New upstream version 0.26.0upstream/0.26.0

213 files changed, 106179 insertions, 92530 deletions

diff --git a/ChangeLog b/ChangeLog
index 43f6d86..d8b8ba6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,1151 @@
+commit b83a820fc0a3f85f22484f3275adf086ad8e2ca3
+Author: Jens Georg <mail@jensge.org>
+Date:   Mon Mar 20 13:41:40 2017 +0100
+
+    Prepare shotwell 0.26.0
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	NEWS
+M	configure.ac
+M	debian/changelog
+M	icons/Makefile.am
+A	icons/about-aachen.jpg
+M	org.gnome.Shotwell.gresource.xml
+M	src/AppWindow.vala
+M	src/Resources.vala
+
+commit a54ff87cce112a075b91591f811ed605d1d84430
+Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+Date:	Fri Mar 17 08:39:22 2017 +0000
+
+    Update Kazakh translation
+
+M	po/kk.po
+
+commit 683e673975674852828d17fc441a98e39a5c3bcd
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Mar 16 20:51:15 2017 +0100
+
+    Fix some spelling errors in NEWS
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	NEWS
+
+commit 844c7b8357b4cb3790d9ffd3f8705f4e68d5b83c
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Mar 16 20:44:50 2017 +0100
+
+    Update debian
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	debian/changelog
+
+commit 3194563aa794a1700b1ce44f6dbe7ce3b6c3db8d
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Thu Mar 16 19:02:54 2017 +0100
+
+    Fix a syntax error in Latvian help translation
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=780116
+
+M	help/lv/lv.po
+
+commit 5e304722ad2e0f4caec6f7ecea71717d4de9ef39
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Thu Mar 16 10:20:58 2017 +0000
+
+    Update German translation
+
+M	po/de.po
+
+commit b134f99e439b6e21f0423805d1bc23fab3a5877d
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:	Thu Mar 16 07:15:37 2017 +0000
+
+    Update Spanish translation
+
+M	help/es/es.po
+
+commit e621cec664dedd62b0bc294b0bdacb0f8953f2ff
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Mar 15 22:32:08 2017 +0100
+
+    Use custom --enable-debug switch
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	configure.ac
+D	m4/ax_check_enable_debug.m4
+
+commit fee674ea7a2bb57f11efa59bc04fe5b08332fb79
+Author: Balázs Úr <urbalazs@gmail.com>
+Date:	Wed Mar 15 17:11:57 2017 +0000
+
+    Update Hungarian translation
+
+M	po/hu.po
+
+commit 76e8aedfe6678c3b5a367d3d6f2ef0002fd33a95
+Author: gogo <trebelnik2@gmail.com>
+Date:	Wed Mar 15 11:10:14 2017 +0000
+
+    Update Croatian translation
+
+M	po/hr.po
+
+commit e0f75e01c38c17d5bef5c04c95e2810b3aad0c59
+Author: Marek Černocký <marek@manet.cz>
+Date:	Wed Mar 15 00:56:16 2017 +0100
+
+    Updated Czech translation
+
+M	po/cs.po
+
+commit b11f1b0fe626f50c5c715018d97bf7e438777fd7
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Mar 14 20:44:44 2017 +0100
+
+    Check for LC_MEASUREMENT in a more portable way
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=779844
+
+M	src/Resources.vala
+
+commit b9ac3e74033749b4864a59bb5b21b69dcc90678c
+Author: Josef Andersson <l10nl18nsweja@gmail.com>
+Date:	Tue Mar 14 13:43:49 2017 +0000
+
+    Update Swedish translation
+
+M	po/sv.po
+
+commit 05caf49deda458a49f9cc21babca5c4fb2c4b580
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Tue Mar 14 13:43:45 2017 +0100
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit 190a7e948d679344c00d46695623e770aae06549
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 13 19:45:14 2017 +0100
+
+    Prepare 0.25.92
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	NEWS
+M	configure.ac
+
+commit 3d71f6f68df5a0e965a395e501f22b816095f71e
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 13 20:57:57 2017 +0100
+
+    icons: Add missing files to tarball
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	icons/Makefile.am
+
+commit 5b2490388036237c82dd8837fc9267ea6b88ff57
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 13 20:40:38 2017 +0100
+
+    Fix issue with non-distributed ui files
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	ui/Makefile.am
+
+commit eaf7e88240369f87defe0f7f8ba9fe9f468a256e
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 13 19:33:07 2017 +0100
+
+    printing: Use inch/cm depending on locale settings
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=779844
+
+M	misc/org.yorba.shotwell.gschema.xml
+M	src/Printing.vala
+M	src/Resources.vala
+M	src/config/ConfigurationInterfaces.vala
+
+commit 31ee9ff2bbad67918f14efaf52903c177ce35d2b
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 13 19:08:57 2017 +0100
+
+    build: Remove debugging leftover
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	configure.ac
+
+commit 9fa3ac748d330b21400d15d883d2437073f231f4
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:	Mon Mar 13 16:54:15 2017 +0100
+
+    Unique summary for each transition
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=779989
+
+M	misc/org.yorba.shotwell.gschema.xml
+
+commit 379ea72c323f7aa84383991075cc492cc0e3833e
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 13 19:03:11 2017 +0100
+
+    Enable GExiv2 GLib logging handler
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/main.vala
+
+commit 2f9ad9731ca512f888e716c7cf5e70d701dbcc51
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 13 19:02:29 2017 +0100
+
+    Prevent needless string copy
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Printing.vala
+
+commit e031ef34362cb656b40ddf7ad36e192a5b59b50f
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 13 18:59:27 2017 +0100
+
+    build: Use proper argument for AX_IS_RELEASE
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	configure.ac
+
+commit 3db3d1f357a85000d3f5c1fc825d7466420c0d28
+Author: Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+Date:	Sun Mar 12 04:10:09 2017 +0000
+
+    Update Kazakh translation
+
+M	po/kk.po
+
+commit e5e018338eda698432673038da85686db293fd0c
+Author: GNOME Translation Robot <gnome-sysadmin@gnome.org>
+Date:	Fri Mar 10 10:19:47 2017 +0000
+
+    Update Scottish Gaelic translation
+
+    (cherry picked from commit 9f41fcb9cc54734b4f02c0e5003f2b6309ece9e5)
+
+M	po/gd.po
+
+commit e7376bf09a8811a2380b23ccd553972d46dd4cc5
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Mar 9 22:37:03 2017 +0100
+
+    viewer: Enable context menu
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/direct/DirectPhotoPage.vala
+
+commit eceb40c3578c9c795ad20612a0702024686eafba
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Mar 9 21:24:28 2017 +0100
+
+    Use gp_file_new_from_fd for getting files
+
+    Previously, we would use a memory file and load the whole file into
+    memory and
+    write it to disk afterwards. That was probably ok for (small)
+    photos, but
+    totally killed memory usage with videos.
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=732663
+
+M	src/camera/GPhoto.vala
+M	vapi/libgphoto2.vapi
+
+commit 764d257bd4e532b858c4338b6c52e69125505856
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Mar 8 22:01:06 2017 +0100
+
+    Allow CCW rotation by ctrl-Space on tool button
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=715501
+
+M	src/CollectionPage.vala
+M	src/PhotoPage.vala
+
+commit f24bd7af01eff3e3085134ba7de5a5e898e3fbbf
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Mar 7 23:53:25 2017 +0100
+
+    piwigo: Add .jpg extension to file name
+
+    Otherwise downloading files would cause the original RAW file name
+    created with JPEG contents
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=729091
+
+M	plugins/shotwell-publishing/PiwigoPublishing.vala
+
+commit 268e65fe6a1348f1bfcc702041048467b1f63d37
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Mar 7 22:40:30 2017 +0100
+
+    Speed-up autogen.sh
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	autogen.sh
+
+commit 8284f1a227050a99f0740222bacc0444d5859aa7
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Mar 7 22:31:58 2017 +0100
+
+    Simplify printing dialog a bit
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Printing.vala
+M	ui/printing_widget.ui
+
+commit bd3ccefcd6d8066d47fd4f998436668913fcc096
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 6 23:26:59 2017 +0100
+
+    Make custom printing widget a GtkTemplate
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	org.gnome.Shotwell.gresource.xml
+M	po/POTFILES.in
+M	src/Printing.vala
+A	ui/printing_widget.ui
+M	ui/shotwell.ui
+
+commit ece3fb96288db5ae7920417c99c02f7881a53b61
+Author: Gábor Kelemen <kelemeng@openscope.org>
+Date:	Tue Mar 7 00:20:49 2017 +0000
+
+    Update Hungarian translation
+
+M	po/hu.po
+
+commit de793a9b0af74c309486349395c8b9193043f87a
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 6 22:49:23 2017 +0100
+
+    Remove obsolete Glade helper
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+D	sw-glade
+D	ui/shotwell.xml
+
+commit 93ee36a52afe4a07b73ce499854aa3e8c10154d9
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 6 22:15:54 2017 +0100
+
+    Move ui files into resources
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	org.gnome.Shotwell.gresource.xml
+M	src/AppWindow.vala
+M	src/Page.vala
+M	src/Resources.vala
+M	src/SearchFilter.vala
+M	src/searches/Branch.vala
+M	src/sidebar/Tree.vala
+M	src/tags/Branch.vala
+M	ui/Makefile.am
+
+commit 056b465182a2cc4310dc999bd9f30a791a66e224
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 6 21:53:56 2017 +0100
+
+    Move icons into resource file
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	icons/Makefile.am
+M	org.gnome.Shotwell.gresource.xml
+M	src/AppDirs.vala
+M	src/Resources.vala
+M	src/editing_tools/EditingTools.vala
+M	src/main.vala
+
+commit 97c0e4f8829edb18c061fc7acd8fd30c5c5804f8
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Mar 6 21:52:39 2017 +0100
+
+    Fix compilation issue with no authenticators enabled
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/shotwell-publishing.vala
+
+commit 7ee7bbf9126faa3d49df74656843bc2602bfbf2c
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date:	Sun Mar 5 20:58:03 2017 +0100
+
+    Updated Serbian translation
+
+M	po/sr.po
+M	po/sr@latin.po
+
+commit 33f86a14c2e5e99465292c863f5e1f2ce74b6659
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Mar 5 20:24:08 2017 +0100
+
+    Remove obsolete top.ui
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	po/POTFILES.in
+M	ui/Makefile.am
+D	ui/top.ui
+
+commit 4b60125bfa77bbe725b7de598eea24a3d1e244a1
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:	Sun Mar 5 12:40:28 2017 +0000
+
+    Update German translation
+
+M	po/de.po
+
+commit 3d26c342a7e7aaf8e89c5ab4b695618a0f6ee1a7
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Mar 4 15:58:58 2017 +0100
+
+    Make it possible to disable individual publishers
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=775158
+
+M	configure.ac
+M	plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
+M	plugins/shotwell-publishing/shotwell-publishing.vala
+M	publish-extra.am
+M	publish.am
+
+commit 13f8bd03ebb7883abe23917f1ee84ea618f924fe
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Mar 4 11:51:50 2017 +0100
+
+    Temporarily remove goa and uoa from configure
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	configure.ac
+
+commit 954da8e7e7bf1430dd5b1ec6544745f96dd04ce9
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Mar 4 10:47:39 2017 +0100
+
+    Remove [Version] tag from gdata vapi
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	vapi/libgdata.vapi
+
+commit 2ca6abe3443a845a3bc6b1a8bbd71b48ed61ad5d
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Mar 4 10:25:04 2017 +0100
+
+    Minor debian fixes
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	NEWS
+M	debian/changelog
+M	debian/control
+
+commit 8e539a21c46141aaa891057ce50fafaf6497b10a
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Mar 4 09:43:23 2017 +0100
+
+    Remove web dependencies of core shotwell
+
+    Only necessary for plugins or authenticators
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	configure.ac
+
+commit 0c383826ec9c45fcfb8e9d42b57b97eabce214b4
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Date:	Sat Aug 20 18:29:03 2016 +0000
+
+    manpage: Remove wrong macro 'R'
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=779558
+
+M	help/shotwell.1
+
+commit 83aa3870cae8d958a253630c988a1f4a48dd5783
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Mar 4 00:05:43 2017 +0100
+
+    viewer: Don't always add photo again after saving
+
+    This seems to cause the photo being in the collection twice, causing
+    not being able to navigate to the previous photo anymore
+
+    Just do it when the photo we save isn't the current photo.
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=734816
+
+M	src/direct/DirectPhotoPage.vala
+
+commit 054ca90f435498d1a58a2f4c91b6ed4857553398
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Mar 2 23:32:48 2017 +0100
+
+    Fix toolbox not visible in fullscreen
+
+    Seems to affect Cinnamon so far. Most likely due to the work-around
+    for crashing on wayland (1eec412e97c255c9ca235e039dcdc59ee4c3c140)
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/PhotoPage.vala
+
+commit 8b6b33f14aecf448a14eef5372219d4f524bccab
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Mar 2 21:49:57 2017 +0100
+
+    Fix issue when deleting image in Fullscreen
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Page.vala
+
+commit 8e4268248f035bf0f1ae071d451b335321e6c686
+Author: Jordi Mas <jmas@softcatala.org>
+Date:	Tue Feb 28 20:05:45 2017 +0100
+
+    Fix Catalan translation
+
+M	po/ca.po
+
+commit 70e9071a01d1d596fca9851f393a8ff847c79bb3
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Feb 27 21:01:51 2017 +0100
+
+    Post-release version bump
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	configure.ac
+
+commit 46cb5788d823338f0b0e2e64ec79851f701ab444
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Feb 27 20:45:28 2017 +0100
+
+    Prepare 0.25.90
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	NEWS
+M	configure.ac
+M	debian/changelog
+
+commit e590ff354add6024dda62eab9c1aa9fe6cb4bca1
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Feb 27 20:29:06 2017 +0100
+
+    picasa: Skip default url from album list
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/PicasaPublishing.vala
+M	plugins/shotwell-publishing/YouTubePublishing.vala
+
+commit 9afb5a61f866768b0c45344448fa9958edf15636
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Feb 26 20:53:43 2017 +0100
+
+    More Save As => Export
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	ui/event.ui
+M	ui/tags.ui
+
+commit 5a944fb2379f63b2278cf2192022911da1723f74
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sun Feb 26 18:33:19 2017 +0100
+
+    Update Polish translation
+
+M	po/pl.po
+
+commit 969d102177f150ee7fbd700acb6304648b41e461
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Feb 26 17:01:42 2017 +0100
+
+    Drop GOA dependency
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	publish.am
+M	vapi/libgdata.vapi
+
+commit 1ae4e1315fa9b20ef59946e1885de886b04f7f2b
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date:	Sun Feb 26 10:33:30 2017 +0100
+
+    Updated Serbian translation
+
+M	po/sr.po
+M	po/sr@latin.po
+
+commit d6328842ef4da39c9dbe20579ceb4177ff5950b3
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Feb 25 23:41:03 2017 +0100
+
+    Re-introduce "Export" menu
+
+    Accidently named "Save As" because the mixing up the icon with
+    the label
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	ui/media.ui
+M	ui/photo.ui
+
+commit a334c78881f0ddbec4a2c2a2656d7c7d9f1fd8a8
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Feb 25 23:24:31 2017 +0100
+
+    Fix import of files ending in ogg
+
+    This will only work for "local" imports, not from camera.
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=717305
+
+M	src/BatchImport.vala
+M	src/VideoSupport.vala
+
+commit da83d231f6efe00e2bea5ccc7d1a5fbab8a20749
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Oct 12 16:20:09 2016 +0200
+
+    Get prefetched copy after setting the developer
+
+    Avoid doing a raw development if we want the embedded developer
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Photo.vala
+
+commit 50cce33b66a3bd40f9edc347e56c9b8a19b1b234
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Oct 9 18:26:00 2016 +0200
+
+    Don't uncessarily do a raw processing for thumbs
+
+    Try to use the embedded preview instead.
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=718248
+
+M	src/photos/RawSupport.vala
+
+commit 5873a3c4f46ddf1a3045387876cb20415e267338
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Oct 9 18:24:41 2016 +0200
+
+    Attach a role to PhotoFileReader
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/Photo.vala
+M	src/photos/PhotoFileAdapter.vala
+
+commit ead1bd5373ce572380f598ea14ad443568822b62
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Feb 25 22:07:50 2017 +0100
+
+    youtube: Show progress while uploading
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/YouTubePublishing.vala
+
+commit 8776a682fb305aa91111533cea10fc7b403de913
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Feb 25 20:47:45 2017 +0100
+
+    youtube: Add local gdata vapi, fix authorizer
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/YouTubePublishing.vala
+M	publish.am
+A	vapi/libgdata.vapi
+
+commit e63a88e328ab268e3cea3d178a47e519f2e03b87
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Feb 21 23:48:07 2017 +0100
+
+    google: Extract access token expiry time
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/authenticator/shotwell/GoogleAuthenticator.vala
+
+commit f5a89c745f00f15d88e63a401e9fb6d9c4fca7e5
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Feb 11 22:29:39 2017 +0100
+
+    youtube: Port to libgdata
+
+    Make YouTube upload work again
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=777910
+
+M	configure.ac
+M	plugins/shotwell-publishing/YouTubePublishing.vala
+M	publish.am
+
+commit dca35c362b741c1379676c2e1c7099d39e4d1755
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Feb 11 22:28:47 2017 +0100
+
+    Update Google API keys
+
+    Old API keys were not activated for YouTube Data API v3 uploading.
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/authenticator/shotwell/GoogleAuthenticator.vala
+M	plugins/shotwell-publishing/YouTubePublishing.vala
+
+commit 5d3559d149c4e9c21dd78e396edcfe82bbe702f6
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Feb 23 19:27:12 2017 +0100
+
+    Update debian
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	debian/changelog
+
+commit 441e36711a52a65540345c8d385488f4169fe0e5
+Author: Jiri Grönroos <jiri.gronroos@iki.fi>
+Date:	Wed Feb 22 18:50:12 2017 +0000
+
+    Update Finnish translation
+
+M	po/fi.po
+
+commit ddcc9c9b4eb4e3c2582f939235282791465157ba
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Feb 21 22:57:47 2017 +0100
+
+    picasa: Use proper mime type for video
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/PicasaPublishing.vala
+
+commit b3fe24ea953ca86310dca39226a1b87f54bfb8ee
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Feb 21 22:05:49 2017 +0100
+
+    picasa: Remove possibility to create new albums
+
+    This has been dropped from the Picasa Web API / Google Photos
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/authenticator/shotwell/GoogleAuthenticator.vala
+M	plugins/shotwell-publishing/PicasaPublishing.vala
+M	plugins/shotwell-publishing/picasa_publishing_options_pane.ui
+
+commit 12dd77b2e08712eb9a4fc8f85bd2639092422bc5
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Feb 21 21:36:21 2017 +0100
+
+    picasa: Remove obsolete comment
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/PicasaPublishing.vala
+
+commit 4aa315083e4fa1984905a907788e595510f183de
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Feb 19 17:49:00 2017 +0100
+
+    Post-releease version bump
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	configure.ac
+
+commit cfb0e920a3328d07787dab0e7751d6da7a9cf72a
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Feb 13 21:39:24 2017 +0100
+
+    Prepare 0.25.5
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	NEWS
+
+commit 178070af02ea3dd9af920ec33d112b2fb354055c
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Feb 13 21:37:01 2017 +0100
+
+    Distribute resource and header files
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	authenticator.am
+
+commit b834fe3d8cd117b9bda916e9b8abc23472c005bd
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Feb 13 20:51:14 2017 +0100
+
+    Fix dependencies for authenticator library
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	authenticator.am
+
+commit e96362678ca4e8b5650df2fdbfd0e55ee50cb326
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Feb 13 20:50:51 2017 +0100
+
+    Introduce "refresh()" method to authenticator
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M
+plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala
+M	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+M	plugins/authenticator/shotwell/GoogleAuthenticator.vala
+M	src/plugins/PublishingInterfaces.vala
+
+commit 841db576d864fb0252e1b34e086bcbab94f8ef5d
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:	Sun Feb 12 14:59:45 2017 +0000
+
+    Update Swedish translation
+
+M	help/sv/sv.po
+
+commit 5c64525827f751dad749c39706f1630e7e189e84
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:	Sat Feb 11 20:11:02 2017 +0100
+
+    Update POTFILES.in and POTFILES.skip
+
+M	po/POTFILES.in
+M	po/POTFILES.skip
+
+commit d4687a780564111e8d312f60efd87e42b31c5ee1
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Feb 11 19:34:25 2017 +0100
+
+    i18n: Update POTFILES.{in,skip}
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	po/POTFILES.in
+M	po/POTFILES.skip
+
+commit 0a170a63276965e5548b7e2c561bccdd401bd7d5
+Author: Jens Georg <mail@jensge.org>
+Date:	Sat Feb 11 00:04:20 2017 +0100
+
+    Only show logout button if authenticator supports it
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+M	plugins/shotwell-publishing/PicasaPublishing.vala
+M	plugins/shotwell-publishing/YouTubePublishing.vala
+
+commit b0fa855491788456973575794ec97ee753ea514c
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Feb 9 23:02:15 2017 +0100
+
+    Flickr: Fix authentication from persistent data
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+
+commit f0f65a1275e84b9dfab2124be6a36396997f8683
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Feb 9 22:38:42 2017 +0100
+
+    google: Persistency handling in authenticator
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/authenticator/shotwell/GoogleAuthenticator.vala
+M	plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
+M	plugins/common/RESTSupport.vala
+M	plugins/shotwell-publishing/PicasaPublishing.vala
+M	plugins/shotwell-publishing/YouTubePublishing.vala
+
+commit 161c19ba01045b942e050e6dd5956c759c1fa140
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Feb 9 22:17:45 2017 +0100
+
+    Make pluggables depend on authenticator availability
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/authenticator/shotwell/GoogleAuthenticator.vala
+M	plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
+M	plugins/shotwell-publishing/shotwell-publishing.vala
+M	src/plugins/PublishingInterfaces.vala
+
+commit abad9e07aeaae6a91c571ddeb99cfedfb4afa5e3
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Feb 9 22:16:53 2017 +0100
+
+    Facebook: Move persitency into authenticator
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M
+plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala
+M	plugins/shotwell-publishing/FacebookPublishing.vala
+
+commit 7544a3eba84686cbfeafed8cab572e3aff9ba9b8
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Feb 9 21:36:14 2017 +0100
+
+    flickr: Move persistency to authenticator
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+
+commit b8b39ef517ae0a944175e66d3a27262e5503c6df
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Feb 8 23:15:04 2017 +0100
+
+    Extract Google authenticator
+
+    Put it into the authenticator library as well
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	authenticator.am
+M	configure.ac
+A	plugins/authenticator/shotwell/GoogleAuthenticator.vala
+M	plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
+M	plugins/common/RESTSupport.vala
+M	plugins/shotwell-publishing/PicasaPublishing.vala
+M	plugins/shotwell-publishing/YouTubePublishing.vala
+
+commit a3b6e0f6f73069ad2472ffa68f36f77adadd0485
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Feb 6 19:08:31 2017 +0100
+
+    Put authenticators into separate library
+
+M	Makefile.am
+A	authenticator.am
+M	configure.ac
+R096	plugins/shotwell-publishing/FacebookPublishingAuthenticator.vala
+plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala
+R066	plugins/shotwell-publishing/FlickrPublishingAuthenticator.vala
+plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+A	plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
+R100	plugins/shotwell-publishing/flickr_pin_entry_pane.ui
+plugins/authenticator/shotwell/flickr_pin_entry_pane.ui
+A
+plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml
+M	plugins/shotwell-publishing/FacebookPublishing.vala
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+M
+plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+M	publish.am
+M	src/plugins/PublishingInterfaces.vala
+
+commit a90cf2623f57ec50f1ad2284a7ae552f33381be4
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Jan 4 11:37:43 2017 +0100
+
+    No need for request phase tokens in Flickr publisher
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+
+commit 6b6e2818218e80d90dfcca5382da635e9b16b580
+Author: Jens Georg <mail@jensge.org>
+Date:	Wed Jan 4 11:28:05 2017 +0100
+
+    flickr: Move API keys into authenticator
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+M	plugins/shotwell-publishing/FlickrPublishingAuthenticator.vala
+
+commit b473cddea88394badb66faaf7dab5091a620c027
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Dec 22 21:05:41 2016 +0100
+
+    Extract Flickr authentication into own class
+
+M	plugins/shotwell-publishing/FlickrPublishing.vala
+A	plugins/shotwell-publishing/FlickrPublishingAuthenticator.vala
+M	publish.am
+
+commit 3351086742689b8397dd8df0c2961e42a46499be
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Dec 19 19:28:39 2016 +0100
+
+    Move Facebook authenticator in extra file
+
+M	plugins/shotwell-publishing/FacebookPublishing.vala
+A	plugins/shotwell-publishing/FacebookPublishingAuthenticator.vala
+M	po/POTFILES.in
+M	po/POTFILES.skip
+M	publish.am
+
+commit 25ec931a9447eefbcffb34e0a1d5362eb3b5cb55
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Dec 18 23:09:04 2016 +0100
+
+    Only show Facebook logout button if supported
+
+    If authenticator does not have logout feature, don't show it
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/FacebookPublishing.vala
+
+commit a8bda161eb06acafadc95c907b1acb0e2b34212d
+Author: Jens Georg <mail@jensge.org>
+Date:	Sun Dec 18 23:02:29 2016 +0100
+
+    Extract Facebook authentication process
+
+    Put it into extra class implementing the Authenticator interface
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	plugins/shotwell-publishing/FacebookPublishing.vala
+M	src/plugins/PublishingInterfaces.vala
+
+commit 9a04c84ec121a6a027540a8aad422c5fffa90d69
+Author: Jens Georg <mail@jensge.org>
+Date:	Thu Dec 15 20:08:54 2016 +0100
+
+    Define Authenticator interface
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	src/plugins/PublishingInterfaces.vala
+
+commit 535b205eb061bc1d95cf83fb07a415d7515f31f3
+Author: Alan Mortensen <alanmortensen.am@gmail.com>
+Date:	Sat Feb 11 19:14:45 2017 +0100
+
+    Updated Danish translation
+
+M	po/da.po
+
+commit c73d7b5f14b71f12df11a654dc688edd566f8592
+Author: Jens Georg <mail@jensge.org>
+Date:	Mon Feb 6 19:52:49 2017 +0100
+
+    libraw.vapi: Fix setting of parameters on OutputParams
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=778174
+
+M	src/photos/GRaw.vala
+M	vapi/libraw.vapi
+
+commit 478e943e82926ee617126f659fffd8810e202b65
+Author: Enrico Nicoletto <liverig@gmail.com>
+Date:	Mon Feb 6 12:17:32 2017 +0000
+
+    Update Brazilian Portuguese translation
+
+M	po/pt_BR.po
+
+commit 6c6182f341dafdb39c2b270fd11edb5fa8e30941
+Author: Debarshi Ray <debarshir@gnome.org>
+Date:	Sat Feb 4 16:48:24 2017 +0100
+
+    graw, libraw.vapi: Use the correct type for use_camera_matrix
+
+    libraw_output_params_t.use_camera_matrix is a tri-state value, not a
+    boolean. Since any non-zero value counts as 'true', let's use the
+    default unless someone finds a reason not to.
+
+    See:
+    http://www.libraw.org/docs/API-datastruct-eng.html#libraw_output_params_t
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=778174
+
+M	src/photos/GRaw.vala
+M	vapi/libraw.vapi
+
+commit e045b9b48851dd4f21387e99de1aa3a1e10a3a66
+Author: Debarshi Ray <debarshir@gnome.org>
+Date:	Sat Feb 4 16:21:17 2017 +0100
+
+    libraw.vapi: Set the correct power value for the gamma curve
+
+    libraw_output_params_t.gamm[0] is meant to have the inverted gamma or
+    power value. See:
+    http://www.libraw.org/docs/API-datastruct-eng.html#libraw_output_params_t
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=778174
+
+M	vapi/libraw.vapi
+
+commit dac7891bd25d9d3b62f773cb0743c78b41692f24
+Author: Jens Georg <mail@jensge.org>
+Date:	Tue Jan 31 21:43:57 2017 +0100
+
+    Post-release version bump
+
+    Signed-off-by: Jens Georg <mail@jensge.org>
+
+M	configure.ac
+
 commit 8d2e927e78abb7699f1e9c8e9fd60119ea01999a
 Author: Jens Georg <mail@jensge.org>
-Date:   Tue Jan 31 21:25:06 2017 +0100
+Date:	Tue Jan 31 21:25:06 2017 +0100
 
     Prepare 0.25.4
 
diff --git a/Makefile.am b/Makefile.am
index 4568e29..93b929b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -131,6 +131,9 @@ include $(top_srcdir)/common.am
 include $(top_srcdir)/shotwell.am
 include $(top_srcdir)/thumbnailer.am
 
+# Authenticators
+include $(top_srcdir)/authenticator.am
+
 # Plugins
 include $(top_srcdir)/publish.am
 
diff --git a/Makefile.in b/Makefile.in
index b77a47b..a67ea28 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,8 +95,14 @@ 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
 bin_PROGRAMS = shotwell$(EXEEXT)
-@HAVE_EXTRA_PLUGINS_TRUE@am__append_3 = plugins/shotwell-publishing-extras/shotwell-publishing-extras.la
-@HAVE_EXTRA_PLUGINS_TRUE@am__append_4 = \
+@AUTHENTICATOR_SHOTWELL_TRUE@am__append_3 = \
+@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
+
+@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@	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 \
@@ -109,12 +115,10 @@ bin_PROGRAMS = shotwell$(EXEEXT)
 @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_5 = plugins/shotwell-publishing-extras/resource.c
+@HAVE_EXTRA_PLUGINS_TRUE@am__append_6 = plugins/shotwell-publishing-extras/resource.c
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \
-	$(top_srcdir)/m4/ax_check_enable_debug.m4 \
-	$(top_srcdir)/m4/ax_generate_changelog.m4 \
+am__aclocal_m4_deps = $(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 \
@@ -171,19 +175,43 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(plugindir)" \
 LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES) \
 	$(plugin_LTLIBRARIES)
 am__DEPENDENCIES_1 =
+plugins_authenticator_libshotwell_authenticator_la_DEPENDENCIES =  \
+	$(am__DEPENDENCIES_1) \
+	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
+am__plugins_authenticator_libshotwell_authenticator_la_SOURCES_DIST =  \
+	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__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
+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
+plugins_authenticator_libshotwell_authenticator_la_OBJECTS = $(am_plugins_authenticator_libshotwell_authenticator_la_OBJECTS) \
+	$(nodist_plugins_authenticator_libshotwell_authenticator_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+plugins_authenticator_libshotwell_authenticator_la_LINK = $(LIBTOOL) \
+	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+	--mode=link $(CCLD) \
+	$(plugins_authenticator_libshotwell_authenticator_la_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 plugins_common_libshotwell_plugin_common_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1)
-am__dirstamp = $(am__leading_dot)dirstamp
 am_plugins_common_libshotwell_plugin_common_la_OBJECTS = plugins/common/plugins_common_libshotwell_plugin_common_la-RESTSupport.lo \
 	plugins/common/plugins_common_libshotwell_plugin_common_la-Resources.lo \
 	plugins/common/plugins_common_libshotwell_plugin_common_la-WebAuthenticationPane.lo \
 	plugins/common/plugins_common_libshotwell_plugin_common_la-BuilderPane.lo
 plugins_common_libshotwell_plugin_common_la_OBJECTS =  \
 	$(am_plugins_common_libshotwell_plugin_common_la_OBJECTS)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
 plugins_common_libshotwell_plugin_common_la_LINK = $(LIBTOOL) \
 	$(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) \
@@ -245,7 +273,8 @@ plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_LINK =  \
 @HAVE_EXTRA_PLUGINS_TRUE@	-rpath $(plugindir)
 plugins_shotwell_publishing_shotwell_publishing_la_DEPENDENCIES =  \
 	$(am__DEPENDENCIES_1) \
-	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
+	$(top_builddir)/plugins/common/libshotwell-plugin-common.la \
+	$(top_builddir)/plugins/authenticator/libshotwell-authenticator.la
 am_plugins_shotwell_publishing_shotwell_publishing_la_OBJECTS = plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-shotwell-publishing.lo \
 	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-FacebookPublishing.lo \
 	plugins/shotwell-publishing/plugins_shotwell_publishing_shotwell_publishing_la-PicasaPublishing.lo \
@@ -544,7 +573,10 @@ AM_V_VALAC = $(am__v_VALAC_@AM_V@)
 am__v_VALAC_ = $(am__v_VALAC_@AM_DEFAULT_V@)
 am__v_VALAC_0 = @echo "  VALAC   " $@;
 am__v_VALAC_1 = 
-SOURCES = $(plugins_common_libshotwell_plugin_common_la_SOURCES) \
+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) \
@@ -556,7 +588,8 @@ SOURCES = $(plugins_common_libshotwell_plugin_common_la_SOURCES) \
 	$(src_plugins_libplugin_la_SOURCES) $(shotwell_SOURCES) \
 	$(nodist_shotwell_SOURCES) \
 	$(thumbnailer_shotwell_video_thumbnailer_SOURCES)
-DIST_SOURCES = $(plugins_common_libshotwell_plugin_common_la_SOURCES) \
+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) \
@@ -577,13 +610,15 @@ am__can_run_installinfo = \
     *) (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 \
+	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/picasa.png \
 	plugins/shotwell-publishing/piwigo.png \
 	plugins/shotwell-publishing/youtube.png \
 	plugins/shotwell-publishing/facebook_publishing_options_pane.ui \
-	plugins/shotwell-publishing/flickr_pin_entry_pane.ui \
 	plugins/shotwell-publishing/flickr_publishing_options_pane.ui \
 	plugins/shotwell-publishing/picasa_publishing_options_pane.ui \
 	plugins/shotwell-publishing/piwigo_authentication_pane.ui \
@@ -642,6 +677,7 @@ CTAGS = ctags
 CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
 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 \
@@ -650,7 +686,7 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(srcdir)/shotwell_vala.stamp \
 	$(srcdir)/src_plugins_libplugin_la_vala.stamp \
 	$(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp \
-	$(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/authenticator.am $(top_srcdir)/build-aux/compile \
 	$(top_srcdir)/build-aux/config.guess \
 	$(top_srcdir)/build-aux/config.rpath \
 	$(top_srcdir)/build-aux/config.sub \
@@ -665,6 +701,10 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	build-aux/compile build-aux/config.guess \
 	build-aux/config.rpath build-aux/config.sub build-aux/depcomp \
 	build-aux/install-sh build-aux/ltmain.sh build-aux/missing \
+	plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c \
+	plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c \
+	plugins/authenticator/shotwell/GoogleAuthenticator.c \
+	plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c \
 	plugins/common/BuilderPane.c plugins/common/RESTSupport.c \
 	plugins/common/Resources.c \
 	plugins/common/WebAuthenticationPane.c \
@@ -855,6 +895,9 @@ 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@
@@ -942,6 +985,7 @@ 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@
@@ -1053,9 +1097,8 @@ GITIGNOREFILES = \
 #
 # Generate utility library for plugins
 #
-lib_LTLIBRARIES = \
-	plugins/common/libshotwell-plugin-common.la
-
+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/Resources.vala \
@@ -1118,19 +1161,21 @@ SHOTWELL_PLUGIN_LDFLAGS = \
 plugindir = $(pkglibdir)/plugins/builtin
 plugin_LTLIBRARIES =  \
 	plugins/shotwell-publishing/shotwell-publishing.la \
-	$(am__append_3) \
+	$(am__append_4) \
 	plugins/shotwell-transitions/shotwell-transitions.la \
 	plugins/shotwell-data-imports/shotwell-data-imports.la
 dist_plugin_DATA = 
 dist_pkglibexec_SCRIPTS = $(top_srcdir)/settings-migrator/shotwell-settings-migrator
 dist_noinst_DATA = $(NULL) org.gnome.Shotwell.gresource.xml \
+	plugins/authenticator/shotwell/flickr_pin_entry_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/picasa.png \
 	plugins/shotwell-publishing/piwigo.png \
 	plugins/shotwell-publishing/youtube.png \
 	plugins/shotwell-publishing/facebook_publishing_options_pane.ui \
-	plugins/shotwell-publishing/flickr_pin_entry_pane.ui \
 	plugins/shotwell-publishing/flickr_publishing_options_pane.ui \
 	plugins/shotwell-publishing/picasa_publishing_options_pane.ui \
 	plugins/shotwell-publishing/piwigo_authentication_pane.ui \
@@ -1138,7 +1183,7 @@ dist_noinst_DATA = $(NULL) org.gnome.Shotwell.gresource.xml \
 	plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui \
 	plugins/shotwell-publishing/youtube_publishing_options_pane.ui \
 	plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml \
-	$(am__append_4) \
+	$(am__append_5) \
 	plugins/shotwell-transitions/slideshow-plugin.png \
 	plugins/shotwell-transitions/org.gnome.Shotwell.Transitions.gresource.xml \
 	plugins/shotwell-data-imports/f-spot-24.png \
@@ -1147,8 +1192,8 @@ dist_noinst_DATA = $(NULL) org.gnome.Shotwell.gresource.xml \
 	plugins/shotwell-plugin-common.h vapi/gphoto.h \
 	vapi/libexif.vapi vapi/libgphoto2.vapi vapi/libraw.vapi \
 	vapi/unity.deps vapi/unity.vapi vapi/misc.vapi
-MOSTLYCLEANFILES = $(NULL) resource.c \
-	plugins/shotwell-publishing/resource.c $(am__append_5) \
+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
 
@@ -1397,6 +1442,36 @@ thumbnailer_shotwell_video_thumbnailer_VALAFLAGS = $(COMMON_VALAFLAGS) \
 
 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_authenticator_libshotwell_authenticator_la_VALAFLAGS = \
+	$(COMMON_VALAFLAGS) \
+	--library shotwell-authenticator \
+	--vapi=plugins/authenticator/shotwell-authenticator.vapi \
+	--header=plugins/authenticator/shotwell-authenticator.h \
+	$(AUTHENTICATOR_PACKAGES) \
+	--vapidir $(abs_top_srcdir)/plugins
+
+plugins_authenticator_libshotwell_authenticator_la_LIBADD = \
+	$(AUTHENTICATOR_LIBS) \
+	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
+
+plugins_authenticator_libshotwell_authenticator_la_CFLAGS = \
+	$(COMMON_CFLAGS) \
+	$(AUTHENTICATOR_CFLAGS) \
+	-I $(top_srcdir)/plugins \
+	-DPLUGIN_RESOURCE_PATH='"/org/gnome/Shotwell/Authenticator"'
+
+nodist_plugins_authenticator_libshotwell_authenticator_la_SOURCES = \
+	plugins/authenticator/resource.c
+
+AUTHENTICATOR_RESOURCE_DEPS = $(shell $(GLIB_COMPILE_RESOURCES) \
+		--sourcedir=$(AUTHENTICATOR_RESOURCE_SOURCEDIR) \
+		--generate-dependencies $(AUTHENTICATOR_SHOTWELL_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
 plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
 	plugins/shotwell-publishing/shotwell-publishing.vala \
 	plugins/shotwell-publishing/FacebookPublishing.vala \
@@ -1404,7 +1479,9 @@ plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
 	plugins/shotwell-publishing/FlickrPublishing.vala \
 	plugins/shotwell-publishing/YouTubePublishing.vala \
 	plugins/shotwell-publishing/PiwigoPublishing.vala \
-	plugins/shotwell-plugin-common.vapi
+	plugins/shotwell-plugin-common.vapi \
+	plugins/authenticator/shotwell-authenticator.vapi \
+	vapi/libgdata.vapi
 
 nodist_plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
 	plugins/shotwell-publishing/resource.c
@@ -1416,6 +1493,7 @@ PUBLISHING_RESOURCE_DEPS = $(shell $(GLIB_COMPILE_RESOURCES) \
 
 plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS = \
 	$(COMMON_VALAFLAGS) \
+	@PUBLISHER_VALAFLAGS@ \
 	--pkg gtk+-3.0 \
 	--pkg libsoup-2.4 \
 	--pkg gexiv2 \
@@ -1434,14 +1512,16 @@ plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS = \
 	$(COMMON_CFLAGS) \
 	-DGCR_API_SUBJECT_TO_CHANGE \
 	$(PUBLISHING_CFLAGS) \
-	-I $(top_srcdir)/plugins
+	-I $(top_srcdir)/plugins \
+	-I $(top_srcdir)/plugins/authenticator
 
 plugins_shotwell_publishing_shotwell_publishing_la_LDFLAGS = \
 	$(SHOTWELL_PLUGIN_LDFLAGS)
 
 plugins_shotwell_publishing_shotwell_publishing_la_LIBADD = \
 	$(PUBLISHING_LIBS) \
-	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
+	$(top_builddir)/plugins/common/libshotwell-plugin-common.la \
+	$(top_builddir)/plugins/authenticator/libshotwell-authenticator.la
 
 @HAVE_EXTRA_PLUGINS_TRUE@plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_SOURCES = \
 @HAVE_EXTRA_PLUGINS_TRUE@	plugins/shotwell-publishing-extras/GalleryConnector.vala \
@@ -1456,6 +1536,7 @@ plugins_shotwell_publishing_shotwell_publishing_la_LIBADD = \
 
 @HAVE_EXTRA_PLUGINS_TRUE@plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \
 @HAVE_EXTRA_PLUGINS_TRUE@	$(COMMON_VALAFLAGS) \
+@HAVE_EXTRA_PLUGINS_TRUE@	@PUBLISHER_VALAFLAGS@ \
 @HAVE_EXTRA_PLUGINS_TRUE@	--pkg gtk+-3.0 \
 @HAVE_EXTRA_PLUGINS_TRUE@	--pkg libsoup-2.4 \
 @HAVE_EXTRA_PLUGINS_TRUE@	--pkg gexiv2 \
@@ -1568,6 +1649,8 @@ plugins_shotwell_data_imports_shotwell_data_imports_la_LIBADD = \
 	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
 
 
+# Authenticators
+
 # Plugins
 dist_noinst_SCRIPTS = \
 	autogen.sh
@@ -1579,7 +1662,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)/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)/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)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -1601,7 +1684,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)/publish.am $(top_srcdir)/publish-extra.am $(top_srcdir)/transition.am $(top_srcdir)/import.am $(am__empty):
+$(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_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
@@ -1707,6 +1790,36 @@ clean-pluginLTLIBRARIES:
 	  echo rm -f $${locs}; \
 	  rm -f $${locs}; \
 	}
+plugins/authenticator/shotwell/$(am__dirstamp):
+	@$(MKDIR_P) plugins/authenticator/shotwell
+	@: > plugins/authenticator/shotwell/$(am__dirstamp)
+plugins/authenticator/shotwell/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) plugins/authenticator/shotwell/$(DEPDIR)
+	@: > plugins/authenticator/shotwell/$(DEPDIR)/$(am__dirstamp)
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-ShotwellAuthenticatorFactory.lo:  \
+	plugins/authenticator/shotwell/$(am__dirstamp) \
+	plugins/authenticator/shotwell/$(DEPDIR)/$(am__dirstamp)
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-FacebookPublishingAuthenticator.lo:  \
+	plugins/authenticator/shotwell/$(am__dirstamp) \
+	plugins/authenticator/shotwell/$(DEPDIR)/$(am__dirstamp)
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-FlickrPublishingAuthenticator.lo:  \
+	plugins/authenticator/shotwell/$(am__dirstamp) \
+	plugins/authenticator/shotwell/$(DEPDIR)/$(am__dirstamp)
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-GoogleAuthenticator.lo:  \
+	plugins/authenticator/shotwell/$(am__dirstamp) \
+	plugins/authenticator/shotwell/$(DEPDIR)/$(am__dirstamp)
+plugins/authenticator/$(am__dirstamp):
+	@$(MKDIR_P) plugins/authenticator
+	@: > plugins/authenticator/$(am__dirstamp)
+plugins/authenticator/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) plugins/authenticator/$(DEPDIR)
+	@: > plugins/authenticator/$(DEPDIR)/$(am__dirstamp)
+plugins/authenticator/plugins_authenticator_libshotwell_authenticator_la-resource.lo:  \
+	plugins/authenticator/$(am__dirstamp) \
+	plugins/authenticator/$(DEPDIR)/$(am__dirstamp)
+
+plugins/authenticator/libshotwell-authenticator.la: $(plugins_authenticator_libshotwell_authenticator_la_OBJECTS) $(plugins_authenticator_libshotwell_authenticator_la_DEPENDENCIES) $(EXTRA_plugins_authenticator_libshotwell_authenticator_la_DEPENDENCIES) plugins/authenticator/$(am__dirstamp)
+	$(AM_V_CCLD)$(plugins_authenticator_libshotwell_authenticator_la_LINK) -rpath $(libdir) $(plugins_authenticator_libshotwell_authenticator_la_OBJECTS) $(plugins_authenticator_libshotwell_authenticator_la_LIBADD) $(LIBS)
 plugins/common/$(am__dirstamp):
 	@$(MKDIR_P) plugins/common
 	@: > plugins/common/$(am__dirstamp)
@@ -2628,6 +2741,10 @@ uninstall-dist_pkglibexecSCRIPTS:
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f plugins/authenticator/*.$(OBJEXT)
+	-rm -f plugins/authenticator/*.lo
+	-rm -f plugins/authenticator/shotwell/*.$(OBJEXT)
+	-rm -f plugins/authenticator/shotwell/*.lo
 	-rm -f plugins/common/*.$(OBJEXT)
 	-rm -f plugins/common/*.lo
 	-rm -f plugins/shotwell-data-imports/*.$(OBJEXT)
@@ -2667,6 +2784,11 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shotwell-resource.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@plugins/authenticator/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-resource.Plo@am__quote@
+@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-ShotwellAuthenticatorFactory.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-RESTSupport.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-Resources.Plo@am__quote@
@@ -2932,6 +3054,41 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-ShotwellAuthenticatorFactory.lo: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.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-ShotwellAuthenticatorFactory.lo -MD -MP -MF plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-ShotwellAuthenticatorFactory.Tpo -c -o plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-ShotwellAuthenticatorFactory.lo `test -f 'plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-ShotwellAuthenticatorFactory.Tpo plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-ShotwellAuthenticatorFactory.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c' object='plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-ShotwellAuthenticatorFactory.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-ShotwellAuthenticatorFactory.lo `test -f 'plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
+
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-FacebookPublishingAuthenticator.lo: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.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-FacebookPublishingAuthenticator.lo -MD -MP -MF plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-FacebookPublishingAuthenticator.Tpo -c -o plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-FacebookPublishingAuthenticator.lo `test -f 'plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-FacebookPublishingAuthenticator.Tpo plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-FacebookPublishingAuthenticator.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c' object='plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-FacebookPublishingAuthenticator.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-FacebookPublishingAuthenticator.lo `test -f 'plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
+
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-FlickrPublishingAuthenticator.lo: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.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-FlickrPublishingAuthenticator.lo -MD -MP -MF plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-FlickrPublishingAuthenticator.Tpo -c -o plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-FlickrPublishingAuthenticator.lo `test -f 'plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-FlickrPublishingAuthenticator.Tpo plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-FlickrPublishingAuthenticator.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c' object='plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-FlickrPublishingAuthenticator.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-FlickrPublishingAuthenticator.lo `test -f 'plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
+
+plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-GoogleAuthenticator.lo: plugins/authenticator/shotwell/GoogleAuthenticator.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-GoogleAuthenticator.lo -MD -MP -MF plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-GoogleAuthenticator.Tpo -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
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-GoogleAuthenticator.Tpo plugins/authenticator/shotwell/$(DEPDIR)/plugins_authenticator_libshotwell_authenticator_la-GoogleAuthenticator.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/authenticator/shotwell/GoogleAuthenticator.c' object='plugins/authenticator/shotwell/plugins_authenticator_libshotwell_authenticator_la-GoogleAuthenticator.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-GoogleAuthenticator.lo `test -f 'plugins/authenticator/shotwell/GoogleAuthenticator.c' || echo '$(srcdir)/'`plugins/authenticator/shotwell/GoogleAuthenticator.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
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins/authenticator/resource.c' object='plugins/authenticator/plugins_authenticator_libshotwell_authenticator_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_authenticator_libshotwell_authenticator_la_CFLAGS) $(CFLAGS) -c -o plugins/authenticator/plugins_authenticator_libshotwell_authenticator_la-resource.lo `test -f 'plugins/authenticator/resource.c' || echo '$(srcdir)/'`plugins/authenticator/resource.c
+
 plugins/common/plugins_common_libshotwell_plugin_common_la-RESTSupport.lo: plugins/common/RESTSupport.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-RESTSupport.lo -MD -MP -MF plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-RESTSupport.Tpo -c -o plugins/common/plugins_common_libshotwell_plugin_common_la-RESTSupport.lo `test -f 'plugins/common/RESTSupport.c' || echo '$(srcdir)/'`plugins/common/RESTSupport.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-RESTSupport.Tpo plugins/common/$(DEPDIR)/plugins_common_libshotwell_plugin_common_la-RESTSupport.Plo
@@ -6937,122 +7094,29 @@ $(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/common/RESTSupport.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/common/Resources.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/common/WebAuthenticationPane.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/common/BuilderPane.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
-	fi
-$(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp: plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/common/BuilderPane.vala plugins/shotwell-plugin-dev-1.0.vapi
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_common_libshotwell_plugin_common_la_VALAFLAGS) $(VALAFLAGS) -C plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/common/BuilderPane.vala plugins/shotwell-plugin-dev-1.0.vapi
-	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
-	fi
-$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
-	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
-	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
-	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
-	fi
-$(srcdir)/plugins/shotwell-publishing/FacebookPublishing.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/PicasaPublishing.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
+$(srcdir)/src/plugins/SpitInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-publishing/FlickrPublishing.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
+$(srcdir)/src/plugins/TransitionsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_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
+$(srcdir)/src/plugins/PublishingInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_la_vala.stamp; \
 	fi
-$(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.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
+$(srcdir)/src/plugins/DataImportsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
 	@if test -f $@; then :; else \
-	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/src_plugins_libplugin_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
+$(srcdir)/src_plugins_libplugin_la_vala.stamp: src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-publishing/shotwell-publishing.vala plugins/shotwell-publishing/FacebookPublishing.vala plugins/shotwell-publishing/PicasaPublishing.vala plugins/shotwell-publishing/FlickrPublishing.vala plugins/shotwell-publishing/YouTubePublishing.vala plugins/shotwell-publishing/PiwigoPublishing.vala plugins/shotwell-plugin-common.vapi
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_plugins_libplugin_la_VALAFLAGS) $(VALAFLAGS) -C src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala
 	$(AM_V_at)mv -f $@-t $@
 $(srcdir)/plugins/shotwell-publishing-extras/GalleryConnector.c: $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp
 	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_vala.stamp; fi
@@ -7157,29 +7221,146 @@ $(srcdir)/plugins_shotwell_data_imports_shotwell_data_imports_la_vala.stamp: plu
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
 	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_data_imports_shotwell_data_imports_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala plugins/shotwell-data-imports/FSpotDatabaseTable.vala plugins/shotwell-data-imports/FSpotDatabase.vala plugins/shotwell-data-imports/FSpotImporter.vala plugins/shotwell-data-imports/FSpotMetaTable.vala plugins/shotwell-data-imports/FSpotPhotosTable.vala plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala plugins/shotwell-data-imports/FSpotRollsTable.vala plugins/shotwell-data-imports/FSpotTableBehavior.vala plugins/shotwell-data-imports/FSpotTagsTable.vala plugins/shotwell-data-imports/shotwell-data-imports.vala plugins/shotwell-data-imports/SqliteSupport.vala plugins/shotwell-data-imports/VersionNumber.vala plugins/shotwell-plugin-common.vapi
 	$(AM_V_at)mv -f $@-t $@
-$(srcdir)/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
+$(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)/src_plugins_libplugin_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
 	fi
-$(srcdir)/src/plugins/TransitionsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
+$(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)/src_plugins_libplugin_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
 	fi
-$(srcdir)/src/plugins/PublishingInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
+$(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)/src_plugins_libplugin_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
 	fi
-$(srcdir)/src/plugins/DataImportsInterfaces.c: $(srcdir)/src_plugins_libplugin_la_vala.stamp
-	@if test -f $@; then :; else rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp; fi
+$(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)/src_plugins_libplugin_la_vala.stamp; \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_authenticator_libshotwell_authenticator_la_vala.stamp; \
 	fi
-$(srcdir)/src_plugins_libplugin_la_vala.stamp: src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala
+$(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
 	$(AM_V_at)rm -f $@ && echo stamp > $@-t
-	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(src_plugins_libplugin_la_VALAFLAGS) $(VALAFLAGS) -C src/plugins/SpitInterfaces.vala src/plugins/TransitionsInterfaces.vala src/plugins/PublishingInterfaces.vala src/plugins/DataImportsInterfaces.vala
+	$(AM_V_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_at)mv -f $@-t $@
+$(srcdir)/plugins/common/RESTSupport.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/common/Resources.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/common/WebAuthenticationPane.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/common/BuilderPane.c: $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp; \
+	fi
+$(srcdir)/plugins_common_libshotwell_plugin_common_la_vala.stamp: plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/common/BuilderPane.vala plugins/shotwell-plugin-dev-1.0.vapi
+	$(AM_V_at)rm -f $@ && echo stamp > $@-t
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_common_libshotwell_plugin_common_la_VALAFLAGS) $(VALAFLAGS) -C plugins/common/RESTSupport.vala plugins/common/Resources.vala plugins/common/WebAuthenticationPane.vala plugins/common/BuilderPane.vala plugins/shotwell-plugin-dev-1.0.vapi
+	$(AM_V_at)mv -f $@-t $@
+$(srcdir)/plugins/shotwell-transitions/BlindsEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/ChessEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/CircleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/CirclesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/ClockEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/CrumbleEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/FadeEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/shotwell-transitions.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/SlideEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/SquaresEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-transitions/StripesEffect.c: $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp; \
+	fi
+$(srcdir)/plugins_shotwell_transitions_shotwell_transitions_la_vala.stamp: plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
+	$(AM_V_at)rm -f $@ && echo stamp > $@-t
+	$(AM_V_VALAC)$(am__cd) $(srcdir) && $(VALAC) $(plugins_shotwell_transitions_shotwell_transitions_la_VALAFLAGS) $(VALAFLAGS) -C plugins/shotwell-transitions/BlindsEffect.vala plugins/shotwell-transitions/ChessEffect.vala plugins/shotwell-transitions/CircleEffect.vala plugins/shotwell-transitions/CirclesEffect.vala plugins/shotwell-transitions/ClockEffect.vala plugins/shotwell-transitions/CrumbleEffect.vala plugins/shotwell-transitions/FadeEffect.vala plugins/shotwell-transitions/shotwell-transitions.vala plugins/shotwell-transitions/SlideEffect.vala plugins/shotwell-transitions/SquaresEffect.vala plugins/shotwell-transitions/StripesEffect.vala plugins/shotwell-plugin-common.vapi
+	$(AM_V_at)mv -f $@-t $@
+$(srcdir)/plugins/shotwell-publishing/shotwell-publishing.c: $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp
+	@if test -f $@; then :; else rm -f $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; fi
+	@if test -f $@; then :; else \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-publishing/FacebookPublishing.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/PicasaPublishing.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/FlickrPublishing.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 \
+	  $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/plugins_shotwell_publishing_shotwell_publishing_la_vala.stamp; \
+	fi
+$(srcdir)/plugins/shotwell-publishing/PiwigoPublishing.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_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
+	$(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_at)mv -f $@-t $@
 
 mostlyclean-libtool:
@@ -7187,6 +7368,8 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
+	-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
@@ -7553,6 +7736,10 @@ 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)
+	-rm -f plugins/authenticator/$(DEPDIR)/$(am__dirstamp)
+	-rm -f plugins/authenticator/$(am__dirstamp)
+	-rm -f plugins/authenticator/shotwell/$(DEPDIR)/$(am__dirstamp)
+	-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)
@@ -7613,6 +7800,10 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f $(srcdir)/plugins/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/ShotwellAuthenticatorFactory.c
 	-rm -f $(srcdir)/plugins/common/BuilderPane.c
 	-rm -f $(srcdir)/plugins/common/RESTSupport.c
 	-rm -f $(srcdir)/plugins/common/Resources.c
@@ -7653,6 +7844,7 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/plugins/shotwell-transitions/SquaresEffect.c
 	-rm -f $(srcdir)/plugins/shotwell-transitions/StripesEffect.c
 	-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
@@ -7857,6 +8049,10 @@ maintainer-clean-generic:
 	-rm -f $(srcdir)/src_plugins_libplugin_la_vala.stamp
 	-rm -f $(srcdir)/thumbnailer/shotwell-video-thumbnailer.c
 	-rm -f $(srcdir)/thumbnailer_shotwell_video_thumbnailer_vala.stamp
+	-rm -f plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
+	-rm -f plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
+	-rm -f plugins/authenticator/shotwell/GoogleAuthenticator.c
+	-rm -f plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
 	-rm -f plugins/common/BuilderPane.c
 	-rm -f plugins/common/RESTSupport.c
 	-rm -f plugins/common/Resources.c
@@ -8102,7 +8298,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
 
 distclean: distclean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf ./$(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-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 -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-libtool distclean-tags
@@ -8151,7 +8347,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-recursive
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf ./$(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-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 -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
@@ -8233,6 +8429,15 @@ resource.c: org.gnome.Shotwell.gresource.xml $(shotwell_resource_deps)
 		--sourcedir=$(abs_top_srcdir) \
 		--generate $<
 
+plugins/authenticator/shotwell-authenticator.vapi plugins/authenticator/shotwell-authenticator.h: \
+	plugins_authenticator_libshotwell_authenticator_la_vala.stamp
+
+plugins/authenticator/resource.c: $(AUTHENTICATOR_RESOURCE_DEPS) $(AUTHENTICATOR_RESOURCE_FILE)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \
+		--target=$@ \
+		--sourcedir=$(AUTHENTICATOR_RESOURCE_SOURCEDIR) \
+		--generate $(AUTHENTICATOR_RESOURCE_FILE)
+
 plugins/shotwell-publishing/resource.c: $(PUBLISHING_RESOURCE_DEPS) $(PUBLISHING_RESOURCE_FILE)
 	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \
 		--target=$@ \
diff --git a/NEWS b/NEWS
index fdfd919..82eba85 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,132 @@
+Shotwell 0.26.0 - 20 Mar 2017
+  * Translation updates
+  * Fix build on non-glibc systems
+  * Fix missing optimisation in standard configure call
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=779844
+ - https://bugzilla.gnome.org/show_bug.cgi?id=780116
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+ - Piotr Drąg <piotrdrag@gmail.com>
+ - Mario Blättermann <mario.blaettermann@gmail.com>
+ - Marek Černocký <marek@manet.cz>
+ - Josef Andersson <l10nl18nsweja@gmail.com>
+ - gogo <trebelnik2@gmail.com>
+ - Daniel Mustieles <daniel.mustieles@gmail.com>
+ - Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+ - Balázs Úr <urbalazs@gmail.com>
+
+Added/updated translations
+ - cs, courtesy of Marek Černocký
+ - de, courtesy of Mario Blättermann
+ - es, courtesy of Daniel Mustieles
+ - hr, courtesy of gogo
+ - hu, courtesy of Balázs Úr
+ - kk, courtesy of Baurzhan Muftakhidinov
+ - lv, courtesy of Rūdolfs Mazurs
+ - pl, courtesy of Piotr Drąg
+ - sv, courtesy of Josef Andersson
+
+Shotwell 0.25.92 - 13 Mar 2017
+  * Fix navigation issue when deleting image in fullscreen view
+  * Fix toolbox not visible on Mate in fullscreen view
+  * Fix navigation in viewer when saving modified photo
+  * Fix wrong macro in manpage
+  * Clean-up some dependencies
+  * Make it possible to enable/disable individual publishers
+  * Remove obsolete UI file
+  * Move all icons in the resource file
+  * Move ui files into resources
+  * Remove obsolete Glade helpers
+  * Clean-up printing dialog a little
+  * Piwigo: Append .jpg extension to published raw files
+  * Fix keyboard accessibility of CCW rotation
+  * Fix massive memory consumption when importing videos
+  * Fix context menu of viewer
+  * Fix a useless string copy
+  * Use default measurements depending on locale when none are set
+  * Translation updates
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=715501
+ - https://bugzilla.gnome.org/show_bug.cgi?id=729091
+ - https://bugzilla.gnome.org/show_bug.cgi?id=732663
+ - https://bugzilla.gnome.org/show_bug.cgi?id=734816
+ - https://bugzilla.gnome.org/show_bug.cgi?id=775158
+ - https://bugzilla.gnome.org/show_bug.cgi?id=779558
+ - https://bugzilla.gnome.org/show_bug.cgi?id=779844
+ - https://bugzilla.gnome.org/show_bug.cgi?id=779989
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+ - Мирослав Николић <miroslavnikolic@rocketmail.com>
+ - Mario Blättermann <mario.blaettermann@gmail.com>
+ - Jörg Frings-Fürst <debian@jff-webhosting.net>
+ - Jordi Mas <jmas@softcatala.org>
+ - GNOME Translation Robot <gnome-sysadmin@gnome.org>
+ - Gábor Kelemen <kelemeng@openscope.org>
+ - Baurzhan Muftakhidinov <baurthefirst@gmail.com>
+ - Anders Jonsson <anders.jonsson@norsjovallen.se>
+
+Added/updated translations
+ - ca, courtesy of Jordi Mas
+ - de, courtesy of Mario Blättermann
+ - gd, courtesy of GunChleoc
+ - hu, courtesy of Gabor Kelemen
+ - kk, courtesy of Baurzhan Muftakhidinov
+ - sr, courtesy of Мирослав Николић
+ - sr@latin, courtesy of Miroslav Nikolić
+
+Shotwell 0.25.90 - 27 Feb 2017
+  * Remove obsolete option to create new folders on Picasa web albums
+  * Update Google API keys
+  * Fix Youtube upload by porting to libgdata
+  * Use embedded thumbnails in RAW files when default developer is set to
+    Camera
+  * Remove accidental raw development while importing
+  * Fix "Export" menu accidentally being labelled as "Save As"
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=717305
+ - https://bugzilla.gnome.org/show_bug.cgi?id=718248
+ - https://bugzilla.gnome.org/show_bug.cgi?id=777910
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+ - Мирослав Николић <miroslavnikolic@rocketmail.com>
+ - Piotr Drąg <piotrdrag@gmail.com>
+ - Jiri Grönroos <jiri.gronroos@iki.fi>
+
+Added/updated translations
+ - fi, courtesy of Jiri Grönroos
+ - pl, courtesy of Piotr Drąg
+ - sr, courtesy of Мирослав Николић
+ - sr@latin, courtesy of Miroslav Nikolić
+
+Shotwell 0.25.5 - 31 Feb 2017
+  * Fix setting of gamma value and color matrix in libraw
+  * Extract web publishing authenticators into separate library. That should
+    make it possible to easily support UOA and GOA without patching Shotwell.
+  * Translation updates
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=778174
+
+All contributors to this release:
+ - Jens Georg <mail@jensge.org>
+ - Debarshi Ray <debarshir@gnome.org>
+ - Piotr Drąg <piotrdrag@gmail.com>
+ - Enrico Nicoletto <liverig@gmail.com>
+ - Anders Jonsson <anders.jonsson@norsjovallen.se>
+ - Alan Mortensen <alanmortensen.am@gmail.com>
+
+Added/updated translations
+ - da, courtesy of Alan Mortensen
+ - pt_BR, courtesy of Enrico Nicoletto
+ - sv, courtesy of Anders Jonsson
+
 Shotwell 0.25.4 - 31 Jan 2017
   * Publishing: Use HTTPS everywhere
   * Translation updates
@@ -24,7 +153,7 @@ Shotwell 0.25.3 - 16 Jan 2017
   * Fix toolbar in camera import page
   * Update glade files for all publishers
   * Flickr: Simplify OAuth parsing by using libsoup
-  * Fix accellerators not coming from menu model
+  * Fix accelerators not coming from menu model
   * Add <Ctrl>-f as shortcut for search bar
   * Remove AppMenu, needs more thinking about the design.
   * Flickr: Use human-readable size of upload quota
@@ -73,7 +202,7 @@ Added/updated translations
 Shotwell 0.25.2 - 12 Dec 2016
   * Fix missing About action
   * Fix setting of initial action state
-  * Fix missing initialzation of several states
+  * Fix missing initialization of several states
   * Fix sort order not working
   * Fix a critical on startup
   * Fix initial sort order
@@ -82,7 +211,7 @@ Shotwell 0.25.2 - 12 Dec 2016
   * Use Gtk.Revealer for bottom toolbar
   * Fix a copy and paste error in the publishing result
   * Use Application menu
-  * Do not make errors in git version check cause false identifiaction of git
+  * Do not make errors in git version check cause false identification of git
     versions
   * Fix debian scripts
   * Fix filter actions not being active
@@ -128,7 +257,7 @@ Shotwell 0.25.1 - 21 Nov 2016
   * Update Piwigo dialogs
   * Remove most of the deprecated API calls for GTK+ <= 3.14
   * Remove some useless warnings generated by Vala
-  * Refactor Plugins to use a common aproach to load panes from glade
+  * Refactor Plugins to use a common approach to load panes from glade
   * Piwigo: Simplify category parsing
   * Remove GtkUIManager and Gtk*Action* from code
   * Fix a crash when clicking on tool window under Wayland
diff --git a/aclocal.m4 b/aclocal.m4
index 5090192..cdacdf4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -20,6 +20,97 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
+# appdata-xml.m4
+#
+# serial 5
+
+dnl APPDATA_XML
+dnl Installs and validates AppData XML files.
+dnl
+dnl Call APPDATA_XML in configure.ac to check for the appdata-validate tool.
+dnl Add @APPDATA_XML_RULES@ to a Makefile.am to substitute the make rules. Add
+dnl .appdata.xml files to appdata_XML in Makefile.am and they will be validated
+dnl at make check time, if appdata-validate is installed, as well as installed
+dnl to the correct location automatically. Add --enable-appdata-validate to
+dnl DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when
+dnl doing a distcheck.
+dnl
+dnl Adding files to appdata_XML does not distribute them automatically.
+
+AU_DEFUN([APPDATA_XML],
+[
+  m4_pattern_allow([AM_V_GEN])
+  AC_ARG_ENABLE([appdata-validate],
+                [AS_HELP_STRING([--disable-appdata-validate],
+                                [Disable validating AppData XML files during check phase])])
+
+  AS_IF([test "x$enable_appdata_validate" != "xno"],
+        [AC_PATH_PROG([APPSTREAM_UTIL], [appstream-util])
+         AS_IF([test "x$APPSTREAM_UTIL" = "x"],
+               [have_appdata_validate=no],
+               [have_appdata_validate=yes
+                AC_SUBST([APPSTREAM_UTIL])])],
+        [have_appdata_validate=no])
+
+  AS_IF([test "x$have_appdata_validate" != "xno"],
+        [appdata_validate=yes],
+        [appdata_validate=no
+         AS_IF([test "x$enable_appdata_validate" = "xyes"],
+               [AC_MSG_ERROR([AppData validation was requested but appstream-util was not found])])])
+
+  AC_SUBST([appdataxmldir], [${datadir}/appdata])
+
+  APPDATA_XML_RULES='
+.PHONY : uninstall-appdata-xml install-appdata-xml clean-appdata-xml
+
+mostlyclean-am: clean-appdata-xml
+
+%.appdata.valid: %.appdata.xml
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \
+		if test -n "$(APPSTREAM_UTIL)"; \
+			then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \
+		&& touch [$]@
+
+check-am: $(appdata_XML:.appdata.xml=.appdata.valid)
+uninstall-am: uninstall-appdata-xml
+install-data-am: install-appdata-xml
+
+.SECONDARY: $(appdata_XML)
+
+install-appdata-xml: $(appdata_XML)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(appdataxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appdataxmldir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(appdataxmldir)"; \
+	fi
+
+uninstall-appdata-xml:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(appdata_XML)'\''; test -n "$(appdataxmldir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(appdataxmldir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(appdataxmldir)" && rm -f $$files
+
+clean-appdata-xml:
+	rm -f $(appdata_XML:.appdata.xml=.appdata.valid)
+'
+  _APPDATA_XML_SUBST(APPDATA_XML_RULES)
+],
+[Use the new APPSTREAM_XML macro instead of APPDATA_XML in configure.ac, and
+ replace @APPDATA_XML_RULES@ with @APPSTREAM_XML_RULES@, appdata_XML with
+ appstream_XML and --enable-appdata-validate with --enable-appstream-validate
+ in Makefile.am])
+
+dnl _APPDATA_XML_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_APPDATA_XML_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
 # Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -1224,8 +1315,6 @@ AC_DEFUN([AM_PROG_VALAC],
       m4_default([$2], [:])
     fi])
 
-m4_include([m4/appdata-xml.m4])
-m4_include([m4/ax_check_enable_debug.m4])
 m4_include([m4/ax_generate_changelog.m4])
 m4_include([m4/ax_is_release.m4])
 m4_include([m4/ax_require_defined.m4])
diff --git a/app-icons/Makefile.in b/app-icons/Makefile.in
index 0f72c8c..d9848a4 100644
--- a/app-icons/Makefile.in
+++ b/app-icons/Makefile.in
@@ -90,9 +90,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = app-icons
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \
-	$(top_srcdir)/m4/ax_check_enable_debug.m4 \
-	$(top_srcdir)/m4/ax_generate_changelog.m4 \
+am__aclocal_m4_deps = $(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 \
@@ -179,6 +177,9 @@ 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@
@@ -266,6 +267,7 @@ 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@
diff --git a/authenticator.am b/authenticator.am
new file mode 100644
index 0000000..abc0fa3
--- /dev/null
+++ b/authenticator.am
@@ -0,0 +1,58 @@
+lib_LTLIBRARIES += plugins/authenticator/libshotwell-authenticator.la
+
+dist_noinst_DATA += \
+	plugins/authenticator/shotwell/flickr_pin_entry_pane.ui \
+	plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml \
+	plugins/authenticator/shotwell-authenticator.h
+
+plugins/authenticator/shotwell-authenticator.vapi plugins/authenticator/shotwell-authenticator.h: \
+	plugins_authenticator_libshotwell_authenticator_la_vala.stamp
+
+plugins_authenticator_libshotwell_authenticator_la_SOURCES = \
+	plugins/shotwell-plugin-common.vapi \
+	plugins/shotwell-plugin-dev-1.0.vapi
+
+plugins_authenticator_libshotwell_authenticator_la_VALAFLAGS = \
+	$(COMMON_VALAFLAGS) \
+	--library shotwell-authenticator \
+	--vapi=plugins/authenticator/shotwell-authenticator.vapi \
+	--header=plugins/authenticator/shotwell-authenticator.h \
+	$(AUTHENTICATOR_PACKAGES) \
+	--vapidir $(abs_top_srcdir)/plugins
+
+plugins_authenticator_libshotwell_authenticator_la_LIBADD = \
+	$(AUTHENTICATOR_LIBS) \
+	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
+
+plugins_authenticator_libshotwell_authenticator_la_CFLAGS = \
+	$(COMMON_CFLAGS) \
+	$(AUTHENTICATOR_CFLAGS) \
+	-I $(top_srcdir)/plugins \
+	-DPLUGIN_RESOURCE_PATH='"/org/gnome/Shotwell/Authenticator"'
+
+## Resource handling
+
+nodist_plugins_authenticator_libshotwell_authenticator_la_SOURCES = \
+	plugins/authenticator/resource.c
+MOSTLYCLEANFILES += plugins/authenticator/resource.c
+
+AUTHENTICATOR_RESOURCE_DEPS = $(shell $(GLIB_COMPILE_RESOURCES) \
+		--sourcedir=$(AUTHENTICATOR_RESOURCE_SOURCEDIR) \
+		--generate-dependencies $(AUTHENTICATOR_SHOTWELL_RESOURCE_FILE))
+
+plugins/authenticator/resource.c: $(AUTHENTICATOR_RESOURCE_DEPS) $(AUTHENTICATOR_RESOURCE_FILE)
+	$(AM_V_GEN)$(GLIB_COMPILE_RESOURCES) \
+		--target=$@ \
+		--sourcedir=$(AUTHENTICATOR_RESOURCE_SOURCEDIR) \
+		--generate $(AUTHENTICATOR_RESOURCE_FILE)
+
+if AUTHENTICATOR_SHOTWELL
+AUTHENTICATOR_RESOURCE_FILE := $(abs_top_srcdir)/plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml
+AUTHENTICATOR_RESOURCE_SOURCEDIR := $(abs_top_srcdir)/plugins/authenticator/shotwell
+
+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
+endif
diff --git a/autogen.sh b/autogen.sh
index abadb9a..988d5bc 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,7 +22,6 @@ if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
 	echo "" >&2
 fi
 
-aclocal --install || exit 1
 autoreconf --verbose --force --install || exit 1
 
 cd "$olddir"
diff --git a/config.h.in b/config.h.in
index 02be145..24f46a9 100644
--- a/config.h.in
+++ b/config.h.in
@@ -7,15 +7,6 @@
 /* GETTEXT package name */
 #undef GETTEXT_PACKAGE
 
-/* Define if debugging is enabled */
-#undef G_DISABLE_ASSERT
-
-/* Define if debugging is enabled */
-#undef G_DISABLE_CAST_CHECKS
-
-/* Define if debugging is enabled */
-#undef G_DISABLE_CHECKS
-
 /* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
    CoreFoundation framework. */
 #undef HAVE_CFLOCALECOPYCURRENT
@@ -67,9 +58,6 @@
 /* Define to the sub-directory where libtool stores uninstalled libraries. */
 #undef LT_OBJDIR
 
-/* Define if debugging is disabled */
-#undef NDEBUG
-
 /* Name of package */
 #undef PACKAGE
 
diff --git a/configure b/configure
index dcbaf56..d410845 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for shotwell 0.25.4.
+# Generated by GNU Autoconf 2.69 for shotwell 0.26.0.
 #
 # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell>.
 #
@@ -650,8 +650,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='shotwell'
 PACKAGE_TARNAME='shotwell'
-PACKAGE_VERSION='0.25.4'
-PACKAGE_STRING='shotwell 0.25.4'
+PACKAGE_VERSION='0.26.0'
+PACKAGE_STRING='shotwell 0.26.0'
 PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell'
 PACKAGE_URL=''
 
@@ -729,12 +729,16 @@ LIBTOOL
 HAVE_EXTRA_PLUGINS_FALSE
 HAVE_EXTRA_PLUGINS_TRUE
 HAVE_EXTRA_PLUGINS
+PUBLISHER_VALAFLAGS
 HAVE_UNITY_FALSE
 HAVE_UNITY_TRUE
 HAVE_UNITY
 UNITY_VALAFLAGS
 UNITY_LIBS
 UNITY_CFLAGS
+AUTHENTICATOR_PACKAGES
+AUTHENTICATOR_LIBS
+AUTHENTICATOR_CFLAGS
 TRANSITIONS_LIBS
 TRANSITIONS_CFLAGS
 PUBLISHING_LIBS
@@ -747,6 +751,12 @@ THUMBNAILER_LIBS
 THUMBNAILER_CFLAGS
 SHOTWELL_LIBS
 SHOTWELL_CFLAGS
+AUTHENTICATOR_UOA_FALSE
+AUTHENTICATOR_UOA_TRUE
+AUTHENTICATOR_GOA_FALSE
+AUTHENTICATOR_GOA_TRUE
+AUTHENTICATOR_SHOTWELL_FALSE
+AUTHENTICATOR_SHOTWELL_TRUE
 VALAFLAGS
 GSETTINGS_RULES
 GLIB_COMPILE_SCHEMAS
@@ -795,6 +805,8 @@ GETTEXT_MACRO_VERSION
 USE_NLS
 SED
 GETTEXT_PACKAGE
+IS_NDEBUG_FALSE
+IS_NDEBUG_TRUE
 GENERATE_CHANGELOG_RULES
 GIT
 MAINT
@@ -895,7 +907,9 @@ enable_rpath
 with_libiconv_prefix
 with_libintl_prefix
 enable_schemas_compile
+with_authenticator
 enable_unity_support
+enable_publishers
 enable_extra_plugins
 enable_shared
 enable_static
@@ -931,6 +945,8 @@ PUBLISHING_CFLAGS
 PUBLISHING_LIBS
 TRANSITIONS_CFLAGS
 TRANSITIONS_LIBS
+AUTHENTICATOR_CFLAGS
+AUTHENTICATOR_LIBS
 UNITY_CFLAGS
 UNITY_LIBS
 LT_SYS_LIBRARY_PATH
@@ -1486,7 +1502,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures shotwell 0.25.4 to adapt to many kinds of systems.
+\`configure' configures shotwell 0.26.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1557,7 +1573,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of shotwell 0.25.4:";;
+     short | recursive ) echo "Configuration of shotwell 0.26.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1570,8 +1586,8 @@ Optional Features:
   --disable-maintainer-mode
                           disable make rules and dependencies not useful (and
                           sometimes confusing) to the casual installer
-  --enable-debug=[yes/info/profile/no]
-                          compile with debugging
+  --enable-debug          compile with debugging,
+              , enable_debug=no
   --disable-nls           do not use Native Language Support
   --enable-dependency-tracking
                           do not reject slow dependency extractors
@@ -1581,6 +1597,9 @@ Optional Features:
   --disable-schemas-compile
                           Disable regeneration of gschemas.compiled on install
   --enable-unity-support  Enable Ubuntu Unity integration
+  --enable-publishers=[list-of-publishers or all]
+                          A comma-separated list of publishers from
+                          facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex
   --disable-extra-plugins Enable building and installation of extra publishing
                           plugins
   --enable-shared[=PKGS]  build shared libraries [default=yes]
@@ -1600,6 +1619,9 @@ Optional Packages:
   --without-libiconv-prefix     don't search for libiconv in includedir and libdir
   --with-libintl-prefix[=DIR]  search for libintl in DIR/include and DIR/lib
   --without-libintl-prefix     don't search for libintl in includedir and libdir
+  --with-authenticator=[shotwell]
+                           Which authentication back-end to use (defaul: shotwell)
+
   --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-aix-soname=aix|svr4|both
@@ -1646,6 +1668,10 @@ Some influential environment variables:
               C compiler flags for TRANSITIONS, overriding pkg-config
   TRANSITIONS_LIBS
               linker flags for TRANSITIONS, overriding pkg-config
+  AUTHENTICATOR_CFLAGS
+              C compiler flags for AUTHENTICATOR, overriding pkg-config
+  AUTHENTICATOR_LIBS
+              linker flags for AUTHENTICATOR, overriding pkg-config
   UNITY_CFLAGS
               C compiler flags for UNITY, overriding pkg-config
   UNITY_LIBS  linker flags for UNITY, overriding pkg-config
@@ -1720,7 +1746,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-shotwell configure 0.25.4
+shotwell configure 0.26.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1998,7 +2024,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by shotwell $as_me 0.25.4, which was
+It was created by shotwell $as_me 0.26.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2457,14 +2483,14 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 MAJOR_VERSION=0
 
-MINOR_VERSION=25
+MINOR_VERSION=26
 
-MICRO_VERSION=4
+MICRO_VERSION=0
 
 API_VERSION=0
 
 
-GITVER=8d2e927e78abb7699f1e9c8e9fd60119ea01999a
+GITVER=b83a820fc0a3f85f22484f3275adf086ad8e2ca3
 
 
  if test "x$GITVER" != "x"; then
@@ -2962,7 +2988,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='shotwell'
- VERSION='0.25.4'
+ VERSION='0.26.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3279,105 +3305,22 @@ dist-ChangeLog:
 
 
 
-
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable debugging" >&5
-$as_echo_n "checking whether to enable debugging... " >&6; }
-
-    ax_enable_debug_default=no
-    ax_enable_debug_is_release=$ax_is_release
-
-    # If this is a release, override the default.
-    if test "$ax_enable_debug_is_release" = "yes"; then :
-  ax_enable_debug_default="no"
-fi
-
-
-
-
-    # Check whether --enable-debug was given.
+# Check whether --enable-debug was given.
 if test "${enable_debug+set}" = set; then :
   enableval=$enable_debug;
-else
-  enable_debug=$ax_enable_debug_default
 fi
 
-
-    # empty mean debug yes
-    if test "x$enable_debug" = "x"; then :
-  enable_debug="yes"
-fi
-
-    # case of debug
-    case $enable_debug in #(
-  yes) :
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	CFLAGS="${CFLAGS} -g -O0"
-	CXXFLAGS="${CXXFLAGS} -g -O0"
-	FFLAGS="${FFLAGS} -g -O0"
-	FCFLAGS="${FCFLAGS} -g -O0"
-	OBJCFLAGS="${OBJCFLAGS} -g -O0"
-       ;; #(
-  info) :
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: info" >&5
-$as_echo "info" >&6; }
-	CFLAGS="${CFLAGS} -g"
-	CXXFLAGS="${CXXFLAGS} -g"
-	FFLAGS="${FFLAGS} -g"
-	FCFLAGS="${FCFLAGS} -g"
-	OBJCFLAGS="${OBJCFLAGS} -g"
-       ;; #(
-  profile) :
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: profile" >&5
-$as_echo "profile" >&6; }
-	CFLAGS="${CFLAGS} -g -pg"
-	CXXFLAGS="${CXXFLAGS} -g -pg"
-	FFLAGS="${FFLAGS} -g -pg"
-	FCFLAGS="${FCFLAGS} -g -pg"
-	OBJCFLAGS="${OBJCFLAGS} -g -pg"
-	LDFLAGS="${LDFLAGS} -pg"
-       ;; #(
-  *) :
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-			if test "x${CFLAGS+set}" != "xset"; then :
-  CFLAGS=""
-fi
-	if test "x${CXXFLAGS+set}" != "xset"; then :
-  CXXFLAGS=""
+enable_debug=${enable_debug-no}
+if test "x$enable_debug" = "xyes"; then :
+  CFLAGS="${CFLAGS} -g -O0"
 fi
-	if test "x${FFLAGS+set}" != "xset"; then :
-  FFLAGS=""
-fi
-	if test "x${FCFLAGS+set}" != "xset"; then :
-  FCFLAGS=""
-fi
-	if test "x${OBJCFLAGS+set}" != "xset"; then :
-  OBJCFLAGS=""
-fi
-       ;;
-esac
-
-            if test "x$enable_debug" = "xyes"; then :
-
-$as_echo "#define G_DISABLE_ASSERT /**/" >>confdefs.h
-
-$as_echo "#define G_DISABLE_CHECKS /**/" >>confdefs.h
-
-$as_echo "#define G_DISABLE_CAST_CHECKS /**/" >>confdefs.h
-
+ if test "x$enable_debug" != "xyes"; then
+  IS_NDEBUG_TRUE=
+  IS_NDEBUG_FALSE='#'
 else
-
-$as_echo "#define NDEBUG /**/" >>confdefs.h
-
+  IS_NDEBUG_TRUE='#'
+  IS_NDEBUG_FALSE=
 fi
-    ax_enable_debug=$enable_debug
-
 
 
 GETTEXT_PACKAGE=shotwell
@@ -5904,21 +5847,16 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
 
   ;
   return 0;
@@ -6671,25 +6609,20 @@ else
 /* end confdefs.h.  */
 
 #include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
 
   ;
   return 0;
@@ -6708,25 +6641,20 @@ rm -f core conftest.err conftest.$ac_objext \
 /* end confdefs.h.  */
 
 #include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
 
 int
 main ()
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
 
   ;
   return 0;
@@ -8014,6 +7942,46 @@ VALAFLAGS="-g"
 
 
 
+# Check whether --with-authenticator was given.
+if test "${with_authenticator+set}" = set; then :
+  withval=$with_authenticator; with_authenticator=$withval
+else
+  with_authenticator=shotwell
+fi
+
+if test "x$with_authenticator" != "xshotwell"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: Unknown authenticator $with_authenticator, using shotwell" >&5
+$as_echo "$as_me: Unknown authenticator $with_authenticator, using shotwell" >&6;}
+             with_authenticator="shotwell"
+
+fi
+
+ if test "x$with_authenticator" = "xshotwell"; then
+  AUTHENTICATOR_SHOTWELL_TRUE=
+  AUTHENTICATOR_SHOTWELL_FALSE='#'
+else
+  AUTHENTICATOR_SHOTWELL_TRUE='#'
+  AUTHENTICATOR_SHOTWELL_FALSE=
+fi
+
+ if test "x$with_authenticator" = "xgoa"; then
+  AUTHENTICATOR_GOA_TRUE=
+  AUTHENTICATOR_GOA_FALSE='#'
+else
+  AUTHENTICATOR_GOA_TRUE='#'
+  AUTHENTICATOR_GOA_FALSE=
+fi
+
+ if test "x$with_authenticator" = "xuoa"; then
+  AUTHENTICATOR_UOA_TRUE=
+  AUTHENTICATOR_UOA_FALSE='#'
+else
+  AUTHENTICATOR_UOA_TRUE='#'
+  AUTHENTICATOR_UOA_FALSE=
+fi
+
+
+
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHOTWELL" >&5
 $as_echo_n "checking for SHOTWELL... " >&6; }
@@ -8037,10 +8005,8 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
                              gee-0.8 >= 0.8.5
@@ -8057,10 +8023,8 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8080,10 +8044,8 @@ if test -n "$SHOTWELL_CFLAGS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -8111,10 +8073,8 @@ if test -n "$SHOTWELL_LIBS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             \""; } >&5
   ($PKG_CONFIG --exists --print-errors "
                              gee-0.8 >= 0.8.5
@@ -8131,10 +8091,8 @@ if test -n "$SHOTWELL_LIBS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             ") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
@@ -8154,10 +8112,8 @@ if test -n "$SHOTWELL_LIBS"; then
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             " 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
@@ -8194,10 +8150,8 @@ fi
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             " 2>&1`
         else
 	        SHOTWELL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "
@@ -8215,10 +8169,8 @@ fi
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             " 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -8239,10 +8191,8 @@ fi
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             ) were not met:
 
 $SHOTWELL_PKG_ERRORS
@@ -8580,16 +8530,16 @@ if test -n "$PUBLISHING_CFLAGS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3\""; } >&5
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3") 2>&5
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PUBLISHING_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>/dev/null`
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -8603,16 +8553,16 @@ if test -n "$PUBLISHING_LIBS"; then
     if test -n "$PKG_CONFIG" && \
     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3\""; } >&5
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata\""; } >&5
   ($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3") 2>&5
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
   pkg_cv_PUBLISHING_LIBS=`$PKG_CONFIG --libs "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>/dev/null`
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -8635,18 +8585,18 @@ fi
         if test $_pkg_short_errors_supported = yes; then
 	        PUBLISHING_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>&1`
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata" 2>&1`
         else
 	        PUBLISHING_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3" 2>&1`
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$PUBLISHING_PKG_ERRORS" >&5
 
 	as_fn_error $? "Package requirements (gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3) were not met:
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata) were not met:
 
 $PUBLISHING_PKG_ERRORS
 
@@ -8780,6 +8730,122 @@ $as_echo "yes" >&6; }
 
 fi
 
+if test "x$with_authenticator" = "xshotwell"; then :
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AUTHENTICATOR" >&5
+$as_echo_n "checking for AUTHENTICATOR... " >&6; }
+
+if test -n "$AUTHENTICATOR_CFLAGS"; then
+    pkg_cv_AUTHENTICATOR_CFLAGS="$AUTHENTICATOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_AUTHENTICATOR_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$AUTHENTICATOR_LIBS"; then
+    pkg_cv_AUTHENTICATOR_LIBS="$AUTHENTICATOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_AUTHENTICATOR_LIBS=`$PKG_CONFIG --libs "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        AUTHENTICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0" 2>&1`
+        else
+	        AUTHENTICATOR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$AUTHENTICATOR_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0) were not met:
+
+$AUTHENTICATOR_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables AUTHENTICATOR_CFLAGS
+and AUTHENTICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables AUTHENTICATOR_CFLAGS
+and AUTHENTICATOR_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	AUTHENTICATOR_CFLAGS=$pkg_cv_AUTHENTICATOR_CFLAGS
+	AUTHENTICATOR_LIBS=$pkg_cv_AUTHENTICATOR_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+        AUTHENTICATOR_PACKAGES="--pkg webkit2gtk-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg gee-0.8 --pkg libxml-2.0 --pkg json-glib-1.0"
+
+
+fi
+
 # Check whether --enable-unity-support was given.
 if test "${enable_unity_support+set}" = set; then :
   enableval=$enable_unity_support;
@@ -8879,6 +8945,70 @@ else
 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"
+fi
+
+
+if test "$xenable_publishers" = "xall"; then :
+  enable_publishers="facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex"
+fi
+
+save_ifs=$IFS
+IFS=,
+PUBLISHER_VALAFLAGS=""
+ENABLED_PUBLISHERS=""
+for publisher in $enable_publishers; do
+    case $publisher in
+        *facebook*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_FACEBOOK"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS facebook"
+        ;;
+        *flickr*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_FLICKR"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS flickr"
+        ;;
+        *picasa*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_PICASA"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS picasa"
+        ;;
+        *piwigo*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_PIWIGO"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS piwigo"
+        ;;
+        *youtube*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_YOUTUBE"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS youtube"
+        ;;
+        *gallery3*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_GALLERY3"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS gallery3"
+        ;;
+        *rajce*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_RAJCE"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS rajce"
+        ;;
+        *tumblr*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_TUMBLR"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS tumblr"
+        ;;
+        *yandex*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_YANDEX"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS yandex"
+        ;;
+        *)
+        ;;
+    esac
+done
+IFS=$save_ifs
+
+
+
 # Check whether --enable-extra-plugins was given.
 if test "${enable_extra_plugins+set}" = set; then :
   enableval=$enable_extra_plugins;
@@ -17198,6 +17328,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${IS_NDEBUG_TRUE}" && test -z "${IS_NDEBUG_FALSE}"; then
+  as_fn_error $? "conditional \"IS_NDEBUG\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
   as_fn_error $? "conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -17210,6 +17344,18 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${AUTHENTICATOR_SHOTWELL_TRUE}" && test -z "${AUTHENTICATOR_SHOTWELL_FALSE}"; then
+  as_fn_error $? "conditional \"AUTHENTICATOR_SHOTWELL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${AUTHENTICATOR_GOA_TRUE}" && test -z "${AUTHENTICATOR_GOA_FALSE}"; then
+  as_fn_error $? "conditional \"AUTHENTICATOR_GOA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${AUTHENTICATOR_UOA_TRUE}" && test -z "${AUTHENTICATOR_UOA_FALSE}"; then
+  as_fn_error $? "conditional \"AUTHENTICATOR_UOA\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 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
@@ -17615,7 +17761,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by shotwell $as_me 0.25.4, which was
+This file was extended by shotwell $as_me 0.26.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17681,7 +17827,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-shotwell config.status 0.25.4
+shotwell config.status 0.26.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -19504,4 +19650,6 @@ echo "  Prefix ............................... : ${prefix}"
 echo "  Libdir ............................... : ${libdir}"
 echo "  Unity support ........................ : ${HAVE_UNITY}"
 echo "  Additional publishing plugins ........ : ${HAVE_EXTRA_PLUGINS}"
+echo "  Authentication library ............... : ${with_authenticator}"
+echo "  Publishers ........................... : ${ENABLED_PUBLISHERS}"
 echo ""
diff --git a/configure.ac b/configure.ac
index ebd74e6..21e87f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,13 +5,13 @@ dnl ***********************************************************************
 dnl Define Versioning Information
 dnl ***********************************************************************
 m4_define([major_version],[0])
-m4_define([minor_version],[25])
-m4_define([micro_version],[4])
+m4_define([minor_version],[26])
+m4_define([micro_version],[0])
 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])
 
-AX_IS_RELEASE([micro-version])
+AX_IS_RELEASE([git-directory])
 
 m4_define([git_version],[m4_esyscmd(git rev-parse HEAD 2>/dev/null)])
 
@@ -50,9 +50,12 @@ AX_GENERATE_CHANGELOG
 dnl ***********************************************************************
 dnl Add extra debugging with --enable-debug and --enable-compile-warnings
 dnl ***********************************************************************
-AX_CHECK_ENABLE_DEBUG([no],[]
-                      [G_DISABLE_ASSERT G_DISABLE_CHECKS G_DISABLE_CAST_CHECKS])
-
+AC_ARG_ENABLE(debug,
+              [AS_HELP_STRING([--enable-debug],[compile with debugging]),
+              [], enable_debug=no])
+enable_debug=${enable_debug-no}
+AS_IF([test "x$enable_debug" = "xyes"],[CFLAGS="${CFLAGS} -g -O0"])
+AM_CONDITIONAL([IS_NDEBUG], [test "x$enable_debug" != "xyes"])
 
 dnl ***********************************************************************
 dnl Internationalization
@@ -81,6 +84,23 @@ VALAFLAGS="-g"
 AC_SUBST([VALAFLAGS])
 
 dnl ***********************************************************************
+dnl Check for authenticator
+dnl ***********************************************************************
+AC_ARG_WITH([authenticator],
+            AS_HELP_STRING([--with-authenticator=@<:@shotwell@:>@]
+                           [Which authentication back-end to use (defaul: shotwell)]),
+                           [with_authenticator=$withval],
+                           [with_authenticator=shotwell])
+AS_IF([test "x$with_authenticator" != "xshotwell"],
+            [AC_MSG_NOTICE([Unknown authenticator $[]with_authenticator, using shotwell])
+             with_authenticator="shotwell"
+            ])
+
+AM_CONDITIONAL([AUTHENTICATOR_SHOTWELL],[test "x$with_authenticator" = "xshotwell"])
+AM_CONDITIONAL([AUTHENTICATOR_GOA],[test "x$with_authenticator" = "xgoa"])
+AM_CONDITIONAL([AUTHENTICATOR_UOA],[test "x$with_authenticator" = "xuoa"])
+
+dnl ***********************************************************************
 dnl Check for required packages
 dnl ***********************************************************************
 PKG_CHECK_MODULES(SHOTWELL, [
@@ -98,10 +118,8 @@ PKG_CHECK_MODULES(SHOTWELL, [
                              libexif >= 0.6.16
                              libgphoto2 >= 2.5.0
                              libraw >= 0.13.2
-                             libsoup-2.4 >= 2.42.0
                              libxml-2.0 >= 2.6.32
                              sqlite3 >= 3.5.9
-                             webkit2gtk-4.0
                             ])
 PKG_CHECK_MODULES(THUMBNAILER, [gee-0.8 >= 0.8.5 gtk+-3.0 >= 3.14.0
                                 gstreamer-base-1.0 >= 1.0.0])
@@ -113,11 +131,19 @@ PKG_CHECK_MODULES(IMPORT, [gee-0.8 >= 0.8.5 glib-2.0 gio-2.0 sqlite3])
 
 PKG_CHECK_MODULES(PUBLISHING, [gobject-2.0 glib-2.0 gexiv2 json-glib-1.0
                                gee-0.8 libsoup-2.4 libxml-2.0 gtk+-3.0
-                               webkit2gtk-4.0 gcr-3 gcr-ui-3])
+                               webkit2gtk-4.0 gcr-3 gcr-ui-3 libgdata])
 
 PKG_CHECK_MODULES(TRANSITIONS, [gobject-2.0 cairo gio-2.0 gdk-pixbuf-2.0
                                 gdk-3.0])
 
+AS_IF([test "x$with_authenticator" = "xshotwell"],
+      [
+        PKG_CHECK_MODULES(AUTHENTICATOR, [gobject-2.0 glib-2.0 libsoup-2.4
+                                          webkit2gtk-4.0 gee-0.8 gtk+-3.0
+                                          libxml-2.0 json-glib-1.0])
+        AC_SUBST(AUTHENTICATOR_PACKAGES, ["--pkg webkit2gtk-4.0 --pkg gtk+-3.0 --pkg libsoup-2.4 --pkg gee-0.8 --pkg libxml-2.0 --pkg json-glib-1.0"])
+      ])
+
 dnl ***********************************************************************
 dnl Unity support
 dnl ***********************************************************************
@@ -140,6 +166,69 @@ AC_SUBST([HAVE_UNITY])
 AM_CONDITIONAL([HAVE_UNITY],[test "x$HAVE_UNITY" = "xyes"])
 
 dnl ***********************************************************************
+dnl Publishers
+dnl ***********************************************************************
+
+m4_define(ALL_PUBLISHERS, [facebook, flickr, picasa, piwigo, youtube, gallery3, rajce, tumblr, yandex])
+AC_ARG_ENABLE([publishers],
+            AS_HELP_STRING([--enable-publishers=@<:@list-of-publishers or all@:>@],
+                           [A comma-separated list of publishers from ALL_PUBLISHERS]),
+            [],[enable_publishers="ALL_PUBLISHERS"])
+
+AS_IF([test "$xenable_publishers" = "xall"],
+      [enable_publishers="ALL_PUBLISHERS"],[])
+
+save_ifs=$IFS
+IFS=,
+PUBLISHER_VALAFLAGS=""
+ENABLED_PUBLISHERS=""
+for publisher in $enable_publishers; do
+    case $publisher in
+        *facebook*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_FACEBOOK"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS facebook"
+        ;;
+        *flickr*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_FLICKR"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS flickr"
+        ;;
+        *picasa*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_PICASA"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS picasa"
+        ;;
+        *piwigo*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_PIWIGO"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS piwigo"
+        ;;
+        *youtube*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_YOUTUBE"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS youtube"
+        ;;
+        *gallery3*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_GALLERY3"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS gallery3"
+        ;;
+        *rajce*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_RAJCE"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS rajce"
+        ;;
+        *tumblr*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_TUMBLR"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS tumblr"
+        ;;
+        *yandex*)
+            PUBLISHER_VALAFLAGS="$PUBLISHER_VALAFLAGS --define HAVE_YANDEX"
+            ENABLED_PUBLISHERS="$ENABLED_PUBLISHERS yandex"
+        ;;
+        *)
+        ;;
+    esac
+done
+IFS=$save_ifs
+AC_SUBST([PUBLISHER_VALAFLAGS])
+
+
+dnl ***********************************************************************
 dnl Extra publishing plugins
 dnl ***********************************************************************
 AC_ARG_ENABLE([extra-plugins],
@@ -199,4 +288,6 @@ echo "  Prefix ............................... : ${prefix}"
 echo "  Libdir ............................... : ${libdir}"
 echo "  Unity support ........................ : ${HAVE_UNITY}"
 echo "  Additional publishing plugins ........ : ${HAVE_EXTRA_PLUGINS}"
+echo "  Authentication library ............... : ${with_authenticator}"
+echo "  Publishers ........................... : ${ENABLED_PUBLISHERS}"
 echo ""
diff --git a/help/Makefile.in b/help/Makefile.in
index 76c7a8a..6ad66d0 100644
--- a/help/Makefile.in
+++ b/help/Makefile.in
@@ -92,9 +92,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = help
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \
-	$(top_srcdir)/m4/ax_check_enable_debug.m4 \
-	$(top_srcdir)/m4/ax_generate_changelog.m4 \
+am__aclocal_m4_deps = $(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 \
@@ -173,6 +171,9 @@ 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@
@@ -260,6 +261,7 @@ 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@
diff --git a/help/es/edit-crop.page b/help/es/edit-crop.page
index d834984..64d356a 100644
--- a/help/es/edit-crop.page
+++ b/help/es/edit-crop.page
@@ -42,7 +42,7 @@
   <p>También puede limitar el recuadro a uno de los tamaños más comunes. Elija un tamaño de la lista desplegable que se adapte a sus necesidades. Si pulsa el botón voltear situado junto a esta, la orientación de la restricción cambiará (de horizontal a vertical).</p>
  </item>
  <item>
-  <p>When you're happy with your crop outline, apply it by pressing the <gui>Crop</gui> button. Shotwell will display the cropped photo.</p>
+  <p>Cuando esté satisfecho con su recorte, aplíquelo pulsando el botón <gui>Recortar</gui>. Shotwell mostrará la foto recortada.</p>
  </item>
  <item>
   <p>Si cambia de opinión, pulse el botón <gui>Recortar</gui> de nuevo y ajuste el recorte.</p>
diff --git a/help/es/edit-external.page b/help/es/edit-external.page
index 0b6f834..6c1805e 100644
--- a/help/es/edit-external.page
+++ b/help/es/edit-external.page
@@ -28,13 +28,7 @@
 
     <title>Editar las fotos con un programa externo</title>
 
-    <p>
-        You might want to use an external editor to do additional work on a photo.
-        If installed, GIMP and UFRaw are the default external editors for photo and RAW editing, 
-        respectively.  If these programs are not installed, you must select your preferred 
-        editors by choosing <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq> and selecting
-        editors from drop-down menus of installed applications.
-    </p>
+    <p>Quizás quiera utilizar un editor externo para trabajar adicionalmente en una foto. Si están instalados, GIMP y UFRaw son los editores externos predeterminados para editar una foto o RAW, respectivamente. Si estos programas no están instalados, tiene que seleccionar sus editores preferidos eligiendo <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> y seleccionar los editores del menú desplegable de las aplicaciones instaladas.</p>
 
     <p>Una vez que los editores se han establecido, seleccione una foto y elija <guiseq><gui>Fotos</gui> <gui>Abrir con un editor externo</gui></guiseq> para abrir la foto con un editor externo. De la misma manera, si la foto original es un archivo RAW, seleccione <guiseq><gui>Fotos</gui><gui>Abrir con un editor RAW</gui></guiseq> para editar el archivo RAW directamente con un editor RAW establecido.</p>
 
diff --git a/help/es/edit-nondestructive.page b/help/es/edit-nondestructive.page
index d8348a8..7542fd1 100644
--- a/help/es/edit-nondestructive.page
+++ b/help/es/edit-nondestructive.page
@@ -30,7 +30,7 @@
 
 <p>Shotwell es un editor de fotos no destructivo. No modifica sus fotografías originales. Es decir, si recorta una foto o ajusta sus colores, el archivo de la foto del disco permanece intacto. Shotwell almacena sus ediciones en una base de datos y las aplica sobre la marcha, según sea necesario. Esto significa que puede deshacer cualquier alteración que realices en una fotografía.</p>
 
-<p>If you want to see what a photo looked like before your modifications, press the <key>Shift</key> key. The original photo will be displayed as long as you hold the key down.</p>
+<p>Si quiere ver qué aspecto tenía una foto antes de realizar las modificaciones, pulse la tecla <key>Mayús</key>. La foto original se mostrará siempre que mantenga pulsada esta tecla.</p>
 
 <p>Tenga en cuenta que Shotwell puede escribir metadatos opcionalmente (como etiquetas y títulos) en los archivos de fotos. Para obtener más información, consulte la sección <link xref="other-files">Archivos de fotos</link>.</p>
 
diff --git a/help/es/edit-rotate.page b/help/es/edit-rotate.page
index f18e358..b5edcf4 100644
--- a/help/es/edit-rotate.page
+++ b/help/es/edit-rotate.page
@@ -30,7 +30,7 @@
 
     <p>Puede girar las fotos a la izquierda y a la derecha con el botón <gui>Girar</gui> en la barra de herramientas de la mayoría de las vistas. También puede hacer una imagen reflejada de cualquier foto.</p>
     
-    <p>To rotate right, click on the <gui>Rotate</gui> button. To rotate left, press and hold the <key>Ctrl</key> key and then click the button. Both commands are available in the <gui>Photos</gui> menu too.  Alternatively, use the following keyboard shortcuts:</p>
+    <p>Para girar hacia la derecha, pulse el botón <gui>Girar</gui>. Para girar hacia la izquierda, mantenga pulsada la tecla <key>Ctrl</key> y luego pulse el botón. Ambos comandos están disponibles en el menú <gui>Fotos</gui>. Como alternativa, utilice los siguientes atajos del teclado:</p>
     <list>
     <item><p>rotar a la izquierda: <keyseq><key>Mayús</key><key>Ctrl</key><key>R</key></keyseq> o <key>[</key></p></item>
     <item><p>rotar a la derecha: <keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>]</key></p></item>
diff --git a/help/es/edit-undo.page b/help/es/edit-undo.page
index 3f694e9..854a08b 100644
--- a/help/es/edit-undo.page
+++ b/help/es/edit-undo.page
@@ -32,7 +32,7 @@
     
     <p>Gracias a que Shotwell es un editor de fotos no destructivo, puede deshacer cualquier alteración que realice en una foto.</p>
     
-    <p>If you want to see what a photo looked like before your modifications, press the <key>Shift</key> key. The original photo will be displayed as long as you hold the key down.</p>
+    <p>Si quiere ver qué aspecto tenía una foto antes de realizar las modificaciones, pulse la tecla <key>Mayús</key>. La foto original se mostrará siempre que mantenga pulsada esta tecla.</p>
 
     <p>Para deshacer por completo todos los cambios realizados en una foto, haga clic en <guiseq><gui>Fotos</gui><gui>Volver al original</gui></guiseq>. La única excepción es que los ajustes de hora y fecha no se revertirán.</p>
 
diff --git a/help/es/es.po b/help/es/es.po
index e653ecb..bb54e1d 100644
--- a/help/es/es.po
+++ b/help/es/es.po
@@ -10,3320 +10,3321 @@
 # 

 # 

 # 

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

 # 

-msgid ""

-msgstr ""

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

-"POT-Creation-Date: 2016-12-23 00:18+0000\n"

-"PO-Revision-Date: 2016-12-23 \n"

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

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

-"Language: es\n"

-"MIME-Version: 1.0\n"

-"Content-Type: text/plain; charset=UTF-8\n"

-"Content-Transfer-Encoding: 8bit\n"

-"Plural-Forms: nplurals=2; plural=(n != 1);\n"

-"X-Generator: Gtranslator 2.91.6\n"

-

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

-msgctxt "_"

-msgid "translator-credits"

-msgstr ""

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

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

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

-

-#. (itstool) path: info/desc

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

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

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

-

-#. (itstool) path: page/title

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

-msgid "Color adjustments"

-msgstr "Ajustes del color"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

-"range."

-msgstr ""

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

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

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

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

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

-

-#. (itstool) path: page/p

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

-msgid ""

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

-"improve the quality of a photo."

-msgstr ""

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

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

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-msgstr ""

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

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

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

-"cambios realizados."

-

-#. (itstool) path: section/title

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

-msgid "What do the color adjustments do?"

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

-

-#. (itstool) path: item/title

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

-msgid "Exposure"

-msgstr "Exposición"

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-msgstr ""

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

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

-"sobreexpuestas o excesivamente subexpuestas."

-

-#. (itstool) path: item/title

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

-msgid "Saturation"

-msgstr "Saturación"

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-msgstr ""

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

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

-"disminuirlos."

-

-#. (itstool) path: item/title

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

-msgid "Tint"

-msgstr "Matiz"

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

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

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

-msgstr ""

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

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

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

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

-"una tonalidad azulada."

-

-#. (itstool) path: item/title

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

-msgid "Temperature"

-msgstr "Temperatura"

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-msgstr ""

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

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

-

-#. (itstool) path: item/title

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

-msgid "Shadows"

-msgstr "Sombras"

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-msgstr ""

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

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

-

-#. (itstool) path: item/title

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

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

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

-msgstr ""

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

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

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

-

-#. (itstool) path: media

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

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

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

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

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

-msgctxt "_"

-msgid ""

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

-msgstr ""

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

-

-#. (itstool) path: info/desc

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

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

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

-

-#. (itstool) path: page/title

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

-msgid "Cropping"

-msgstr "Recortar"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-"full-window or fullscreen mode."

-msgstr ""

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

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

-"gui> button on the toolbar."

-msgstr ""

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-"will look like when you crop it."

-msgstr ""

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

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

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

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

-msgstr ""

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

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

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

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

-"em>."

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

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

-"landscape to portrait)."

-msgstr ""

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

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

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-msgstr ""

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

-"tune the crop."

-msgstr ""

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

-"el recorte."

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-msgstr ""

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

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

-

-#. (itstool) path: section/title

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

-msgid "What is the rule of thirds?"

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

-

-#. (itstool) path: section/p

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

-msgid ""

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

-"photo."

-msgstr ""

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

-"satisfactoria para una foto."

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

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

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

-"another can also help."

-msgstr ""

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

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

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

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

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

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

-"ser de ayuda."

-

-#. (itstool) path: section/p

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

-msgid ""

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

-"a more visually appealing image."

-msgstr ""

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

-"una imagen visualmente más satisfactoria."

-

-#. (itstool) path: media/p

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

-msgid ""

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

-"composition."

-msgstr ""

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

-"mejorar la composición."

-

-#. (itstool) path: info/desc

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

-msgid ""

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

-msgstr ""

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

-"automáticamente."

-

-#. (itstool) path: page/title

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

-msgid "Auto-enhance"

-msgstr "Mejora automática"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

-msgstr ""

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

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

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

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

-"<gui>Ajustar</gui>."

-

-#. (itstool) path: info/desc

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

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

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

-

-#. (itstool) path: page/title

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

-msgid "Edit photos with an external program"

-msgstr "Editar las fotos con un programa externo"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

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

-"menus of installed applications."

-msgstr ""

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

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

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

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

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

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

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

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

-msgstr ""

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

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

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

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

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

-"un editor RAW establecido."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-"rather than the externally-edited one."

-msgstr ""

-"Cuando complete sus ediciones y guarde el archivo, Shotwell detectará los "

-"cambios y actualizará la foto. Cuando se hayan realizado ediciones externas, "

-"mantenga pulsada la tecla <tecla>Mayús</tecla> en la vista de la pantalla "

-"completa para mostrar la foto original en lugar de la editada externamente."

-

-#. (itstool) path: page/p

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

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

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

-

-#. (itstool) path: note/p

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

-msgid ""

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

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

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

-msgstr ""

-"Si edita de manera externa una foto RAW y guarda el resultado en otra "

-"imagen, como un archivo JPEG o PNG, Shotwell no puede determinar "

-"automáticamente que la RAW original y la nueva imagen deberían estar "

-"emparejadas."

-

-#. (itstool) path: note/p

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

-msgid ""

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

-"to import it yourself."

-msgstr ""

-"Si quiere trabajar sobre la imagen resultante con Shotwell, tendrá que "

-"importarla usted mismo."

-

-#. (itstool) path: info/desc

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

-msgid ""

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

-"original photos."

-msgstr ""

-"Shotwell es un editor de fotos no destructivo, es decir, no modifica sus "

-"fotos originales."

-

-#. (itstool) path: page/title

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

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

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

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

-"any alterations you make to a photograph."

-msgstr ""

-"Shotwell es un editor de fotos no destructivo. No modifica sus fotografías "

-"originales. Es decir, si recorta una foto o ajusta sus colores, el archivo "

-"de la foto del disco permanece intacto. Shotwell almacena sus ediciones en "

-"una base de datos y las aplica sobre la marcha, según sea necesario. Esto "

-"significa que puede deshacer cualquier alteración que realices en una "

-"fotografía."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-"you hold the key down."

-msgstr ""

-"Si quiere ver qué aspecto tenía una foto antes de realizar las "

-"modificaciones, pulse la tecla <tecla>Mayús<tecla>. La foto original se "

-"mostrará siempre que mantenga pulsada esta tecla."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-msgstr ""

-"Tenga en cuenta que Shotwell puede escribir metadatos opcionalmente (como "

-"etiquetas y títulos) en los archivos de fotos. Para obtener más información, "

-"consulte la sección <link xref=\"other-files\">Archivos de fotos</link>."

-

-#. (itstool) path: info/desc

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

-msgid ""

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

-msgstr ""

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

-"cámara."

-

-#. (itstool) path: page/title

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

-msgid "Removing red-eye"

-msgstr "Quitar los ojos rojos"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-msgstr ""

-"Los ojos rojos aparecen cuando el flash de la cámara se refleja en las "

-"pupilas de los ojos. Para eliminar esto en una foto, utilice la herramienta "

-"Ojos rojos."

-

-#. (itstool) path: item/p

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

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-msgstr ""

-"Arrastre el círculo sobre la pupila afectada, ajuste su tamaño con el "

-"control deslizante y presione <gui>Aplicar</gui>. Se eliminará el color rojo."

-

-#. (itstool) path: item/p

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

-msgid ""

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

-"when finished."

-msgstr ""

-"Repita este proceso para todas las pupilas rojas en su foto. Pulse "

-"<gui>Cerrar</gui> cuando haya terminado."

-

-#. (itstool) path: info/desc

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

-msgid ""

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

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

-msgstr ""

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

-"<gui>Foto</gui>."

-

-#. (itstool) path: page/title

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

-msgid "Rotate or flip a photo"

-msgstr "Girar o voltear una foto"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-"make a mirror image of any photo."

-msgstr ""

-"Puede girar las fotos a la izquierda y a la derecha con el botón <gui>Girar</"

-"gui> en la barra de herramientas de la mayoría de las vistas. También puede "

-"hacer una imagen reflejada de cualquier foto."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-"the following keyboard shortcuts:"

-msgstr ""

-"Para girar hacia la derecha, pulse el botón <gui>Girar</gui>. Para girar "

-"hacia la izquierda, mantenga pulsada la tecla <tecla>Ctrl</key> y luego "

-"pulse el botón. Ambos comandos están disponibles en el menú <gui>Fotos</"

-"gui>. Como alternativa, utilice los siguientes atajos del teclado:"

-

-#. (itstool) path: item/p

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

-msgid ""

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

-"<key>[</key>"

-msgstr ""

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

-msgstr ""

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

-"key>"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-msgstr ""

-"Para crear una imagen reflejada de una foto, utilice el comando <gui>Voltear "

-"horizontalmente</gui> en el menú <gui>Fotos</gui>. Para voltear una imagen "

-"verticalmente, utilice el comando <gui>Voltear verticalmente</gui> en el "

-"mismo menú."

-

-#. (itstool) path: note/p

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

-msgid ""

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

-"time."

-msgstr ""

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

-

-#. (itstool) path: info/desc

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

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

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

-

-#. (itstool) path: page/title

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

-msgid "Straighten photos"

-msgstr "Enderezar fotos"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-msgstr ""

-"Las herramientas de enderezar permiten que las fotos se nivelen y enderecen. "

-"La herramienta de enderezado sólo está disponible en modo de pantalla "

-"completa."

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-"key></keyseq>."

-msgstr ""

-"Pulse en <gui>Enderezar</gui>. Aparecerá el control deslizante de "

-"enderezamiento. También puede utilizar el atajo de teclado "

-"<keyseq><key>Ctrl</key><key>A</key></keyseq>."

-

-#. (itstool) path: item/p

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

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

-msgstr ""

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

-"enderezamiento."

-

-#. (itstool) path: item/p

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

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

-msgstr "Pulse <gui>Enderezar</gui> cuando haya acabado."

-

-#. (itstool) path: info/desc

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

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

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

-

-#. (itstool) path: page/title

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

-msgid "Adjust the date and time of photos"

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

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-msgstr ""

-"Para ajustar la hora y fecha de las fotos, seleccione las fotos que quiere "

-"ajustar y pulse <guiseq><gui>Fotos</gui><gui>Ajustar fecha y hora...</gui></"

-"guiseq> y seleccione una nueva fecha y hora."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-"photos to the same time."

-msgstr ""

-"Si está cambiando la fecha y la hora de varias fotos a la vez, puede elegir "

-"cambiar todas las fotos en la misma cantidad de horas o establecer todas las "

-"fotos en la misma hora."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-"undone once you exit Shotwell."

-msgstr ""

-"De manera predeterminada, la fecha y la hora sólo se cambian dentro de "

-"Shotwell. También puede optar por modificar la fecha y la hora en el archivo "

-"original, pero esto no se puede deshacer una vez que salga de Shotwell."

-

-#. (itstool) path: info/desc

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

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

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

-

-#. (itstool) path: page/title

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

-msgid "Undoing changes"

-msgstr "Deshacer cambios"

-

-#. (itstool) path: page/p

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

-msgid ""

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

-"alterations you make to a photograph."

-msgstr ""

-"Gracias a que Shotwell es un editor de fotos no destructivo, puede deshacer "

-"cualquier alteración que realice en una foto."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-msgstr ""

-"Para deshacer por completo todos los cambios realizados en una foto, haga "

-"clic en <guiseq><gui>Fotos</gui><gui>Volver al original</gui></guiseq>. La "

-"única excepción es que los ajustes de hora y fecha no se revertirán."

-

-#. (itstool) path: info/desc

-#: C/formats.page:7

-msgid ""

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

-"files."

-msgstr ""

-"Shotwell soporta archivos JPEG, PNG, TIFF, BMP y RAW, así como archivos de "

-"vídeo."

-

-#. (itstool) path: page/title

-#: C/formats.page:12

-msgid "Supported photo and video formats"

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

-

-#. (itstool) path: page/p

-#: C/formats.page:14

-msgid ""

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

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

-"format such as GIF."

-msgstr ""

-"Shotwell soporta archivos JPEG, PNG, TIFF, BMP y <link type =\"guide\" xref="

-"\"other-raw\">RAW</link>. Shotwell todavía no soporta otros formatos "

-"gráficos como GIF."

-

-#. (itstool) path: page/p

-#: C/formats.page:16

-msgid ""

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

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

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

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

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

-msgstr ""

-"El soporte del formato RAW de Shotwell está actualmente limitado. Cuando ve "

-"una foto RAW, en realidad está viendo un JPEG derivado de la foto RAW, no la "

-"imagen RAW en sí. Además, la ruta de edición RAW no es completamente de 16 "

-"bits; sólo puede exportar las fotos editadas como archivos de 8 bits. Todos "

-"los formatos compatibles se pueden utilizar para la exportación (JPEG, PNG, "

-"TIFF, BMP)."

-

-#. (itstool) path: page/p

-#: C/formats.page:18

-msgid ""

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

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

-msgstr ""

-"Para obtener más información acerca de las fotos en formato RAW en Shotwell, "

-"consulte la sección <link type=\"guide\" xref=\"other-raw\">RAW</link>."

-

-#. (itstool) path: page/p

-#: C/formats.page:22

-msgid ""

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

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

-"includes the following formats among others:"

-msgstr ""

-"Shotwell también soporta archivos de vídeo en cualquier formato soportado "

-"por la biblioteca multimedia de GStreamer en el sistema donde Shotwell está "

-"funcionando. Esto normalmente incluye los siguientes formatos, entre otros:"

-

-#. (itstool) path: item/p

-#: C/formats.page:25

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

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

-

-#. (itstool) path: item/p

-#: C/formats.page:26

-msgid ""

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

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

-"restrictions.</em>"

-msgstr ""

-"Códecs: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Tenga en cuenta que "

-"algunos sistemas operativos pueden no incluir todos los códecs que se "

-"enumeran aquí debido a restricciones legales o de licencia.</em>"

-

-#. (itstool) path: page/p

-#: C/formats.page:30

-msgid ""

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

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

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

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

-"videos."

-msgstr ""

-"Shotwell soporta fotos y vídeos, pero por simplicidad, esta documentación "

-"usa sólo el término «fotos» en la mayoría de ocasiones. Sin embargo, muchas "

-"operaciones en Shotwell se aplican tanto a fotos como a vídeos. En "

-"particular, los eventos, los marcados, las clasificaciones, los etiquetados "

-"y los trabajos publicados funcionan tanto para fotos como para vídeos."

-

-#. (itstool) path: info/desc

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

-msgid "Copy photos from a digital camera."

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

-

-#. (itstool) path: page/title

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

-msgid "Importing from a camera"

-msgstr "Importar desde una cámara"

-

-#. (itstool) path: page/p

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

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

-"it and list it in the sidebar."

-msgstr ""

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

-"mostrará en la barra lateral."

-

-#. (itstool) path: item/p

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

-msgid ""

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

-"be displayed."

-msgstr ""

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

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

-msgstr ""

-"Si quiere, puede elegir un conjunto de fotos específicas para importar. Para "

-"ello, mantenga presionada la tecla <tecla>Ctrl</key> y pulse para "

-"seleccionar las fotos individuales. Puede mantener pulsada la tecla "

-"<tecla>Mayús</tecla> y pulsar para seleccionar varias fotos también."

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-msgstr ""

-"Pulse <gui>Importar seleccionadas</gui> o <gui> Importar todo</gui>. Las "

-"fotos se copiarán de la cámara y se guardarán en el ordenador."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-msgstr ""

-"Una vez finalizada la importación, puede abrir la vista <gui>Última "

-"importación</gui> (en la barra lateral) para ver todas las fotos que se "

-"importaron. La lista de Eventos (también en la barra lateral) también "

-"mostrará las nuevas fotos, organizadas por fecha."

-

-#. (itstool) path: info/desc

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

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

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

-

-#. (itstool) path: page/title

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

-msgid "Importing from your hard disk"

-msgstr "Importar desde su disco duro"

-

-#. (itstool) path: page/p

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

-msgid ""

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

-"your file browser into the Shotwell window."

-msgstr ""

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

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

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-msgstr ""

-"Alternativamente, pulse <guiseq><gui>Archivo</gui><gui>Importar desde la "

-"carpeta...</gui></guiseq> y seleccione la carpeta que contiene las fotos que "

-"quiere importar."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-msgstr ""

-"Shotwell le preguntará si quiere copiar los archivos de fotos en su carpeta "

-"de la biblioteca (la carpeta de la biblioteca está normalmente en la carpeta "

-"<file>Imágenes</file> en su carpeta local) o importarlos en su lugar sin "

-"copiar los archivos."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

-msgstr ""

-"Si mantiene pulsada la tecla <key>Ctrl</key> mientras arrastra las fotos, "

-"Shotwell copiará las fotos en la carpeta de la biblioteca sin preguntar. Del "

-"mismo modo, si mantiene presionadas las teclas <keyseq><key>Ctrl</"

-"key><key>Shift</key></keyseq>, Shotwell importará las fotos sin copiarlas."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-msgstr ""

-"Una vez finalizada la importación, puede seleccionar <gui>Última "

-"importación</gui> en la barra lateral para ver todas las fotos importadas "

-"correctamente. La lista de Eventos también mostrará nuevas entradas para las "

-"fechas correspondientes a las fotos importadas."

-

-#. (itstool) path: info/desc

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

-msgid ""

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

-msgstr ""

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

-"F-Spot."

-

-#. (itstool) path: page/title

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

-msgid "Importing from F-Spot"

-msgstr "Importar desde F-Spot"

-

-#. (itstool) path: page/p

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

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

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

-

-#. (itstool) path: item/p

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

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

-msgstr ""

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

-"guiseq>."

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-"chooser dialog box."

-msgstr ""

-"Ahora elija la biblioteca predeterminada F-Spot u otra base de datos F-Spot. "

-"Si quiere importar desde otra base de datos F-Spot, seleccione una carpeta y "

-"un archivo en el cuadro de diálogo del selector."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

-"photos."

-msgstr ""

-"Shotwell importará sus fotos, junto con sus etiquetas y otra información. "

-"Una vez finalizada la importación, puede seleccionar <gui>Última "

-"importación</gui> en la barra lateral para ver todas las fotos importadas "

-"correctamente. La lista de Eventos también mostrará nuevas entradas para las "

-"fechas correspondientes a las fotos importadas."

-

-#. (itstool) path: info/desc

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

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

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

-

-#. (itstool) path: page/title

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

-msgid "Importing from a memory card"

-msgstr "Importar desde una tarjeta de memoria"

-

-#. (itstool) path: page/p

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

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

-"to the computer and switched on."

-msgstr ""

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

-"conectado al equipo y encendido."

-

-#. (itstool) path: item/p

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

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

-msgstr ""

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

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

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

-msgstr ""

-"Siga las instrucciones para <link xref=\"import-file\">importar fotos desde "

-"el disco duro</link>. Si pulsa en <guiseq><gui>Archivo</gui><gui>Importar "

-"desde la carpeta...</gui></guiseq>, la tarjeta de memoria será visible como "

-"una carpeta en la barra lateral de la ventana de selección de archivos."

-

-#. (itstool) path: page/p

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

-msgid ""

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

-"card reader."

-msgstr ""

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

-"con su lector de tarjetas."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

-"though."

-msgstr ""

-"Si la tarjeta no se detecta automáticamente, es posible que su lector de "

-"tarjetas no se haya reconocido. Intente desenchufarlo y vuelva a enchufarlo. "

-"Sin embargo, si eso no funciona, podrá importar fotos mediante <link xref="

-"\"import-camera\">conectar su cámara directamente al ordenador</link>."

-

-#. (itstool) path: media

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

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

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

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

-#: C/index.page:23

-msgctxt "_"

-msgid ""

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

-"md5='4b333499555b4e496b1a38f7899067f3'"

-msgstr ""

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

-"md5='4b333499555b4e496b1a38f7899067f3'"

-

-#. (itstool) path: info/title

-#: C/index.page:6

-msgctxt "link"

-msgid "Shotwell"

-msgstr "Shotwell"

-

-#. (itstool) path: info/title

-#: C/index.page:7

-msgctxt "text"

-msgid "Shotwell"

-msgstr "Shotwell"

-

-#. (itstool) path: credit/name

-#: C/index.page:9

-msgid "Jim Nelson"

-msgstr "Jim Nelson"

-

-#. (itstool) path: credit/name

-#: C/index.page:11

-msgid "Allison Barlow"

-msgstr "Allison Barlow"

-

-#. (itstool) path: credit/name

-#: C/index.page:13

-msgid "Robert Ancell"

-msgstr "Robert Ancell"

-

-#. (itstool) path: credit/name

-#: C/index.page:15

-msgid "Peter Smith"

-msgstr "Peter Smith"

-

-#. (itstool) path: credit/name

-#: C/index.page:17

-msgid "Phil Bull"

-msgstr "Phil Bull"

-

-#. (itstool) path: page/title

-#: C/index.page:23

-msgid ""

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

-"Manager"

-msgstr ""

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

-"Shotwell"

-

-#. (itstool) path: section/title

-#: C/index.page:26

-msgid "Importing Photos"

-msgstr "Importar fotos"

-

-#. (itstool) path: section/title

-#: C/index.page:30

-msgid "Viewing Photos"

-msgstr "Ver fotos"

-

-#. (itstool) path: section/title

-#: C/index.page:34

-msgid "Organizing Photos"

-msgstr "Organizar fotos"

-

-#. (itstool) path: section/title

-#: C/index.page:38

-msgid "Editing Photos"

-msgstr "Editar fotos"

-

-#. (itstool) path: section/title

-#: C/index.page:42

-msgid "Sharing Photos"

-msgstr "Compartir fotos"

-

-#. (itstool) path: section/title

-#: C/index.page:46

-msgid "Other Features"

-msgstr "Otras características"

-

-#. (itstool) path: info/desc

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

-msgid ""

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

-"merge, and sort events."

-msgstr ""

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

-"y ordenar eventos."

-

-#. (itstool) path: page/title

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

-msgid "Events"

-msgstr "Eventos"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-"then groups the photos into events."

-msgstr ""

-"Un evento es un grupo de fotos que se han hecho aproximadamente al mismo "

-"tiempo. Cuando importa fotos, Shotwell comprueba cuándo se hizo cada foto y "

-"las agrupa por eventos."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-"that were taken around that time."

-msgstr ""

-"Elija <gui>Eventos</gui> en la barra lateral para ver sus fotos organizadas "

-"por fecha. Si selecciona un mes o un año en la barra lateral, se mostrará "

-"una lista de eventos en la ventana principal. Pulse dos veces en un evento "

-"para ver todas las fotos tomadas en ese momento."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

-msgstr ""

-"Si una foto no tiene información insertada de la fecha o la hora, entonces "

-"Shotwell no puede colocarla automáticamente en ningún evento. En este caso, "

-"la foto aparecerá en la vista <gui>No hay eventos</gui> a la que se accede "

-"desde la barra lateral. Todavía puede mover la foto a cualquier evento que "

-"quiera como se describe a continuación."

-

-#. (itstool) path: section/title

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

-msgid "Renaming events"

-msgstr "Renombrar eventos"

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

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

-msgstr ""

-"Para dar un nombre a un evento en lugar de referirse a él por su fecha, "

-"seleccione el evento, pulse en <guiseq><gui>Eventos</gui><gui>Renombrar "

-"evento...</gui></guiseq> e introduzca un nuevo nombre. Otra forma de cambiar "

-"el nombre de un evento es pulsar dos veces en su nombre en la barra lateral; "

-"Escriba un nuevo nombre y luego pulse <key>Intro</key>."

-

-#. (itstool) path: section/title

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

-msgid "Moving photos between events"

-msgstr "Mover fotos entre eventos"

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

-"drop it on an event."

-msgstr ""

-"Aunque las fotos se agrupan inicialmente por eventos según su fecha, puede "

-"mover fotos entre eventos. Para ello, arrastre cualquier foto a la barra "

-"lateral y suéltela en un evento."

-

-#. (itstool) path: section/title

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

-msgid "Creating and merging events"

-msgstr "Crear y combinar eventos"

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

-msgstr ""

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

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

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

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

-msgstr ""

-"Para combinar eventos, seleccione <guiseq><gui>Eventos</gui></guiseq> de la "

-"barra lateral, luego, mientras presiona <key>Ctrl</key> pulse en los eventos "

-"que quiere combinar en la ventana principal. Finalmente, pulse en "

-"<guiseq><gui>Eventos</gui><gui>Combinar eventos</gui></guiseq>."

-

-#. (itstool) path: section/title

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

-msgid "Sorting events"

-msgstr "Ordenar eventos"

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

-"either ascending or descending."

-msgstr ""

-"Los eventos se muestran en la estructura de árbol en la barra lateral, "

-"organizados por el año y el mes de la primera foto del evento. Para cambiar "

-"el orden de clasificación del evento, pulse en <guiseq><gui>Vista</"

-"gui><gui>Ordenar eventos</gui></guiseq> y seleccione si quiere el orden "

-"ascendente o descendente."

-

-#. (itstool) path: section/title

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

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

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

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

-msgstr ""

-"Si selecciona <gui>Eventos</gui> en la barra lateral, verá una única foto "

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

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

-msgstr ""

-"De manera predeterminada, Shotwell utiliza la primera foto de cada evento "

-"como su vista de miniatura. Para utilizar una foto distinta, seleccione la "

-"foto y elija <guiseq><gui>Fotos</gui><gui>Definir vista de miniatura de "

-"eventos </gui></guiseq>."

-

-#. (itstool) path: info/desc

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

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

-msgstr ""

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

-"como conjunto."

-

-#. (itstool) path: page/title

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

-msgid "Flagging photos"

-msgstr "Marcar fotos"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-"flagged."

-msgstr ""

-"Shotwell le permite <em>marcar</em> sus fotos. Cuando se marca una foto, "

-"aparece un pequeño icono de una bandera en su esquina superior derecha. "

-"Puede seleccionar el elemento <gui>Marcada</gui> en la barra lateral para "

-"ver todas las fotos que se han marcado."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-msgstr ""

-"Marcar una foto hace que esta sea especial. Puede interpretar esto de la "

-"manera que quiera. Por ejemplo, puede marcar todas las fotos que necesitan "

-"un ajuste visual o todas las fotos que quiere compartir con un amigo."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-"all flagged photos to a publishing service."

-msgstr ""

-"Marcar fotos es útil porque también puede trabajar en todas las fotos "

-"marcadas como un conjunto. Por ejemplo, puede seleccionar la vista "

-"<gui>Marcada</gui> y luego subir todas las fotos marcadas a un servicio de "

-"publicación."

-

-#. (itstool) path: section/title

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

-msgid "To flag or unflag a photo"

-msgstr "Para marcar o desmarcar una foto"

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

-msgstr ""

-"Para marcar o desmarcar una foto, pulse con el botón derecho en la foto y "

-"seleccione <gui>Marcar</gui> o <gui>Desmarcar</gui> desde el menú "

-"contextual. O pulse use los atajos del teclado <keyseq><key>Ctrl</"

-"key><key>G</key></keyseq> o <key>/</key>."

-

-#. (itstool) path: info/desc

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

-msgid ""

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

-"hiding them from view."

-msgstr ""

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

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

-

-#. (itstool) path: page/title

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

-msgid "Ratings"

-msgstr "Valoraciones"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-msgstr ""

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

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

-

-#. (itstool) path: page/p

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

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

-msgstr ""

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

-msgstr ""

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

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

-"superior."

-

-#. (itstool) path: item/p

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

-msgid ""

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

-"context menu."

-msgstr ""

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

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

-

-#. (itstool) path: item/p

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

-msgid ""

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

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

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

-"clear the rating(s)."

-msgstr ""

-"Seleccione la foto o las fotos, luego pulse cualquiera de los atajos del "

-"teclado <key>1</key>, <key>2</key>, <key>3</key>, <key>4</key> o <key>5</"

-"key> para asignar una puntuación. Pulse <key>9</key> para marcar las fotos "

-"como rechazadas o pulse <key>0</key> para borrar las puntuaciones."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

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

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

-msgstr ""

-"Normalmente, Shotwell muestra todas las fotos excepto las rechazadas. Puede "

-"establecer un filtro de puntuaciones diferente utilizando el menú "

-"<guiseq><gui>Vista</gui><gui>Filtrar fotos</gui></guiseq>. Por ejemplo, "

-"puede mostrar sólo las fotos con puntuación de 3 estrellas o más, o puede "

-"mostrar todas las fotos, incluidas las marcadas como rechazadas. El icono "

-"Shotwell de la barra de herramientas muestra el filtro de puntuación actual "

-"y también se puede utilizar para configurar el filtro."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-msgstr ""

-"Shotwell normalmente muestra la puntuación de cada foto en su esquina "

-"inferior izquierda. Puede desactivar la visualización de las puntuaciones "

-"utilzando el elemento del menú <guiseq><gui>Vista</gui><gui>Valoraciones</"

-"gui></guiseq>."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

-msgstr ""

-"Puede aumentar o disminuir la puntuación de una foto utilizando los comandos "

-"<guiseq><gui>Establecer puntuación</gui><gui>Aumentar</gui></guiseq> y "

-"<guiseq><gui>Establecer puntuación</gui><gui>Disminuir</gui></guiseq>, o los "

-"atajos del teclado <key>&lt;</key> y <key>&gt;</key>."

-

-#. (itstool) path: media

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

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

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

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

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

-msgctxt "_"

-msgid ""

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

-"md5='ed596bda34c2f4a79a310fbc8bb51fd2'"

-msgstr ""

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

-"md5='ed596bda34c2f4a79a310fbc8bb51fd2'"

-

-#. (itstool) path: info/desc

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

-msgid ""

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

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

-

-#. (itstool) path: page/title

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

-msgid "Removing and deleting photos"

-msgstr "Quitar y eliminar fotos"

-

-#. (itstool) path: page/p

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

-msgid ""

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

-"entirely from your hard disk."

-msgstr ""

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

-"disco duro."

-

-#. (itstool) path: page/media

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

-msgid "Delete process"

-msgstr "Proceso de eliminado"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-"finally and irretrievably deleted from your computer."

-msgstr ""

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

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

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

-"eliminará permanentemente."

-

-#. (itstool) path: section/title

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

-msgid "Removing photos from the library"

-msgstr "Quitar fotos de la biblioteca"

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

-msgstr ""

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

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

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

-"Shotwell."

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

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

-msgstr ""

-"Si quiere quitar las fotos de Shotwell sin tener que moverlas a la papelera, "

-"simplemente seleccione las fotos que va a quitar y elija "

-"<guiseq><gui>Editar</gui><gui>Eliminar de la biblioteca</gui></guiseq>. Los "

-"archivos de fotos se dejarán en su lugar en el disco."

-

-#. (itstool) path: section/title

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

-msgid "Emptying or restoring the trash folder"

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

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

-"following commands are available:"

-msgstr ""

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

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

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

-

-#. (itstool) path: item/title

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

-msgid "Delete"

-msgstr "Eliminar"

-

-#. (itstool) path: item/p

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

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

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

-

-#. (itstool) path: item/title

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

-msgid "Restore"

-msgstr "Restaurar"

-

-#. (itstool) path: item/p

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

-msgid "Restore the selected photos into Shotwell."

-msgstr "Restaurar las fotos seleccionadas en Shotwell."

-

-#. (itstool) path: item/title

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

-msgid "Empty trash"

-msgstr "Vaciar la papelera"

-

-#. (itstool) path: item/p

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

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

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

-

-#. (itstool) path: section/title

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

-msgid "Deleting or emptying Trash"

-msgstr "Eliminar o vaciar la papelera"

-

-#. (itstool) path: section/p

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

-msgid ""

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

-"will be given the following choices:"

-msgstr ""

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

-"ofrecerán las siguientes opciones:"

-

-#. (itstool) path: item/title

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

-msgid "Only Remove"

-msgstr "Solo eliminar"

-

-#. (itstool) path: item/p

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

-msgid ""

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

-"computer."

-msgstr ""

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

-"del equipo."

-

-#. (itstool) path: item/title

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

-msgid "Trash file"

-msgstr "Archivo de Papelera"

-

-#. (itstool) path: item/p

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

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

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

-

-#. (itstool) path: item/title

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

-msgid "Cancel"

-msgstr "Cancelar"

-

-#. (itstool) path: item/p

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

-msgid "Do nothing."

-msgstr "No hacer nada."

-

-#. (itstool) path: info/desc

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

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

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

-

-#. (itstool) path: page/title

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

-msgid "Searching"

-msgstr "Búsqueda"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-"and persist in the sidebar between sessions."

-msgstr ""

-"Hay dos maneras de hacer una búsqueda en Shotwell: con la barra de "

-"herramientas de filtro, y con una búsqueda guardada. La barra de búsqueda le "

-"permite buscar rápidamente la vista actual para ciertos criterios. Las "

-"búsquedas guardadas tienen criterios de búsqueda más complejos y se "

-"mantienen en la barra lateral entre sesiones."

-

-#. (itstool) path: section/title

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

-msgid "Search bar"

-msgstr "Barra de búsqueda"

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

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

-"rating or other options."

-msgstr ""

-"La casilla <guiseq><gui>Vista</gui><gui>Barra de búsqueda</gui></guiseq> "

-"activa la visualización de la barra de búsqueda. También puede pulsar "

-"<keyseq><key>Ctrl</key><key>F</key></keyseq> o <key>F8</key> para abrir la "

-"barra de búsqueda. Desde esta barra, puede encontrar, mostrar y ocultar "

-"fotos y vídeos basados en su título, etiqueta, valoración u otras opciones."

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

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

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

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

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

-msgstr ""

-"Para comenzar la búsqueda, simplemente introduzca una palabra clave de "

-"búsqueda en el cuadro de texto o pulse en <gui>Marcada</gui>, "

-"<gui>Puntuación</gui> o <gui>Tipo</gui>. La búsqueda de texto compara sus "

-"palabras clave con los nombres de las etiquetas, los títulos de fotos o "

-"vídeos y los nombres de los archivos originales de las fotos. Los botones "

-"<gui>Marcada</gui>, <gui>Puntuación</gui> y <gui>Tipo</gui> le permiten "

-"filtrar su colección según las fotos marcadas, su número actual de estrellas "

-"y si los elementos mostrados son imágenes, vídeos o archivos de cámara RAW, "

-"respectivamente."

-

-#. (itstool) path: section/p

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

-msgid ""

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

-"bar."

-msgstr ""

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

-"la barra de búsqueda."

-

-#. (itstool) path: section/title

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

-msgid "Saved search"

-msgstr "Búsqueda guardada"

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

-msgstr ""

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

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

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

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

-"rows."

-msgstr ""

-"Cree una nueva búsqueda guardada con <guiseq><gui>Editar</gui><gui>Nueva "

-"búsqueda guardada...</gui></guiseq> o pulsando <keyseq><key>Ctrl</"

-"key><key>S</key></keyseq>. El cuadro de diálogo le permite introducir un "

-"nombre para la búsqueda y seleccionar si quiere marcar alguno, todos o "

-"ninguno de los criterios de las siguientes filas."

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

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

-msgstr ""

-"Cada fila representa un criterio de búsqueda. Pulse el botón <gui>+</gui> "

-"para añadir más filas y el botón <gui>-</gui> para eliminar una fila "

-"específica. El cuadro combinado de la izquierda de cada fila selecciona el "

-"tipo de criterios. Los criterios se deben introducir correctamente antes de "

-"que el botón <gui>Aceptar</gui> esté disponible."

-

-#. (itstool) path: info/desc

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

-msgid "Organize photos by labelling them."

-msgstr "Organizar las fotos etiquetándolas."

-

-#. (itstool) path: page/title

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

-msgid "Tagging photos"

-msgstr "Etiquetar fotos"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-msgstr ""

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

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

-

-#. (itstool) path: page/p

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

-msgid ""

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

-"any of the following:"

-msgstr ""

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

-"etiquetar y siga estos pasos:"

-

-#. (itstool) path: item/p

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

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

-msgstr ""

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

-

-#. (itstool) path: item/p

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

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

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

-

-#. (itstool) path: item/p

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

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

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

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

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

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

-"tag in the sidebar."

-msgstr ""

-"Cuando pulse <keyseq><key>Ctrl</key><key>T</key></keyseq> o "

-"<guiseq><gui>Etiquetas</gui><gui>Añadir etiquetas...</gui></guiseq> puede "

-"escribir los nombres de una o más etiquetas, separadas por comas. Una vez "

-"que haya creado una etiqueta, puede renombrarla seleccionando esa etiqueta "

-"en la barra lateral y eligiendo <guiseq><gui>Etiquetas</gui><gui>Renombrar "

-"etiqueta \"[nombre]\"...</gui></guiseq> pulsando con el botón derecho y "

-"eligiendo <gui>Renombrar...</gui> o pulsando dos veces en la etiqueta de la "

-"barra lateral. "

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

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

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

-"gui></guiseq> or right-click on the photos an select <gui>Remove Tag "

-"\"[name]\" from Photos</gui>."

-msgstr ""

-"Para cambiar las etiquetas asociadas a una foto en particular, seleccione "

-"esa foto, elija <guiseq><gui>Etiquetas</gui><gui>Modificar etiquetas...</"

-"gui></guiseq> o pulse con el botón derecho en una foto y seleccione "

-"<gui>Modificar etiquetas...</gui> y edite la lista separada por comas. Para "

-"quitar una etiqueta de una o más fotos, primero seleccione esa etiqueta en "

-"la barra lateral, luego seleccione las fotos que quiere quitar y elija "

-"<guiseq><gui>Etiquetas</gui><gui>Quitar etiquetas \"[nombre]\" de fotos</"

-"gui></guiseq> o pulse con el botón derecho en las fotos y seleccione "

-"<gui>Quitar etiquetas \"[nombre]\" de fotos</gui>."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

-msgstr ""

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

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

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

-"«nombre»</gui>."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

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

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

-msgstr ""

-"Cuando crea una etiqueta, aparecerá en la barra lateral bajo el elemento "

-"<gui>Etiquetas</gui>, que se oculta si no hay etiquetas. Las fotos pueden "

-"tener múltiples etiquetas relacionadas con las mismas. Cuando posiciona el "

-"cursor sobre el nombre de una etiqueta en la barra lateral, podrá ver todas "

-"las fotos asociadas a esa etiqueta."

-

-#. (itstool) path: section/title

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

-msgid "Hierarchical Tags"

-msgstr "Etiquetas jerárquicas"

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

-msgstr ""

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

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

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

-"<gui>Nuevo</gui>."

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

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

-msgstr ""

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

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

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

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

-

-#. (itstool) path: section/p

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

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

-msgstr ""

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

-"etiquetas hijas."

-

-#. (itstool) path: info/desc

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

-msgid "Give titles to your photos."

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

-

-#. (itstool) path: page/title

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

-msgid "Titles"

-msgstr "Títulos"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-"filename."

-msgstr ""

-"La casilla de <guiseq><gui>Vista</gui><gui>Títulos</gui></guiseq> activa la "

-"visualización de títulos debajo de cada foto. De manera predeterminada, el "

-"título de la foto es su nombre de archivo."

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-msgstr ""

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

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

-

-#. (itstool) path: info/desc

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

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

-msgstr ""

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

-"del disco."

-

-#. (itstool) path: page/title

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

-msgid "Photo files"

-msgstr "Archivos de fotos"

-

-#. (itstool) path: page/p

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

-msgid ""

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

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

-"library and files on disk in sync."

-msgstr ""

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

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

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

-

-#. (itstool) path: section/title

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

-msgid "Using a custom directory pattern"

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

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

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

-msgstr ""

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

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

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

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

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

-

-#. (itstool) path: section/p

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

-msgid ""

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

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

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

-msgstr ""

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

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

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

-"diferente a estos ejemplos."

-

-#. (itstool) path: td/p

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

-msgid "<em>Symbol</em>"

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

-

-#. (itstool) path: td/p

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

-msgid "<em>Meaning</em>"

-msgstr "<em>Significado</em>"

-

-#. (itstool) path: td/p

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

-msgid "<em>Example</em>"

-msgstr "<em>Ejemplo</em>"

-

-#. (itstool) path: td/p

-#: C/other-files.page:43

-msgid "%Y"

-msgstr "%Y"

-

-#. (itstool) path: td/p

-#: C/other-files.page:43

-msgid "Year: full"

-msgstr "Año: completo"

-

-#. (itstool) path: td/p

-#: C/other-files.page:43

-msgid "2011"

-msgstr "2011"

-

-#. (itstool) path: td/p

-#: C/other-files.page:46

-msgid "%y"

-msgstr "%y"

-

-#. (itstool) path: td/p

-#: C/other-files.page:46

-msgid "Year: two digit"

-msgstr "Año: dos dígitos"

-

-#. (itstool) path: td/p

-#: C/other-files.page:46

-msgid "11"

-msgstr "11"

-

-#. (itstool) path: td/p

-#: C/other-files.page:49

-msgid "%d"

-msgstr "%d"

-

-#. (itstool) path: td/p

-#: C/other-files.page:49

-msgid "Day of the month with leading zero"

-msgstr "Día del mes, empezando por cero"

-

-#. (itstool) path: td/p

-#: C/other-files.page:49

-msgid "03"

-msgstr "03"

-

-#. (itstool) path: td/p

-#: C/other-files.page:52

-msgid "%A"

-msgstr "%A"

-

-#. (itstool) path: td/p

-#: C/other-files.page:52

-msgid "Day name: full"

-msgstr "Nombre del día: completo"

-

-#. (itstool) path: td/p

-#: C/other-files.page:52

-msgid "Wednesday"

-msgstr "Miércoles"

-

-#. (itstool) path: td/p

-#: C/other-files.page:55

-msgid "%a"

-msgstr "%a"

-

-#. (itstool) path: td/p

-#: C/other-files.page:55

-msgid "Day name: abbreviated"

-msgstr "Nombre del día: abreviado"

-

-#. (itstool) path: td/p

-#: C/other-files.page:55

-msgid "Wed"

-msgstr "Mié"

-

-#. (itstool) path: td/p

-#: C/other-files.page:58

-msgid "%m"

-msgstr "%m"

-

-#. (itstool) path: td/p

-#: C/other-files.page:58

-msgid "Month number with leading zero"

-msgstr "Número de mes, empezando por cero"

-

-#. (itstool) path: td/p

-#: C/other-files.page:58

-msgid "02"

-msgstr "02"

-

-#. (itstool) path: td/p

-#: C/other-files.page:60

-msgid "%b"

-msgstr "%b"

-

-#. (itstool) path: td/p

-#: C/other-files.page:60

-msgid "Month name: abbreviated"

-msgstr "Nombre del mes: abreviado"

-

-#. (itstool) path: td/p

-#: C/other-files.page:60

-msgid "Feb"

-msgstr "Feb"

-

-#. (itstool) path: td/p

-#: C/other-files.page:62

-msgid "%B"

-msgstr "%B"

-

-#. (itstool) path: td/p

-#: C/other-files.page:62

-msgid "Month name: full"

-msgstr "Nombre del mes: completo"

-

-#. (itstool) path: td/p

-#: C/other-files.page:62

-msgid "February"

-msgstr "Febrero"

-

-#. (itstool) path: td/p

-#: C/other-files.page:63

-msgid "%I"

-msgstr "%I"

-

-#. (itstool) path: td/p

-#: C/other-files.page:63

-msgid "Hour: 12 hour format"

-msgstr "Hora: formato de 12 horas"

-

-#. (itstool) path: td/p

-#: C/other-files.page:63

-msgid "05"

-msgstr "05"

-

-#. (itstool) path: td/p

-#: C/other-files.page:64

-msgid "%H"

-msgstr "%H"

-

-#. (itstool) path: td/p

-#: C/other-files.page:64

-msgid "Hour: 24 hour format"

-msgstr "Hora: formato de 24 horas"

-

-#. (itstool) path: td/p

-#: C/other-files.page:64

-msgid "17"

-msgstr "17"

-

-#. (itstool) path: td/p

-#: C/other-files.page:66

-msgid "%M"

-msgstr "%M"

-

-#. (itstool) path: td/p

-#: C/other-files.page:66

-msgid "Minute"

-msgstr "Minuto"

-

-#. (itstool) path: td/p

-#: C/other-files.page:66

-msgid "16"

-msgstr "16"

-

-#. (itstool) path: td/p

-#: C/other-files.page:67

-msgid "%S"

-msgstr "%S"

-

-#. (itstool) path: td/p

-#: C/other-files.page:67

-msgid "Second"

-msgstr "Segundo"

-

-#. (itstool) path: td/p

-#: C/other-files.page:67

-msgid "30"

-msgstr "30"

-

-#. (itstool) path: td/p

-#: C/other-files.page:68

-msgid "%p"

-msgstr "%p"

-

-#. (itstool) path: td/p

-#: C/other-files.page:68

-msgid "AM or PM"

-msgstr "AM o PM"

-

-#. (itstool) path: td/p

-#: C/other-files.page:68

-msgid "PM"

-msgstr "PM"

-

-#. (itstool) path: section/p

-#: C/other-files.page:72

-msgid ""

-"There are other symbols available; please check the manual for strftime by "

-"running the command <cmd>man strftime</cmd> if you need one that isn't "

-"listed here."

-msgstr ""

-"Existen otros símbolos disponibles, revise el manual de strftime ejecutando "

-"el comando <cmd>man strftime</cmd> si necesita alguno que no esté listado "

-"aquí."

-

-#. (itstool) path: section/title

-#: C/other-files.page:79

-msgid "Automatically importing photos"

-msgstr "Importar fotos automáticamente"

-

-#. (itstool) path: section/p

-#: C/other-files.page:81

-msgid ""

-"Shotwell can automatically import new photos which appear in the library "

-"directory. (The library directory is usually the <file>Pictures</file> "

-"directory in your home directory; you can change its location in in the "

-"<gui>Preferences</gui> window.)"

-msgstr ""

-"Shotwell puede automáticamente importar nuevas fotos que aparezcan en la "

-"carpeta de la biblioteca. (La carpeta de la biblioteca está usualmente en la "

-"carpeta <file>Imágenes</file> en su carpeta local; puede cambiar esta "

-"ubicación en la ventana <gui>Preferencias</gui>.)"

-

-#. (itstool) path: section/p

-#: C/other-files.page:86

-msgid ""

-"To enable auto-import, check the box <gui>Watch library directory for new "

-"files</gui> in the <gui>Preferences</gui> window."

-msgstr ""

-"Para activar la importación automática, marca la opción <gui>Vigilar mi "

-"colección en búsqueda de archivos nuevos</gui> en la ventana "

-"<gui>Preferencias</gui>."

-

-#. (itstool) path: note/p

-#: C/other-files.page:90

-msgid ""

-"Shotwell can also follow symbolic links inside automatically-imported "

-"directories."

-msgstr ""

-"Shotwell también puede seguir los enlaces simbólicos en carpetas importadas "

-"automáticamente."

-

-#. (itstool) path: section/title

-#: C/other-files.page:95

-msgid "Automatically renaming imported photos to lowercase"

-msgstr "Renombrar a minúsculas automáticamente las fotos importadas"

-

-#. (itstool) path: section/p

-#: C/other-files.page:97

-msgid ""

-"Shotwell can automatically change the filenames of imported photos to "

-"lowercase. To enable this, choose <guiseq><gui>Edit</gui><gui>Preferences</"

-"gui></guiseq>, and in the <gui>Preferences</gui> window, check the "

-"<gui>Rename imported files to lowercase</gui> box."

-msgstr ""

-"Shotwell puede cambiar automáticamente los nombres de las fotos importadas a "

-"minúsculas. Para activar esto, escoja <guiseq><gui>Editar</"

-"gui><gui>Preferencias</gui></guiseq>, y en la ventana de <gui>Preferencias</"

-"gui>, marque la casilla <gui>Renombrar los archivos importados a minúsculas</"

-"gui>."

-

-#. (itstool) path: section/title

-#: C/other-files.page:107

-msgid "Writing metadata on the fly"

-msgstr "Escribir metadatos al vuelo"

-

-#. (itstool) path: section/p

-#: C/other-files.page:109

-msgid ""

-"By default, Shotwell does not modify photo files, even when you edit photos "

-"or change their tags or titles. Shotwell records these changes in its own "

-"database only."

-msgstr ""

-"De manera predeterminada, Shotwell no modifica los archivos de fotos, aunque "

-"las edite o cambie sus etiquetas o títulos. Shotwell guardará estos cambios "

-"únicamente en su propia base de datos."

-

-#. (itstool) path: section/p

-#: C/other-files.page:112

-msgid ""

-"To change this behavior, you can enable the checkbox <gui>Write tags, titles "

-"and other metadata to photo files</gui> in the <gui>Preferences</gui> "

-"dialog. When this option is enabled, Shotwell will write the following "

-"metadata to most photo files whenever you change it in Shotwell:"

-msgstr ""

-"Para cambiar este comportamiento, puede activar la casilla <gui>Escribir "

-"etiquetas, títulos y otros metadatos a los archivos</gui> en el cuadro de "

-"diálogo <gui>Preferencias</gui>. Cuando esta opción se activa, Shotwell "

-"escribirá los siguientes metadatos a la mayoría de los archivos cada vez que "

-"los modifique en Shotwell."

-

-#. (itstool) path: item/p

-#: C/other-files.page:118

-msgid "titles"

-msgstr "títulos"

-

-#. (itstool) path: item/p

-#: C/other-files.page:119

-msgid "tags"

-msgstr "etiquetas"

-

-#. (itstool) path: item/p

-#: C/other-files.page:120

-msgid "ratings"

-msgstr "valoraciones"

-

-#. (itstool) path: item/p

-#: C/other-files.page:121

-msgid "rotation information"

-msgstr "información de rotación"

-

-#. (itstool) path: item/p

-#: C/other-files.page:122

-msgid "time/date"

-msgstr "fecha/hora"

-

-#. (itstool) path: section/p

-#: C/other-files.page:125

-msgid ""

-"Shotwell stores this information in photo files in EXIF, IPTC and/or XMP "

-"format. Note that Shotwell can write only to photo files in JPEG, PNG and "

-"TIFF format, not to BMP photos, RAW photos or to video files."

-msgstr ""

-"Shotwell almacena esta información en archivos de fotos en formato EXIF, "

-"IPTC y/o XMP. Tenga en cuenta que Shotwell sólo puede escribir en archivos "

-"de fotos en formato JPEG, PNG y TIFF, no en fotos en BMP, RAW o en archivos "

-"de vídeo."

-

-#. (itstool) path: section/title

-#: C/other-files.page:133

-msgid "Runtime monitoring"

-msgstr "Monitorizazión en tiempo de ejecución"

-

-#. (itstool) path: section/p

-#: C/other-files.page:135

-msgid ""

-"While Shotwell is running, it notices changes made to any photo file "

-"externally. When a photo file changes, Shotwell rereads the file and updates "

-"your view of the photo and metadata."

-msgstr ""

-"Mientras Shotwell está en ejecución, tiene en cuenta los cambios realizados "

-"en un archivo de una foto externamente. Cuando el archivo cambia, Shotwell "

-"vuelve a leer el archivo y actualiza la vista de la foto y sus metadatos."

-

-#. (itstool) path: section/p

-#: C/other-files.page:139

-msgid ""

-"Note that Shotwell checks all photo files for changes at startup, but only "

-"photo files contained in the library directory are monitored in real time "

-"after startup. We hope to remove this limitation in a further release."

-msgstr ""

-"Tenga en cuenta que Shotwell comprueba todos los archivos de fotos para ver "

-"si hay cambios al inicio, pero sólo los archivos de fotos contenidos en la "

-"carpeta de la biblioteca se supervisan en tiempo real después del inicio. "

-"Esperamos eliminar esta limitación en una nueva versión."

-

-#. (itstool) path: info/desc

-#: C/other-missing.page:7

-msgid "If Shotwell can't find a photo in your library, it marks it as missing."

-msgstr ""

-"Si Shotwell no puede encontrar una foto en su biblioteca, la marca como "

-"ausente."

-

-#. (itstool) path: page/title

-#: C/other-missing.page:12

-msgid "Missing photos"

-msgstr "Fotos ausentes"

-

-#. (itstool) path: page/p

-#: C/other-missing.page:14

-msgid ""

-"Each time Shotwell starts up, it scans your photo library to verify that all "

-"photo files still exist on your hard drive. If Shotwell finds that any photo "

-"files are missing, it will not display them in the normal Photos, Events and "

-"Tags views, but will instead show them in a separate Missing Files view "

-"which will appear in the sidebar."

-msgstr ""

-"Cada vez que Shotwell se inicia, analiza su biblioteca de fotos para "

-"verificar que todos los archivos de fotos siguen existiendo en el disco "

-"duro. Si Shotwell encuentra que falta alguna foto, no la mostrará en las "

-"vistas normales de Fotos, Eventos o Etiquetas, sino que la mostrará en una "

-"vista de Fotos ausentes separada que aparecerá en la barra lateral."

-

-#. (itstool) path: page/p

-#: C/other-missing.page:16

-msgid ""

-"If you no longer want the missing files to be part of your Shotwell "

-"collection (perhaps because you deleted them), go to the Missing Files view, "

-"select the photos and then click <gui>Remove From Library</gui>."

-msgstr ""

-"Si ya no quiere que los archivos que faltan formen parte de su colección "

-"Shotwell (tal vez porque los ha eliminado), vaya a la vista de Fotos "

-"ausentes, seleccione las fotos y, a continuación, pulse en <gui>Eliminar de "

-"la biblioteca</gui>."

-

-#. (itstool) path: page/p

-#: C/other-missing.page:18

-msgid ""

-"If you have photos on a removable disk, such as a CD or USB flash drive, and "

-"<link xref=\"index#import\">import</link> them into Shotwell <em>without</"

-"em> copying the photos to your computer, they will show up as missing files "

-"if you then disconnect the removable disk. See <link xref=\"import-file\"/> "

-"to learn how to copy files from removable disks onto your computer."

-msgstr ""

-"Si tiene fotos en un disco externo, como un CD o un pendrive USB y las <link "

-"xref=\"index#import\">importa</link> en Shotwell <em>sin</em> copiarlas al "

-"equipo, se mostrarán como archivos ausentes cuando desconecte el disco "

-"extraíble. Consulte la <link xref=\"import-file\"/> para aprender cómo "

-"copiar archivos desde discos extraíbles a su equipo."

-

-#. (itstool) path: page/p

-#: C/other-missing.page:20

-msgid ""

-"If any missing photo files become available again, Shotwell will notice this "

-"the next time it starts. The photos will once again appear in the Photos, "

-"Events and Tags views."

-msgstr ""

-"Si una foto ausente vuelve a estar disponible, Shotwell lo tendrá en cuenta "

-"la próxima vez que se inicie. Las fotos volverán a aparecer en las vistas de "

-"Fotos, Eventos y Etiquetas."

-

-#. (itstool) path: info/desc

-#: C/other-multiple.page:7

-msgid ""

-"You can open Shotwell with a different photo library by using the command "

-"line."

-msgstr ""

-"Puede abrir Shotwell con una biblioteca de fotos diferente usando la línea "

-"de comandos."

-

-#. (itstool) path: page/title

-#: C/other-multiple.page:12

-msgid "Multiple libraries"

-msgstr "Varias bibliotecas"

-

-#. (itstool) path: page/p

-#: C/other-multiple.page:14

-msgid ""

-"Shotwell normally stores its database and photo thumbnails in the directory "

-"<file>~/.shotwell</file> . This directory does not hold photos, but the "

-"database in this directory contains a list of all the photos in the Shotwell "

-"library."

-msgstr ""

-"Normalmente, Shotwell almacena su base de datos y miniaturas de fotos en la "

-"carpeta <file>~/.shotwell</file>. Esta carpeta no contiene fotos, pero la "

-"base de datos de esta carpeta contiene una lista de todas las fotos de la "

-"biblioteca de Shotwell."

-

-#. (itstool) path: page/p

-#: C/other-multiple.page:16

-msgid ""

-"As an advanced feature, it's possible for you to have multiple Shotwell "

-"libraries, each of which has its own set of photos. Each library needs its "

-"own database directory. To launch Shotwell with an alternate library, "

-"specify an alternate database directory on the command line as follows:"

-msgstr ""

-"Como característica avanzada, es posible tener varias bibliotecas de "

-"Shotwell, cada una de ellas con su propio conjunto de fotos. Cada biblioteca "

-"necesita su propia carpeta de base de datos. Para ejecutar Shotwell con una "

-"biblioteca diferente, especifique una base de datos alternativa en la línea "

-"de comandos como sigue:"

-

-#. (itstool) path: page/screen

-#: C/other-multiple.page:18

-#, no-wrap

-msgid ""

-"\n"

-"shotwell -d [library-directory]\n"

-msgstr ""

-"\n"

-"shotwell -d [carpeta-biblioteca]\n"

-

-#. (itstool) path: info/desc

-#: C/other-plugins.page:7

-msgid "Extend Shotwell's functionality dynamically."

-msgstr "Ampliar la funcionalidad de Shotwell dinámicamente."

-

-#. (itstool) path: page/title

-#: C/other-plugins.page:12

-msgid "Plugins"

-msgstr "Complementos"

-

-#. (itstool) path: page/p

-#: C/other-plugins.page:13

-msgid ""

-"Shotwell can be used with <em>plugins</em>, which are companion shared "

-"libraries that can add support for new publishing destinations or new "

-"slideshow transitions."

-msgstr ""

-"Shotwell se puede usar con <em>complementos</em>, que son bibliotecas "

-"compartidas complementarias que pueden agregar soporte para nuevos destinos "

-"de publicación o nuevas transiciones de presentación de diapositivas."

-

-#. (itstool) path: page/p

-#: C/other-plugins.page:18

-msgid ""

-"To see a list of installed plugins, choose <guiseq><gui>Edit</"

-"gui><gui>Preferences</gui></guiseq>, and in the <gui>Preferences</gui> "

-"window, click on the <gui>Plugins</gui> tab. You'll see a list of currently-"

-"installed plugins, each with a checkbox by it, and you may enable or disable "

-"each by selecting or deselecting the checkbox by its name."

-msgstr ""

-"Para ver una lista de los complementos instalados, elija "

-"<guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>, y en la ventana "

-"de <gui>Preferencias</gui> pulse en la pestaña <gui>Complementos</gui>. Verá "

-"una lista de los complementos actualmente instalados, cada uno con una "

-"casilla mediante la que puede activarlos o desactivarlos por su nombre."

-

-#. (itstool) path: note/p

-#: C/other-plugins.page:25

-msgid ""

-"Full documentation on how to develop new plugins is available at <link href="

-"\"http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins"

-"\">http://redmine.yorba.org/projects/shotwell/wiki/"

-"ShotwellArchWritingPlugins</link>"

-msgstr ""

-"La documentación completa sobre cómo desarrollar nuevos complementos está "

-"disponible en <link href=\"http://redmine.yorba.org/projects/shotwell/wiki/"

-"ShotwellArchWritingPlugins\">http://redmine.yorba.org/projects/shotwell/wiki/"

-"ShotwellArchWritingPlugins</link>"

-

-#. (itstool) path: info/desc

-#: C/raw.page:7

-msgid "More about RAW support in Shotwell."

-msgstr "Más sobre el soporte RAW en Shotwell."

-

-#. (itstool) path: page/title

-#: C/raw.page:12

-msgid "RAW support in Shotwell"

-msgstr "Soporte de RAW en Shotwell"

-

-#. (itstool) path: page/p

-#: C/raw.page:13

-msgid ""

-"Some cameras have the ability to store data directly off the sensor and into "

-"a file that contains extra color information; this is commonly referred to "

-"as 'RAW' or 'camera RAW', and Shotwell supports these files as well."

-msgstr ""

-"Algunas cámaras tienen la capacidad de almacenar datos directamente del "

-"sensor y en un archivo que contiene información adicional de color; Esto se "

-"conoce comúnmente como «RAW» o «cámara RAW», y Shotwell soporta estos "

-"archivos también."

-

-#. (itstool) path: page/p

-#: C/raw.page:18

-msgid ""

-"Since RAW photographs normally cannot be displayed directly, but must be "

-"first developed - that is, have their extra information interpreted and "

-"readied for displaying - most cameras will either embed a JPEG inside a RAW-"

-"format file, or produce a JPEG alongside the RAW file at the time the "

-"snapshot is taken. The latter is referred to throughout this document as RAW"

-"+JPEG. If you import a RAW+JPEG pair, Shotwell will keep them paired and "

-"treat them as one item in your library."

-msgstr ""

-"Dado que las fotografías RAW normalmente no se pueden mostrar directamente, "

-"sino que deben ser desarrolladas por primera vez (se interpreta y se prepara "

-"su información adicional para mostrarse) la mayoría de las cámaras "

-"incorporarán un JPEG dentro de un archivo en formato RAW, o producirán un "

-"JPEG junto con el archivo RAW en el momento en que se toma la foto. Este "

-"último se refiere a todo este documento como RAW+JPEG. Si importa una "

-"pareja de RAW+JPEG, Shotwell los mantendrá sincronizados y los tratará como "

-"un elemento de su biblioteca."

-

-#. (itstool) path: page/p

-#: C/raw.page:27

-msgid ""

-"When you import a RAW file, you can choose to either use the camera's "

-"internally-developed JPEG or Shotwell's by selecting <guiseq><gui>Photos</"

-"gui><gui>Developer</gui></guiseq> in the menus."

-msgstr ""

-"Al importar un archivo RAW, puede elegir entre usar el desarrollador JPEG "

-"interno de la cámara o el de Shotwell seleccionando <guiseq><gui>Fotos</"

-"gui><gui>Desarrollador</gui></guiseq> en los menús."

-

-#. (itstool) path: note/p

-#: C/raw.page:33

-msgid ""

-"Changing between developers will cause all edits made to a photograph to be "

-"discarded."

-msgstr ""

-"Cambiar entre desarrolladores hará que todas las ediciones hechas en una "

-"foto se descarten."

-

-#. (itstool) path: page/p

-#: C/raw.page:39

-msgid ""

-"In order to publish or use a RAW photograph in most other software, it has "

-"to be exported first. Shotwell can export your RAW photos in JPEG, PNG, TIFF "

-"or BMP format, and, when publishing, will internally export a JPEG version "

-"for you and publish that."

-msgstr ""

-"Para publicar o usar una foto RAW en la mayoría de los programas, primero se "

-"debe exportar. Shotwell puede exportar sus fotos RAW en formato JPEG, PNG, "

-"TIFF o BMP y, al publicarlas, exportará internamente una versión JPEG para "

-"y la publicará."

-

-#. (itstool) path: info/desc

-#: C/running.page:7

-msgid ""

-"Find Shotwell in the Applications menu, or have it start automatically when "

-"you plug in a camera."

-msgstr ""

-"Busque Shotwell en el menú Aplicaciones o haga que se inicie automáticamente "

-"cuando conecta una cámara."

-

-#. (itstool) path: page/title

-#: C/running.page:14

-msgid "Running Shotwell"

-msgstr "Ejecutar Shotwell"

-

-#. (itstool) path: page/p

-#: C/running.page:16

-msgid ""

-"Once installed, Shotwell is available in your <gui>Applications</gui> menu "

-"under <gui>Graphics</gui> or <gui>Photography</gui>."

-msgstr ""

-"Una vez instalado, Shotwell estará disponible en su menú <gui>Aplicaciones</"

-"gui>, en <gui>Gráficos</gui> o en <gui>Fotografía</gui>."

-

-#. (itstool) path: page/p

-#: C/running.page:18

-msgid ""

-"Shotwell may also be executed automatically when a camera is plugged in to "

-"your computer. To check that your system is set up to run Shotwell when a "

-"camera is detected, go to <guiseq><gui>Edit</gui><gui>Preferences</gui></"

-"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"

-"gui> tab.  You'll see a dropdown box entitled <gui>Photos:</gui> which lets "

-"you choose Shotwell as your photo handling application."

-msgstr ""

-"Shotwell también se puede ejecutar automáticamente cuando una cámara está "

-"conectada a su ordenador. Para comprobar que su sistema está configurado "

-"para ejecutar Shotwell cuando se detecta una cámara, pulse en "

-"<guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> en cualquier "

-"ventana de Nautilus (explorador) y elija la pestaña <gui>Media</gui>.Verá un "

-"cuadro desplegable titulado <gui>Fotos:</gui> que le permitirá elegir "

-"Shotwell como su aplicación de gestión de fotos."

-

-#. (itstool) path: note/p

-#: C/running.page:25

-msgid ""

-"Shotwell may also be executed directly from its build directory, although "

-"this is only recommended for testing out Shotwell or for developers."

-msgstr ""

-"También puede ejecutar Shotwell directamente desde la carpeta en la que se "

-"construyó, pero esto sólo se recomienda para probar Shotwell o para "

-"desarrolladores."

-

-#. (itstool) path: info/desc

-#: C/share-background.page:7

-msgid ""

-"Set your desktop background to a single photo or to a slideshow of photos."

-msgstr ""

-"Configure su fondo de escritorio como una única foto o como una presentación "

-"de fotos."

-

-#. (itstool) path: page/title

-#: C/share-background.page:12

-msgid "Set a desktop background or slideshow"

-msgstr "Configurar un fondo de escritorio o presentación"

-

-#. (itstool) path: page/p

-#: C/share-background.page:14

-msgid ""

-"To set a single photo as your desktop background, select the photo and "

-"choose <guiseq><gui>File</gui><gui>Set as Desktop Background</gui></guiseq>."

-msgstr ""

-"Para establecer una única foto como fondo del escritorio, seleccione la foto "

-"y escriba <guiseq><gui>Archivo</gui><gui>Establecer como fondo del "

-"escritorio</gui></guiseq>."

-

-#. (itstool) path: page/p

-#: C/share-background.page:16

-msgid ""

-"You can also set your background to a slideshow of photos. To do this, "

-"select the photos for the slideshow and choose <guiseq><gui>File</"

-"gui><gui>Set as Desktop Slideshow...</gui></guiseq>. Shotwell will prompt "

-"you for a slideshow delay, which can be any interval up to one day in "

-"length. The background slideshow will proceed even when Shotwell is not "

-"running."

-msgstr ""

-"También puede configurar su fondo para una presentación de fotos. Para ello, "

-"seleccione las fotos de la presentación y elija <guiseq><gui>Archivo</"

-"gui><gui>Establecer como presentación de diapositivas de escritorio...</"

-"gui></guiseq>. Shotwell le pedirá el tiempo de duración de cada diapositiva, "

-"que puede ser desde cualquier intervalo de tiempo hasta un día. La "

-"presentación de diapositivas de fondo continuará incluso cuando Shotwell no "

-"esté funcionando."

-

-#. (itstool) path: info/desc

-#: C/share-export.page:7

-msgid "Copy photos out of Shotwell so you can put them somewhere else."

-msgstr ""

-"Copiar fotos fuera Shotwell, para poder ponerlas en cualquier otro lugar."

-

-#. (itstool) path: page/title

-#: C/share-export.page:12

-msgid "Exporting photos"

-msgstr "Exportar fotos"

-

-#. (itstool) path: page/p

-#: C/share-export.page:14

-msgid ""

-"To export photos from Shotwell via drag and drop, drag the photos from "

-"Shotwell onto a file manager window or your desktop. The new files will be "

-"full-sized copies of the photos in your library."

-msgstr ""

-"Para exportar fotos desde Shotwell usando arrastrar y soltar, arrastre desde "

-"Shotwell hacia una ventana de manejador de archivos o su escritorio. Los "

-"archivos nuevos serán copias de tamaño completo de las fotos de su "

-"biblioteca."

-

-#. (itstool) path: page/p

-#: C/share-export.page:18

-msgid ""

-"Alternatively, select a set of photos and choose the <guiseq><gui>File</"

-"gui><gui>Export...</gui></guiseq> command or press <keyseq><key>Shift</"

-"key><key>Ctrl</key><key>E</key></keyseq>, which exports photos while letting "

-"you fine-tune the size and dimensions of your photo files. A window will "

-"appear allowing you to make several choices:"

-msgstr ""

-"Alternativamente, seleccione un conjunto de fotos y elija el comando "

-"<guiseq><gui>Archivo</gui><gui>Exportar...</gui></guiseq> o pulse "

-"<keyseq><key>Shift</key><key>Ctrl</key><key>E</key></keyseq> , para exportar "

-"las fotos y al mismo tiempo ajustar el tamaño y las dimensiones de sus "

-"archivos de fotos. Aparecerá una ventana que le permitirá realizar varias "

-"opciones:"

-

-#. (itstool) path: item/p

-#: C/share-export.page:24

-msgid "A format for export."

-msgstr "Un formato al que exportar."

-

-#. (itstool) path: item/p

-#: C/share-export.page:27

-msgid ""

-"Choose <gui>Unmodified</gui> to export photos in their original format "

-"without any edits made in Shotwell. RAW photos will be exported in their "

-"original RAW format."

-msgstr ""

-"Selecione <gui>Sin modificar</gui> para exportar las fotos en su formato "

-"original, sin ninguna modificación hecha en Shotwell. Las fotos en bruto se "

-"exportarán en su formato original."

-

-#. (itstool) path: item/p

-#: C/share-export.page:29

-msgid ""

-"Choose <gui>Current</gui> to export photos including edits made in Shotwell. "

-"RAW photos will be exported in JPEG format if you have edited them in "

-"Shotwell, and otherwise in their original RAW format."

-msgstr ""

-"Escoja <gui>Actual</gui> para exportar las fotos, incluyendo las editadas en "

-"Shotwell. Las fotos en bruto se exportarán en formato JPEG si las editó en "

-"Shotwell, y si no en su formato en bruto original."

-

-#. (itstool) path: item/p

-#: C/share-export.page:31

-msgid ""

-"Or you can choose a particular image format (JPEG, PNG, TIFF, BMP) to be "

-"used for exporting. Any edits made in Shotwell will be included, and "

-"Shotwell will convert photos to the destination format."

-msgstr ""

-"O puede seleccionar un formato de imagen específico (JPEG, PNG,TIFF, BMP) "

-"para usar en la exportación. Cualquier edición hecha en Shotwell se "

-"incluirá, y Shotwel convertirá las fotos al formato de destino."

-

-#. (itstool) path: item/p

-#: C/share-export.page:37

-msgid "The image quality for exporting (Low, Medium, High, or Maximum)."

-msgstr "La calidad de la imagen al exportarla (baja, media, alta o máxima)."

-

-#. (itstool) path: item/p

-#: C/share-export.page:38

-msgid ""

-"A scaling constraint (which means how Shotwell will decide to scale the "

-"photos down), and the desired pixel size."

-msgstr ""

-"Una restricción de la escala (que significa cómo Shotwell va a decidir "

-"reducir la escala proporcionalmente), y el tamaño de píxel requerido."

-

-#. (itstool) path: item/p

-#: C/share-export.page:39

-msgid ""

-"The option whether you like to export metadatas such as tags or ratings. "

-"This can help to save your privacy if you have geolocation tags or tags "

-"which shouldn't be seen by anyone."

-msgstr ""

-"La opción de si quiere exportar metadatos como etiquetas o puntuaciones "

-"puede ayudar a preservar su privacidad en caso de que tenga etiquetas o "

-"etiquetas de geolocalización que nadie debería ver."

-

-#. (itstool) path: page/p

-#: C/share-export.page:42

-msgid ""

-"If selected, Shotwell will write tags, titles, and other metadata to the new "

-"files."

-msgstr ""

-"Si está seleccionada, Shotwell escribirá etiquetas, títulos y otros "

-"metadatos a los nuevos archivos."

-

-#. (itstool) path: info/desc

-#: C/share-print.page:7

-msgid ""

-"Click <guiseq><gui>File</gui><gui>Print...</gui></guiseq>. For more printing "

-"options, select the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog."

-msgstr ""

-"Pulse <guiseq><gui>Archivo</gui><gui>Imprimir...</gui></guiseq>. Para más "

-"opciones de impresión, seleccione la pestaña <gui>Configuración de página</"

-"gui> en el diálogo <gui>Imprimir</gui>."

-

-#. (itstool) path: page/title

-#: C/share-print.page:12

-msgid "Printing"

-msgstr "Imprimir"

-

-#. (itstool) path: page/p

-#: C/share-print.page:14

-msgid ""

-"To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print...</"

-"gui></guiseq>."

-msgstr ""

-"Para imprimir una foto, selecciónela y elija <guiseq><gui>Archivo</"

-"gui><gui>Imprimir</gui></guiseq>."

-

-#. (itstool) path: page/p

-#: C/share-print.page:16

-msgid ""

-"Shotwell can also print multiple images in one page; to do this, select "

-"multiple images, choose <guiseq><gui>File</gui><gui>Print...</gui></guiseq>, "

-"and in the <gui>Print</gui> dialog, choose the <gui>Image Settings</gui> "

-"tab. In <gui>Image Settings</gui>, choose one of the multiple-image-per-page "

-"options under <gui>Autosize</gui>."

-msgstr ""

-"Shotwell puede también imprimir varias imágenes en una página; para hacer "

-"esto, seleccione las imágenes, elija <guiseq><gui>Archivo</"

-"gui><gui>Imprimir</gui></guiseq> y en el cuadro de diálogo <gui>Imprimir</"

-"gui>, seleccione la pestaña <gui>Configuraciones de la imagen</gui>. "

-"En<gui>Configuración de la imagen</gui>, elija una de las opciones múltiples "

-"imágenes por página en <gui>Tamaño automático</gui>."

-

-#. (itstool) path: page/p

-#: C/share-print.page:23

-msgid ""

-"If you would like to set formatting, paper size, and orientation options, "

-"choose the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog prior to "

-"printing."

-msgstr ""

-"Si quiere establecer el formato, el tamaño del papel, y la orientación, "

-"seleccione la pestaña <gui>Configuración de la página</gui>en el cuadro de "

-"diálogo <gui>Imprimir</gui> antes de imprimir."

-

-#. (itstool) path: info/desc

-#: C/share-send.page:7

-msgid "Send photos via email, instant messaging or in other ways."

-msgstr "Enviar fotos por correo-e, mensajería instantánea u otras maneras."

-

-#. (itstool) path: page/title

-#: C/share-send.page:12

-msgid "Sending photos"

-msgstr "Enviar fotos"

-

-#. (itstool) path: page/p

-#: C/share-send.page:14

-msgid ""

-"Shotwell can send photos using the GNOME desktop's Send To mechanism, which "

-"lets you send photos via email, instant messaging or in other ways."

-msgstr ""

-"Shotwell puede enviar fotos usando el mecanismo de «Enviar a» de GNOME, lo "

-"que le permite enviar fotos por correo-e, mensajería instantánea u otras "

-"maneras."

-

-#. (itstool) path: page/p

-#: C/share-send.page:16

-msgid ""

-"To send photos, select them in Shotwell and choose <guiseq><gui>File</"

-"gui><gui>Send To...</gui></guiseq>, or right-click the photos and choose "

-"<gui>Send To...</gui> from the context menu. A <gui>Send To</gui> dialog box "

-"will appear which lets you choose a mechanism for sending the files (such as "

-"email or instant messaging) and a destination. You can optionally choose to "

-"send the files in a compressed format."

-msgstr ""

-"Para enviar fotos, selecciónelas en Shotwell y después "

-"escoja<guiseq><gui>Archivo</gui><gui>Enviar a...</gui></guiseq>, o pulse con "

-"el botón derecho en las fotos y escoja <gui>Enviar a ...</gui> del menú "

-"contextual. Aparecerá una caja de diálogo en donde puede escoger la forma "

-"para enviar los archivos (como correo electrónico o mensaje instantáneo) y "

-"el destino. Puede, opcionalmente, enviar los archivos en un formato "

-"comprimido."

-

-#. (itstool) path: info/desc

-#: C/share-slideshow.page:7

-msgid "Watch a slideshow of your photos."

-msgstr "Ver sus fotos como diapositivas."

-

-#. (itstool) path: page/title

-#: C/share-slideshow.page:12

-msgid "Slideshows"

-msgstr "Diapositivas"

-

-#. (itstool) path: page/p

-#: C/share-slideshow.page:14

-msgid ""

-"To see a sideshow of any collection in Shotwell, navigate to that collection "

-"and select <guiseq><gui>View</gui><gui>Slideshow</gui></guiseq> or press "

-"<key>F5</key>."

-msgstr ""

-"Para ver una presentación de diapositivas en Shotwell, navegue hasta la "

-"colección y elija <guiseq><gui>Ver</gui><gui>Presentación</gui></guiseq> o "

-"pulse <key>F5</key>."

-

-#. (itstool) path: page/p

-#: C/share-slideshow.page:16

-msgid "You can change some settings in a running slideshow:"

-msgstr ""

-"Puede cambiar algunas configuraciones de una presentación de diapositivas en "

-"ejecución:"

-

-#. (itstool) path: item/p

-#: C/share-slideshow.page:19

-msgid "The duration how long an image should be shown: 1 - 30 seconds"

-msgstr ""

-"La duración de cuánto tiempo se debe mostrar una imagen: 1 - 30 segundos"

-

-#. (itstool) path: item/p

-#: C/share-slideshow.page:20

-msgid "You can select different transition effects."

-msgstr "Puede seleccionar diferentes efectos de transición."

-

-#. (itstool) path: item/p

-#: C/share-slideshow.page:21

-msgid "The time for each transition effect: 0.1 - 1.0 seconds"

-msgstr "El tiempo para cada efecto de transición: 0.1 - 1.0 segundos"

-

-#. (itstool) path: info/desc

-#: C/share-upload.page:7

-msgid "Publish photos to Facebook, Flickr, Picasa Web Albums, or other sites."

-msgstr ""

-"Publica fotos en Facebook, Flickr, álbumes web de Picasa o en otros sitios."

-

-#. (itstool) path: page/title

-#: C/share-upload.page:12

-msgid "Publishing to the Web"

-msgstr "Publicar en la web"

-

-#. (itstool) path: page/p

-#: C/share-upload.page:14

-msgid ""

-"Through the use of <link xref=\"other-plugins\">plugins</link>, Shotwell can "

-"publish photos and videos to the following services, each of which requires "

-"an account:"

-msgstr ""

-"Gracias al uso de <link xref=\"other-plugins\">complementos</link>, Shotwell "

-"puede publicar fotos y vídeos en los siguientes servicios, para los que se "

-"requiere una cuenta."

-

-#. (itstool) path: item/p

-#: C/share-upload.page:18

-msgid "<link href=\"http://facebook.com\">Facebook</link>"

-msgstr "<link href=\"http://facebook.com\">Facebook</link>"

-

-#. (itstool) path: item/p

-#: C/share-upload.page:19

-msgid "<link href=\"http://flickr.com\">Flickr</link>"

-msgstr "<link href=\"http://flickr.com\">Flickr</link>"

-

-#. (itstool) path: item/p

-#: C/share-upload.page:20

-msgid ""

-"<link href=\"http://picasaweb.google.com\">Picasa Web Albums</link> and "

-"<link href=\"http://plus.google.com\">Google+</link>"

-msgstr ""

-"<link href=\"http://picasaweb.google.com\">Álbumes de Picasa Web</link> y "

-"<link href=\"http://plus.google.com\">Google+</link>"

-

-#. (itstool) path: item/p

-#: C/share-upload.page:21

-msgid "<link href=\"http://youtube.com\">YouTube</link> (videos only)"

-msgstr "<link href=\"http://youtube.com\">YouTube</link> (sólo vídeos)"

-

-#. (itstool) path: item/p

-#: C/share-upload.page:22

-msgid ""

-"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, a photo site "

-"popular in Russia (photos only)"

-msgstr ""

-"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, una página de "

-"fotos popular en Rusia (sólo fotos)"

-

-#. (itstool) path: item/p

-#: C/share-upload.page:23

-msgid ""

-"Any site running the <link href=\"http://piwigo.org\">Piwigo</link> photo "

-"gallery software (photos only)"

-msgstr ""

-"Cualquier sitio que ejecute el software de galería de fotos <link href="

-"\"http://piwigo.org\">Piwigo</link> (sólo fotos)"

-

-#. (itstool) path: page/p

-#: C/share-upload.page:26

-msgid ""

-"To publish selected photos in a collection, choose <guiseq><gui>Edit</"

-"gui><gui>Preferences</gui></guiseq> and click on the <gui>Plugins</gui> tab "

-"to enable the plugin for the service you want to publish to. Next, choose, "

-"<guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</"

-"gui> toolbar button or use <keyseq><key>Ctrl</key><key>P</key></keyseq>. You "

-"will see a dialog that lets you select a publishing service. You will then "

-"need to log in or create an account."

-msgstr ""

-"Para publicar las fotos seleccionadas en una colección, elija "

-"<guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> y pulse en la "

-"pestaña <gui>Complementos</gui> para activar el complemento del servicio en "

-"el que quiere publicar. A continuación, elija <guiseq><gui>Archivo</"

-"gui><gui>Publicar</gui></guiseq>, pulse el botón <gui>Publicar</gui> en la "

-"barra de herramientas o pulse <keyseq><key>Ctrl</key><key>P</key></keyseq>. "

-"Verá un diálogo que le permite elegir el servicio de publicación. Necesitará "

-"iniciar sesión o crear una cuenta."

-

-#. (itstool) path: page/p

-#: C/share-upload.page:31

-msgid ""

-"Publishing to Facebook requires you to grant certain permissions to the "

-"Shotwell Facebook application. You only need to grant these permissions "

-"once, when you first associate Shotwell with your Facebook account."

-msgstr ""

-"Publicar en Facebook requiere que conceda ciertos permisos a la aplicación "

-"Conectar Shotwell con Facebook. Solo necesita conceder los permisos una vez, "

-"la primera vez que asocie Shotwell con su cuenta de Facebook."

-

-#. (itstool) path: note/p

-#: C/share-upload.page:34

-msgid ""

-"You will be only able to publish images with at most the permission you "

-"granted to the Shotwell Facebook application"

-msgstr ""

-"Solo podrá publicar imágenes con el permiso que concedió a la aplicación "

-"Facebook de Shotwell"

-

-#. (itstool) path: page/p

-#: C/share-upload.page:36

-msgid ""

-"Similarly, publishing to Flickr requires you to log in and permit Shotwell "

-"Connect to access your account."

-msgstr ""

-"Del mismo modo, publicar en Flickr requiere que inicie sesión y permita que "

-"Shotwell Connect acceda a su cuenta."

-

-#. (itstool) path: page/p

-#: C/share-upload.page:38

-msgid ""

-"If you have a Google account, but have not yet used Picasa Web Albums, you "

-"will need to log in to Picasa using a browser once before you can publish to "

-"this service."

-msgstr ""

-"Si tiene una cuenta de Google, pero nunca ha usado los álbumes web de "

-"Picasa, necesitará iniciar sesión en Picasa usando un navegador antes de "

-"poder publicar algo en este servicio."

-

-#. (itstool) path: info/desc

-#: C/view-displaying.page:7

-msgid ""

-"Learn about different ways of viewing your photos: in a grid, filling the "

-"main window, or filling the whole screen."

-msgstr ""

-"Aprenda sobre diferentes formas de ver sus fotos: en una cuadrícula, "

-"llenando la ventana principal o a pantalla completa."

-

-#. (itstool) path: page/title

-#: C/view-displaying.page:12

-msgid "Photo views"

-msgstr "Vistas de fotos"

-

-#. (itstool) path: page/p

-#: C/view-displaying.page:14

-msgid ""

-"When you select any collection in the sidebar, Shotwell displays all photos "

-"in the collection in the main window area. At the bottom right is a slider "

-"which adjusts the viewing size of the thumbnails. You may also adjust the "

-"thumbnail size using the plus and minus keys (<key>+</key> and <key>-</key>) "

-"or by pressing <key>Ctrl</key> while moving your mouse scroll wheel."

-msgstr ""

-"Cuando selecciona cualquier colección en la barra lateral, Shotwell muestra "

-"todas las fotos en esa colección en la ventana principal. En la esquina "

-"inferior derecha hay un control deslizante que puede ajustar el tamaño de "

-"las vistas miniatura. Puede ajustar el tamaño de las miniaturas usando las "

-"teclas más y menos (<key>+</key> y <key>-</key>) o presionando <key>Ctrl</"

-"key> mientras mueve la rueda central del ratón."

-

-#. (itstool) path: page/p

-#: C/view-displaying.page:16

-msgid ""

-"You can view a photo full-window by double-clicking on it. From there you "

-"may move to other photos in the collection with the Back and Forward "

-"buttons. To return to the collection, double-click on the photo or press "

-"<key>Esc</key>."

-msgstr ""

-"Puede ver la vista de la foto en pantalla completa pulsando dos veces. Desde "

-"ahí puede moverse a otras fotos en la colección con los botones de retroceso "

-"y avance. Puede regresar a la colección, pulsando dos veces en la foto o "

-"presionando <key>Esc</key>."

-

-#. (itstool) path: page/p

-#: C/view-displaying.page:18

-msgid ""

-"When viewing a photo in full-window mode, the slider on the toolbar controls "

-"zoom. You can pan around by grabbing and dragging anywhere on the photo. You "

-"can also zoom using your scroll wheel or by pressing the following keyboard "

-"shortcuts: <keyseq><key>Ctrl</key>0</keyseq> for the full image, "

-"<keyseq><key>Ctrl</key>1</keyseq> for 100% (1 photo pixel = 1 screen pixel), "

-"and <keyseq><key>Ctrl</key>2</keyseq> for 200% (1 photo pixel = 2x2 screen "

-"pixels)."

-msgstr ""

-"Al visualizar una foto en pantalla completa, el control deslizante de la "

-"barra de herramientas controla el zoom. Puede desplazarse agarrando y "

-"arrastrando donde quiera en la foto. También puede hacer zoom utilizando la "

-"rueda de desplazamiento o pulsando los siguientes atajos de teclado: "

-"<keyseq><key>Ctrl</key>0</keyseq> para la imagen completa, "

-"<keyseq><key>Ctrl</key>1</keyseq> para el 100% (1 pixel de la foto = 1 pixel "

-"de la pantalla), y <keyseq><key>Ctrl</key>2</keyseq> para el 200% (1 pixel "

-"de la foto = 2x2 pixeles de la pantalla)."

-

-#. (itstool) path: page/p

-#: C/view-displaying.page:20

-msgid ""

-"Shotwell offers a fullscreen mode to display photos. Choose "

-"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</"

-"key>. To see the fullscreen toolbar, move your mouse to the bottom of the "

-"screen. The toolbar offers buttons to move through the collection, to pin "

-"the toolbar down (so it isn't hidden when you move the mouse away), and to "

-"leave fullscreen view."

-msgstr ""

-"Shotwell ofrece un modo de pantalla completa para mostrar las fotos. Escoja "

-"<guiseq><gui>Ver</gui><gui>Pantalla completa</gui></guiseq> o presione "

-"<key>F11</key>. Para ver la barra de herramientas de pantalla completa, "

-"mueva su ratón a la parte inferior de la pantalla. La barra de herramientas "

-"le ofrece botones para moverse a través de la colección, para fijar la barra "

-"de herramientas (así esta no se ocultará cuando mueva el ratón), y dejar la "

-"vista de pantalla completa."

-

-#. (itstool) path: section/title

-#: C/view-displaying.page:23

-msgid "Viewing videos"

-msgstr "Ver vídeos"

-

-#. (itstool) path: section/p

-#: C/view-displaying.page:24

-msgid ""

-"When you double-click a video, Shotwell will launch an external video player "

-"to play the video. It's not currently possible to display a video in full-"

-"window mode in Shotwell or to play the video within Shotwell itself."

-msgstr ""

-"Cuando pulse dos veces sobre un vídeo, Shotwell lanzará un reproductor de "

-"vídeo externo para reproducir el vídeo. Actualmente no es posible mostrar un "

-"vídeo en modo a pantalla completa o reproducirlo dentro del propio Shotwell"

-

-#. (itstool) path: info/desc

-#: C/view-information.page:7

-msgid ""

-"View more detailed information about photos, like the exposure mode used by "

-"the camera."

-msgstr ""

-"Ver información más detallada sobre las fotos, como el modo de exposición "

-"usado por la cámara."

-

-#. (itstool) path: page/title

-#: C/view-information.page:12

-msgid "Basic and extended information"

-msgstr "Información básica y extendida"

-

-#. (itstool) path: page/p

-#: C/view-information.page:14

-msgid ""

-"The Basic Information pane appears at the bottom of the sidebar, and "

-"displays a brief summary of the photos you've selected. If no photos are "

-"selected, it displays a summary of the entire collection. You can toggle the "

-"display of this pane using the <guiseq><gui>View</gui><gui>Basic "

-"Information</gui></guiseq> command."

-msgstr ""

-"El panel de información básica aparece en la parte inferior de la barra "

-"lateral, y muestra un breve resumen de las fotos que ha seleccionado. Si no "

-"se ha seleccionado ninguna foto, muestra un resumen de la colección "

-"completa. Puede cambiar la visibilidad de este panel usando el comando "

-"<guiseq><gui>Ver</gui><gui>Información básica</gui></guiseq>."

-

-#. (itstool) path: page/p

-#: C/view-information.page:16

-msgid ""

-"The floating Extended Information window displays more information about the "

-"selected photo. The <guiseq><gui>View</gui><gui>Extended Information</gui></"

-"guiseq> command or <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></"

-"keyseq> toggles the display of this window."

-msgstr ""

-"La ventana flotante de información extendida muestra más información sobre "

-"la foto seleccionada. El comando <guiseq><gui>Vista</gui><gui>Información "

-"extendida</gui></guiseq> o <keyseq><key>Ctrl</key><key>Shift</key><key>X</"

-"key></keyseq> activa la visualización de esta ventana."

-

-#. (itstool) path: info/desc

-#: C/view-sidebar.page:7

-msgid ""

-"The sidebar on the left of the window lists various views of your library."

-msgstr ""

-"La barra lateral de la izquierda de la ventana lista varios tipos de vistas "

-"de su biblioteca."

-

-#. (itstool) path: page/title

-#: C/view-sidebar.page:21

-msgid "The sidebar"

-msgstr "La barra lateral"

-

-#. (itstool) path: page/p

-#: C/view-sidebar.page:23

-msgid ""

-"The sidebar on the left side of the Shotwell window lists various views of "

-"your library. Although you may see the same photo in multiple views, it's "

-"only stored once on your hard drive."

-msgstr ""

-"La barra lateral a la izquierda de la ventana de Shotwell lista varias "

-"vistas de su biblioteca. Aunque puede ver muchas vistas de la misma foto, "

-"solo se almacena una en su disco duro"

-

-#. (itstool) path: page/p

-#: C/view-sidebar.page:25

-msgid ""

-"The <gui>Last Import</gui> view lists your last imported photos no matter if "

-"they are imported from F-Spot, your camera, a memory card or the hard disk."

-msgstr ""

-"La vista <gui>Última importación</gui> lista sus últimas fotos importadas no "

-"importa si estas se importaron de F-Spot, su cámara, una tarjeta de memoria "

-"o su disco duro."

-

-#. (itstool) path: page/p

-#: C/view-sidebar.page:27

-msgid "The <gui>Flagged</gui> lists all photos you had previous flagged."

-msgstr ""

-"La opción <gui>Marcada</gui> lista todas las fotos que ha marcado "

-"anteriormente."

-

-#. (itstool) path: page/p

-#: C/view-sidebar.page:29

-msgid ""

-"The <gui>Saved Search</gui> allows you to sort your library by many criteria."

-msgstr ""

-"La <gui>Búsqueda guardada</gui> le permite ordenar su biblioteca bajo "

-"diferentes criterios."

-

-#. (itstool) path: page/p

-#: C/view-sidebar.page:31

-msgid ""

-"The <gui>Events</gui> folder lists all events in your library. An event is a "

-"group of photos that were taken at approximately the same time."

-msgstr ""

-"La carpeta de <gui>Eventos</gui> lista todos los eventos en su biblioteca.Un "

-"evento es un grupo de fotos que se tomaron aproximadamente al mismo tiempo."

-

-#. (itstool) path: page/p

-#: C/view-sidebar.page:33

-msgid ""

-"The <gui>Tags</gui> folder lists all tags you've assigned to photos. Photos "

-"can have multiple tags attached to them. When you click on the name of a tag "

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

-msgstr ""

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

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

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

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

-

-#~ msgid "Facebook"

-#~ msgstr "Facebook"

-

-#~ msgid "Flickr"

-#~ msgstr "Flickr"

-

-#~ msgid "Symbol"

-#~ msgstr "Símbolo"

-

-#~ msgid ""

-#~ "@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"

-#~ msgstr ""

-#~ "@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"

-

-#~ msgid "jim@yorba.org"

-#~ msgstr "jim@yorba.org"

-

-#~ msgid "allison@yorba.org"

-#~ msgstr "allison@yorba.org"

-

-#~ msgid "robert.ancell@canonical.com"

-#~ msgstr "robert.ancell@canonical.com"

-

-#~ msgid "pdo.smith@gmail.com"

-#~ msgstr "pdo.smith@gmail.com"

-

-#~ msgid "philbull@gmail.com"

-#~ msgstr "philbull@gmail.com"

+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2014, 2016.
, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: shotwell master\n"
+"POT-Creation-Date: 2017-03-15 21:36+0000\n"
+"PO-Revision-Date: 2017-03-16 08:13+0100\n"
+"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
+"Language-Team: es <gnome-es-list@gnome.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Gtranslator 2.91.6\n"
+
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+msgctxt "_"
+msgid "translator-credits"
+msgstr ""
+"Marina Prado <mapraro93@hotmail.com>, 2016\n"
+"Daniel Mustieles <daniel.mustieles@gmail.com>, 2014 - 2016\n"
+"Dámaris Letelier <dam.letelier@gmail.com>, 2014"
+
+#. (itstool) path: info/desc
+#: C/edit-adjustments.page:7
+msgid "Change the exposure, saturation, tint, and shadows of a photo."
+msgstr "Cambiar la exposición, saturación, matiz y sombras de una foto."
+
+#. (itstool) path: page/title
+#: C/edit-adjustments.page:12
+msgid "Color adjustments"
+msgstr "Ajustes del color"
+
+#. (itstool) path: page/p
+#: C/edit-adjustments.page:14
+msgid ""
+"The <gui>Adjust</gui> button opens a floating window with a histogram and "
+"sliders to adjust a photo's exposure, saturation, tint, temperature, and "
+"shadows. The histogram also has sliders to reduce the upper and lower "
+"intensity thresholds of the photograph, expanding the contrast of the middle "
+"range."
+msgstr ""
+"El botón <gui>Ajustes</gui> abre una ventana flotante con un histograma y el "
+"control deslizante para ajustar la exposición, la saturación, el matiz, la "
+"calidez y las sombras de una fotografía. El histograma también tiene control "
+"deslizante para reducir los umbrales de intensidad superior e inferior de la "
+"fotografía, ampliando el contraste de la gama media."
+
+#. (itstool) path: page/p
+#: C/edit-adjustments.page:16
+msgid ""
+"The <gui>Enhance</gui> button adjusts the histogram and shadows sliders to "
+"improve the quality of a photo."
+msgstr ""
+"El botón <gui>Mejorar</gui> ajusta el histograma y el control deslizante de "
+"las sombras para mejorar la calidad de una foto."
+
+#. (itstool) path: page/p
+#: C/edit-adjustments.page:18
+msgid ""
+"When the photo's colors and contrast are to your liking, press <gui>OK</gui> "
+"to save the changes. <gui>Reset</gui> will return the image to its original "
+"state. <gui>Cancel</gui> discards all changes you've made."
+msgstr ""
+"Si los colores y el contraste de la foto son adecuados, pulse <gui>Aceptar</"
+"gui> para guardar los cambios. El botón <gui>Restablecer</gui> devolverá la "
+"imagen a su estado original. El botón <gui>Cancelar</gui> deshace todos los "
+"cambios realizados."
+
+#. (itstool) path: section/title
+#: C/edit-adjustments.page:21
+msgid "What do the color adjustments do?"
+msgstr "¿Qué hacen los ajustes del color?"
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:24
+msgid "Exposure"
+msgstr "Exposición"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:25
+msgid ""
+"Changes the brightness to make it look like the photo was exposed for a "
+"longer or shorter time. Use this to correct under- or over-exposed photos."
+msgstr ""
+"Cambia el brillo para que parezca que la foto se ha expuesto por un tiempo "
+"más o menos largo. Utilice esta opción para corregir las fotografías "
+"sobreexpuestas o excesivamente subexpuestas."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:28
+msgid "Saturation"
+msgstr "Saturación"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:29
+msgid ""
+"Changes how vivid colors look. If your photo looks gray and washed out, try "
+"increasing the saturation. If colors look too bold, try decreasing it."
+msgstr ""
+"Cambia la intensidad de los colores. Si su foto parece gris y pálida, pruebe "
+"a aumentar la saturación. Si los colores se ven demasiado intensos, intente "
+"disminuirlos."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:32
+msgid "Tint"
+msgstr "Matiz"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:33
+msgid ""
+"This tints the photo with a color. It's useful for correcting photos taken "
+"with the wrong white balance setting, which typically have an unnatural "
+"color cast. For example, photos taken outdoors with the white balance set to "
+"\"Tungsten\" may have a blue cast."
+msgstr ""
+"Esto matiza la foto con un color. Es útil para corregir fotos que se han "
+"tomado con el ajuste del balance de blancos erróneo, que normalmente tiene "
+"unas tonalidades de color poco naturales. Por ejemplo, las fotos tomadas en "
+"el exterior con el ajuste del balance de blancos en «Tungsten» pueden tener "
+"una tonalidad azulada."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:36
+msgid "Temperature"
+msgstr "Temperatura"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:37
+msgid ""
+"Changes how \"warm\" or \"cool\" the picture looks. Use this to make cold, "
+"depressing scenes look more lively, for example."
+msgstr ""
+"Cambia el aspecto «cálido» o «frío» de la imagen. Utilice esto, por ejemplo, "
+"para hacer que las escenas frías y tristes parezcan más alegres."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:40
+msgid "Shadows"
+msgstr "Sombras"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:41
+msgid ""
+"This makes shadowy areas appear lighter. Use this to make detail more "
+"visible if it's obscured by the darkness of a shadow."
+msgstr ""
+"Esto hace que las áreas oscuras aparezcan más claras. Si los detalles se han "
+"oscurecido por las sombras, utilice esto para hacerlos más visibles."
+
+#. (itstool) path: item/title
+#: C/edit-adjustments.page:44
+msgid "Intensity Threshold (sliders on the histogram)"
+msgstr "Umbral de intensidad (control deslizante en el histograma)"
+
+#. (itstool) path: item/p
+#: C/edit-adjustments.page:45
+msgid ""
+"These sliders change how light the brightest white is and how dark the "
+"darkest black is. Use them to change the contrast of the photo. Photos which "
+"look washed out should particularly benefit from changing these settings."
+msgstr ""
+"Estos controles deslizantes cambian cómo de claro es el blanco más brillante "
+"y cómo de oscuro es el negro más oscuro. Utilícelos para cambiar el "
+"contraste de la foto, sobre todo en las fotos que son pálidas."
+
+#. (itstool) path: info/desc
+#: C/edit-crop.page:7
+msgid "Improve the composition of a photo by cutting out parts of it."
+msgstr "Mejore la composición de una foto cortando partes de la misma."
+
+#. (itstool) path: page/title
+#: C/edit-crop.page:12
+msgid "Cropping"
+msgstr "Recortar"
+
+#. (itstool) path: page/p
+#: C/edit-crop.page:14
+msgid ""
+"To reduce the area of a photo and concentrate the viewer's attention on a "
+"smaller portion of it, use the Crop tool. The crop tool is only available in "
+"full-window or fullscreen mode."
+msgstr ""
+"Para reducir el área de una foto y concentrar la atención del espectador en "
+"una parte más pequeña de ella, utilice la herramienta Recortar. La "
+"herramienta Recortar sólo está disponible en el modo a pantalla completa."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:19
+msgid ""
+"Double-click on a photo to enter full-window mode, then press the <gui>Crop</"
+"gui> button on the toolbar."
+msgstr ""
+"Para entrar en el modo a pantalla completa, pulse dos veces en la foto y "
+"luego pulse el botón <gui>Recortar</gui> en la barra de herramientas."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:22
+msgid ""
+"A white box, the crop rectangle, will appear over the photo. The lighter "
+"portion of the photo within the crop rectangle represents what the photo "
+"will look like when you crop it."
+msgstr ""
+"Unas líneas blancas, que representan el rectángulo de recorte, aparecerán "
+"sobre la foto. La parte más clara de la foto dentro del rectángulo de "
+"recorte representa cómo se verá la foto cuando la recorte."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:25
+msgid ""
+"If you place your cursor in the middle of the box, you can move the box "
+"around. If you drag the edges of the box, you can adjust its size. As you "
+"move and adjust the crop box, you'll see four lines appear inside it, like a "
+"tic-tac-toe grid. These are <em>rule of thirds</em> lines."
+msgstr ""
+"Si coloca el cursor en el centro del recuadro, podrá moverlo. Si arrastra "
+"los bordes del recuadro, puede ajustar su tamaño. Al mover y ajustar la caja "
+"de recorte, verá aparecer cuatro líneas en su interior, como las cuadrículas "
+"para el tres en raya. Estas son las líneas de la <em>regla de los tercios</"
+"em>."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:26
+msgid ""
+"You can also constrain the crop box to one of many common sizes. Choose a "
+"size from the drop-down list that suits your needs. If you press the flip "
+"button next to it, the orientation of the constraint will switch (from "
+"landscape to portrait)."
+msgstr ""
+"También puede limitar el recuadro a uno de los tamaños más comunes. Elija un "
+"tamaño de la lista desplegable que se adapte a sus necesidades. Si pulsa el "
+"botón voltear situado junto a esta, la orientación de la restricción "
+"cambiará (de horizontal a vertical)."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:29
+msgid ""
+"When you're happy with your crop outline, apply it by pressing the "
+"<gui>Crop</gui> button. Shotwell will display the cropped photo."
+msgstr ""
+"Cuando esté satisfecho con su recorte, aplíquelo pulsando el botón "
+"<gui>Recortar</gui>. Shotwell mostrará la foto recortada."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:32
+msgid ""
+"If you change your mind, press the <gui>Crop</gui> button again and fine-"
+"tune the crop."
+msgstr ""
+"Si cambia de opinión, pulse el botón <gui>Recortar</gui> de nuevo y ajuste "
+"el recorte."
+
+#. (itstool) path: item/p
+#: C/edit-crop.page:33
+msgid ""
+"If you press <gui>Cancel</gui> rather than <gui>Apply</gui>, Shotwell will "
+"return to the photo's previous crop dimensions."
+msgstr ""
+"Si pulsa el botón <gui>Cancelar</gui> en vez del botón <gui>Aplicar</gui>, "
+"Shotwell devolverá a la foto las dimensiones anteriores del recorte."
+
+#. (itstool) path: section/title
+#: C/edit-crop.page:38
+msgid "What is the rule of thirds?"
+msgstr "¿Qué es la regla de los tercios?"
+
+#. (itstool) path: section/p
+#: C/edit-crop.page:39
+msgid ""
+"The <em>rule of thirds</em> helps you to choose a pleasing composition for a "
+"photo."
+msgstr ""
+"La <em>regla de los tercios </em> le ayuda a elegir una composición "
+"satisfactoria para una foto."
+
+#. (itstool) path: section/p
+#: C/edit-crop.page:40
+msgid ""
+"Imagine that the scene is divided up into a 3x3 grid by two equally-spaced "
+"vertical lines and two equally-spaced horizontal lines. According to the "
+"rule, you're more likely to get a pleasing composition if you align major "
+"features (like the horizon, or a person's body) with one of the lines. "
+"Paying attention to the way features flow from one part of the grid to "
+"another can also help."
+msgstr ""
+"Imagine que la escena se divide en una cuadrícula de 3x3 por dos líneas "
+"verticales espaciadas y por dos líneas horizontales igualmente espaciadas. "
+"De acuerdo con la regla, es más probable que obtenga una composición "
+"satisfactoria si alinea las características principales (como el horizonte o "
+"una persona) con una de estas líneas. Prestar atención a la forma en que las "
+"características van de una parte de la cuadrícula a la otra también puede "
+"ser de ayuda."
+
+#. (itstool) path: section/p
+#: C/edit-crop.page:41
+msgid ""
+"Cropping a photo so that it conforms to the rule of thirds often results in "
+"a more visually appealing image."
+msgstr ""
+"Recortar una foto siguiendo la regla de los tercios suele dar como resultado "
+"una imagen visualmente más satisfactoria."
+
+#. (itstool) path: 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 ""
+"Cropping a photo, using the \"rule of thirds\" lines to improve the "
+"composition."
+msgstr ""
+"Recorte una foto siguiendo las líneas de la «regla de los tercios» para "
+"mejorar la composición."
+
+#. (itstool) path: info/desc
+#: C/edit-enhance.page:7
+msgid ""
+"Let Shotwell improve the brightness and contrast of a photo automatically."
+msgstr ""
+"Permita que Shotwell mejore el brillo y el contraste de una foto "
+"automáticamente."
+
+#. (itstool) path: page/title
+#: C/edit-enhance.page:14
+msgid "Auto-enhance"
+msgstr "Mejora automática"
+
+#. (itstool) path: page/p
+#: C/edit-enhance.page:16
+msgid ""
+"Clicking on the <gui>Enhance</gui> button is a quick way to automatically "
+"adjust the brightness and contrast of your photo. It will often give you a "
+"photo that is correctly exposed. You can also use it as a starting point and "
+"then improve the adjustments by clicking on the <gui>Adjust</gui> button."
+msgstr ""
+"Pulsar en el botón <gui>Mejorar</gui> es una forma rápida de ajustar "
+"automáticamente el brillo y el contraste de la foto. Normalmente le ofrecerá "
+"una foto que esté correctamente expuesta. También puede utilizarlo como "
+"punto de partida y luego mejorar los ajustes pulsando en el botón "
+"<gui>Ajustar</gui>."
+
+#. (itstool) path: info/desc
+#: C/edit-external.page:7
+msgid "Use a different program to edit a photo."
+msgstr "Usar un programa diferente para editar una foto."
+
+#. (itstool) path: page/title
+#: C/edit-external.page:12
+msgid "Edit photos with an external program"
+msgstr "Editar las fotos con un programa externo"
+
+#. (itstool) path: page/p
+#: C/edit-external.page:16
+msgid ""
+"You might want to use an external editor to do additional work on a photo. "
+"If installed, GIMP and UFRaw are the default external editors for photo and "
+"RAW editing, respectively. If these programs are not installed, you must "
+"select your preferred editors by choosing <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq> and selecting editors from drop-down "
+"menus of installed applications."
+msgstr ""
+"Quizás quiera utilizar un editor externo para trabajar adicionalmente en una "
+"foto. Si están instalados, GIMP y UFRaw son los editores externos "
+"predeterminados para editar una foto o RAW, respectivamente. Si estos "
+"programas no están instalados, tiene que seleccionar sus editores preferidos "
+"eligiendo <guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> y "
+"seleccionar los editores del menú desplegable de las aplicaciones instaladas."
+
+#. (itstool) path: page/p
+#: C/edit-external.page:24
+msgid ""
+"Once your editors have been set, select a photo and choose "
+"<guiseq><gui>Photos</gui> <gui>Open With External Editor</gui></guiseq> to "
+"open the photo with the external editor. Likewise, if the original photo is "
+"a RAW file, select <guiseq><gui>Photos</gui><gui>Open With RAW Editor</gui></"
+"guiseq> to edit the RAW file directly with the set RAW editor."
+msgstr ""
+"Una vez que los editores se han establecido, seleccione una foto y elija "
+"<guiseq><gui>Fotos</gui> <gui>Abrir con un editor externo</gui></guiseq> "
+"para abrir la foto con un editor externo. De la misma manera, si la foto "
+"original es un archivo RAW, seleccione <guiseq><gui>Fotos</gui><gui>Abrir "
+"con un editor RAW</gui></guiseq> para editar el archivo RAW directamente con "
+"un editor RAW establecido."
+
+#. (itstool) path: page/p
+#: C/edit-external.page:31
+msgid ""
+"When you complete your edits and save the file, Shotwell will detect the "
+"changes and update the photo. When external edits have been made, press and "
+"hold the <key>Shift</key> key in full-window view to show the original photo "
+"rather than the externally-edited one."
+msgstr ""
+"Cuando complete sus ediciones y guarde el archivo, Shotwell detectará los "
+"cambios y actualizará la foto. Cuando se hayan realizado ediciones externas, "
+"mantenga pulsada la tecla <tecla>Mayús</tecla> en la vista de la pantalla "
+"completa para mostrar la foto original en lugar de la editada externamente."
+
+#. (itstool) path: page/p
+#: C/edit-external.page:38
+msgid "Reverting to original will erase any external edits."
+msgstr "Revertir al original borrará cualquier cambio externo."
+
+#. (itstool) path: note/p
+#: C/edit-external.page:43
+msgid ""
+"If you externally edit a RAW photo and save the result to another image, "
+"such as a JPEG or PNG, Shotwell cannot automatically determine that the "
+"original RAW and the new image should be paired."
+msgstr ""
+"Si edita de manera externa una foto RAW y guarda el resultado en otra "
+"imagen, como un archivo JPEG o PNG, Shotwell no puede determinar "
+"automáticamente que la RAW original y la nueva imagen deberían estar "
+"emparejadas."
+
+#. (itstool) path: note/p
+#: C/edit-external.page:49
+msgid ""
+"If you want to work within the resulting image within Shotwell, you'll need "
+"to import it yourself."
+msgstr ""
+"Si quiere trabajar sobre la imagen resultante con Shotwell, tendrá que "
+"importarla usted mismo."
+
+#. (itstool) path: info/desc
+#: C/edit-nondestructive.page:7
+msgid ""
+"Shotwell is a non-destructive photo editor - it does not modify your "
+"original photos."
+msgstr ""
+"Shotwell es un editor de fotos no destructivo, es decir, no modifica sus "
+"fotos originales."
+
+#. (itstool) path: page/title
+#: C/edit-nondestructive.page:12
+msgid "What happens to the original when I edit a photo?"
+msgstr "¿Qué sucede con el original cuando edito una foto?"
+
+#. (itstool) path: page/p
+#: C/edit-nondestructive.page:14
+msgid ""
+"Shotwell is a non-destructive photo editor. It does not modify your original "
+"photographs. That is to say, if you crop a photo or adjust its colors, the "
+"photo file on disc remains untouched. Shotwell stores your edits in a "
+"database and applies them on the fly as necessary. This means you can undo "
+"any alterations you make to a photograph."
+msgstr ""
+"Shotwell es un editor de fotos no destructivo. No modifica sus fotografías "
+"originales. Es decir, si recorta una foto o ajusta sus colores, el archivo "
+"de la foto del disco permanece intacto. Shotwell almacena sus ediciones en "
+"una base de datos y las aplica sobre la marcha, según sea necesario. Esto "
+"significa que puede deshacer cualquier alteración que realices en una "
+"fotografía."
+
+#. (itstool) path: page/p
+#: C/edit-nondestructive.page:16 C/edit-undo.page:18
+msgid ""
+"If you want to see what a photo looked like before your modifications, press "
+"the <key>Shift</key> key. The original photo will be displayed as long as "
+"you hold the key down."
+msgstr ""
+"Si quiere ver qué aspecto tenía una foto antes de realizar las "
+"modificaciones, pulse la tecla <key>Mayús</key>. La foto original se "
+"mostrará siempre que mantenga pulsada esta tecla."
+
+#. (itstool) path: page/p
+#: C/edit-nondestructive.page:18
+msgid ""
+"Note that Shotwell can optionally write metadata (such as tags and titles) "
+"to photo files. For more information, see the section <link xref=\"other-"
+"files\">Photo files</link>."
+msgstr ""
+"Tenga en cuenta que Shotwell puede escribir metadatos opcionalmente (como "
+"etiquetas y títulos) en los archivos de fotos. Para obtener más información, "
+"consulte la sección <link xref=\"other-files\">Archivos de fotos</link>."
+
+#. (itstool) path: info/desc
+#: C/edit-redeye.page:7
+msgid ""
+"Correct photos where people have red eyes because of the camera's flash."
+msgstr ""
+"Corrige las fotos donde las personas tienen ojos rojos por el flash de la "
+"cámara."
+
+#. (itstool) path: page/title
+#: C/edit-redeye.page:12
+msgid "Removing red-eye"
+msgstr "Quitar los ojos rojos"
+
+#. (itstool) path: page/p
+#: C/edit-redeye.page:14
+msgid ""
+"Red-eye occurs when the camera's flash reflects off the pupil of someone's "
+"eye. To eliminate this in a photo, use the Red-eye tool."
+msgstr ""
+"Los ojos rojos aparecen cuando el flash de la cámara se refleja en las "
+"pupilas de los ojos. Para eliminar esto en una foto, utilice la herramienta "
+"Ojos rojos."
+
+#. (itstool) path: item/p
+#: C/edit-redeye.page:17
+msgid "Click <gui>Red-eye</gui>. A circle will appear on the photo."
+msgstr "Pulse en <gui>Ojos Rojos</gui>. Un círculo aparecerá en la foto."
+
+#. (itstool) path: item/p
+#: C/edit-redeye.page:20
+msgid ""
+"Drag the circle over the affected pupil, adjust its size with the slider "
+"control, and press <gui>Apply</gui>. The redness will be removed."
+msgstr ""
+"Arrastre el círculo sobre la pupila afectada, ajuste su tamaño con el "
+"control deslizante y presione <gui>Aplicar</gui>. Se eliminará el color rojo."
+
+#. (itstool) path: item/p
+#: C/edit-redeye.page:23
+msgid ""
+"Repeat this process for all red pupils in your photo. Press <gui>Close</gui> "
+"when finished."
+msgstr ""
+"Repita este proceso para todas las pupilas rojas en su foto. Pulse "
+"<gui>Cerrar</gui> cuando haya terminado."
+
+#. (itstool) path: info/desc
+#: C/edit-rotate.page:7
+msgid ""
+"Click the <gui>Rotate</gui> button, or choose one of the commands in the "
+"<gui>Photo</gui> menu."
+msgstr ""
+"Pulse el botón <gui>Girar</gui>, o elija uno de los comandos en el menú "
+"<gui>Foto</gui>."
+
+#. (itstool) path: page/title
+#: C/edit-rotate.page:12
+msgid "Rotate or flip a photo"
+msgstr "Girar o voltear una foto"
+
+#. (itstool) path: page/p
+#: C/edit-rotate.page:14
+msgid ""
+"You can rotate your photos left and right (clockwise and counterclockwise) "
+"with the <gui>Rotate</gui> button on the toolbar of most views. You can also "
+"make a mirror image of any photo."
+msgstr ""
+"Puede girar las fotos a la izquierda y a la derecha con el botón <gui>Girar</"
+"gui> en la barra de herramientas de la mayoría de las vistas. También puede "
+"hacer una imagen reflejada de cualquier foto."
+
+#. (itstool) path: page/p
+#: C/edit-rotate.page:16
+msgid ""
+"To rotate right, click on the <gui>Rotate</gui> button. To rotate left, "
+"press and hold the <key>Ctrl</key> key and then click the button. Both "
+"commands are available in the <gui>Photos</gui> menu too. Alternatively, use "
+"the following keyboard shortcuts:"
+msgstr ""
+"Para girar hacia la derecha, pulse el botón <gui>Girar</gui>. Para girar "
+"hacia la izquierda, mantenga pulsada la tecla <key>Ctrl</key> y luego pulse "
+"el botón. Ambos comandos están disponibles en el menú <gui>Fotos</gui>. Como "
+"alternativa, utilice los siguientes atajos del teclado:"
+
+#. (itstool) path: item/p
+#: C/edit-rotate.page:18
+msgid ""
+"rotate left: <keyseq><key>Shift</key><key>Ctrl</key><key>R</key></keyseq> or "
+"<key>[</key>"
+msgstr ""
+"rotar a la izquierda: <keyseq><key>Mayús</key><key>Ctrl</key><key>R</key></"
+"keyseq> o <key>[</key>"
+
+#. (itstool) path: item/p
+#: C/edit-rotate.page:19
+msgid ""
+"rotate right: <keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>]</key>"
+msgstr ""
+"rotar a la derecha: <keyseq><key>Ctrl</key><key>R</key></keyseq> or <key>]</"
+"key>"
+
+#. (itstool) path: page/p
+#: C/edit-rotate.page:21
+msgid ""
+"To create a mirror image of a photo, use the <gui>Flip Horizontally</gui> "
+"command in the <gui>Photos</gui> menu. To flip an image vertically, use the "
+"<gui>Flip Vertically</gui> command in the same menu."
+msgstr ""
+"Para crear una imagen reflejada de una foto, utilice el comando <gui>Voltear "
+"horizontalmente</gui> en el menú <gui>Fotos</gui>. Para voltear una imagen "
+"verticalmente, utilice el comando <gui>Voltear verticalmente</gui> en el "
+"mismo menú."
+
+#. (itstool) path: note/p
+#: C/edit-rotate.page:24
+msgid ""
+"If you select more than one image, you can rotate all of them at the same "
+"time."
+msgstr ""
+"Si selecciona más de una imagen, puede girar todas ellas al mismo tiempo."
+
+#. (itstool) path: info/desc
+#: C/edit-straighten.page:7
+msgid "Straighten a photo so that its horizon appears level."
+msgstr "Enderezar una foto tal que su horizonte aparezca nivelado."
+
+#. (itstool) path: page/title
+#: C/edit-straighten.page:12
+msgid "Straighten photos"
+msgstr "Enderezar fotos"
+
+#. (itstool) path: page/p
+#: C/edit-straighten.page:14
+msgid ""
+"The straighten tools allows photos to be leveled and straightened. The "
+"straighten tool is only available in full-window or fullscreen mode."
+msgstr ""
+"Las herramientas de enderezar permiten que las fotos se nivelen y enderecen. "
+"La herramienta de enderezado sólo está disponible en modo de pantalla "
+"completa."
+
+#. (itstool) path: item/p
+#: C/edit-straighten.page:18
+msgid ""
+"Click <gui>Straighten</gui>. The straighten slider will appear. "
+"Alternatively, use the keyboard shortcut <keyseq><key>Ctrl</key><key>A</"
+"key></keyseq>."
+msgstr ""
+"Pulse en <gui>Enderezar</gui>. Aparecerá el control deslizante de "
+"enderezamiento. También puede utilizar el atajo de teclado "
+"<keyseq><key>Ctrl</key><key>A</key></keyseq>."
+
+#. (itstool) path: item/p
+#: C/edit-straighten.page:21
+msgid "Drag the slider to achieve the desired degree of straightening."
+msgstr ""
+"Arrastre el control deslizante para conseguir el grado que quiera de "
+"enderezamiento."
+
+#. (itstool) path: item/p
+#: C/edit-straighten.page:24
+msgid "Press <gui>Straighten</gui> when finished."
+msgstr "Pulse <gui>Enderezar</gui> cuando haya acabado."
+
+#. (itstool) path: info/desc
+#: C/edit-date-time.page:7
+msgid "Change the date and time of photos if those details are incorrect."
+msgstr "Cambiar la hora y la fecha de las fotos si son incorrectas."
+
+#. (itstool) path: page/title
+#: C/edit-date-time.page:12
+msgid "Adjust the date and time of photos"
+msgstr "Ajustar la hora y fecha de las fotos"
+
+#. (itstool) path: page/p
+#: C/edit-date-time.page:14
+msgid ""
+"To adjust the date and time of photos, select the photos you would like to "
+"adjust, choose <guiseq><gui>Photos</gui><gui>Adjust Date and Time...</gui></"
+"guiseq> and select a new date and time."
+msgstr ""
+"Para ajustar la hora y fecha de las fotos, seleccione las fotos que quiere "
+"ajustar y pulse <guiseq><gui>Fotos</gui><gui>Ajustar fecha y hora...</gui></"
+"guiseq> y seleccione una nueva fecha y hora."
+
+#. (itstool) path: page/p
+#: C/edit-date-time.page:16
+msgid ""
+"If you are changing the date and time of multiple photos at once, you can "
+"choose to shift all the photos by the same amount of time or to set all the "
+"photos to the same time."
+msgstr ""
+"Si está cambiando la fecha y la hora de varias fotos a la vez, puede elegir "
+"cambiar todas las fotos en la misma cantidad de horas o establecer todas las "
+"fotos en la misma hora."
+
+#. (itstool) path: page/p
+#: C/edit-date-time.page:18
+msgid ""
+"By default, the date and time are only changed inside Shotwell. You can also "
+"choose to modify the date and time in the original file, but this cannot be "
+"undone once you exit Shotwell."
+msgstr ""
+"De manera predeterminada, la fecha y la hora sólo se cambian dentro de "
+"Shotwell. También puede optar por modificar la fecha y la hora en el archivo "
+"original, pero esto no se puede deshacer una vez que salga de Shotwell."
+
+#. (itstool) path: info/desc
+#: C/edit-undo.page:7
+msgid "Return a photo to its original, unedited form."
+msgstr "Restaurar una foto a su estado original, sin edición."
+
+#. (itstool) path: page/title
+#: C/edit-undo.page:14
+msgid "Undoing changes"
+msgstr "Deshacer cambios"
+
+#. (itstool) path: page/p
+#: C/edit-undo.page:16
+msgid ""
+"Because Shotwell is a non-destructive photo editor, you can undo any "
+"alterations you make to a photograph."
+msgstr ""
+"Gracias a que Shotwell es un editor de fotos no destructivo, puede deshacer "
+"cualquier alteración que realice en una foto."
+
+#. (itstool) path: page/p
+#: C/edit-undo.page:20
+msgid ""
+"To completely undo all the changes you've made to a photo, click "
+"<guiseq><gui>Photos</gui><gui>Revert to Original</gui></guiseq>. The only "
+"exception is that time and date adjustments will not be reverted."
+msgstr ""
+"Para deshacer por completo todos los cambios realizados en una foto, haga "
+"clic en <guiseq><gui>Fotos</gui><gui>Volver al original</gui></guiseq>. La "
+"única excepción es que los ajustes de hora y fecha no se revertirán."
+
+#. (itstool) path: info/desc
+#: C/formats.page:7
+msgid ""
+"Shotwell supports JPEG, PNG, TIFF, BMP and RAW photo files as well as video "
+"files."
+msgstr ""
+"Shotwell soporta archivos JPEG, PNG, TIFF, BMP y RAW, así como archivos de "
+"vídeo."
+
+#. (itstool) path: page/title
+#: C/formats.page:12
+msgid "Supported photo and video formats"
+msgstr "Formatos de foto y vídeo soportados"
+
+#. (itstool) path: page/p
+#: C/formats.page:14
+msgid ""
+"Shotwell supports JPEG, PNG, TIFF, BMP and <link type=\"guide\" xref=\"other-"
+"raw\">RAW</link> photo files. Shotwell does not yet support other graphics "
+"format such as GIF."
+msgstr ""
+"Shotwell soporta archivos JPEG, PNG, TIFF, BMP y <link type =\"guide\" xref="
+"\"other-raw\">RAW</link>. Shotwell todavía no soporta otros formatos "
+"gráficos como GIF."
+
+#. (itstool) path: page/p
+#: C/formats.page:16
+msgid ""
+"Shotwell's RAW format support is currently limited. When you view a RAW "
+"photo, you are actually viewing a JPEG derived from the RAW photo, not the "
+"RAW image itself. Additionally, the RAW editing pipeline is not fully 16-bit "
+"- you can only export edited photos as 8-bit files. All supported formats "
+"can be used for export (JPEG, PNG, TIFF, BMP)."
+msgstr ""
+"El soporte del formato RAW de Shotwell está actualmente limitado. Cuando ve "
+"una foto RAW, en realidad está viendo un JPEG derivado de la foto RAW, no la "
+"imagen RAW en sí. Además, la ruta de edición RAW no es completamente de 16 "
+"bits; sólo puede exportar las fotos editadas como archivos de 8 bits. Todos "
+"los formatos compatibles se pueden utilizar para la exportación (JPEG, PNG, "
+"TIFF, BMP)."
+
+#. (itstool) path: page/p
+#: C/formats.page:18
+msgid ""
+"For more information about RAW-format photos in Shotwell, please see the "
+"<link type=\"guide\" xref=\"other-raw\">RAW</link> section."
+msgstr ""
+"Para obtener más información acerca de las fotos en formato RAW en Shotwell, "
+"consulte la sección <link type=\"guide\" xref=\"other-raw\">RAW</link>."
+
+#. (itstool) path: page/p
+#: C/formats.page:22
+msgid ""
+"Shotwell also supports video files in any format supported by the GStreamer "
+"media library on the system where Shotwell is running. This typically "
+"includes the following formats among others:"
+msgstr ""
+"Shotwell también soporta archivos de vídeo en cualquier formato soportado "
+"por la biblioteca multimedia de GStreamer en el sistema donde Shotwell está "
+"funcionando. Esto normalmente incluye los siguientes formatos, entre otros:"
+
+#. (itstool) path: item/p
+#: C/formats.page:25
+msgid "Container formats: Ogg, QuickTime, MP4, AVI."
+msgstr "Formatos de contenedor: Ogg, QuickTime, MP4, AVI."
+
+#. (itstool) path: item/p
+#: C/formats.page:26
+msgid ""
+"Codecs: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Note that some operating "
+"systems may not include all codecs listed here due to legal or licensing "
+"restrictions.</em>"
+msgstr ""
+"Códecs: Theora, Quicktime, MPEG-4, Motion JPEG. <em>Tenga en cuenta que "
+"algunos sistemas operativos pueden no incluir todos los códecs que se "
+"enumeran aquí debido a restricciones legales o de licencia.</em>"
+
+#. (itstool) path: page/p
+#: C/formats.page:30
+msgid ""
+"Shotwell supports both photos and videos, but for simplicity, this "
+"documentation uses just the term \"photos\" in most places. Many operations "
+"in Shotwell apply to both photos and videos, however. In particular, events, "
+"flagging, rating, tagging, and publishing work both for photos and for "
+"videos."
+msgstr ""
+"Shotwell soporta fotos y vídeos, pero por simplicidad, esta documentación "
+"usa sólo el término «fotos» en la mayoría de ocasiones. Sin embargo, muchas "
+"operaciones en Shotwell se aplican tanto a fotos como a vídeos. En "
+"particular, los eventos, los marcados, las clasificaciones, los etiquetados "
+"y los trabajos publicados funcionan tanto para fotos como para vídeos."
+
+#. (itstool) path: info/desc
+#: C/import-camera.page:7
+msgid "Copy photos from a digital camera."
+msgstr "Copiar fotos desde una cámara digital."
+
+#. (itstool) path: page/title
+#: C/import-camera.page:12
+msgid "Importing from a camera"
+msgstr "Importar desde una cámara"
+
+#. (itstool) path: page/p
+#: C/import-camera.page:14
+msgid "To import photos from a digital camera:"
+msgstr "Para importar fotos desde una cámara digital:"
+
+#. (itstool) path: item/p
+#: C/import-camera.page:18
+msgid ""
+"Connect the camera to your computer and switch it on. Shotwell will detect "
+"it and list it in the sidebar."
+msgstr ""
+"Conecte la cámara al equipo y enciéndala. Shotwell la detectará y la "
+"mostrará en la barra lateral."
+
+#. (itstool) path: item/p
+#: C/import-camera.page:22
+msgid ""
+"Select the camera in the sidebar. Previews of each photo on the camera will "
+"be displayed."
+msgstr ""
+"Seleccione la cámara en la barra lateral. Se mostrará la vista previa de "
+"cada una de las fotos de la cámara."
+
+#. (itstool) path: item/p
+#: C/import-camera.page:25
+msgid ""
+"If you like, you can choose a set of specific photos to import. To do this, "
+"hold down the <key>Ctrl</key> key and click to select individual photos. You "
+"can hold down <key>Shift</key> and click to select a range of photos too."
+msgstr ""
+"Si quiere, puede elegir un conjunto de fotos específicas para importar. Para "
+"ello, mantenga presionada la tecla <key>Ctrl</key> y pulse para seleccionar "
+"las fotos individuales. Puede mantener pulsada la tecla <key>Mayús</key> y "
+"pulsar para seleccionar varias fotos también."
+
+#. (itstool) path: item/p
+#: C/import-camera.page:28
+msgid ""
+"Click either <gui>Import Selected</gui> or <gui>Import All</gui>. The photos "
+"will be copied from the camera and saved on your computer."
+msgstr ""
+"Pulse <gui>Importar seleccionadas</gui> o <gui> Importar todo</gui>. Las "
+"fotos se copiarán de la cámara y se guardarán en el ordenador."
+
+#. (itstool) path: page/p
+#: C/import-camera.page:32
+msgid ""
+"Once the import is complete, you can open the <gui>Last Import</gui> view "
+"(in the sidebar) to see all photos that were imported. The Events list (also "
+"in the sidebar) will also show the new photos, organized by date."
+msgstr ""
+"Una vez finalizada la importación, puede abrir la vista <gui>Última "
+"importación</gui> (en la barra lateral) para ver todas las fotos que se "
+"importaron. La lista de Eventos (también en la barra lateral) también "
+"mostrará las nuevas fotos, organizadas por fecha."
+
+#. (itstool) path: info/desc
+#: C/import-file.page:7
+msgid "Import photos that are already saved on your computer."
+msgstr "Importar fotos que ya están en el equipo."
+
+#. (itstool) path: page/title
+#: C/import-file.page:12
+msgid "Importing from your hard disk"
+msgstr "Importar desde su disco duro"
+
+#. (itstool) path: page/p
+#: C/import-file.page:14
+msgid ""
+"To import photo files from your hard disk into Shotwell, just drag them from "
+"your file browser into the Shotwell window."
+msgstr ""
+"Para importar fotos desde su disco duro a Shotwell, solo debe arrastrarlas "
+"desde su explorador a la ventana de Shotwell."
+
+#. (itstool) path: page/p
+#: C/import-file.page:16
+msgid ""
+"Alternatively, click <guiseq><gui>File</gui><gui>Import From Folder...</"
+"gui></guiseq> and select the folder containing the photos you want to import."
+msgstr ""
+"Alternativamente, pulse <guiseq><gui>Archivo</gui><gui>Importar desde la "
+"carpeta...</gui></guiseq> y seleccione la carpeta que contiene las fotos que "
+"quiere importar."
+
+#. (itstool) path: page/p
+#: C/import-file.page:18
+msgid ""
+"Shotwell will ask whether you want to copy the photo files to your library "
+"folder (usually this is the <file>Pictures</file> folder in your home "
+"directory) or to import them in place without copying the files."
+msgstr ""
+"Shotwell le preguntará si quiere copiar los archivos de fotos en su carpeta "
+"de la biblioteca (la carpeta de la biblioteca está normalmente en la carpeta "
+"<file>Imágenes</file> en su carpeta local) o importarlos en su lugar sin "
+"copiar los archivos."
+
+#. (itstool) path: page/p
+#: C/import-file.page:20
+msgid ""
+"If you hold down <key>Ctrl</key> while dragging photos in, Shotwell will "
+"copy the photos into your library folder without prompting. Similarly, if "
+"you hold down <keyseq><key>Ctrl</key><key>Shift</key></keyseq> while "
+"dragging photos in, Shotwell will import the photos without copying them."
+msgstr ""
+"Si mantiene pulsada la tecla <key>Ctrl</key> mientras arrastra las fotos, "
+"Shotwell copiará las fotos en la carpeta de la biblioteca sin preguntar. Del "
+"mismo modo, si mantiene presionadas las teclas <keyseq><key>Ctrl</"
+"key><key>Shift</key></keyseq>, Shotwell importará las fotos sin copiarlas."
+
+#. (itstool) path: page/p
+#: C/import-file.page:22
+msgid ""
+"Once the import is complete, you can select <gui>Last Import</gui> in the "
+"sidebar to see all photos successfully imported. The Events list will also "
+"show new entries for the dates corresponding to the imported photos."
+msgstr ""
+"Una vez finalizada la importación, puede seleccionar <gui>Última "
+"importación</gui> en la barra lateral para ver todas las fotos importadas "
+"correctamente. La lista de Eventos también mostrará nuevas entradas para las "
+"fechas correspondientes a las fotos importadas."
+
+#. (itstool) path: info/desc
+#: C/import-f-spot.page:7
+msgid ""
+"Shotwell can import all your photos and tags from the F-Spot photo manager."
+msgstr ""
+"Shotwell puede importar todas sus fotos y etiquetas desde el gestor de fotos "
+"F-Spot."
+
+#. (itstool) path: page/title
+#: C/import-f-spot.page:12
+msgid "Importing from F-Spot"
+msgstr "Importar desde F-Spot"
+
+#. (itstool) path: page/p
+#: C/import-f-spot.page:14
+msgid "To import an existing photo collection from F-Spot:"
+msgstr "Para importar una colección de fotos existente desde F-Spot:"
+
+#. (itstool) path: item/p
+#: C/import-f-spot.page:16
+msgid "Select <guiseq><gui>File</gui><gui>Import From F-Spot</gui></guiseq>."
+msgstr ""
+"Seleccione <guiseq><gui>Archivo</gui><gui>Importar desde F-Spot</gui></"
+"guiseq>."
+
+#. (itstool) path: item/p
+#: C/import-f-spot.page:17
+msgid ""
+"Now choose either the default F-Spot library or another F-Spot database. If "
+"importing from another F-Spot database, select a directory and file from the "
+"chooser dialog box."
+msgstr ""
+"Ahora elija la biblioteca predeterminada F-Spot u otra base de datos F-Spot. "
+"Si quiere importar desde otra base de datos F-Spot, seleccione una carpeta y "
+"un archivo en el cuadro de diálogo del selector."
+
+#. (itstool) path: page/p
+#: C/import-f-spot.page:20
+msgid ""
+"Shotwell will import your photos, together with their tags and other "
+"information. Once the import is complete, you can select <gui>Last Import</"
+"gui> in the sidebar to see all photos successfully imported. The Events list "
+"will also show new entries for the dates corresponding to the imported "
+"photos."
+msgstr ""
+"Shotwell importará sus fotos, junto con sus etiquetas y otra información. "
+"Una vez finalizada la importación, puede seleccionar <gui>Última "
+"importación</gui> en la barra lateral para ver todas las fotos importadas "
+"correctamente. La lista de Eventos también mostrará nuevas entradas para las "
+"fechas correspondientes a las fotos importadas."
+
+#. (itstool) path: info/desc
+#: C/import-memorycard.page:7
+msgid "Import photos from a digital camera's memory card."
+msgstr "Importar fotos desde una tarjeta de memoria de una cámara digital."
+
+#. (itstool) path: page/title
+#: C/import-memorycard.page:12
+msgid "Importing from a memory card"
+msgstr "Importar desde una tarjeta de memoria"
+
+#. (itstool) path: page/p
+#: C/import-memorycard.page:14
+msgid "To import photos from a camera memory card:"
+msgstr "Para importar fotos desde una tarjeta de memoria de una cámara:"
+
+#. (itstool) path: item/p
+#: C/import-memorycard.page:18
+msgid ""
+"Put the card into your card reader. Make sure the card reader is plugged in "
+"to the computer and switched on."
+msgstr ""
+"Coloque la tarjeta en el lector de tarjetas. Asegúrese de que el lector está "
+"conectado al equipo y encendido."
+
+#. (itstool) path: item/p
+#: C/import-memorycard.page:21
+msgid "The card reader and card should be detected automatically."
+msgstr ""
+"El lector de tarjetas y la tarjeta se deberían detectar automáticamente."
+
+#. (itstool) path: item/p
+#: C/import-memorycard.page:24
+msgid ""
+"Follow the instructions for <link xref=\"import-file\">importing photos from "
+"your hard disk</link>. If you click <guiseq><gui>File</gui><gui>Import From "
+"Folder...</gui></guiseq>, the memory card should be visible as a folder in "
+"the side bar of the file selection window."
+msgstr ""
+"Siga las instrucciones para <link xref=\"import-file\">importar fotos desde "
+"el disco duro</link>. Si pulsa en <guiseq><gui>Archivo</gui><gui>Importar "
+"desde la carpeta...</gui></guiseq>, la tarjeta de memoria será visible como "
+"una carpeta en la barra lateral de la ventana de selección de archivos."
+
+#. (itstool) path: page/p
+#: C/import-memorycard.page:28
+msgid ""
+"Shotwell can import photos from any memory card that is compatible with your "
+"card reader."
+msgstr ""
+"Shotwell puede importar fotos de una tarjeta de memoria que sea compatible "
+"con su lector de tarjetas."
+
+#. (itstool) path: page/p
+#: C/import-memorycard.page:30
+msgid ""
+"If the card is not detected automatically, your card reader may not have "
+"been recognized. Try unplugging it and then plugging it in again. If that "
+"doesn't work, you should still be able to import photos by <link xref="
+"\"import-camera\">connecting your camera directly to the computer</link>, "
+"though."
+msgstr ""
+"Si la tarjeta no se detecta automáticamente, es posible que su lector de "
+"tarjetas no se haya reconocido. Intente desenchufarlo y vuelva a enchufarlo. "
+"Sin embargo, si eso no funciona, podrá importar fotos mediante <link xref="
+"\"import-camera\">conectar su cámara directamente al ordenador</link>."
+
+#. (itstool) path: info/title
+#: C/index.page:6
+msgctxt "link"
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#. (itstool) path: info/title
+#: C/index.page:7
+msgctxt "text"
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#. (itstool) path: credit/name
+#: C/index.page:9
+msgid "Jim Nelson"
+msgstr "Jim Nelson"
+
+#. (itstool) path: credit/name
+#: C/index.page:11
+msgid "Allison Barlow"
+msgstr "Allison Barlow"
+
+#. (itstool) path: credit/name
+#: C/index.page:13
+msgid "Robert Ancell"
+msgstr "Robert Ancell"
+
+#. (itstool) path: credit/name
+#: C/index.page:15
+msgid "Peter Smith"
+msgstr "Peter Smith"
+
+#. (itstool) path: credit/name
+#: C/index.page:17
+msgid "Phil Bull"
+msgstr "Phil Bull"
+
+#. (itstool) path: 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:23
+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
+msgid ""
+"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Shotwell Photo "
+"Manager"
+msgstr ""
+"<media type=\"image\" src=\"figures/shotwell_logo.png\"/>Gestor de fotos "
+"Shotwell"
+
+#. (itstool) path: section/title
+#: C/index.page:26
+msgid "Importing Photos"
+msgstr "Importar fotos"
+
+#. (itstool) path: section/title
+#: C/index.page:30
+msgid "Viewing Photos"
+msgstr "Ver fotos"
+
+#. (itstool) path: section/title
+#: C/index.page:34
+msgid "Organizing Photos"
+msgstr "Organizar fotos"
+
+#. (itstool) path: section/title
+#: C/index.page:38
+msgid "Editing Photos"
+msgstr "Editar fotos"
+
+#. (itstool) path: section/title
+#: C/index.page:42
+msgid "Sharing Photos"
+msgstr "Compartir fotos"
+
+#. (itstool) path: section/title
+#: C/index.page:46
+msgid "Other Features"
+msgstr "Otras características"
+
+#. (itstool) path: info/desc
+#: C/organize-event.page:7
+msgid ""
+"Group photos together that were taken at the same time. Learn how to rename, "
+"merge, and sort events."
+msgstr ""
+"Agrupar fotos que se tomadron al mismo tiempo. Aprenda como renombrar, unir "
+"y ordenar eventos."
+
+#. (itstool) path: page/title
+#: C/organize-event.page:12
+msgid "Events"
+msgstr "Eventos"
+
+#. (itstool) path: page/p
+#: C/organize-event.page:14
+msgid ""
+"An event is a group of photos that were taken at approximately the same "
+"time. When you import photos, Shotwell checks when each photo was taken. It "
+"then groups the photos into events."
+msgstr ""
+"Un evento es un grupo de fotos que se han hecho aproximadamente al mismo "
+"tiempo. Cuando importa fotos, Shotwell comprueba cuándo se hizo cada foto y "
+"las agrupa por eventos."
+
+#. (itstool) path: page/p
+#: C/organize-event.page:16
+msgid ""
+"Choose <gui>Events</gui> from the sidebar to see your photos organized by "
+"date. If you select a month or year from the sidebar, a list of events will "
+"be displayed in the main window. Double-click an event to see all the photos "
+"that were taken around that time."
+msgstr ""
+"Elija <gui>Eventos</gui> en la barra lateral para ver sus fotos organizadas "
+"por fecha. Si selecciona un mes o un año en la barra lateral, se mostrará "
+"una lista de eventos en la ventana principal. Pulse dos veces en un evento "
+"para ver todas las fotos tomadas en ese momento."
+
+#. (itstool) path: page/p
+#: C/organize-event.page:18
+msgid ""
+"If a photo has no embedded date/time information, then Shotwell can't "
+"automatically place it in any event. In this case the photo will appear in "
+"the <gui>No Event</gui> view accessible from the sidebar. You can still move "
+"the photo to any event you like as described below."
+msgstr ""
+"Si una foto no tiene información insertada de la fecha o la hora, entonces "
+"Shotwell no puede colocarla automáticamente en ningún evento. En este caso, "
+"la foto aparecerá en la vista <gui>No hay eventos</gui> a la que se accede "
+"desde la barra lateral. Todavía puede mover la foto a cualquier evento que "
+"quiera como se describe a continuación."
+
+#. (itstool) path: section/title
+#: C/organize-event.page:25
+msgid "Renaming events"
+msgstr "Renombrar eventos"
+
+#. (itstool) path: section/p
+#: C/organize-event.page:27
+msgid ""
+"To give an event a name rather than referring to it by its date, select the "
+"event, click <guiseq><gui>Events</gui><gui>Rename Event...</gui></guiseq> "
+"and enter a new name. Another way of renaming an event is to double-click "
+"its name in the sidebar; type a new name and then press <key>Enter</key>."
+msgstr ""
+"Para dar un nombre a un evento en lugar de referirse a él por su fecha, "
+"seleccione el evento, pulse en <guiseq><gui>Eventos</gui><gui>Renombrar "
+"evento...</gui></guiseq> e introduzca un nuevo nombre. Otra forma de cambiar "
+"el nombre de un evento es pulsar dos veces en su nombre en la barra lateral; "
+"Escriba un nuevo nombre y luego pulse <key>Intro</key>."
+
+#. (itstool) path: section/title
+#: C/organize-event.page:31
+msgid "Moving photos between events"
+msgstr "Mover fotos entre eventos"
+
+#. (itstool) path: section/p
+#: C/organize-event.page:33
+msgid ""
+"Even though photos are initially grouped into events by their date, you can "
+"move photos between events. To do this, drag any photo to the sidebar and "
+"drop it on an event."
+msgstr ""
+"Aunque las fotos se agrupan inicialmente por eventos según su fecha, puede "
+"mover fotos entre eventos. Para ello, arrastre cualquier foto a la barra "
+"lateral y suéltela en un evento."
+
+#. (itstool) path: section/title
+#: C/organize-event.page:37
+msgid "Creating and merging events"
+msgstr "Crear y combinar eventos"
+
+#. (itstool) path: section/p
+#: C/organize-event.page:38
+msgid ""
+"To create a new event, select the photos you would like in the new event and "
+"click <guiseq><gui>Events</gui><gui>New Event</gui></guiseq>."
+msgstr ""
+"Para crear un evento nuevo, seleccione las fotos que quiere tener en el "
+"evento y pulse <guiseq><gui>Eventos</gui><gui>Nuevo evento</gui></guiseq>."
+
+#. (itstool) path: section/p
+#: C/organize-event.page:39
+msgid ""
+"To merge events, select <guiseq><gui>Events</gui></guiseq> from the sidebar, "
+"then, while holding down <key>Ctrl</key> click on the events you want to "
+"merge in the main window area. Finally, click <guiseq><gui>Events</"
+"gui><gui>Merge Events</gui></guiseq>."
+msgstr ""
+"Para combinar eventos, seleccione <guiseq><gui>Eventos</gui></guiseq> de la "
+"barra lateral, luego, mientras presiona <key>Ctrl</key> pulse en los eventos "
+"que quiere combinar en la ventana principal. Finalmente, pulse en "
+"<guiseq><gui>Eventos</gui><gui>Combinar eventos</gui></guiseq>."
+
+#. (itstool) path: section/title
+#: C/organize-event.page:43
+msgid "Sorting events"
+msgstr "Ordenar eventos"
+
+#. (itstool) path: section/p
+#: C/organize-event.page:45
+msgid ""
+"Events are displayed in a tree in the sidebar, organized by the year and "
+"month of the earliest photo in the event. To change the event sort order, "
+"click <guiseq><gui>View</gui><gui>Sort Events</gui></guiseq> and select "
+"either ascending or descending."
+msgstr ""
+"Los eventos se muestran en la estructura de árbol en la barra lateral, "
+"organizados por el año y el mes de la primera foto del evento. Para cambiar "
+"el orden de clasificación del evento, pulse en <guiseq><gui>Vista</"
+"gui><gui>Ordenar eventos</gui></guiseq> y seleccione si quiere el orden "
+"ascendente o descendente."
+
+#. (itstool) path: section/title
+#: C/organize-event.page:51
+msgid "Change the photo used to represent each event"
+msgstr "Cambiar la foto usada para representar cada evento"
+
+#. (itstool) path: section/p
+#: C/organize-event.page:53
+msgid ""
+"If you select the <gui>Events</gui> item in the sidebar, you'll see a single "
+"photo which represents each event. This is called the key photo."
+msgstr ""
+"Si selecciona <gui>Eventos</gui> en la barra lateral, verá una única foto "
+"que representa cada evento. Esto se denomina «foto clave»."
+
+#. (itstool) path: section/p
+#: C/organize-event.page:55
+msgid ""
+"By default, Shotwell uses the first photo in each event as its key photo. To "
+"use a different key photo, select the photo and choose <guiseq><gui>Photos</"
+"gui><gui>Make Key Photo for Event</gui></guiseq>."
+msgstr ""
+"De manera predeterminada, Shotwell utiliza la primera foto de cada evento "
+"como su vista de miniatura. Para utilizar una foto distinta, seleccione la "
+"foto y elija <guiseq><gui>Fotos</gui><gui>Definir vista de miniatura de "
+"eventos </gui></guiseq>."
+
+#. (itstool) path: info/desc
+#: C/organize-flag.page:7
+msgid "Flag photos to mark them as special or to work with them as a set."
+msgstr ""
+"Marcar fotos para identificarlas como especiales o para trabajar con ellas "
+"como conjunto."
+
+#. (itstool) path: page/title
+#: C/organize-flag.page:12
+msgid "Flagging photos"
+msgstr "Marcar fotos"
+
+#. (itstool) path: page/p
+#: C/organize-flag.page:14
+msgid ""
+"Shotwell lets you <em>flag</em> photos. When a photo is flagged, a small "
+"flag icon appears in its upper right corner. You can select the "
+"<gui>Flagged</gui> item in the sidebar to see all photos which have been "
+"flagged."
+msgstr ""
+"Shotwell le permite <em>marcar</em> sus fotos. Cuando se marca una foto, "
+"aparece un pequeño icono de una bandera en su esquina superior derecha. "
+"Puede seleccionar el elemento <gui>Marcada</gui> en la barra lateral para "
+"ver todas las fotos que se han marcado."
+
+#. (itstool) path: page/p
+#: C/organize-flag.page:18
+msgid ""
+"Flagging a photo marks it as special. You can interpret this in any way you "
+"like. For example, you might flag all photos which need visual adjustment, "
+"or all photos which you want to share with a friend."
+msgstr ""
+"Marcar una foto hace que esta sea especial. Puede interpretar esto de la "
+"manera que quiera. Por ejemplo, puede marcar todas las fotos que necesitan "
+"un ajuste visual o todas las fotos que quiere compartir con un amigo."
+
+#. (itstool) path: page/p
+#: C/organize-flag.page:22
+msgid ""
+"Flagging is also useful because you can operate on all flagged photos as a "
+"set. For example, you can select the <gui>Flagged</gui> view and then upload "
+"all flagged photos to a publishing service."
+msgstr ""
+"Marcar fotos es útil porque también puede trabajar en todas las fotos "
+"marcadas como un conjunto. Por ejemplo, puede seleccionar la vista "
+"<gui>Marcada</gui> y luego subir todas las fotos marcadas a un servicio de "
+"publicación."
+
+#. (itstool) path: section/title
+#: C/organize-flag.page:27
+msgid "To flag or unflag a photo"
+msgstr "Para marcar o desmarcar una foto"
+
+#. (itstool) path: section/p
+#: C/organize-flag.page:28
+msgid ""
+"To flag or unflag a photo, right-click the photo and choose <gui>Flag</gui> "
+"or <gui>Unflag</gui> from the context menu. Or use the <keyseq><key>Ctrl</"
+"key><key>G</key></keyseq> or <key>/</key> shortcut keys."
+msgstr ""
+"Para marcar o desmarcar una foto, pulse con el botón derecho en la foto y "
+"seleccione <gui>Marcar</gui> o <gui>Desmarcar</gui> desde el menú "
+"contextual. O pulse use los atajos del teclado <keyseq><key>Ctrl</"
+"key><key>G</key></keyseq> o <key>/</key>."
+
+#. (itstool) path: info/desc
+#: C/organize-rating.page:7
+msgid ""
+"Give photos a rating between 1 and 5 stars. You can reject bad photos, "
+"hiding them from view."
+msgstr ""
+"Asigne a las fotos una puntuación entre 1 y 5. Puede rechazar las fotos "
+"malas, ocultándolas en la vista."
+
+#. (itstool) path: page/title
+#: C/organize-rating.page:12
+msgid "Ratings"
+msgstr "Valoraciones"
+
+#. (itstool) path: page/p
+#: C/organize-rating.page:13
+msgid ""
+"You can assign each photo a rating from 1-5 stars, or may alternatively rate "
+"it as Rejected, in which case Shotwell will hide the photo by default."
+msgstr ""
+"Puede asignar a cada foto una puntuación entre 1 y 5, o marcarla como "
+"rechazada, en cuyo caso Shotwell la ocultará de manera predeterminada."
+
+#. (itstool) path: page/p
+#: C/organize-rating.page:15
+msgid "You can rate a photo or a set of photos in any of these ways:"
+msgstr ""
+"Puede valorar una foto o un conjunto de fotos de cualquiera de estas maneras:"
+
+#. (itstool) path: item/p
+#: C/organize-rating.page:18
+msgid ""
+"Select the photo(s), then choose a rating from the top-level "
+"<guiseq><gui>Photos</gui><gui>Set Rating</gui></guiseq> menu."
+msgstr ""
+"Seleccione las fotos y luego escoja una puntuación en el menú "
+"<guiseq><gui>Foto</gui><gui>Establecer puntuación</gui></guiseq> del nivel "
+"superior."
+
+#. (itstool) path: item/p
+#: C/organize-rating.page:19
+msgid ""
+"Right-click on the photo(s), then choose a rating from the Set Rating "
+"context menu."
+msgstr ""
+"Pulse con el botón derecho en las fotos y luego escoja su puntuación en el "
+"menú contextual «Establecer puntuación»."
+
+#. (itstool) path: item/p
+#: C/organize-rating.page:20
+msgid ""
+"Select the photo(s), then press any of the shortcut keys <key>1</key>, "
+"<key>2</key>, <key>3</key>, <key>4</key> or <key>5</key> to assign a rating. "
+"Or press <key>9</key> to mark the photo(s) as rejected or <key>0</key> to "
+"clear the rating(s)."
+msgstr ""
+"Seleccione la foto o las fotos, luego pulse cualquiera de los atajos del "
+"teclado <key>1</key>, <key>2</key>, <key>3</key>, <key>4</key> o <key>5</"
+"key> para asignar una puntuación. Pulse <key>9</key> para marcar las fotos "
+"como rechazadas o pulse <key>0</key> para borrar las puntuaciones."
+
+#. (itstool) path: page/p
+#: C/organize-rating.page:23
+msgid ""
+"Normally Shotwell displays all photos except rejected photos. You can set a "
+"different rating filter using the <guiseq><gui>View</gui><gui>Filter Photos</"
+"gui></guiseq> menu - for example, you can display only photos rated with 3 "
+"stars or higher, or you can display all photos including those marked "
+"rejected. The Shotwell icon on the toolbar displays the current rating "
+"filter and can also be used to set the filter."
+msgstr ""
+"Normalmente, Shotwell muestra todas las fotos excepto las rechazadas. Puede "
+"establecer un filtro de puntuaciones diferente utilizando el menú "
+"<guiseq><gui>Vista</gui><gui>Filtrar fotos</gui></guiseq>. Por ejemplo, "
+"puede mostrar sólo las fotos con puntuación de 3 estrellas o más, o puede "
+"mostrar todas las fotos, incluidas las marcadas como rechazadas. El icono "
+"Shotwell de la barra de herramientas muestra el filtro de puntuación actual "
+"y también se puede utilizar para configurar el filtro."
+
+#. (itstool) path: page/p
+#: C/organize-rating.page:26
+msgid ""
+"Shotwell normally displays each photo's rating in its lower left-hand "
+"corner. You can turn off the display of ratings using the <guiseq><gui>View</"
+"gui><gui>Ratings</gui></guiseq> menu item."
+msgstr ""
+"Shotwell normalmente muestra la puntuación de cada foto en su esquina "
+"inferior izquierda. Puede desactivar la visualización de las puntuaciones "
+"utilzando el elemento del menú <guiseq><gui>Vista</gui><gui>Valoraciones</"
+"gui></guiseq>."
+
+#. (itstool) path: page/p
+#: C/organize-rating.page:28
+msgid ""
+"You can increase or decrease a photo's rating using the <guiseq><gui>Set "
+"Rating</gui><gui>Increase</gui></guiseq> and <guiseq><gui>Set Rating</"
+"gui><gui>Decrease</gui></guiseq> commands, or the keyboard shortcuts "
+"<key>&lt;</key> and <key>&gt;</key>."
+msgstr ""
+"Puede aumentar o disminuir la puntuación de una foto utilizando los comandos "
+"<guiseq><gui>Establecer puntuación</gui><gui>Aumentar</gui></guiseq> y "
+"<guiseq><gui>Establecer puntuación</gui><gui>Disminuir</gui></guiseq>, o los "
+"atajos del teclado <key>&lt;</key> y <key>&gt;</key>."
+
+#. (itstool) path: info/desc
+#: C/organize-remove.page:7
+msgid ""
+"Remove photos from the library, or delete them from your computer entirely."
+msgstr "Quitar fotos de la biblioteca, o eliminarlas por completo del equipo."
+
+#. (itstool) path: page/title
+#: C/organize-remove.page:12
+msgid "Removing and deleting photos"
+msgstr "Quitar y eliminar fotos"
+
+#. (itstool) path: page/p
+#: C/organize-remove.page:14
+msgid ""
+"You may remove photos from your library and you may additionally delete them "
+"entirely from your hard disk."
+msgstr ""
+"Puede eliminar las fotos de su biblioteca y también puede eliminarlas de su "
+"disco duro."
+
+#. (itstool) path: page/media
+#. 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: page/media
+#: C/organize-remove.page:15
+msgid "Delete process"
+msgstr "Proceso de eliminado"
+
+#. (itstool) path: page/p
+#: C/organize-remove.page:16
+msgid ""
+"This diagram shows how a photo, when deleted, is first put into Shotwell's "
+"trash. If you delete it from Shotwell's trash, it is put into your "
+"computer's trash. If you delete it from your computer's trash the photo is "
+"finally and irretrievably deleted from your computer."
+msgstr ""
+"Este diagrama muestra cómo, cuando se elimina una foto, se pone primero en "
+"la papelera de Shotwell. Si la elimina de la papelera de Shotwell, se mueve "
+"a la papelera de su equipo. Si la elimina de la papelera del equipo, se "
+"eliminará permanentemente."
+
+#. (itstool) path: section/title
+#: C/organize-remove.page:18
+msgid "Removing photos from the library"
+msgstr "Quitar fotos de la biblioteca"
+
+#. (itstool) path: section/p
+#: C/organize-remove.page:19
+msgid ""
+"Select the photos to remove and choose <guiseq><gui>Edit</gui><gui>Move to "
+"Trash</gui></guiseq>. (You can also press the <key>Delete</key> key.) The "
+"photos will be moved from your library to Shotwell's Trash."
+msgstr ""
+"Seleccione las fotos que quiere quitar y elija <guiseq><gui>Editar</"
+"gui><gui>Mover a la papelera</gui></guiseq>. (También puede pulsar la tecla "
+"<key>Supr</key>.) Las fotos se moverán de su biblioteca a la papelera de "
+"Shotwell."
+
+#. (itstool) path: section/p
+#: C/organize-remove.page:22
+msgid ""
+"If you want to remove photos from Shotwell without having them pass through "
+"the trash, simply select the photos to be removed and choose "
+"<guiseq><gui>Edit</gui><gui>Remove From Library</gui></guiseq>. The photo "
+"files will be left in place on disk."
+msgstr ""
+"Si quiere quitar las fotos de Shotwell sin tener que moverlas a la papelera, "
+"simplemente seleccione las fotos que va a quitar y elija "
+"<guiseq><gui>Editar</gui><gui>Eliminar de la biblioteca</gui></guiseq>. Los "
+"archivos de fotos se dejarán en su lugar en el disco."
+
+#. (itstool) path: section/title
+#: C/organize-remove.page:26
+msgid "Emptying or restoring the trash folder"
+msgstr "Vaciar o restaurar la carpeta de la papelera"
+
+#. (itstool) path: section/p
+#: C/organize-remove.page:27
+msgid ""
+"Select the Trash entry in the Sidebar and Shotwell will display all photos "
+"that have been marked for removal or deletion. In the Trash view, the "
+"following commands are available:"
+msgstr ""
+"Seleccione la entrada de la papelera en la barra lateral y Shotwell mostrará "
+"todas las fotos que se han marcado para quitar o eliminar. En la vista de la "
+"papelera están disponibles los siguientes comandos:"
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:29
+msgid "Delete"
+msgstr "Eliminar"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:29
+msgid "Delete the selected photos from the trash folder."
+msgstr "Eliminar las fotos seleccionadas de la carpeta de la papelera"
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:30
+msgid "Restore"
+msgstr "Restaurar"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:30
+msgid "Restore the selected photos into Shotwell."
+msgstr "Restaurar las fotos seleccionadas en Shotwell."
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:31
+msgid "Empty trash"
+msgstr "Vaciar la papelera"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:31
+msgid "Delete all photos from the trash folder."
+msgstr "Eliminar todas las fotos de la papelera."
+
+#. (itstool) path: section/title
+#: C/organize-remove.page:36
+msgid "Deleting or emptying Trash"
+msgstr "Eliminar o vaciar la papelera"
+
+#. (itstool) path: section/p
+#: C/organize-remove.page:37
+msgid ""
+"When you delete files from the Trash folder or empty the Trash folder, you "
+"will be given the following choices:"
+msgstr ""
+"Cuando elimine archivos de la carpeta Papelera, o cuando la vacíe, se le "
+"ofrecerán las siguientes opciones:"
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:39
+msgid "Only Remove"
+msgstr "Solo eliminar"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:39
+msgid ""
+"Remove photos from the library but leave the photos in their location on the "
+"computer."
+msgstr ""
+"Quitar fotos de la biblioteca pero mantener las fotos en su ubicación dentro "
+"del equipo."
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:40
+msgid "Trash file"
+msgstr "Archivo de Papelera"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:40
+msgid "Remove photos from the library and delete them from the computer."
+msgstr "Quitar fotos de la biblioteca y eliminarlas del equipo."
+
+#. (itstool) path: item/title
+#: C/organize-remove.page:41
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. (itstool) path: item/p
+#: C/organize-remove.page:41
+msgid "Do nothing."
+msgstr "No hacer nada."
+
+#. (itstool) path: info/desc
+#: C/organize-search.page:7
+msgid "Find photos and videos in your collection by a variety of criteria."
+msgstr "Buscar fotos y vídeos en su colección siguiendo varios criterios."
+
+#. (itstool) path: page/title
+#: C/organize-search.page:12
+msgid "Searching"
+msgstr "Búsqueda"
+
+#. (itstool) path: page/p
+#: C/organize-search.page:14
+msgid ""
+"There are two ways to search in Shotwell: the filter toolbar, and with a "
+"saved search. The search bar allows you to quickly search the current view "
+"for certain criteria. Saved Searches feature more complex search criteria "
+"and persist in the sidebar between sessions."
+msgstr ""
+"Hay dos maneras de hacer una búsqueda en Shotwell: con la barra de "
+"herramientas de filtro, y con una búsqueda guardada. La barra de búsqueda le "
+"permite buscar rápidamente la vista actual para ciertos criterios. Las "
+"búsquedas guardadas tienen criterios de búsqueda más complejos y se "
+"mantienen en la barra lateral entre sesiones."
+
+#. (itstool) path: section/title
+#: C/organize-search.page:21
+msgid "Search bar"
+msgstr "Barra de búsqueda"
+
+#. (itstool) path: section/p
+#: C/organize-search.page:22
+msgid ""
+"The <guiseq><gui>View</gui><gui>Search Bar</gui></guiseq> checkbox toggles "
+"the display of the search bar. You can also hit <keyseq><key>Ctrl</"
+"key><key>F</key></keyseq> or <key>F8</key> to bring up the search bar. From "
+"this bar, you can find, show and hide photos and videos based on title, tag, "
+"rating or other options."
+msgstr ""
+"La casilla <guiseq><gui>Vista</gui><gui>Barra de búsqueda</gui></guiseq> "
+"activa la visualización de la barra de búsqueda. También puede pulsar "
+"<keyseq><key>Ctrl</key><key>F</key></keyseq> o <key>F8</key> para abrir la "
+"barra de búsqueda. Desde esta barra, puede encontrar, mostrar y ocultar "
+"fotos y vídeos basados en su título, etiqueta, valoración u otras opciones."
+
+#. (itstool) path: section/p
+#: C/organize-search.page:29
+msgid ""
+"To begin searching, simply enter a search keyword in the text box, or click "
+"on <gui>Flagged</gui>, <gui>Rating</gui> or <gui>Type</gui>. The text search "
+"matches your keywords across tag names, photo or video titles and photos' "
+"original filenames. The <gui>Flagged</gui>, <gui>Rating</gui> and <gui>Type</"
+"gui> buttons allow you to filter your collection by whether photos are "
+"flagged, their current number of stars, and whether the items shown are "
+"images, videos, or raw camera files, respectively."
+msgstr ""
+"Para comenzar la búsqueda, simplemente introduzca una palabra clave de "
+"búsqueda en el cuadro de texto o pulse en <gui>Marcada</gui>, "
+"<gui>Puntuación</gui> o <gui>Tipo</gui>. La búsqueda de texto compara sus "
+"palabras clave con los nombres de las etiquetas, los títulos de fotos o "
+"vídeos y los nombres de los archivos originales de las fotos. Los botones "
+"<gui>Marcada</gui>, <gui>Puntuación</gui> y <gui>Tipo</gui> le permiten "
+"filtrar su colección según las fotos marcadas, su número actual de estrellas "
+"y si los elementos mostrados son imágenes, vídeos o archivos de cámara RAW, "
+"respectivamente."
+
+#. (itstool) path: section/p
+#: C/organize-search.page:38
+msgid ""
+"Disabling the search bar or exiting Shotwell automatically resets the search "
+"bar."
+msgstr ""
+"Desactivar la barra de búsqueda o salir de Shotwell reinicia automáticamente "
+"la barra de búsqueda."
+
+#. (itstool) path: section/title
+#: C/organize-search.page:44
+msgid "Saved search"
+msgstr "Búsqueda guardada"
+
+#. (itstool) path: section/p
+#: C/organize-search.page:45
+msgid ""
+"A saved search persists across Shotwell sessions, and is updated as photos "
+"and videos are added and removed from your Shotwell library."
+msgstr ""
+"Una búsqueda guardada se mantiene entre sesiones de Shotwell, y se actualiza "
+"con las fotos y vídeos que se añaden o quitan de su biblioteca de Shotwell."
+
+#. (itstool) path: section/p
+#: C/organize-search.page:50
+msgid ""
+"Create a new saved search with <guiseq><gui>Edit</gui><gui>New Saved "
+"Search...</gui></guiseq> or by hitting <keyseq><key>Ctrl</key><key>S</key></"
+"keyseq>. The dialog box allows you to enter a name for the search and select "
+"whether you want to meet Any, All, or None of the criteria in the following "
+"rows."
+msgstr ""
+"Cree una nueva búsqueda guardada con <guiseq><gui>Editar</gui><gui>Nueva "
+"búsqueda guardada...</gui></guiseq> o pulsando <keyseq><key>Ctrl</"
+"key><key>S</key></keyseq>. El cuadro de diálogo le permite introducir un "
+"nombre para la búsqueda y seleccionar si quiere marcar alguno, todos o "
+"ninguno de los criterios de las siguientes filas."
+
+#. (itstool) path: section/p
+#: C/organize-search.page:56
+msgid ""
+"Each row represents a search criterion. Use the <gui>+</gui> button to add "
+"more rows, and the <gui>-</gui> button to remove a specific row. The combo "
+"box on the left of each row selects the type of criteria. Criteria must be "
+"entered correctly before the <gui>OK</gui> button becomes available."
+msgstr ""
+"Cada fila representa un criterio de búsqueda. Pulse el botón <gui>+</gui> "
+"para añadir más filas y el botón <gui>-</gui> para eliminar una fila "
+"específica. El cuadro combinado de la izquierda de cada fila selecciona el "
+"tipo de criterios. Los criterios se deben introducir correctamente antes de "
+"que el botón <gui>Aceptar</gui> esté disponible."
+
+#. (itstool) path: info/desc
+#: C/organize-tag.page:7
+msgid "Organize photos by labelling them."
+msgstr "Organizar las fotos etiquetándolas."
+
+#. (itstool) path: page/title
+#: C/organize-tag.page:14
+msgid "Tagging photos"
+msgstr "Etiquetar fotos"
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:16
+msgid ""
+"You can assign one or more tags to selected photos. A tag can be one or more "
+"words that you want to associate with those photos."
+msgstr ""
+"Puede asignar una o más etiquetas a las fotos seleccionadas. Una etiqueta "
+"puede constar de una o más palabras que quiera asociar a esas fotos."
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:22
+msgid ""
+"To add new tags to photos, select the photos you would like to tag, then do "
+"any of the following:"
+msgstr ""
+"Para añadir etiquetas nuevas a las fotos, seleccione las fotos que quiere "
+"etiquetar y siga estos pasos:"
+
+#. (itstool) path: item/p
+#: C/organize-tag.page:28
+msgid "Choose <guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq>."
+msgstr ""
+"Elija <guiseq><gui>Etiquetas</gui><gui>Añadir etiquetas...</gui></guiseq>."
+
+#. (itstool) path: item/p
+#: C/organize-tag.page:29
+msgid "Type <keyseq><key>Ctrl</key><key>T</key></keyseq>."
+msgstr "Pulse <keyseq><key>Ctrl</key><key>T</key></keyseq>."
+
+#. (itstool) path: item/p
+#: C/organize-tag.page:30
+msgid "Drag the selected photos and drop them on the desired tag."
+msgstr "Arrastre las fotos y suéltelas en la etiqueta que quiera."
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:33
+msgid ""
+"When you use <keyseq><key>Ctrl</key><key>T</key></keyseq> or "
+"<guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq> you can type in the "
+"names of one or more tags, separated by commas. Once you have created a tag, "
+"you can rename it by selecting that tag in the sidebar and choosing "
+"<guiseq><gui>Tags</gui><gui>Rename Tag \"[name]\"...</gui></guiseq>, by "
+"rightclicking on it and choose <gui>Rename...</gui> or double-click on the "
+"tag in the sidebar."
+msgstr ""
+"Cuando pulse <keyseq><key>Ctrl</key><key>T</key></keyseq> o "
+"<guiseq><gui>Etiquetas</gui><gui>Añadir etiquetas...</gui></guiseq> puede "
+"escribir los nombres de una o más etiquetas, separadas por comas. Una vez "
+"que haya creado una etiqueta, puede renombrarla seleccionando esa etiqueta "
+"en la barra lateral y eligiendo <guiseq><gui>Etiquetas</gui><gui>Renombrar "
+"etiqueta \"[nombre]\"...</gui></guiseq> pulsando con el botón derecho y "
+"eligiendo <gui>Renombrar...</gui> o pulsando dos veces en la etiqueta de la "
+"barra lateral. "
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:44
+msgid ""
+"To change which tags are associated with a particular photo, select that "
+"photo, choose <guiseq><gui>Tags</gui><gui>Modify Tags...</gui></guiseq> or "
+"right-click on a photo and select <gui>Modify Tags...</gui> and edit the "
+"comma separated list. To remove a tag from one or more photos, first select "
+"that tag in the sidebar, then select the photos you would like to remove, "
+"and choose <guiseq><gui>Tags</gui><gui>Remove Tag \"[name]\" from Photos</"
+"gui></guiseq> or right-click on the photos an select <gui>Remove Tag "
+"\"[name]\" from Photos</gui>."
+msgstr ""
+"Para cambiar las etiquetas asociadas a una foto en particular, seleccione "
+"esa foto, elija <guiseq><gui>Etiquetas</gui><gui>Modificar etiquetas...</"
+"gui></guiseq> o pulse con el botón derecho en una foto y seleccione "
+"<gui>Modificar etiquetas...</gui> y edite la lista separada por comas. Para "
+"quitar una etiqueta de una o más fotos, primero seleccione esa etiqueta en "
+"la barra lateral, luego seleccione las fotos que quiere quitar y elija "
+"<guiseq><gui>Etiquetas</gui><gui>Quitar etiquetas \"[nombre]\" de fotos</"
+"gui></guiseq> o pulse con el botón derecho en las fotos y seleccione "
+"<gui>Quitar etiquetas \"[nombre]\" de fotos</gui>."
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:58
+msgid ""
+"To delete a tag entirely, select that tag in the sidebar and choose "
+"<guiseq><gui>Tags</gui><gui>Delete Tag \"[name]\"</gui></guiseq> or by right-"
+"click and select <gui>Delete Tag \"[name]\"</gui>."
+msgstr ""
+"Para eliminar por completo una etiqueta, selecciónela en la barra latera y "
+"elija <guiseq><gui>Etiquetas</gui><gui>Eliminar etiqueta «nombre»</gui></"
+"guiseq> o púlsela con el botón derecho y elija <gui>Eliminar etiqueta "
+"«nombre»</gui>."
+
+#. (itstool) path: page/p
+#: C/organize-tag.page:64
+msgid ""
+"When you create a tag, it will appear in the sidebar under the <gui>Tags</"
+"gui> item, which is hidden if there are no tags. Photos can have multiple "
+"tags attached to them, and when you click on the name of a given tag in the "
+"sidebar, you will see all the photos associated with that tag."
+msgstr ""
+"Cuando crea una etiqueta, aparecerá en la barra lateral bajo el elemento "
+"<gui>Etiquetas</gui>, que se oculta si no hay etiquetas. Las fotos pueden "
+"tener múltiples etiquetas relacionadas con las mismas. Cuando posiciona el "
+"cursor sobre el nombre de una etiqueta en la barra lateral, podrá ver todas "
+"las fotos asociadas a esa etiqueta."
+
+#. (itstool) path: section/title
+#: C/organize-tag.page:73
+msgid "Hierarchical Tags"
+msgstr "Etiquetas jerárquicas"
+
+#. (itstool) path: section/p
+#: C/organize-tag.page:74
+msgid ""
+"Shotwell supports also hierarchial tags. You can rearrange your tags by drag "
+"and drop a tag onto another. To create a new subtag right-click on a tag and "
+"select <gui>New</gui>."
+msgstr ""
+"Shotwell también soporta etiquetas jerárquicas. Puede reordenar sus "
+"etiquetas arrastrando y soltando una etiqueta sobre otra. Para crear una "
+"etiqueta hija nueva, pulse con el botón derecho sobre una etiqueta y elija "
+"<gui>Nuevo</gui>."
+
+#. (itstool) path: section/p
+#: C/organize-tag.page:81
+msgid ""
+"Hierarchial tags can help you to sort your tag list in ways that better "
+"match how you work or think; for example, you can store location tags like "
+"\"Mountains\" or \"Beach\" under a parent tag \"Places\", which itself can "
+"be placed under the tag \"Summer Holidays\"."
+msgstr ""
+"Las etiquetas jerárquicas le pueden ayudar a ordenar su lista de etiquetas "
+"de manera que se ajuste a mejor a lo que necesita; por ejemplo, puede tener "
+"las etiquetas «Montañas» o «Playa» dentro de la etiqueta «Lugares», que a su "
+"vez puede estar dentro de la etiqueta «Vacaciones de verano»."
+
+#. (itstool) path: section/p
+#: C/organize-tag.page:89
+msgid "Note that deleting a parent tag will also delete its child tags."
+msgstr ""
+"Tenga en cuenta que al eliminar una etiqueta padre también se eliminarán las "
+"etiquetas hijas."
+
+#. (itstool) path: info/desc
+#: C/organize-title.page:7
+msgid "Give titles to your photos."
+msgstr "Asignar títulos a las fotos."
+
+#. (itstool) path: page/title
+#: C/organize-title.page:12
+msgid "Titles"
+msgstr "Títulos"
+
+#. (itstool) path: page/p
+#: C/organize-title.page:14
+msgid ""
+"The <guiseq><gui>View</gui><gui>Titles</gui></guiseq> checkbox toggles the "
+"display of titles beneath each photo. By default, a photo's title is its "
+"filename."
+msgstr ""
+"La casilla de <guiseq><gui>Vista</gui><gui>Títulos</gui></guiseq> activa la "
+"visualización de títulos debajo de cada foto. De manera predeterminada, el "
+"título de la foto es su nombre de archivo."
+
+#. (itstool) path: page/p
+#: C/organize-title.page:17
+msgid ""
+"To change a photo's title, select the photo and click <guiseq><gui>Photos</"
+"gui><gui>Edit Title...</gui></guiseq>, or press <key>F2</key>."
+msgstr ""
+"Para cambiar el título de una foto, selecciónela y pulse <guiseq><gui>Fotos</"
+"gui><gui>Editar título</gui></guiseq>, o pulse <key>F2</key>."
+
+#. (itstool) path: info/desc
+#: C/other-files.page:7
+msgid "Keep the Shotwell library in sync with photo files on disk."
+msgstr ""
+"Mantener la biblioteca de Shotwell sincronizada con los archivos de fotos "
+"del disco."
+
+#. (itstool) path: page/title
+#: C/other-files.page:12
+msgid "Photo files"
+msgstr "Archivos de fotos"
+
+#. (itstool) path: page/p
+#: C/other-files.page:14
+msgid ""
+"Every photo in the Shotwell library corresponds to a file stored on your "
+"hard disk. Shotwell has several features which help you keep the Shotwell "
+"library and files on disk in sync."
+msgstr ""
+"Cada foto de la biblioteca de Shotwell se corresponde con un archivo "
+"almacenado en su disco duro. Shotwell tienen varias características que le "
+"ayudan a mantener su biblioteca y los archivos del disco sincronizados."
+
+#. (itstool) path: section/title
+#: C/other-files.page:21
+msgid "Using a custom directory pattern"
+msgstr "Usar un patrón de carpeta predeterminado"
+
+#. (itstool) path: section/p
+#: C/other-files.page:22
+msgid ""
+"Shotwell allows you to specify how it names directories in your library. You "
+"can do this by changing the <gui>Directory Structure</gui> and <gui>Pattern</"
+"gui> settings in the <gui>Preferences</gui> dialog. You may use a "
+"preselected pattern, or choose <gui>Custom</gui> and type in your own."
+msgstr ""
+"Shotwell le permite especificar como llamar a sus carpetas en una "
+"biblioteca. Puede hacer esto cambiando las configuraciones de "
+"<gui>Estructura del directorio</gui> y <gui>Patrón</gui> en el cuadro de "
+"diálogo <gui>Preferencias</gui>. Puede utilizar un patrón preseleccionado, o "
+"escoger <gui>Personalizado</gui> y escribir el suyo."
+
+#. (itstool) path: section/p
+#: C/other-files.page:29
+msgid ""
+"The available symbols for the directory pattern begin with a % (percent "
+"sign). The values these symbols produce are locale-dependent, so what you "
+"see on your computer may vary from the examples below."
+msgstr ""
+"Los símbolos disponibles para los patrones de carpetas empiezan por "
+"«%» (signo de porcentaje). Los valores que estos símbolos producen dependen "
+"de la configuración regional, por lo que lo que vea en su equipo puede ser "
+"diferente a estos ejemplos."
+
+#. (itstool) path: td/p
+#: C/other-files.page:38
+msgid "<em>Symbol</em>"
+msgstr "<em>Símbolo</em>"
+
+#. (itstool) path: td/p
+#: C/other-files.page:38
+msgid "<em>Meaning</em>"
+msgstr "<em>Significado</em>"
+
+#. (itstool) path: td/p
+#: C/other-files.page:38
+msgid "<em>Example</em>"
+msgstr "<em>Ejemplo</em>"
+
+#. (itstool) path: td/p
+#: C/other-files.page:43
+msgid "%Y"
+msgstr "%Y"
+
+#. (itstool) path: td/p
+#: C/other-files.page:43
+msgid "Year: full"
+msgstr "Año: completo"
+
+#. (itstool) path: td/p
+#: C/other-files.page:43
+msgid "2011"
+msgstr "2011"
+
+#. (itstool) path: td/p
+#: C/other-files.page:46
+msgid "%y"
+msgstr "%y"
+
+#. (itstool) path: td/p
+#: C/other-files.page:46
+msgid "Year: two digit"
+msgstr "Año: dos dígitos"
+
+#. (itstool) path: td/p
+#: C/other-files.page:46
+msgid "11"
+msgstr "11"
+
+#. (itstool) path: td/p
+#: C/other-files.page:49
+msgid "%d"
+msgstr "%d"
+
+#. (itstool) path: td/p
+#: C/other-files.page:49
+msgid "Day of the month with leading zero"
+msgstr "Día del mes, empezando por cero"
+
+#. (itstool) path: td/p
+#: C/other-files.page:49
+msgid "03"
+msgstr "03"
+
+#. (itstool) path: td/p
+#: C/other-files.page:52
+msgid "%A"
+msgstr "%A"
+
+#. (itstool) path: td/p
+#: C/other-files.page:52
+msgid "Day name: full"
+msgstr "Nombre del día: completo"
+
+#. (itstool) path: td/p
+#: C/other-files.page:52
+msgid "Wednesday"
+msgstr "Miércoles"
+
+#. (itstool) path: td/p
+#: C/other-files.page:55
+msgid "%a"
+msgstr "%a"
+
+#. (itstool) path: td/p
+#: C/other-files.page:55
+msgid "Day name: abbreviated"
+msgstr "Nombre del día: abreviado"
+
+#. (itstool) path: td/p
+#: C/other-files.page:55
+msgid "Wed"
+msgstr "Mié"
+
+#. (itstool) path: td/p
+#: C/other-files.page:58
+msgid "%m"
+msgstr "%m"
+
+#. (itstool) path: td/p
+#: C/other-files.page:58
+msgid "Month number with leading zero"
+msgstr "Número de mes, empezando por cero"
+
+#. (itstool) path: td/p
+#: C/other-files.page:58
+msgid "02"
+msgstr "02"
+
+#. (itstool) path: td/p
+#: C/other-files.page:60
+msgid "%b"
+msgstr "%b"
+
+#. (itstool) path: td/p
+#: C/other-files.page:60
+msgid "Month name: abbreviated"
+msgstr "Nombre del mes: abreviado"
+
+#. (itstool) path: td/p
+#: C/other-files.page:60
+msgid "Feb"
+msgstr "Feb"
+
+#. (itstool) path: td/p
+#: C/other-files.page:62
+msgid "%B"
+msgstr "%B"
+
+#. (itstool) path: td/p
+#: C/other-files.page:62
+msgid "Month name: full"
+msgstr "Nombre del mes: completo"
+
+#. (itstool) path: td/p
+#: C/other-files.page:62
+msgid "February"
+msgstr "Febrero"
+
+#. (itstool) path: td/p
+#: C/other-files.page:63
+msgid "%I"
+msgstr "%I"
+
+#. (itstool) path: td/p
+#: C/other-files.page:63
+msgid "Hour: 12 hour format"
+msgstr "Hora: formato de 12 horas"
+
+#. (itstool) path: td/p
+#: C/other-files.page:63
+msgid "05"
+msgstr "05"
+
+#. (itstool) path: td/p
+#: C/other-files.page:64
+msgid "%H"
+msgstr "%H"
+
+#. (itstool) path: td/p
+#: C/other-files.page:64
+msgid "Hour: 24 hour format"
+msgstr "Hora: formato de 24 horas"
+
+#. (itstool) path: td/p
+#: C/other-files.page:64
+msgid "17"
+msgstr "17"
+
+#. (itstool) path: td/p
+#: C/other-files.page:66
+msgid "%M"
+msgstr "%M"
+
+#. (itstool) path: td/p
+#: C/other-files.page:66
+msgid "Minute"
+msgstr "Minuto"
+
+#. (itstool) path: td/p
+#: C/other-files.page:66
+msgid "16"
+msgstr "16"
+
+#. (itstool) path: td/p
+#: C/other-files.page:67
+msgid "%S"
+msgstr "%S"
+
+#. (itstool) path: td/p
+#: C/other-files.page:67
+msgid "Second"
+msgstr "Segundo"
+
+#. (itstool) path: td/p
+#: C/other-files.page:67
+msgid "30"
+msgstr "30"
+
+#. (itstool) path: td/p
+#: C/other-files.page:68
+msgid "%p"
+msgstr "%p"
+
+#. (itstool) path: td/p
+#: C/other-files.page:68
+msgid "AM or PM"
+msgstr "AM o PM"
+
+#. (itstool) path: td/p
+#: C/other-files.page:68
+msgid "PM"
+msgstr "PM"
+
+#. (itstool) path: section/p
+#: C/other-files.page:72
+msgid ""
+"There are other symbols available; please check the manual for strftime by "
+"running the command <cmd>man strftime</cmd> if you need one that isn't "
+"listed here."
+msgstr ""
+"Existen otros símbolos disponibles, revise el manual de strftime ejecutando "
+"el comando <cmd>man strftime</cmd> si necesita alguno que no esté listado "
+"aquí."
+
+#. (itstool) path: section/title
+#: C/other-files.page:79
+msgid "Automatically importing photos"
+msgstr "Importar fotos automáticamente"
+
+#. (itstool) path: section/p
+#: C/other-files.page:81
+msgid ""
+"Shotwell can automatically import new photos which appear in the library "
+"directory. (The library directory is usually the <file>Pictures</file> "
+"directory in your home directory; you can change its location in in the "
+"<gui>Preferences</gui> window.)"
+msgstr ""
+"Shotwell puede automáticamente importar nuevas fotos que aparezcan en la "
+"carpeta de la biblioteca. (La carpeta de la biblioteca está usualmente en la "
+"carpeta <file>Imágenes</file> en su carpeta local; puede cambiar esta "
+"ubicación en la ventana <gui>Preferencias</gui>.)"
+
+#. (itstool) path: section/p
+#: C/other-files.page:86
+msgid ""
+"To enable auto-import, check the box <gui>Watch library directory for new "
+"files</gui> in the <gui>Preferences</gui> window."
+msgstr ""
+"Para activar la importación automática, marca la opción <gui>Vigilar mi "
+"colección en búsqueda de archivos nuevos</gui> en la ventana "
+"<gui>Preferencias</gui>."
+
+#. (itstool) path: note/p
+#: C/other-files.page:90
+msgid ""
+"Shotwell can also follow symbolic links inside automatically-imported "
+"directories."
+msgstr ""
+"Shotwell también puede seguir los enlaces simbólicos en carpetas importadas "
+"automáticamente."
+
+#. (itstool) path: section/title
+#: C/other-files.page:95
+msgid "Automatically renaming imported photos to lowercase"
+msgstr "Renombrar a minúsculas automáticamente las fotos importadas"
+
+#. (itstool) path: section/p
+#: C/other-files.page:97
+msgid ""
+"Shotwell can automatically change the filenames of imported photos to "
+"lowercase. To enable this, choose <guiseq><gui>Edit</gui><gui>Preferences</"
+"gui></guiseq>, and in the <gui>Preferences</gui> window, check the "
+"<gui>Rename imported files to lowercase</gui> box."
+msgstr ""
+"Shotwell puede cambiar automáticamente los nombres de las fotos importadas a "
+"minúsculas. Para activar esto, escoja <guiseq><gui>Editar</"
+"gui><gui>Preferencias</gui></guiseq>, y en la ventana de <gui>Preferencias</"
+"gui>, marque la casilla <gui>Renombrar los archivos importados a minúsculas</"
+"gui>."
+
+#. (itstool) path: section/title
+#: C/other-files.page:107
+msgid "Writing metadata on the fly"
+msgstr "Escribir metadatos al vuelo"
+
+#. (itstool) path: section/p
+#: C/other-files.page:109
+msgid ""
+"By default, Shotwell does not modify photo files, even when you edit photos "
+"or change their tags or titles. Shotwell records these changes in its own "
+"database only."
+msgstr ""
+"De manera predeterminada, Shotwell no modifica los archivos de fotos, aunque "
+"las edite o cambie sus etiquetas o títulos. Shotwell guardará estos cambios "
+"únicamente en su propia base de datos."
+
+#. (itstool) path: section/p
+#: C/other-files.page:112
+msgid ""
+"To change this behavior, you can enable the checkbox <gui>Write tags, titles "
+"and other metadata to photo files</gui> in the <gui>Preferences</gui> "
+"dialog. When this option is enabled, Shotwell will write the following "
+"metadata to most photo files whenever you change it in Shotwell:"
+msgstr ""
+"Para cambiar este comportamiento, puede activar la casilla <gui>Escribir "
+"etiquetas, títulos y otros metadatos a los archivos</gui> en el cuadro de "
+"diálogo <gui>Preferencias</gui>. Cuando esta opción se activa, Shotwell "
+"escribirá los siguientes metadatos a la mayoría de los archivos cada vez que "
+"los modifique en Shotwell."
+
+#. (itstool) path: item/p
+#: C/other-files.page:118
+msgid "titles"
+msgstr "títulos"
+
+#. (itstool) path: item/p
+#: C/other-files.page:119
+msgid "tags"
+msgstr "etiquetas"
+
+#. (itstool) path: item/p
+#: C/other-files.page:120
+msgid "ratings"
+msgstr "valoraciones"
+
+#. (itstool) path: item/p
+#: C/other-files.page:121
+msgid "rotation information"
+msgstr "información de rotación"
+
+#. (itstool) path: item/p
+#: C/other-files.page:122
+msgid "time/date"
+msgstr "fecha/hora"
+
+#. (itstool) path: section/p
+#: C/other-files.page:125
+msgid ""
+"Shotwell stores this information in photo files in EXIF, IPTC and/or XMP "
+"format. Note that Shotwell can write only to photo files in JPEG, PNG and "
+"TIFF format, not to BMP photos, RAW photos or to video files."
+msgstr ""
+"Shotwell almacena esta información en archivos de fotos en formato EXIF, "
+"IPTC y/o XMP. Tenga en cuenta que Shotwell sólo puede escribir en archivos "
+"de fotos en formato JPEG, PNG y TIFF, no en fotos en BMP, RAW o en archivos "
+"de vídeo."
+
+#. (itstool) path: section/title
+#: C/other-files.page:133
+msgid "Runtime monitoring"
+msgstr "Monitorizazión en tiempo de ejecución"
+
+#. (itstool) path: section/p
+#: C/other-files.page:135
+msgid ""
+"While Shotwell is running, it notices changes made to any photo file "
+"externally. When a photo file changes, Shotwell rereads the file and updates "
+"your view of the photo and metadata."
+msgstr ""
+"Mientras Shotwell está en ejecución, tiene en cuenta los cambios realizados "
+"en un archivo de una foto externamente. Cuando el archivo cambia, Shotwell "
+"vuelve a leer el archivo y actualiza la vista de la foto y sus metadatos."
+
+#. (itstool) path: section/p
+#: C/other-files.page:139
+msgid ""
+"Note that Shotwell checks all photo files for changes at startup, but only "
+"photo files contained in the library directory are monitored in real time "
+"after startup. We hope to remove this limitation in a further release."
+msgstr ""
+"Tenga en cuenta que Shotwell comprueba todos los archivos de fotos para ver "
+"si hay cambios al inicio, pero sólo los archivos de fotos contenidos en la "
+"carpeta de la biblioteca se supervisan en tiempo real después del inicio. "
+"Esperamos eliminar esta limitación en una nueva versión."
+
+#. (itstool) path: info/desc
+#: C/other-missing.page:7
+msgid "If Shotwell can't find a photo in your library, it marks it as missing."
+msgstr ""
+"Si Shotwell no puede encontrar una foto en su biblioteca, la marca como "
+"ausente."
+
+#. (itstool) path: page/title
+#: C/other-missing.page:12
+msgid "Missing photos"
+msgstr "Fotos ausentes"
+
+#. (itstool) path: page/p
+#: C/other-missing.page:14
+msgid ""
+"Each time Shotwell starts up, it scans your photo library to verify that all "
+"photo files still exist on your hard drive. If Shotwell finds that any photo "
+"files are missing, it will not display them in the normal Photos, Events and "
+"Tags views, but will instead show them in a separate Missing Files view "
+"which will appear in the sidebar."
+msgstr ""
+"Cada vez que Shotwell se inicia, analiza su biblioteca de fotos para "
+"verificar que todos los archivos de fotos siguen existiendo en el disco "
+"duro. Si Shotwell encuentra que falta alguna foto, no la mostrará en las "
+"vistas normales de Fotos, Eventos o Etiquetas, sino que la mostrará en una "
+"vista de Fotos ausentes separada que aparecerá en la barra lateral."
+
+#. (itstool) path: page/p
+#: C/other-missing.page:16
+msgid ""
+"If you no longer want the missing files to be part of your Shotwell "
+"collection (perhaps because you deleted them), go to the Missing Files view, "
+"select the photos and then click <gui>Remove From Library</gui>."
+msgstr ""
+"Si ya no quiere que los archivos que faltan formen parte de su colección "
+"Shotwell (tal vez porque los ha eliminado), vaya a la vista de Fotos "
+"ausentes, seleccione las fotos y, a continuación, pulse en <gui>Eliminar de "
+"la biblioteca</gui>."
+
+#. (itstool) path: page/p
+#: C/other-missing.page:18
+msgid ""
+"If you have photos on a removable disk, such as a CD or USB flash drive, and "
+"<link xref=\"index#import\">import</link> them into Shotwell <em>without</"
+"em> copying the photos to your computer, they will show up as missing files "
+"if you then disconnect the removable disk. See <link xref=\"import-file\"/> "
+"to learn how to copy files from removable disks onto your computer."
+msgstr ""
+"Si tiene fotos en un disco externo, como un CD o un pendrive USB y las <link "
+"xref=\"index#import\">importa</link> en Shotwell <em>sin</em> copiarlas al "
+"equipo, se mostrarán como archivos ausentes cuando desconecte el disco "
+"extraíble. Consulte la <link xref=\"import-file\"/> para aprender cómo "
+"copiar archivos desde discos extraíbles a su equipo."
+
+#. (itstool) path: page/p
+#: C/other-missing.page:20
+msgid ""
+"If any missing photo files become available again, Shotwell will notice this "
+"the next time it starts. The photos will once again appear in the Photos, "
+"Events and Tags views."
+msgstr ""
+"Si una foto ausente vuelve a estar disponible, Shotwell lo tendrá en cuenta "
+"la próxima vez que se inicie. Las fotos volverán a aparecer en las vistas de "
+"Fotos, Eventos y Etiquetas."
+
+#. (itstool) path: info/desc
+#: C/other-multiple.page:7
+msgid ""
+"You can open Shotwell with a different photo library by using the command "
+"line."
+msgstr ""
+"Puede abrir Shotwell con una biblioteca de fotos diferente usando la línea "
+"de comandos."
+
+#. (itstool) path: page/title
+#: C/other-multiple.page:12
+msgid "Multiple libraries"
+msgstr "Varias bibliotecas"
+
+#. (itstool) path: page/p
+#: C/other-multiple.page:14
+msgid ""
+"Shotwell normally stores its database and photo thumbnails in the directory "
+"<file>~/.shotwell</file> . This directory does not hold photos, but the "
+"database in this directory contains a list of all the photos in the Shotwell "
+"library."
+msgstr ""
+"Normalmente, Shotwell almacena su base de datos y miniaturas de fotos en la "
+"carpeta <file>~/.shotwell</file>. Esta carpeta no contiene fotos, pero la "
+"base de datos de esta carpeta contiene una lista de todas las fotos de la "
+"biblioteca de Shotwell."
+
+#. (itstool) path: page/p
+#: C/other-multiple.page:16
+msgid ""
+"As an advanced feature, it's possible for you to have multiple Shotwell "
+"libraries, each of which has its own set of photos. Each library needs its "
+"own database directory. To launch Shotwell with an alternate library, "
+"specify an alternate database directory on the command line as follows:"
+msgstr ""
+"Como característica avanzada, es posible tener varias bibliotecas de "
+"Shotwell, cada una de ellas con su propio conjunto de fotos. Cada biblioteca "
+"necesita su propia carpeta de base de datos. Para ejecutar Shotwell con una "
+"biblioteca diferente, especifique una base de datos alternativa en la línea "
+"de comandos como sigue:"
+
+#. (itstool) path: page/screen
+#: C/other-multiple.page:18
+#, no-wrap
+msgid ""
+"\n"
+"shotwell -d [library-directory]\n"
+msgstr ""
+"\n"
+"shotwell -d [carpeta-biblioteca]\n"
+
+#. (itstool) path: info/desc
+#: C/other-plugins.page:7
+msgid "Extend Shotwell's functionality dynamically."
+msgstr "Ampliar la funcionalidad de Shotwell dinámicamente."
+
+#. (itstool) path: page/title
+#: C/other-plugins.page:12
+msgid "Plugins"
+msgstr "Complementos"
+
+#. (itstool) path: page/p
+#: C/other-plugins.page:13
+msgid ""
+"Shotwell can be used with <em>plugins</em>, which are companion shared "
+"libraries that can add support for new publishing destinations or new "
+"slideshow transitions."
+msgstr ""
+"Shotwell se puede usar con <em>complementos</em>, que son bibliotecas "
+"compartidas complementarias que pueden agregar soporte para nuevos destinos "
+"de publicación o nuevas transiciones de presentación de diapositivas."
+
+#. (itstool) path: page/p
+#: C/other-plugins.page:18
+msgid ""
+"To see a list of installed plugins, choose <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq>, and in the <gui>Preferences</gui> "
+"window, click on the <gui>Plugins</gui> tab. You'll see a list of currently-"
+"installed plugins, each with a checkbox by it, and you may enable or disable "
+"each by selecting or deselecting the checkbox by its name."
+msgstr ""
+"Para ver una lista de los complementos instalados, elija "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq>, y en la ventana "
+"de <gui>Preferencias</gui> pulse en la pestaña <gui>Complementos</gui>. Verá "
+"una lista de los complementos actualmente instalados, cada uno con una "
+"casilla mediante la que puede activarlos o desactivarlos por su nombre."
+
+#. (itstool) path: note/p
+#: C/other-plugins.page:25
+msgid ""
+"Full documentation on how to develop new plugins is available at <link href="
+"\"http://redmine.yorba.org/projects/shotwell/wiki/ShotwellArchWritingPlugins"
+"\">http://redmine.yorba.org/projects/shotwell/wiki/"
+"ShotwellArchWritingPlugins</link>"
+msgstr ""
+"La documentación completa sobre cómo desarrollar nuevos complementos está "
+"disponible en <link href=\"http://redmine.yorba.org/projects/shotwell/wiki/"
+"ShotwellArchWritingPlugins\">http://redmine.yorba.org/projects/shotwell/wiki/"
+"ShotwellArchWritingPlugins</link>"
+
+#. (itstool) path: info/desc
+#: C/raw.page:7
+msgid "More about RAW support in Shotwell."
+msgstr "Más sobre el soporte RAW en Shotwell."
+
+#. (itstool) path: page/title
+#: C/raw.page:12
+msgid "RAW support in Shotwell"
+msgstr "Soporte de RAW en Shotwell"
+
+#. (itstool) path: page/p
+#: C/raw.page:13
+msgid ""
+"Some cameras have the ability to store data directly off the sensor and into "
+"a file that contains extra color information; this is commonly referred to "
+"as 'RAW' or 'camera RAW', and Shotwell supports these files as well."
+msgstr ""
+"Algunas cámaras tienen la capacidad de almacenar datos directamente del "
+"sensor y en un archivo que contiene información adicional de color; Esto se "
+"conoce comúnmente como «RAW» o «cámara RAW», y Shotwell soporta estos "
+"archivos también."
+
+#. (itstool) path: page/p
+#: C/raw.page:18
+msgid ""
+"Since RAW photographs normally cannot be displayed directly, but must be "
+"first developed - that is, have their extra information interpreted and "
+"readied for displaying - most cameras will either embed a JPEG inside a RAW-"
+"format file, or produce a JPEG alongside the RAW file at the time the "
+"snapshot is taken. The latter is referred to throughout this document as RAW"
+"+JPEG. If you import a RAW+JPEG pair, Shotwell will keep them paired and "
+"treat them as one item in your library."
+msgstr ""
+"Dado que las fotografías RAW normalmente no se pueden mostrar directamente, "
+"sino que deben ser desarrolladas por primera vez (se interpreta y se prepara "
+"su información adicional para mostrarse) la mayoría de las cámaras "
+"incorporarán un JPEG dentro de un archivo en formato RAW, o producirán un "
+"JPEG junto con el archivo RAW en el momento en que se toma la foto. Este "
+"último se refiere a todo este documento como RAW+JPEG. Si importa una pareja "
+"de RAW+JPEG, Shotwell los mantendrá sincronizados y los tratará como un "
+"elemento de su biblioteca."
+
+#. (itstool) path: page/p
+#: C/raw.page:27
+msgid ""
+"When you import a RAW file, you can choose to either use the camera's "
+"internally-developed JPEG or Shotwell's by selecting <guiseq><gui>Photos</"
+"gui><gui>Developer</gui></guiseq> in the menus."
+msgstr ""
+"Al importar un archivo RAW, puede elegir entre usar el desarrollador JPEG "
+"interno de la cámara o el de Shotwell seleccionando <guiseq><gui>Fotos</"
+"gui><gui>Desarrollador</gui></guiseq> en los menús."
+
+#. (itstool) path: note/p
+#: C/raw.page:33
+msgid ""
+"Changing between developers will cause all edits made to a photograph to be "
+"discarded."
+msgstr ""
+"Cambiar entre desarrolladores hará que todas las ediciones hechas en una "
+"foto se descarten."
+
+#. (itstool) path: page/p
+#: C/raw.page:39
+msgid ""
+"In order to publish or use a RAW photograph in most other software, it has "
+"to be exported first. Shotwell can export your RAW photos in JPEG, PNG, TIFF "
+"or BMP format, and, when publishing, will internally export a JPEG version "
+"for you and publish that."
+msgstr ""
+"Para publicar o usar una foto RAW en la mayoría de los programas, primero se "
+"debe exportar. Shotwell puede exportar sus fotos RAW en formato JPEG, PNG, "
+"TIFF o BMP y, al publicarlas, exportará internamente una versión JPEG para y "
+"la publicará."
+
+#. (itstool) path: info/desc
+#: C/running.page:7
+msgid ""
+"Find Shotwell in the Applications menu, or have it start automatically when "
+"you plug in a camera."
+msgstr ""
+"Busque Shotwell en el menú Aplicaciones o haga que se inicie automáticamente "
+"cuando conecta una cámara."
+
+#. (itstool) path: page/title
+#: C/running.page:14
+msgid "Running Shotwell"
+msgstr "Ejecutar Shotwell"
+
+#. (itstool) path: page/p
+#: C/running.page:16
+msgid ""
+"Once installed, Shotwell is available in your <gui>Applications</gui> menu "
+"under <gui>Graphics</gui> or <gui>Photography</gui>."
+msgstr ""
+"Una vez instalado, Shotwell estará disponible en su menú <gui>Aplicaciones</"
+"gui>, en <gui>Gráficos</gui> o en <gui>Fotografía</gui>."
+
+#. (itstool) path: page/p
+#: C/running.page:18
+msgid ""
+"Shotwell may also be executed automatically when a camera is plugged in to "
+"your computer. To check that your system is set up to run Shotwell when a "
+"camera is detected, go to <guiseq><gui>Edit</gui><gui>Preferences</gui></"
+"guiseq> in any Nautilus (file browser) window and choose the <gui>Media</"
+"gui> tab.  You'll see a dropdown box entitled <gui>Photos:</gui> which lets "
+"you choose Shotwell as your photo handling application."
+msgstr ""
+"Shotwell también se puede ejecutar automáticamente cuando una cámara está "
+"conectada a su ordenador. Para comprobar que su sistema está configurado "
+"para ejecutar Shotwell cuando se detecta una cámara, pulse en "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> en cualquier "
+"ventana de Nautilus (explorador) y elija la pestaña <gui>Media</gui>.Verá un "
+"cuadro desplegable titulado <gui>Fotos:</gui> que le permitirá elegir "
+"Shotwell como su aplicación de gestión de fotos."
+
+#. (itstool) path: note/p
+#: C/running.page:25
+msgid ""
+"Shotwell may also be executed directly from its build directory, although "
+"this is only recommended for testing out Shotwell or for developers."
+msgstr ""
+"También puede ejecutar Shotwell directamente desde la carpeta en la que se "
+"construyó, pero esto sólo se recomienda para probar Shotwell o para "
+"desarrolladores."
+
+#. (itstool) path: info/desc
+#: C/share-background.page:7
+msgid ""
+"Set your desktop background to a single photo or to a slideshow of photos."
+msgstr ""
+"Configure su fondo de escritorio como una única foto o como una presentación "
+"de fotos."
+
+#. (itstool) path: page/title
+#: C/share-background.page:12
+msgid "Set a desktop background or slideshow"
+msgstr "Configurar un fondo de escritorio o presentación"
+
+#. (itstool) path: page/p
+#: C/share-background.page:14
+msgid ""
+"To set a single photo as your desktop background, select the photo and "
+"choose <guiseq><gui>File</gui><gui>Set as Desktop Background</gui></guiseq>."
+msgstr ""
+"Para establecer una única foto como fondo del escritorio, seleccione la foto "
+"y escriba <guiseq><gui>Archivo</gui><gui>Establecer como fondo del "
+"escritorio</gui></guiseq>."
+
+#. (itstool) path: page/p
+#: C/share-background.page:16
+msgid ""
+"You can also set your background to a slideshow of photos. To do this, "
+"select the photos for the slideshow and choose <guiseq><gui>File</"
+"gui><gui>Set as Desktop Slideshow...</gui></guiseq>. Shotwell will prompt "
+"you for a slideshow delay, which can be any interval up to one day in "
+"length. The background slideshow will proceed even when Shotwell is not "
+"running."
+msgstr ""
+"También puede configurar su fondo para una presentación de fotos. Para ello, "
+"seleccione las fotos de la presentación y elija <guiseq><gui>Archivo</"
+"gui><gui>Establecer como presentación de diapositivas de escritorio...</"
+"gui></guiseq>. Shotwell le pedirá el tiempo de duración de cada diapositiva, "
+"que puede ser desde cualquier intervalo de tiempo hasta un día. La "
+"presentación de diapositivas de fondo continuará incluso cuando Shotwell no "
+"esté funcionando."
+
+#. (itstool) path: info/desc
+#: C/share-export.page:7
+msgid "Copy photos out of Shotwell so you can put them somewhere else."
+msgstr ""
+"Copiar fotos fuera Shotwell, para poder ponerlas en cualquier otro lugar."
+
+#. (itstool) path: page/title
+#: C/share-export.page:12
+msgid "Exporting photos"
+msgstr "Exportar fotos"
+
+#. (itstool) path: page/p
+#: C/share-export.page:14
+msgid ""
+"To export photos from Shotwell via drag and drop, drag the photos from "
+"Shotwell onto a file manager window or your desktop. The new files will be "
+"full-sized copies of the photos in your library."
+msgstr ""
+"Para exportar fotos desde Shotwell usando arrastrar y soltar, arrastre desde "
+"Shotwell hacia una ventana de manejador de archivos o su escritorio. Los "
+"archivos nuevos serán copias de tamaño completo de las fotos de su "
+"biblioteca."
+
+#. (itstool) path: page/p
+#: C/share-export.page:18
+msgid ""
+"Alternatively, select a set of photos and choose the <guiseq><gui>File</"
+"gui><gui>Export...</gui></guiseq> command or press <keyseq><key>Shift</"
+"key><key>Ctrl</key><key>E</key></keyseq>, which exports photos while letting "
+"you fine-tune the size and dimensions of your photo files. A window will "
+"appear allowing you to make several choices:"
+msgstr ""
+"Alternativamente, seleccione un conjunto de fotos y elija el comando "
+"<guiseq><gui>Archivo</gui><gui>Exportar...</gui></guiseq> o pulse "
+"<keyseq><key>Shift</key><key>Ctrl</key><key>E</key></keyseq> , para exportar "
+"las fotos y al mismo tiempo ajustar el tamaño y las dimensiones de sus "
+"archivos de fotos. Aparecerá una ventana que le permitirá realizar varias "
+"opciones:"
+
+#. (itstool) path: item/p
+#: C/share-export.page:24
+msgid "A format for export."
+msgstr "Un formato al que exportar."
+
+#. (itstool) path: item/p
+#: C/share-export.page:27
+msgid ""
+"Choose <gui>Unmodified</gui> to export photos in their original format "
+"without any edits made in Shotwell. RAW photos will be exported in their "
+"original RAW format."
+msgstr ""
+"Selecione <gui>Sin modificar</gui> para exportar las fotos en su formato "
+"original, sin ninguna modificación hecha en Shotwell. Las fotos en bruto se "
+"exportarán en su formato original."
+
+#. (itstool) path: item/p
+#: C/share-export.page:29
+msgid ""
+"Choose <gui>Current</gui> to export photos including edits made in Shotwell. "
+"RAW photos will be exported in JPEG format if you have edited them in "
+"Shotwell, and otherwise in their original RAW format."
+msgstr ""
+"Escoja <gui>Actual</gui> para exportar las fotos, incluyendo las editadas en "
+"Shotwell. Las fotos en bruto se exportarán en formato JPEG si las editó en "
+"Shotwell, y si no en su formato en bruto original."
+
+#. (itstool) path: item/p
+#: C/share-export.page:31
+msgid ""
+"Or you can choose a particular image format (JPEG, PNG, TIFF, BMP) to be "
+"used for exporting. Any edits made in Shotwell will be included, and "
+"Shotwell will convert photos to the destination format."
+msgstr ""
+"O puede seleccionar un formato de imagen específico (JPEG, PNG,TIFF, BMP) "
+"para usar en la exportación. Cualquier edición hecha en Shotwell se "
+"incluirá, y Shotwel convertirá las fotos al formato de destino."
+
+#. (itstool) path: item/p
+#: C/share-export.page:37
+msgid "The image quality for exporting (Low, Medium, High, or Maximum)."
+msgstr "La calidad de la imagen al exportarla (baja, media, alta o máxima)."
+
+#. (itstool) path: item/p
+#: C/share-export.page:38
+msgid ""
+"A scaling constraint (which means how Shotwell will decide to scale the "
+"photos down), and the desired pixel size."
+msgstr ""
+"Una restricción de la escala (que significa cómo Shotwell va a decidir "
+"reducir la escala proporcionalmente), y el tamaño de píxel requerido."
+
+#. (itstool) path: item/p
+#: C/share-export.page:39
+msgid ""
+"The option whether you like to export metadatas such as tags or ratings. "
+"This can help to save your privacy if you have geolocation tags or tags "
+"which shouldn't be seen by anyone."
+msgstr ""
+"La opción de si quiere exportar metadatos como etiquetas o puntuaciones "
+"puede ayudar a preservar su privacidad en caso de que tenga etiquetas o "
+"etiquetas de geolocalización que nadie debería ver."
+
+#. (itstool) path: page/p
+#: C/share-export.page:42
+msgid ""
+"If selected, Shotwell will write tags, titles, and other metadata to the new "
+"files."
+msgstr ""
+"Si está seleccionada, Shotwell escribirá etiquetas, títulos y otros "
+"metadatos a los nuevos archivos."
+
+#. (itstool) path: info/desc
+#: C/share-print.page:7
+msgid ""
+"Click <guiseq><gui>File</gui><gui>Print...</gui></guiseq>. For more printing "
+"options, select the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog."
+msgstr ""
+"Pulse <guiseq><gui>Archivo</gui><gui>Imprimir...</gui></guiseq>. Para más "
+"opciones de impresión, seleccione la pestaña <gui>Configuración de página</"
+"gui> en el diálogo <gui>Imprimir</gui>."
+
+#. (itstool) path: page/title
+#: C/share-print.page:12
+msgid "Printing"
+msgstr "Imprimir"
+
+#. (itstool) path: page/p
+#: C/share-print.page:14
+msgid ""
+"To print a photo, select it and choose <guiseq><gui>File</gui><gui>Print...</"
+"gui></guiseq>."
+msgstr ""
+"Para imprimir una foto, selecciónela y elija <guiseq><gui>Archivo</"
+"gui><gui>Imprimir</gui></guiseq>."
+
+#. (itstool) path: page/p
+#: C/share-print.page:16
+msgid ""
+"Shotwell can also print multiple images in one page; to do this, select "
+"multiple images, choose <guiseq><gui>File</gui><gui>Print...</gui></guiseq>, "
+"and in the <gui>Print</gui> dialog, choose the <gui>Image Settings</gui> "
+"tab. In <gui>Image Settings</gui>, choose one of the multiple-image-per-page "
+"options under <gui>Autosize</gui>."
+msgstr ""
+"Shotwell puede también imprimir varias imágenes en una página; para hacer "
+"esto, seleccione las imágenes, elija <guiseq><gui>Archivo</"
+"gui><gui>Imprimir</gui></guiseq> y en el cuadro de diálogo <gui>Imprimir</"
+"gui>, seleccione la pestaña <gui>Configuraciones de la imagen</gui>. "
+"En<gui>Configuración de la imagen</gui>, elija una de las opciones múltiples "
+"imágenes por página en <gui>Tamaño automático</gui>."
+
+#. (itstool) path: page/p
+#: C/share-print.page:23
+msgid ""
+"If you would like to set formatting, paper size, and orientation options, "
+"choose the <gui>Page Setup</gui> tab in the <gui>Print</gui> dialog prior to "
+"printing."
+msgstr ""
+"Si quiere establecer el formato, el tamaño del papel, y la orientación, "
+"seleccione la pestaña <gui>Configuración de la página</gui>en el cuadro de "
+"diálogo <gui>Imprimir</gui> antes de imprimir."
+
+#. (itstool) path: info/desc
+#: C/share-send.page:7
+msgid "Send photos via email, instant messaging or in other ways."
+msgstr "Enviar fotos por correo-e, mensajería instantánea u otras maneras."
+
+#. (itstool) path: page/title
+#: C/share-send.page:12
+msgid "Sending photos"
+msgstr "Enviar fotos"
+
+#. (itstool) path: page/p
+#: C/share-send.page:14
+msgid ""
+"Shotwell can send photos using the GNOME desktop's Send To mechanism, which "
+"lets you send photos via email, instant messaging or in other ways."
+msgstr ""
+"Shotwell puede enviar fotos usando el mecanismo de «Enviar a» de GNOME, lo "
+"que le permite enviar fotos por correo-e, mensajería instantánea u otras "
+"maneras."
+
+#. (itstool) path: page/p
+#: C/share-send.page:16
+msgid ""
+"To send photos, select them in Shotwell and choose <guiseq><gui>File</"
+"gui><gui>Send To...</gui></guiseq>, or right-click the photos and choose "
+"<gui>Send To...</gui> from the context menu. A <gui>Send To</gui> dialog box "
+"will appear which lets you choose a mechanism for sending the files (such as "
+"email or instant messaging) and a destination. You can optionally choose to "
+"send the files in a compressed format."
+msgstr ""
+"Para enviar fotos, selecciónelas en Shotwell y después "
+"escoja<guiseq><gui>Archivo</gui><gui>Enviar a...</gui></guiseq>, o pulse con "
+"el botón derecho en las fotos y escoja <gui>Enviar a ...</gui> del menú "
+"contextual. Aparecerá una caja de diálogo en donde puede escoger la forma "
+"para enviar los archivos (como correo electrónico o mensaje instantáneo) y "
+"el destino. Puede, opcionalmente, enviar los archivos en un formato "
+"comprimido."
+
+#. (itstool) path: info/desc
+#: C/share-slideshow.page:7
+msgid "Watch a slideshow of your photos."
+msgstr "Ver sus fotos como diapositivas."
+
+#. (itstool) path: page/title
+#: C/share-slideshow.page:12
+msgid "Slideshows"
+msgstr "Diapositivas"
+
+#. (itstool) path: page/p
+#: C/share-slideshow.page:14
+msgid ""
+"To see a sideshow of any collection in Shotwell, navigate to that collection "
+"and select <guiseq><gui>View</gui><gui>Slideshow</gui></guiseq> or press "
+"<key>F5</key>."
+msgstr ""
+"Para ver una presentación de diapositivas en Shotwell, navegue hasta la "
+"colección y elija <guiseq><gui>Ver</gui><gui>Presentación</gui></guiseq> o "
+"pulse <key>F5</key>."
+
+#. (itstool) path: page/p
+#: C/share-slideshow.page:16
+msgid "You can change some settings in a running slideshow:"
+msgstr ""
+"Puede cambiar algunas configuraciones de una presentación de diapositivas en "
+"ejecución:"
+
+#. (itstool) path: item/p
+#: C/share-slideshow.page:19
+msgid "The duration how long an image should be shown: 1 - 30 seconds"
+msgstr ""
+"La duración de cuánto tiempo se debe mostrar una imagen: 1 - 30 segundos"
+
+#. (itstool) path: item/p
+#: C/share-slideshow.page:20
+msgid "You can select different transition effects."
+msgstr "Puede seleccionar diferentes efectos de transición."
+
+#. (itstool) path: item/p
+#: C/share-slideshow.page:21
+msgid "The time for each transition effect: 0.1 - 1.0 seconds"
+msgstr "El tiempo para cada efecto de transición: 0.1 - 1.0 segundos"
+
+#. (itstool) path: info/desc
+#: C/share-upload.page:7
+msgid "Publish photos to Facebook, Flickr, Picasa Web Albums, or other sites."
+msgstr ""
+"Publica fotos en Facebook, Flickr, álbumes web de Picasa o en otros sitios."
+
+#. (itstool) path: page/title
+#: C/share-upload.page:12
+msgid "Publishing to the Web"
+msgstr "Publicar en la web"
+
+#. (itstool) path: page/p
+#: C/share-upload.page:14
+msgid ""
+"Through the use of <link xref=\"other-plugins\">plugins</link>, Shotwell can "
+"publish photos and videos to the following services, each of which requires "
+"an account:"
+msgstr ""
+"Gracias al uso de <link xref=\"other-plugins\">complementos</link>, Shotwell "
+"puede publicar fotos y vídeos en los siguientes servicios, para los que se "
+"requiere una cuenta."
+
+#. (itstool) path: item/p
+#: C/share-upload.page:18
+msgid "<link href=\"http://facebook.com\">Facebook</link>"
+msgstr "<link href=\"http://facebook.com\">Facebook</link>"
+
+#. (itstool) path: item/p
+#: C/share-upload.page:19
+msgid "<link href=\"http://flickr.com\">Flickr</link>"
+msgstr "<link href=\"http://flickr.com\">Flickr</link>"
+
+#. (itstool) path: item/p
+#: C/share-upload.page:20
+msgid ""
+"<link href=\"http://picasaweb.google.com\">Picasa Web Albums</link> and "
+"<link href=\"http://plus.google.com\">Google+</link>"
+msgstr ""
+"<link href=\"http://picasaweb.google.com\">Álbumes de Picasa Web</link> y "
+"<link href=\"http://plus.google.com\">Google+</link>"
+
+#. (itstool) path: item/p
+#: C/share-upload.page:21
+msgid "<link href=\"http://youtube.com\">YouTube</link> (videos only)"
+msgstr "<link href=\"http://youtube.com\">YouTube</link> (sólo vídeos)"
+
+#. (itstool) path: item/p
+#: C/share-upload.page:22
+msgid ""
+"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, a photo site "
+"popular in Russia (photos only)"
+msgstr ""
+"<link href=\"http://fotki.yandex.ru\">Yandex.Fotki</link>, una página de "
+"fotos popular en Rusia (sólo fotos)"
+
+#. (itstool) path: item/p
+#: C/share-upload.page:23
+msgid ""
+"Any site running the <link href=\"http://piwigo.org\">Piwigo</link> photo "
+"gallery software (photos only)"
+msgstr ""
+"Cualquier sitio que ejecute el software de galería de fotos <link href="
+"\"http://piwigo.org\">Piwigo</link> (sólo fotos)"
+
+#. (itstool) path: page/p
+#: C/share-upload.page:26
+msgid ""
+"To publish selected photos in a collection, choose <guiseq><gui>Edit</"
+"gui><gui>Preferences</gui></guiseq> and click on the <gui>Plugins</gui> tab "
+"to enable the plugin for the service you want to publish to. Next, choose, "
+"<guiseq><gui>File</gui><gui>Publish</gui></guiseq>, press the <gui>Publish</"
+"gui> toolbar button or use <keyseq><key>Ctrl</key><key>P</key></keyseq>. You "
+"will see a dialog that lets you select a publishing service. You will then "
+"need to log in or create an account."
+msgstr ""
+"Para publicar las fotos seleccionadas en una colección, elija "
+"<guiseq><gui>Editar</gui><gui>Preferencias</gui></guiseq> y pulse en la "
+"pestaña <gui>Complementos</gui> para activar el complemento del servicio en "
+"el que quiere publicar. A continuación, elija <guiseq><gui>Archivo</"
+"gui><gui>Publicar</gui></guiseq>, pulse el botón <gui>Publicar</gui> en la "
+"barra de herramientas o pulse <keyseq><key>Ctrl</key><key>P</key></keyseq>. "
+"Verá un diálogo que le permite elegir el servicio de publicación. Necesitará "
+"iniciar sesión o crear una cuenta."
+
+#. (itstool) path: page/p
+#: C/share-upload.page:31
+msgid ""
+"Publishing to Facebook requires you to grant certain permissions to the "
+"Shotwell Facebook application. You only need to grant these permissions "
+"once, when you first associate Shotwell with your Facebook account."
+msgstr ""
+"Publicar en Facebook requiere que conceda ciertos permisos a la aplicación "
+"Conectar Shotwell con Facebook. Solo necesita conceder los permisos una vez, "
+"la primera vez que asocie Shotwell con su cuenta de Facebook."
+
+#. (itstool) path: note/p
+#: C/share-upload.page:34
+msgid ""
+"You will be only able to publish images with at most the permission you "
+"granted to the Shotwell Facebook application"
+msgstr ""
+"Solo podrá publicar imágenes con el permiso que concedió a la aplicación "
+"Facebook de Shotwell"
+
+#. (itstool) path: page/p
+#: C/share-upload.page:36
+msgid ""
+"Similarly, publishing to Flickr requires you to log in and permit Shotwell "
+"Connect to access your account."
+msgstr ""
+"Del mismo modo, publicar en Flickr requiere que inicie sesión y permita que "
+"Shotwell Connect acceda a su cuenta."
+
+#. (itstool) path: page/p
+#: C/share-upload.page:38
+msgid ""
+"If you have a Google account, but have not yet used Picasa Web Albums, you "
+"will need to log in to Picasa using a browser once before you can publish to "
+"this service."
+msgstr ""
+"Si tiene una cuenta de Google, pero nunca ha usado los álbumes web de "
+"Picasa, necesitará iniciar sesión en Picasa usando un navegador antes de "
+"poder publicar algo en este servicio."
+
+#. (itstool) path: info/desc
+#: C/view-displaying.page:7
+msgid ""
+"Learn about different ways of viewing your photos: in a grid, filling the "
+"main window, or filling the whole screen."
+msgstr ""
+"Aprenda sobre diferentes formas de ver sus fotos: en una cuadrícula, "
+"llenando la ventana principal o a pantalla completa."
+
+#. (itstool) path: page/title
+#: C/view-displaying.page:12
+msgid "Photo views"
+msgstr "Vistas de fotos"
+
+#. (itstool) path: page/p
+#: C/view-displaying.page:14
+msgid ""
+"When you select any collection in the sidebar, Shotwell displays all photos "
+"in the collection in the main window area. At the bottom right is a slider "
+"which adjusts the viewing size of the thumbnails. You may also adjust the "
+"thumbnail size using the plus and minus keys (<key>+</key> and <key>-</key>) "
+"or by pressing <key>Ctrl</key> while moving your mouse scroll wheel."
+msgstr ""
+"Cuando selecciona cualquier colección en la barra lateral, Shotwell muestra "
+"todas las fotos en esa colección en la ventana principal. En la esquina "
+"inferior derecha hay un control deslizante que puede ajustar el tamaño de "
+"las vistas miniatura. Puede ajustar el tamaño de las miniaturas usando las "
+"teclas más y menos (<key>+</key> y <key>-</key>) o presionando <key>Ctrl</"
+"key> mientras mueve la rueda central del ratón."
+
+#. (itstool) path: page/p
+#: C/view-displaying.page:16
+msgid ""
+"You can view a photo full-window by double-clicking on it. From there you "
+"may move to other photos in the collection with the Back and Forward "
+"buttons. To return to the collection, double-click on the photo or press "
+"<key>Esc</key>."
+msgstr ""
+"Puede ver la vista de la foto en pantalla completa pulsando dos veces. Desde "
+"ahí puede moverse a otras fotos en la colección con los botones de retroceso "
+"y avance. Puede regresar a la colección, pulsando dos veces en la foto o "
+"presionando <key>Esc</key>."
+
+#. (itstool) path: page/p
+#: C/view-displaying.page:18
+msgid ""
+"When viewing a photo in full-window mode, the slider on the toolbar controls "
+"zoom. You can pan around by grabbing and dragging anywhere on the photo. You "
+"can also zoom using your scroll wheel or by pressing the following keyboard "
+"shortcuts: <keyseq><key>Ctrl</key>0</keyseq> for the full image, "
+"<keyseq><key>Ctrl</key>1</keyseq> for 100% (1 photo pixel = 1 screen pixel), "
+"and <keyseq><key>Ctrl</key>2</keyseq> for 200% (1 photo pixel = 2x2 screen "
+"pixels)."
+msgstr ""
+"Al visualizar una foto en pantalla completa, el control deslizante de la "
+"barra de herramientas controla el zoom. Puede desplazarse agarrando y "
+"arrastrando donde quiera en la foto. También puede hacer zoom utilizando la "
+"rueda de desplazamiento o pulsando los siguientes atajos de teclado: "
+"<keyseq><key>Ctrl</key>0</keyseq> para la imagen completa, "
+"<keyseq><key>Ctrl</key>1</keyseq> para el 100% (1 pixel de la foto = 1 pixel "
+"de la pantalla), y <keyseq><key>Ctrl</key>2</keyseq> para el 200% (1 pixel "
+"de la foto = 2x2 pixeles de la pantalla)."
+
+#. (itstool) path: page/p
+#: C/view-displaying.page:20
+msgid ""
+"Shotwell offers a fullscreen mode to display photos. Choose "
+"<guiseq><gui>View</gui><gui>Fullscreen</gui></guiseq> or press <key>F11</"
+"key>. To see the fullscreen toolbar, move your mouse to the bottom of the "
+"screen. The toolbar offers buttons to move through the collection, to pin "
+"the toolbar down (so it isn't hidden when you move the mouse away), and to "
+"leave fullscreen view."
+msgstr ""
+"Shotwell ofrece un modo de pantalla completa para mostrar las fotos. Escoja "
+"<guiseq><gui>Ver</gui><gui>Pantalla completa</gui></guiseq> o presione "
+"<key>F11</key>. Para ver la barra de herramientas de pantalla completa, "
+"mueva su ratón a la parte inferior de la pantalla. La barra de herramientas "
+"le ofrece botones para moverse a través de la colección, para fijar la barra "
+"de herramientas (así esta no se ocultará cuando mueva el ratón), y dejar la "
+"vista de pantalla completa."
+
+#. (itstool) path: section/title
+#: C/view-displaying.page:23
+msgid "Viewing videos"
+msgstr "Ver vídeos"
+
+#. (itstool) path: section/p
+#: C/view-displaying.page:24
+msgid ""
+"When you double-click a video, Shotwell will launch an external video player "
+"to play the video. It's not currently possible to display a video in full-"
+"window mode in Shotwell or to play the video within Shotwell itself."
+msgstr ""
+"Cuando pulse dos veces sobre un vídeo, Shotwell lanzará un reproductor de "
+"vídeo externo para reproducir el vídeo. Actualmente no es posible mostrar un "
+"vídeo en modo a pantalla completa o reproducirlo dentro del propio Shotwell"
+
+#. (itstool) path: info/desc
+#: C/view-information.page:7
+msgid ""
+"View more detailed information about photos, like the exposure mode used by "
+"the camera."
+msgstr ""
+"Ver información más detallada sobre las fotos, como el modo de exposición "
+"usado por la cámara."
+
+#. (itstool) path: page/title
+#: C/view-information.page:12
+msgid "Basic and extended information"
+msgstr "Información básica y extendida"
+
+#. (itstool) path: page/p
+#: C/view-information.page:14
+msgid ""
+"The Basic Information pane appears at the bottom of the sidebar, and "
+"displays a brief summary of the photos you've selected. If no photos are "
+"selected, it displays a summary of the entire collection. You can toggle the "
+"display of this pane using the <guiseq><gui>View</gui><gui>Basic "
+"Information</gui></guiseq> command."
+msgstr ""
+"El panel de información básica aparece en la parte inferior de la barra "
+"lateral, y muestra un breve resumen de las fotos que ha seleccionado. Si no "
+"se ha seleccionado ninguna foto, muestra un resumen de la colección "
+"completa. Puede cambiar la visibilidad de este panel usando el comando "
+"<guiseq><gui>Ver</gui><gui>Información básica</gui></guiseq>."
+
+#. (itstool) path: page/p
+#: C/view-information.page:16
+msgid ""
+"The floating Extended Information window displays more information about the "
+"selected photo. The <guiseq><gui>View</gui><gui>Extended Information</gui></"
+"guiseq> command or <keyseq><key>Ctrl</key><key>Shift</key><key>X</key></"
+"keyseq> toggles the display of this window."
+msgstr ""
+"La ventana flotante de información extendida muestra más información sobre "
+"la foto seleccionada. El comando <guiseq><gui>Vista</gui><gui>Información "
+"extendida</gui></guiseq> o <keyseq><key>Ctrl</key><key>Shift</key><key>X</"
+"key></keyseq> activa la visualización de esta ventana."
+
+#. (itstool) path: info/desc
+#: C/view-sidebar.page:7
+msgid ""
+"The sidebar on the left of the window lists various views of your library."
+msgstr ""
+"La barra lateral de la izquierda de la ventana lista varios tipos de vistas "
+"de su biblioteca."
+
+#. (itstool) path: page/title
+#: C/view-sidebar.page:21
+msgid "The sidebar"
+msgstr "La barra lateral"
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:23
+msgid ""
+"The sidebar on the left side of the Shotwell window lists various views of "
+"your library. Although you may see the same photo in multiple views, it's "
+"only stored once on your hard drive."
+msgstr ""
+"La barra lateral a la izquierda de la ventana de Shotwell lista varias "
+"vistas de su biblioteca. Aunque puede ver muchas vistas de la misma foto, "
+"solo se almacena una en su disco duro"
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:25
+msgid ""
+"The <gui>Last Import</gui> view lists your last imported photos no matter if "
+"they are imported from F-Spot, your camera, a memory card or the hard disk."
+msgstr ""
+"La vista <gui>Última importación</gui> lista sus últimas fotos importadas no "
+"importa si estas se importaron de F-Spot, su cámara, una tarjeta de memoria "
+"o su disco duro."
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:27
+msgid "The <gui>Flagged</gui> lists all photos you had previous flagged."
+msgstr ""
+"La opción <gui>Marcada</gui> lista todas las fotos que ha marcado "
+"anteriormente."
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:29
+msgid ""
+"The <gui>Saved Search</gui> allows you to sort your library by many criteria."
+msgstr ""
+"La <gui>Búsqueda guardada</gui> le permite ordenar su biblioteca bajo "
+"diferentes criterios."
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:31
+msgid ""
+"The <gui>Events</gui> folder lists all events in your library. An event is a "
+"group of photos that were taken at approximately the same time."
+msgstr ""
+"La carpeta de <gui>Eventos</gui> lista todos los eventos en su biblioteca.Un "
+"evento es un grupo de fotos que se tomaron aproximadamente al mismo tiempo."
+
+#. (itstool) path: page/p
+#: C/view-sidebar.page:33
+msgid ""
+"The <gui>Tags</gui> folder lists all tags you've assigned to photos. Photos "
+"can have multiple tags attached to them. When you click on the name of a tag "
+"in the sidebar, you will see all the photos associated with that tag."
+msgstr ""
+"La carpeta <gui>Etiquetas</gui> lista todas las etiquetas que ha asignado a "
+"sus fotos. Las fotos pueden tener múltiples etiquetas relacionadas con las "
+"mismas. Cuando posiciona el cursor sobre el nombre de una etiqueta en la "
+"barra lateral, podrá ver todas las fotos asociadas a esa etiqueta."
+
+#~ msgid "Facebook"
+#~ msgstr "Facebook"
+
+#~ msgid "Flickr"
+#~ msgstr "Flickr"
+
+#~ msgid "Symbol"
+#~ msgstr "Símbolo"
+
+#~ msgid ""
+#~ "@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"
+#~ msgstr ""
+#~ "@@image: 'figures/shotwell_logo.png'; md5=59de2b2c4fa64ea1497c98452c509dbd"
+
+#~ msgid "jim@yorba.org"
+#~ msgstr "jim@yorba.org"
+
+#~ msgid "allison@yorba.org"
+#~ msgstr "allison@yorba.org"
+
+#~ msgid "robert.ancell@canonical.com"
+#~ msgstr "robert.ancell@canonical.com"
+
+#~ msgid "pdo.smith@gmail.com"
+#~ msgstr "pdo.smith@gmail.com"
+
+#~ msgid "philbull@gmail.com"
+#~ msgstr "philbull@gmail.com"
diff --git a/help/es/import-camera.page b/help/es/import-camera.page
index 874b518..0f67e39 100644
--- a/help/es/import-camera.page
+++ b/help/es/import-camera.page
@@ -38,7 +38,7 @@
      <p>Seleccione la cámara en la barra lateral. Se mostrará la vista previa de cada una de las fotos de la cámara.</p>
     </item>
     <item>
-     <p>If you like, you can choose a set of specific photos to import. To do this, hold down the <key>Ctrl</key> key and click to select individual photos. You can hold down <key>Shift</key> and click to select a range of photos too.</p>
+     <p>Si quiere, puede elegir un conjunto de fotos específicas para importar. Para ello, mantenga presionada la tecla <key>Ctrl</key> y pulse para seleccionar las fotos individuales. Puede mantener pulsada la tecla <key>Mayús</key> y pulsar para seleccionar varias fotos también.</p>
     </item>
     <item>
      <p>Pulse <gui>Importar seleccionadas</gui> o <gui> Importar todo</gui>. Las fotos se copiarán de la cámara y se guardarán en el ordenador.</p>
diff --git a/help/lv/lv.po b/help/lv/lv.po
index cc8a1e5..89be000 100644
--- a/help/lv/lv.po
+++ b/help/lv/lv.po
@@ -1806,7 +1806,7 @@ msgstr ""
 "<guiseq><gui>Tagi</gui><gui>Pievienot tagus...</gui></guiseq>, varat "
 "ierakstīt vienu vai vairāku tagu nosaukumus, atdalot tos ar komatiem. Kad "
 "tags ir izveidots, varat to pārdēvēt, izvēloties to tagu sānu joslā un "
-"izvēloties <guiseq><gui>Tagi</ui><gui>Pārdēvēt tagu \"[nosaukums]\"...</"
+"izvēloties <guiseq><gui>Tagi</gui><gui>Pārdēvēt tagu \"[nosaukums]\"...</"
 "gui></guiseq>, veicot labo klikšķi un izvēloties <gui>Pārdēvēt...</gui> vai "
 "dubultklikšķinot tagu sānu joslā."
 
diff --git a/help/lv/organize-tag.page b/help/lv/organize-tag.page
index 6efee62..46bff0c 100644
--- a/help/lv/organize-tag.page
+++ b/help/lv/organize-tag.page
@@ -22,16 +22,7 @@
 		<item><p>Velciet un nometiet izvēlētās fotogrāfijas uz vēlamā taga.</p></item>
     </list>
      
-    <p>
-		When you use <keyseq><key>Ctrl</key><key>T</key></keyseq> or 
-		<guiseq><gui>Tags</gui><gui>Add Tags...</gui></guiseq> you can type
-		in the names of one or more tags, separated by commas.
-		Once you have created a tag, you can rename it by selecting that 
-		tag in the sidebar and choosing 
-		<guiseq><gui>Tags</gui><gui>Rename Tag "[name]"...</gui></guiseq>,
-		by rightclicking on it and choose <gui>Rename...</gui> or
-		double-click on the tag in the sidebar.
-	</p>
+    <p>Ja izmantojat <keyseq><key>Ctrl</key><key>T</key></keyseq> vai <guiseq><gui>Tagi</gui><gui>Pievienot tagus...</gui></guiseq>, varat ierakstīt vienu vai vairāku tagu nosaukumus, atdalot tos ar komatiem. Kad tags ir izveidots, varat to pārdēvēt, izvēloties to tagu sānu joslā un izvēloties <guiseq><gui>Tagi</gui><gui>Pārdēvēt tagu "[nosaukums]"...</gui></guiseq>, veicot labo klikšķi un izvēloties <gui>Pārdēvēt...</gui> vai dubultklikšķinot tagu sānu joslā.</p>
     
     <p>Lai mainītu, kuri tagi ir saistīti ar kurām fotogrāfijām, izvēlieties attiecīgo fotogrāfiju , izvēlieties <guiseq><gui>Tagi</gui><gui>Modificēt tagus...</gui></guiseq> vai spiediet labo peles pogu uz fotogrāfijas un izvēlieties <gui>Modificēt tagus...</gui> un rediģējiet ar komatiem atdalīto sarakstu. Lai izņemtu tagu no vienas vai vairākām fotogrāfijām, vispirms izvēlieties attiecīgo tagu sānu joslā, tad izvēlieties fotogrāfijas, ko vēlaties izņemt un izvēlieties <guiseq><gui>Tagi</gui><gui>Izņemt tagu "[nosaukums]" no fotogrāfijām</gui></guiseq> vai spiediet labo peles pogu uz fotogrāfijām un izvēlieties <gui>Izņemt tagu "[nosaukums]" no fotogrāfijām</gui>.</p>
     
diff --git a/help/shotwell.1 b/help/shotwell.1
index 334cd7c..195143f 100644
--- a/help/shotwell.1
+++ b/help/shotwell.1
@@ -13,7 +13,8 @@ import photos from disk or camera, organize them in various ways, view them in f
 
 .SH "OPTIONS"
 .B \-h, \-\-help
-.R Show help options
+Show help options
+.RE
 
 .B \-d, \-\-datadir=DIRECTORY
 .RS
diff --git a/help/sv/organize-event.page b/help/sv/organize-event.page
index 59e822a..d81eb45 100644
--- a/help/sv/organize-event.page
+++ b/help/sv/organize-event.page
@@ -54,7 +54,7 @@
     </section>
     
     <section>
-    <title>Ändra bilden som representerar varje händelse.</title>
+    <title>Ändra bilden som representerar varje händelse</title>
 
     <p>Om du väljer <gui>Händelser</gui> i sidopanelen kommer du att se en ensam bild som representerar var händelse. Det kallas nyckelbilden.</p>
 
diff --git a/help/sv/other-files.page b/help/sv/other-files.page
index 6c1374b..bcfd7cd 100644
--- a/help/sv/other-files.page
+++ b/help/sv/other-files.page
@@ -75,7 +75,7 @@
     </section>
 
     <section id="automatic-rename">
-       <title>Automatiskt döpa om importerade bilder till gemener.</title>
+       <title>Automatiskt byta namn på importerade bilder till gemener</title>
        
        <p>Shotwell kan automatiskt ändra filnamnen för importerade bilder till gemener. För att aktivera detta, välj <guiseq><gui>Redigera</gui><gui>Inställningar</gui></guiseq> och i fönstret <gui>Inställningar</gui>, kryssa i rutan <gui>Byt namn på importerade filer till gemener</gui>.</p>
     
diff --git a/help/sv/share-background.page b/help/sv/share-background.page
index 560016e..8f5e39a 100644
--- a/help/sv/share-background.page
+++ b/help/sv/share-background.page
@@ -20,7 +20,7 @@
     </mal:credit>
   </info>
 
-	<title>Ange en skrivbordsbakgrund eller ett bildspel.</title>
+	<title>Ange en skrivbordsbakgrund eller ett bildspel</title>
 
     <p>För att ange en bild som din skrivbordsbakgrund, markera bilden och välj sedan <guiseq><gui>Arkiv</gui><gui>Använd som skrivbordsbakgrund</gui></guiseq>.</p>
     
diff --git a/help/sv/sv.po b/help/sv/sv.po
index b11fd4c..59b1afb 100644
--- a/help/sv/sv.po
+++ b/help/sv/sv.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell master\n"
-"POT-Creation-Date: 2016-07-01 22:30+0000\n"
-"PO-Revision-Date: 2016-09-21 13:25+0200\n"
+"POT-Creation-Date: 2017-01-18 21:37+0000\n"
+"PO-Revision-Date: 2017-02-12 15:58+0100\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.9\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
 msgctxt "_"
@@ -171,8 +171,6 @@ msgstr ""
 #. 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
-#| msgid ""
-#| "@@image: 'figures/crop_thirds.jpg'; md5=4cf0a026bb812c7eab0c9db8210a9524"
 msgctxt "_"
 msgid ""
 "external ref='figures/crop_thirds.jpg' md5='4cf0a026bb812c7eab0c9db8210a9524'"
@@ -1266,7 +1264,7 @@ msgstr ""
 #. (itstool) path: section/title
 #: C/organize-event.page:51
 msgid "Change the photo used to represent each event"
-msgstr "Ändra bilden som representerar varje händelse."
+msgstr "Ändra bilden som representerar varje händelse"
 
 #. (itstool) path: section/p
 #: C/organize-event.page:53
@@ -1457,8 +1455,6 @@ msgstr ""
 #. 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
-#| msgid ""
-#| "@@image: 'figures/trash_process.png'; md5=ed596bda34c2f4a79a310fbc8bb51fd2"
 msgctxt "_"
 msgid ""
 "external ref='figures/trash_process.png' "
@@ -2227,7 +2223,7 @@ msgstr ""
 #. (itstool) path: section/title
 #: C/other-files.page:95
 msgid "Automatically renaming imported photos to lowercase"
-msgstr "Automatiskt döpa om importerade bilder till gemener."
+msgstr "Automatiskt byta namn på importerade bilder till gemener"
 
 #. (itstool) path: section/p
 #: C/other-files.page:97
@@ -2632,7 +2628,7 @@ msgstr ""
 #. (itstool) path: page/title
 #: C/share-background.page:12
 msgid "Set a desktop background or slideshow"
-msgstr "Ange en skrivbordsbakgrund eller ett bildspel."
+msgstr "Ange en skrivbordsbakgrund eller ett bildspel"
 
 #. (itstool) path: page/p
 #: C/share-background.page:14
@@ -2921,13 +2917,11 @@ msgstr ""
 
 #. (itstool) path: item/p
 #: C/share-upload.page:18
-#| msgid "<link href=\"http://youtube.com\">YouTube</link> (videos only)"
 msgid "<link href=\"http://facebook.com\">Facebook</link>"
 msgstr "<link href=\"http://facebook.com\">Facebook</link>"
 
 #. (itstool) path: item/p
 #: C/share-upload.page:19
-#| msgid "<link href=\"http://youtube.com\">YouTube</link> (videos only)"
 msgid "<link href=\"http://flickr.com\">Flickr</link>"
 msgstr "<link href=\"http://flickr.com\">Flickr</link>"
 
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 79724ee..59f6087 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,14 +1,17 @@
-imagesdir = $(datadir)/shotwell/icons
-
-dist_images_DATA = \
+dist_noinst_DATA = \
+	about-aachen.jpg \
 	all-rejected.png \
 	crop-pivot-reticle.png \
 	crop.svg \
 	drag_nub.png \
 	faces-tool.png \
+	filter-flagged-disabled.png \
 	filter-flagged.png \
+	filter-photos-disabled.png \
 	filter-photos.png \
+	filter-raw-disabled.png \
 	filter-raw.png \
+	filter-videos-disabled.png \
 	filter-videos.png \
 	five-star-filter.svg \
 	five-stars.svg \
diff --git a/icons/Makefile.in b/icons/Makefile.in
index cffd751..49a770f 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -90,9 +90,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = icons
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \
-	$(top_srcdir)/m4/ax_check_enable_debug.m4 \
-	$(top_srcdir)/m4/ax_generate_changelog.m4 \
+am__aclocal_m4_deps = $(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 \
@@ -106,7 +104,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.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 $(dist_images_DATA) \
+DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \
 	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
@@ -131,35 +129,7 @@ am__can_run_installinfo = \
     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)$(imagesdir)"
-DATA = $(dist_images_DATA)
+DATA = $(dist_noinst_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -170,6 +140,9 @@ 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@
@@ -257,6 +230,7 @@ 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@
@@ -338,16 +312,20 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-imagesdir = $(datadir)/shotwell/icons
-dist_images_DATA = \
+dist_noinst_DATA = \
+	about-aachen.jpg \
 	all-rejected.png \
 	crop-pivot-reticle.png \
 	crop.svg \
 	drag_nub.png \
 	faces-tool.png \
+	filter-flagged-disabled.png \
 	filter-flagged.png \
+	filter-photos-disabled.png \
 	filter-photos.png \
+	filter-raw-disabled.png \
 	filter-raw.png \
+	filter-videos-disabled.png \
 	filter-videos.png \
 	five-star-filter.svg \
 	five-stars.svg \
@@ -428,27 +406,6 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-dist_imagesDATA: $(dist_images_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_images_DATA)'; test -n "$(imagesdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(imagesdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(imagesdir)" || 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)$(imagesdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(imagesdir)" || exit $$?; \
-	done
-
-uninstall-dist_imagesDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_images_DATA)'; test -n "$(imagesdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(imagesdir)'; $(am__uninstall_files_from_dir)
 tags TAGS:
 
 ctags CTAGS:
@@ -490,9 +447,6 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(imagesdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -543,7 +497,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_imagesDATA
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -587,22 +541,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_imagesDATA
+uninstall-am:
 
 .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-data install-data-am \
-	install-dist_imagesDATA 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-dist_imagesDATA
+	install install-am 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
 
 .PRECIOUS: Makefile
 
diff --git a/icons/about-aachen.jpg b/icons/about-aachen.jpg
new file mode 100644
index 0000000..924cfb9
--- /dev/null
+++ b/icons/about-aachen.jpg
diff --git a/icons/filter-flagged-disabled.png b/icons/filter-flagged-disabled.png
new file mode 100644
index 0000000..e03284f
--- /dev/null
+++ b/icons/filter-flagged-disabled.png
diff --git a/icons/filter-photos-disabled.png b/icons/filter-photos-disabled.png
new file mode 100644
index 0000000..a1dce74
--- /dev/null
+++ b/icons/filter-photos-disabled.png
diff --git a/icons/filter-raw-disabled.png b/icons/filter-raw-disabled.png
new file mode 100644
index 0000000..63dfd5b
--- /dev/null
+++ b/icons/filter-raw-disabled.png
diff --git a/icons/filter-videos-disabled.png b/icons/filter-videos-disabled.png
new file mode 100644
index 0000000..39a1bd5
--- /dev/null
+++ b/icons/filter-videos-disabled.png
diff --git a/m4/appdata-xml.m4 b/m4/appdata-xml.m4
deleted file mode 100644
index 765d95c..0000000
--- a/m4/appdata-xml.m4
+++ /dev/null
@@ -1,90 +0,0 @@
-# appdata-xml.m4
-#
-# serial 5
-
-dnl APPDATA_XML
-dnl Installs and validates AppData XML files.
-dnl
-dnl Call APPDATA_XML in configure.ac to check for the appdata-validate tool.
-dnl Add @APPDATA_XML_RULES@ to a Makefile.am to substitute the make rules. Add
-dnl .appdata.xml files to appdata_XML in Makefile.am and they will be validated
-dnl at make check time, if appdata-validate is installed, as well as installed
-dnl to the correct location automatically. Add --enable-appdata-validate to
-dnl DISTCHECK_CONFIGURE_FLAGS in Makefile.am to require valid AppData XML when
-dnl doing a distcheck.
-dnl
-dnl Adding files to appdata_XML does not distribute them automatically.
-
-AU_DEFUN([APPDATA_XML],
-[
-  m4_pattern_allow([AM_V_GEN])
-  AC_ARG_ENABLE([appdata-validate],
-                [AS_HELP_STRING([--disable-appdata-validate],
-                                [Disable validating AppData XML files during check phase])])
-
-  AS_IF([test "x$enable_appdata_validate" != "xno"],
-        [AC_PATH_PROG([APPSTREAM_UTIL], [appstream-util])
-         AS_IF([test "x$APPSTREAM_UTIL" = "x"],
-               [have_appdata_validate=no],
-               [have_appdata_validate=yes
-                AC_SUBST([APPSTREAM_UTIL])])],
-        [have_appdata_validate=no])
-
-  AS_IF([test "x$have_appdata_validate" != "xno"],
-        [appdata_validate=yes],
-        [appdata_validate=no
-         AS_IF([test "x$enable_appdata_validate" = "xyes"],
-               [AC_MSG_ERROR([AppData validation was requested but appstream-util was not found])])])
-
-  AC_SUBST([appdataxmldir], [${datadir}/appdata])
-
-  APPDATA_XML_RULES='
-.PHONY : uninstall-appdata-xml install-appdata-xml clean-appdata-xml
-
-mostlyclean-am: clean-appdata-xml
-
-%.appdata.valid: %.appdata.xml
-	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; \
-		if test -n "$(APPSTREAM_UTIL)"; \
-			then $(APPSTREAM_UTIL) --nonet validate $${d}$<; fi \
-		&& touch [$]@
-
-check-am: $(appdata_XML:.appdata.xml=.appdata.valid)
-uninstall-am: uninstall-appdata-xml
-install-data-am: install-appdata-xml
-
-.SECONDARY: $(appdata_XML)
-
-install-appdata-xml: $(appdata_XML)
-	@$(NORMAL_INSTALL)
-	if test -n "$^"; then \
-		test -z "$(appdataxmldir)" || $(MKDIR_P) "$(DESTDIR)$(appdataxmldir)"; \
-		$(INSTALL_DATA) $^ "$(DESTDIR)$(appdataxmldir)"; \
-	fi
-
-uninstall-appdata-xml:
-	@$(NORMAL_UNINSTALL)
-	@list='\''$(appdata_XML)'\''; test -n "$(appdataxmldir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '\''$(DESTDIR)$(appdataxmldir)'\'' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(appdataxmldir)" && rm -f $$files
-
-clean-appdata-xml:
-	rm -f $(appdata_XML:.appdata.xml=.appdata.valid)
-'
-  _APPDATA_XML_SUBST(APPDATA_XML_RULES)
-],
-[Use the new APPSTREAM_XML macro instead of APPDATA_XML in configure.ac, and
- replace @APPDATA_XML_RULES@ with @APPSTREAM_XML_RULES@, appdata_XML with
- appstream_XML and --enable-appdata-validate with --enable-appstream-validate
- in Makefile.am])
-
-dnl _APPDATA_XML_SUBST(VARIABLE)
-dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-AC_DEFUN([_APPDATA_XML_SUBST],
-[
-AC_SUBST([$1])
-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-]
-)
diff --git a/m4/ax_check_enable_debug.m4 b/m4/ax_check_enable_debug.m4
deleted file mode 100644
index f99d75f..0000000
--- a/m4/ax_check_enable_debug.m4
+++ /dev/null
@@ -1,124 +0,0 @@
-# ===========================================================================
-#   http://www.gnu.org/software/autoconf-archive/ax_check_enable_debug.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_CHECK_ENABLE_DEBUG([enable by default=yes/info/profile/no], [ENABLE DEBUG VARIABLES ...], [DISABLE DEBUG VARIABLES NDEBUG ...], [IS-RELEASE])
-#
-# DESCRIPTION
-#
-#   Check for the presence of an --enable-debug option to configure, with
-#   the specified default value used when the option is not present.  Return
-#   the value in the variable $ax_enable_debug.
-#
-#   Specifying 'yes' adds '-g -O0' to the compilation flags for all
-#   languages. Specifying 'info' adds '-g' to the compilation flags.
-#   Specifying 'profile' adds '-g -pg' to the compilation flags and '-pg' to
-#   the linking flags. Otherwise, nothing is added.
-#
-#   Define the variables listed in the second argument if debug is enabled,
-#   defaulting to no variables.  Defines the variables listed in the third
-#   argument if debug is disabled, defaulting to NDEBUG.  All lists of
-#   variables should be space-separated.
-#
-#   If debug is not enabled, ensure AC_PROG_* will not add debugging flags.
-#   Should be invoked prior to any AC_PROG_* compiler checks.
-#
-#   IS-RELEASE can be used to change the default to 'no' when making a
-#   release.  Set IS-RELEASE to 'yes' or 'no' as appropriate. By default, it
-#   uses the value of $ax_is_release, so if you are using the AX_IS_RELEASE
-#   macro, there is no need to pass this parameter.
-#
-#     AX_IS_RELEASE([git-directory])
-#     AX_CHECK_ENABLE_DEBUG()
-#
-# LICENSE
-#
-#   Copyright (c) 2011 Rhys Ulerich <rhys.ulerich@gmail.com>
-#   Copyright (c) 2014, 2015 Philip Withnall <philip@tecnocode.co.uk>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-#serial 5
-
-AC_DEFUN([AX_CHECK_ENABLE_DEBUG],[
-    AC_BEFORE([$0],[AC_PROG_CC])dnl
-    AC_BEFORE([$0],[AC_PROG_CXX])dnl
-    AC_BEFORE([$0],[AC_PROG_F77])dnl
-    AC_BEFORE([$0],[AC_PROG_FC])dnl
-
-    AC_MSG_CHECKING(whether to enable debugging)
-
-    ax_enable_debug_default=m4_tolower(m4_normalize(ifelse([$1],,[no],[$1])))
-    ax_enable_debug_is_release=m4_tolower(m4_normalize(ifelse([$4],,
-                                                              [$ax_is_release],
-                                                              [$4])))
-
-    # If this is a release, override the default.
-    AS_IF([test "$ax_enable_debug_is_release" = "yes"],
-      [ax_enable_debug_default="no"])
-
-    m4_define(ax_enable_debug_vars,[m4_normalize(ifelse([$2],,,[$2]))])
-    m4_define(ax_disable_debug_vars,[m4_normalize(ifelse([$3],,[NDEBUG],[$3]))])
-
-    AC_ARG_ENABLE(debug,
-	[AS_HELP_STRING([--enable-debug=]@<:@yes/info/profile/no@:>@,[compile with debugging])],
-	[],enable_debug=$ax_enable_debug_default)
-
-    # empty mean debug yes
-    AS_IF([test "x$enable_debug" = "x"],
-      [enable_debug="yes"])
-
-    # case of debug
-    AS_CASE([$enable_debug],
-      [yes],[
-	AC_MSG_RESULT(yes)
-	CFLAGS="${CFLAGS} -g -O0"
-	CXXFLAGS="${CXXFLAGS} -g -O0"
-	FFLAGS="${FFLAGS} -g -O0"
-	FCFLAGS="${FCFLAGS} -g -O0"
-	OBJCFLAGS="${OBJCFLAGS} -g -O0"
-      ],
-      [info],[
-	AC_MSG_RESULT(info)
-	CFLAGS="${CFLAGS} -g"
-	CXXFLAGS="${CXXFLAGS} -g"
-	FFLAGS="${FFLAGS} -g"
-	FCFLAGS="${FCFLAGS} -g"
-	OBJCFLAGS="${OBJCFLAGS} -g"
-      ],
-      [profile],[
-	AC_MSG_RESULT(profile)
-	CFLAGS="${CFLAGS} -g -pg"
-	CXXFLAGS="${CXXFLAGS} -g -pg"
-	FFLAGS="${FFLAGS} -g -pg"
-	FCFLAGS="${FCFLAGS} -g -pg"
-	OBJCFLAGS="${OBJCFLAGS} -g -pg"
-	LDFLAGS="${LDFLAGS} -pg"
-      ],
-      [
-	AC_MSG_RESULT(no)
-	dnl Ensure AC_PROG_CC/CXX/F77/FC/OBJC will not enable debug flags
-	dnl by setting any unset environment flag variables
-	AS_IF([test "x${CFLAGS+set}" != "xset"],
-	  [CFLAGS=""])
-	AS_IF([test "x${CXXFLAGS+set}" != "xset"],
-	  [CXXFLAGS=""])
-	AS_IF([test "x${FFLAGS+set}" != "xset"],
-	  [FFLAGS=""])
-	AS_IF([test "x${FCFLAGS+set}" != "xset"],
-	  [FCFLAGS=""])
-	AS_IF([test "x${OBJCFLAGS+set}" != "xset"],
-	  [OBJCFLAGS=""])
-      ])
-
-    dnl Define various variables if debugging is disabled.
-    dnl assert.h is a NOP if NDEBUG is defined, so define it by default.
-    AS_IF([test "x$enable_debug" = "xyes"],
-      [m4_map_args_w(ax_enable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is enabled])])],
-      [m4_map_args_w(ax_disable_debug_vars, [AC_DEFINE(], [,,[Define if debugging is disabled])])])
-    ax_enable_debug=$enable_debug
-])
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index eef5073..da31efe 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -1,5 +1,5 @@
-# gettext.m4 serial 68 (gettext-0.19.8)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+# gettext.m4 serial 67 (gettext-0.19.6)
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -161,18 +161,13 @@ changequote([,])dnl
             [AC_LANG_PROGRAM(
                [[
 #include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
                ]],
                [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
                ]])],
             [eval "$gt_func_gnugettext_libc=yes"],
             [eval "$gt_func_gnugettext_libc=no"])])
@@ -198,22 +193,17 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
               [AC_LANG_PROGRAM(
                  [[
 #include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
                  ]],
                  [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
                  ]])],
               [eval "$gt_func_gnugettext_libintl=yes"],
               [eval "$gt_func_gnugettext_libintl=no"])
@@ -224,22 +214,17 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                 [AC_LANG_PROGRAM(
                    [[
 #include <libintl.h>
-#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+$gt_revision_test_code
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
-#else
-#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
-#endif
-$gt_revision_test_code
                    ]],
                    [[
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
+return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
                    ]])],
                 [LIBINTL="$LIBINTL $LIBICONV"
                  LTLIBINTL="$LTLIBINTL $LTLIBICONV"
diff --git a/m4/iconv.m4 b/m4/iconv.m4
index aa159c5..4e37363 100644
--- a/m4/iconv.m4
+++ b/m4/iconv.m4
@@ -1,5 +1,5 @@
 # iconv.m4 serial 19 (gettext-0.18.2)
-dnl Copyright (C) 2000-2002, 2007-2014, 2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2000-2002, 2007-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4
index aca924c..bba7b3d 100644
--- a/m4/intlmacosx.m4
+++ b/m4/intlmacosx.m4
@@ -1,5 +1,5 @@
 # intlmacosx.m4 serial 5 (gettext-0.18.2)
-dnl Copyright (C) 2004-2014, 2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2004-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4
index 6209de6..91ca911 100644
--- a/m4/lib-ld.m4
+++ b/m4/lib-ld.m4
@@ -1,5 +1,5 @@
 # lib-ld.m4 serial 6
-dnl Copyright (C) 1996-2003, 2009-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2009-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 2f51855..d8d5d1f 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -1,5 +1,5 @@
 # lib-link.m4 serial 26 (gettext-0.18.2)
-dnl Copyright (C) 2001-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 6851031..0465f47 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,5 +1,5 @@
 # lib-prefix.m4 serial 7 (gettext-0.18)
-dnl Copyright (C) 2001-2005, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 2001-2005, 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/nls.m4 b/m4/nls.m4
index afdb9ca..93df8d3 100644
--- a/m4/nls.m4
+++ b/m4/nls.m4
@@ -1,6 +1,6 @@
 # nls.m4 serial 5 (gettext-0.18)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
-dnl Foundation, Inc.
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
+dnl Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/po.m4 b/m4/po.m4
index c5a2f6b..d4bc262 100644
--- a/m4/po.m4
+++ b/m4/po.m4
@@ -1,5 +1,5 @@
 # po.m4 serial 24 (gettext-0.19)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2014 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 9ace7c3..0921e1e 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -1,5 +1,5 @@
 # progtest.m4 serial 7 (gettext-0.18.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2016 Free Software Foundation, Inc.
+dnl Copyright (C) 1996-2003, 2005, 2008-2015 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/misc/Makefile.in b/misc/Makefile.in
index b69d514..ece7535 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -90,9 +90,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = misc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \
-	$(top_srcdir)/m4/ax_check_enable_debug.m4 \
-	$(top_srcdir)/m4/ax_generate_changelog.m4 \
+am__aclocal_m4_deps = $(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 \
@@ -170,6 +168,9 @@ 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@
@@ -257,6 +258,7 @@ 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@
diff --git a/misc/org.yorba.shotwell.gschema.xml b/misc/org.yorba.shotwell.gschema.xml
index ce3b815..afd2f02 100644
--- a/misc/org.yorba.shotwell.gschema.xml
+++ b/misc/org.yorba.shotwell.gschema.xml
@@ -668,7 +668,7 @@
     </key>
 
     <key name="size-selection" type="i">
-        <default>3</default>
+        <default>-1</default>
         <summary>size selection</summary>
         <description>The index of the current print size in a pre-defined list of standard sizes</description>
     </key>
@@ -789,13 +789,13 @@
     
     <key name="transitions-circles" type="b">
         <default>true</default>
-        <summary>enable slideshow circle transition</summary>
+        <summary>enable slideshow circles transition</summary>
         <description>True if the Circles slideshow transition plugin is enabled, false otherwise</description>
     </key>
     
     <key name="transitions-blinds" type="b">
         <default>true</default>
-        <summary>enable slideshow slide transition</summary>
+        <summary>enable slideshow blinds transition</summary>
         <description>True if the Blinds slideshow transition plugin is enabled, false otherwise</description>
     </key>
 
diff --git a/org.gnome.Shotwell.gresource.xml b/org.gnome.Shotwell.gresource.xml
index 3716038..64335e8 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/org.gnome.Shotwell.gresource.xml
@@ -1,12 +1,84 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/org/gnome/Shotwell">
-      <file alias="crop-pivot-reticle.png">icons/crop-pivot-reticle.png</file>
-      <file alias="search_sidebar_context.ui">ui/search_sidebar_context.ui</file>
-      <file alias="tag_sidebar_context.ui">ui/tag_sidebar_context.ui</file>
-      <file alias="sidebar_default_context.ui">ui/sidebar_default_context.ui</file>
-      <file alias="search_bar.ui">ui/search_bar.ui</file>
-      <file>ui/set_background_dialog.ui</file>
-      <file>ui/set_background_slideshow_dialog.ui</file>
+      <!-- UI files -->
+      <file preprocess="xml-stripblanks">ui/collection.ui</file>
+      <file preprocess="xml-stripblanks">ui/direct_context.ui</file>
+      <file preprocess="xml-stripblanks">ui/direct.ui</file>
+      <file preprocess="xml-stripblanks">ui/events_directory.ui</file>
+      <file preprocess="xml-stripblanks">ui/event.ui</file>
+      <file preprocess="xml-stripblanks">ui/fullscreen.ui</file>
+      <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/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/printing_widget.ui</file>
+      <file preprocess="xml-stripblanks">ui/savedsearch.ui</file>
+      <file preprocess="xml-stripblanks">ui/search_bar.ui</file>
+      <file preprocess="xml-stripblanks">ui/search_sidebar_context.ui</file>
+      <file preprocess="xml-stripblanks">ui/set_background_dialog.ui</file>
+      <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/tag_sidebar_context.ui</file>
+      <file preprocess="xml-stripblanks">ui/tags.ui</file>
+      <file preprocess="xml-stripblanks">ui/trash.ui</file>
+      <!-- Icons -->
+      <file>icons/about-aachen.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>
+      <file>icons/filter-photos-disabled.png</file>
+      <file>icons/filter-photos.png</file>
+      <file>icons/filter-raw-disabled.png</file>
+      <file>icons/filter-raw.png</file>
+      <file>icons/filter-videos-disabled.png</file>
+      <file>icons/filter-videos.png</file>
+      <file>icons/five-star-filter.svg</file>
+      <file>icons/five-stars.svg</file>
+      <file>icons/flag-page.png</file>
+      <file>icons/flag-trinket.png</file>
+      <file>icons/four-star-filter-plus.svg</file>
+      <file>icons/four-stars.svg</file>
+      <file>icons/generic-plugin.png</file>
+      <file>icons/image-adjust.svg</file>
+      <file>icons/import-all.png</file>
+      <file>icons/import.svg</file>
+      <file>icons/make-primary.svg</file>
+      <file>icons/many-faces.png</file>
+      <file>icons/merge.svg</file>
+      <file>icons/multiple-events.png</file>
+      <file>icons/multiple-tags.png</file>
+      <file>icons/no-event.png</file>
+      <file>icons/noninterpretable-video.png</file>
+      <file>icons/one-event.png</file>
+      <file>icons/one-face.png</file>
+      <file>icons/one-star-filter-plus.svg</file>
+      <file>icons/one-star.svg</file>
+      <file>icons/one-tag.png</file>
+      <file>icons/pin-toolbar.svg</file>
+      <file>icons/publish.png</file>
+      <file>icons/redeye.png</file>
+      <file>icons/rejected.svg</file>
+      <file>icons/shotwell-16.png</file>
+      <file>icons/shotwell-auto-enhance.png</file>
+      <file>icons/shotwell.png</file>
+      <file>icons/shotwell-street.jpg</file>
+      <file>icons/slideshow-extension-point.png</file>
+      <file>icons/sprocket.png</file>
+      <file>icons/straighten.svg</file>
+      <file>icons/three-star-filter-plus.svg</file>
+      <file>icons/three-stars.svg</file>
+      <file>icons/two-star-filter-plus.svg</file>
+      <file>icons/two-stars.svg</file>
+      <file>icons/videos-page.png</file>
+      <file>icons/zoom-in.png</file>
+      <file>icons/zoom-out.png</file>
   </gresource>
 </gresources>
diff --git a/plugins/authenticator/shotwell-authenticator.h b/plugins/authenticator/shotwell-authenticator.h
new file mode 100644
index 0000000..c2e469c
--- /dev/null
+++ b/plugins/authenticator/shotwell-authenticator.h
@@ -0,0 +1,43 @@
+/* shotwell-authenticator.h generated by valac 0.34.4, the Vala compiler, do not modify */
+
+
+#ifndef __PLUGINS_AUTHENTICATOR_SHOTWELL_AUTHENTICATOR_H__
+#define __PLUGINS_AUTHENTICATOR_SHOTWELL_AUTHENTICATOR_H__
+
+#include <glib.h>
+#include <glib-object.h>
+#include "shotwell-plugin-dev-1.0.h"
+
+G_BEGIN_DECLS
+
+
+#define PUBLISHING_AUTHENTICATOR_TYPE_FACTORY (publishing_authenticator_factory_get_type ())
+#define PUBLISHING_AUTHENTICATOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory))
+#define PUBLISHING_AUTHENTICATOR_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactoryClass))
+#define PUBLISHING_AUTHENTICATOR_IS_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_TYPE_FACTORY))
+#define PUBLISHING_AUTHENTICATOR_IS_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_TYPE_FACTORY))
+#define PUBLISHING_AUTHENTICATOR_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactoryClass))
+
+typedef struct _PublishingAuthenticatorFactory PublishingAuthenticatorFactory;
+typedef struct _PublishingAuthenticatorFactoryClass PublishingAuthenticatorFactoryClass;
+typedef struct _PublishingAuthenticatorFactoryPrivate PublishingAuthenticatorFactoryPrivate;
+
+struct _PublishingAuthenticatorFactory {
+	GObject parent_instance;
+	PublishingAuthenticatorFactoryPrivate * priv;
+};
+
+struct _PublishingAuthenticatorFactoryClass {
+	GObjectClass parent_class;
+};
+
+
+GType publishing_authenticator_factory_get_type (void) G_GNUC_CONST;
+PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (void);
+PublishingAuthenticatorFactory* publishing_authenticator_factory_new (void);
+PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GType object_type);
+
+
+G_END_DECLS
+
+#endif
diff --git a/plugins/authenticator/shotwell-authenticator.vapi b/plugins/authenticator/shotwell-authenticator.vapi
new file mode 100644
index 0000000..a978f84
--- /dev/null
+++ b/plugins/authenticator/shotwell-authenticator.vapi
@@ -0,0 +1,19 @@
+/* shotwell-authenticator.vapi generated by valac 0.34.4, do not modify. */
+
+namespace Publishing {
+	namespace Authenticator {
+		namespace Shotwell {
+			namespace Facebook {
+			}
+			namespace Flickr {
+			}
+			namespace Google {
+			}
+		}
+		[CCode (cheader_filename = "shotwell-authenticator.h")]
+		public class Factory : Spit.Publishing.AuthenticatorFactory, GLib.Object {
+			public Factory ();
+			public static Publishing.Authenticator.Factory get_instance ();
+		}
+	}
+}
diff --git a/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
new file mode 100644
index 0000000..8db6ac0
--- /dev/null
+++ b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.c
@@ -0,0 +1,2300 @@
+/* FacebookPublishingAuthenticator.c generated by valac 0.34.4, the Vala compiler
+ * generated from FacebookPublishingAuthenticator.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 "shotwell-plugin-common.h"
+#include <locale.h>
+#include <webkit2/webkit2.h>
+#include "shotwell-plugin-dev-1.0.h"
+#include <glib/gi18n-lib.h>
+#include <libsoup/soup.h>
+#include <gobject/gvaluecollector.h>
+
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE (publishing_authenticator_shotwell_facebook_web_authentication_pane_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFacebookWebAuthenticationPane))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass))
+
+typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPane PublishingAuthenticatorShotwellFacebookWebAuthenticationPane;
+typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass;
+typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPanePrivate PublishingAuthenticatorShotwellFacebookWebAuthenticationPanePrivate;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP (publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_IS_LOCALE_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_IS_LOCALE_LOOKUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass))
+
+typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup;
+typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass;
+#define _g_free0(var) (var = (g_free (var), NULL))
+typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupPrivate PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupPrivate;
+#define _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0(var) ((var == NULL) ? NULL : (var = (publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (var), NULL)))
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (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)))
+typedef struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneParamSpecLocaleLookup PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneParamSpecLocaleLookup;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK (publishing_authenticator_shotwell_facebook_facebook_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebookClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebookClass))
+
+typedef struct _PublishingAuthenticatorShotwellFacebookFacebook PublishingAuthenticatorShotwellFacebookFacebook;
+typedef struct _PublishingAuthenticatorShotwellFacebookFacebookClass PublishingAuthenticatorShotwellFacebookFacebookClass;
+typedef struct _PublishingAuthenticatorShotwellFacebookFacebookPrivate PublishingAuthenticatorShotwellFacebookFacebookPrivate;
+#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_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 _PublishingAuthenticatorShotwellFacebookWebAuthenticationPane {
+	ShotwellPluginsCommonWebAuthenticationPane parent_instance;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPanePrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass {
+	ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup {
+	GTypeInstance parent_instance;
+	volatile int ref_count;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupPrivate * priv;
+	gchar* prefix;
+	gchar* translation;
+	gchar* exception_code;
+	gchar* exception_translation;
+	gchar* exception_code_2;
+	gchar* exception_translation_2;
+};
+
+struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass {
+	GTypeClass parent_class;
+	void (*finalize) (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup *self);
+};
+
+struct _PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneParamSpecLocaleLookup {
+	GParamSpec parent_instance;
+};
+
+struct _PublishingAuthenticatorShotwellFacebookFacebook {
+	GObject parent_instance;
+	PublishingAuthenticatorShotwellFacebookFacebookPrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellFacebookFacebookClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellFacebookFacebookPrivate {
+	SpitPublishingPluginHost* host;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* web_auth_pane;
+	GHashTable* params;
+};
+
+
+static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_parent_class = NULL;
+static gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_cache_dirty;
+static gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_cache_dirty = FALSE;
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table;
+static gint publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_length1;
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table = NULL;
+static gint publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_length1 = 0;
+static gint _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_size_ = 0;
+static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_parent_class = NULL;
+static gpointer publishing_authenticator_shotwell_facebook_facebook_parent_class = NULL;
+static SpitPublishingAuthenticatorIface* publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_parent_iface = NULL;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_APPLICATION_ID "1612018629063184"
+GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
+};
+static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance);
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance);
+static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value) G_GNUC_UNUSED;
+static GType publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2);
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (GType object_type, const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2);
+PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_new (void);
+PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (GType object_type);
+static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url (void);
+static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void);
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
+gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty (void);
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_DUMMY_PROPERTY
+};
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* obj);
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject* obj);
+GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebookPrivate))
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_DUMMY_PROPERTY
+};
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into Facebook.\n" \
+"\n" \
+"If you don’t yet have a Facebook account, you can create one during th" \
+"e login process. During login, Shotwell Connect may ask you for permis" \
+"sion to upload photos and publish to your feed. These permissions are " \
+"required for Shotwell Connect to function.")
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_RESTART_ERROR_MESSAGE _ ("You have already logged in and out of Facebook during this Shotwell se" \
+"ssion.\n" \
+"To continue publishing to Facebook, quit and restart Shotwell, then tr" \
+"y publishing again.")
+PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host);
+PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host);
+static void _g_free0_ (gpointer var);
+static void _g_variant_unref0_ (gpointer var);
+static void publishing_authenticator_shotwell_facebook_facebook_real_authenticate (SpitPublishingAuthenticator* base);
+static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (PublishingAuthenticatorShotwellFacebookFacebook* self);
+static gchar* publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self);
+static void publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (PublishingAuthenticatorShotwellFacebookFacebook* self);
+static gboolean publishing_authenticator_shotwell_facebook_facebook_real_can_logout (SpitPublishingAuthenticator* base);
+static GHashTable* publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter (SpitPublishingAuthenticator* base);
+void publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (PublishingAuthenticatorShotwellFacebookFacebook* self);
+static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* access_token);
+static void publishing_authenticator_shotwell_facebook_facebook_real_logout (SpitPublishingAuthenticator* base);
+static void publishing_authenticator_shotwell_facebook_facebook_real_refresh (SpitPublishingAuthenticator* base);
+static void publishing_authenticator_shotwell_facebook_facebook_on_login_clicked (PublishingAuthenticatorShotwellFacebookFacebook* self);
+static void _publishing_authenticator_shotwell_facebook_facebook_on_login_clicked_spit_publishing_login_callback (gpointer self);
+static void publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (PublishingAuthenticatorShotwellFacebookFacebook* self);
+static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* success_url);
+static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, const gchar* success_url, gpointer self);
+static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed (PublishingAuthenticatorShotwellFacebookFacebook* self);
+static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, gpointer self);
+static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* good_login_uri);
+static void publishing_authenticator_shotwell_facebook_facebook_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);
+
+
+PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (GType object_type) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self = NULL;
+	gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url ();
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = _tmp0_;
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp1_, NULL);
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (_tmp1_);
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return self;
+#line 200 "FacebookPublishingAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* publishing_authenticator_shotwell_facebook_web_authentication_pane_new (void) {
+#line 19 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return publishing_authenticator_shotwell_facebook_web_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE);
+#line 207 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gpointer _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref0 (gpointer self) {
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return self ? publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (self) : NULL;
+#line 214 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gboolean string_contains (const gchar* self, const gchar* needle) {
+	gboolean result = FALSE;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, FALSE);
+#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (needle != NULL, FALSE);
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = needle;
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	result = _tmp1_ != NULL;
+#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	return result;
+#line 234 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void) {
+	gchar* result = NULL;
+	const gchar* raw_system_locale = NULL;
+	const gchar* _tmp0_ = NULL;
+	gboolean _tmp1_ = FALSE;
+	const gchar* _tmp2_ = NULL;
+	gchar* system_locale = NULL;
+	const gchar* _tmp5_ = NULL;
+	gchar** _tmp6_ = NULL;
+	gchar** _tmp7_ = NULL;
+	gchar** _tmp8_ = NULL;
+	gint _tmp8__length1 = 0;
+	const gchar* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp12_ = NULL;
+	gint _tmp12__length1 = 0;
+	gchar* _tmp43_ = NULL;
+#line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = setlocale (LC_ALL, "");
+#line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	raw_system_locale = _tmp0_;
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp2_ = raw_system_locale;
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp2_ == NULL) {
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp1_ = TRUE;
+#line 266 "FacebookPublishingAuthenticator.c"
+	} else {
+		const gchar* _tmp3_ = NULL;
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp3_ = raw_system_locale;
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp1_ = g_strcmp0 (_tmp3_, "") == 0;
+#line 273 "FacebookPublishingAuthenticator.c"
+	}
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp1_) {
+#line 277 "FacebookPublishingAuthenticator.c"
+		gchar* _tmp4_ = NULL;
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp4_ = g_strdup ("www");
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		result = _tmp4_;
+#line 95 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		return result;
+#line 285 "FacebookPublishingAuthenticator.c"
+	}
+#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp5_ = raw_system_locale;
+#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp7_ = _tmp6_ = g_strsplit (_tmp5_, ".", 0);
+#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp8_ = _tmp7_;
+#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp8__length1 = _vala_array_length (_tmp6_);
+#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp9_ = _tmp8_[0];
+#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp10_ = g_strdup (_tmp9_);
+#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp11_ = _tmp10_;
+#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL);
+#line 97 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	system_locale = _tmp11_;
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp12_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table;
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp12__length1 = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_length1;
+#line 309 "FacebookPublishingAuthenticator.c"
+	{
+		PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** locale_lookup_collection = NULL;
+		gint locale_lookup_collection_length1 = 0;
+		gint _locale_lookup_collection_size_ = 0;
+		gint locale_lookup_it = 0;
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		locale_lookup_collection = _tmp12_;
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		locale_lookup_collection_length1 = _tmp12__length1;
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		for (locale_lookup_it = 0; locale_lookup_it < _tmp12__length1; locale_lookup_it = locale_lookup_it + 1) {
+#line 321 "FacebookPublishingAuthenticator.c"
+			PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp13_ = NULL;
+			PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* locale_lookup = NULL;
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+			_tmp13_ = _publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref0 (locale_lookup_collection[locale_lookup_it]);
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+			locale_lookup = _tmp13_;
+#line 328 "FacebookPublishingAuthenticator.c"
+			{
+				const gchar* _tmp14_ = NULL;
+				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp15_ = NULL;
+				const gchar* _tmp16_ = NULL;
+				gboolean _tmp17_ = FALSE;
+				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp18_ = NULL;
+				const gchar* _tmp19_ = NULL;
+				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_ = NULL;
+				const gchar* _tmp30_ = NULL;
+				PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp40_ = NULL;
+				const gchar* _tmp41_ = NULL;
+				gchar* _tmp42_ = NULL;
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_tmp14_ = system_locale;
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_tmp15_ = locale_lookup;
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_tmp16_ = _tmp15_->prefix;
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_tmp17_ = g_str_has_prefix (_tmp14_, _tmp16_);
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				if (!_tmp17_) {
+#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
+#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					continue;
+#line 355 "FacebookPublishingAuthenticator.c"
+				}
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_tmp18_ = locale_lookup;
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_tmp19_ = _tmp18_->exception_code;
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				if (_tmp19_ != NULL) {
+#line 363 "FacebookPublishingAuthenticator.c"
+					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_ = NULL;
+					const gchar* _tmp21_ = NULL;
+					const gchar* _tmp22_ = NULL;
+					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_ = NULL;
+					const gchar* _tmp24_ = NULL;
+					gboolean _tmp25_ = FALSE;
+#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp20_ = locale_lookup;
+#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp21_ = _tmp20_->exception_translation;
+#line 104 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_vala_assert (_tmp21_ != NULL, "locale_lookup.exception_translation != null");
+#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp22_ = system_locale;
+#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp23_ = locale_lookup;
+#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp24_ = _tmp23_->exception_code;
+#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp25_ = string_contains (_tmp22_, _tmp24_);
+#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					if (_tmp25_) {
+#line 386 "FacebookPublishingAuthenticator.c"
+						PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_ = NULL;
+						const gchar* _tmp27_ = NULL;
+						gchar* _tmp28_ = NULL;
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						_tmp26_ = locale_lookup;
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						_tmp27_ = _tmp26_->exception_translation;
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						_tmp28_ = g_strdup (_tmp27_);
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						result = _tmp28_;
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						_g_free0 (system_locale);
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						return result;
+#line 404 "FacebookPublishingAuthenticator.c"
+					}
+				}
+#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_tmp29_ = locale_lookup;
+#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_tmp30_ = _tmp29_->exception_code_2;
+#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				if (_tmp30_ != NULL) {
+#line 413 "FacebookPublishingAuthenticator.c"
+					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_ = NULL;
+					const gchar* _tmp32_ = NULL;
+					const gchar* _tmp33_ = NULL;
+					PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_ = NULL;
+					const gchar* _tmp35_ = NULL;
+					gboolean _tmp36_ = FALSE;
+#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp31_ = locale_lookup;
+#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp32_ = _tmp31_->exception_translation_2;
+#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_vala_assert (_tmp32_ != NULL, "locale_lookup.exception_translation_2 != null");
+#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp33_ = system_locale;
+#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp34_ = locale_lookup;
+#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp35_ = _tmp34_->exception_code_2;
+#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					_tmp36_ = string_contains (_tmp33_, _tmp35_);
+#line 113 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+					if (_tmp36_) {
+#line 436 "FacebookPublishingAuthenticator.c"
+						PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_ = NULL;
+						const gchar* _tmp38_ = NULL;
+						gchar* _tmp39_ = NULL;
+#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						_tmp37_ = locale_lookup;
+#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						_tmp38_ = _tmp37_->exception_translation_2;
+#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						_tmp39_ = g_strdup (_tmp38_);
+#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						result = _tmp39_;
+#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
+#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						_g_free0 (system_locale);
+#line 114 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+						return result;
+#line 454 "FacebookPublishingAuthenticator.c"
+					}
+				}
+#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_tmp40_ = locale_lookup;
+#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_tmp41_ = _tmp40_->translation;
+#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_tmp42_ = g_strdup (_tmp41_);
+#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				result = _tmp42_;
+#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
+#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				_g_free0 (system_locale);
+#line 117 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+				return result;
+#line 471 "FacebookPublishingAuthenticator.c"
+			}
+		}
+	}
+#line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp43_ = g_strdup ("www");
+#line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	result = _tmp43_;
+#line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (system_locale);
+#line 121 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return result;
+#line 483 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_get_login_url (void) {
+	gchar* result = NULL;
+	gchar* facebook_locale = NULL;
+	gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_get_system_locale_as_facebook_locale ();
+#line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	facebook_locale = _tmp0_;
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = g_strdup_printf ("https://%s.facebook.com/dialog/oauth?client_id=%s&redirect_uri=https:/" \
+"/www.facebook.com/connect/login_success.html&display=popup&scope=publi" \
+"sh_actions,user_photos,user_videos&response_type=token", facebook_locale, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_APPLICATION_ID);
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	result = _tmp1_;
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (facebook_locale);
+#line 127 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return result;
+#line 504 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
+	gint result = 0;
+	gchar* _result_ = NULL;
+	gint _tmp0_ = 0;
+	gunichar _tmp1_ = 0U;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, 0);
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = start_index;
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = c;
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
+#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_result_ = _tmp2_;
+#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp3_ = _result_;
+#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp3_ != NULL) {
+#line 529 "FacebookPublishingAuthenticator.c"
+		gchar* _tmp4_ = NULL;
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = _result_;
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = (gint) (_tmp4_ - ((gchar*) self));
+#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 537 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = -1;
+#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 543 "FacebookPublishingAuthenticator.c"
+	}
+}
+
+
+static gchar* string_slice (const gchar* self, glong start, glong end) {
+	gchar* result = NULL;
+	glong string_length = 0L;
+	gint _tmp0_ = 0;
+	gint _tmp1_ = 0;
+	glong _tmp2_ = 0L;
+	glong _tmp5_ = 0L;
+	gboolean _tmp8_ = FALSE;
+	glong _tmp9_ = 0L;
+	gboolean _tmp12_ = FALSE;
+	glong _tmp13_ = 0L;
+	glong _tmp16_ = 0L;
+	glong _tmp17_ = 0L;
+	glong _tmp18_ = 0L;
+	glong _tmp19_ = 0L;
+	glong _tmp20_ = 0L;
+	gchar* _tmp21_ = NULL;
+#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = strlen (self);
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = _tmp0_;
+#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	string_length = (glong) _tmp1_;
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp2_ = start;
+#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp2_ < ((glong) 0)) {
+#line 577 "FacebookPublishingAuthenticator.c"
+		glong _tmp3_ = 0L;
+		glong _tmp4_ = 0L;
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp3_ = string_length;
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = start;
+#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		start = _tmp3_ + _tmp4_;
+#line 586 "FacebookPublishingAuthenticator.c"
+	}
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp5_ = end;
+#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp5_ < ((glong) 0)) {
+#line 592 "FacebookPublishingAuthenticator.c"
+		glong _tmp6_ = 0L;
+		glong _tmp7_ = 0L;
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp6_ = string_length;
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp7_ = end;
+#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		end = _tmp6_ + _tmp7_;
+#line 601 "FacebookPublishingAuthenticator.c"
+	}
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp9_ = start;
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp9_ >= ((glong) 0)) {
+#line 607 "FacebookPublishingAuthenticator.c"
+		glong _tmp10_ = 0L;
+		glong _tmp11_ = 0L;
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp10_ = start;
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp11_ = string_length;
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp8_ = _tmp10_ <= _tmp11_;
+#line 616 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp8_ = FALSE;
+#line 620 "FacebookPublishingAuthenticator.c"
+	}
+#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp8_, NULL);
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp13_ = end;
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp13_ >= ((glong) 0)) {
+#line 628 "FacebookPublishingAuthenticator.c"
+		glong _tmp14_ = 0L;
+		glong _tmp15_ = 0L;
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp14_ = end;
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp12_ = _tmp14_ <= _tmp15_;
+#line 637 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp12_ = FALSE;
+#line 641 "FacebookPublishingAuthenticator.c"
+	}
+#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp12_, NULL);
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp16_ = start;
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp17_ = end;
+#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp18_ = start;
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp19_ = end;
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp20_ = start;
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	result = _tmp21_;
+#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	return result;
+#line 663 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+	gchar* result = NULL;
+	GError * _inner_error_ = NULL;
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (old != NULL, NULL);
+#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (replacement != NULL, NULL);
+#line 676 "FacebookPublishingAuthenticator.c"
+	{
+		GRegex* regex = NULL;
+		const gchar* _tmp0_ = NULL;
+		gchar* _tmp1_ = NULL;
+		gchar* _tmp2_ = NULL;
+		GRegex* _tmp3_ = NULL;
+		GRegex* _tmp4_ = NULL;
+		gchar* _tmp5_ = NULL;
+		GRegex* _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+		gchar* _tmp9_ = NULL;
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp0_ = old;
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp2_ = _tmp1_;
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = _tmp3_;
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp2_);
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		regex = _tmp4_;
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			if (_inner_error_->domain == G_REGEX_ERROR) {
+#line 707 "FacebookPublishingAuthenticator.c"
+				goto __catch0_g_regex_error;
+			}
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			g_clear_error (&_inner_error_);
+#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			return NULL;
+#line 716 "FacebookPublishingAuthenticator.c"
+		}
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp6_ = regex;
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp7_ = replacement;
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp5_ = _tmp8_;
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			_g_regex_unref0 (regex);
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			if (_inner_error_->domain == G_REGEX_ERROR) {
+#line 732 "FacebookPublishingAuthenticator.c"
+				goto __catch0_g_regex_error;
+			}
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			_g_regex_unref0 (regex);
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			g_clear_error (&_inner_error_);
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			return NULL;
+#line 743 "FacebookPublishingAuthenticator.c"
+		}
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp9_ = _tmp5_;
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp5_ = NULL;
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = _tmp9_;
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp5_);
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_g_regex_unref0 (regex);
+#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 757 "FacebookPublishingAuthenticator.c"
+	}
+	goto __finally0;
+	__catch0_g_regex_error:
+	{
+		GError* e = NULL;
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		e = _inner_error_;
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_inner_error_ = NULL;
+#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		g_assert_not_reached ();
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_g_error_free0 (e);
+#line 771 "FacebookPublishingAuthenticator.c"
+	}
+	__finally0:
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		g_clear_error (&_inner_error_);
+#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return NULL;
+#line 782 "FacebookPublishingAuthenticator.c"
+	}
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self;
+	gchar* loaded_url = NULL;
+	WebKitWebView* _tmp0_ = NULL;
+	WebKitWebView* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	const gchar* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	gboolean _tmp10_ = FALSE;
+	const gchar* _tmp22_ = NULL;
+	gboolean _tmp23_ = FALSE;
+	const gchar* _tmp28_ = NULL;
+	gboolean _tmp29_ = FALSE;
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFacebookWebAuthenticationPane);
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.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 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = _tmp0_;
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp2_ = webkit_web_view_get_uri (_tmp1_);
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp3_ = _tmp2_;
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp4_ = g_strdup (_tmp3_);
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp5_ = _tmp4_;
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_object_unref0 (_tmp1_);
+#line 131 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	loaded_url = _tmp5_;
+#line 132 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp6_ = loaded_url;
+#line 132 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp7_ = g_strconcat ("loaded url: ", _tmp6_, NULL);
+#line 132 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp8_ = _tmp7_;
+#line 132 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_debug ("FacebookPublishingAuthenticator.vala:132: %s", _tmp8_);
+#line 132 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (_tmp8_);
+#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp9_ = loaded_url;
+#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp10_ = string_contains (_tmp9_, "?");
+#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp10_) {
+#line 839 "FacebookPublishingAuthenticator.c"
+		gint index = 0;
+		const gchar* _tmp11_ = NULL;
+		gint _tmp12_ = 0;
+		gchar* params = NULL;
+		const gchar* _tmp13_ = NULL;
+		gint _tmp14_ = 0;
+		const gchar* _tmp15_ = NULL;
+		gint _tmp16_ = 0;
+		gint _tmp17_ = 0;
+		gchar* _tmp18_ = NULL;
+		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp20_ = NULL;
+		gchar* _tmp21_ = NULL;
+#line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp11_ = loaded_url;
+#line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp12_ = string_index_of_char (_tmp11_, (gunichar) '?', 0);
+#line 136 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		index = _tmp12_;
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp13_ = loaded_url;
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp14_ = index;
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp15_ = loaded_url;
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp16_ = strlen (_tmp15_);
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp17_ = _tmp16_;
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp18_ = string_slice (_tmp13_, (glong) _tmp14_, (glong) _tmp17_);
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		params = _tmp18_;
+#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp19_ = loaded_url;
+#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp20_ = params;
+#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp21_ = string_replace (_tmp19_, _tmp20_, "");
+#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_free0 (loaded_url);
+#line 138 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		loaded_url = _tmp21_;
+#line 135 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_free0 (params);
+#line 885 "FacebookPublishingAuthenticator.c"
+	}
+#line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp22_ = loaded_url;
+#line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp23_ = string_contains (_tmp22_, "login_success");
+#line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp23_) {
+#line 893 "FacebookPublishingAuthenticator.c"
+		WebKitWebView* _tmp24_ = NULL;
+		WebKitWebView* _tmp25_ = NULL;
+		const gchar* _tmp26_ = NULL;
+		const gchar* _tmp27_ = NULL;
+#line 143 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		publishing_authenticator_shotwell_facebook_web_authentication_pane_cache_dirty = TRUE;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp24_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp25_ = _tmp24_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp26_ = webkit_web_view_get_uri (_tmp25_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp27_ = _tmp26_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_signal_emit_by_name (self, "login-succeeded", _tmp27_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_object_unref0 (_tmp25_);
+#line 145 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_free0 (loaded_url);
+#line 145 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		return;
+#line 916 "FacebookPublishingAuthenticator.c"
+	}
+#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp28_ = loaded_url;
+#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp29_ = string_contains (_tmp28_, "login_failure");
+#line 149 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp29_) {
+#line 150 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_signal_emit_by_name (self, "login-failed");
+#line 151 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_free0 (loaded_url);
+#line 151 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		return;
+#line 930 "FacebookPublishingAuthenticator.c"
+	}
+#line 130 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (loaded_url);
+#line 934 "FacebookPublishingAuthenticator.c"
+}
+
+
+gboolean publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty (void) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+#line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_cache_dirty;
+#line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	result = _tmp0_;
+#line 156 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return result;
+#line 947 "FacebookPublishingAuthenticator.c"
+}
+
+
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (GType object_type, const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self = NULL;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	const gchar* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	const gchar* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_val_if_fail (prefix != NULL, NULL);
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_val_if_fail (translation != NULL, NULL);
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup*) g_type_create_instance (object_type);
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = prefix;
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = g_strdup (_tmp0_);
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->prefix);
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->prefix = _tmp1_;
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp2_ = translation;
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->translation);
+#line 35 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->translation = _tmp3_;
+#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp4_ = exception_code;
+#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp5_ = g_strdup (_tmp4_);
+#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->exception_code);
+#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->exception_code = _tmp5_;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp6_ = exception_translation;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp7_ = g_strdup (_tmp6_);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->exception_translation);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->exception_translation = _tmp7_;
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp8_ = exception_code_2;
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp9_ = g_strdup (_tmp8_);
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->exception_code_2);
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->exception_code_2 = _tmp9_;
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp10_ = exception_translation_2;
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp11_ = g_strdup (_tmp10_);
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->exception_translation_2);
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->exception_translation_2 = _tmp11_;
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return self;
+#line 1021 "FacebookPublishingAuthenticator.c"
+}
+
+
+static PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2) {
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, prefix, translation, exception_code, exception_translation, exception_code_2, exception_translation_2);
+#line 1028 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_init (GValue* value) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	value->data[0].v_pointer = NULL;
+#line 1035 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_free_value (GValue* value) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (value->data[0].v_pointer) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (value->data[0].v_pointer);
+#line 1044 "FacebookPublishingAuthenticator.c"
+	}
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_copy_value (const GValue* src_value, GValue* dest_value) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (src_value->data[0].v_pointer) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		dest_value->data[0].v_pointer = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (src_value->data[0].v_pointer);
+#line 1054 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		dest_value->data[0].v_pointer = NULL;
+#line 1058 "FacebookPublishingAuthenticator.c"
+	}
+}
+
+
+static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_peek_pointer (const GValue* value) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return value->data[0].v_pointer;
+#line 1066 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (collect_values[0].v_pointer) {
+#line 1073 "FacebookPublishingAuthenticator.c"
+		PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* object;
+		object = collect_values[0].v_pointer;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		if (object->parent_instance.g_class == NULL) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
+#line 1080 "FacebookPublishingAuthenticator.c"
+		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.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 1084 "FacebookPublishingAuthenticator.c"
+		}
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		value->data[0].v_pointer = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (object);
+#line 1088 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		value->data[0].v_pointer = NULL;
+#line 1092 "FacebookPublishingAuthenticator.c"
+	}
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return NULL;
+#line 1096 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gchar* publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** object_p;
+	object_p = collect_values[0].v_pointer;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (!object_p) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
+#line 1107 "FacebookPublishingAuthenticator.c"
+	}
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (!value->data[0].v_pointer) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		*object_p = NULL;
+#line 1113 "FacebookPublishingAuthenticator.c"
+	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		*object_p = value->data[0].v_pointer;
+#line 1117 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		*object_p = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer);
+#line 1121 "FacebookPublishingAuthenticator.c"
+	}
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return NULL;
+#line 1125 "FacebookPublishingAuthenticator.c"
+}
+
+
+static GParamSpec* publishing_authenticator_shotwell_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneParamSpecLocaleLookup* spec;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP), NULL);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	G_PARAM_SPEC (spec)->value_type = object_type;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return G_PARAM_SPEC (spec);
+#line 1139 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP), NULL);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return value->data[0].v_pointer;
+#line 1148 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* old;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	old = value->data[0].v_pointer;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (v_object) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		value->data[0].v_pointer = v_object;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer);
+#line 1168 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		value->data[0].v_pointer = NULL;
+#line 1172 "FacebookPublishingAuthenticator.c"
+	}
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (old) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (old);
+#line 1178 "FacebookPublishingAuthenticator.c"
+	}
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* old;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	old = value->data[0].v_pointer;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (v_object) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		value->data[0].v_pointer = v_object;
+#line 1197 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		value->data[0].v_pointer = NULL;
+#line 1201 "FacebookPublishingAuthenticator.c"
+	}
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (old) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (old);
+#line 1207 "FacebookPublishingAuthenticator.c"
+	}
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass * klass) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_parent_class = g_type_class_peek_parent (klass);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	((PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass *) klass)->finalize = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize;
+#line 1217 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_instance_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->ref_count = 1;
+#line 1224 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_finalize (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* obj) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup * self;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_signal_handlers_destroy (self);
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->prefix);
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->translation);
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->exception_code);
+#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->exception_translation);
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->exception_code_2);
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (self->exception_translation_2);
+#line 1246 "FacebookPublishingAuthenticator.c"
+}
+
+
+static GType publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_type_id__volatile)) {
+		static const GTypeValueTable g_define_type_value_table = { publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_init, publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_free_value, publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_copy_value, publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_peek_pointer, "p", publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_collect_value, "p", publishing_authenticator_shotwell_facebook_web_authentication_pane_value_locale_lookup_lcopy_value };
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookupClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_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_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_type_id;
+		publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup", &g_define_type_info, &g_define_type_fundamental_info, 0);
+		g_once_init_leave (&publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_type_id__volatile, publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_type_id);
+	}
+	return publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_type_id__volatile;
+}
+
+
+static gpointer publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self;
+	self = instance;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_atomic_int_inc (&self->ref_count);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return instance;
+#line 1271 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* self;
+	self = instance;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (g_atomic_int_dec_and_test (&self->ref_count)) {
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_GET_CLASS (self)->finalize (self);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_type_free_instance ((GTypeInstance *) self);
+#line 1284 "FacebookPublishingAuthenticator.c"
+	}
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_class_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass * klass) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp0_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp1_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp2_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp3_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp4_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp5_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp6_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp7_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp8_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp9_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp10_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp11_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp12_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp13_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp14_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp15_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp16_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp17_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp18_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp19_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp20_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp21_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp22_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp23_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp24_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp25_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp26_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp27_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp28_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp29_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp30_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp31_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp32_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp33_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp34_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp35_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp36_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp37_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp38_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp39_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp40_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp41_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp42_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp43_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup* _tmp44_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup** _tmp45_ = NULL;
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_authenticator_shotwell_facebook_web_authentication_pane_real_on_page_load;
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize;
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_signal_new ("login_succeeded", PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_signal_new ("login_failed", PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("es", "es-la", "ES", "es-es", NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("en", "en-gb", "US", "en-us", NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp2_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("fr", "fr-fr", "CA", "fr-ca", NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp3_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("pt", "pt-br", "PT", "pt-pt", NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp4_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("zh", "zh-cn", "HK", "zh-hk", "TW", "zh-tw");
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp5_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("af", "af-za", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp6_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("ar", "ar-ar", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp7_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("nb", "nb-no", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp8_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("no", "nb-no", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp9_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("id", "id-id", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp10_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("ms", "ms-my", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp11_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("ca", "ca-es", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp12_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("cs", "cs-cz", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp13_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("cy", "cy-gb", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp14_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("da", "da-dk", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp15_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("de", "de-de", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp16_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("tl", "tl-ph", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp17_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("ko", "ko-kr", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp18_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("hr", "hr-hr", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp19_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("it", "it-it", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp20_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("lt", "lt-lt", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp21_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("hu", "hu-hu", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp22_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("nl", "nl-nl", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp23_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("ja", "ja-jp", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp24_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("nb", "nb-no", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp25_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("no", "nb-no", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp26_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("pl", "pl-pl", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp27_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("ro", "ro-ro", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp28_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("ru", "ru-ru", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp29_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("sk", "sk-sk", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp30_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("sl", "sl-si", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp31_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("sv", "sv-se", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp32_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("th", "th-th", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp33_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("vi", "vi-vn", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp34_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("tr", "tr-tr", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp35_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("el", "el-gr", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp36_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("bg", "bg-bg", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp37_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("sr", "sr-rs", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp38_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("he", "he-il", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp39_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("hi", "hi-in", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp40_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("bn", "bn-in", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp41_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("pa", "pa-in", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp42_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("ta", "ta-in", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp43_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("te", "te-in", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp44_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_new ("ml", "ml-in", NULL, NULL, NULL, NULL);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_ = g_new0 (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneLocaleLookup*, 45 + 1);
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[0] = _tmp0_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[1] = _tmp1_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[2] = _tmp2_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[3] = _tmp3_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[4] = _tmp4_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[5] = _tmp5_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[6] = _tmp6_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[7] = _tmp7_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[8] = _tmp8_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[9] = _tmp9_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[10] = _tmp10_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[11] = _tmp11_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[12] = _tmp12_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[13] = _tmp13_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[14] = _tmp14_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[15] = _tmp15_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[16] = _tmp16_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[17] = _tmp17_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[18] = _tmp18_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[19] = _tmp19_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[20] = _tmp20_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[21] = _tmp21_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[22] = _tmp22_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[23] = _tmp23_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[24] = _tmp24_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[25] = _tmp25_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[26] = _tmp26_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[27] = _tmp27_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[28] = _tmp28_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[29] = _tmp29_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[30] = _tmp30_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[31] = _tmp31_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[32] = _tmp32_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[33] = _tmp33_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[34] = _tmp34_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[35] = _tmp35_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[36] = _tmp36_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[37] = _tmp37_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[38] = _tmp38_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[39] = _tmp39_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[40] = _tmp40_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[41] = _tmp41_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[42] = _tmp42_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[43] = _tmp43_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp45_[44] = _tmp44_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table = _tmp45_;
+#line 44 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_web_authentication_pane_locale_lookup_table_length1 = 45;
+#line 1532 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self) {
+}
+
+
+static void publishing_authenticator_shotwell_facebook_web_authentication_pane_finalize (GObject* obj) {
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane * self;
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellFacebookWebAuthenticationPane);
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	G_OBJECT_CLASS (publishing_authenticator_shotwell_facebook_web_authentication_pane_parent_class)->finalize (obj);
+#line 1546 "FacebookPublishingAuthenticator.c"
+}
+
+
+GType publishing_authenticator_shotwell_facebook_web_authentication_pane_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_facebook_web_authentication_pane_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_facebook_web_authentication_pane_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFacebookWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_facebook_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_facebook_web_authentication_pane_instance_init, NULL };
+		GType publishing_authenticator_shotwell_facebook_web_authentication_pane_type_id;
+		publishing_authenticator_shotwell_facebook_web_authentication_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, "PublishingAuthenticatorShotwellFacebookWebAuthenticationPane", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_authenticator_shotwell_facebook_web_authentication_pane_type_id__volatile, publishing_authenticator_shotwell_facebook_web_authentication_pane_type_id);
+	}
+	return publishing_authenticator_shotwell_facebook_web_authentication_pane_type_id__volatile;
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 1565 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void _g_free0_ (gpointer var) {
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	var = (g_free (var), NULL);
+#line 1572 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void _g_variant_unref0_ (gpointer var) {
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
+#line 1579 "FacebookPublishingAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_construct (GType object_type, SpitPublishingPluginHost* host) {
+	PublishingAuthenticatorShotwellFacebookFacebook * self = NULL;
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp1_ = NULL;
+	GHashFunc _tmp2_ = NULL;
+	GEqualFunc _tmp3_ = NULL;
+	GHashTable* _tmp4_ = NULL;
+#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
+#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellFacebookFacebook*) g_object_new (object_type, NULL);
+#line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = host;
+#line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_object_unref0 (self->priv->host);
+#line 172 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->priv->host = _tmp1_;
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp2_ = g_str_hash;
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp3_ = g_str_equal;
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp4_ = g_hash_table_new_full (_tmp2_, _tmp3_, _g_free0_, _g_variant_unref0_);
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_hash_table_unref0 (self->priv->params);
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->priv->params = _tmp4_;
+#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return self;
+#line 1614 "FacebookPublishingAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellFacebookFacebook* publishing_authenticator_shotwell_facebook_facebook_new (SpitPublishingPluginHost* host) {
+#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return publishing_authenticator_shotwell_facebook_facebook_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, host);
+#line 1621 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_real_authenticate (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellFacebookFacebook * self;
+	gboolean _tmp0_ = FALSE;
+	gboolean _tmp6_ = FALSE;
+#line 176 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
+#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (self);
+#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp0_) {
+#line 1635 "FacebookPublishingAuthenticator.c"
+		gchar* access_token = NULL;
+		gchar* _tmp1_ = NULL;
+		GHashTable* _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
+		const gchar* _tmp4_ = NULL;
+		GVariant* _tmp5_ = NULL;
+#line 181 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp1_ = publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (self);
+#line 181 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		access_token = _tmp1_;
+#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp2_ = self->priv->params;
+#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp3_ = g_strdup ("AccessToken");
+#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp4_ = access_token;
+#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp5_ = g_variant_new_string (_tmp4_);
+#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_variant_ref_sink (_tmp5_);
+#line 182 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_hash_table_insert (_tmp2_, _tmp3_, _tmp5_);
+#line 183 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
+#line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_free0 (access_token);
+#line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		return;
+#line 1664 "FacebookPublishingAuthenticator.c"
+	}
+#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp6_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_is_cache_dirty ();
+#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp6_) {
+#line 1670 "FacebookPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp7_ = NULL;
+		SpitPublishingPluginHost* _tmp8_ = NULL;
+#line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp7_ = self->priv->host;
+#line 189 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		spit_publishing_plugin_host_set_service_locked (_tmp7_, FALSE);
+#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp8_ = self->priv->host;
+#line 190 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		spit_publishing_plugin_host_install_static_message_pane (_tmp8_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_RESTART_ERROR_MESSAGE, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 1681 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 193 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (self);
+#line 1685 "FacebookPublishingAuthenticator.c"
+	}
+}
+
+
+static gboolean publishing_authenticator_shotwell_facebook_facebook_real_can_logout (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellFacebookFacebook * self;
+	gboolean result = FALSE;
+#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
+#line 198 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	result = TRUE;
+#line 198 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return result;
+#line 1699 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gpointer _g_hash_table_ref0 (gpointer self) {
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return self ? g_hash_table_ref (self) : NULL;
+#line 1706 "FacebookPublishingAuthenticator.c"
+}
+
+
+static GHashTable* publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellFacebookFacebook * self;
+	GHashTable* result = NULL;
+	GHashTable* _tmp0_ = NULL;
+	GHashTable* _tmp1_ = NULL;
+#line 201 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = self->priv->params;
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = _g_hash_table_ref0 (_tmp0_);
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	result = _tmp1_;
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return result;
+#line 1725 "FacebookPublishingAuthenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_debug ("FacebookPublishingAuthenticator.vala:206: invalidating saved Facebook " \
+"session.");
+#line 207 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (self, "");
+#line 1736 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_real_logout (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellFacebookFacebook * self;
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
+#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_facebook_invalidate_persistent_session (self);
+#line 1746 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_real_refresh (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellFacebookFacebook * self;
+#line 214 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
+#line 1754 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gboolean publishing_authenticator_shotwell_facebook_facebook_is_persistent_session_valid (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+	gboolean result = FALSE;
+	gchar* token = NULL;
+	gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp3_ = NULL;
+#line 219 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self), FALSE);
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (self);
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	token = _tmp0_;
+#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = token;
+#line 222 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp1_ != NULL) {
+#line 1774 "FacebookPublishingAuthenticator.c"
+		const gchar* _tmp2_ = NULL;
+#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp2_ = token;
+#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_debug ("FacebookPublishingAuthenticator.vala:223: existing Facebook session fo" \
+"und in configuration database (access_token = %s).", _tmp2_);
+#line 1780 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		g_debug ("FacebookPublishingAuthenticator.vala:226: no existing Facebook session" \
+" available.");
+#line 1784 "FacebookPublishingAuthenticator.c"
+	}
+#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp3_ = token;
+#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	result = _tmp3_ != NULL;
+#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (token);
+#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return result;
+#line 1794 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gchar* publishing_authenticator_shotwell_facebook_facebook_get_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+	gchar* result = NULL;
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 231 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self), NULL);
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = self->priv->host;
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_token", NULL);
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	result = _tmp1_;
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	return result;
+#line 1812 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* access_token) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
+#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (access_token != NULL);
+#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = self->priv->host;
+#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = access_token;
+#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_token", _tmp1_);
+#line 1829 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_facebook_facebook_on_login_clicked_spit_publishing_login_callback (gpointer self) {
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_facebook_on_login_clicked ((PublishingAuthenticatorShotwellFacebookFacebook*) self);
+#line 1836 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp1_ = NULL;
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_debug ("FacebookPublishingAuthenticator.vala:240: ACTION: showing service welc" \
+"ome pane.");
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = self->priv->host;
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_SERVICE_WELCOME_MESSAGE, _publishing_authenticator_shotwell_facebook_facebook_on_login_clicked_spit_publishing_login_callback, self);
+#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = self->priv->host;
+#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp1_, FALSE);
+#line 1855 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_on_login_clicked (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+#line 246 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
+#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_debug ("FacebookPublishingAuthenticator.vala:247: EVENT: user clicked 'Login' " \
+"on welcome pane.");
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (self);
+#line 1866 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, const gchar* success_url, gpointer self) {
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded ((PublishingAuthenticatorShotwellFacebookFacebook*) self, success_url);
+#line 1873 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed (PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _sender, gpointer self) {
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed ((PublishingAuthenticatorShotwellFacebookFacebook*) self);
+#line 1880 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_do_hosted_web_authentication (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp1_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp2_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp3_ = NULL;
+	SpitPublishingPluginHost* _tmp4_ = NULL;
+	PublishingAuthenticatorShotwellFacebookWebAuthenticationPane* _tmp5_ = NULL;
+#line 252 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
+#line 253 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_debug ("FacebookPublishingAuthenticator.vala:253: ACTION: doing hosted web aut" \
+"hentication.");
+#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = self->priv->host;
+#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
+#line 257 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = publishing_authenticator_shotwell_facebook_web_authentication_pane_new ();
+#line 257 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_object_unref0 (self->priv->web_auth_pane);
+#line 257 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->priv->web_auth_pane = _tmp1_;
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp2_ = self->priv->web_auth_pane;
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_signal_connect_object (_tmp2_, "login-succeeded", (GCallback) _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_succeeded, self, 0);
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp3_ = self->priv->web_auth_pane;
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_signal_connect_object (_tmp3_, "login-failed", (GCallback) _publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed_publishing_authenticator_shotwell_facebook_web_authentication_pane_login_failed, self, 0);
+#line 261 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp4_ = self->priv->host;
+#line 261 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp5_ = self->priv->web_auth_pane;
+#line 261 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 1919 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_succeeded (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* success_url) {
+	const gchar* _tmp0_ = NULL;
+#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
+#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (success_url != NULL);
+#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_debug ("FacebookPublishingAuthenticator.vala:267: EVENT: hosted web login succ" \
+"eeded.");
+#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = success_url;
+#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (self, _tmp0_);
+#line 1935 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_on_web_auth_pane_login_failed (PublishingAuthenticatorShotwellFacebookFacebook* self) {
+#line 272 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
+#line 273 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_debug ("FacebookPublishingAuthenticator.vala:273: EVENT: hosted web login fail" \
+"ed.");
+#line 281 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_facebook_do_show_service_welcome_pane (self);
+#line 1946 "FacebookPublishingAuthenticator.c"
+}
+
+
+static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
+	gint result = 0;
+	gchar* _result_ = NULL;
+	gint _tmp0_ = 0;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, 0);
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (needle != NULL, 0);
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = start_index;
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = needle;
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_result_ = _tmp2_;
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp3_ = _result_;
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp3_ != NULL) {
+#line 1973 "FacebookPublishingAuthenticator.c"
+		gchar* _tmp4_ = NULL;
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = _result_;
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = (gint) (_tmp4_ - ((gchar*) self));
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 1981 "FacebookPublishingAuthenticator.c"
+	} else {
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = -1;
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 1987 "FacebookPublishingAuthenticator.c"
+	}
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_do_authenticate_session (PublishingAuthenticatorShotwellFacebookFacebook* self, const gchar* good_login_uri) {
+	const gchar* _tmp0_ = NULL;
+	gchar* decoded_uri = NULL;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* access_token = NULL;
+	gint index = 0;
+	const gchar* _tmp3_ = NULL;
+	gint _tmp4_ = 0;
+	gint _tmp5_ = 0;
+	const gchar* _tmp12_ = NULL;
+	gchar* trailing_params = NULL;
+	const gchar* _tmp16_ = NULL;
+	gint _tmp17_ = 0;
+	gint _tmp18_ = 0;
+	const gchar* _tmp25_ = NULL;
+	const gchar* _tmp29_ = NULL;
+	gchar* _tmp30_ = NULL;
+	GHashTable* _tmp31_ = NULL;
+	gchar* _tmp32_ = NULL;
+	const gchar* _tmp33_ = NULL;
+	GVariant* _tmp34_ = NULL;
+	const gchar* _tmp35_ = NULL;
+#line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK (self));
+#line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_return_if_fail (good_login_uri != NULL);
+#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp0_ = good_login_uri;
+#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_debug ("FacebookPublishingAuthenticator.vala:285: ACTION: preparing to extract" \
+" session information encoded in uri = '%s'", _tmp0_);
+#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp1_ = good_login_uri;
+#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp2_ = soup_uri_decode (_tmp1_);
+#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	decoded_uri = _tmp2_;
+#line 292 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	access_token = NULL;
+#line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp3_ = decoded_uri;
+#line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp4_ = string_index_of (_tmp3_, "#access_token=", 0);
+#line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	index = _tmp4_;
+#line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp5_ = index;
+#line 294 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp5_ >= 0) {
+#line 2041 "FacebookPublishingAuthenticator.c"
+		const gchar* _tmp6_ = NULL;
+		gint _tmp7_ = 0;
+		const gchar* _tmp8_ = NULL;
+		gint _tmp9_ = 0;
+		gint _tmp10_ = 0;
+		gchar* _tmp11_ = NULL;
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp6_ = decoded_uri;
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp7_ = index;
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp8_ = decoded_uri;
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp9_ = strlen (_tmp8_);
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp10_ = _tmp9_;
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp11_ = string_slice (_tmp6_, (glong) _tmp7_, (glong) _tmp10_);
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_free0 (access_token);
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		access_token = _tmp11_;
+#line 2064 "FacebookPublishingAuthenticator.c"
+	}
+#line 296 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp12_ = access_token;
+#line 296 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp12_ == NULL) {
+#line 2070 "FacebookPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp13_ = NULL;
+		GError* _tmp14_ = NULL;
+		GError* _tmp15_ = NULL;
+#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp13_ = self->priv->host;
+#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp14_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Server redirect URL contained no access token");
+#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp15_ = _tmp14_;
+#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp13_, _tmp15_);
+#line 297 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_error_free0 (_tmp15_);
+#line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_free0 (access_token);
+#line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_free0 (decoded_uri);
+#line 299 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		return;
+#line 2090 "FacebookPublishingAuthenticator.c"
+	}
+#line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	trailing_params = NULL;
+#line 304 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp16_ = access_token;
+#line 304 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp17_ = string_index_of_char (_tmp16_, (gunichar) '&', 0);
+#line 304 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	index = _tmp17_;
+#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp18_ = index;
+#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp18_ >= 0) {
+#line 2104 "FacebookPublishingAuthenticator.c"
+		const gchar* _tmp19_ = NULL;
+		gint _tmp20_ = 0;
+		const gchar* _tmp21_ = NULL;
+		gint _tmp22_ = 0;
+		gint _tmp23_ = 0;
+		gchar* _tmp24_ = NULL;
+#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp19_ = access_token;
+#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp20_ = index;
+#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp21_ = access_token;
+#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp22_ = strlen (_tmp21_);
+#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp23_ = _tmp22_;
+#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp24_ = string_slice (_tmp19_, (glong) _tmp20_, (glong) _tmp23_);
+#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_free0 (trailing_params);
+#line 306 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		trailing_params = _tmp24_;
+#line 2127 "FacebookPublishingAuthenticator.c"
+	}
+#line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp25_ = trailing_params;
+#line 307 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	if (_tmp25_ != NULL) {
+#line 2133 "FacebookPublishingAuthenticator.c"
+		const gchar* _tmp26_ = NULL;
+		const gchar* _tmp27_ = NULL;
+		gchar* _tmp28_ = NULL;
+#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp26_ = access_token;
+#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp27_ = trailing_params;
+#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_tmp28_ = string_replace (_tmp26_, _tmp27_, "");
+#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		_g_free0 (access_token);
+#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+		access_token = _tmp28_;
+#line 2147 "FacebookPublishingAuthenticator.c"
+	}
+#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp29_ = access_token;
+#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp30_ = string_replace (_tmp29_, "#access_token=", "");
+#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (access_token);
+#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	access_token = _tmp30_;
+#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp31_ = self->priv->params;
+#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp32_ = g_strdup ("AccessToken");
+#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp33_ = access_token;
+#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp34_ = g_variant_new_string (_tmp33_);
+#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_variant_ref_sink (_tmp34_);
+#line 312 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_hash_table_insert (_tmp31_, _tmp32_, _tmp34_);
+#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_tmp35_ = access_token;
+#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_facebook_set_persistent_access_token (self, _tmp35_);
+#line 315 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
+#line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (trailing_params);
+#line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (access_token);
+#line 284 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_free0 (decoded_uri);
+#line 2181 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_class_init (PublishingAuthenticatorShotwellFacebookFacebookClass * klass) {
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_facebook_parent_class = g_type_class_peek_parent (klass);
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellFacebookFacebookPrivate));
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_facebook_facebook_finalize;
+#line 2192 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface) {
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	iface->authenticate = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_authenticate;
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	iface->can_logout = (gboolean (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_can_logout;
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	iface->get_authentication_parameter = (GHashTable* (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_get_authentication_parameter;
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	iface->logout = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_logout;
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	iface->refresh = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_facebook_facebook_real_refresh;
+#line 2209 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_instance_init (PublishingAuthenticatorShotwellFacebookFacebook * self) {
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_GET_PRIVATE (self);
+#line 162 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self->priv->web_auth_pane = NULL;
+#line 2218 "FacebookPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_facebook_facebook_finalize (GObject* obj) {
+	PublishingAuthenticatorShotwellFacebookFacebook * self;
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook);
+#line 161 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_object_unref0 (self->priv->host);
+#line 162 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_object_unref0 (self->priv->web_auth_pane);
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	_g_hash_table_unref0 (self->priv->params);
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala"
+	G_OBJECT_CLASS (publishing_authenticator_shotwell_facebook_facebook_parent_class)->finalize (obj);
+#line 2234 "FacebookPublishingAuthenticator.c"
+}
+
+
+GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_facebook_facebook_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_facebook_facebook_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellFacebookFacebookClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_facebook_facebook_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellFacebookFacebook), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_facebook_facebook_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_authenticator_info = { (GInterfaceInitFunc) publishing_authenticator_shotwell_facebook_facebook_spit_publishing_authenticator_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_authenticator_shotwell_facebook_facebook_type_id;
+		publishing_authenticator_shotwell_facebook_facebook_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingAuthenticatorShotwellFacebookFacebook", &g_define_type_info, 0);
+		g_type_add_interface_static (publishing_authenticator_shotwell_facebook_facebook_type_id, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, &spit_publishing_authenticator_info);
+		g_once_init_leave (&publishing_authenticator_shotwell_facebook_facebook_type_id__volatile, publishing_authenticator_shotwell_facebook_facebook_type_id);
+	}
+	return publishing_authenticator_shotwell_facebook_facebook_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/authenticator/shotwell/FacebookPublishingAuthenticator.vala b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala
new file mode 100644
index 0000000..26a2363
--- /dev/null
+++ b/plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala
@@ -0,0 +1,318 @@
+/* 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.
+ */
+
+using Shotwell;
+using Shotwell.Plugins;
+
+namespace Publishing.Authenticator.Shotwell.Facebook {
+    private const string APPLICATION_ID = "1612018629063184";
+
+    private class WebAuthenticationPane : Common.WebAuthenticationPane {
+        private static bool cache_dirty = false;
+
+        public signal void login_succeeded(string success_url);
+        public signal void login_failed();
+
+        public WebAuthenticationPane() {
+            Object (login_uri : get_login_url ());
+        }
+
+        private class LocaleLookup {
+            public string prefix;
+            public string translation;
+            public string? exception_code;
+            public string? exception_translation;
+            public string? exception_code_2;
+            public string? exception_translation_2;
+
+            public LocaleLookup(string prefix, string translation, string? exception_code = null,
+                string? exception_translation  = null, string? exception_code_2  = null,
+                string? exception_translation_2 = null) {
+                this.prefix = prefix;
+                this.translation = translation;
+                this.exception_code = exception_code;
+                this.exception_translation = exception_translation;
+                this.exception_code_2 = exception_code_2;
+                this.exception_translation_2 = exception_translation_2;
+            }
+
+        }
+
+        private static LocaleLookup[] locale_lookup_table = {
+            new LocaleLookup( "es", "es-la", "ES", "es-es" ),
+            new LocaleLookup( "en", "en-gb", "US", "en-us" ),
+            new LocaleLookup( "fr", "fr-fr", "CA", "fr-ca" ),
+            new LocaleLookup( "pt", "pt-br", "PT", "pt-pt" ),
+            new LocaleLookup( "zh", "zh-cn", "HK", "zh-hk", "TW", "zh-tw" ),
+            new LocaleLookup( "af", "af-za" ),
+            new LocaleLookup( "ar", "ar-ar" ),
+            new LocaleLookup( "nb", "nb-no" ),
+            new LocaleLookup( "no", "nb-no" ),
+            new LocaleLookup( "id", "id-id" ),
+            new LocaleLookup( "ms", "ms-my" ),
+            new LocaleLookup( "ca", "ca-es" ),
+            new LocaleLookup( "cs", "cs-cz" ),
+            new LocaleLookup( "cy", "cy-gb" ),
+            new LocaleLookup( "da", "da-dk" ),
+            new LocaleLookup( "de", "de-de" ),
+            new LocaleLookup( "tl", "tl-ph" ),
+            new LocaleLookup( "ko", "ko-kr" ),
+            new LocaleLookup( "hr", "hr-hr" ),
+            new LocaleLookup( "it", "it-it" ),
+            new LocaleLookup( "lt", "lt-lt" ),
+            new LocaleLookup( "hu", "hu-hu" ),
+            new LocaleLookup( "nl", "nl-nl" ),
+            new LocaleLookup( "ja", "ja-jp" ),
+            new LocaleLookup( "nb", "nb-no" ),
+            new LocaleLookup( "no", "nb-no" ),
+            new LocaleLookup( "pl", "pl-pl" ),
+            new LocaleLookup( "ro", "ro-ro" ),
+            new LocaleLookup( "ru", "ru-ru" ),
+            new LocaleLookup( "sk", "sk-sk" ),
+            new LocaleLookup( "sl", "sl-si" ),
+            new LocaleLookup( "sv", "sv-se" ),
+            new LocaleLookup( "th", "th-th" ),
+            new LocaleLookup( "vi", "vi-vn" ),
+            new LocaleLookup( "tr", "tr-tr" ),
+            new LocaleLookup( "el", "el-gr" ),
+            new LocaleLookup( "bg", "bg-bg" ),
+            new LocaleLookup( "sr", "sr-rs" ),
+            new LocaleLookup( "he", "he-il" ),
+            new LocaleLookup( "hi", "hi-in" ),
+            new LocaleLookup( "bn", "bn-in" ),
+            new LocaleLookup( "pa", "pa-in" ),
+            new LocaleLookup( "ta", "ta-in" ),
+            new LocaleLookup( "te", "te-in" ),
+            new LocaleLookup( "ml", "ml-in" )
+        };
+
+        private static string get_system_locale_as_facebook_locale() {
+            unowned string? raw_system_locale = Intl.setlocale(LocaleCategory.ALL, "");
+            if (raw_system_locale == null || raw_system_locale == "")
+                return "www";
+
+            string system_locale = raw_system_locale.split(".")[0];
+
+            foreach (LocaleLookup locale_lookup in locale_lookup_table) {
+                if (!system_locale.has_prefix(locale_lookup.prefix))
+                    continue;
+
+                if (locale_lookup.exception_code != null) {
+                    assert(locale_lookup.exception_translation != null);
+
+                    if (system_locale.contains(locale_lookup.exception_code))
+                        return locale_lookup.exception_translation;
+                }
+
+                if (locale_lookup.exception_code_2 != null) {
+                    assert(locale_lookup.exception_translation_2 != null);
+
+                    if (system_locale.contains(locale_lookup.exception_code_2))
+                        return locale_lookup.exception_translation_2;
+                }
+
+                return locale_lookup.translation;
+            }
+
+            // default
+            return "www";
+        }
+
+        private static string get_login_url() {
+            var facebook_locale = get_system_locale_as_facebook_locale();
+
+            return "https://%s.facebook.com/dialog/oauth?client_id=%s&redirect_uri=https://www.facebook.com/connect/login_success.html&display=popup&scope=publish_actions,user_photos,user_videos&response_type=token".printf(facebook_locale, APPLICATION_ID);
+        }
+
+        public override void on_page_load() {
+            string loaded_url = get_view ().uri.dup();
+            debug("loaded url: " + loaded_url);
+
+            // strip parameters from the loaded url
+            if (loaded_url.contains("?")) {
+                int index = loaded_url.index_of_char('?');
+                string params = loaded_url[index:loaded_url.length];
+                loaded_url = loaded_url.replace(params, "");
+            }
+
+            // were we redirected to the facebook login success page?
+            if (loaded_url.contains("login_success")) {
+                cache_dirty = true;
+                login_succeeded(get_view ().uri);
+                return;
+            }
+
+            // were we redirected to the login total failure page?
+            if (loaded_url.contains("login_failure")) {
+                login_failed();
+                return;
+            }
+        }
+
+        public static bool is_cache_dirty() {
+            return cache_dirty;
+        }
+    }
+
+    internal class Facebook : Spit.Publishing.Authenticator, GLib.Object {
+        private Spit.Publishing.PluginHost host;
+        private Publishing.Authenticator.Shotwell.Facebook.WebAuthenticationPane web_auth_pane = null;
+        private GLib.HashTable<string, Variant> params;
+
+        private const string SERVICE_WELCOME_MESSAGE =
+    _("You are not currently logged into Facebook.\n\nIf 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.");
+        private const string RESTART_ERROR_MESSAGE =
+    _("You have already logged in and out of Facebook during this Shotwell session.\nTo continue publishing to Facebook, quit and restart Shotwell, then try publishing again.");
+
+        /* Interface functions */
+        public Facebook(Spit.Publishing.PluginHost host) {
+            this.host = host;
+            this.params = new GLib.HashTable<string, Variant>(str_hash, str_equal);
+        }
+
+        public void authenticate() {
+            // Do we have saved user credentials? If so, go ahead and authenticate the session
+            // with the saved credentials and proceed with the publishing interaction. Otherwise, show
+            // the Welcome pane
+            if (is_persistent_session_valid()) {
+                var access_token = get_persistent_access_token();
+                this.params.insert("AccessToken", new Variant.string(access_token));
+                this.authenticated();
+                return;
+            }
+
+            // FIXME: Find a way for a proper logout
+            if (WebAuthenticationPane.is_cache_dirty()) {
+                host.set_service_locked(false);
+                host.install_static_message_pane(RESTART_ERROR_MESSAGE,
+                                                 Spit.Publishing.PluginHost.ButtonMode.CANCEL);
+            } else {
+                this.do_show_service_welcome_pane();
+            }
+        }
+
+        public bool can_logout() {
+            return true;
+        }
+
+        public GLib.HashTable<string, Variant> get_authentication_parameter() {
+            return this.params;
+        }
+
+        public void invalidate_persistent_session() {
+            debug("invalidating saved Facebook session.");
+            set_persistent_access_token("");
+        }
+
+        public void logout() {
+            invalidate_persistent_session();
+        }
+
+        public void refresh() {
+            // No-Op with Flickr
+        }
+
+        /* Private functions */
+        private bool is_persistent_session_valid() {
+            string? token = get_persistent_access_token();
+
+            if (token != null)
+                debug("existing Facebook session found in configuration database (access_token = %s).",
+                        token);
+            else
+                debug("no existing Facebook session available.");
+
+            return token != null;
+        }
+
+        private string? get_persistent_access_token() {
+            return host.get_config_string("access_token", null);
+        }
+
+        private void set_persistent_access_token(string access_token) {
+            host.set_config_string("access_token", access_token);
+        }
+
+        private void do_show_service_welcome_pane() {
+            debug("ACTION: showing service welcome pane.");
+
+            host.install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_login_clicked);
+            host.set_service_locked(false);
+        }
+
+        private void on_login_clicked() {
+            debug("EVENT: user clicked 'Login' on welcome pane.");
+
+            do_hosted_web_authentication();
+        }
+
+        private void do_hosted_web_authentication() {
+            debug("ACTION: doing hosted web authentication.");
+
+            this.host.set_service_locked(false);
+
+            this.web_auth_pane = new WebAuthenticationPane();
+            this.web_auth_pane.login_succeeded.connect(on_web_auth_pane_login_succeeded);
+            this.web_auth_pane.login_failed.connect(on_web_auth_pane_login_failed);
+
+            this.host.install_dialog_pane(this.web_auth_pane,
+                                          Spit.Publishing.PluginHost.ButtonMode.CANCEL);
+
+        }
+
+        private void on_web_auth_pane_login_succeeded(string success_url) {
+            debug("EVENT: hosted web login succeeded.");
+
+            do_authenticate_session(success_url);
+        }
+
+        private void on_web_auth_pane_login_failed() {
+            debug("EVENT: hosted web login failed.");
+
+            // In this case, "failed" doesn't mean that the user didn't enter the right username and
+            // password -- Facebook handles that case inside the Facebook Connect web control. Instead,
+            // it means that no session was initiated in response to our login request. The only
+            // way this happens is if the user clicks the "Cancel" button that appears inside
+            // the web control. In this case, the correct behavior is to return the user to the
+            // service welcome pane so that they can start the web interaction again.
+            do_show_service_welcome_pane();
+        }
+
+        private void do_authenticate_session(string good_login_uri) {
+            debug("ACTION: preparing to extract session information encoded in uri = '%s'",
+                 good_login_uri);
+
+            // the raw uri is percent-encoded, so decode it
+            string decoded_uri = Soup.URI.decode(good_login_uri);
+
+            // locate the access token within the URI
+            string? access_token = null;
+            int index = decoded_uri.index_of("#access_token=");
+            if (index >= 0)
+                access_token = decoded_uri[index:decoded_uri.length];
+            if (access_token == null) {
+                host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
+                    "Server redirect URL contained no access token"));
+                return;
+            }
+
+            // remove any trailing parameters from the session description string
+            string? trailing_params = null;
+            index = access_token.index_of_char('&');
+            if (index >= 0)
+                trailing_params = access_token[index:access_token.length];
+            if (trailing_params != null)
+                access_token = access_token.replace(trailing_params, "");
+
+            // remove the key from the session description string
+            access_token = access_token.replace("#access_token=", "");
+            this.params.insert("AccessToken", new Variant.string(access_token));
+            set_persistent_access_token(access_token);
+
+            this.authenticated();
+        }
+    }
+} // namespace Publishing.Facebook;
diff --git a/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
new file mode 100644
index 0000000..033eb84
--- /dev/null
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.c
@@ -0,0 +1,3687 @@
+/* FlickrPublishingAuthenticator.c generated by valac 0.34.4, the Vala compiler
+ * generated from FlickrPublishingAuthenticator.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 "shotwell-plugin-common.h"
+#include "shotwell-plugin-dev-1.0.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))
+
+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))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_AUTHENTICATION_REQUEST_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_AUTHENTICATION_REQUEST_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass))
+
+typedef struct _PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction;
+typedef struct _PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass;
+typedef struct _PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionPrivate PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionPrivate;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION (publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass))
+
+typedef struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction;
+typedef struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass;
+typedef struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionPrivate PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionPrivate;
+
+#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))
+
+typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPane PublishingAuthenticatorShotwellFlickrPinEntryPane;
+typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPaneClass PublishingAuthenticatorShotwellFlickrPinEntryPaneClass;
+typedef struct _PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate;
+#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 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))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickrClass))
+
+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;
+	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionPrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransactionClass {
+	PublishingAuthenticatorShotwellFlickrTransactionClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction {
+	PublishingAuthenticatorShotwellFlickrTransaction parent_instance;
+	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionPrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransactionClass {
+	PublishingAuthenticatorShotwellFlickrTransactionClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellFlickrPinEntryPane {
+	GObject parent_instance;
+	PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellFlickrPinEntryPaneClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellFlickrPinEntryPanePrivate {
+	GtkBox* pane_widget;
+	GtkButton* continue_button;
+	GtkEntry* pin_entry;
+	GtkLabel* pin_entry_caption;
+	GtkLabel* explanatory_text;
+	GtkBuilder* builder;
+};
+
+struct _PublishingAuthenticatorShotwellFlickrFlickr {
+	GObject parent_instance;
+	PublishingAuthenticatorShotwellFlickrFlickrPrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellFlickrFlickrClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellFlickrFlickrPrivate {
+	GHashTable* params;
+	PublishingAuthenticatorShotwellFlickrSession* session;
+	SpitPublishingPluginHost* host;
+};
+
+
+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_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" \
+"\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.")
+GType publishing_authenticator_shotwell_flickr_authentication_request_transaction_get_type (void) G_GNUC_CONST;
+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);
+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))
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_PIN_ENTRY_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);
+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);
+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 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);
+static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err);
+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_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* pin);
+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_ = NULL;
+	PublishingRESTSupportHttpMethod _tmp1_ = 0;
+#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 326 "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 333 "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_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	PublishingRESTSupportHttpMethod _tmp2_ = 0;
+#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);
+#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 358 "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 365 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_transaction_setup_arguments (PublishingAuthenticatorShotwellFlickrTransaction* self) {
+	PublishingAuthenticatorShotwellFlickrSession* session = NULL;
+	PublishingRESTSupportSession* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+#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 416 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
+	PublishingAuthenticatorShotwellFlickrTransaction * self;
+	PublishingRESTSupportSession* _tmp0_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp1_ = NULL;
+	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 445 "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 453 "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 = publishing_authenticator_shotwell_flickr_transaction_real_execute;
+#line 464 "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 490 "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 497 "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_ = NULL;
+#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 513 "FlickrPublishingAuthenticator.c"
+		const gchar* _tmp3_ = NULL;
+#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 519 "FlickrPublishingAuthenticator.c"
+	} else {
+#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp1_ = FALSE;
+#line 523 "FlickrPublishingAuthenticator.c"
+	}
+#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	if (_tmp1_) {
+#line 527 "FlickrPublishingAuthenticator.c"
+		const gchar* _tmp4_ = NULL;
+#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 533 "FlickrPublishingAuthenticator.c"
+	} else {
+#line 58 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp0_ = FALSE;
+#line 537 "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 543 "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_ = NULL;
+	gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+#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 588 "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 607 "FlickrPublishingAuthenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_flickr_session_set_api_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#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 638 "FlickrPublishingAuthenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_flickr_session_sign_transaction (PublishingAuthenticatorShotwellFlickrSession* self, PublishingRESTSupportTransaction* txn) {
+	gchar* http_method = NULL;
+	PublishingRESTSupportTransaction* _tmp0_ = NULL;
+	PublishingRESTSupportHttpMethod _tmp1_ = 0;
+	gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	PublishingRESTSupportArgument** base_string_arguments = NULL;
+	PublishingRESTSupportTransaction* _tmp6_ = NULL;
+	gint _tmp7_ = 0;
+	PublishingRESTSupportArgument** _tmp8_ = NULL;
+	gint base_string_arguments_length1 = 0;
+	gint _base_string_arguments_size_ = 0;
+	PublishingRESTSupportArgument** sorted_args = NULL;
+	PublishingRESTSupportArgument** _tmp9_ = NULL;
+	gint _tmp9__length1 = 0;
+	gint _tmp10_ = 0;
+	PublishingRESTSupportArgument** _tmp11_ = NULL;
+	gint sorted_args_length1 = 0;
+	gint _sorted_args_size_ = 0;
+	gchar* arguments_string = NULL;
+	gchar* _tmp12_ = NULL;
+	gchar* signing_key = NULL;
+	const gchar* _tmp35_ = NULL;
+	gchar* signature_base_string = NULL;
+	const gchar* _tmp49_ = NULL;
+	gchar* _tmp50_ = NULL;
+	gchar* _tmp51_ = NULL;
+	PublishingRESTSupportTransaction* _tmp52_ = NULL;
+	gchar* _tmp53_ = NULL;
+	gchar* _tmp54_ = NULL;
+	gchar* _tmp55_ = NULL;
+	gchar* _tmp56_ = NULL;
+	gchar* _tmp57_ = NULL;
+	gchar* _tmp58_ = NULL;
+	gchar* _tmp59_ = NULL;
+	gchar* _tmp60_ = NULL;
+	const gchar* _tmp61_ = NULL;
+	gchar* _tmp62_ = NULL;
+	gchar* _tmp63_ = NULL;
+	gchar* _tmp64_ = NULL;
+	gchar* _tmp65_ = NULL;
+	const gchar* _tmp66_ = NULL;
+	gchar* signature = NULL;
+	const gchar* _tmp67_ = NULL;
+	gchar* _tmp68_ = NULL;
+	const gchar* _tmp69_ = NULL;
+	gchar* _tmp70_ = NULL;
+	const gchar* _tmp71_ = NULL;
+	PublishingRESTSupportTransaction* _tmp72_ = NULL;
+	const gchar* _tmp73_ = NULL;
+#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 744 "FlickrPublishingAuthenticator.c"
+	{
+		gint i = 0;
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		i = 0;
+#line 749 "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 756 "FlickrPublishingAuthenticator.c"
+				gint _tmp15_ = 0;
+				PublishingRESTSupportArgument** _tmp16_ = NULL;
+				gint _tmp16__length1 = 0;
+				const gchar* _tmp17_ = NULL;
+				PublishingRESTSupportArgument** _tmp18_ = NULL;
+				gint _tmp18__length1 = 0;
+				gint _tmp19_ = 0;
+				PublishingRESTSupportArgument* _tmp20_ = NULL;
+				const gchar* _tmp21_ = NULL;
+				gchar* _tmp22_ = NULL;
+				gchar* _tmp23_ = NULL;
+				PublishingRESTSupportArgument** _tmp24_ = NULL;
+				gint _tmp24__length1 = 0;
+				gint _tmp25_ = 0;
+				PublishingRESTSupportArgument* _tmp26_ = NULL;
+				const gchar* _tmp27_ = NULL;
+				gchar* _tmp28_ = NULL;
+				gchar* _tmp29_ = NULL;
+				gchar* _tmp30_ = NULL;
+				gint _tmp31_ = 0;
+				PublishingRESTSupportArgument** _tmp32_ = NULL;
+				gint _tmp32__length1 = 0;
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+				if (!_tmp13_) {
+#line 781 "FlickrPublishingAuthenticator.c"
+					gint _tmp14_ = 0;
+#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 787 "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 801 "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 851 "FlickrPublishingAuthenticator.c"
+					const gchar* _tmp33_ = NULL;
+					gchar* _tmp34_ = NULL;
+#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 862 "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 873 "FlickrPublishingAuthenticator.c"
+		const gchar* _tmp36_ = NULL;
+		gchar* _tmp37_ = NULL;
+		gchar* _tmp38_ = NULL;
+		const gchar* _tmp39_ = NULL;
+		gchar* _tmp40_ = NULL;
+#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 897 "FlickrPublishingAuthenticator.c"
+	} else {
+		const gchar* _tmp41_ = NULL;
+#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 904 "FlickrPublishingAuthenticator.c"
+			const gchar* _tmp42_ = NULL;
+			gchar* _tmp43_ = NULL;
+			gchar* _tmp44_ = NULL;
+			const gchar* _tmp45_ = NULL;
+			gchar* _tmp46_ = NULL;
+#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 928 "FlickrPublishingAuthenticator.c"
+		} else {
+			const gchar* _tmp47_ = NULL;
+			gchar* _tmp48_ = NULL;
+#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 942 "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 1037 "FlickrPublishingAuthenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_flickr_session_set_request_phase_credentials (PublishingAuthenticatorShotwellFlickrSession* self, const gchar* token, const gchar* secret) {
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#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 1068 "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_ = NULL;
+	gchar* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+#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 1113 "FlickrPublishingAuthenticator.c"
+}
+
+
+gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_nonce (PublishingAuthenticatorShotwellFlickrSession* self) {
+	gchar* result = NULL;
+	GTimeVal currtime = {0};
+	GTimeVal _tmp0_ = {0};
+	glong _tmp1_ = 0L;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	GTimeVal _tmp4_ = {0};
+	glong _tmp5_ = 0L;
+	gchar* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+#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 1172 "FlickrPublishingAuthenticator.c"
+}
+
+
+static glong string_strnlen (gchar* str, glong maxlen) {
+	glong result = 0L;
+	gchar* end = NULL;
+	gchar* _tmp0_ = NULL;
+	glong _tmp1_ = 0L;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = str;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = maxlen;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	end = _tmp2_;
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp3_ = end;
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp3_ == NULL) {
+#line 1195 "FlickrPublishingAuthenticator.c"
+		glong _tmp4_ = 0L;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = maxlen;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = _tmp4_;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 1203 "FlickrPublishingAuthenticator.c"
+	} else {
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp5_ = end;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp6_ = str;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp5_ - _tmp6_);
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 1215 "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_ = 0L;
+	glong _tmp8_ = 0L;
+	glong _tmp14_ = 0L;
+	glong _tmp17_ = 0L;
+	glong _tmp18_ = 0L;
+	glong _tmp19_ = 0L;
+	glong _tmp20_ = 0L;
+	glong _tmp21_ = 0L;
+	gchar* _tmp22_ = NULL;
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = offset;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp1_ >= ((glong) 0)) {
+#line 1239 "FlickrPublishingAuthenticator.c"
+		glong _tmp2_ = 0L;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp2_ = len;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp2_ >= ((glong) 0);
+#line 1245 "FlickrPublishingAuthenticator.c"
+	} else {
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 1249 "FlickrPublishingAuthenticator.c"
+	}
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 1253 "FlickrPublishingAuthenticator.c"
+		glong _tmp3_ = 0L;
+		glong _tmp4_ = 0L;
+		glong _tmp5_ = 0L;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp3_ = offset;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = len;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		string_length = _tmp5_;
+#line 1265 "FlickrPublishingAuthenticator.c"
+	} else {
+		gint _tmp6_ = 0;
+		gint _tmp7_ = 0;
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp6_ = strlen (self);
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp6_;
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp7_;
+#line 1275 "FlickrPublishingAuthenticator.c"
+	}
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp8_ = offset;
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp8_ < ((glong) 0)) {
+#line 1281 "FlickrPublishingAuthenticator.c"
+		glong _tmp9_ = 0L;
+		glong _tmp10_ = 0L;
+		glong _tmp11_ = 0L;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp9_ = string_length;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp10_ = offset;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		offset = _tmp9_ + _tmp10_;
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp11_ = offset;
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+#line 1295 "FlickrPublishingAuthenticator.c"
+	} else {
+		glong _tmp12_ = 0L;
+		glong _tmp13_ = 0L;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp12_ = offset;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp13_ = string_length;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
+#line 1305 "FlickrPublishingAuthenticator.c"
+	}
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp14_ = len;
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp14_ < ((glong) 0)) {
+#line 1311 "FlickrPublishingAuthenticator.c"
+		glong _tmp15_ = 0L;
+		glong _tmp16_ = 0L;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp16_ = offset;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		len = _tmp15_ - _tmp16_;
+#line 1320 "FlickrPublishingAuthenticator.c"
+	}
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp17_ = offset;
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp18_ = len;
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp19_ = string_length;
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp20_ = offset;
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp21_ = len;
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	result = _tmp22_;
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	return result;
+#line 1340 "FlickrPublishingAuthenticator.c"
+}
+
+
+gchar* publishing_authenticator_shotwell_flickr_session_get_oauth_timestamp (PublishingAuthenticatorShotwellFlickrSession* self) {
+	gchar* result = NULL;
+	gint64 _tmp0_ = 0LL;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+#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 1369 "FlickrPublishingAuthenticator.c"
+}
+
+
+gchar* publishing_authenticator_shotwell_flickr_session_get_consumer_key (PublishingAuthenticatorShotwellFlickrSession* self) {
+	gchar* result = NULL;
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+#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 1392 "FlickrPublishingAuthenticator.c"
+}
+
+
+gchar* publishing_authenticator_shotwell_flickr_session_get_request_phase_token (PublishingAuthenticatorShotwellFlickrSession* self) {
+	gchar* result = NULL;
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+#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 1415 "FlickrPublishingAuthenticator.c"
+}
+
+
+gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token (PublishingAuthenticatorShotwellFlickrSession* self) {
+	gchar* result = NULL;
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+#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 1438 "FlickrPublishingAuthenticator.c"
+}
+
+
+gchar* publishing_authenticator_shotwell_flickr_session_get_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrSession* self) {
+	gchar* result = NULL;
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+#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 1461 "FlickrPublishingAuthenticator.c"
+}
+
+
+gchar* publishing_authenticator_shotwell_flickr_session_get_username (PublishingAuthenticatorShotwellFlickrSession* self) {
+	gchar* result = NULL;
+	gboolean _tmp0_ = FALSE;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+#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 1484 "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 = publishing_authenticator_shotwell_flickr_session_real_is_authenticated;
+#line 1497 "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 1518 "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 1542 "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_ = NULL;
+#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"
+	return self;
+#line 1569 "FlickrPublishingAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (PublishingAuthenticatorShotwellFlickrSession* session) {
+#line 190 "/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 1576 "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"
+	publishing_authenticator_shotwell_flickr_authentication_request_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 1583 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_authentication_request_transaction_instance_init (PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction * self) {
+}
+
+
+GType publishing_authenticator_shotwell_flickr_authentication_request_transaction_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_flickr_authentication_request_transaction_type_id__volatile = 0;
+	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);
+		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* self = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+#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"
+	g_return_val_if_fail (user_verifier != NULL, NULL);
+#line 198 "/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"
+	_tmp1_ = user_verifier;
+#line 200 "/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"
+	_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"
+	_tmp4_ = _tmp3_;
+#line 201 "/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"
+	_g_free0 (_tmp4_);
+#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	return self;
+#line 1634 "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"
+	return publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, user_verifier);
+#line 1641 "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"
+	publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 1648 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_instance_init (PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction * self) {
+}
+
+
+GType publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_type_id__volatile = 0;
+	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);
+		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 1671 "FlickrPublishingAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellFlickrPinEntryPane* publishing_authenticator_shotwell_flickr_pin_entry_pane_construct (GType object_type, GtkBuilder* builder) {
+	PublishingAuthenticatorShotwellFlickrPinEntryPane * self = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	GtkBuilder* _tmp1_ = NULL;
+	GtkBuilder* _tmp2_ = NULL;
+	GtkBuilder* _tmp3_ = NULL;
+	GSList* _tmp4_ = NULL;
+	GSList* _tmp5_ = NULL;
+	guint _tmp6_ = 0U;
+	GtkBuilder* _tmp7_ = NULL;
+	GObject* _tmp8_ = NULL;
+	GtkLabel* _tmp9_ = NULL;
+	GtkBuilder* _tmp10_ = NULL;
+	GObject* _tmp11_ = NULL;
+	GtkLabel* _tmp12_ = NULL;
+	GtkBuilder* _tmp13_ = NULL;
+	GObject* _tmp14_ = NULL;
+	GtkEntry* _tmp15_ = NULL;
+	GtkBuilder* _tmp16_ = NULL;
+	GObject* _tmp17_ = NULL;
+	GtkButton* _tmp18_ = NULL;
+	GtkBuilder* _tmp19_ = NULL;
+	GObject* _tmp20_ = NULL;
+	GtkBox* _tmp21_ = NULL;
+	GtkBox* _tmp22_ = NULL;
+#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"
+	return self;
+#line 1786 "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 1793 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_continue_clicked (PublishingAuthenticatorShotwellFlickrPinEntryPane* self) {
+	GtkEntry* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+#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_by_name (self, "proceed", self, _tmp1_);
+#line 1808 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_pin_entry_pane_on_pin_entry_contents_changed (PublishingAuthenticatorShotwellFlickrPinEntryPane* self) {
+	GtkButton* _tmp0_ = NULL;
+	GtkEntry* _tmp1_ = NULL;
+	guint _tmp2_ = 0U;
+	guint _tmp3_ = 0U;
+#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 1829 "FlickrPublishingAuthenticator.c"
+}
+
+
+static GtkWidget* publishing_authenticator_shotwell_flickr_pin_entry_pane_real_get_widget (SpitPublishingDialogPane* base) {
+	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
+	GtkWidget* result = NULL;
+	GtkBox* _tmp0_ = NULL;
+	GtkWidget* _tmp1_ = NULL;
+#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 1848 "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 1861 "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 1868 "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 1875 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
+	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
+	GtkButton* _tmp0_ = NULL;
+	GtkEntry* _tmp1_ = NULL;
+#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 1893 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
+	PublishingAuthenticatorShotwellFlickrPinEntryPane * self;
+	GtkButton* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	GtkEntry* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+#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 1917 "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 1936 "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 1942 "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 1948 "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"
+	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 1961 "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 1976 "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 1995 "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 2017 "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 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 2038 "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 2045 "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 2052 "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 2059 "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 2066 "FlickrPublishingAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_construct (GType object_type, SpitPublishingPluginHost* host) {
+	PublishingAuthenticatorShotwellFlickrFlickr * self = NULL;
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp1_ = NULL;
+	GHashFunc _tmp2_ = NULL;
+	GEqualFunc _tmp3_ = NULL;
+	GHashTable* _tmp4_ = NULL;
+	GHashTable* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	GVariant* _tmp7_ = NULL;
+	GHashTable* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	GVariant* _tmp10_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp11_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp12_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp13_ = NULL;
+#line 265 "/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"
+	_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"
+	return self;
+#line 2140 "FlickrPublishingAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellFlickrFlickr* publishing_authenticator_shotwell_flickr_flickr_new (SpitPublishingPluginHost* host) {
+#line 265 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	return publishing_authenticator_shotwell_flickr_flickr_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, host);
+#line 2147 "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 2160 "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_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gboolean _tmp4_ = FALSE;
+#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 2183 "FlickrPublishingAuthenticator.c"
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+#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 2194 "FlickrPublishingAuthenticator.c"
+	} else {
+#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp1_ = FALSE;
+#line 2198 "FlickrPublishingAuthenticator.c"
+	}
+#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	if (_tmp1_) {
+#line 2202 "FlickrPublishingAuthenticator.c"
+		gchar* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+#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 2213 "FlickrPublishingAuthenticator.c"
+	} else {
+#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp0_ = FALSE;
+#line 2217 "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 2223 "FlickrPublishingAuthenticator.c"
+}
+
+
+static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+	gchar* result = NULL;
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#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 2241 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_username (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* username) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+#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 2258 "FlickrPublishingAuthenticator.c"
+}
+
+
+static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+	gchar* result = NULL;
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#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 2276 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+#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 2293 "FlickrPublishingAuthenticator.c"
+}
+
+
+static gchar* publishing_authenticator_shotwell_flickr_flickr_get_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+	gchar* result = NULL;
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#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 2311 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_set_persistent_access_phase_token_secret (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* secret) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+#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 2328 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_real_authenticate (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellFlickrFlickr * self;
+	gboolean _tmp0_ = FALSE;
+#line 318 "/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"
+	if (_tmp0_) {
+#line 2341 "FlickrPublishingAuthenticator.c"
+		PublishingAuthenticatorShotwellFlickrSession* _tmp1_ = NULL;
+		gchar* _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
+		gchar* _tmp4_ = NULL;
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+#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"
+		_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"
+		_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"
+		_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"
+		_g_free0 (_tmp7_);
+#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_g_free0 (_tmp5_);
+#line 322 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_g_free0 (_tmp3_);
+#line 2373 "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"
+		publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (self);
+#line 2379 "FlickrPublishingAuthenticator.c"
+	}
+}
+
+
+static gboolean publishing_authenticator_shotwell_flickr_flickr_real_can_logout (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellFlickrFlickr * self;
+	gboolean result = FALSE;
+#line 330 "/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"
+	result = TRUE;
+#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	return result;
+#line 2393 "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 2400 "FlickrPublishingAuthenticator.c"
+}
+
+
+static GHashTable* publishing_authenticator_shotwell_flickr_flickr_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellFlickrFlickr * self;
+	GHashTable* result = NULL;
+	GHashTable* _tmp0_ = NULL;
+	GHashTable* _tmp1_ = NULL;
+#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"
+	return result;
+#line 2419 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_real_logout (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellFlickrFlickr * self;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
+#line 338 "/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 2434 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_real_refresh (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellFlickrFlickr * self;
+#line 343 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickr);
+#line 2442 "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"
+	publishing_authenticator_shotwell_flickr_flickr_on_welcome_pane_login_clicked ((PublishingAuthenticatorShotwellFlickrFlickr*) self);
+#line 2449 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_do_show_login_welcome_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp1_ = NULL;
+#line 347 "/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" \
+"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"
+	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"
+	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 2468 "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"
+	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" \
+"tton in the welcome pane");
+#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (self);
+#line 2479 "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"
+	publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
+#line 2486 "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"
+	publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
+#line 2493 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_do_run_authentication_request_transaction (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* txn = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp3_ = NULL;
+	PublishingAuthenticatorShotwellFlickrAuthenticationRequestTransaction* _tmp4_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 360 "/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" \
+" 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"
+	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"
+	_tmp2_ = _ ("Preparing for login…");
+#line 364 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _tmp2_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp3_ = self->priv->session;
+#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp4_ = publishing_authenticator_shotwell_flickr_authentication_request_transaction_new (_tmp3_);
+#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	txn = _tmp4_;
+#line 367 "/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"
+	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 2529 "FlickrPublishingAuthenticator.c"
+	{
+#line 371 "/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"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 2537 "FlickrPublishingAuthenticator.c"
+				goto __catch1_spit_publishing_publishing_error;
+			}
+#line 371 "/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"
+			g_critical ("file %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"
+			g_clear_error (&_inner_error_);
+#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+			return;
+#line 2548 "FlickrPublishingAuthenticator.c"
+		}
+	}
+	goto __finally1;
+	__catch1_spit_publishing_publishing_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
+#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		err = _inner_error_;
+#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_inner_error_ = NULL;
+#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp5_ = self->priv->host;
+#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp6_ = err;
+#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
+#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_g_error_free0 (err);
+#line 2569 "FlickrPublishingAuthenticator.c"
+	}
+	__finally1:
+#line 370 "/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"
+		_publishing_rest_support_transaction_unref0 (txn);
+#line 370 "/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"
+		g_clear_error (&_inner_error_);
+#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		return;
+#line 2582 "FlickrPublishingAuthenticator.c"
+	}
+#line 360 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_publishing_rest_support_transaction_unref0 (txn);
+#line 2586 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) {
+	PublishingRESTSupportTransaction* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	PublishingRESTSupportTransaction* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+#line 377 "/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"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = txn;
+#line 378 "/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"
+	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"
+	_tmp2_ = txn;
+#line 379 "/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"
+	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"
+	_tmp4_ = txn;
+#line 381 "/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"
+	_tmp6_ = _tmp5_;
+#line 381 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_debug ("FlickrPublishingAuthenticator.vala:381: EVENT: OAuth authentication re" \
+"quest transaction completed; response = '%s'", _tmp6_);
+#line 381 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_free0 (_tmp6_);
+#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp7_ = txn;
+#line 384 "/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"
+	_tmp9_ = _tmp8_;
+#line 384 "/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"
+	_g_free0 (_tmp9_);
+#line 2637 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_on_auth_request_txn_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) {
+	PublishingRESTSupportTransaction* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	PublishingRESTSupportTransaction* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+	SpitPublishingPluginHost* _tmp4_ = NULL;
+	GError* _tmp5_ = NULL;
+#line 387 "/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"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = txn;
+#line 389 "/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"
+	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"
+	_tmp2_ = txn;
+#line 390 "/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"
+	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" \
+"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"
+	_tmp5_ = err;
+#line 393 "/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"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
+#line 2674 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_do_parse_token_info_from_auth_request (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) {
+	const gchar* _tmp0_ = NULL;
+	gchar* oauth_token = NULL;
+	gchar* oauth_token_secret = NULL;
+	GHashTable* data = NULL;
+	const gchar* _tmp1_ = NULL;
+	GHashTable* _tmp2_ = NULL;
+	GHashTable* _tmp3_ = NULL;
+	gconstpointer _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	GHashTable* _tmp6_ = NULL;
+	gconstpointer _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	gboolean _tmp9_ = FALSE;
+	const gchar* _tmp10_ = NULL;
+	const gchar* _tmp16_ = NULL;
+	const gchar* _tmp17_ = NULL;
+#line 398 "/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"
+	g_return_if_fail (response != NULL);
+#line 399 "/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 " \
+"request response '%s' into token and secret", _tmp0_);
+#line 401 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	oauth_token = NULL;
+#line 402 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	oauth_token_secret = NULL;
+#line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp1_ = response;
+#line 404 "/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"
+	data = _tmp2_;
+#line 405 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp3_ = data;
+#line 405 "/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"
+	_g_free0 (oauth_token);
+#line 405 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp5_ = g_strdup (_tmp4_);
+#line 405 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	oauth_token = _tmp5_;
+#line 406 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp6_ = data;
+#line 406 "/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"
+	_g_free0 (oauth_token_secret);
+#line 406 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp8_ = g_strdup (_tmp7_);
+#line 406 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	oauth_token_secret = _tmp8_;
+#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp10_ = oauth_token;
+#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	if (_tmp10_ == NULL) {
+#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp9_ = TRUE;
+#line 2739 "FlickrPublishingAuthenticator.c"
+	} else {
+		const gchar* _tmp11_ = NULL;
+#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp11_ = oauth_token_secret;
+#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp9_ = _tmp11_ == NULL;
+#line 2746 "FlickrPublishingAuthenticator.c"
+	}
+#line 408 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	if (_tmp9_) {
+#line 2750 "FlickrPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp12_ = NULL;
+		const gchar* _tmp13_ = NULL;
+		GError* _tmp14_ = NULL;
+		GError* _tmp15_ = NULL;
+#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"
+		_tmp13_ = response;
+#line 409 "/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"
+		_tmp15_ = _tmp14_;
+#line 409 "/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"
+		_g_error_free0 (_tmp15_);
+#line 2767 "FlickrPublishingAuthenticator.c"
+	}
+#line 413 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp16_ = oauth_token;
+#line 413 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp17_ = oauth_token_secret;
+#line 413 "/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"
+	_g_hash_table_unref0 (data);
+#line 398 "/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"
+	_g_free0 (oauth_token);
+#line 2781 "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_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+#line 416 "/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"
+	g_return_if_fail (token != NULL);
+#line 416 "/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"
+	_tmp0_ = token;
+#line 417 "/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" \
+"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"
+	_tmp3_ = token;
+#line 420 "/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"
+	_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 2816 "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 2827 "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 2834 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_on_pin_entry_proceed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingAuthenticatorShotwellFlickrPinEntryPane* sender, const gchar* pin) {
+	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	const gchar* _tmp2_ = NULL;
+#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 2860 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_do_launch_system_browser (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* token) {
+	gchar* login_uri = NULL;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 439 "/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"
+	g_return_if_fail (token != NULL);
+#line 440 "/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 2895 "FlickrPublishingAuthenticator.c"
+	{
+		const gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+#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 2914 "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 2925 "FlickrPublishingAuthenticator.c"
+		}
+	}
+	goto __finally2;
+	__catch2_g_spawn_error:
+	{
+		GError* e = NULL;
+		SpitPublishingPluginHost* _tmp9_ = NULL;
+		GError* _tmp10_ = NULL;
+		GError* _tmp11_ = NULL;
+#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 2955 "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 2968 "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 2974 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_do_show_pin_entry_pane (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+	GtkBuilder* builder = NULL;
+	GtkBuilder* _tmp0_ = NULL;
+	PublishingAuthenticatorShotwellFlickrPinEntryPane* pin_entry_pane = NULL;
+	GtkBuilder* _tmp8_ = NULL;
+	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp9_ = NULL;
+	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp10_ = NULL;
+	SpitPublishingPluginHost* _tmp11_ = NULL;
+	PublishingAuthenticatorShotwellFlickrPinEntryPane* _tmp12_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 456 "/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 2996 "FlickrPublishingAuthenticator.c"
+	{
+		GtkBuilder* _tmp1_ = NULL;
+#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 3005 "FlickrPublishingAuthenticator.c"
+			goto __catch3_g_error;
+		}
+	}
+	goto __finally3;
+	__catch3_g_error:
+	{
+		GError* e = NULL;
+		GError* _tmp2_ = NULL;
+		const gchar* _tmp3_ = NULL;
+		SpitPublishingPluginHost* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
+		GError* _tmp7_ = NULL;
+#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_ = _ ("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_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
+#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp7_ = _tmp6_;
+#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
+#line 466 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_g_error_free0 (_tmp7_);
+#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 3047 "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 3060 "FlickrPublishingAuthenticator.c"
+	}
+#line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp8_ = builder;
+#line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp9_ = publishing_authenticator_shotwell_flickr_pin_entry_pane_new (_tmp8_);
+#line 472 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	pin_entry_pane = _tmp9_;
+#line 473 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp10_ = pin_entry_pane;
+#line 473 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	g_signal_connect_object (_tmp10_, "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"
+	_tmp11_ = self->priv->host;
+#line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp12_ = pin_entry_pane;
+#line 474 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 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 3082 "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"
+	publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender);
+#line 3089 "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"
+	publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error ((PublishingAuthenticatorShotwellFlickrFlickr*) self, _sender, err);
+#line 3096 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_do_verify_pin (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* pin) {
+	const gchar* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp1_ = NULL;
+	SpitPublishingPluginHost* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* txn = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	PublishingAuthenticatorShotwellFlickrAccessTokenFetchTransaction* _tmp6_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 477 "/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"
+	g_return_if_fail (pin != NULL);
+#line 478 "/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" \
+"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"
+	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"
+	_tmp3_ = _ ("Verifying authorization…");
+#line 481 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _tmp3_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp4_ = self->priv->session;
+#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp5_ = pin;
+#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp6_ = publishing_authenticator_shotwell_flickr_access_token_fetch_transaction_new (_tmp4_, _tmp5_);
+#line 483 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	txn = _tmp6_;
+#line 484 "/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"
+	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 3140 "FlickrPublishingAuthenticator.c"
+	{
+#line 488 "/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"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 3148 "FlickrPublishingAuthenticator.c"
+				goto __catch4_spit_publishing_publishing_error;
+			}
+#line 488 "/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"
+			g_critical ("file %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"
+			g_clear_error (&_inner_error_);
+#line 488 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+			return;
+#line 3159 "FlickrPublishingAuthenticator.c"
+		}
+	}
+	goto __finally4;
+	__catch4_spit_publishing_publishing_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp7_ = NULL;
+		GError* _tmp8_ = NULL;
+#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		err = _inner_error_;
+#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_inner_error_ = NULL;
+#line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp7_ = self->priv->host;
+#line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp8_ = err;
+#line 490 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
+#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_g_error_free0 (err);
+#line 3180 "FlickrPublishingAuthenticator.c"
+	}
+	__finally4:
+#line 487 "/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"
+		_publishing_rest_support_transaction_unref0 (txn);
+#line 487 "/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"
+		g_clear_error (&_inner_error_);
+#line 487 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		return;
+#line 3193 "FlickrPublishingAuthenticator.c"
+	}
+#line 477 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_publishing_rest_support_transaction_unref0 (txn);
+#line 3197 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_txn_completed (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn) {
+	PublishingRESTSupportTransaction* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	PublishingRESTSupportTransaction* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+#line 494 "/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"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 495 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = txn;
+#line 495 "/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"
+	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"
+	_tmp2_ = txn;
+#line 496 "/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"
+	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" \
+"oken over the network succeeded");
+#line 500 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp4_ = txn;
+#line 500 "/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"
+	_tmp6_ = _tmp5_;
+#line 500 "/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"
+	_g_free0 (_tmp6_);
+#line 3237 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_on_access_token_fetch_error (PublishingAuthenticatorShotwellFlickrFlickr* self, PublishingRESTSupportTransaction* txn, GError* err) {
+	PublishingRESTSupportTransaction* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	PublishingRESTSupportTransaction* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+	SpitPublishingPluginHost* _tmp4_ = NULL;
+	GError* _tmp5_ = NULL;
+#line 503 "/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"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 505 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp0_ = txn;
+#line 505 "/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"
+	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"
+	_tmp2_ = txn;
+#line 506 "/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"
+	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" \
+"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"
+	_tmp5_ = err;
+#line 510 "/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"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authentication-failed");
+#line 3274 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_do_extract_access_phase_credentials_from_reponse (PublishingAuthenticatorShotwellFlickrFlickr* self, const gchar* response) {
+	const gchar* _tmp0_ = NULL;
+	gchar* token = NULL;
+	gchar* token_secret = NULL;
+	gchar* username = NULL;
+	GHashTable* data = NULL;
+	const gchar* _tmp1_ = NULL;
+	GHashTable* _tmp2_ = NULL;
+	GHashTable* _tmp3_ = NULL;
+	gconstpointer _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	GHashTable* _tmp6_ = NULL;
+	gconstpointer _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+	GHashTable* _tmp9_ = NULL;
+	gconstpointer _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+	const gchar* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	const gchar* _tmp14_ = NULL;
+	gboolean _tmp15_ = FALSE;
+	gboolean _tmp16_ = FALSE;
+	const gchar* _tmp17_ = NULL;
+#line 514 "/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"
+	g_return_if_fail (response != NULL);
+#line 515 "/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" \
+"e credentials from '%s'", _tmp0_);
+#line 517 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	token = NULL;
+#line 518 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	token_secret = NULL;
+#line 519 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	username = NULL;
+#line 521 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp1_ = response;
+#line 521 "/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"
+	data = _tmp2_;
+#line 522 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp3_ = data;
+#line 522 "/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"
+	_g_free0 (token);
+#line 522 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp5_ = g_strdup (_tmp4_);
+#line 522 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	token = _tmp5_;
+#line 523 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp6_ = data;
+#line 523 "/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"
+	_g_free0 (token_secret);
+#line 523 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp8_ = g_strdup (_tmp7_);
+#line 523 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	token_secret = _tmp8_;
+#line 524 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp9_ = data;
+#line 524 "/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"
+	_g_free0 (username);
+#line 524 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp11_ = g_strdup (_tmp10_);
+#line 524 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	username = _tmp11_;
+#line 526 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp12_ = token;
+#line 526 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp13_ = token_secret;
+#line 526 "/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" \
+"ken = '%s'; token_secret = '%s'; username = '%s' }", _tmp12_, _tmp13_, _tmp14_);
+#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_tmp17_ = token;
+#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	if (_tmp17_ == NULL) {
+#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp16_ = TRUE;
+#line 3365 "FlickrPublishingAuthenticator.c"
+	} else {
+		const gchar* _tmp18_ = NULL;
+#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp18_ = token_secret;
+#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp16_ = _tmp18_ == NULL;
+#line 3372 "FlickrPublishingAuthenticator.c"
+	}
+#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	if (_tmp16_) {
+#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp15_ = TRUE;
+#line 3378 "FlickrPublishingAuthenticator.c"
+	} else {
+		const gchar* _tmp19_ = NULL;
+#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp19_ = username;
+#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp15_ = _tmp19_ == NULL;
+#line 3385 "FlickrPublishingAuthenticator.c"
+	}
+#line 529 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	if (_tmp15_) {
+#line 3389 "FlickrPublishingAuthenticator.c"
+		SpitPublishingPluginHost* _tmp20_ = NULL;
+		GError* _tmp21_ = NULL;
+		GError* _tmp22_ = NULL;
+#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"
+		_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"
+		_tmp22_ = _tmp21_;
+#line 530 "/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"
+		_g_error_free0 (_tmp22_);
+#line 533 "/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 3405 "FlickrPublishingAuthenticator.c"
+	} else {
+		PublishingAuthenticatorShotwellFlickrSession* _tmp23_ = NULL;
+		const gchar* _tmp24_ = NULL;
+		const gchar* _tmp25_ = NULL;
+		const gchar* _tmp26_ = NULL;
+#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"
+		_tmp24_ = token;
+#line 535 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+		_tmp25_ = token_secret;
+#line 535 "/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 3421 "FlickrPublishingAuthenticator.c"
+	}
+#line 514 "/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"
+	_g_free0 (username);
+#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_free0 (token_secret);
+#line 514 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala"
+	_g_free0 (token);
+#line 3431 "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 3438 "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 3445 "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 3452 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_on_session_authenticated (PublishingAuthenticatorShotwellFlickrFlickr* self) {
+	GHashTable* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+	GHashTable* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+	GVariant* _tmp11_ = NULL;
+	GHashTable* _tmp12_ = NULL;
+	gchar* _tmp13_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp14_ = NULL;
+	gchar* _tmp15_ = NULL;
+	gchar* _tmp16_ = NULL;
+	GVariant* _tmp17_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp18_ = NULL;
+	gchar* _tmp19_ = NULL;
+	gchar* _tmp20_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp21_ = NULL;
+	gchar* _tmp22_ = NULL;
+	gchar* _tmp23_ = NULL;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp24_ = NULL;
+	gchar* _tmp25_ = NULL;
+	gchar* _tmp26_ = NULL;
+#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 3566 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_class_init (PublishingAuthenticatorShotwellFlickrFlickrClass * klass) {
+#line 260 "/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 3577 "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 3594 "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 3601 "FlickrPublishingAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_flickr_flickr_finalize (GObject* obj) {
+	PublishingAuthenticatorShotwellFlickrFlickr * self;
+	PublishingAuthenticatorShotwellFlickrSession* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+#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 3625 "FlickrPublishingAuthenticator.c"
+}
+
+
+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);
+		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
new file mode 100644
index 0000000..e389908
--- /dev/null
+++ b/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
@@ -0,0 +1,552 @@
+/* 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 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) {
+            base.with_uri(session, "https://www.flickr.com/services/oauth/request_token",
+                    Publishing.RESTSupport.HttpMethod.GET);
+        }
+    }
+
+    internal class AccessTokenFetchTransaction : Transaction {
+        public AccessTokenFetchTransaction(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());
+        }
+    }
+
+    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;
+
+            pane_widget.show_all();
+
+            on_pin_entry_contents_changed();
+        }
+
+        private void on_continue_clicked() {
+            proceed(this, pin_entry.get_text());
+        }
+
+        private void on_pin_entry_contents_changed() {
+            continue_button.set_sensitive(pin_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() {
+            continue_button.clicked.connect(on_continue_clicked);
+            pin_entry.changed.connect(on_pin_entry_contents_changed);
+        }
+
+        public void on_pane_uninstalled() {
+            continue_button.clicked.disconnect(on_continue_clicked);
+            pin_entry.changed.disconnect(on_pin_entry_contents_changed);
+        }
+    }
+
+
+    internal class Flickr : GLib.Object, Spit.Publishing.Authenticator {
+        private GLib.HashTable<string, Variant> params;
+        private Session session;
+        private Spit.Publishing.PluginHost host;
+
+        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);
+        }
+
+        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() {
+            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(), get_persistent_access_phase_username());
+            } else {
+                debug("attempt start: no persistent session available; showing login welcome pane");
+                do_show_login_welcome_pane();
+            }
+        }
+
+        public bool can_logout() {
+            return true;
+        }
+
+        public GLib.HashTable<string, Variant> get_authentication_parameter() {
+            return this.params;
+        }
+
+        public void logout () {
+            session.deauthenticate();
+            invalidate_persistent_session();
+        }
+
+        public void refresh() {
+            // No-Op with flickr
+        }
+
+        private void do_show_login_welcome_pane() {
+            debug("ACTION: installing login welcome pane");
+
+            host.set_service_locked(false);
+            host.install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_welcome_pane_login_clicked);
+        }
+
+        private void on_welcome_pane_login_clicked() {
+            debug("EVENT: user clicked 'Login' button in the welcome pane");
+
+            do_run_authentication_request_transaction();
+        }
+
+        private void do_run_authentication_request_transaction() {
+            debug("ACTION: running authentication request transaction");
+
+            host.set_service_locked(true);
+            host.install_static_message_pane(_("Preparing for login…"));
+
+            AuthenticationRequestTransaction txn = new AuthenticationRequestTransaction(session);
+            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);
+
+            this.authentication_failed();
+        }
+
+        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;
+
+            var data = Soup.Form.decode(response);
+            data.lookup_extended("oauth_token", null, out oauth_token);
+            data.lookup_extended("oauth_token_secret", null, out oauth_token_secret);
+
+            if (oauth_token == null || oauth_token_secret == null)
+                host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
+                            "'%s' isn't a valid response to an OAuth authentication request", response));
+
+
+            on_authentication_token_available(oauth_token, oauth_token_secret);
+        }
+
+        private void on_authentication_token_available(string token, string token_secret) {
+            debug("EVENT: OAuth authentication token (%s) and token secret (%s) available",
+                    token, token_secret);
+
+            session.set_request_phase_credentials(token, token_secret);
+
+            do_launch_system_browser(token);
+        }
+
+        private void on_system_browser_launched() {
+            debug("EVENT: system browser launched.");
+
+            do_show_pin_entry_pane();
+        }
+
+        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 do_verify_pin(string pin) {
+            debug("ACTION: validating authorization PIN %s", pin);
+
+            host.set_service_locked(true);
+            host.install_static_message_pane(_("Verifying authorization…"));
+
+            AccessTokenFetchTransaction txn = new AccessTokenFetchTransaction(session, pin);
+            txn.completed.connect(on_access_token_fetch_txn_completed);
+            txn.network_error.connect(on_access_token_fetch_error);
+
+            try {
+                txn.execute();
+            } catch (Spit.Publishing.PublishingError err) {
+                host.post_error(err);
+            }
+        }
+
+        private void on_access_token_fetch_txn_completed(Publishing.RESTSupport.Transaction txn) {
+            txn.completed.disconnect(on_access_token_fetch_txn_completed);
+            txn.network_error.disconnect(on_access_token_fetch_error);
+
+            debug("EVENT: fetching OAuth access token over the network succeeded");
+
+            do_extract_access_phase_credentials_from_reponse(txn.get_response());
+        }
+
+        private void on_access_token_fetch_error(Publishing.RESTSupport.Transaction txn,
+                Spit.Publishing.PublishingError err) {
+            txn.completed.disconnect(on_access_token_fetch_txn_completed);
+            txn.network_error.disconnect(on_access_token_fetch_error);
+
+            debug("EVENT: fetching OAuth access token over the network caused an error.");
+
+            host.post_error(err);
+            this.authentication_failed();
+        }
+
+        private void do_extract_access_phase_credentials_from_reponse(string response) {
+            debug("ACTION: extracting access phase credentials from '%s'", response);
+
+            string? token = null;
+            string? token_secret = null;
+            string? username = 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);
+            data.lookup_extended("username", null, out username);
+
+            debug("access phase credentials: { token = '%s'; token_secret = '%s'; username = '%s' }",
+                    token, token_secret, username);
+
+            if (token == null || token_secret == null || username == null) {
+                host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("expected " +
+                            "access phase credentials to contain token, token secret, and username but at " +
+                            "least one of these is absent"));
+                this.authentication_failed();
+            } else {
+                session.set_access_phase_credentials(token, token_secret, username);
+            }
+        }
+
+        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
new file mode 100644
index 0000000..938d8c4
--- /dev/null
+++ b/plugins/authenticator/shotwell/GoogleAuthenticator.c
@@ -0,0 +1,2690 @@
+/* GoogleAuthenticator.c generated by valac 0.34.4, the Vala compiler
+ * generated from GoogleAuthenticator.vala, do not modify */
+
+
+#include <glib.h>
+#include <glib-object.h>
+#include <stdlib.h>
+#include <string.h>
+#include "shotwell-plugin-common.h"
+#include <webkit2/webkit2.h>
+#include "shotwell-plugin-dev-1.0.h"
+#include <glib/gi18n-lib.h>
+#include <libsoup/soup.h>
+#include <json-glib/json-glib.h>
+
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE (publishing_authenticator_shotwell_google_web_authentication_pane_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPane))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass))
+
+typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPane PublishingAuthenticatorShotwellGoogleWebAuthenticationPane;
+typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass;
+typedef struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+#define _g_free0(var) (var = (g_free (var), NULL))
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION (publishing_authenticator_shotwell_google_session_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSession))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSessionClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_SESSION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSessionClass))
+
+typedef struct _PublishingAuthenticatorShotwellGoogleSession PublishingAuthenticatorShotwellGoogleSession;
+typedef struct _PublishingAuthenticatorShotwellGoogleSessionClass PublishingAuthenticatorShotwellGoogleSessionClass;
+typedef struct _PublishingAuthenticatorShotwellGoogleSessionPrivate PublishingAuthenticatorShotwellGoogleSessionPrivate;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GET_ACCESS_TOKENS_TRANSACTION (publishing_authenticator_shotwell_google_get_access_tokens_transaction_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GET_ACCESS_TOKENS_TRANSACTION, PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GET_ACCESS_TOKENS_TRANSACTION, PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GET_ACCESS_TOKENS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GET_ACCESS_TOKENS_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GET_ACCESS_TOKENS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GET_ACCESS_TOKENS_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GET_ACCESS_TOKENS_TRANSACTION, PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass))
+
+typedef struct _PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction;
+typedef struct _PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass;
+typedef struct _PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionPrivate PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionPrivate;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION (publishing_authenticator_shotwell_google_refresh_access_token_transaction_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_REFRESH_ACCESS_TOKEN_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_REFRESH_ACCESS_TOKEN_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass))
+
+typedef struct _PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction;
+typedef struct _PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass;
+typedef struct _PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionPrivate PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionPrivate;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_USERNAME_FETCH_TRANSACTION (publishing_authenticator_shotwell_google_username_fetch_transaction_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_USERNAME_FETCH_TRANSACTION, PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_USERNAME_FETCH_TRANSACTION, PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_USERNAME_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_USERNAME_FETCH_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_USERNAME_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_USERNAME_FETCH_TRANSACTION))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_USERNAME_FETCH_TRANSACTION, PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass))
+
+typedef struct _PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction;
+typedef struct _PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass;
+typedef struct _PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionPrivate PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionPrivate;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE (publishing_authenticator_shotwell_google_google_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogleClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogleClass))
+
+typedef struct _PublishingAuthenticatorShotwellGoogleGoogle PublishingAuthenticatorShotwellGoogleGoogle;
+typedef struct _PublishingAuthenticatorShotwellGoogleGoogleClass PublishingAuthenticatorShotwellGoogleGoogleClass;
+typedef struct _PublishingAuthenticatorShotwellGoogleGooglePrivate PublishingAuthenticatorShotwellGoogleGooglePrivate;
+#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 _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 _json_object_unref0(var) ((var == NULL) ? NULL : (var = (json_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 _PublishingAuthenticatorShotwellGoogleWebAuthenticationPane {
+	ShotwellPluginsCommonWebAuthenticationPane parent_instance;
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPanePrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass {
+	ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleSession {
+	PublishingRESTSupportSession parent_instance;
+	PublishingAuthenticatorShotwellGoogleSessionPrivate * priv;
+	gchar* access_token;
+	gchar* refresh_token;
+	gint64 expires_at;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleSessionClass {
+	PublishingRESTSupportSessionClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction {
+	PublishingRESTSupportTransaction parent_instance;
+	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionPrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass {
+	PublishingRESTSupportTransactionClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction {
+	PublishingRESTSupportTransaction parent_instance;
+	PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionPrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass {
+	PublishingRESTSupportTransactionClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction {
+	PublishingRESTSupportTransaction parent_instance;
+	PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionPrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass {
+	PublishingRESTSupportTransactionClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleGoogle {
+	GObject parent_instance;
+	PublishingAuthenticatorShotwellGoogleGooglePrivate * priv;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleGoogleClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingAuthenticatorShotwellGoogleGooglePrivate {
+	gchar* scope;
+	SpitPublishingPluginHost* host;
+	GHashTable* params;
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* web_auth_pane;
+	PublishingAuthenticatorShotwellGoogleSession* session;
+	gchar* welcome_message;
+};
+
+
+static gpointer publishing_authenticator_shotwell_google_web_authentication_pane_parent_class = NULL;
+extern gboolean publishing_authenticator_shotwell_google_web_authentication_pane_cache_dirty;
+gboolean publishing_authenticator_shotwell_google_web_authentication_pane_cache_dirty = FALSE;
+static gpointer publishing_authenticator_shotwell_google_session_parent_class = NULL;
+static gpointer publishing_authenticator_shotwell_google_get_access_tokens_transaction_parent_class = NULL;
+static gpointer publishing_authenticator_shotwell_google_refresh_access_token_transaction_parent_class = NULL;
+static gpointer publishing_authenticator_shotwell_google_username_fetch_transaction_parent_class = NULL;
+static gpointer publishing_authenticator_shotwell_google_google_parent_class = NULL;
+static SpitPublishingAuthenticatorIface* publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_parent_iface = NULL;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_ID "534227538559-hvj2e8bj0vfv2f49r7gvjoq6jibfav67.apps.googleusercontent.c" \
+"om"
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_SECRET "pwpzZ7W1TCcD5uIfYCu8sM7x"
+GType publishing_authenticator_shotwell_google_web_authentication_pane_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
+};
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_new (const gchar* auth_sequence_start_url);
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url);
+gboolean publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void);
+static void publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
+static void publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject* obj);
+GType publishing_authenticator_shotwell_google_session_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_SESSION_DUMMY_PROPERTY
+};
+static gboolean publishing_authenticator_shotwell_google_session_real_is_authenticated (PublishingRESTSupportSession* base);
+void publishing_authenticator_shotwell_google_session_deauthenticate (PublishingAuthenticatorShotwellGoogleSession* self);
+PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_new (void);
+PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_construct (GType object_type);
+static void publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession* obj);
+GType publishing_authenticator_shotwell_google_get_access_tokens_transaction_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_DUMMY_PROPERTY
+};
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL "https://accounts.google.com/o/oauth2/token"
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code);
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code);
+GType publishing_authenticator_shotwell_google_refresh_access_token_transaction_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_DUMMY_PROPERTY
+};
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL "https://accounts.google.com/o/oauth2/token"
+PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session);
+PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session);
+GType publishing_authenticator_shotwell_google_username_fetch_transaction_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_DUMMY_PROPERTY
+};
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL "https://www.googleapis.com/oauth2/v1/userinfo"
+PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session);
+PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session);
+GType publishing_authenticator_shotwell_google_google_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGooglePrivate))
+enum  {
+	PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_DUMMY_PROPERTY
+};
+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);
+static void _g_free0_ (gpointer var);
+static void _g_variant_unref0_ (gpointer var);
+static void publishing_authenticator_shotwell_google_google_real_authenticate (SpitPublishingAuthenticator* base);
+static void publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token);
+static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_access_token (PublishingAuthenticatorShotwellGoogleGoogle* self);
+static void publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (PublishingAuthenticatorShotwellGoogleGoogle* self);
+static gboolean publishing_authenticator_shotwell_google_google_real_can_logout (SpitPublishingAuthenticator* base);
+static GHashTable* publishing_authenticator_shotwell_google_google_real_get_authentication_parameter (SpitPublishingAuthenticator* base);
+static void publishing_authenticator_shotwell_google_google_real_logout (SpitPublishingAuthenticator* base);
+static void publishing_authenticator_shotwell_google_google_real_refresh (SpitPublishingAuthenticator* base);
+static void publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (PublishingAuthenticatorShotwellGoogleGoogle* self);
+static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code);
+static void _publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self);
+static void publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code);
+static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err);
+static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
+static void publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body);
+static void publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self, gint64 abs_time);
+static void publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token);
+static void publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAuthenticatorShotwellGoogleGoogle* self);
+static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err);
+static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
+static void publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body);
+static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn);
+static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err);
+static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
+static gboolean ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self);
+static gboolean ____lambda4__gsource_func (gpointer self);
+static void publishing_authenticator_shotwell_google_google_on_service_welcome_login (PublishingAuthenticatorShotwellGoogleGoogle* self);
+static void _publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback (gpointer self);
+static void publishing_authenticator_shotwell_google_google_finalize (GObject* obj);
+
+
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url) {
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self = NULL;
+	const gchar* _tmp0_ = NULL;
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_val_if_fail (auth_sequence_start_url != NULL, NULL);
+#line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = auth_sequence_start_url;
+#line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp0_, NULL);
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return self;
+#line 269 "GoogleAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* publishing_authenticator_shotwell_google_web_authentication_pane_new (const gchar* auth_sequence_start_url) {
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return publishing_authenticator_shotwell_google_web_authentication_pane_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, auth_sequence_start_url);
+#line 276 "GoogleAuthenticator.c"
+}
+
+
+gboolean publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty (void) {
+	gboolean result = FALSE;
+	gboolean _tmp0_ = FALSE;
+#line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = publishing_authenticator_shotwell_google_web_authentication_pane_cache_dirty;
+#line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	result = _tmp0_;
+#line 18 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return result;
+#line 289 "GoogleAuthenticator.c"
+}
+
+
+static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
+	gint result = 0;
+	gchar* _result_ = NULL;
+	gint _tmp0_ = 0;
+	const gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, 0);
+#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (needle != NULL, 0);
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = start_index;
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = needle;
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
+#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_result_ = _tmp2_;
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp3_ = _result_;
+#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp3_ != NULL) {
+#line 316 "GoogleAuthenticator.c"
+		gchar* _tmp4_ = NULL;
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = _result_;
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = (gint) (_tmp4_ - ((gchar*) self));
+#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 324 "GoogleAuthenticator.c"
+	} else {
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = -1;
+#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 330 "GoogleAuthenticator.c"
+	}
+}
+
+
+static glong string_strnlen (gchar* str, glong maxlen) {
+	glong result = 0L;
+	gchar* end = NULL;
+	gchar* _tmp0_ = NULL;
+	glong _tmp1_ = 0L;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = str;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = maxlen;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	end = _tmp2_;
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp3_ = end;
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp3_ == NULL) {
+#line 354 "GoogleAuthenticator.c"
+		glong _tmp4_ = 0L;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = maxlen;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = _tmp4_;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 362 "GoogleAuthenticator.c"
+	} else {
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp5_ = end;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp6_ = str;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp5_ - _tmp6_);
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 374 "GoogleAuthenticator.c"
+	}
+}
+
+
+static gchar* string_substring (const gchar* self, glong offset, glong len) {
+	gchar* result = NULL;
+	glong string_length = 0L;
+	gboolean _tmp0_ = FALSE;
+	glong _tmp1_ = 0L;
+	glong _tmp8_ = 0L;
+	glong _tmp14_ = 0L;
+	glong _tmp17_ = 0L;
+	glong _tmp18_ = 0L;
+	glong _tmp19_ = 0L;
+	glong _tmp20_ = 0L;
+	glong _tmp21_ = 0L;
+	gchar* _tmp22_ = NULL;
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = offset;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp1_ >= ((glong) 0)) {
+#line 398 "GoogleAuthenticator.c"
+		glong _tmp2_ = 0L;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp2_ = len;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp2_ >= ((glong) 0);
+#line 404 "GoogleAuthenticator.c"
+	} else {
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 408 "GoogleAuthenticator.c"
+	}
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 412 "GoogleAuthenticator.c"
+		glong _tmp3_ = 0L;
+		glong _tmp4_ = 0L;
+		glong _tmp5_ = 0L;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp3_ = offset;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = len;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		string_length = _tmp5_;
+#line 424 "GoogleAuthenticator.c"
+	} else {
+		gint _tmp6_ = 0;
+		gint _tmp7_ = 0;
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp6_ = strlen (self);
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp6_;
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp7_;
+#line 434 "GoogleAuthenticator.c"
+	}
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp8_ = offset;
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp8_ < ((glong) 0)) {
+#line 440 "GoogleAuthenticator.c"
+		glong _tmp9_ = 0L;
+		glong _tmp10_ = 0L;
+		glong _tmp11_ = 0L;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp9_ = string_length;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp10_ = offset;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		offset = _tmp9_ + _tmp10_;
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp11_ = offset;
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+#line 454 "GoogleAuthenticator.c"
+	} else {
+		glong _tmp12_ = 0L;
+		glong _tmp13_ = 0L;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp12_ = offset;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp13_ = string_length;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
+#line 464 "GoogleAuthenticator.c"
+	}
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp14_ = len;
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp14_ < ((glong) 0)) {
+#line 470 "GoogleAuthenticator.c"
+		glong _tmp15_ = 0L;
+		glong _tmp16_ = 0L;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp16_ = offset;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		len = _tmp15_ - _tmp16_;
+#line 479 "GoogleAuthenticator.c"
+	}
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp17_ = offset;
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp18_ = len;
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp19_ = string_length;
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp20_ = offset;
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp21_ = len;
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	result = _tmp22_;
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	return result;
+#line 499 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self;
+	gchar* page_title = NULL;
+	WebKitWebView* _tmp0_ = NULL;
+	WebKitWebView* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	gint _tmp6_ = 0;
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPane);
+#line 22 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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 22 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = _tmp0_;
+#line 22 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = webkit_web_view_get_title (_tmp1_);
+#line 22 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 22 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = _tmp3_;
+#line 22 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_object_unref0 (_tmp1_);
+#line 22 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	page_title = _tmp4_;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = page_title;
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = string_index_of (_tmp5_, "state=connect", 0);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp6_ > 0) {
+#line 535 "GoogleAuthenticator.c"
+		gint auth_code_field_start = 0;
+		const gchar* _tmp7_ = NULL;
+		gint _tmp8_ = 0;
+		gint _tmp9_ = 0;
+		gchar* auth_code = NULL;
+		const gchar* _tmp10_ = NULL;
+		gint _tmp11_ = 0;
+		gchar* _tmp12_ = NULL;
+		const gchar* _tmp13_ = NULL;
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp7_ = page_title;
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp8_ = string_index_of (_tmp7_, "code=", 0);
+#line 24 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		auth_code_field_start = _tmp8_;
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp9_ = auth_code_field_start;
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		if (_tmp9_ < 0) {
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_g_free0 (page_title);
+#line 26 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			return;
+#line 559 "GoogleAuthenticator.c"
+		}
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp10_ = page_title;
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp11_ = auth_code_field_start;
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp12_ = string_substring (_tmp10_, (glong) (_tmp11_ + 5), (glong) -1);
+#line 28 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		auth_code = _tmp12_;
+#line 30 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		publishing_authenticator_shotwell_google_web_authentication_pane_cache_dirty = TRUE;
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp13_ = auth_code;
+#line 32 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_signal_emit_by_name (self, "authorized", _tmp13_);
+#line 23 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_free0 (auth_code);
+#line 577 "GoogleAuthenticator.c"
+	}
+#line 21 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (page_title);
+#line 581 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_web_authentication_pane_class_init (PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass * klass) {
+#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
+#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_authenticator_shotwell_google_web_authentication_pane_real_on_page_load;
+#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_web_authentication_pane_finalize;
+#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_new ("authorized", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
+#line 594 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_web_authentication_pane_instance_init (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self) {
+}
+
+
+static void publishing_authenticator_shotwell_google_web_authentication_pane_finalize (GObject* obj) {
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane * self;
+#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, PublishingAuthenticatorShotwellGoogleWebAuthenticationPane);
+#line 8 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	G_OBJECT_CLASS (publishing_authenticator_shotwell_google_web_authentication_pane_parent_class)->finalize (obj);
+#line 608 "GoogleAuthenticator.c"
+}
+
+
+GType publishing_authenticator_shotwell_google_web_authentication_pane_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_google_web_authentication_pane_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_google_web_authentication_pane_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_web_authentication_pane_instance_init, NULL };
+		GType publishing_authenticator_shotwell_google_web_authentication_pane_type_id;
+		publishing_authenticator_shotwell_google_web_authentication_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, "PublishingAuthenticatorShotwellGoogleWebAuthenticationPane", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_authenticator_shotwell_google_web_authentication_pane_type_id__volatile, publishing_authenticator_shotwell_google_web_authentication_pane_type_id);
+	}
+	return publishing_authenticator_shotwell_google_web_authentication_pane_type_id__volatile;
+}
+
+
+static gboolean publishing_authenticator_shotwell_google_session_real_is_authenticated (PublishingRESTSupportSession* base) {
+	PublishingAuthenticatorShotwellGoogleSession * self;
+	gboolean result = FALSE;
+	const gchar* _tmp0_ = NULL;
+#line 42 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSession);
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = self->access_token;
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	result = _tmp0_ != NULL;
+#line 43 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return result;
+#line 636 "GoogleAuthenticator.c"
+}
+
+
+void publishing_authenticator_shotwell_google_session_deauthenticate (PublishingAuthenticatorShotwellGoogleSession* self) {
+#line 46 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (self));
+#line 47 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (self->access_token);
+#line 47 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->access_token = NULL;
+#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (self->refresh_token);
+#line 48 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->refresh_token = NULL;
+#line 49 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->expires_at = (gint64) -1;
+#line 653 "GoogleAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_construct (GType object_type) {
+	PublishingAuthenticatorShotwellGoogleSession* self = NULL;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return self;
+#line 663 "GoogleAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellGoogleSession* publishing_authenticator_shotwell_google_session_new (void) {
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return publishing_authenticator_shotwell_google_session_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION);
+#line 670 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_session_class_init (PublishingAuthenticatorShotwellGoogleSessionClass * klass) {
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_session_parent_class = g_type_class_peek_parent (klass);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_authenticator_shotwell_google_session_finalize;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_authenticator_shotwell_google_session_real_is_authenticated;
+#line 681 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_session_instance_init (PublishingAuthenticatorShotwellGoogleSession * self) {
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->access_token = NULL;
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->refresh_token = NULL;
+#line 40 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->expires_at = (gint64) -1;
+#line 692 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_session_finalize (PublishingRESTSupportSession* obj) {
+	PublishingAuthenticatorShotwellGoogleSession * self;
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_SESSION, PublishingAuthenticatorShotwellGoogleSession);
+#line 38 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (self->access_token);
+#line 39 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (self->refresh_token);
+#line 37 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_authenticator_shotwell_google_session_parent_class)->finalize (obj);
+#line 706 "GoogleAuthenticator.c"
+}
+
+
+GType publishing_authenticator_shotwell_google_session_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_google_session_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_google_session_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleSessionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_session_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleSession), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_session_instance_init, NULL };
+		GType publishing_authenticator_shotwell_google_session_type_id;
+		publishing_authenticator_shotwell_google_session_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_SESSION, "PublishingAuthenticatorShotwellGoogleSession", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_authenticator_shotwell_google_session_type_id__volatile, publishing_authenticator_shotwell_google_session_type_id);
+	}
+	return publishing_authenticator_shotwell_google_session_type_id__volatile;
+}
+
+
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code) {
+	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* self = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_val_if_fail (auth_code != NULL, NULL);
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = session;
+#line 57 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = auth_code;
+#line 59 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "code", _tmp1_);
+#line 60 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_ID);
+#line 61 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_secret", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_SECRET);
+#line 62 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "redirect_uri", "urn:ietf:wg:oauth:2.0:oob");
+#line 63 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "authorization_code");
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return self;
+#line 748 "GoogleAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session, const gchar* auth_code) {
+#line 56 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return publishing_authenticator_shotwell_google_get_access_tokens_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GET_ACCESS_TOKENS_TRANSACTION, session, auth_code);
+#line 755 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_get_access_tokens_transaction_class_init (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass * klass) {
+#line 53 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_get_access_tokens_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 762 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_get_access_tokens_transaction_instance_init (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction * self) {
+}
+
+
+GType publishing_authenticator_shotwell_google_get_access_tokens_transaction_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_google_get_access_tokens_transaction_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_google_get_access_tokens_transaction_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_get_access_tokens_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_get_access_tokens_transaction_instance_init, NULL };
+		GType publishing_authenticator_shotwell_google_get_access_tokens_transaction_type_id;
+		publishing_authenticator_shotwell_google_get_access_tokens_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_authenticator_shotwell_google_get_access_tokens_transaction_type_id__volatile, publishing_authenticator_shotwell_google_get_access_tokens_transaction_type_id);
+	}
+	return publishing_authenticator_shotwell_google_get_access_tokens_transaction_type_id__volatile;
+}
+
+
+PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session) {
+	PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* self = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
+#line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = session;
+#line 71 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
+#line 73 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_ID);
+#line 74 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_secret", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_SECRET);
+#line 75 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = session;
+#line 75 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = _tmp1_->refresh_token;
+#line 75 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "refresh_token", _tmp2_);
+#line 76 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "refresh_token");
+#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return self;
+#line 807 "GoogleAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* publishing_authenticator_shotwell_google_refresh_access_token_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session) {
+#line 70 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return publishing_authenticator_shotwell_google_refresh_access_token_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, session);
+#line 814 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_refresh_access_token_transaction_class_init (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass * klass) {
+#line 67 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_refresh_access_token_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 821 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_refresh_access_token_transaction_instance_init (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction * self) {
+}
+
+
+GType publishing_authenticator_shotwell_google_refresh_access_token_transaction_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_google_refresh_access_token_transaction_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_google_refresh_access_token_transaction_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_refresh_access_token_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_refresh_access_token_transaction_instance_init, NULL };
+		GType publishing_authenticator_shotwell_google_refresh_access_token_transaction_type_id;
+		publishing_authenticator_shotwell_google_refresh_access_token_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_authenticator_shotwell_google_refresh_access_token_transaction_type_id__volatile, publishing_authenticator_shotwell_google_refresh_access_token_transaction_type_id);
+	}
+	return publishing_authenticator_shotwell_google_refresh_access_token_transaction_type_id__volatile;
+}
+
+
+PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_construct (GType object_type, PublishingAuthenticatorShotwellGoogleSession* session) {
+	PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* self = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_val_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_SESSION (session), NULL);
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = session;
+#line 83 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = session;
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = _tmp1_->access_token;
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = g_strconcat ("Bearer ", _tmp2_, NULL);
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = _tmp3_;
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_rest_support_transaction_add_header (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "Authorization", _tmp4_);
+#line 84 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp4_);
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return self;
+#line 868 "GoogleAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* publishing_authenticator_shotwell_google_username_fetch_transaction_new (PublishingAuthenticatorShotwellGoogleSession* session) {
+#line 82 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return publishing_authenticator_shotwell_google_username_fetch_transaction_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_USERNAME_FETCH_TRANSACTION, session);
+#line 875 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_username_fetch_transaction_class_init (PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass * klass) {
+#line 80 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_username_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
+#line 882 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_username_fetch_transaction_instance_init (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction * self) {
+}
+
+
+GType publishing_authenticator_shotwell_google_username_fetch_transaction_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_google_username_fetch_transaction_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_google_username_fetch_transaction_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleUsernameFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_username_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_username_fetch_transaction_instance_init, NULL };
+		GType publishing_authenticator_shotwell_google_username_fetch_transaction_type_id;
+		publishing_authenticator_shotwell_google_username_fetch_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction", &g_define_type_info, 0);
+		g_once_init_leave (&publishing_authenticator_shotwell_google_username_fetch_transaction_type_id__volatile, publishing_authenticator_shotwell_google_username_fetch_transaction_type_id);
+	}
+	return publishing_authenticator_shotwell_google_username_fetch_transaction_type_id__volatile;
+}
+
+
+static gpointer _g_object_ref0 (gpointer self) {
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return self ? g_object_ref (self) : NULL;
+#line 905 "GoogleAuthenticator.c"
+}
+
+
+static void _g_free0_ (gpointer var) {
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	var = (g_free (var), NULL);
+#line 912 "GoogleAuthenticator.c"
+}
+
+
+static void _g_variant_unref0_ (gpointer var) {
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	(var == NULL) ? NULL : (var = (g_variant_unref (var), NULL));
+#line 919 "GoogleAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_construct (GType object_type, const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host) {
+	PublishingAuthenticatorShotwellGoogleGoogle * self = NULL;
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp1_ = NULL;
+	GHashFunc _tmp2_ = NULL;
+	GEqualFunc _tmp3_ = NULL;
+	GHashTable* _tmp4_ = NULL;
+	const gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_val_if_fail (scope != NULL, NULL);
+#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_val_if_fail (welcome_message != NULL, NULL);
+#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
+#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = (PublishingAuthenticatorShotwellGoogleGoogle*) g_object_new (object_type, NULL);
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = host;
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = _g_object_ref0 (_tmp0_);
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_object_unref0 (self->priv->host);
+#line 99 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->host = _tmp1_;
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = g_str_hash;
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = g_str_equal;
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = g_hash_table_new_full (_tmp2_, _tmp3_, _g_free0_, _g_variant_unref0_);
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_hash_table_unref0 (self->priv->params);
+#line 100 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->params = _tmp4_;
+#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = scope;
+#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = g_strdup (_tmp5_);
+#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (self->priv->scope);
+#line 101 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->scope = _tmp6_;
+#line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp7_ = publishing_authenticator_shotwell_google_session_new ();
+#line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 102 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->session = _tmp7_;
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp8_ = welcome_message;
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp9_ = g_strdup (_tmp8_);
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (self->priv->welcome_message);
+#line 103 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->welcome_message = _tmp9_;
+#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return self;
+#line 985 "GoogleAuthenticator.c"
+}
+
+
+PublishingAuthenticatorShotwellGoogleGoogle* publishing_authenticator_shotwell_google_google_new (const gchar* scope, const gchar* welcome_message, SpitPublishingPluginHost* host) {
+#line 96 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return publishing_authenticator_shotwell_google_google_construct (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, scope, welcome_message, host);
+#line 992 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_real_authenticate (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellGoogleGoogle * self;
+	gchar* refresh_token = NULL;
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp3_ = NULL;
+	gboolean _tmp6_ = FALSE;
+#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = self->priv->host;
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", NULL);
+#line 107 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	refresh_token = _tmp1_;
+#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = refresh_token;
+#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp3_ != NULL) {
+#line 1016 "GoogleAuthenticator.c"
+		const gchar* _tmp4_ = NULL;
+#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp4_ = refresh_token;
+#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp2_ = g_strcmp0 (_tmp4_, "") != 0;
+#line 1022 "GoogleAuthenticator.c"
+	} else {
+#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp2_ = FALSE;
+#line 1026 "GoogleAuthenticator.c"
+	}
+#line 108 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp2_) {
+#line 1030 "GoogleAuthenticator.c"
+		const gchar* _tmp5_ = NULL;
+#line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp5_ = refresh_token;
+#line 109 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		publishing_authenticator_shotwell_google_google_on_refresh_token_available (self, _tmp5_);
+#line 110 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_access_token (self);
+#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_free0 (refresh_token);
+#line 111 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		return;
+#line 1042 "GoogleAuthenticator.c"
+	}
+#line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = publishing_authenticator_shotwell_google_web_authentication_pane_is_cache_dirty ();
+#line 115 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp6_) {
+#line 1048 "GoogleAuthenticator.c"
+		SpitPublishingPluginHost* _tmp7_ = NULL;
+		SpitPublishingPluginHost* _tmp8_ = NULL;
+		const gchar* _tmp9_ = NULL;
+#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp7_ = self->priv->host;
+#line 116 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		spit_publishing_plugin_host_set_service_locked (_tmp7_, FALSE);
+#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp8_ = self->priv->host;
+#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp9_ = _ ("You have already logged in and out of a Google service during this Sho" \
+"twell session.\n" \
+"\n" \
+"To continue publishing to Google services, quit and restart Shotwell, " \
+"then try publishing again.");
+#line 118 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		spit_publishing_plugin_host_install_static_message_pane (_tmp8_, _tmp9_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 1062 "GoogleAuthenticator.c"
+	} else {
+#line 120 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (self);
+#line 1066 "GoogleAuthenticator.c"
+	}
+#line 106 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (refresh_token);
+#line 1070 "GoogleAuthenticator.c"
+}
+
+
+static gboolean publishing_authenticator_shotwell_google_google_real_can_logout (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellGoogleGoogle * self;
+	gboolean result = FALSE;
+#line 124 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
+#line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	result = TRUE;
+#line 125 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return result;
+#line 1083 "GoogleAuthenticator.c"
+}
+
+
+static gpointer _g_hash_table_ref0 (gpointer self) {
+#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return self ? g_hash_table_ref (self) : NULL;
+#line 1090 "GoogleAuthenticator.c"
+}
+
+
+static GHashTable* publishing_authenticator_shotwell_google_google_real_get_authentication_parameter (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellGoogleGoogle * self;
+	GHashTable* result = NULL;
+	GHashTable* _tmp0_ = NULL;
+	GHashTable* _tmp1_ = NULL;
+#line 128 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
+#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = self->priv->params;
+#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = _g_hash_table_ref0 (_tmp0_);
+#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	result = _tmp1_;
+#line 129 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return result;
+#line 1109 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_real_logout (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellGoogleGoogle * self;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp1_ = NULL;
+#line 132 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
+#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = self->priv->session;
+#line 133 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_session_deauthenticate (_tmp0_);
+#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = self->priv->host;
+#line 134 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", "");
+#line 1127 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_real_refresh (SpitPublishingAuthenticator* base) {
+	PublishingAuthenticatorShotwellGoogleGoogle * self;
+#line 137 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
+#line 1135 "GoogleAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized (PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
+#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized ((PublishingAuthenticatorShotwellGoogleGoogle*) self, auth_code);
+#line 1142 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+	gchar* user_authorization_url = NULL;
+	gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+	gchar* _tmp12_ = NULL;
+	gchar* _tmp13_ = NULL;
+	gchar* _tmp14_ = NULL;
+	gchar* _tmp15_ = NULL;
+	gchar* _tmp16_ = NULL;
+	gchar* _tmp17_ = NULL;
+	gchar* _tmp18_ = NULL;
+	gchar* _tmp19_ = NULL;
+	gchar* _tmp20_ = NULL;
+	gchar* _tmp21_ = NULL;
+	gchar* _tmp22_ = NULL;
+	gchar* _tmp23_ = NULL;
+	gchar* _tmp24_ = NULL;
+	gchar* _tmp25_ = NULL;
+	gchar* _tmp26_ = NULL;
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp27_ = NULL;
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp28_ = NULL;
+	SpitPublishingPluginHost* _tmp29_ = NULL;
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp30_ = NULL;
+#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 142 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:142: ACTION: running OAuth authentication flo" \
+"w in hosted web pane.");
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = soup_uri_encode ("urn:ietf:wg:oauth:2.0:oob", NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = _tmp0_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = g_strconcat ("https://accounts.google.com/o/oauth2/auth?" "response_type=code&" "client_id=" PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_OAUTH_CLIENT_ID "&" "redirect_uri=", _tmp1_, NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = _tmp2_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = g_strconcat (_tmp3_, "&", NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = _tmp4_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = g_strconcat (_tmp5_, "scope=", NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp7_ = _tmp6_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp8_ = self->priv->scope;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp9_ = soup_uri_encode (_tmp8_, NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp10_ = _tmp9_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp11_ = g_strconcat (_tmp7_, _tmp10_, NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp12_ = _tmp11_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp13_ = g_strconcat (_tmp12_, "+", NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp14_ = _tmp13_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp15_ = soup_uri_encode ("https://www.googleapis.com/auth/userinfo.profile", NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp16_ = _tmp15_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp17_ = g_strconcat (_tmp14_, _tmp16_, NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp18_ = _tmp17_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp19_ = g_strconcat (_tmp18_, "&", NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp20_ = _tmp19_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp21_ = g_strconcat (_tmp20_, "state=connect&", NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp22_ = _tmp21_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp23_ = g_strconcat (_tmp22_, "access_type=offline&", NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp24_ = _tmp23_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp25_ = g_strconcat (_tmp24_, "approval_prompt=force", NULL);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp26_ = _tmp25_;
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp24_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp22_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp20_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp18_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp16_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp14_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp12_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp10_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp7_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp5_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp3_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp1_);
+#line 144 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	user_authorization_url = _tmp26_;
+#line 154 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp27_ = publishing_authenticator_shotwell_google_web_authentication_pane_new (user_authorization_url);
+#line 154 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_object_unref0 (self->priv->web_auth_pane);
+#line 154 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->web_auth_pane = _tmp27_;
+#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp28_ = self->priv->web_auth_pane;
+#line 155 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_connect_object (_tmp28_, "authorized", (GCallback) _publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized, self, 0);
+#line 157 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp29_ = self->priv->host;
+#line 157 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp30_ = self->priv->web_auth_pane;
+#line 157 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 141 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (user_authorization_url);
+#line 1281 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_on_web_auth_pane_authorized (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code) {
+	PublishingAuthenticatorShotwellGoogleWebAuthenticationPane* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 160 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (auth_code != NULL);
+#line 161 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = self->priv->web_auth_pane;
+#line 161 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("authorized", PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_WEB_AUTHENTICATION_PANE, &_tmp1_, NULL, FALSE);
+#line 161 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_web_auth_pane_authorized_publishing_authenticator_shotwell_google_web_authentication_pane_authorized, self);
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = self->priv->scope;
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = auth_code;
+#line 163 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:163: EVENT: user authorized scope %s with aut" \
+"h_code %s", _tmp2_, _tmp3_);
+#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = auth_code;
+#line 165 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_do_get_access_tokens (self, _tmp4_);
+#line 1311 "GoogleAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
+#line 1318 "GoogleAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_on_get_access_tokens_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
+#line 1325 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_do_get_access_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* auth_code) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* tokens_txn = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	PublishingAuthenticatorShotwellGoogleGetAccessTokensTransaction* _tmp3_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (auth_code != NULL);
+#line 169 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:169: ACTION: exchanging authorization code fo" \
+"r access & refresh tokens");
+#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = self->priv->host;
+#line 171 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = self->priv->session;
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = auth_code;
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = publishing_authenticator_shotwell_google_get_access_tokens_transaction_new (_tmp1_, _tmp2_);
+#line 173 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	tokens_txn = _tmp3_;
+#line 174 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self, 0);
+#line 175 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self, 0);
+#line 1358 "GoogleAuthenticator.c"
+	{
+#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 1366 "GoogleAuthenticator.c"
+				goto __catch5_spit_publishing_publishing_error;
+			}
+#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_publishing_rest_support_transaction_unref0 (tokens_txn);
+#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			g_critical ("file %s: line %d: unexpected 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/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			g_clear_error (&_inner_error_);
+#line 178 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			return;
+#line 1377 "GoogleAuthenticator.c"
+		}
+	}
+	goto __finally5;
+	__catch5_spit_publishing_publishing_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp4_ = NULL;
+		GError* _tmp5_ = NULL;
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		err = _inner_error_;
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_inner_error_ = NULL;
+#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp4_ = self->priv->host;
+#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp5_ = err;
+#line 180 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_error_free0 (err);
+#line 1398 "GoogleAuthenticator.c"
+	}
+	__finally5:
+#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"
+		_publishing_rest_support_transaction_unref0 (tokens_txn);
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_clear_error (&_inner_error_);
+#line 177 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		return;
+#line 1411 "GoogleAuthenticator.c"
+	}
+#line 168 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_publishing_rest_support_transaction_unref0 (tokens_txn);
+#line 1415 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_complete (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
+	PublishingRESTSupportTransaction* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	PublishingRESTSupportTransaction* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+#line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 184 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = txn;
+#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 185 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
+#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = txn;
+#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+#line 186 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
+#line 188 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:188: %s", "EVENT: network transaction to exchange authorization code for access t" \
+"okens " "completed successfully.");
+#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = txn;
+#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = _tmp5_;
+#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp6_);
+#line 191 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp6_);
+#line 1455 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_on_get_access_tokens_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
+	PublishingRESTSupportTransaction* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	PublishingRESTSupportTransaction* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	SpitPublishingPluginHost* _tmp7_ = NULL;
+	GError* _tmp8_ = NULL;
+#line 194 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 194 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = txn;
+#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 196 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
+#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = txn;
+#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+#line 197 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
+#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = txn;
+#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = _tmp5_;
+#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("EVENT: network transaction to exchange authorization code for access t" \
+"okens " "failed; response = '%s'", _tmp6_);
+#line 199 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp6_);
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp7_ = self->priv->host;
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp8_ = err;
+#line 202 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
+#line 1501 "GoogleAuthenticator.c"
+}
+
+
+static gpointer _json_object_ref0 (gpointer self) {
+#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return self ? json_object_ref (self) : NULL;
+#line 1508 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_do_extract_tokens (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body) {
+	JsonParser* parser = NULL;
+	JsonParser* _tmp0_ = NULL;
+	JsonObject* response_obj = NULL;
+	JsonParser* _tmp10_ = NULL;
+	JsonNode* _tmp11_ = NULL;
+	JsonObject* _tmp12_ = NULL;
+	JsonObject* _tmp13_ = NULL;
+	gboolean _tmp14_ = FALSE;
+	JsonObject* _tmp15_ = NULL;
+	gboolean _tmp16_ = FALSE;
+	JsonObject* _tmp22_ = NULL;
+	gboolean _tmp23_ = FALSE;
+	JsonObject* _tmp29_ = NULL;
+	gboolean _tmp30_ = FALSE;
+	JsonObject* _tmp36_ = NULL;
+	gboolean _tmp37_ = FALSE;
+	GError * _inner_error_ = NULL;
+#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (response_body != NULL);
+#line 206 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:206: ACTION: extracting OAuth tokens from bod" \
+"y of server response");
+#line 208 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = json_parser_new ();
+#line 208 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	parser = _tmp0_;
+#line 1540 "GoogleAuthenticator.c"
+	{
+		JsonParser* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp1_ = parser;
+#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp2_ = response_body;
+#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+#line 211 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1552 "GoogleAuthenticator.c"
+			goto __catch6_g_error;
+		}
+	}
+	goto __finally6;
+	__catch6_g_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp3_ = NULL;
+		GError* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+		GError* _tmp8_ = NULL;
+		GError* _tmp9_ = NULL;
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		err = _inner_error_;
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_inner_error_ = NULL;
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp3_ = self->priv->host;
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp4_ = err;
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp5_ = _tmp4_->message;
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp7_ = _tmp6_;
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp9_ = _tmp8_;
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_error_free0 (_tmp9_);
+#line 213 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_free0 (_tmp7_);
+#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_error_free0 (err);
+#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_object_unref0 (parser);
+#line 215 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		return;
+#line 1597 "GoogleAuthenticator.c"
+	}
+	__finally6:
+#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"
+		_g_object_unref0 (parser);
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_clear_error (&_inner_error_);
+#line 210 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		return;
+#line 1610 "GoogleAuthenticator.c"
+	}
+#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp10_ = parser;
+#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp11_ = json_parser_get_root (_tmp10_);
+#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp12_ = json_node_get_object (_tmp11_);
+#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp13_ = _json_object_ref0 (_tmp12_);
+#line 218 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	response_obj = _tmp13_;
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp15_ = response_obj;
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp16_ = json_object_has_member (_tmp15_, "access_token");
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (!_tmp16_) {
+#line 1628 "GoogleAuthenticator.c"
+		JsonObject* _tmp17_ = NULL;
+		gboolean _tmp18_ = FALSE;
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp17_ = response_obj;
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp18_ = json_object_has_member (_tmp17_, "refresh_token");
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp14_ = !_tmp18_;
+#line 1637 "GoogleAuthenticator.c"
+	} else {
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp14_ = FALSE;
+#line 1641 "GoogleAuthenticator.c"
+	}
+#line 220 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp14_) {
+#line 1645 "GoogleAuthenticator.c"
+		SpitPublishingPluginHost* _tmp19_ = NULL;
+		GError* _tmp20_ = NULL;
+		GError* _tmp21_ = NULL;
+#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp19_ = self->priv->host;
+#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "neither access_token nor refresh_token not present in server response");
+#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp21_ = _tmp20_;
+#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp19_, _tmp21_);
+#line 221 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_error_free0 (_tmp21_);
+#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_json_object_unref0 (response_obj);
+#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_object_unref0 (parser);
+#line 223 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		return;
+#line 1665 "GoogleAuthenticator.c"
+	}
+#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp22_ = response_obj;
+#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp23_ = json_object_has_member (_tmp22_, "expires_in");
+#line 226 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp23_) {
+#line 1673 "GoogleAuthenticator.c"
+		gint64 duration = 0LL;
+		JsonObject* _tmp24_ = NULL;
+		gint64 _tmp25_ = 0LL;
+		gint64 abs_time = 0LL;
+		gint64 _tmp26_ = 0LL;
+		gint64 _tmp27_ = 0LL;
+		gint64 _tmp28_ = 0LL;
+#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp24_ = response_obj;
+#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp25_ = json_object_get_int_member (_tmp24_, "expires_in");
+#line 227 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		duration = _tmp25_;
+#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp26_ = g_get_real_time ();
+#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp27_ = duration;
+#line 228 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		abs_time = _tmp26_ + ((_tmp27_ * 1000L) * 1000L);
+#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp28_ = abs_time;
+#line 229 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (self, _tmp28_);
+#line 1697 "GoogleAuthenticator.c"
+	}
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp29_ = response_obj;
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp30_ = json_object_has_member (_tmp29_, "refresh_token");
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp30_) {
+#line 1705 "GoogleAuthenticator.c"
+		gchar* refresh_token = NULL;
+		JsonObject* _tmp31_ = NULL;
+		const gchar* _tmp32_ = NULL;
+		gchar* _tmp33_ = NULL;
+		const gchar* _tmp34_ = NULL;
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp31_ = response_obj;
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp32_ = json_object_get_string_member (_tmp31_, "refresh_token");
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp33_ = g_strdup (_tmp32_);
+#line 233 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		refresh_token = _tmp33_;
+#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp34_ = refresh_token;
+#line 235 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		if (g_strcmp0 (_tmp34_, "") != 0) {
+#line 1723 "GoogleAuthenticator.c"
+			const gchar* _tmp35_ = NULL;
+#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_tmp35_ = refresh_token;
+#line 236 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			publishing_authenticator_shotwell_google_google_on_refresh_token_available (self, _tmp35_);
+#line 1729 "GoogleAuthenticator.c"
+		}
+#line 232 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_free0 (refresh_token);
+#line 1733 "GoogleAuthenticator.c"
+	}
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp36_ = response_obj;
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp37_ = json_object_has_member (_tmp36_, "access_token");
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp37_) {
+#line 1741 "GoogleAuthenticator.c"
+		gchar* access_token = NULL;
+		JsonObject* _tmp38_ = NULL;
+		const gchar* _tmp39_ = NULL;
+		gchar* _tmp40_ = NULL;
+		const gchar* _tmp41_ = NULL;
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp38_ = response_obj;
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp39_ = json_object_get_string_member (_tmp38_, "access_token");
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp40_ = g_strdup (_tmp39_);
+#line 240 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		access_token = _tmp40_;
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp41_ = access_token;
+#line 242 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		if (g_strcmp0 (_tmp41_, "") != 0) {
+#line 1759 "GoogleAuthenticator.c"
+			const gchar* _tmp42_ = NULL;
+#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_tmp42_ = access_token;
+#line 243 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			publishing_authenticator_shotwell_google_google_on_access_token_available (self, _tmp42_);
+#line 1765 "GoogleAuthenticator.c"
+		}
+#line 239 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_free0 (access_token);
+#line 1769 "GoogleAuthenticator.c"
+	}
+#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_json_object_unref0 (response_obj);
+#line 205 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_object_unref0 (parser);
+#line 1775 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_on_refresh_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token) {
+	const gchar* _tmp0_ = NULL;
+	GHashTable* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	const gchar* _tmp3_ = NULL;
+	GVariant* _tmp4_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp5_ = NULL;
+	const gchar* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 247 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (token != NULL);
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = token;
+#line 248 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:248: EVENT: an OAuth refresh token has become" \
+" available; token = '%s'.", _tmp0_);
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = self->priv->params;
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = g_strdup ("RefreshToken");
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = token;
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = g_variant_new_string (_tmp3_);
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_variant_ref_sink (_tmp4_);
+#line 249 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_hash_table_insert (_tmp1_, _tmp2_, _tmp4_);
+#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = self->priv->session;
+#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = token;
+#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp7_ = g_strdup (_tmp6_);
+#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp5_->refresh_token);
+#line 251 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_->refresh_token = _tmp7_;
+#line 1818 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_on_expiry_time_avilable (PublishingAuthenticatorShotwellGoogleGoogle* self, gint64 abs_time) {
+	gint64 _tmp0_ = 0LL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
+	gint64 _tmp2_ = 0LL;
+	GHashTable* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	gint64 _tmp5_ = 0LL;
+	GVariant* _tmp6_ = NULL;
+#line 254 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = abs_time;
+#line 255 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("EVENT: an OAuth access token expiry time became available; time = %'" G_GINT64_FORMAT "'.", _tmp0_);
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = self->priv->session;
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = abs_time;
+#line 258 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_->expires_at = _tmp2_;
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = self->priv->params;
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = g_strdup ("ExpiryTime");
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = abs_time;
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = g_variant_new_int64 (_tmp5_);
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_variant_ref_sink (_tmp6_);
+#line 259 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_hash_table_insert (_tmp3_, _tmp4_, _tmp6_);
+#line 1854 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_on_access_token_available (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* token) {
+	const gchar* _tmp0_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	GHashTable* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	const gchar* _tmp6_ = NULL;
+	GVariant* _tmp7_ = NULL;
+#line 263 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 263 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (token != NULL);
+#line 264 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = token;
+#line 264 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:264: EVENT: an OAuth access token has become " \
+"available; token = '%s'.", _tmp0_);
+#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = self->priv->session;
+#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = token;
+#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp1_->access_token);
+#line 266 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_->access_token = _tmp3_;
+#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = self->priv->params;
+#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = g_strdup ("AccessToken");
+#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = token;
+#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp7_ = g_variant_new_string (_tmp6_);
+#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_variant_ref_sink (_tmp7_);
+#line 267 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_hash_table_insert (_tmp4_, _tmp5_, _tmp7_);
+#line 269 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_do_fetch_username (self);
+#line 1899 "GoogleAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+#line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
+#line 1906 "GoogleAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+#line 280 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
+#line 1913 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_do_fetch_username (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	SpitPublishingPluginHost* _tmp1_ = NULL;
+	PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* txn = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp2_ = NULL;
+	PublishingAuthenticatorShotwellGoogleUsernameFetchTransaction* _tmp3_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 272 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 273 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:273: ACTION: running network transaction to f" \
+"etch username.");
+#line 275 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = self->priv->host;
+#line 275 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
+#line 276 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = self->priv->host;
+#line 276 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
+#line 278 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = self->priv->session;
+#line 278 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp3_ = publishing_authenticator_shotwell_google_username_fetch_transaction_new (_tmp2_);
+#line 278 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	txn = _tmp3_;
+#line 279 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
+#line 280 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
+#line 1946 "GoogleAuthenticator.c"
+	{
+#line 283 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 283 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1952 "GoogleAuthenticator.c"
+			goto __catch7_g_error;
+		}
+	}
+	goto __finally7;
+	__catch7_g_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp4_ = NULL;
+		GError* _tmp5_ = NULL;
+#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		err = _inner_error_;
+#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_inner_error_ = NULL;
+#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp4_ = self->priv->host;
+#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp5_ = err;
+#line 285 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_error_free0 (err);
+#line 1974 "GoogleAuthenticator.c"
+	}
+	__finally7:
+#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"
+		_publishing_rest_support_transaction_unref0 (txn);
+#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_clear_error (&_inner_error_);
+#line 282 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		return;
+#line 1987 "GoogleAuthenticator.c"
+	}
+#line 272 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_publishing_rest_support_transaction_unref0 (txn);
+#line 1991 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
+	PublishingRESTSupportTransaction* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	PublishingRESTSupportTransaction* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+	PublishingRESTSupportTransaction* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 289 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = txn;
+#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 290 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
+#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = txn;
+#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+#line 291 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
+#line 293 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:293: EVENT: username fetch transaction comple" \
+"ted successfully.");
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = txn;
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = _tmp5_;
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_do_extract_username (self, _tmp6_);
+#line 295 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp6_);
+#line 2031 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_on_fetch_username_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
+	PublishingRESTSupportTransaction* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	PublishingRESTSupportTransaction* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+	SpitPublishingPluginHost* _tmp4_ = NULL;
+	GError* _tmp5_ = NULL;
+#line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 298 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 300 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = txn;
+#line 300 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 300 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
+#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = txn;
+#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+#line 301 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
+#line 303 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:303: EVENT: username fetch transaction caused" \
+" a network error");
+#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = self->priv->host;
+#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = err;
+#line 305 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
+#line 2066 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_do_extract_username (PublishingAuthenticatorShotwellGoogleGoogle* self, const gchar* response_body) {
+	JsonParser* parser = NULL;
+	JsonParser* _tmp0_ = NULL;
+	JsonObject* response_obj = NULL;
+	JsonParser* _tmp10_ = NULL;
+	JsonNode* _tmp11_ = NULL;
+	JsonObject* _tmp12_ = NULL;
+	JsonObject* _tmp13_ = NULL;
+	JsonObject* _tmp14_ = NULL;
+	gboolean _tmp15_ = FALSE;
+	JsonObject* _tmp24_ = NULL;
+	gboolean _tmp25_ = FALSE;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp34_ = NULL;
+	gboolean _tmp35_ = FALSE;
+	SpitPublishingPluginHost* _tmp36_ = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp37_ = NULL;
+	const gchar* _tmp38_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (response_body != NULL);
+#line 309 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:309: ACTION: extracting username from body of" \
+" server response");
+#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = json_parser_new ();
+#line 311 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	parser = _tmp0_;
+#line 2098 "GoogleAuthenticator.c"
+	{
+		JsonParser* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp1_ = parser;
+#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp2_ = response_body;
+#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
+#line 314 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2110 "GoogleAuthenticator.c"
+			goto __catch8_g_error;
+		}
+	}
+	goto __finally8;
+	__catch8_g_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp3_ = NULL;
+		GError* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+		GError* _tmp8_ = NULL;
+		GError* _tmp9_ = NULL;
+#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		err = _inner_error_;
+#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_inner_error_ = NULL;
+#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp3_ = self->priv->host;
+#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp4_ = err;
+#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp5_ = _tmp4_->message;
+#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
+#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp7_ = _tmp6_;
+#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
+#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp9_ = _tmp8_;
+#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
+#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_error_free0 (_tmp9_);
+#line 316 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_free0 (_tmp7_);
+#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_error_free0 (err);
+#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_object_unref0 (parser);
+#line 318 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		return;
+#line 2155 "GoogleAuthenticator.c"
+	}
+	__finally8:
+#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"
+		_g_object_unref0 (parser);
+#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_critical ("file %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/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_clear_error (&_inner_error_);
+#line 313 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		return;
+#line 2168 "GoogleAuthenticator.c"
+	}
+#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp10_ = parser;
+#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp11_ = json_parser_get_root (_tmp10_);
+#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp12_ = json_node_get_object (_tmp11_);
+#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp13_ = _json_object_ref0 (_tmp12_);
+#line 321 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	response_obj = _tmp13_;
+#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp14_ = response_obj;
+#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp15_ = json_object_has_member (_tmp14_, "name");
+#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp15_) {
+#line 2186 "GoogleAuthenticator.c"
+		gchar* username = NULL;
+		JsonObject* _tmp16_ = NULL;
+		const gchar* _tmp17_ = NULL;
+		gchar* _tmp18_ = NULL;
+		const gchar* _tmp19_ = NULL;
+#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp16_ = response_obj;
+#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp17_ = json_object_get_string_member (_tmp16_, "name");
+#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp18_ = g_strdup (_tmp17_);
+#line 324 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		username = _tmp18_;
+#line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp19_ = username;
+#line 326 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		if (g_strcmp0 (_tmp19_, "") != 0) {
+#line 2204 "GoogleAuthenticator.c"
+			GHashTable* _tmp20_ = NULL;
+			gchar* _tmp21_ = NULL;
+			const gchar* _tmp22_ = NULL;
+			GVariant* _tmp23_ = NULL;
+#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_tmp20_ = self->priv->params;
+#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_tmp21_ = g_strdup ("UserName");
+#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_tmp22_ = username;
+#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_tmp23_ = g_variant_new_string (_tmp22_);
+#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			g_variant_ref_sink (_tmp23_);
+#line 327 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			g_hash_table_insert (_tmp20_, _tmp21_, _tmp23_);
+#line 2221 "GoogleAuthenticator.c"
+		}
+#line 323 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_free0 (username);
+#line 2225 "GoogleAuthenticator.c"
+	}
+#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp24_ = response_obj;
+#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp25_ = json_object_has_member (_tmp24_, "access_token");
+#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp25_) {
+#line 2233 "GoogleAuthenticator.c"
+		gchar* access_token = NULL;
+		JsonObject* _tmp26_ = NULL;
+		const gchar* _tmp27_ = NULL;
+		gchar* _tmp28_ = NULL;
+		const gchar* _tmp29_ = NULL;
+#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp26_ = response_obj;
+#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp27_ = json_object_get_string_member (_tmp26_, "access_token");
+#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp28_ = g_strdup (_tmp27_);
+#line 331 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		access_token = _tmp28_;
+#line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp29_ = access_token;
+#line 333 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		if (g_strcmp0 (_tmp29_, "") != 0) {
+#line 2251 "GoogleAuthenticator.c"
+			GHashTable* _tmp30_ = NULL;
+			gchar* _tmp31_ = NULL;
+			const gchar* _tmp32_ = NULL;
+			GVariant* _tmp33_ = NULL;
+#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_tmp30_ = self->priv->params;
+#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_tmp31_ = g_strdup ("AccessToken");
+#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_tmp32_ = access_token;
+#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_tmp33_ = g_variant_new_string (_tmp32_);
+#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			g_variant_ref_sink (_tmp33_);
+#line 334 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			g_hash_table_insert (_tmp30_, _tmp31_, _tmp33_);
+#line 2268 "GoogleAuthenticator.c"
+		}
+#line 330 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_free0 (access_token);
+#line 2272 "GoogleAuthenticator.c"
+	}
+#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp34_ = self->priv->session;
+#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp35_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+#line 339 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_vala_assert (_tmp35_, "session.is_authenticated()");
+#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp36_ = self->priv->host;
+#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp37_ = self->priv->session;
+#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp38_ = _tmp37_->refresh_token;
+#line 340 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", _tmp38_);
+#line 342 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator), "authenticated");
+#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_json_object_unref0 (response_obj);
+#line 308 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_object_unref0 (parser);
+#line 2294 "GoogleAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
+#line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender);
+#line 2301 "GoogleAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
+#line 354 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error ((PublishingAuthenticatorShotwellGoogleGoogle*) self, _sender, err);
+#line 2308 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_do_exchange_refresh_token_for_access_token (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* txn = NULL;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp1_ = NULL;
+	PublishingAuthenticatorShotwellGoogleRefreshAccessTokenTransaction* _tmp2_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 347 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:347: ACTION: exchanging OAuth refresh token f" \
+"or OAuth access token.");
+#line 349 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = self->priv->host;
+#line 349 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
+#line 351 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = self->priv->session;
+#line 351 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = publishing_authenticator_shotwell_google_refresh_access_token_transaction_new (_tmp1_);
+#line 351 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	txn = _tmp2_;
+#line 353 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
+#line 354 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
+#line 2336 "GoogleAuthenticator.c"
+	{
+#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
+#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
+#line 2344 "GoogleAuthenticator.c"
+				goto __catch9_spit_publishing_publishing_error;
+			}
+#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			_publishing_rest_support_transaction_unref0 (txn);
+#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			g_critical ("file %s: line %d: unexpected 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/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			g_clear_error (&_inner_error_);
+#line 357 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+			return;
+#line 2355 "GoogleAuthenticator.c"
+		}
+	}
+	goto __finally9;
+	__catch9_spit_publishing_publishing_error:
+	{
+		GError* err = NULL;
+		SpitPublishingPluginHost* _tmp3_ = NULL;
+		GError* _tmp4_ = NULL;
+#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		err = _inner_error_;
+#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_inner_error_ = NULL;
+#line 359 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp3_ = self->priv->host;
+#line 359 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp4_ = err;
+#line 359 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
+#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_g_error_free0 (err);
+#line 2376 "GoogleAuthenticator.c"
+	}
+	__finally9:
+#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"
+		_publishing_rest_support_transaction_unref0 (txn);
+#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_critical ("file %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/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_clear_error (&_inner_error_);
+#line 356 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		return;
+#line 2389 "GoogleAuthenticator.c"
+	}
+#line 346 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_publishing_rest_support_transaction_unref0 (txn);
+#line 2393 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_completed (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn) {
+	PublishingRESTSupportTransaction* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	PublishingRESTSupportTransaction* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp4_ = NULL;
+	gboolean _tmp5_ = FALSE;
+	PublishingRESTSupportTransaction* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	gchar* _tmp8_ = NULL;
+#line 363 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 363 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 365 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = txn;
+#line 365 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 365 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
+#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = txn;
+#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+#line 366 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
+#line 368 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:368: EVENT: refresh access token transaction " \
+"completed successfully.");
+#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = self->priv->session;
+#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+#line 370 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp5_) {
+#line 371 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		return;
+#line 2433 "GoogleAuthenticator.c"
+	}
+#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp6_ = txn;
+#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp7_ = publishing_rest_support_transaction_get_response (_tmp6_);
+#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp8_ = _tmp7_;
+#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_do_extract_tokens (self, _tmp8_);
+#line 373 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (_tmp8_);
+#line 2445 "GoogleAuthenticator.c"
+}
+
+
+static gboolean ___lambda4_ (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+	gboolean result = FALSE;
+#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_publishing_authenticator_authenticate (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator));
+#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	result = FALSE;
+#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return result;
+#line 2457 "GoogleAuthenticator.c"
+}
+
+
+static gboolean ____lambda4__gsource_func (gpointer self) {
+	gboolean result;
+	result = ___lambda4_ ((PublishingAuthenticatorShotwellGoogleGoogle*) self);
+#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	return result;
+#line 2466 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_on_refresh_access_token_transaction_error (PublishingAuthenticatorShotwellGoogleGoogle* self, PublishingRESTSupportTransaction* txn, GError* err) {
+	PublishingRESTSupportTransaction* _tmp0_ = NULL;
+	guint _tmp1_ = 0U;
+	PublishingRESTSupportTransaction* _tmp2_ = NULL;
+	guint _tmp3_ = 0U;
+	PublishingAuthenticatorShotwellGoogleSession* _tmp4_ = NULL;
+	gboolean _tmp5_ = FALSE;
+	gboolean _tmp6_ = FALSE;
+	PublishingRESTSupportTransaction* _tmp7_ = NULL;
+	guint _tmp8_ = 0U;
+	SpitPublishingPluginHost* _tmp12_ = NULL;
+	GError* _tmp13_ = NULL;
+#line 376 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 376 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
+#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = txn;
+#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
+#line 378 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
+#line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp2_ = txn;
+#line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
+#line 379 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.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_google_google_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
+#line 381 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:381: EVENT: refresh access token transaction " \
+"caused a network error.");
+#line 383 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp4_ = self->priv->session;
+#line 383 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
+#line 383 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp5_) {
+#line 384 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		return;
+#line 2508 "GoogleAuthenticator.c"
+	}
+#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp7_ = txn;
+#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp8_ = publishing_rest_support_transaction_get_status_code (_tmp7_);
+#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp8_ == ((guint) SOUP_STATUS_BAD_REQUEST)) {
+#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp6_ = TRUE;
+#line 2518 "GoogleAuthenticator.c"
+	} else {
+		PublishingRESTSupportTransaction* _tmp9_ = NULL;
+		guint _tmp10_ = 0U;
+#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp9_ = txn;
+#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp10_ = publishing_rest_support_transaction_get_status_code (_tmp9_);
+#line 386 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp6_ = _tmp10_ == ((guint) SOUP_STATUS_UNAUTHORIZED);
+#line 2528 "GoogleAuthenticator.c"
+	}
+#line 385 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	if (_tmp6_) {
+#line 2532 "GoogleAuthenticator.c"
+		SpitPublishingPluginHost* _tmp11_ = NULL;
+#line 388 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		_tmp11_ = self->priv->host;
+#line 388 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", "");
+#line 389 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ____lambda4__gsource_func, g_object_ref (self), g_object_unref);
+#line 2540 "GoogleAuthenticator.c"
+	}
+#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp12_ = self->priv->host;
+#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp13_ = err;
+#line 392 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_publishing_plugin_host_post_error (_tmp12_, _tmp13_);
+#line 2548 "GoogleAuthenticator.c"
+}
+
+
+static void _publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
+#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_on_service_welcome_login ((PublishingAuthenticatorShotwellGoogleGoogle*) self);
+#line 2555 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_do_show_service_welcome_pane (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+	SpitPublishingPluginHost* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+#line 395 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 396 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:396: ACTION: showing service welcome pane.");
+#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp0_ = self->priv->host;
+#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_tmp1_ = self->priv->welcome_message;
+#line 398 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, _tmp1_, _publishing_authenticator_shotwell_google_google_on_service_welcome_login_spit_publishing_login_callback, self);
+#line 2572 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_on_service_welcome_login (PublishingAuthenticatorShotwellGoogleGoogle* self) {
+#line 401 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_return_if_fail (PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE (self));
+#line 402 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_debug ("GoogleAuthenticator.vala:402: EVENT: user clicked 'Login' in welcome p" \
+"ane.");
+#line 404 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_do_hosted_web_authentication (self);
+#line 2583 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_class_init (PublishingAuthenticatorShotwellGoogleGoogleClass * klass) {
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_parent_class = g_type_class_peek_parent (klass);
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	g_type_class_add_private (klass, sizeof (PublishingAuthenticatorShotwellGoogleGooglePrivate));
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_authenticator_shotwell_google_google_finalize;
+#line 2594 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_interface_init (SpitPublishingAuthenticatorIface * iface) {
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_parent_iface = g_type_interface_peek_parent (iface);
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	iface->authenticate = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_authenticate;
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	iface->can_logout = (gboolean (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_can_logout;
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	iface->get_authentication_parameter = (GHashTable* (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_get_authentication_parameter;
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	iface->logout = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_logout;
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	iface->refresh = (void (*)(SpitPublishingAuthenticator*)) publishing_authenticator_shotwell_google_google_real_refresh;
+#line 2611 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_instance_init (PublishingAuthenticatorShotwellGoogleGoogle * self) {
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv = PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_GET_PRIVATE (self);
+#line 89 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->scope = NULL;
+#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->host = NULL;
+#line 91 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->params = NULL;
+#line 92 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->web_auth_pane = NULL;
+#line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->session = NULL;
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self->priv->welcome_message = NULL;
+#line 2630 "GoogleAuthenticator.c"
+}
+
+
+static void publishing_authenticator_shotwell_google_google_finalize (GObject* obj) {
+	PublishingAuthenticatorShotwellGoogleGoogle * self;
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle);
+#line 89 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (self->priv->scope);
+#line 90 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_object_unref0 (self->priv->host);
+#line 91 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_hash_table_unref0 (self->priv->params);
+#line 92 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_object_unref0 (self->priv->web_auth_pane);
+#line 93 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 94 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	_g_free0 (self->priv->welcome_message);
+#line 88 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/GoogleAuthenticator.vala"
+	G_OBJECT_CLASS (publishing_authenticator_shotwell_google_google_parent_class)->finalize (obj);
+#line 2652 "GoogleAuthenticator.c"
+}
+
+
+GType publishing_authenticator_shotwell_google_google_get_type (void) {
+	static volatile gsize publishing_authenticator_shotwell_google_google_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_shotwell_google_google_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorShotwellGoogleGoogleClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_shotwell_google_google_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorShotwellGoogleGoogle), 0, (GInstanceInitFunc) publishing_authenticator_shotwell_google_google_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_authenticator_info = { (GInterfaceInitFunc) publishing_authenticator_shotwell_google_google_spit_publishing_authenticator_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_authenticator_shotwell_google_google_type_id;
+		publishing_authenticator_shotwell_google_google_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingAuthenticatorShotwellGoogleGoogle", &g_define_type_info, 0);
+		g_type_add_interface_static (publishing_authenticator_shotwell_google_google_type_id, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, &spit_publishing_authenticator_info);
+		g_once_init_leave (&publishing_authenticator_shotwell_google_google_type_id__volatile, publishing_authenticator_shotwell_google_google_type_id);
+	}
+	return publishing_authenticator_shotwell_google_google_type_id__volatile;
+}
+
+
+
diff --git a/plugins/authenticator/shotwell/GoogleAuthenticator.vala b/plugins/authenticator/shotwell/GoogleAuthenticator.vala
new file mode 100644
index 0000000..9271b57
--- /dev/null
+++ b/plugins/authenticator/shotwell/GoogleAuthenticator.vala
@@ -0,0 +1,409 @@
+using Shotwell;
+using Shotwell.Plugins;
+
+namespace Publishing.Authenticator.Shotwell.Google {
+    private const string OAUTH_CLIENT_ID = "534227538559-hvj2e8bj0vfv2f49r7gvjoq6jibfav67.apps.googleusercontent.com";
+    private const string OAUTH_CLIENT_SECRET = "pwpzZ7W1TCcD5uIfYCu8sM7x";
+
+    private class WebAuthenticationPane : Common.WebAuthenticationPane {
+        public static bool cache_dirty = false;
+
+        public signal void authorized(string auth_code);
+
+        public WebAuthenticationPane(string auth_sequence_start_url) {
+            Object (login_uri : auth_sequence_start_url);
+        }
+
+        public static bool is_cache_dirty() {
+            return cache_dirty;
+        }
+
+        public override void on_page_load() {
+            string page_title = get_view ().get_title();
+            if (page_title.index_of("state=connect") > 0) {
+                int auth_code_field_start = page_title.index_of("code=");
+                if (auth_code_field_start < 0)
+                    return;
+
+                string auth_code = page_title.substring(auth_code_field_start + 5); // 5 = "code=".length
+
+                cache_dirty = true;
+
+                authorized(auth_code);
+            }
+        }
+    }
+
+    private class Session : Publishing.RESTSupport.Session {
+        public string access_token = null;
+        public string refresh_token = null;
+        public int64 expires_at = -1;
+
+        public override bool is_authenticated() {
+            return (access_token != null);
+        }
+
+        public void deauthenticate() {
+            access_token = null;
+            refresh_token = null;
+            expires_at = -1;
+        }
+    }
+
+    private class GetAccessTokensTransaction : Publishing.RESTSupport.Transaction {
+        private const string ENDPOINT_URL = "https://accounts.google.com/o/oauth2/token";
+
+        public GetAccessTokensTransaction(Session session, string auth_code) {
+            base.with_endpoint_url(session, ENDPOINT_URL);
+
+            add_argument("code", auth_code);
+            add_argument("client_id", OAUTH_CLIENT_ID);
+            add_argument("client_secret", OAUTH_CLIENT_SECRET);
+            add_argument("redirect_uri", "urn:ietf:wg:oauth:2.0:oob");
+            add_argument("grant_type", "authorization_code");
+        }
+    }
+
+    private class RefreshAccessTokenTransaction : Publishing.RESTSupport.Transaction {
+        private const string ENDPOINT_URL = "https://accounts.google.com/o/oauth2/token";
+
+        public RefreshAccessTokenTransaction(Session session) {
+            base.with_endpoint_url(session, ENDPOINT_URL);
+
+            add_argument("client_id", OAUTH_CLIENT_ID);
+            add_argument("client_secret", OAUTH_CLIENT_SECRET);
+            add_argument("refresh_token", session.refresh_token);
+            add_argument("grant_type", "refresh_token");
+        }
+    }
+
+    private class UsernameFetchTransaction : Publishing.RESTSupport.Transaction {
+        private const string ENDPOINT_URL = "https://www.googleapis.com/oauth2/v1/userinfo";
+        public UsernameFetchTransaction(Session session) {
+            base.with_endpoint_url(session, ENDPOINT_URL, Publishing.RESTSupport.HttpMethod.GET);
+            add_header("Authorization", "Bearer " + session.access_token);
+        }
+    }
+
+    internal class Google : Spit.Publishing.Authenticator, Object {
+        private string scope = null;
+        private Spit.Publishing.PluginHost host = null;
+        private GLib.HashTable<string, Variant> params = null;
+        private WebAuthenticationPane web_auth_pane = null;
+        private Session session = null;
+        private string welcome_message = null;
+
+        public Google(string scope,
+                      string welcome_message,
+                      Spit.Publishing.PluginHost host) {
+            this.host = host;
+            this.params = new GLib.HashTable<string, Variant>(str_hash, str_equal);
+            this.scope = scope;
+            this.session = new Session();
+            this.welcome_message = welcome_message;
+        }
+
+        public void authenticate() {
+            var refresh_token = host.get_config_string("refresh_token", null);
+            if (refresh_token != null && refresh_token != "") {
+                on_refresh_token_available(refresh_token);
+                do_exchange_refresh_token_for_access_token();
+                return;
+            }
+
+            // FIXME: Find a way for a proper logout
+            if (WebAuthenticationPane.is_cache_dirty()) {
+                host.set_service_locked(false);
+
+                host.install_static_message_pane(_("You have already logged in and out of a Google service during this Shotwell session.\n\nTo continue publishing to Google services, quit and restart Shotwell, then try publishing again."));
+            } else {
+                this.do_show_service_welcome_pane();
+            }
+        }
+
+        public bool can_logout() {
+            return true;
+        }
+
+        public GLib.HashTable<string, Variant> get_authentication_parameter() {
+            return this.params;
+        }
+
+        public void logout() {
+            session.deauthenticate();
+            host.set_config_string("refresh_token", "");
+        }
+
+        public void refresh() {
+            // TODO: Needs to re-auth
+        }
+
+        private void do_hosted_web_authentication() {
+            debug("ACTION: running OAuth authentication flow in hosted web pane.");
+
+            string user_authorization_url = "https://accounts.google.com/o/oauth2/auth?" +
+                "response_type=code&" +
+                "client_id=" + OAUTH_CLIENT_ID + "&" +
+                "redirect_uri=" + Soup.URI.encode("urn:ietf:wg:oauth:2.0:oob", null) + "&" +
+                "scope=" + Soup.URI.encode(this.scope, null) + "+" +
+                Soup.URI.encode("https://www.googleapis.com/auth/userinfo.profile", null) + "&" +
+                "state=connect&" +
+                "access_type=offline&" +
+                "approval_prompt=force";
+
+            web_auth_pane = new WebAuthenticationPane(user_authorization_url);
+            web_auth_pane.authorized.connect(on_web_auth_pane_authorized);
+
+            host.install_dialog_pane(web_auth_pane);
+        }
+
+        private void on_web_auth_pane_authorized(string auth_code) {
+            web_auth_pane.authorized.disconnect(on_web_auth_pane_authorized);
+
+            debug("EVENT: user authorized scope %s with auth_code %s", scope, auth_code);
+
+            do_get_access_tokens(auth_code);
+        }
+
+        private void do_get_access_tokens(string auth_code) {
+            debug("ACTION: exchanging authorization code for access & refresh tokens");
+
+            host.install_login_wait_pane();
+
+            GetAccessTokensTransaction tokens_txn = new GetAccessTokensTransaction(session, auth_code);
+            tokens_txn.completed.connect(on_get_access_tokens_complete);
+            tokens_txn.network_error.connect(on_get_access_tokens_error);
+
+            try {
+                tokens_txn.execute();
+            } catch (Spit.Publishing.PublishingError err) {
+                host.post_error(err);
+            }
+        }
+
+        private void on_get_access_tokens_complete(Publishing.RESTSupport.Transaction txn) {
+            txn.completed.disconnect(on_get_access_tokens_complete);
+            txn.network_error.disconnect(on_get_access_tokens_error);
+
+            debug("EVENT: network transaction to exchange authorization code for access tokens " +
+                    "completed successfully.");
+
+            do_extract_tokens(txn.get_response());
+        }
+
+        private void on_get_access_tokens_error(Publishing.RESTSupport.Transaction txn,
+                Spit.Publishing.PublishingError err) {
+            txn.completed.disconnect(on_get_access_tokens_complete);
+            txn.network_error.disconnect(on_get_access_tokens_error);
+
+            debug("EVENT: network transaction to exchange authorization code for access tokens " +
+                    "failed; response = '%s'", txn.get_response());
+
+            host.post_error(err);
+        }
+
+        private void do_extract_tokens(string response_body) {
+            debug("ACTION: extracting OAuth tokens from body of server response");
+
+            Json.Parser parser = new Json.Parser();
+
+            try {
+                parser.load_from_data(response_body);
+            } catch (Error err) {
+                host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
+                    "Couldn't parse JSON response: " + err.message));
+                return;
+            }
+
+            Json.Object response_obj = parser.get_root().get_object();
+
+            if ((!response_obj.has_member("access_token")) && (!response_obj.has_member("refresh_token"))) {
+                host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
+                    "neither access_token nor refresh_token not present in server response"));
+                return;
+            }
+
+            if (response_obj.has_member("expires_in")) {
+                var duration = response_obj.get_int_member("expires_in");
+                var abs_time = GLib.get_real_time() + duration * 1000L * 1000L;
+                on_expiry_time_avilable(abs_time);
+            }
+
+            if (response_obj.has_member("refresh_token")) {
+                string refresh_token = response_obj.get_string_member("refresh_token");
+
+                if (refresh_token != "")
+                    on_refresh_token_available(refresh_token);
+            }
+
+            if (response_obj.has_member("access_token")) {
+                string access_token = response_obj.get_string_member("access_token");
+
+                if (access_token != "")
+                    on_access_token_available(access_token);
+            }
+        }
+
+        private void on_refresh_token_available(string token) {
+            debug("EVENT: an OAuth refresh token has become available; token = '%s'.", token);
+            this.params.insert("RefreshToken", new Variant.string(token));
+
+            session.refresh_token = token;
+        }
+
+        private void on_expiry_time_avilable(int64 abs_time) {
+            debug("EVENT: an OAuth access token expiry time became available; time = %'" + int64.FORMAT +
+                    "'.", abs_time);
+
+            session.expires_at = abs_time;
+            this.params.insert("ExpiryTime", new Variant.int64(abs_time));
+        }
+
+
+        private void on_access_token_available(string token) {
+            debug("EVENT: an OAuth access token has become available; token = '%s'.", token);
+
+            session.access_token = token;
+            this.params.insert("AccessToken", new Variant.string(token));
+
+            do_fetch_username();
+        }
+
+        private void do_fetch_username() {
+            debug("ACTION: running network transaction to fetch username.");
+
+            host.install_login_wait_pane();
+            host.set_service_locked(true);
+
+            UsernameFetchTransaction txn = new UsernameFetchTransaction(session);
+            txn.completed.connect(on_fetch_username_transaction_completed);
+            txn.network_error.connect(on_fetch_username_transaction_error);
+
+            try {
+                txn.execute();
+            } catch (Error err) {
+                host.post_error(err);
+            }
+        }
+
+        private void on_fetch_username_transaction_completed(Publishing.RESTSupport.Transaction txn) {
+            txn.completed.disconnect(on_fetch_username_transaction_completed);
+            txn.network_error.disconnect(on_fetch_username_transaction_error);
+
+            debug("EVENT: username fetch transaction completed successfully.");
+
+            do_extract_username(txn.get_response());
+        }
+
+        private void on_fetch_username_transaction_error(Publishing.RESTSupport.Transaction txn,
+                Spit.Publishing.PublishingError err) {
+            txn.completed.disconnect(on_fetch_username_transaction_completed);
+            txn.network_error.disconnect(on_fetch_username_transaction_error);
+
+            debug("EVENT: username fetch transaction caused a network error");
+
+            host.post_error(err);
+        }
+
+        private void do_extract_username(string response_body) {
+            debug("ACTION: extracting username from body of server response");
+
+            Json.Parser parser = new Json.Parser();
+
+            try {
+                parser.load_from_data(response_body);
+            } catch (Error err) {
+                host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
+                            "Couldn't parse JSON response: " + err.message));
+                return;
+            }
+
+            Json.Object response_obj = parser.get_root().get_object();
+
+            if (response_obj.has_member("name")) {
+                string username = response_obj.get_string_member("name");
+
+                if (username != "")
+                    this.params.insert("UserName", new Variant.string(username));
+            }
+
+            if (response_obj.has_member("access_token")) {
+                string access_token = response_obj.get_string_member("access_token");
+
+                if (access_token != "")
+                    this.params.insert("AccessToken", new Variant.string(access_token));
+            }
+
+            // by the time we get a username, the session should be authenticated, or else something
+            // really tragic has happened
+            assert(session.is_authenticated());
+            host.set_config_string("refresh_token", session.refresh_token);
+
+            this.authenticated();
+        }
+
+
+        private void do_exchange_refresh_token_for_access_token() {
+            debug("ACTION: exchanging OAuth refresh token for OAuth access token.");
+
+            host.install_login_wait_pane();
+
+            RefreshAccessTokenTransaction txn = new RefreshAccessTokenTransaction(session);
+
+            txn.completed.connect(on_refresh_access_token_transaction_completed);
+            txn.network_error.connect(on_refresh_access_token_transaction_error);
+
+            try {
+                txn.execute();
+            } catch (Spit.Publishing.PublishingError err) {
+                    host.post_error(err);
+            }
+        }
+
+        private void on_refresh_access_token_transaction_completed(Publishing.RESTSupport.Transaction
+                txn) {
+            txn.completed.disconnect(on_refresh_access_token_transaction_completed);
+            txn.network_error.disconnect(on_refresh_access_token_transaction_error);
+
+            debug("EVENT: refresh access token transaction completed successfully.");
+
+            if (session.is_authenticated()) // ignore these events if the session is already auth'd
+                return;
+
+            do_extract_tokens(txn.get_response());
+        }
+
+        private void on_refresh_access_token_transaction_error(Publishing.RESTSupport.Transaction txn,
+                Spit.Publishing.PublishingError err) {
+            txn.completed.disconnect(on_refresh_access_token_transaction_completed);
+            txn.network_error.disconnect(on_refresh_access_token_transaction_error);
+
+            debug("EVENT: refresh access token transaction caused a network error.");
+
+            if (session.is_authenticated()) // ignore these events if the session is already auth'd
+                return;
+            if (txn.get_status_code() == Soup.Status.BAD_REQUEST ||
+                txn.get_status_code() == Soup.Status.UNAUTHORIZED) {
+                // Refresh token invalid, starting over
+                host.set_config_string("refresh_token", "");
+                Idle.add (() => { this.authenticate(); return false; });
+            }
+
+            host.post_error(err);
+        }
+
+        private void do_show_service_welcome_pane() {
+            debug("ACTION: showing service welcome pane.");
+
+            this.host.install_welcome_pane(this.welcome_message, on_service_welcome_login);
+        }
+
+        private void on_service_welcome_login() {
+            debug("EVENT: user clicked 'Login' in welcome pane.");
+
+            this.do_hosted_web_authentication();
+        }
+
+
+    }
+}
diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
new file mode 100644
index 0000000..fe03b0e
--- /dev/null
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.c
@@ -0,0 +1,356 @@
+/* ShotwellAuthenticatorFactory.c generated by valac 0.34.4, the Vala compiler
+ * generated from ShotwellAuthenticatorFactory.vala, do not modify */
+
+
+#include <glib.h>
+#include <glib-object.h>
+#include "shotwell-plugin-dev-1.0.h"
+#include <gee.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib/gi18n-lib.h>
+
+
+#define PUBLISHING_AUTHENTICATOR_TYPE_FACTORY (publishing_authenticator_factory_get_type ())
+#define PUBLISHING_AUTHENTICATOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory))
+#define PUBLISHING_AUTHENTICATOR_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactoryClass))
+#define PUBLISHING_AUTHENTICATOR_IS_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_TYPE_FACTORY))
+#define PUBLISHING_AUTHENTICATOR_IS_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_TYPE_FACTORY))
+#define PUBLISHING_AUTHENTICATOR_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactoryClass))
+
+typedef struct _PublishingAuthenticatorFactory PublishingAuthenticatorFactory;
+typedef struct _PublishingAuthenticatorFactoryClass PublishingAuthenticatorFactoryClass;
+typedef struct _PublishingAuthenticatorFactoryPrivate PublishingAuthenticatorFactoryPrivate;
+#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#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))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_IS_FLICKR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_FLICKR_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FLICKR_TYPE_FLICKR, PublishingAuthenticatorShotwellFlickrFlickrClass))
+
+typedef struct _PublishingAuthenticatorShotwellFlickrFlickr PublishingAuthenticatorShotwellFlickrFlickr;
+typedef struct _PublishingAuthenticatorShotwellFlickrFlickrClass PublishingAuthenticatorShotwellFlickrFlickrClass;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK (publishing_authenticator_shotwell_facebook_facebook_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebook))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebookClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_IS_FACEBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_FACEBOOK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_FACEBOOK_TYPE_FACEBOOK, PublishingAuthenticatorShotwellFacebookFacebookClass))
+
+typedef struct _PublishingAuthenticatorShotwellFacebookFacebook PublishingAuthenticatorShotwellFacebookFacebook;
+typedef struct _PublishingAuthenticatorShotwellFacebookFacebookClass PublishingAuthenticatorShotwellFacebookFacebookClass;
+
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE (publishing_authenticator_shotwell_google_google_get_type ())
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogle))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogleClass))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_IS_GOOGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE))
+#define PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_GOOGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_AUTHENTICATOR_SHOTWELL_GOOGLE_TYPE_GOOGLE, PublishingAuthenticatorShotwellGoogleGoogleClass))
+
+typedef struct _PublishingAuthenticatorShotwellGoogleGoogle PublishingAuthenticatorShotwellGoogleGoogle;
+typedef struct _PublishingAuthenticatorShotwellGoogleGoogleClass PublishingAuthenticatorShotwellGoogleGoogleClass;
+
+struct _PublishingAuthenticatorFactory {
+	GObject parent_instance;
+	PublishingAuthenticatorFactoryPrivate * priv;
+};
+
+struct _PublishingAuthenticatorFactoryClass {
+	GObjectClass parent_class;
+};
+
+
+static gpointer publishing_authenticator_factory_parent_class = NULL;
+static PublishingAuthenticatorFactory* publishing_authenticator_factory_instance;
+static PublishingAuthenticatorFactory* publishing_authenticator_factory_instance = NULL;
+static SpitPublishingAuthenticatorFactoryIface* publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = NULL;
+
+GType publishing_authenticator_factory_get_type (void) G_GNUC_CONST;
+enum  {
+	PUBLISHING_AUTHENTICATOR_FACTORY_DUMMY_PROPERTY
+};
+PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (void);
+PublishingAuthenticatorFactory* publishing_authenticator_factory_new (void);
+PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GType object_type);
+static GeeList* publishing_authenticator_factory_real_get_available_authenticators (SpitPublishingAuthenticatorFactory* base);
+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_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);
+GType publishing_authenticator_shotwell_facebook_facebook_get_type (void) G_GNUC_CONST;
+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;
+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"
+}
+
+
+PublishingAuthenticatorFactory* publishing_authenticator_factory_get_instance (void) {
+	PublishingAuthenticatorFactory* result = NULL;
+	PublishingAuthenticatorFactory* _tmp0_ = NULL;
+	PublishingAuthenticatorFactory* _tmp2_ = NULL;
+	PublishingAuthenticatorFactory* _tmp3_ = NULL;
+#line 6 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	_tmp0_ = publishing_authenticator_factory_instance;
+#line 6 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	if (_tmp0_ == NULL) {
+#line 109 "ShotwellAuthenticatorFactory.c"
+		PublishingAuthenticatorFactory* _tmp1_ = NULL;
+#line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+		_tmp1_ = publishing_authenticator_factory_new ();
+#line 7 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+		_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 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	_tmp2_ = publishing_authenticator_factory_instance;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	_tmp3_ = _g_object_ref0 (_tmp2_);
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	result = _tmp3_;
+#line 10 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	return result;
+#line 127 "ShotwellAuthenticatorFactory.c"
+}
+
+
+static GeeList* publishing_authenticator_factory_real_get_available_authenticators (SpitPublishingAuthenticatorFactory* base) {
+	PublishingAuthenticatorFactory * self;
+	GeeList* result = NULL;
+	GeeArrayList* list = NULL;
+	GeeArrayList* _tmp0_ = NULL;
+#line 13 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_AUTHENTICATOR_TYPE_FACTORY, PublishingAuthenticatorFactory);
+#line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+#line 14 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	list = _tmp0_;
+#line 15 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), "flickr");
+#line 16 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), "facebook");
+#line 17 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	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"
+	result = G_TYPE_CHECK_INSTANCE_CAST (list, GEE_TYPE_LIST, GeeList);
+#line 20 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	return result;
+#line 154 "ShotwellAuthenticatorFactory.c"
+}
+
+
+static SpitPublishingAuthenticator* publishing_authenticator_factory_real_create (SpitPublishingAuthenticatorFactory* base, const gchar* provider, SpitPublishingPluginHost* host) {
+	PublishingAuthenticatorFactory * self;
+	SpitPublishingAuthenticator* result = NULL;
+	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp1_ = NULL;
+	GQuark _tmp3_ = 0U;
+#line 25 "/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"
+	static GQuark _tmp2_label1 = 0;
+#line 25 "/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"
+	static GQuark _tmp2_label3 = 0;
+#line 23 "/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"
+	g_return_val_if_fail (provider != NULL, NULL);
+#line 23 "/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"
+	_tmp0_ = provider;
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	_tmp1_ = _tmp0_;
+#line 25 "/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"
+	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"
+		switch (0) {
+#line 188 "ShotwellAuthenticatorFactory.c"
+			default:
+			{
+				SpitPublishingPluginHost* _tmp4_ = NULL;
+				PublishingAuthenticatorShotwellFlickrFlickr* _tmp5_ = NULL;
+#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp4_ = host;
+#line 27 "/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"
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+#line 27 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				return result;
+#line 201 "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"
+		switch (0) {
+#line 207 "ShotwellAuthenticatorFactory.c"
+			default:
+			{
+				SpitPublishingPluginHost* _tmp6_ = NULL;
+				PublishingAuthenticatorShotwellFacebookFacebook* _tmp7_ = NULL;
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp6_ = host;
+#line 29 "/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"
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+#line 29 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				return result;
+#line 220 "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"
+		switch (0) {
+#line 226 "ShotwellAuthenticatorFactory.c"
+			default:
+			{
+				const gchar* _tmp8_ = NULL;
+				SpitPublishingPluginHost* _tmp9_ = NULL;
+				PublishingAuthenticatorShotwellGoogleGoogle* _tmp10_ = NULL;
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp8_ = _ ("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.");
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp9_ = host;
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp10_ = publishing_authenticator_shotwell_google_google_new ("https://picasaweb.google.com/data/", _tmp8_, _tmp9_);
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+#line 31 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				return result;
+#line 242 "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"
+		switch (0) {
+#line 248 "ShotwellAuthenticatorFactory.c"
+			default:
+			{
+				const gchar* _tmp11_ = NULL;
+				SpitPublishingPluginHost* _tmp12_ = NULL;
+				PublishingAuthenticatorShotwellGoogleGoogle* _tmp13_ = NULL;
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp11_ = _ ("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.");
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp12_ = host;
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				_tmp13_ = publishing_authenticator_shotwell_google_google_new ("https://gdata.youtube.com/", _tmp11_, _tmp12_);
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				result = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator);
+#line 34 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				return result;
+#line 264 "ShotwellAuthenticatorFactory.c"
+			}
+		}
+	} else {
+#line 25 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+		switch (0) {
+#line 270 "ShotwellAuthenticatorFactory.c"
+			default:
+			{
+#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				result = NULL;
+#line 36 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+				return result;
+#line 277 "ShotwellAuthenticatorFactory.c"
+			}
+		}
+	}
+}
+
+
+PublishingAuthenticatorFactory* publishing_authenticator_factory_construct (GType object_type) {
+	PublishingAuthenticatorFactory * self = NULL;
+#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	self = (PublishingAuthenticatorFactory*) g_object_new (object_type, NULL);
+#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	return self;
+#line 290 "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 297 "ShotwellAuthenticatorFactory.c"
+}
+
+
+static void publishing_authenticator_factory_class_init (PublishingAuthenticatorFactoryClass * klass) {
+#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	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 306 "ShotwellAuthenticatorFactory.c"
+}
+
+
+static void publishing_authenticator_factory_spit_publishing_authenticator_factory_interface_init (SpitPublishingAuthenticatorFactoryIface * iface) {
+#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	publishing_authenticator_factory_spit_publishing_authenticator_factory_parent_iface = g_type_interface_peek_parent (iface);
+#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	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 317 "ShotwellAuthenticatorFactory.c"
+}
+
+
+static void publishing_authenticator_factory_instance_init (PublishingAuthenticatorFactory * self) {
+}
+
+
+static void publishing_authenticator_factory_finalize (GObject* obj) {
+	PublishingAuthenticatorFactory * self;
+#line 2 "/home/jens/Source/shotwell/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala"
+	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 331 "ShotwellAuthenticatorFactory.c"
+}
+
+
+GType publishing_authenticator_factory_get_type (void) {
+	static volatile gsize publishing_authenticator_factory_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_authenticator_factory_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingAuthenticatorFactoryClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_authenticator_factory_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingAuthenticatorFactory), 0, (GInstanceInitFunc) publishing_authenticator_factory_instance_init, NULL };
+		static const GInterfaceInfo spit_publishing_authenticator_factory_info = { (GInterfaceInitFunc) publishing_authenticator_factory_spit_publishing_authenticator_factory_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_authenticator_factory_type_id;
+		publishing_authenticator_factory_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingAuthenticatorFactory", &g_define_type_info, 0);
+		g_type_add_interface_static (publishing_authenticator_factory_type_id, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, &spit_publishing_authenticator_factory_info);
+		g_once_init_leave (&publishing_authenticator_factory_type_id__volatile, publishing_authenticator_factory_type_id);
+	}
+	return publishing_authenticator_factory_type_id__volatile;
+}
+
+
+
diff --git a/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
new file mode 100644
index 0000000..17980e6
--- /dev/null
+++ b/plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala
@@ -0,0 +1,40 @@
+namespace Publishing.Authenticator {
+    public class Factory : Spit.Publishing.AuthenticatorFactory, Object {
+        private static Factory instance = null;
+
+        public static Factory get_instance() {
+            if (Factory.instance == null) {
+                Factory.instance = new Factory();
+            }
+
+            return Factory.instance;
+        }
+
+        public Gee.List<string> get_available_authenticators() {
+            var list = new Gee.ArrayList<string>();
+            list.add("flickr");
+            list.add("facebook");
+            list.add("picasa");
+            list.add("youtube");
+
+            return list;
+        }
+
+        public Spit.Publishing.Authenticator? create(string provider,
+                                                     Spit.Publishing.PluginHost host) {
+            switch (provider) {
+                case "flickr":
+                    return new Shotwell.Flickr.Flickr(host);
+                case "facebook":
+                    return new Shotwell.Facebook.Facebook(host);
+                case "picasa":
+                    return new Shotwell.Google.Google("https://picasaweb.google.com/data/", _("You are not currently logged into Picasa Web Albums.\n\nClick 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."), host);
+
+                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);
+                default:
+                    return null;
+            }
+        }
+    }
+}
diff --git a/plugins/shotwell-publishing/flickr_pin_entry_pane.ui b/plugins/authenticator/shotwell/flickr_pin_entry_pane.ui
index dd4c35c..dd4c35c 100644
--- a/plugins/shotwell-publishing/flickr_pin_entry_pane.ui
+++ b/plugins/authenticator/shotwell/flickr_pin_entry_pane.ui
diff --git a/plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml b/plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml
new file mode 100644
index 0000000..c40e700
--- /dev/null
+++ b/plugins/authenticator/shotwell/org.gnome.Shotwell.Authenticator.gresource.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/gnome/Shotwell/Authenticator">
+      <file>flickr_pin_entry_pane.ui</file>
+  </gresource>
+</gresources>
diff --git a/plugins/common/RESTSupport.c b/plugins/common/RESTSupport.c
index b3397f2..1ae73ba 100644
--- a/plugins/common/RESTSupport.c
+++ b/plugins/common/RESTSupport.c
@@ -21,8 +21,6 @@
 #include <libxml/parser.h>
 #include <float.h>
 #include <math.h>
-#include <json-glib/json-glib.h>
-#include <webkit2/webkit2.h>
 #include <gobject/gvaluecollector.h>
 
 #define _g_hmac_unref0(var) ((var == NULL) ? NULL : (var = (g_hmac_unref (var), NULL)))
@@ -143,49 +141,9 @@ typedef struct _PublishingRESTSupportGooglePublisherPrivate PublishingRESTSuppor
 
 typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImpl PublishingRESTSupportGooglePublisherGoogleSessionImpl;
 typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImplClass PublishingRESTSupportGooglePublisherGoogleSessionImplClass;
-
-#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))
-#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
-#define SHOTWELL_PLUGINS_COMMON_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE))
-#define SHOTWELL_PLUGINS_COMMON_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPaneClass))
-
-typedef struct _ShotwellPluginsCommonWebAuthenticationPane ShotwellPluginsCommonWebAuthenticationPane;
-typedef struct _ShotwellPluginsCommonWebAuthenticationPaneClass ShotwellPluginsCommonWebAuthenticationPaneClass;
-
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE (publishing_rest_support_google_publisher_web_authentication_pane_get_type ())
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass))
-
-typedef struct _PublishingRESTSupportGooglePublisherWebAuthenticationPane PublishingRESTSupportGooglePublisherWebAuthenticationPane;
-typedef struct _PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass;
+#define _g_variant_unref0(var) ((var == NULL) ? NULL : (var = (g_variant_unref (var), NULL)))
 typedef struct _PublishingRESTSupportGooglePublisherGoogleSessionImplPrivate PublishingRESTSupportGooglePublisherGoogleSessionImplPrivate;
 
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION (publishing_rest_support_google_publisher_get_access_tokens_transaction_get_type ())
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_ACCESS_TOKENS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION, PublishingRESTSupportGooglePublisherGetAccessTokensTransaction))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_ACCESS_TOKENS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION, PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_GET_ACCESS_TOKENS_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_GET_ACCESS_TOKENS_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_ACCESS_TOKENS_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION, PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass))
-
-typedef struct _PublishingRESTSupportGooglePublisherGetAccessTokensTransaction PublishingRESTSupportGooglePublisherGetAccessTokensTransaction;
-typedef struct _PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass;
-
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION (publishing_rest_support_google_publisher_refresh_access_token_transaction_get_type ())
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_REFRESH_ACCESS_TOKEN_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_REFRESH_ACCESS_TOKEN_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_REFRESH_ACCESS_TOKEN_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_REFRESH_ACCESS_TOKEN_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_REFRESH_ACCESS_TOKEN_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass))
-
-typedef struct _PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction;
-typedef struct _PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass;
-#define _json_object_unref0(var) ((var == NULL) ? NULL : (var = (json_object_unref (var), NULL)))
-
 #define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION (publishing_rest_support_google_publisher_authenticated_transaction_get_type ())
 #define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_AUTHENTICATED_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, PublishingRESTSupportGooglePublisherAuthenticatedTransaction))
 #define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_AUTHENTICATED_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass))
@@ -195,22 +153,7 @@ typedef struct _PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactio
 
 typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransaction PublishingRESTSupportGooglePublisherAuthenticatedTransaction;
 typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass;
-
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION (publishing_rest_support_google_publisher_username_fetch_transaction_get_type ())
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_USERNAME_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION, PublishingRESTSupportGooglePublisherUsernameFetchTransaction))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_USERNAME_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION, PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_USERNAME_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_IS_USERNAME_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION))
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_USERNAME_FETCH_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION, PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass))
-
-typedef struct _PublishingRESTSupportGooglePublisherUsernameFetchTransaction PublishingRESTSupportGooglePublisherUsernameFetchTransaction;
-typedef struct _PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass;
-typedef struct _ShotwellPluginsCommonWebAuthenticationPanePrivate ShotwellPluginsCommonWebAuthenticationPanePrivate;
-typedef struct _PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate;
-typedef struct _PublishingRESTSupportGooglePublisherGetAccessTokensTransactionPrivate PublishingRESTSupportGooglePublisherGetAccessTokensTransactionPrivate;
-typedef struct _PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionPrivate PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionPrivate;
 typedef struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionPrivate PublishingRESTSupportGooglePublisherAuthenticatedTransactionPrivate;
-typedef struct _PublishingRESTSupportGooglePublisherUsernameFetchTransactionPrivate PublishingRESTSupportGooglePublisherUsernameFetchTransactionPrivate;
 #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; }
@@ -359,7 +302,6 @@ struct _PublishingRESTSupportGoogleSessionClass {
 	PublishingRESTSupportSessionClass parent_class;
 	gchar* (*get_user_name) (PublishingRESTSupportGoogleSession* self);
 	gchar* (*get_access_token) (PublishingRESTSupportGoogleSession* self);
-	gchar* (*get_refresh_token) (PublishingRESTSupportGoogleSession* self);
 	void (*deauthenticate) (PublishingRESTSupportGoogleSession* self);
 };
 
@@ -370,6 +312,7 @@ struct _PublishingRESTSupportGooglePublisher {
 
 struct _PublishingRESTSupportGooglePublisherClass {
 	GObjectClass parent_class;
+	SpitPublishingAuthenticator* (*get_authenticator) (PublishingRESTSupportGooglePublisher* self);
 	void (*on_login_flow_complete) (PublishingRESTSupportGooglePublisher* self);
 	void (*do_logout) (PublishingRESTSupportGooglePublisher* self);
 	gboolean (*is_running) (PublishingRESTSupportGooglePublisher* self);
@@ -380,9 +323,9 @@ struct _PublishingRESTSupportGooglePublisherClass {
 struct _PublishingRESTSupportGooglePublisherPrivate {
 	gchar* scope;
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* session;
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane* web_auth_pane;
 	SpitPublishingPluginHost* host;
 	SpitPublishingService* service;
+	SpitPublishingAuthenticator* authenticator;
 };
 
 struct _PublishingRESTSupportGooglePublisherGoogleSessionImpl {
@@ -397,43 +340,6 @@ struct _PublishingRESTSupportGooglePublisherGoogleSessionImplClass {
 	PublishingRESTSupportGoogleSessionClass parent_class;
 };
 
-struct _ShotwellPluginsCommonWebAuthenticationPane {
-	GObject parent_instance;
-	ShotwellPluginsCommonWebAuthenticationPanePrivate * priv;
-};
-
-struct _ShotwellPluginsCommonWebAuthenticationPaneClass {
-	GObjectClass parent_class;
-	void (*on_page_load) (ShotwellPluginsCommonWebAuthenticationPane* self);
-};
-
-struct _PublishingRESTSupportGooglePublisherWebAuthenticationPane {
-	ShotwellPluginsCommonWebAuthenticationPane parent_instance;
-	PublishingRESTSupportGooglePublisherWebAuthenticationPanePrivate * priv;
-};
-
-struct _PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass {
-	ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
-};
-
-struct _PublishingRESTSupportGooglePublisherGetAccessTokensTransaction {
-	PublishingRESTSupportTransaction parent_instance;
-	PublishingRESTSupportGooglePublisherGetAccessTokensTransactionPrivate * priv;
-};
-
-struct _PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass {
-	PublishingRESTSupportTransactionClass parent_class;
-};
-
-struct _PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction {
-	PublishingRESTSupportTransaction parent_instance;
-	PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionPrivate * priv;
-};
-
-struct _PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass {
-	PublishingRESTSupportTransactionClass parent_class;
-};
-
 struct _PublishingRESTSupportGooglePublisherAuthenticatedTransaction {
 	PublishingRESTSupportTransaction parent_instance;
 	PublishingRESTSupportGooglePublisherAuthenticatedTransactionPrivate * priv;
@@ -443,15 +349,6 @@ struct _PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass {
 	PublishingRESTSupportTransactionClass parent_class;
 };
 
-struct _PublishingRESTSupportGooglePublisherUsernameFetchTransaction {
-	PublishingRESTSupportGooglePublisherAuthenticatedTransaction parent_instance;
-	PublishingRESTSupportGooglePublisherUsernameFetchTransactionPrivate * priv;
-};
-
-struct _PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass {
-	PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass parent_class;
-};
-
 
 static gpointer publishing_rest_support_session_parent_class = NULL;
 static gpointer publishing_rest_support_argument_parent_class = NULL;
@@ -462,13 +359,7 @@ static gpointer publishing_rest_support_batch_uploader_parent_class = NULL;
 static gpointer publishing_rest_support_google_session_parent_class = NULL;
 static gpointer publishing_rest_support_google_publisher_parent_class = NULL;
 static gpointer publishing_rest_support_google_publisher_google_session_impl_parent_class = NULL;
-static gpointer publishing_rest_support_google_publisher_web_authentication_pane_parent_class = NULL;
-static gboolean publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty;
-static gboolean publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty = FALSE;
-static gpointer publishing_rest_support_google_publisher_get_access_tokens_transaction_parent_class = NULL;
-static gpointer publishing_rest_support_google_publisher_refresh_access_token_transaction_parent_class = NULL;
 static gpointer publishing_rest_support_google_publisher_authenticated_transaction_parent_class = NULL;
-static gpointer publishing_rest_support_google_publisher_username_fetch_transaction_parent_class = NULL;
 static SpitPublishingPublisherIface* publishing_rest_support_google_publisher_spit_publishing_publisher_parent_iface = NULL;
 
 #define PUBLISHING_REST_SUPPORT_SHA1_HMAC_LENGTH 20
@@ -630,15 +521,11 @@ gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSuppo
 static gchar* publishing_rest_support_google_session_real_get_user_name (PublishingRESTSupportGoogleSession* self);
 gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self);
 static gchar* publishing_rest_support_google_session_real_get_access_token (PublishingRESTSupportGoogleSession* self);
-gchar* publishing_rest_support_google_session_get_refresh_token (PublishingRESTSupportGoogleSession* self);
-static gchar* publishing_rest_support_google_session_real_get_refresh_token (PublishingRESTSupportGoogleSession* self);
 void publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self);
 static void publishing_rest_support_google_session_real_deauthenticate (PublishingRESTSupportGoogleSession* self);
 PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_construct (GType object_type);
 GType publishing_rest_support_google_publisher_get_type (void) G_GNUC_CONST;
 static GType publishing_rest_support_google_publisher_google_session_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-GType shotwell_plugins_common_web_authentication_pane_get_type (void) G_GNUC_CONST;
-static GType publishing_rest_support_google_publisher_web_authentication_pane_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisherPrivate))
 enum  {
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_DUMMY_PROPERTY
@@ -649,49 +536,17 @@ enum  {
 PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host, const gchar* scope);
 static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void);
 static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_construct (GType object_type);
-static void publishing_rest_support_google_publisher_on_web_auth_pane_authorized (PublishingRESTSupportGooglePublisher* self, const gchar* auth_code);
-static void _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized (PublishingRESTSupportGooglePublisherWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self);
-gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self);
-static void publishing_rest_support_google_publisher_do_get_access_tokens (PublishingRESTSupportGooglePublisher* self, const gchar* auth_code);
-static void publishing_rest_support_google_publisher_on_get_access_tokens_complete (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_rest_support_google_publisher_on_get_access_tokens_error (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rest_support_google_publisher_do_extract_tokens (PublishingRESTSupportGooglePublisher* self, const gchar* response_body);
-static void publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self);
-static void publishing_rest_support_google_publisher_on_refresh_token_available (PublishingRESTSupportGooglePublisher* self, const gchar* token);
-static void publishing_rest_support_google_publisher_on_access_token_available (PublishingRESTSupportGooglePublisher* self, const gchar* token);
-static void publishing_rest_support_google_publisher_do_fetch_username (PublishingRESTSupportGooglePublisher* self);
-static void publishing_rest_support_google_publisher_on_fetch_username_transaction_completed (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_rest_support_google_publisher_on_fetch_username_transaction_error (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_rest_support_google_publisher_do_extract_username (PublishingRESTSupportGooglePublisher* self, const gchar* response_body);
-static GType publishing_rest_support_google_publisher_get_access_tokens_transaction_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishing_rest_support_google_publisher_get_access_tokens_transaction_new (PublishingRESTSupportSession* session, const gchar* auth_code);
-static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishing_rest_support_google_publisher_get_access_tokens_transaction_construct (GType object_type, PublishingRESTSupportSession* session, const gchar* auth_code);
-static void publishing_rest_support_google_publisher_do_hosted_web_authentication (PublishingRESTSupportGooglePublisher* self);
-static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_rest_support_google_publisher_web_authentication_pane_new (const gchar* auth_sequence_start_url);
-static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_rest_support_google_publisher_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url);
-static void publishing_rest_support_google_publisher_do_exchange_refresh_token_for_access_token (PublishingRESTSupportGooglePublisher* self);
-static GType publishing_rest_support_google_publisher_refresh_access_token_transaction_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publishing_rest_support_google_publisher_refresh_access_token_transaction_new (PublishingRESTSupportSession* session);
-static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publishing_rest_support_google_publisher_refresh_access_token_transaction_construct (GType object_type, PublishingRESTSupportSession* session);
-GType publishing_rest_support_google_publisher_authenticated_transaction_get_type (void) G_GNUC_CONST;
-static GType publishing_rest_support_google_publisher_username_fetch_transaction_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_rest_support_google_publisher_username_fetch_transaction_new (PublishingRESTSupportGoogleSession* session);
-static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_rest_support_google_publisher_username_fetch_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session);
-void publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self);
+SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self);
+static void publishing_rest_support_google_publisher_on_authenticator_authenticated (PublishingRESTSupportGooglePublisher* self);
+static void _publishing_rest_support_google_publisher_on_authenticator_authenticated_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self);
+static SpitPublishingAuthenticator* publishing_rest_support_google_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* self);
 SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self);
 PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self);
-void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSupportGooglePublisher* self, const gchar* refresh_token);
-static gboolean publishing_rest_support_google_publisher_web_authentication_pane_is_cache_dirty (void);
+void publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self);
 static void publishing_rest_support_google_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self);
+void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self);
 static void publishing_rest_support_google_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* self);
+gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self);
 static gboolean publishing_rest_support_google_publisher_real_is_running (PublishingRESTSupportGooglePublisher* self);
 void publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self);
 static void publishing_rest_support_google_publisher_real_start (PublishingRESTSupportGooglePublisher* self);
@@ -704,23 +559,9 @@ enum  {
 static gboolean publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated (PublishingRESTSupportSession* base);
 static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_user_name (PublishingRESTSupportGoogleSession* base);
 static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_access_token (PublishingRESTSupportGoogleSession* base);
-static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_refresh_token (PublishingRESTSupportGoogleSession* base);
 static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base);
 static void publishing_rest_support_google_publisher_google_session_impl_finalize (PublishingRESTSupportSession* obj);
-enum  {
-	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
-static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
-WebKitWebView* shotwell_plugins_common_web_authentication_pane_get_view (ShotwellPluginsCommonWebAuthenticationPane* self);
-static void publishing_rest_support_google_publisher_web_authentication_pane_finalize (GObject* obj);
-enum  {
-	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_ACCESS_TOKENS_TRANSACTION_DUMMY_PROPERTY
-};
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL "https://accounts.google.com/o/oauth2/token"
-enum  {
-	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_REFRESH_ACCESS_TOKEN_TRANSACTION_DUMMY_PROPERTY
-};
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL "https://accounts.google.com/o/oauth2/token"
+GType publishing_rest_support_google_publisher_authenticated_transaction_get_type (void) G_GNUC_CONST;
 enum  {
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_AUTHENTICATED_TRANSACTION_DUMMY_PROPERTY
 };
@@ -728,10 +569,6 @@ static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_
 static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method);
 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);
-enum  {
-	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_USERNAME_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-#define PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL "https://www.googleapis.com/oauth2/v1/userinfo"
 static void publishing_rest_support_google_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);
@@ -777,13 +614,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 780 "RESTSupport.c"
+#line 617 "RESTSupport.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 786 "RESTSupport.c"
+#line 623 "RESTSupport.c"
 }
 
 
@@ -845,7 +682,7 @@ gchar* publishing_rest_support_hmac_sha1 (const gchar* key, const gchar* message
 	_g_hmac_unref0 (mac);
 #line 22 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 848 "RESTSupport.c"
+#line 685 "RESTSupport.c"
 }
 
 
@@ -877,7 +714,7 @@ PublishingRESTSupportSession* publishing_rest_support_session_construct (GType o
 	g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
 #line 34 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 880 "RESTSupport.c"
+#line 717 "RESTSupport.c"
 }
 
 
@@ -891,7 +728,7 @@ void publishing_rest_support_session_notify_wire_message_unqueued (PublishingRES
 	_tmp0_ = message;
 #line 41 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "wire-message-unqueued", _tmp0_);
-#line 894 "RESTSupport.c"
+#line 731 "RESTSupport.c"
 }
 
 
@@ -900,7 +737,7 @@ void publishing_rest_support_session_notify_authenticated (PublishingRESTSupport
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self));
 #line 45 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "authenticated");
-#line 903 "RESTSupport.c"
+#line 740 "RESTSupport.c"
 }
 
 
@@ -912,7 +749,7 @@ void publishing_rest_support_session_notify_authentication_failed (PublishingRES
 	_tmp0_ = err;
 #line 49 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "authentication-failed", _tmp0_);
-#line 915 "RESTSupport.c"
+#line 752 "RESTSupport.c"
 }
 
 
@@ -921,7 +758,7 @@ static gboolean publishing_rest_support_session_real_is_authenticated (Publishin
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_session_is_authenticated'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return FALSE;
-#line 924 "RESTSupport.c"
+#line 761 "RESTSupport.c"
 }
 
 
@@ -930,7 +767,7 @@ gboolean publishing_rest_support_session_is_authenticated (PublishingRESTSupport
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (self), FALSE);
 #line 52 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->is_authenticated (self);
-#line 933 "RESTSupport.c"
+#line 770 "RESTSupport.c"
 }
 
 
@@ -948,7 +785,7 @@ gchar* publishing_rest_support_session_get_endpoint_url (PublishingRESTSupportSe
 	result = _tmp1_;
 #line 55 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 951 "RESTSupport.c"
+#line 788 "RESTSupport.c"
 }
 
 
@@ -962,7 +799,7 @@ void publishing_rest_support_session_stop_transactions (PublishingRESTSupportSes
 	_tmp0_ = self->priv->soup_session;
 #line 60 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_session_abort (_tmp0_);
-#line 965 "RESTSupport.c"
+#line 802 "RESTSupport.c"
 }
 
 
@@ -977,14 +814,14 @@ gboolean publishing_rest_support_session_are_transactions_stopped (PublishingRES
 	result = _tmp0_;
 #line 64 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 980 "RESTSupport.c"
+#line 817 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
 #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_session_notify_wire_message_unqueued ((PublishingRESTSupportSession*) self, msg);
-#line 987 "RESTSupport.c"
+#line 824 "RESTSupport.c"
 }
 
 
@@ -1005,7 +842,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
 	if (_tmp0_) {
 #line 69 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 1008 "RESTSupport.c"
+#line 845 "RESTSupport.c"
 	}
 #line 71 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->priv->soup_session;
@@ -1023,7 +860,7 @@ void publishing_rest_support_session_send_wire_message (PublishingRESTSupportSes
 	g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp5_, NULL, FALSE);
 #line 74 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_rest_support_session_notify_wire_message_unqueued_soup_session_request_unqueued, self);
-#line 1026 "RESTSupport.c"
+#line 863 "RESTSupport.c"
 }
 
 
@@ -1040,14 +877,14 @@ void publishing_rest_support_session_set_insecure (PublishingRESTSupportSession*
 	_tmp1_ = self->priv->soup_session;
 #line 79 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_object_set (_tmp1_, "ssl-strict", FALSE, NULL);
-#line 1043 "RESTSupport.c"
+#line 880 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_session_init (GValue* value) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 1050 "RESTSupport.c"
+#line 887 "RESTSupport.c"
 }
 
 
@@ -1056,7 +893,7 @@ static void publishing_rest_support_value_session_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (value->data[0].v_pointer);
-#line 1059 "RESTSupport.c"
+#line 896 "RESTSupport.c"
 	}
 }
 
@@ -1066,11 +903,11 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
 	if (src_value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_session_ref (src_value->data[0].v_pointer);
-#line 1069 "RESTSupport.c"
+#line 906 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1073 "RESTSupport.c"
+#line 910 "RESTSupport.c"
 	}
 }
 
@@ -1078,37 +915,37 @@ static void publishing_rest_support_value_session_copy_value (const GValue* src_
 static gpointer publishing_rest_support_value_session_peek_pointer (const GValue* value) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1081 "RESTSupport.c"
+#line 918 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 1088 "RESTSupport.c"
+#line 925 "RESTSupport.c"
 		PublishingRESTSupportSession* object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1095 "RESTSupport.c"
+#line 932 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1099 "RESTSupport.c"
+#line 936 "RESTSupport.c"
 		}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_session_ref (object);
-#line 1103 "RESTSupport.c"
+#line 940 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1107 "RESTSupport.c"
+#line 944 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1111 "RESTSupport.c"
+#line 948 "RESTSupport.c"
 }
 
 
@@ -1119,25 +956,25 @@ static gchar* publishing_rest_support_value_session_lcopy_value (const GValue* v
 	if (!object_p) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1122 "RESTSupport.c"
+#line 959 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 1128 "RESTSupport.c"
+#line 965 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1132 "RESTSupport.c"
+#line 969 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1136 "RESTSupport.c"
+#line 973 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1140 "RESTSupport.c"
+#line 977 "RESTSupport.c"
 }
 
 
@@ -1151,7 +988,7 @@ GParamSpec* publishing_rest_support_param_spec_session (const gchar* name, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 1154 "RESTSupport.c"
+#line 991 "RESTSupport.c"
 }
 
 
@@ -1160,7 +997,7 @@ gpointer publishing_rest_support_value_get_session (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_SESSION), NULL);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1163 "RESTSupport.c"
+#line 1000 "RESTSupport.c"
 }
 
 
@@ -1180,17 +1017,17 @@ void publishing_rest_support_value_set_session (GValue* value, gpointer v_object
 		value->data[0].v_pointer = v_object;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_ref (value->data[0].v_pointer);
-#line 1183 "RESTSupport.c"
+#line 1020 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1187 "RESTSupport.c"
+#line 1024 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (old);
-#line 1193 "RESTSupport.c"
+#line 1030 "RESTSupport.c"
 	}
 }
 
@@ -1209,17 +1046,17 @@ void publishing_rest_support_value_take_session (GValue* value, gpointer v_objec
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1212 "RESTSupport.c"
+#line 1049 "RESTSupport.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1216 "RESTSupport.c"
+#line 1053 "RESTSupport.c"
 	}
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_session_unref (old);
-#line 1222 "RESTSupport.c"
+#line 1059 "RESTSupport.c"
 	}
 }
 
@@ -1239,7 +1076,7 @@ static void publishing_rest_support_session_class_init (PublishingRESTSupportSes
 	g_signal_new ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("authentication_failed", PUBLISHING_REST_SUPPORT_TYPE_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 1242 "RESTSupport.c"
+#line 1079 "RESTSupport.c"
 }
 
 
@@ -1254,7 +1091,7 @@ static void publishing_rest_support_session_instance_init (PublishingRESTSupport
 	self->priv->transactions_stopped = FALSE;
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 1257 "RESTSupport.c"
+#line 1094 "RESTSupport.c"
 }
 
 
@@ -1268,7 +1105,7 @@ static void publishing_rest_support_session_finalize (PublishingRESTSupportSessi
 	_g_free0 (self->priv->endpoint_url);
 #line 27 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_object_unref0 (self->priv->soup_session);
-#line 1271 "RESTSupport.c"
+#line 1108 "RESTSupport.c"
 }
 
 
@@ -1293,7 +1130,7 @@ gpointer publishing_rest_support_session_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 1296 "RESTSupport.c"
+#line 1133 "RESTSupport.c"
 }
 
 
@@ -1306,7 +1143,7 @@ void publishing_rest_support_session_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_SESSION_GET_CLASS (self)->finalize (self);
 #line 25 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1309 "RESTSupport.c"
+#line 1146 "RESTSupport.c"
 	}
 }
 
@@ -1317,7 +1154,7 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
 	switch (self) {
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET:
-#line 1320 "RESTSupport.c"
+#line 1157 "RESTSupport.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1326,11 +1163,11 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
 			result = _tmp0_;
 #line 91 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1329 "RESTSupport.c"
+#line 1166 "RESTSupport.c"
 		}
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT:
-#line 1333 "RESTSupport.c"
+#line 1170 "RESTSupport.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1339,11 +1176,11 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
 			result = _tmp1_;
 #line 94 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1342 "RESTSupport.c"
+#line 1179 "RESTSupport.c"
 		}
 #line 89 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST:
-#line 1346 "RESTSupport.c"
+#line 1183 "RESTSupport.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1352,13 +1189,13 @@ gchar* publishing_rest_support_http_method_to_string (PublishingRESTSupportHttpM
 			result = _tmp2_;
 #line 97 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1355 "RESTSupport.c"
+#line 1192 "RESTSupport.c"
 		}
 		default:
 		{
 #line 100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_error ("RESTSupport.vala:100: unrecognized HTTP method enumeration value");
-#line 1361 "RESTSupport.c"
+#line 1198 "RESTSupport.c"
 		}
 	}
 }
@@ -1377,7 +1214,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
 		result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET;
 #line 106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return result;
-#line 1380 "RESTSupport.c"
+#line 1217 "RESTSupport.c"
 	} else {
 		const gchar* _tmp1_ = NULL;
 #line 107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1388,7 +1225,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
 			result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_PUT;
 #line 108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 1391 "RESTSupport.c"
+#line 1228 "RESTSupport.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 #line 109 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -1399,14 +1236,14 @@ PublishingRESTSupportHttpMethod publishing_rest_support_http_method_from_string
 				result = PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST;
 #line 110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return result;
-#line 1402 "RESTSupport.c"
+#line 1239 "RESTSupport.c"
 			} else {
 				const gchar* _tmp3_ = NULL;
 #line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp3_ = str;
 #line 112 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_error ("RESTSupport.vala:112: unrecognized HTTP method name: %s", _tmp3_);
-#line 1409 "RESTSupport.c"
+#line 1246 "RESTSupport.c"
 			}
 		}
 	}
@@ -1455,14 +1292,14 @@ PublishingRESTSupportArgument* publishing_rest_support_argument_construct (GType
 	self->value = _tmp3_;
 #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1458 "RESTSupport.c"
+#line 1295 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportArgument* publishing_rest_support_argument_new (const gchar* key, const gchar* value) {
 #line 121 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_argument_construct (PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT, key, value);
-#line 1465 "RESTSupport.c"
+#line 1302 "RESTSupport.c"
 }
 
 
@@ -1494,7 +1331,7 @@ gint publishing_rest_support_argument_compare (PublishingRESTSupportArgument* ar
 	result = _tmp5_;
 #line 127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1497 "RESTSupport.c"
+#line 1334 "RESTSupport.c"
 }
 
 
@@ -1503,14 +1340,14 @@ static gint _publishing_rest_support_argument_compare_gcompare_data_func (gconst
 	result = publishing_rest_support_argument_compare ((PublishingRESTSupportArgument*) a, (PublishingRESTSupportArgument*) b);
 #line 131 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1506 "RESTSupport.c"
+#line 1343 "RESTSupport.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 1513 "RESTSupport.c"
+#line 1350 "RESTSupport.c"
 }
 
 
@@ -1533,7 +1370,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 	_tmp1_ = inputArray;
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1__length1 = inputArray_length1;
-#line 1536 "RESTSupport.c"
+#line 1373 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
@@ -1545,14 +1382,14 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 		arg_collection_length1 = _tmp1__length1;
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (arg_it = 0; arg_it < _tmp1__length1; arg_it = arg_it + 1) {
-#line 1548 "RESTSupport.c"
+#line 1385 "RESTSupport.c"
 			PublishingRESTSupportArgument* _tmp2_ = NULL;
 			PublishingRESTSupportArgument* arg = NULL;
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			arg = _tmp2_;
-#line 1555 "RESTSupport.c"
+#line 1392 "RESTSupport.c"
 			{
 				GeeTreeSet* _tmp3_ = NULL;
 				PublishingRESTSupportArgument* _tmp4_ = NULL;
@@ -1564,7 +1401,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 				gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp4_);
 #line 133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_argument_unref0 (arg);
-#line 1567 "RESTSupport.c"
+#line 1404 "RESTSupport.c"
 			}
 		}
 	}
@@ -1580,7 +1417,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 	if (result_length1) {
 #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp8__length1;
-#line 1583 "RESTSupport.c"
+#line 1420 "RESTSupport.c"
 	}
 #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp8_;
@@ -1588,7 +1425,7 @@ PublishingRESTSupportArgument** publishing_rest_support_argument_sort (Publishin
 	_g_object_unref0 (sorted_args);
 #line 136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1591 "RESTSupport.c"
+#line 1428 "RESTSupport.c"
 }
 
 
@@ -1609,14 +1446,14 @@ gchar* publishing_rest_support_argument_to_string (PublishingRESTSupportArgument
 	result = _tmp2_;
 #line 140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 1612 "RESTSupport.c"
+#line 1449 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_argument_init (GValue* value) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 1619 "RESTSupport.c"
+#line 1456 "RESTSupport.c"
 }
 
 
@@ -1625,7 +1462,7 @@ static void publishing_rest_support_value_argument_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (value->data[0].v_pointer);
-#line 1628 "RESTSupport.c"
+#line 1465 "RESTSupport.c"
 	}
 }
 
@@ -1635,11 +1472,11 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src
 	if (src_value->data[0].v_pointer) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_argument_ref (src_value->data[0].v_pointer);
-#line 1638 "RESTSupport.c"
+#line 1475 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1642 "RESTSupport.c"
+#line 1479 "RESTSupport.c"
 	}
 }
 
@@ -1647,37 +1484,37 @@ static void publishing_rest_support_value_argument_copy_value (const GValue* src
 static gpointer publishing_rest_support_value_argument_peek_pointer (const GValue* value) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1650 "RESTSupport.c"
+#line 1487 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_argument_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 1657 "RESTSupport.c"
+#line 1494 "RESTSupport.c"
 		PublishingRESTSupportArgument* object;
 		object = collect_values[0].v_pointer;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1664 "RESTSupport.c"
+#line 1501 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1668 "RESTSupport.c"
+#line 1505 "RESTSupport.c"
 		}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_argument_ref (object);
-#line 1672 "RESTSupport.c"
+#line 1509 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1676 "RESTSupport.c"
+#line 1513 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1680 "RESTSupport.c"
+#line 1517 "RESTSupport.c"
 }
 
 
@@ -1688,25 +1525,25 @@ static gchar* publishing_rest_support_value_argument_lcopy_value (const GValue*
 	if (!object_p) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1691 "RESTSupport.c"
+#line 1528 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 1697 "RESTSupport.c"
+#line 1534 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1701 "RESTSupport.c"
+#line 1538 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1705 "RESTSupport.c"
+#line 1542 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 1709 "RESTSupport.c"
+#line 1546 "RESTSupport.c"
 }
 
 
@@ -1720,7 +1557,7 @@ GParamSpec* publishing_rest_support_param_spec_argument (const gchar* name, cons
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 1723 "RESTSupport.c"
+#line 1560 "RESTSupport.c"
 }
 
 
@@ -1729,7 +1566,7 @@ gpointer publishing_rest_support_value_get_argument (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_ARGUMENT), NULL);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 1732 "RESTSupport.c"
+#line 1569 "RESTSupport.c"
 }
 
 
@@ -1749,17 +1586,17 @@ void publishing_rest_support_value_set_argument (GValue* value, gpointer v_objec
 		value->data[0].v_pointer = v_object;
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_ref (value->data[0].v_pointer);
-#line 1752 "RESTSupport.c"
+#line 1589 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1756 "RESTSupport.c"
+#line 1593 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (old);
-#line 1762 "RESTSupport.c"
+#line 1599 "RESTSupport.c"
 	}
 }
 
@@ -1778,17 +1615,17 @@ void publishing_rest_support_value_take_argument (GValue* value, gpointer v_obje
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 1781 "RESTSupport.c"
+#line 1618 "RESTSupport.c"
 	} else {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 1785 "RESTSupport.c"
+#line 1622 "RESTSupport.c"
 	}
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_argument_unref (old);
-#line 1791 "RESTSupport.c"
+#line 1628 "RESTSupport.c"
 	}
 }
 
@@ -1798,14 +1635,14 @@ static void publishing_rest_support_argument_class_init (PublishingRESTSupportAr
 	publishing_rest_support_argument_parent_class = g_type_class_peek_parent (klass);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportArgumentClass *) klass)->finalize = publishing_rest_support_argument_finalize;
-#line 1801 "RESTSupport.c"
+#line 1638 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_argument_instance_init (PublishingRESTSupportArgument * self) {
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 1808 "RESTSupport.c"
+#line 1645 "RESTSupport.c"
 }
 
 
@@ -1819,7 +1656,7 @@ static void publishing_rest_support_argument_finalize (PublishingRESTSupportArgu
 	_g_free0 (self->key);
 #line 119 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->value);
-#line 1822 "RESTSupport.c"
+#line 1659 "RESTSupport.c"
 }
 
 
@@ -1844,7 +1681,7 @@ gpointer publishing_rest_support_argument_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 1847 "RESTSupport.c"
+#line 1684 "RESTSupport.c"
 }
 
 
@@ -1857,7 +1694,7 @@ void publishing_rest_support_argument_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_ARGUMENT_GET_CLASS (self)->finalize (self);
 #line 117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1860 "RESTSupport.c"
+#line 1697 "RESTSupport.c"
 	}
 }
 
@@ -1865,7 +1702,7 @@ void publishing_rest_support_argument_unref (gpointer instance) {
 static void _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
 #line 166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_on_wrote_body_data ((PublishingRESTSupportTransaction*) self, chunk);
-#line 1868 "RESTSupport.c"
+#line 1705 "RESTSupport.c"
 }
 
 
@@ -1929,14 +1766,14 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct
 	g_signal_connect (_tmp11_, "wrote-body-data", (GCallback) _publishing_rest_support_transaction_on_wrote_body_data_soup_message_wrote_body_data, self);
 #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1932 "RESTSupport.c"
+#line 1769 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_new (PublishingRESTSupportSession* parent_session, PublishingRESTSupportHttpMethod method) {
 #line 158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, method);
-#line 1939 "RESTSupport.c"
+#line 1776 "RESTSupport.c"
 }
 
 
@@ -1986,14 +1823,14 @@ PublishingRESTSupportTransaction* publishing_rest_support_transaction_construct_
 	_g_free0 (_tmp5_);
 #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 1989 "RESTSupport.c"
+#line 1826 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportTransaction* publishing_rest_support_transaction_new_with_endpoint_url (PublishingRESTSupportSession* parent_session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
 #line 169 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, parent_session, endpoint_url, method);
-#line 1996 "RESTSupport.c"
+#line 1833 "RESTSupport.c"
 }
 
 
@@ -2027,14 +1864,14 @@ static void publishing_rest_support_transaction_on_wrote_body_data (PublishingRE
 	_tmp6_ = _tmp5_->length;
 #line 178 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_emit_by_name (self, "chunk-transmitted", _tmp3_, (gint) _tmp6_);
-#line 2030 "RESTSupport.c"
+#line 1867 "RESTSupport.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
 #line 190 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 2037 "RESTSupport.c"
+#line 1874 "RESTSupport.c"
 }
 
 
@@ -2054,7 +1891,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 	if (_tmp0_ != _tmp1_) {
 #line 183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 2057 "RESTSupport.c"
+#line 1894 "RESTSupport.c"
 	}
 	{
 		SoupMessage* _tmp2_ = NULL;
@@ -2066,7 +1903,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2069 "RESTSupport.c"
+#line 1906 "RESTSupport.c"
 				goto __catch0_spit_publishing_publishing_error;
 			}
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2075,7 +1912,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 			g_clear_error (&_inner_error_);
 #line 186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2078 "RESTSupport.c"
+#line 1915 "RESTSupport.c"
 		}
 	}
 	goto __finally0;
@@ -2116,7 +1953,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 		self->priv->err = _tmp8_;
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (err);
-#line 2119 "RESTSupport.c"
+#line 1956 "RESTSupport.c"
 	}
 	__finally0:
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2127,7 +1964,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 		g_clear_error (&_inner_error_);
 #line 185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 2130 "RESTSupport.c"
+#line 1967 "RESTSupport.c"
 	}
 }
 
@@ -2135,7 +1972,7 @@ static void publishing_rest_support_transaction_on_message_unqueued (PublishingR
 static gpointer _g_object_ref0 (gpointer self) {
 #line 197 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2138 "RESTSupport.c"
+#line 1975 "RESTSupport.c"
 }
 
 
@@ -2186,7 +2023,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 	_tmp5_ = tls_errors;
 #line 200 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp5_ & G_TLS_CERTIFICATE_BAD_IDENTITY) == G_TLS_CERTIFICATE_BAD_IDENTITY) {
-#line 2189 "RESTSupport.c"
+#line 2026 "RESTSupport.c"
 		GeeArrayList* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
 #line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2196,13 +2033,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 "bsite.");
 #line 202 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp7_);
-#line 2198 "RESTSupport.c"
+#line 2035 "RESTSupport.c"
 	}
 #line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = tls_errors;
 #line 205 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp8_ & G_TLS_CERTIFICATE_EXPIRED) == G_TLS_CERTIFICATE_EXPIRED) {
-#line 2204 "RESTSupport.c"
+#line 2041 "RESTSupport.c"
 		GeeArrayList* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 #line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2212,13 +2049,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 " your computer’s calendar.");
 #line 207 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp10_);
-#line 2213 "RESTSupport.c"
+#line 2050 "RESTSupport.c"
 	}
 #line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp11_ = tls_errors;
 #line 210 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp11_ & G_TLS_CERTIFICATE_UNKNOWN_CA) == G_TLS_CERTIFICATE_UNKNOWN_CA) {
-#line 2219 "RESTSupport.c"
+#line 2056 "RESTSupport.c"
 		GeeArrayList* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 #line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2228,13 +2065,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 "on.");
 #line 212 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp13_);
-#line 2228 "RESTSupport.c"
+#line 2065 "RESTSupport.c"
 	}
 #line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp14_ = tls_errors;
 #line 215 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp14_ & G_TLS_CERTIFICATE_GENERIC_ERROR) == G_TLS_CERTIFICATE_GENERIC_ERROR) {
-#line 2234 "RESTSupport.c"
+#line 2071 "RESTSupport.c"
 		GeeArrayList* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 #line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2244,13 +2081,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 "upted.");
 #line 217 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
-#line 2243 "RESTSupport.c"
+#line 2080 "RESTSupport.c"
 	}
 #line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp17_ = tls_errors;
 #line 220 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp17_ & G_TLS_CERTIFICATE_REVOKED) == G_TLS_CERTIFICATE_REVOKED) {
-#line 2249 "RESTSupport.c"
+#line 2086 "RESTSupport.c"
 		GeeArrayList* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
 #line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2260,13 +2097,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 "zation that issued it.");
 #line 222 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_);
-#line 2258 "RESTSupport.c"
+#line 2095 "RESTSupport.c"
 	}
 #line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp20_ = tls_errors;
 #line 225 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp20_ & G_TLS_CERTIFICATE_INSECURE) == G_TLS_CERTIFICATE_INSECURE) {
-#line 2264 "RESTSupport.c"
+#line 2101 "RESTSupport.c"
 		GeeArrayList* _tmp21_ = NULL;
 		const gchar* _tmp22_ = NULL;
 #line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2276,13 +2113,13 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 " weak encryption.");
 #line 227 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp22_);
-#line 2273 "RESTSupport.c"
+#line 2110 "RESTSupport.c"
 	}
 #line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = tls_errors;
 #line 230 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if ((_tmp23_ & G_TLS_CERTIFICATE_NOT_ACTIVATED) == G_TLS_CERTIFICATE_NOT_ACTIVATED) {
-#line 2279 "RESTSupport.c"
+#line 2116 "RESTSupport.c"
 		GeeArrayList* _tmp24_ = NULL;
 		const gchar* _tmp25_ = NULL;
 #line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2292,7 +2129,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 "the date on your computer’s calendar.");
 #line 232 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp25_);
-#line 2288 "RESTSupport.c"
+#line 2125 "RESTSupport.c"
 	}
 #line 235 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp26_ = g_string_new ("");
@@ -2306,7 +2143,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 	_tmp29_ = _tmp28_;
 #line 236 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp29_ == 1) {
-#line 2302 "RESTSupport.c"
+#line 2139 "RESTSupport.c"
 		GString* _tmp30_ = NULL;
 		GeeArrayList* _tmp31_ = NULL;
 		gpointer _tmp32_ = NULL;
@@ -2323,7 +2160,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 		g_string_append (_tmp30_, _tmp33_);
 #line 237 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp33_);
-#line 2319 "RESTSupport.c"
+#line 2156 "RESTSupport.c"
 	} else {
 		{
 			GeeArrayList* _entry_list = NULL;
@@ -2352,7 +2189,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 			_entry_index = -1;
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 2348 "RESTSupport.c"
+#line 2185 "RESTSupport.c"
 				gint _tmp39_ = 0;
 				gint _tmp40_ = 0;
 				gint _tmp41_ = 0;
@@ -2374,7 +2211,7 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 				if (!(_tmp40_ < _tmp41_)) {
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 2370 "RESTSupport.c"
+#line 2207 "RESTSupport.c"
 				}
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp42_ = _entry_list;
@@ -2392,11 +2229,11 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 				g_string_append_printf (_tmp45_, "%s\n", _tmp46_);
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_free0 (entry);
-#line 2388 "RESTSupport.c"
+#line 2225 "RESTSupport.c"
 			}
 #line 239 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (_entry_list);
-#line 2392 "RESTSupport.c"
+#line 2229 "RESTSupport.c"
 		}
 	}
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2415,15 +2252,15 @@ gchar* publishing_rest_support_transaction_detailed_error_from_tls_flags (Publis
 	if (cert) {
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*cert = _vala_cert;
-#line 2411 "RESTSupport.c"
+#line 2248 "RESTSupport.c"
 	} else {
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_object_unref0 (_vala_cert);
-#line 2415 "RESTSupport.c"
+#line 2252 "RESTSupport.c"
 	}
 #line 244 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2419 "RESTSupport.c"
+#line 2256 "RESTSupport.c"
 }
 
 
@@ -2453,17 +2290,17 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 		case SOUP_STATUS_OK:
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CREATED:
-#line 2449 "RESTSupport.c"
+#line 2286 "RESTSupport.c"
 		{
 #line 252 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 2453 "RESTSupport.c"
+#line 2290 "RESTSupport.c"
 		}
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_RESOLVE:
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 2459 "RESTSupport.c"
+#line 2296 "RESTSupport.c"
 		{
 			gchar* _tmp3_ = NULL;
 			gchar* _tmp4_ = NULL;
@@ -2496,7 +2333,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_propagate_error (error, _inner_error_);
 #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2492 "RESTSupport.c"
+#line 2329 "RESTSupport.c"
 			} else {
 #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2504,14 +2341,14 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_clear_error (&_inner_error_);
 #line 256 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2500 "RESTSupport.c"
+#line 2337 "RESTSupport.c"
 			}
 		}
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_CONNECT:
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 2507 "RESTSupport.c"
+#line 2344 "RESTSupport.c"
 		{
 			gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
@@ -2544,7 +2381,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_propagate_error (error, _inner_error_);
 #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2540 "RESTSupport.c"
+#line 2377 "RESTSupport.c"
 			} else {
 #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2552,12 +2389,12 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_clear_error (&_inner_error_);
 #line 261 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2548 "RESTSupport.c"
+#line 2385 "RESTSupport.c"
 			}
 		}
 #line 248 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		case SOUP_STATUS_SSL_FAILED:
-#line 2553 "RESTSupport.c"
+#line 2390 "RESTSupport.c"
 		{
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
@@ -2581,7 +2418,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_propagate_error (error, _inner_error_);
 #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2577 "RESTSupport.c"
+#line 2414 "RESTSupport.c"
 			} else {
 #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2589,7 +2426,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 				g_clear_error (&_inner_error_);
 #line 264 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 2585 "RESTSupport.c"
+#line 2422 "RESTSupport.c"
 			}
 		}
 		default:
@@ -2605,7 +2442,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			_tmp23_ = _tmp22_;
 #line 269 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_tmp23_ >= ((guint) 100)) {
-#line 2601 "RESTSupport.c"
+#line 2438 "RESTSupport.c"
 				gchar* _tmp24_ = NULL;
 				gchar* _tmp25_ = NULL;
 				SoupMessage* _tmp26_ = NULL;
@@ -2651,7 +2488,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_propagate_error (error, _inner_error_);
 #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2647 "RESTSupport.c"
+#line 2484 "RESTSupport.c"
 				} else {
 #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2659,7 +2496,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_clear_error (&_inner_error_);
 #line 270 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2655 "RESTSupport.c"
+#line 2492 "RESTSupport.c"
 				}
 			} else {
 				gchar* _tmp35_ = NULL;
@@ -2693,7 +2530,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_propagate_error (error, _inner_error_);
 #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2689 "RESTSupport.c"
+#line 2526 "RESTSupport.c"
 				} else {
 #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2701,7 +2538,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 					g_clear_error (&_inner_error_);
 #line 273 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 2697 "RESTSupport.c"
+#line 2534 "RESTSupport.c"
 				}
 			}
 		}
@@ -2718,7 +2555,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 	if (_tmp45_ == NULL) {
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = TRUE;
-#line 2714 "RESTSupport.c"
+#line 2551 "RESTSupport.c"
 	} else {
 		SoupMessage* _tmp46_ = NULL;
 		SoupMessageBody* _tmp47_ = NULL;
@@ -2734,11 +2571,11 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 		_tmp48__length1 = (gint) _tmp47_->length;
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp42_ = _tmp48__length1 == 0;
-#line 2730 "RESTSupport.c"
+#line 2567 "RESTSupport.c"
 	}
 #line 279 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp42_) {
-#line 2734 "RESTSupport.c"
+#line 2571 "RESTSupport.c"
 		gchar* _tmp49_ = NULL;
 		gchar* _tmp50_ = NULL;
 		GError* _tmp51_ = NULL;
@@ -2761,7 +2598,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			g_propagate_error (error, _inner_error_);
 #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2757 "RESTSupport.c"
+#line 2594 "RESTSupport.c"
 		} else {
 #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2769,7 +2606,7 @@ void publishing_rest_support_transaction_check_response (PublishingRESTSupportTr
 			g_clear_error (&_inner_error_);
 #line 280 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2765 "RESTSupport.c"
+#line 2602 "RESTSupport.c"
 		}
 	}
 }
@@ -2782,17 +2619,17 @@ static PublishingRESTSupportArgument** _vala_array_dup1 (PublishingRESTSupportAr
 	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 2778 "RESTSupport.c"
+#line 2615 "RESTSupport.c"
 		PublishingRESTSupportArgument* _tmp0_ = NULL;
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result[i] = _tmp0_;
-#line 2784 "RESTSupport.c"
+#line 2621 "RESTSupport.c"
 	}
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2788 "RESTSupport.c"
+#line 2625 "RESTSupport.c"
 }
 
 
@@ -2822,13 +2659,13 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_argument
 	if (result_length1) {
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp2__length1;
-#line 2818 "RESTSupport.c"
+#line 2655 "RESTSupport.c"
 	}
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
 #line 285 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2824 "RESTSupport.c"
+#line 2661 "RESTSupport.c"
 }
 
 
@@ -2868,13 +2705,13 @@ PublishingRESTSupportArgument** publishing_rest_support_transaction_get_sorted_a
 	if (result_length1) {
 #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*result_length1 = _tmp6__length1;
-#line 2864 "RESTSupport.c"
+#line 2701 "RESTSupport.c"
 	}
 #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp6_;
 #line 289 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 2870 "RESTSupport.c"
+#line 2707 "RESTSupport.c"
 }
 
 
@@ -2886,14 +2723,14 @@ void publishing_rest_support_transaction_set_is_executed (PublishingRESTSupportT
 	_tmp0_ = is_executed;
 #line 293 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = _tmp0_;
-#line 2882 "RESTSupport.c"
+#line 2719 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_transaction_on_message_unqueued_publishing_rest_support_session_wire_message_unqueued (PublishingRESTSupportSession* _sender, SoupMessage* message, gpointer self) {
 #line 297 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_transaction_on_message_unqueued ((PublishingRESTSupportTransaction*) self, message);
-#line 2889 "RESTSupport.c"
+#line 2726 "RESTSupport.c"
 }
 
 
@@ -2941,23 +2778,23 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 	_tmp8_ = self->priv->err;
 #line 304 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp8_ != NULL) {
-#line 2937 "RESTSupport.c"
+#line 2774 "RESTSupport.c"
 		GError* _tmp9_ = NULL;
 #line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = self->priv->err;
 #line 305 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit_by_name (self, "network-error", _tmp9_);
-#line 2943 "RESTSupport.c"
+#line 2780 "RESTSupport.c"
 	} else {
 #line 307 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit_by_name (self, "completed");
-#line 2947 "RESTSupport.c"
+#line 2784 "RESTSupport.c"
 	}
 #line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp10_ = self->priv->err;
 #line 309 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp10_ != NULL) {
-#line 2953 "RESTSupport.c"
+#line 2790 "RESTSupport.c"
 		GError* _tmp11_ = NULL;
 		GError* _tmp12_ = NULL;
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -2972,7 +2809,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 			g_propagate_error (error, _inner_error_);
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2968 "RESTSupport.c"
+#line 2805 "RESTSupport.c"
 		} else {
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2980,7 +2817,7 @@ void publishing_rest_support_transaction_send (PublishingRESTSupportTransaction*
 			g_clear_error (&_inner_error_);
 #line 310 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 2976 "RESTSupport.c"
+#line 2813 "RESTSupport.c"
 		}
 	}
 }
@@ -3014,7 +2851,7 @@ PublishingRESTSupportHttpMethod publishing_rest_support_transaction_get_method (
 	result = _tmp5_;
 #line 314 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3010 "RESTSupport.c"
+#line 2847 "RESTSupport.c"
 }
 
 
@@ -3037,7 +2874,7 @@ static void publishing_rest_support_transaction_real_add_header (PublishingRESTS
 	_tmp3_ = value;
 #line 318 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	soup_message_headers_append (_tmp1_, _tmp2_, _tmp3_);
-#line 3033 "RESTSupport.c"
+#line 2870 "RESTSupport.c"
 }
 
 
@@ -3046,7 +2883,7 @@ void publishing_rest_support_transaction_add_header (PublishingRESTSupportTransa
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
 #line 317 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->add_header (self, key, value);
-#line 3042 "RESTSupport.c"
+#line 2879 "RESTSupport.c"
 }
 
 
@@ -3080,19 +2917,19 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
 		self->priv->use_custom_payload = FALSE;
 #line 335 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 3076 "RESTSupport.c"
+#line 2913 "RESTSupport.c"
 	}
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = payload_length;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp3_ > ((gulong) 0)) {
-#line 3082 "RESTSupport.c"
+#line 2919 "RESTSupport.c"
 		gulong _tmp4_ = 0UL;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp4_ = payload_length;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = _tmp4_;
-#line 3088 "RESTSupport.c"
+#line 2925 "RESTSupport.c"
 	} else {
 		const gchar* _tmp5_ = NULL;
 		gint _tmp6_ = 0;
@@ -3105,7 +2942,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
 		_tmp7_ = _tmp6_;
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = (gulong) _tmp7_;
-#line 3101 "RESTSupport.c"
+#line 2938 "RESTSupport.c"
 	}
 #line 338 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	length = _tmp2_;
@@ -3127,7 +2964,7 @@ void publishing_rest_support_transaction_set_custom_payload (PublishingRESTSuppo
 	soup_message_set_request (_tmp8_, _tmp9_, SOUP_MEMORY_COPY, _tmp12_ + 0, (gsize) (((gint) _tmp13_) - 0));
 #line 341 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->use_custom_payload = TRUE;
-#line 3123 "RESTSupport.c"
+#line 2960 "RESTSupport.c"
 }
 
 
@@ -3146,7 +2983,7 @@ void publishing_rest_support_transaction_set_message (PublishingRESTSupportTrans
 	_g_object_unref0 (self->priv->message);
 #line 350 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->message = _tmp1_;
-#line 3142 "RESTSupport.c"
+#line 2979 "RESTSupport.c"
 }
 
 
@@ -3161,7 +2998,7 @@ gboolean publishing_rest_support_transaction_get_is_executed (PublishingRESTSupp
 	result = _tmp0_;
 #line 354 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3157 "RESTSupport.c"
+#line 2994 "RESTSupport.c"
 }
 
 
@@ -3187,14 +3024,14 @@ guint publishing_rest_support_transaction_get_status_code (PublishingRESTSupport
 	result = _tmp3_;
 #line 359 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3183 "RESTSupport.c"
+#line 3020 "RESTSupport.c"
 }
 
 
 static void _vala_SoupURI_free (SoupURI* self) {
 #line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 3190 "RESTSupport.c"
+#line 3027 "RESTSupport.c"
 }
 
 
@@ -3224,7 +3061,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				g_propagate_error (error, _inner_error_);
 #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 3220 "RESTSupport.c"
+#line 3057 "RESTSupport.c"
 			} else {
 #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3232,18 +3069,18 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				g_clear_error (&_inner_error_);
 #line 368 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return;
-#line 3228 "RESTSupport.c"
+#line 3065 "RESTSupport.c"
 			}
 		}
 #line 370 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return;
-#line 3233 "RESTSupport.c"
+#line 3070 "RESTSupport.c"
 	}
 #line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_method (self);
 #line 374 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST) {
-#line 3239 "RESTSupport.c"
+#line 3076 "RESTSupport.c"
 		PublishingRESTSupportArgument** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
 #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3252,25 +3089,25 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		_tmp2__length1 = self->priv->arguments_length1;
 #line 375 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_vala_assert (_tmp2__length1 > 0, "arguments.length > 0");
-#line 3248 "RESTSupport.c"
+#line 3085 "RESTSupport.c"
 	}
 #line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = g_strdup ("");
 #line 378 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	formdata_string = _tmp3_;
-#line 3254 "RESTSupport.c"
+#line 3091 "RESTSupport.c"
 	{
 		gint i = 0;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		i = 0;
-#line 3259 "RESTSupport.c"
+#line 3096 "RESTSupport.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = TRUE;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 3266 "RESTSupport.c"
+#line 3103 "RESTSupport.c"
 				gint _tmp6_ = 0;
 				PublishingRESTSupportArgument** _tmp7_ = NULL;
 				gint _tmp7__length1 = 0;
@@ -3287,13 +3124,13 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				gint _tmp16__length1 = 0;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!_tmp4_) {
-#line 3283 "RESTSupport.c"
+#line 3120 "RESTSupport.c"
 					gint _tmp5_ = 0;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = i;
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					i = _tmp5_ + 1;
-#line 3289 "RESTSupport.c"
+#line 3126 "RESTSupport.c"
 				}
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
@@ -3307,7 +3144,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				if (!(_tmp6_ < _tmp7__length1)) {
 #line 379 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 3303 "RESTSupport.c"
+#line 3140 "RESTSupport.c"
 				}
 #line 380 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp8_ = formdata_string;
@@ -3339,7 +3176,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 				_tmp16__length1 = self->priv->arguments_length1;
 #line 381 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp15_ < (_tmp16__length1 - 1)) {
-#line 3335 "RESTSupport.c"
+#line 3172 "RESTSupport.c"
 					const gchar* _tmp17_ = NULL;
 					gchar* _tmp18_ = NULL;
 #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3350,7 +3187,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 					_g_free0 (formdata_string);
 #line 382 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					formdata_string = _tmp18_;
-#line 3346 "RESTSupport.c"
+#line 3183 "RESTSupport.c"
 				}
 			}
 		}
@@ -3363,7 +3200,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 	_tmp20_ = publishing_rest_support_transaction_get_method (self);
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp20_ == PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET) {
-#line 3359 "RESTSupport.c"
+#line 3196 "RESTSupport.c"
 		PublishingRESTSupportArgument** _tmp21_ = NULL;
 		gint _tmp21__length1 = 0;
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3372,15 +3209,15 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		_tmp21__length1 = self->priv->arguments_length1;
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = _tmp21__length1 > 0;
-#line 3368 "RESTSupport.c"
+#line 3205 "RESTSupport.c"
 	} else {
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp19_ = FALSE;
-#line 3372 "RESTSupport.c"
+#line 3209 "RESTSupport.c"
 	}
 #line 390 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp19_) {
-#line 3376 "RESTSupport.c"
+#line 3213 "RESTSupport.c"
 		SoupMessage* _tmp22_ = NULL;
 		SoupURI* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
@@ -3436,7 +3273,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		soup_message_set_uri (_tmp31_, _tmp34_);
 #line 393 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		__vala_SoupURI_free0 (_tmp34_);
-#line 3432 "RESTSupport.c"
+#line 3269 "RESTSupport.c"
 	} else {
 		SoupMessage* _tmp35_ = NULL;
 		const gchar* _tmp36_ = NULL;
@@ -3456,11 +3293,11 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		_tmp38__length1 = _tmp37__length1;
 #line 395 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		soup_message_set_request (_tmp35_, "application/x-www-form-urlencoded", SOUP_MEMORY_COPY, _tmp38_, (gsize) _tmp38__length1);
-#line 3452 "RESTSupport.c"
+#line 3289 "RESTSupport.c"
 	}
 #line 399 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->is_executed = TRUE;
-#line 3456 "RESTSupport.c"
+#line 3293 "RESTSupport.c"
 	{
 		SoupMessage* _tmp39_ = NULL;
 		SoupURI* _tmp40_ = NULL;
@@ -3482,7 +3319,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		publishing_rest_support_transaction_send (self, &_inner_error_);
 #line 403 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3478 "RESTSupport.c"
+#line 3315 "RESTSupport.c"
 			goto __finally1;
 		}
 	}
@@ -3493,7 +3330,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 		_tmp43_ = old_url;
 #line 406 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp43_ != NULL) {
-#line 3489 "RESTSupport.c"
+#line 3326 "RESTSupport.c"
 			SoupMessage* _tmp44_ = NULL;
 			const gchar* _tmp45_ = NULL;
 			SoupURI* _tmp46_ = NULL;
@@ -3510,7 +3347,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 			soup_message_set_uri (_tmp44_, _tmp47_);
 #line 407 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			__vala_SoupURI_free0 (_tmp47_);
-#line 3506 "RESTSupport.c"
+#line 3343 "RESTSupport.c"
 		}
 	}
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3527,7 +3364,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 			_g_free0 (formdata_string);
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 3523 "RESTSupport.c"
+#line 3360 "RESTSupport.c"
 		} else {
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (url_with_query);
@@ -3541,7 +3378,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 			g_clear_error (&_inner_error_);
 #line 401 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 3537 "RESTSupport.c"
+#line 3374 "RESTSupport.c"
 		}
 	}
 #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3550,7 +3387,7 @@ static void publishing_rest_support_transaction_real_execute (PublishingRESTSupp
 	_g_free0 (old_url);
 #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (formdata_string);
-#line 3546 "RESTSupport.c"
+#line 3383 "RESTSupport.c"
 }
 
 
@@ -3559,7 +3396,7 @@ void publishing_rest_support_transaction_execute (PublishingRESTSupportTransacti
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (self));
 #line 362 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->execute (self, error);
-#line 3555 "RESTSupport.c"
+#line 3392 "RESTSupport.c"
 }
 
 
@@ -3591,7 +3428,7 @@ gchar* publishing_rest_support_transaction_get_response (PublishingRESTSupportTr
 	result = _tmp4_;
 #line 413 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3587 "RESTSupport.c"
+#line 3424 "RESTSupport.c"
 }
 
 
@@ -3614,7 +3451,7 @@ SoupMessageHeaders* publishing_rest_support_transaction_get_response_headers (Pu
 	result = _tmp2_;
 #line 418 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3610 "RESTSupport.c"
+#line 3447 "RESTSupport.c"
 }
 
 
@@ -3637,7 +3474,7 @@ SoupMessage* publishing_rest_support_transaction_get_message (PublishingRESTSupp
 	result = _tmp2_;
 #line 423 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3633 "RESTSupport.c"
+#line 3470 "RESTSupport.c"
 }
 
 
@@ -3648,13 +3485,13 @@ static void _vala_array_add1 (PublishingRESTSupportArgument*** array, int* lengt
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 3644 "RESTSupport.c"
+#line 3481 "RESTSupport.c"
 	}
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	(*array)[(*length)++] = value;
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	(*array)[*length] = NULL;
-#line 3650 "RESTSupport.c"
+#line 3487 "RESTSupport.c"
 }
 
 
@@ -3682,7 +3519,7 @@ void publishing_rest_support_transaction_add_argument (PublishingRESTSupportTran
 	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
 #line 427 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_array_add1 (&self->priv->arguments, &self->priv->arguments_length1, &self->priv->_arguments_size_, _tmp3_);
-#line 3678 "RESTSupport.c"
+#line 3515 "RESTSupport.c"
 }
 
 
@@ -3696,7 +3533,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
 	_tmp1_ = self->priv->endpoint_url;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 3692 "RESTSupport.c"
+#line 3529 "RESTSupport.c"
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -3707,7 +3544,7 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
 		_g_free0 (_tmp0_);
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp3_;
-#line 3703 "RESTSupport.c"
+#line 3540 "RESTSupport.c"
 	} else {
 		PublishingRESTSupportSession* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
@@ -3719,20 +3556,20 @@ gchar* publishing_rest_support_transaction_get_endpoint_url (PublishingRESTSuppo
 		_g_free0 (_tmp0_);
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp5_;
-#line 3715 "RESTSupport.c"
+#line 3552 "RESTSupport.c"
 	}
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_;
 #line 431 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3721 "RESTSupport.c"
+#line 3558 "RESTSupport.c"
 }
 
 
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
 #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3728 "RESTSupport.c"
+#line 3565 "RESTSupport.c"
 }
 
 
@@ -3750,7 +3587,7 @@ PublishingRESTSupportSession* publishing_rest_support_transaction_get_parent_ses
 	result = _tmp1_;
 #line 435 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 3746 "RESTSupport.c"
+#line 3583 "RESTSupport.c"
 }
 
 
@@ -3769,26 +3606,26 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 		data1 = closure->data;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 3765 "RESTSupport.c"
+#line 3602 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		data2 = closure->data;
-#line 3771 "RESTSupport.c"
+#line 3608 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 3777 "RESTSupport.c"
+#line 3614 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_transaction_init (GValue* value) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 3784 "RESTSupport.c"
+#line 3621 "RESTSupport.c"
 }
 
 
@@ -3797,7 +3634,7 @@ static void publishing_rest_support_value_transaction_free_value (GValue* value)
 	if (value->data[0].v_pointer) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (value->data[0].v_pointer);
-#line 3793 "RESTSupport.c"
+#line 3630 "RESTSupport.c"
 	}
 }
 
@@ -3807,11 +3644,11 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue*
 	if (src_value->data[0].v_pointer) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_transaction_ref (src_value->data[0].v_pointer);
-#line 3803 "RESTSupport.c"
+#line 3640 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3807 "RESTSupport.c"
+#line 3644 "RESTSupport.c"
 	}
 }
 
@@ -3819,37 +3656,37 @@ static void publishing_rest_support_value_transaction_copy_value (const GValue*
 static gpointer publishing_rest_support_value_transaction_peek_pointer (const GValue* value) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 3815 "RESTSupport.c"
+#line 3652 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_transaction_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 3822 "RESTSupport.c"
+#line 3659 "RESTSupport.c"
 		PublishingRESTSupportTransaction* object;
 		object = collect_values[0].v_pointer;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3829 "RESTSupport.c"
+#line 3666 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3833 "RESTSupport.c"
+#line 3670 "RESTSupport.c"
 		}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_transaction_ref (object);
-#line 3837 "RESTSupport.c"
+#line 3674 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3841 "RESTSupport.c"
+#line 3678 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3845 "RESTSupport.c"
+#line 3682 "RESTSupport.c"
 }
 
 
@@ -3860,25 +3697,25 @@ static gchar* publishing_rest_support_value_transaction_lcopy_value (const GValu
 	if (!object_p) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3856 "RESTSupport.c"
+#line 3693 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 3862 "RESTSupport.c"
+#line 3699 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3866 "RESTSupport.c"
+#line 3703 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3870 "RESTSupport.c"
+#line 3707 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 3874 "RESTSupport.c"
+#line 3711 "RESTSupport.c"
 }
 
 
@@ -3892,7 +3729,7 @@ GParamSpec* publishing_rest_support_param_spec_transaction (const gchar* name, c
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 3888 "RESTSupport.c"
+#line 3725 "RESTSupport.c"
 }
 
 
@@ -3901,7 +3738,7 @@ gpointer publishing_rest_support_value_get_transaction (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION), NULL);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 3897 "RESTSupport.c"
+#line 3734 "RESTSupport.c"
 }
 
 
@@ -3921,17 +3758,17 @@ void publishing_rest_support_value_set_transaction (GValue* value, gpointer v_ob
 		value->data[0].v_pointer = v_object;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_ref (value->data[0].v_pointer);
-#line 3917 "RESTSupport.c"
+#line 3754 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3921 "RESTSupport.c"
+#line 3758 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (old);
-#line 3927 "RESTSupport.c"
+#line 3764 "RESTSupport.c"
 	}
 }
 
@@ -3950,17 +3787,17 @@ void publishing_rest_support_value_take_transaction (GValue* value, gpointer v_o
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 3946 "RESTSupport.c"
+#line 3783 "RESTSupport.c"
 	} else {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3950 "RESTSupport.c"
+#line 3787 "RESTSupport.c"
 	}
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_transaction_unref (old);
-#line 3956 "RESTSupport.c"
+#line 3793 "RESTSupport.c"
 	}
 }
 
@@ -3982,7 +3819,7 @@ static void publishing_rest_support_transaction_class_init (PublishingRESTSuppor
 	g_signal_new ("network_error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3978 "RESTSupport.c"
+#line 3815 "RESTSupport.c"
 }
 
 
@@ -4003,7 +3840,7 @@ static void publishing_rest_support_transaction_instance_init (PublishingRESTSup
 	self->priv->endpoint_url = NULL;
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 3999 "RESTSupport.c"
+#line 3836 "RESTSupport.c"
 }
 
 
@@ -4021,7 +3858,7 @@ static void publishing_rest_support_transaction_finalize (PublishingRESTSupportT
 	_g_error_free0 (self->priv->err);
 #line 151 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->endpoint_url);
-#line 4017 "RESTSupport.c"
+#line 3854 "RESTSupport.c"
 }
 
 
@@ -4046,7 +3883,7 @@ gpointer publishing_rest_support_transaction_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 4042 "RESTSupport.c"
+#line 3879 "RESTSupport.c"
 }
 
 
@@ -4059,7 +3896,7 @@ void publishing_rest_support_transaction_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_TRANSACTION_GET_CLASS (self)->finalize (self);
 #line 144 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4055 "RESTSupport.c"
+#line 3892 "RESTSupport.c"
 	}
 }
 
@@ -4114,14 +3951,14 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	self->message_headers = _tmp7_;
 #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4110 "RESTSupport.c"
+#line 3947 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable) {
 #line 445 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_upload_transaction_construct (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable);
-#line 4117 "RESTSupport.c"
+#line 3954 "RESTSupport.c"
 }
 
 
@@ -4180,14 +4017,14 @@ PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transacti
 	self->message_headers = _tmp8_;
 #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4176 "RESTSupport.c"
+#line 4013 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportUploadTransaction* publishing_rest_support_upload_transaction_new_with_endpoint_url (PublishingRESTSupportSession* session, SpitPublishingPublishable* publishable, const gchar* endpoint_url) {
 #line 455 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_upload_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, session, publishable, endpoint_url);
-#line 4183 "RESTSupport.c"
+#line 4020 "RESTSupport.c"
 }
 
 
@@ -4210,7 +4047,7 @@ static void publishing_rest_support_upload_transaction_real_add_header (Publishi
 	_tmp2_ = value;
 #line 467 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_, _tmp2_);
-#line 4206 "RESTSupport.c"
+#line 4043 "RESTSupport.c"
 }
 
 
@@ -4221,7 +4058,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 	_tmp0_ = media_type;
 #line 471 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 4217 "RESTSupport.c"
+#line 4054 "RESTSupport.c"
 		gchar* _tmp1_ = NULL;
 #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp1_ = g_strdup ("image/jpeg");
@@ -4229,14 +4066,14 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 		result = _tmp1_;
 #line 472 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return result;
-#line 4225 "RESTSupport.c"
+#line 4062 "RESTSupport.c"
 	} else {
 		SpitPublishingPublisherMediaType _tmp2_ = 0;
 #line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = media_type;
 #line 473 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 4232 "RESTSupport.c"
+#line 4069 "RESTSupport.c"
 			gchar* _tmp3_ = NULL;
 #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp3_ = g_strdup ("video/mpeg");
@@ -4244,7 +4081,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 			result = _tmp3_;
 #line 474 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return result;
-#line 4240 "RESTSupport.c"
+#line 4077 "RESTSupport.c"
 		} else {
 			SpitPublishingPublisherMediaType _tmp4_ = 0;
 			GEnumValue* _tmp5_;
@@ -4254,7 +4091,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 			_tmp5_ = g_enum_get_value (g_type_class_ref (SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE), _tmp4_);
 #line 476 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_error ("RESTSupport.vala:476: UploadTransaction: unknown media type %s.", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL);
-#line 4250 "RESTSupport.c"
+#line 4087 "RESTSupport.c"
 		}
 	}
 }
@@ -4263,7 +4100,7 @@ static gchar* publishing_rest_support_upload_transaction_media_type_to_mime_type
 static void _g_free0_ (gpointer var) {
 #line 480 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	var = (g_free (var), NULL);
-#line 4259 "RESTSupport.c"
+#line 4096 "RESTSupport.c"
 }
 
 
@@ -4314,14 +4151,14 @@ static GHashTable* publishing_rest_support_upload_transaction_create_default_bin
 	result = _result_;
 #line 486 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4310 "RESTSupport.c"
+#line 4147 "RESTSupport.c"
 }
 
 
 static gpointer _g_hash_table_ref0 (gpointer self) {
 #line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self ? g_hash_table_ref (self) : NULL;
-#line 4317 "RESTSupport.c"
+#line 4154 "RESTSupport.c"
 }
 
 
@@ -4340,21 +4177,21 @@ void publishing_rest_support_upload_transaction_set_binary_disposition_table (Pu
 	_g_hash_table_unref0 (self->binary_disposition_table);
 #line 490 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->binary_disposition_table = _tmp1_;
-#line 4336 "RESTSupport.c"
+#line 4173 "RESTSupport.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 4343 "RESTSupport.c"
+#line 4180 "RESTSupport.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 4350 "RESTSupport.c"
+#line 4187 "RESTSupport.c"
 }
 
 
@@ -4438,7 +4275,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	_tmp4_ = request_arguments;
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4__length1 = request_arguments_length1;
-#line 4434 "RESTSupport.c"
+#line 4271 "RESTSupport.c"
 	{
 		PublishingRESTSupportArgument** arg_collection = NULL;
 		gint arg_collection_length1 = 0;
@@ -4450,14 +4287,14 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		arg_collection_length1 = _tmp4__length1;
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (arg_it = 0; arg_it < _tmp4__length1; arg_it = arg_it + 1) {
-#line 4446 "RESTSupport.c"
+#line 4283 "RESTSupport.c"
 			PublishingRESTSupportArgument* _tmp5_ = NULL;
 			PublishingRESTSupportArgument* arg = NULL;
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp5_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			arg = _tmp5_;
-#line 4453 "RESTSupport.c"
+#line 4290 "RESTSupport.c"
 			{
 				SoupMultipart* _tmp6_ = NULL;
 				PublishingRESTSupportArgument* _tmp7_ = NULL;
@@ -4478,7 +4315,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 				soup_multipart_append_form_string (_tmp6_, _tmp8_, _tmp10_);
 #line 499 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_publishing_rest_support_argument_unref0 (arg);
-#line 4474 "RESTSupport.c"
+#line 4311 "RESTSupport.c"
 			}
 		}
 	}
@@ -4516,7 +4353,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4512 "RESTSupport.c"
+#line 4349 "RESTSupport.c"
 				goto __catch2_g_file_error;
 			}
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4531,7 +4368,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			g_clear_error (&_inner_error_);
 #line 505 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4527 "RESTSupport.c"
+#line 4364 "RESTSupport.c"
 		}
 	}
 	goto __finally2;
@@ -4552,7 +4389,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		_inner_error_ = _tmp19_;
 #line 508 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_error_free0 (e);
-#line 4548 "RESTSupport.c"
+#line 4385 "RESTSupport.c"
 		goto __finally2;
 	}
 	__finally2:
@@ -4570,7 +4407,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4566 "RESTSupport.c"
+#line 4403 "RESTSupport.c"
 		} else {
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (payload);
@@ -4584,7 +4421,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			g_clear_error (&_inner_error_);
 #line 504 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4580 "RESTSupport.c"
+#line 4417 "RESTSupport.c"
 		}
 	}
 #line 512 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4673,7 +4510,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	cont = _tmp49_;
 #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	while (TRUE) {
-#line 4669 "RESTSupport.c"
+#line 4506 "RESTSupport.c"
 		gboolean _tmp50_ = FALSE;
 		SoupMessage* _tmp51_ = NULL;
 		SoupMessageHeaders* _tmp52_ = NULL;
@@ -4691,7 +4528,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		if (!_tmp50_) {
 #line 528 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 4687 "RESTSupport.c"
+#line 4524 "RESTSupport.c"
 		}
 #line 529 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp51_ = outbound_message;
@@ -4721,7 +4558,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 		_tmp60_ = gee_map_iterator_next (_tmp59_);
 #line 530 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		cont = _tmp60_;
-#line 4717 "RESTSupport.c"
+#line 4554 "RESTSupport.c"
 	}
 #line 532 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp61_ = outbound_message;
@@ -4751,7 +4588,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4747 "RESTSupport.c"
+#line 4584 "RESTSupport.c"
 		} else {
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_object_unref0 (i);
@@ -4771,7 +4608,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 			g_clear_error (&_inner_error_);
 #line 535 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return;
-#line 4767 "RESTSupport.c"
+#line 4604 "RESTSupport.c"
 		}
 	}
 #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4786,7 +4623,7 @@ static void publishing_rest_support_upload_transaction_real_execute (PublishingR
 	__vala_SoupMultipart_free0 (message_parts);
 #line 493 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	request_arguments = (_vala_array_free (request_arguments, request_arguments_length1, (GDestroyNotify) publishing_rest_support_argument_unref), NULL);
-#line 4782 "RESTSupport.c"
+#line 4619 "RESTSupport.c"
 }
 
 
@@ -4799,7 +4636,7 @@ static void publishing_rest_support_upload_transaction_class_init (PublishingRES
 	((PublishingRESTSupportTransactionClass *) klass)->add_header = publishing_rest_support_upload_transaction_real_add_header;
 #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_rest_support_upload_transaction_real_execute;
-#line 4795 "RESTSupport.c"
+#line 4632 "RESTSupport.c"
 }
 
 
@@ -4810,7 +4647,7 @@ static void publishing_rest_support_upload_transaction_instance_init (Publishing
 	self->publishable = NULL;
 #line 443 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->message_headers = NULL;
-#line 4806 "RESTSupport.c"
+#line 4643 "RESTSupport.c"
 }
 
 
@@ -4828,7 +4665,7 @@ static void publishing_rest_support_upload_transaction_finalize (PublishingRESTS
 	_g_object_unref0 (self->message_headers);
 #line 439 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_rest_support_upload_transaction_parent_class)->finalize (obj);
-#line 4824 "RESTSupport.c"
+#line 4661 "RESTSupport.c"
 }
 
 
@@ -4855,14 +4692,14 @@ static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_co
 	self->priv->document = _tmp0_;
 #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 4851 "RESTSupport.c"
+#line 4688 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_new (xmlDoc* doc) {
 #line 547 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_xml_document_construct (PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT, doc);
-#line 4858 "RESTSupport.c"
+#line 4695 "RESTSupport.c"
 }
 
 
@@ -4880,7 +4717,7 @@ xmlNode* publishing_rest_support_xml_document_get_root_node (PublishingRESTSuppo
 	result = _tmp1_;
 #line 556 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 4876 "RESTSupport.c"
+#line 4713 "RESTSupport.c"
 }
 
 
@@ -4902,21 +4739,21 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 	_tmp1_ = _tmp0_->children;
 #line 561 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	doc_node_iter = _tmp1_;
-#line 4898 "RESTSupport.c"
+#line 4735 "RESTSupport.c"
 	{
 		gboolean _tmp2_ = FALSE;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp2_ = TRUE;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		while (TRUE) {
-#line 4905 "RESTSupport.c"
+#line 4742 "RESTSupport.c"
 			xmlNode* _tmp5_ = NULL;
 			xmlNode* _tmp6_ = NULL;
 			const gchar* _tmp7_ = NULL;
 			const gchar* _tmp8_ = NULL;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (!_tmp2_) {
-#line 4912 "RESTSupport.c"
+#line 4749 "RESTSupport.c"
 				xmlNode* _tmp3_ = NULL;
 				xmlNode* _tmp4_ = NULL;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -4925,7 +4762,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 				_tmp4_ = _tmp3_->next;
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				doc_node_iter = _tmp4_;
-#line 4921 "RESTSupport.c"
+#line 4758 "RESTSupport.c"
 			}
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp2_ = FALSE;
@@ -4935,7 +4772,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 			if (!(_tmp5_ != NULL)) {
 #line 563 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				break;
-#line 4931 "RESTSupport.c"
+#line 4768 "RESTSupport.c"
 			}
 #line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = doc_node_iter;
@@ -4945,7 +4782,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 			_tmp8_ = child_name;
 #line 564 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			if (g_strcmp0 (_tmp7_, _tmp8_) == 0) {
-#line 4941 "RESTSupport.c"
+#line 4778 "RESTSupport.c"
 				xmlNode* _tmp9_ = NULL;
 #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = doc_node_iter;
@@ -4953,7 +4790,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 				result = _tmp9_;
 #line 565 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				return result;
-#line 4949 "RESTSupport.c"
+#line 4786 "RESTSupport.c"
 			}
 		}
 	}
@@ -4969,7 +4806,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 		g_propagate_error (error, _inner_error_);
 #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return NULL;
-#line 4965 "RESTSupport.c"
+#line 4802 "RESTSupport.c"
 	} else {
 #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4977,7 +4814,7 @@ xmlNode* publishing_rest_support_xml_document_get_named_child (PublishingRESTSup
 		g_clear_error (&_inner_error_);
 #line 568 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return NULL;
-#line 4973 "RESTSupport.c"
+#line 4810 "RESTSupport.c"
 	}
 }
 
@@ -5006,7 +4843,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
 	_tmp3_ = value_string;
 #line 575 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp3_ == NULL) {
-#line 5002 "RESTSupport.c"
+#line 4839 "RESTSupport.c"
 		const gchar* _tmp4_ = NULL;
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
@@ -5029,7 +4866,7 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
 			_g_free0 (value_string);
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5025 "RESTSupport.c"
+#line 4862 "RESTSupport.c"
 		} else {
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (value_string);
@@ -5039,14 +4876,14 @@ gchar* publishing_rest_support_xml_document_get_property_value (PublishingRESTSu
 			g_clear_error (&_inner_error_);
 #line 576 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5035 "RESTSupport.c"
+#line 4872 "RESTSupport.c"
 		}
 	}
 #line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = value_string;
 #line 579 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5042 "RESTSupport.c"
+#line 4879 "RESTSupport.c"
 }
 
 
@@ -5069,7 +4906,7 @@ static gchar* string_chug (const gchar* self) {
 	result = _result_;
 #line 1202 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5065 "RESTSupport.c"
+#line 4902 "RESTSupport.c"
 }
 
 
@@ -5092,7 +4929,7 @@ static gchar* string_chomp (const gchar* self) {
 	result = _result_;
 #line 1194 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5088 "RESTSupport.c"
+#line 4925 "RESTSupport.c"
 }
 
 
@@ -5133,7 +4970,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	if (_tmp1_ == NULL) {
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = TRUE;
-#line 5129 "RESTSupport.c"
+#line 4966 "RESTSupport.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
@@ -5146,11 +4983,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 		_tmp4_ = _tmp3_;
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _tmp4_ == 0;
-#line 5142 "RESTSupport.c"
+#line 4979 "RESTSupport.c"
 	}
 #line 584 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp0_) {
-#line 5146 "RESTSupport.c"
+#line 4983 "RESTSupport.c"
 		GError* _tmp5_ = NULL;
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp5_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Empty XML string");
@@ -5162,7 +4999,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5158 "RESTSupport.c"
+#line 4995 "RESTSupport.c"
 		} else {
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5170,7 +5007,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 585 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5166 "RESTSupport.c"
+#line 5003 "RESTSupport.c"
 		}
 	}
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5195,7 +5032,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	if (_tmp13_) {
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp6_ = TRUE;
-#line 5191 "RESTSupport.c"
+#line 5028 "RESTSupport.c"
 	} else {
 		const gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
@@ -5221,11 +5058,11 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 		_g_free0 (_tmp18_);
 #line 589 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_g_free0 (_tmp16_);
-#line 5217 "RESTSupport.c"
+#line 5054 "RESTSupport.c"
 	}
 #line 588 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp6_) {
-#line 5221 "RESTSupport.c"
+#line 5058 "RESTSupport.c"
 		GError* _tmp20_ = NULL;
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5237,7 +5074,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5233 "RESTSupport.c"
+#line 5070 "RESTSupport.c"
 		} else {
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5245,7 +5082,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 591 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5241 "RESTSupport.c"
+#line 5078 "RESTSupport.c"
 		}
 	}
 #line 597 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5264,7 +5101,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_tmp26_ = doc;
 #line 599 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp26_ == NULL) {
-#line 5260 "RESTSupport.c"
+#line 5097 "RESTSupport.c"
 		GError* _tmp27_ = NULL;
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp27_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5276,7 +5113,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5272 "RESTSupport.c"
+#line 5109 "RESTSupport.c"
 		} else {
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5284,7 +5121,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 600 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5280 "RESTSupport.c"
+#line 5117 "RESTSupport.c"
 		}
 	}
 #line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5293,7 +5130,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_tmp29_ = _tmp28_->children;
 #line 605 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp29_ == NULL) {
-#line 5289 "RESTSupport.c"
+#line 5126 "RESTSupport.c"
 		GError* _tmp30_ = NULL;
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp30_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Unable to parse XML " "document");
@@ -5305,7 +5142,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_propagate_error (error, _inner_error_);
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5301 "RESTSupport.c"
+#line 5138 "RESTSupport.c"
 		} else {
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5313,7 +5150,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 606 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5309 "RESTSupport.c"
+#line 5146 "RESTSupport.c"
 		}
 	}
 #line 610 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5336,7 +5173,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_tmp36_ = _result_;
 #line 613 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp36_ != NULL) {
-#line 5332 "RESTSupport.c"
+#line 5169 "RESTSupport.c"
 		const gchar* _tmp37_ = NULL;
 		GError* _tmp38_ = NULL;
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5355,7 +5192,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			_publishing_rest_support_xml_document_unref0 (rest_doc);
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5351 "RESTSupport.c"
+#line 5188 "RESTSupport.c"
 		} else {
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_result_);
@@ -5367,7 +5204,7 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 			g_clear_error (&_inner_error_);
 #line 614 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return NULL;
-#line 5363 "RESTSupport.c"
+#line 5200 "RESTSupport.c"
 		}
 	}
 #line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -5376,14 +5213,14 @@ PublishingRESTSupportXmlDocument* publishing_rest_support_xml_document_parse_str
 	_g_free0 (_result_);
 #line 616 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5372 "RESTSupport.c"
+#line 5209 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_value_xml_document_init (GValue* value) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 5379 "RESTSupport.c"
+#line 5216 "RESTSupport.c"
 }
 
 
@@ -5392,7 +5229,7 @@ static void publishing_rest_support_value_xml_document_free_value (GValue* value
 	if (value->data[0].v_pointer) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (value->data[0].v_pointer);
-#line 5388 "RESTSupport.c"
+#line 5225 "RESTSupport.c"
 	}
 }
 
@@ -5402,11 +5239,11 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue*
 	if (src_value->data[0].v_pointer) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_xml_document_ref (src_value->data[0].v_pointer);
-#line 5398 "RESTSupport.c"
+#line 5235 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5402 "RESTSupport.c"
+#line 5239 "RESTSupport.c"
 	}
 }
 
@@ -5414,37 +5251,37 @@ static void publishing_rest_support_value_xml_document_copy_value (const GValue*
 static gpointer publishing_rest_support_value_xml_document_peek_pointer (const GValue* value) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 5410 "RESTSupport.c"
+#line 5247 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_xml_document_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 5417 "RESTSupport.c"
+#line 5254 "RESTSupport.c"
 		PublishingRESTSupportXmlDocument* object;
 		object = collect_values[0].v_pointer;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5424 "RESTSupport.c"
+#line 5261 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5428 "RESTSupport.c"
+#line 5265 "RESTSupport.c"
 		}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_xml_document_ref (object);
-#line 5432 "RESTSupport.c"
+#line 5269 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5436 "RESTSupport.c"
+#line 5273 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5440 "RESTSupport.c"
+#line 5277 "RESTSupport.c"
 }
 
 
@@ -5455,25 +5292,25 @@ static gchar* publishing_rest_support_value_xml_document_lcopy_value (const GVal
 	if (!object_p) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5451 "RESTSupport.c"
+#line 5288 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 5457 "RESTSupport.c"
+#line 5294 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5461 "RESTSupport.c"
+#line 5298 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5465 "RESTSupport.c"
+#line 5302 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 5469 "RESTSupport.c"
+#line 5306 "RESTSupport.c"
 }
 
 
@@ -5487,7 +5324,7 @@ GParamSpec* publishing_rest_support_param_spec_xml_document (const gchar* name,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 5483 "RESTSupport.c"
+#line 5320 "RESTSupport.c"
 }
 
 
@@ -5496,7 +5333,7 @@ gpointer publishing_rest_support_value_get_xml_document (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_XML_DOCUMENT), NULL);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 5492 "RESTSupport.c"
+#line 5329 "RESTSupport.c"
 }
 
 
@@ -5516,17 +5353,17 @@ void publishing_rest_support_value_set_xml_document (GValue* value, gpointer v_o
 		value->data[0].v_pointer = v_object;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_ref (value->data[0].v_pointer);
-#line 5512 "RESTSupport.c"
+#line 5349 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5516 "RESTSupport.c"
+#line 5353 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (old);
-#line 5522 "RESTSupport.c"
+#line 5359 "RESTSupport.c"
 	}
 }
 
@@ -5545,17 +5382,17 @@ void publishing_rest_support_value_take_xml_document (GValue* value, gpointer v_
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 5541 "RESTSupport.c"
+#line 5378 "RESTSupport.c"
 	} else {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 5545 "RESTSupport.c"
+#line 5382 "RESTSupport.c"
 	}
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_xml_document_unref (old);
-#line 5551 "RESTSupport.c"
+#line 5388 "RESTSupport.c"
 	}
 }
 
@@ -5567,7 +5404,7 @@ static void publishing_rest_support_xml_document_class_init (PublishingRESTSuppo
 	((PublishingRESTSupportXmlDocumentClass *) klass)->finalize = publishing_rest_support_xml_document_finalize;
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportXmlDocumentPrivate));
-#line 5563 "RESTSupport.c"
+#line 5400 "RESTSupport.c"
 }
 
 
@@ -5576,7 +5413,7 @@ static void publishing_rest_support_xml_document_instance_init (PublishingRESTSu
 	self->priv = PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_PRIVATE (self);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 5572 "RESTSupport.c"
+#line 5409 "RESTSupport.c"
 }
 
 
@@ -5591,7 +5428,7 @@ static void publishing_rest_support_xml_document_finalize (PublishingRESTSupport
 	_tmp0_ = self->priv->document;
 #line 552 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	xmlFreeDoc (_tmp0_);
-#line 5587 "RESTSupport.c"
+#line 5424 "RESTSupport.c"
 }
 
 
@@ -5616,7 +5453,7 @@ gpointer publishing_rest_support_xml_document_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 5612 "RESTSupport.c"
+#line 5449 "RESTSupport.c"
 }
 
 
@@ -5629,7 +5466,7 @@ void publishing_rest_support_xml_document_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_XML_DOCUMENT_GET_CLASS (self)->finalize (self);
 #line 539 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5625 "RESTSupport.c"
+#line 5462 "RESTSupport.c"
 	}
 }
 
@@ -5658,7 +5495,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 	current_char = _tmp2_;
 #line 628 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	while (TRUE) {
-#line 5654 "RESTSupport.c"
+#line 5491 "RESTSupport.c"
 		gint current_char_value = 0;
 		const gchar* _tmp3_ = NULL;
 		gunichar _tmp4_ = 0U;
@@ -5682,55 +5519,55 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 		if (_tmp5_ < 1) {
 #line 633 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			break;
-#line 5678 "RESTSupport.c"
+#line 5515 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp9_ = current_char_value;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp9_ < 128) {
-#line 5684 "RESTSupport.c"
+#line 5521 "RESTSupport.c"
 			gint _tmp10_ = 0;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp10_ = current_char_value;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = _tmp10_ != ((gint) '&');
-#line 5690 "RESTSupport.c"
+#line 5527 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp8_ = FALSE;
-#line 5694 "RESTSupport.c"
+#line 5531 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp8_) {
-#line 5698 "RESTSupport.c"
+#line 5535 "RESTSupport.c"
 			gint _tmp11_ = 0;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp11_ = current_char_value;
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = _tmp11_ != ((gint) '<');
-#line 5704 "RESTSupport.c"
+#line 5541 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp7_ = FALSE;
-#line 5708 "RESTSupport.c"
+#line 5545 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp7_) {
-#line 5712 "RESTSupport.c"
+#line 5549 "RESTSupport.c"
 			gint _tmp12_ = 0;
 #line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp12_ = current_char_value;
 #line 638 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = _tmp12_ != ((gint) '>');
-#line 5718 "RESTSupport.c"
+#line 5555 "RESTSupport.c"
 		} else {
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp6_ = FALSE;
-#line 5722 "RESTSupport.c"
+#line 5559 "RESTSupport.c"
 		}
 #line 637 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (_tmp6_) {
-#line 5726 "RESTSupport.c"
+#line 5563 "RESTSupport.c"
 			GString* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
 			gunichar _tmp15_ = 0U;
@@ -5742,7 +5579,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 			_tmp15_ = g_utf8_get_char_validated (_tmp14_, (gssize) -1);
 #line 639 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			g_string_append_unichar (_tmp13_, _tmp15_);
-#line 5738 "RESTSupport.c"
+#line 5575 "RESTSupport.c"
 		} else {
 			GString* _tmp16_ = NULL;
 			gint _tmp17_ = 0;
@@ -5760,7 +5597,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 			g_string_append (_tmp16_, _tmp19_);
 #line 641 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_g_free0 (_tmp19_);
-#line 5756 "RESTSupport.c"
+#line 5593 "RESTSupport.c"
 		}
 #line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp20_ = current_char;
@@ -5772,7 +5609,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 		_g_free0 (current_char);
 #line 643 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		current_char = _tmp22_;
-#line 5768 "RESTSupport.c"
+#line 5605 "RESTSupport.c"
 	}
 #line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp23_ = encoded_str_builder;
@@ -5788,7 +5625,7 @@ gchar* publishing_rest_support_decimal_entity_encode (const gchar* source) {
 	_g_string_free0 (encoded_str_builder);
 #line 646 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5784 "RESTSupport.c"
+#line 5621 "RESTSupport.c"
 }
 
 
@@ -5799,17 +5636,17 @@ static SpitPublishingPublishable** _vala_array_dup2 (SpitPublishingPublishable**
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 5795 "RESTSupport.c"
+#line 5632 "RESTSupport.c"
 		SpitPublishingPublishable* _tmp0_ = NULL;
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		result[i] = _tmp0_;
-#line 5801 "RESTSupport.c"
+#line 5638 "RESTSupport.c"
 	}
 #line 659 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 5805 "RESTSupport.c"
+#line 5642 "RESTSupport.c"
 }
 
 
@@ -5851,14 +5688,14 @@ PublishingRESTSupportBatchUploader* publishing_rest_support_batch_uploader_const
 	self->priv->session = _tmp3_;
 #line 658 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 5847 "RESTSupport.c"
+#line 5684 "RESTSupport.c"
 }
 
 
 static void _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted (PublishingRESTSupportTransaction* _sender, gint bytes_written_so_far, gint total_bytes, gpointer self) {
 #line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_batch_uploader_on_chunk_transmitted ((PublishingRESTSupportBatchUploader*) self, bytes_written_so_far, total_bytes);
-#line 5854 "RESTSupport.c"
+#line 5691 "RESTSupport.c"
 }
 
 
@@ -5878,7 +5715,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 	_tmp0_ = self->priv->publishables;
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 5874 "RESTSupport.c"
+#line 5711 "RESTSupport.c"
 	{
 		SpitPublishingPublishable** publishable_collection = NULL;
 		gint publishable_collection_length1 = 0;
@@ -5890,14 +5727,14 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 		publishable_collection_length1 = _tmp0__length1;
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		for (publishable_it = 0; publishable_it < _tmp0__length1; publishable_it = publishable_it + 1) {
-#line 5886 "RESTSupport.c"
+#line 5723 "RESTSupport.c"
 			SpitPublishingPublishable* _tmp1_ = NULL;
 			SpitPublishingPublishable* publishable = NULL;
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp1_ = _g_object_ref0 (publishable_collection[publishable_it]);
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			publishable = _tmp1_;
-#line 5893 "RESTSupport.c"
+#line 5730 "RESTSupport.c"
 			{
 				GFile* file = NULL;
 				SpitPublishingPublishable* _tmp2_ = NULL;
@@ -5930,7 +5767,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_tmp4_ = file;
 #line 670 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp4_ == NULL) {
-#line 5926 "RESTSupport.c"
+#line 5763 "RESTSupport.c"
 					gint _tmp5_ = 0;
 #line 671 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp5_ = self->priv->current_file;
@@ -5942,7 +5779,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					_g_object_unref0 (publishable);
 #line 672 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					continue;
-#line 5938 "RESTSupport.c"
+#line 5775 "RESTSupport.c"
 				}
 #line 675 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp6_ = self->priv->current_file;
@@ -5958,7 +5795,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_tmp8__target = self->priv->status_updated_target;
 #line 676 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (_tmp8_ != NULL) {
-#line 5954 "RESTSupport.c"
+#line 5791 "RESTSupport.c"
 					SpitPublishingProgressCallback _tmp9_ = NULL;
 					void* _tmp9__target = NULL;
 					gint _tmp10_ = 0;
@@ -5973,7 +5810,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					_tmp11_ = fraction_complete;
 #line 677 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_tmp9_ (_tmp10_ + 1, _tmp11_, _tmp9__target);
-#line 5969 "RESTSupport.c"
+#line 5806 "RESTSupport.c"
 				}
 #line 679 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp12_ = self->priv->publishables;
@@ -5991,7 +5828,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_tmp16_ = txn;
 #line 681 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				g_signal_connect (_tmp16_, "chunk-transmitted", (GCallback) _publishing_rest_support_batch_uploader_on_chunk_transmitted_publishing_rest_support_transaction_chunk_transmitted, self);
-#line 5987 "RESTSupport.c"
+#line 5824 "RESTSupport.c"
 				{
 					PublishingRESTSupportTransaction* _tmp17_ = NULL;
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6002,7 +5839,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5998 "RESTSupport.c"
+#line 5835 "RESTSupport.c"
 							goto __catch3_spit_publishing_publishing_error;
 						}
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6017,7 +5854,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 						g_clear_error (&_inner_error_);
 #line 684 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 						return;
-#line 6013 "RESTSupport.c"
+#line 5850 "RESTSupport.c"
 					}
 				}
 				goto __finally3;
@@ -6037,7 +5874,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					stop = TRUE;
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					_g_error_free0 (err);
-#line 6033 "RESTSupport.c"
+#line 5870 "RESTSupport.c"
 				}
 				__finally3:
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6054,7 +5891,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					g_clear_error (&_inner_error_);
 #line 683 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					return;
-#line 6050 "RESTSupport.c"
+#line 5887 "RESTSupport.c"
 				}
 #line 690 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp19_ = txn;
@@ -6074,7 +5911,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 					_g_object_unref0 (publishable);
 #line 693 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 6070 "RESTSupport.c"
+#line 5907 "RESTSupport.c"
 				}
 #line 695 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp22_ = self->priv->current_file;
@@ -6086,7 +5923,7 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 				_g_object_unref0 (file);
 #line 666 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_g_object_unref0 (publishable);
-#line 6082 "RESTSupport.c"
+#line 5919 "RESTSupport.c"
 			}
 		}
 	}
@@ -6094,13 +5931,13 @@ static void publishing_rest_support_batch_uploader_send_files (PublishingRESTSup
 	_tmp23_ = stop;
 #line 698 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!_tmp23_) {
-#line 6090 "RESTSupport.c"
+#line 5927 "RESTSupport.c"
 		gint _tmp24_ = 0;
 #line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp24_ = self->priv->current_file;
 #line 699 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_signal_emit_by_name (self, "upload-complete", _tmp24_);
-#line 6096 "RESTSupport.c"
+#line 5933 "RESTSupport.c"
 	}
 }
 
@@ -6149,7 +5986,7 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
 	_tmp7__target = self->priv->status_updated_target;
 #line 708 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 6145 "RESTSupport.c"
+#line 5982 "RESTSupport.c"
 		SpitPublishingProgressCallback _tmp8_ = NULL;
 		void* _tmp8__target = NULL;
 		gint _tmp9_ = 0;
@@ -6164,7 +6001,7 @@ static void publishing_rest_support_batch_uploader_on_chunk_transmitted (Publish
 		_tmp10_ = fraction_complete;
 #line 709 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 6160 "RESTSupport.c"
+#line 5997 "RESTSupport.c"
 	}
 }
 
@@ -6183,7 +6020,7 @@ PublishingRESTSupportSession* publishing_rest_support_batch_uploader_get_session
 	result = _tmp1_;
 #line 713 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6179 "RESTSupport.c"
+#line 6016 "RESTSupport.c"
 }
 
 
@@ -6210,7 +6047,7 @@ SpitPublishingPublishable* publishing_rest_support_batch_uploader_get_current_pu
 	result = _tmp3_;
 #line 717 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6206 "RESTSupport.c"
+#line 6043 "RESTSupport.c"
 }
 
 
@@ -6219,7 +6056,7 @@ static PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_batch_uploader_create_transaction'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6215 "RESTSupport.c"
+#line 6052 "RESTSupport.c"
 }
 
 
@@ -6228,7 +6065,7 @@ PublishingRESTSupportTransaction* publishing_rest_support_batch_uploader_create_
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (self), NULL);
 #line 720 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->create_transaction (self, publishable);
-#line 6224 "RESTSupport.c"
+#line 6061 "RESTSupport.c"
 }
 
 
@@ -6255,7 +6092,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
 	if (_tmp1__length1 > 0) {
 #line 726 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_send_files (self);
-#line 6251 "RESTSupport.c"
+#line 6088 "RESTSupport.c"
 	}
 }
 
@@ -6263,7 +6100,7 @@ void publishing_rest_support_batch_uploader_upload (PublishingRESTSupportBatchUp
 static void publishing_rest_support_value_batch_uploader_init (GValue* value) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 6259 "RESTSupport.c"
+#line 6096 "RESTSupport.c"
 }
 
 
@@ -6272,7 +6109,7 @@ static void publishing_rest_support_value_batch_uploader_free_value (GValue* val
 	if (value->data[0].v_pointer) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (value->data[0].v_pointer);
-#line 6268 "RESTSupport.c"
+#line 6105 "RESTSupport.c"
 	}
 }
 
@@ -6282,11 +6119,11 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu
 	if (src_value->data[0].v_pointer) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (src_value->data[0].v_pointer);
-#line 6278 "RESTSupport.c"
+#line 6115 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6282 "RESTSupport.c"
+#line 6119 "RESTSupport.c"
 	}
 }
 
@@ -6294,37 +6131,37 @@ static void publishing_rest_support_value_batch_uploader_copy_value (const GValu
 static gpointer publishing_rest_support_value_batch_uploader_peek_pointer (const GValue* value) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 6290 "RESTSupport.c"
+#line 6127 "RESTSupport.c"
 }
 
 
 static gchar* publishing_rest_support_value_batch_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 6297 "RESTSupport.c"
+#line 6134 "RESTSupport.c"
 		PublishingRESTSupportBatchUploader* object;
 		object = collect_values[0].v_pointer;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6304 "RESTSupport.c"
+#line 6141 "RESTSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6308 "RESTSupport.c"
+#line 6145 "RESTSupport.c"
 		}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = publishing_rest_support_batch_uploader_ref (object);
-#line 6312 "RESTSupport.c"
+#line 6149 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6316 "RESTSupport.c"
+#line 6153 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6320 "RESTSupport.c"
+#line 6157 "RESTSupport.c"
 }
 
 
@@ -6335,25 +6172,25 @@ static gchar* publishing_rest_support_value_batch_uploader_lcopy_value (const GV
 	if (!object_p) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6331 "RESTSupport.c"
+#line 6168 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (!value->data[0].v_pointer) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = NULL;
-#line 6337 "RESTSupport.c"
+#line 6174 "RESTSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6341 "RESTSupport.c"
+#line 6178 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		*object_p = publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6345 "RESTSupport.c"
+#line 6182 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6349 "RESTSupport.c"
+#line 6186 "RESTSupport.c"
 }
 
 
@@ -6367,7 +6204,7 @@ GParamSpec* publishing_rest_support_param_spec_batch_uploader (const gchar* name
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 6363 "RESTSupport.c"
+#line 6200 "RESTSupport.c"
 }
 
 
@@ -6376,7 +6213,7 @@ gpointer publishing_rest_support_value_get_batch_uploader (const GValue* value)
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER), NULL);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return value->data[0].v_pointer;
-#line 6372 "RESTSupport.c"
+#line 6209 "RESTSupport.c"
 }
 
 
@@ -6396,17 +6233,17 @@ void publishing_rest_support_value_set_batch_uploader (GValue* value, gpointer v
 		value->data[0].v_pointer = v_object;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_ref (value->data[0].v_pointer);
-#line 6392 "RESTSupport.c"
+#line 6229 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6396 "RESTSupport.c"
+#line 6233 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (old);
-#line 6402 "RESTSupport.c"
+#line 6239 "RESTSupport.c"
 	}
 }
 
@@ -6425,17 +6262,17 @@ void publishing_rest_support_value_take_batch_uploader (GValue* value, gpointer
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 6421 "RESTSupport.c"
+#line 6258 "RESTSupport.c"
 	} else {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 6425 "RESTSupport.c"
+#line 6262 "RESTSupport.c"
 	}
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	if (old) {
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		publishing_rest_support_batch_uploader_unref (old);
-#line 6431 "RESTSupport.c"
+#line 6268 "RESTSupport.c"
 	}
 }
 
@@ -6453,7 +6290,7 @@ static void publishing_rest_support_batch_uploader_class_init (PublishingRESTSup
 	g_signal_new ("upload_complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_signal_new ("upload_error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 6449 "RESTSupport.c"
+#line 6286 "RESTSupport.c"
 }
 
 
@@ -6474,7 +6311,7 @@ static void publishing_rest_support_batch_uploader_instance_init (PublishingREST
 	self->priv->status_updated = NULL;
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->ref_count = 1;
-#line 6470 "RESTSupport.c"
+#line 6307 "RESTSupport.c"
 }
 
 
@@ -6488,7 +6325,7 @@ static void publishing_rest_support_batch_uploader_finalize (PublishingRESTSuppo
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 652 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 6484 "RESTSupport.c"
+#line 6321 "RESTSupport.c"
 }
 
 
@@ -6513,7 +6350,7 @@ gpointer publishing_rest_support_batch_uploader_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return instance;
-#line 6509 "RESTSupport.c"
+#line 6346 "RESTSupport.c"
 }
 
 
@@ -6526,7 +6363,7 @@ void publishing_rest_support_batch_uploader_unref (gpointer instance) {
 		PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_GET_CLASS (self)->finalize (self);
 #line 649 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6522 "RESTSupport.c"
+#line 6359 "RESTSupport.c"
 	}
 }
 
@@ -6545,7 +6382,7 @@ static gunichar string_get_char (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 6541 "RESTSupport.c"
+#line 6378 "RESTSupport.c"
 }
 
 
@@ -6571,7 +6408,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 	_tmp2_ = g_string_new ("");
 #line 736 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	b = _tmp2_;
-#line 6567 "RESTSupport.c"
+#line 6404 "RESTSupport.c"
 	{
 		const gchar* u = NULL;
 		const gchar* _tmp3_ = NULL;
@@ -6579,14 +6416,14 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 		_tmp3_ = t;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 		u = _tmp3_;
-#line 6575 "RESTSupport.c"
+#line 6412 "RESTSupport.c"
 		{
 			gboolean _tmp4_ = FALSE;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			_tmp4_ = TRUE;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 			while (TRUE) {
-#line 6582 "RESTSupport.c"
+#line 6419 "RESTSupport.c"
 				const gchar* _tmp7_ = NULL;
 				gunichar _tmp8_ = 0U;
 				gunichar c = 0U;
@@ -6595,7 +6432,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 				gunichar _tmp11_ = 0U;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (!_tmp4_) {
-#line 6591 "RESTSupport.c"
+#line 6428 "RESTSupport.c"
 					const gchar* _tmp5_ = NULL;
 					const gchar* _tmp6_ = NULL;
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6604,7 +6441,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 					_tmp6_ = g_utf8_next_char (_tmp5_);
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					u = _tmp6_;
-#line 6600 "RESTSupport.c"
+#line 6437 "RESTSupport.c"
 				}
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp4_ = FALSE;
@@ -6616,7 +6453,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 				if (!(_tmp8_ != ((gunichar) 0))) {
 #line 737 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					break;
-#line 6612 "RESTSupport.c"
+#line 6449 "RESTSupport.c"
 				}
 #line 738 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				_tmp9_ = u;
@@ -6628,7 +6465,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 				_tmp11_ = c;
 #line 739 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 				if (((gint) _tmp11_) < 128) {
-#line 6624 "RESTSupport.c"
+#line 6461 "RESTSupport.c"
 					GString* _tmp12_ = NULL;
 					gunichar _tmp13_ = 0U;
 #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
@@ -6637,7 +6474,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 					_tmp13_ = c;
 #line 740 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 					g_string_append_unichar (_tmp12_, _tmp13_);
-#line 6633 "RESTSupport.c"
+#line 6470 "RESTSupport.c"
 				}
 			}
 		}
@@ -6656,7 +6493,7 @@ gchar* publishing_rest_support_asciify_string (const gchar* s) {
 	_g_free0 (t);
 #line 743 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 6652 "RESTSupport.c"
+#line 6489 "RESTSupport.c"
 }
 
 
@@ -6665,7 +6502,7 @@ static gchar* publishing_rest_support_google_session_real_get_user_name (Publish
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_user_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6661 "RESTSupport.c"
+#line 6498 "RESTSupport.c"
 }
 
 
@@ -6674,7 +6511,7 @@ gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSuppo
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
 #line 747 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_user_name (self);
-#line 6670 "RESTSupport.c"
+#line 6507 "RESTSupport.c"
 }
 
 
@@ -6683,7 +6520,7 @@ static gchar* publishing_rest_support_google_session_real_get_access_token (Publ
 	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_access_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return NULL;
-#line 6679 "RESTSupport.c"
+#line 6516 "RESTSupport.c"
 }
 
 
@@ -6692,43 +6529,25 @@ gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSu
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
 #line 748 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_access_token (self);
-#line 6688 "RESTSupport.c"
-}
-
-
-static gchar* publishing_rest_support_google_session_real_get_refresh_token (PublishingRESTSupportGoogleSession* self) {
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_critical ("Type `%s' does not implement abstract method `publishing_rest_support_google_session_get_refresh_token'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return NULL;
-#line 6697 "RESTSupport.c"
-}
-
-
-gchar* publishing_rest_support_google_session_get_refresh_token (PublishingRESTSupportGoogleSession* self) {
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self), NULL);
-#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->get_refresh_token (self);
-#line 6706 "RESTSupport.c"
+#line 6525 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_session_real_deauthenticate (PublishingRESTSupportGoogleSession* self) {
-#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/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 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 6715 "RESTSupport.c"
+#line 6534 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self) {
-#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (self));
-#line 750 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_SESSION_GET_CLASS (self)->deauthenticate (self);
-#line 6724 "RESTSupport.c"
+#line 6543 "RESTSupport.c"
 }
 
 
@@ -6738,7 +6557,7 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_const
 	self = (PublishingRESTSupportGoogleSession*) publishing_rest_support_session_construct (object_type, NULL);
 #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 6734 "RESTSupport.c"
+#line 6553 "RESTSupport.c"
 }
 
 
@@ -6750,10 +6569,8 @@ static void publishing_rest_support_google_session_class_init (PublishingRESTSup
 #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = publishing_rest_support_google_session_real_get_access_token;
 #line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_session_real_get_refresh_token;
-#line 746 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_session_real_deauthenticate;
-#line 6749 "RESTSupport.c"
+#line 6566 "RESTSupport.c"
 }
 
 
@@ -6773,6 +6590,13 @@ 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"
+	publishing_rest_support_google_publisher_on_authenticator_authenticated ((PublishingRESTSupportGooglePublisher*) self);
+#line 6589 "RESTSupport.c"
+}
+
+
 PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host, const gchar* scope) {
 	PublishingRESTSupportGooglePublisher * self = NULL;
 	const gchar* _tmp0_ = NULL;
@@ -6780,1406 +6604,84 @@ PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_c
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
 	SpitPublishingService* _tmp3_ = NULL;
 	SpitPublishingPluginHost* _tmp4_ = NULL;
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	SpitPublishingAuthenticator* _tmp5_ = NULL;
+	SpitPublishingAuthenticator* _tmp6_ = NULL;
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (scope != NULL, NULL);
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGooglePublisher*) g_object_new (object_type, NULL);
-#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = scope;
-#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->scope);
-#line 882 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->scope = _tmp1_;
-#line 883 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = publishing_rest_support_google_publisher_google_session_impl_new ();
-#line 883 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 883 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->session = _tmp2_;
-#line 884 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 813 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = service;
-#line 884 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 813 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->service = _tmp3_;
-#line 885 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp4_ = host;
-#line 885 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv->host = _tmp4_;
-#line 886 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (self->priv->web_auth_pane);
-#line 886 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self->priv->web_auth_pane = NULL;
-#line 880 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 815 "/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"
+	_g_object_unref0 (self->priv->authenticator);
+#line 815 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	self->priv->authenticator = _tmp5_;
+#line 816 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp6_ = self->priv->authenticator;
+#line 816 "/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"
 	return self;
-#line 6812 "RESTSupport.c"
-}
-
-
-static void _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized (PublishingRESTSupportGooglePublisherWebAuthenticationPane* _sender, const gchar* auth_code, gpointer self) {
-#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_on_web_auth_pane_authorized ((PublishingRESTSupportGooglePublisher*) self, auth_code);
-#line 6819 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_on_web_auth_pane_authorized (PublishingRESTSupportGooglePublisher* self, const gchar* auth_code) {
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-	const gchar* _tmp5_ = NULL;
-#line 889 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 889 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (auth_code != NULL);
-#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = self->priv->web_auth_pane;
-#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("authorized", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, &_tmp1_, NULL, FALSE);
-#line 890 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized, self);
-#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = self->priv->scope;
-#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp3_ = auth_code;
-#line 892 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:892: EVENT: user authorized scope %s with auth_code %" \
-"s", _tmp2_, _tmp3_);
-#line 894 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 894 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (!_tmp4_) {
-#line 895 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 6852 "RESTSupport.c"
-	}
-#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp5_ = auth_code;
-#line 897 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_do_get_access_tokens (self, _tmp5_);
-#line 6858 "RESTSupport.c"
-}
-
-
-static void _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_on_get_access_tokens_complete ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6865 "RESTSupport.c"
-}
-
-
-static void _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_on_get_access_tokens_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6872 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_on_get_access_tokens_complete (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 900 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = txn;
-#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 901 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
-#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = txn;
-#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 902 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
-#line 904 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:904: %s", "EVENT: network transaction to exchange authorization code for access t" \
-"okens " "completed successfully.");
-#line 907 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 907 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (!_tmp4_) {
-#line 908 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 6909 "RESTSupport.c"
-	}
-#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp5_ = txn;
-#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp7_ = _tmp6_;
-#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp7_);
-#line 910 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp7_);
-#line 6921 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_on_get_access_tokens_error (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	SpitPublishingPluginHost* _tmp8_ = NULL;
-	GError* _tmp9_ = NULL;
-#line 913 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 913 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 915 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = txn;
-#line 915 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 915 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self);
-#line 916 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = txn;
-#line 916 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 916 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self);
-#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = txn;
-#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp6_ = _tmp5_;
-#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("EVENT: network transaction to exchange authorization code for access t" \
-"okens " "failed; response = '%s'", _tmp6_);
-#line 918 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp6_);
-#line 921 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp7_ = publishing_rest_support_google_publisher_is_running (self);
-#line 921 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (!_tmp7_) {
-#line 922 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 6968 "RESTSupport.c"
-	}
-#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp8_ = self->priv->host;
-#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp9_ = err;
-#line 924 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 6976 "RESTSupport.c"
-}
-
-
-static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 6983 "RESTSupport.c"
-}
-
-
-static void _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 6990 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 927 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = txn;
-#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 929 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = txn;
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 930 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 932 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:932: EVENT: refresh access token transaction complete" \
-"d successfully.");
-#line 934 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 934 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (!_tmp4_) {
-#line 935 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7029 "RESTSupport.c"
-	}
-#line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp5_ = self->priv->session;
-#line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 937 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp6_) {
-#line 938 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7039 "RESTSupport.c"
-	}
-#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp7_ = txn;
-#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_response (_tmp7_);
-#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp9_ = _tmp8_;
-#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_do_extract_tokens (self, _tmp9_);
-#line 940 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp9_);
-#line 7051 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp5_ = NULL;
-	gboolean _tmp6_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp7_ = NULL;
-	guint _tmp8_ = 0U;
-	SpitPublishingPluginHost* _tmp9_ = NULL;
-	GError* _tmp10_ = NULL;
-#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 943 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 945 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = txn;
-#line 945 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 945 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 946 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = txn;
-#line 946 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 946 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 948 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:948: EVENT: refresh access token transaction caused a" \
-" network error.");
-#line 950 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 950 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (!_tmp4_) {
-#line 951 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7091 "RESTSupport.c"
-	}
-#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp5_ = self->priv->session;
-#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp6_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 953 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp6_) {
-#line 954 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7101 "RESTSupport.c"
-	}
-#line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp7_ = txn;
-#line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp8_ = publishing_rest_support_transaction_get_status_code (_tmp7_);
-#line 958 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp8_ == ((guint) 400)) {
-#line 959 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		publishing_rest_support_google_publisher_do_logout (self);
-#line 960 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7113 "RESTSupport.c"
-	}
-#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp9_ = self->priv->host;
-#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp10_ = err;
-#line 963 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	spit_publishing_plugin_host_post_error (_tmp9_, _tmp10_);
-#line 7121 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_on_refresh_token_available (PublishingRESTSupportGooglePublisher* self, const gchar* token) {
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-#line 966 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 966 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (token != NULL);
-#line 967 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = token;
-#line 967 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:967: EVENT: an OAuth refresh token has become availab" \
-"le; token = '%s'.", _tmp0_);
-#line 969 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = publishing_rest_support_google_publisher_is_running (self);
-#line 969 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (!_tmp1_) {
-#line 970 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7145 "RESTSupport.c"
-	}
-#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = self->priv->session;
-#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp3_ = token;
-#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = g_strdup (_tmp3_);
-#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp2_->refresh_token);
-#line 972 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_->refresh_token = _tmp4_;
-#line 7157 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_on_access_token_available (PublishingRESTSupportGooglePublisher* self, const gchar* token) {
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-#line 975 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 975 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (token != NULL);
-#line 976 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = token;
-#line 976 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:976: EVENT: an OAuth access token has become availabl" \
-"e; token = '%s'.", _tmp0_);
-#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = publishing_rest_support_google_publisher_is_running (self);
-#line 978 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (!_tmp1_) {
-#line 979 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7181 "RESTSupport.c"
-	}
-#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = self->priv->session;
-#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp3_ = token;
-#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = g_strdup (_tmp3_);
-#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp2_->access_token);
-#line 981 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_->access_token = _tmp4_;
-#line 983 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_do_fetch_username (self);
-#line 7195 "RESTSupport.c"
-}
-
-
-static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_on_fetch_username_transaction_completed ((PublishingRESTSupportGooglePublisher*) self, _sender);
-#line 7202 "RESTSupport.c"
-}
-
-
-static void _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_on_fetch_username_transaction_error ((PublishingRESTSupportGooglePublisher*) self, _sender, err);
-#line 7209 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_on_fetch_username_transaction_completed (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-#line 986 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 986 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = txn;
-#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 987 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = txn;
-#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 988 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 990 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:990: EVENT: username fetch transaction completed succ" \
-"essfully.");
-#line 992 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 992 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (!_tmp4_) {
-#line 993 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7246 "RESTSupport.c"
-	}
-#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp5_ = txn;
-#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp7_ = _tmp6_;
-#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_do_extract_username (self, _tmp7_);
-#line 995 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp7_);
-#line 7258 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_on_fetch_username_transaction_error (PublishingRESTSupportGooglePublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	GError* _tmp6_ = NULL;
-#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 998 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 1000 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = txn;
-#line 1000 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 1000 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self);
-#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = txn;
-#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 1001 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self);
-#line 1003 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1003: EVENT: username fetch transaction caused a netw" \
-"ork error");
-#line 1005 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (self);
-#line 1005 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (!_tmp4_) {
-#line 1006 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7294 "RESTSupport.c"
-	}
-#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp5_ = self->priv->host;
-#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp6_ = err;
-#line 1008 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 7302 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_do_get_access_tokens (PublishingRESTSupportGooglePublisher* self, const gchar* auth_code) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* tokens_txn = NULL;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* _tmp3_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (auth_code != NULL);
-#line 1012 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1012: ACTION: exchanging authorization code for acces" \
-"s & refresh tokens");
-#line 1014 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = self->priv->host;
-#line 1014 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
-#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = self->priv->session;
-#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = auth_code;
-#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp3_ = publishing_rest_support_google_publisher_get_access_tokens_transaction_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp2_);
-#line 1016 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	tokens_txn = _tmp3_;
-#line 1017 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 1018 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_get_access_tokens_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7335 "RESTSupport.c"
-	{
-#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (tokens_txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7343 "RESTSupport.c"
-				goto __catch4_spit_publishing_publishing_error;
-			}
-#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 1021 "/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 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			g_clear_error (&_inner_error_);
-#line 1021 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			return;
-#line 7354 "RESTSupport.c"
-		}
-	}
-	goto __finally4;
-	__catch4_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		err = _inner_error_;
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_inner_error_ = NULL;
-#line 1023 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp4_ = self->priv->host;
-#line 1023 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp5_ = err;
-#line 1023 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_error_free0 (err);
-#line 7375 "RESTSupport.c"
-	}
-	__finally4:
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 1020 "/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 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_clear_error (&_inner_error_);
-#line 1020 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7388 "RESTSupport.c"
-	}
-#line 1011 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_publishing_rest_support_transaction_unref0 (tokens_txn);
-#line 7392 "RESTSupport.c"
+#line 6644 "RESTSupport.c"
 }
 
 
-static void publishing_rest_support_google_publisher_do_hosted_web_authentication (PublishingRESTSupportGooglePublisher* self) {
-	gchar* user_authorization_url = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane* _tmp27_ = NULL;
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane* _tmp28_ = NULL;
-	SpitPublishingPluginHost* _tmp29_ = NULL;
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane* _tmp30_ = NULL;
-#line 1027 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1028 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1028: ACTION: running OAuth authentication flow in ho" \
-"sted web pane.");
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = soup_uri_encode ("urn:ietf:wg:oauth:2.0:oob", NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = _tmp0_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = g_strconcat ("https://accounts.google.com/o/oauth2/auth?" "response_type=code&" "client_id=" PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_ID "&" "redirect_uri=", _tmp1_, NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp3_ = _tmp2_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = g_strconcat (_tmp3_, "&", NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp5_ = _tmp4_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp6_ = g_strconcat (_tmp5_, "scope=", NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp7_ = _tmp6_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp8_ = self->priv->scope;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp9_ = soup_uri_encode (_tmp8_, NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp10_ = _tmp9_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp11_ = g_strconcat (_tmp7_, _tmp10_, NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp12_ = _tmp11_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp13_ = g_strconcat (_tmp12_, "+", NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp14_ = _tmp13_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp15_ = soup_uri_encode ("https://www.googleapis.com/auth/userinfo.profile", NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp16_ = _tmp15_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp17_ = g_strconcat (_tmp14_, _tmp16_, NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp18_ = _tmp17_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp19_ = g_strconcat (_tmp18_, "&", NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp20_ = _tmp19_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp21_ = g_strconcat (_tmp20_, "state=connect&", NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp22_ = _tmp21_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp23_ = g_strconcat (_tmp22_, "access_type=offline&", NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp24_ = _tmp23_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp25_ = g_strconcat (_tmp24_, "approval_prompt=force", NULL);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp26_ = _tmp25_;
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp24_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp22_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp20_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp18_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp16_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp14_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp12_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp10_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp7_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp5_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp3_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp1_);
-#line 1030 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	user_authorization_url = _tmp26_;
-#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp27_ = publishing_rest_support_google_publisher_web_authentication_pane_new (user_authorization_url);
-#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (self->priv->web_auth_pane);
-#line 1040 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self->priv->web_auth_pane = _tmp27_;
-#line 1041 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp28_ = self->priv->web_auth_pane;
-#line 1041 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_connect_object (_tmp28_, "authorized", (GCallback) _publishing_rest_support_google_publisher_on_web_auth_pane_authorized_publishing_rest_support_google_publisher_web_authentication_pane_authorized, self, 0);
-#line 1043 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp29_ = self->priv->host;
-#line 1043 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp30_ = self->priv->web_auth_pane;
-#line 1043 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1027 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (user_authorization_url);
-#line 7531 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_do_exchange_refresh_token_for_access_token (PublishingRESTSupportGooglePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* txn = NULL;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp1_ = NULL;
-	PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* _tmp2_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1048 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1048: ACTION: exchanging OAuth refresh token for OAut" \
-"h access token.");
-#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = self->priv->host;
-#line 1050 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
-#line 1052 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = self->priv->session;
-#line 1052 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = publishing_rest_support_google_publisher_refresh_access_token_transaction_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1052 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	txn = _tmp2_;
-#line 1054 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 1055 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_refresh_access_token_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7559 "RESTSupport.c"
-	{
-#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 7567 "RESTSupport.c"
-				goto __catch5_spit_publishing_publishing_error;
-			}
-#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_publishing_rest_support_transaction_unref0 (txn);
-#line 1058 "/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 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			g_clear_error (&_inner_error_);
-#line 1058 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			return;
-#line 7578 "RESTSupport.c"
-		}
-	}
-	goto __finally5;
-	__catch5_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp3_ = NULL;
-		GError* _tmp4_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		err = _inner_error_;
-#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_inner_error_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp3_ = self->priv->host;
-#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp4_ = err;
-#line 1060 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		spit_publishing_plugin_host_post_error (_tmp3_, _tmp4_);
-#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_error_free0 (err);
-#line 7599 "RESTSupport.c"
-	}
-	__finally5:
-#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_publishing_rest_support_transaction_unref0 (txn);
-#line 1057 "/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 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_clear_error (&_inner_error_);
-#line 1057 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7612 "RESTSupport.c"
-	}
-#line 1047 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_publishing_rest_support_transaction_unref0 (txn);
-#line 7616 "RESTSupport.c"
-}
-
-
-static gpointer _json_object_ref0 (gpointer self) {
-#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return self ? json_object_ref (self) : NULL;
-#line 7623 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_do_extract_tokens (PublishingRESTSupportGooglePublisher* self, const gchar* response_body) {
-	JsonParser* parser = NULL;
-	JsonParser* _tmp0_ = NULL;
-	JsonObject* response_obj = NULL;
-	JsonParser* _tmp10_ = NULL;
-	JsonNode* _tmp11_ = NULL;
-	JsonObject* _tmp12_ = NULL;
-	JsonObject* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
-	JsonObject* _tmp15_ = NULL;
-	gboolean _tmp16_ = FALSE;
-	JsonObject* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	JsonObject* _tmp29_ = NULL;
-	gboolean _tmp30_ = FALSE;
-	GError * _inner_error_ = NULL;
-#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (response_body != NULL);
-#line 1065 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1065: ACTION: extracting OAuth tokens from body of se" \
-"rver response");
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = json_parser_new ();
-#line 1067 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	parser = _tmp0_;
-#line 7653 "RESTSupport.c"
-	{
-		JsonParser* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp1_ = parser;
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp2_ = response_body;
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 1070 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7665 "RESTSupport.c"
-			goto __catch6_g_error;
-		}
-	}
-	goto __finally6;
-	__catch6_g_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp3_ = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		err = _inner_error_;
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_inner_error_ = NULL;
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp3_ = self->priv->host;
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp4_ = err;
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp5_ = _tmp4_->message;
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp7_ = _tmp6_;
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp9_ = _tmp8_;
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_error_free0 (_tmp9_);
-#line 1072 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_free0 (_tmp7_);
-#line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_error_free0 (err);
-#line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_object_unref0 (parser);
-#line 1074 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7710 "RESTSupport.c"
-	}
-	__finally6:
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_object_unref0 (parser);
-#line 1069 "/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 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_clear_error (&_inner_error_);
-#line 1069 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7723 "RESTSupport.c"
-	}
-#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp10_ = parser;
-#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp11_ = json_parser_get_root (_tmp10_);
-#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp12_ = json_node_get_object (_tmp11_);
-#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp13_ = _json_object_ref0 (_tmp12_);
-#line 1077 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	response_obj = _tmp13_;
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp15_ = response_obj;
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp16_ = json_object_has_member (_tmp15_, "access_token");
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (!_tmp16_) {
-#line 7741 "RESTSupport.c"
-		JsonObject* _tmp17_ = NULL;
-		gboolean _tmp18_ = FALSE;
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp17_ = response_obj;
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp18_ = json_object_has_member (_tmp17_, "refresh_token");
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp14_ = !_tmp18_;
-#line 7750 "RESTSupport.c"
-	} else {
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp14_ = FALSE;
-#line 7754 "RESTSupport.c"
-	}
-#line 1079 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp14_) {
-#line 7758 "RESTSupport.c"
-		SpitPublishingPluginHost* _tmp19_ = NULL;
-		GError* _tmp20_ = NULL;
-		GError* _tmp21_ = NULL;
-#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp19_ = self->priv->host;
-#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp20_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "neither access_token nor refresh_token not present in server response");
-#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp21_ = _tmp20_;
-#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		spit_publishing_plugin_host_post_error (_tmp19_, _tmp21_);
-#line 1080 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_error_free0 (_tmp21_);
-#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_json_object_unref0 (response_obj);
-#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_object_unref0 (parser);
-#line 1082 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7778 "RESTSupport.c"
-	}
-#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp22_ = response_obj;
-#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp23_ = json_object_has_member (_tmp22_, "refresh_token");
-#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp23_) {
-#line 7786 "RESTSupport.c"
-		gchar* refresh_token = NULL;
-		JsonObject* _tmp24_ = NULL;
-		const gchar* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
-#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp24_ = response_obj;
-#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp25_ = json_object_get_string_member (_tmp24_, "refresh_token");
-#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp26_ = g_strdup (_tmp25_);
-#line 1086 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		refresh_token = _tmp26_;
-#line 1088 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp27_ = refresh_token;
-#line 1088 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (g_strcmp0 (_tmp27_, "") != 0) {
-#line 7804 "RESTSupport.c"
-			const gchar* _tmp28_ = NULL;
-#line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp28_ = refresh_token;
-#line 1089 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			publishing_rest_support_google_publisher_on_refresh_token_available (self, _tmp28_);
-#line 7810 "RESTSupport.c"
-		}
-#line 1085 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_free0 (refresh_token);
-#line 7814 "RESTSupport.c"
-	}
-#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp29_ = response_obj;
-#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp30_ = json_object_has_member (_tmp29_, "access_token");
-#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp30_) {
-#line 7822 "RESTSupport.c"
-		gchar* access_token = NULL;
-		JsonObject* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		const gchar* _tmp34_ = NULL;
-#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp31_ = response_obj;
-#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp32_ = json_object_get_string_member (_tmp31_, "access_token");
-#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp33_ = g_strdup (_tmp32_);
-#line 1093 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		access_token = _tmp33_;
-#line 1095 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp34_ = access_token;
-#line 1095 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (g_strcmp0 (_tmp34_, "") != 0) {
-#line 7840 "RESTSupport.c"
-			const gchar* _tmp35_ = NULL;
-#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp35_ = access_token;
-#line 1096 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			publishing_rest_support_google_publisher_on_access_token_available (self, _tmp35_);
-#line 7846 "RESTSupport.c"
-		}
-#line 1092 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_free0 (access_token);
-#line 7850 "RESTSupport.c"
-	}
-#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_json_object_unref0 (response_obj);
-#line 1064 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (parser);
-#line 7856 "RESTSupport.c"
+static SpitPublishingAuthenticator* publishing_rest_support_google_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* self) {
+#line 819 "/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"
+	return NULL;
+#line 6653 "RESTSupport.c"
 }
 
 
-static void publishing_rest_support_google_publisher_do_fetch_username (PublishingRESTSupportGooglePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingRESTSupportGooglePublisherUsernameFetchTransaction* txn = NULL;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp2_ = NULL;
-	PublishingRESTSupportGooglePublisherUsernameFetchTransaction* _tmp3_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1101 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1101: ACTION: running network transaction to fetch us" \
-"ername.");
-#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = self->priv->host;
-#line 1103 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	spit_publishing_plugin_host_install_login_wait_pane (_tmp0_);
-#line 1104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = self->priv->host;
-#line 1104 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 1106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = self->priv->session;
-#line 1106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp3_ = publishing_rest_support_google_publisher_username_fetch_transaction_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession));
-#line 1106 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	txn = _tmp3_;
-#line 1107 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 1108 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_rest_support_google_publisher_on_fetch_username_transaction_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 7889 "RESTSupport.c"
-	{
-#line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 1111 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7895 "RESTSupport.c"
-			goto __catch7_g_error;
-		}
-	}
-	goto __finally7;
-	__catch7_g_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		GError* _tmp5_ = NULL;
-#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		err = _inner_error_;
-#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_inner_error_ = NULL;
-#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp4_ = self->priv->host;
-#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp5_ = err;
-#line 1113 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_error_free0 (err);
-#line 7917 "RESTSupport.c"
-	}
-	__finally7:
-#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_publishing_rest_support_transaction_unref0 (txn);
-#line 1110 "/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 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_clear_error (&_inner_error_);
-#line 1110 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 7930 "RESTSupport.c"
-	}
-#line 1100 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_publishing_rest_support_transaction_unref0 (txn);
-#line 7934 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_do_extract_username (PublishingRESTSupportGooglePublisher* self, const gchar* response_body) {
-	JsonParser* parser = NULL;
-	JsonParser* _tmp0_ = NULL;
-	JsonObject* response_obj = NULL;
-	JsonParser* _tmp10_ = NULL;
-	JsonNode* _tmp11_ = NULL;
-	JsonObject* _tmp12_ = NULL;
-	JsonObject* _tmp13_ = NULL;
-	JsonObject* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	JsonObject* _tmp23_ = NULL;
-	gboolean _tmp24_ = FALSE;
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp32_ = NULL;
-	gboolean _tmp33_ = FALSE;
-	GError * _inner_error_ = NULL;
-#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (response_body != NULL);
-#line 1118 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_debug ("RESTSupport.vala:1118: ACTION: extracting username from body of server" \
-" response");
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = json_parser_new ();
-#line 1120 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	parser = _tmp0_;
-#line 7963 "RESTSupport.c"
-	{
-		JsonParser* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp1_ = parser;
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp2_ = response_body;
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 1123 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7975 "RESTSupport.c"
-			goto __catch8_g_error;
-		}
-	}
-	goto __finally8;
-	__catch8_g_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp3_ = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-		GError* _tmp9_ = NULL;
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		err = _inner_error_;
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_inner_error_ = NULL;
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp3_ = self->priv->host;
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp4_ = err;
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp5_ = _tmp4_->message;
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp6_ = g_strconcat ("Couldn't parse JSON response: ", _tmp5_, NULL);
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp7_ = _tmp6_;
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp7_);
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp9_ = _tmp8_;
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		spit_publishing_plugin_host_post_error (_tmp3_, _tmp9_);
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_error_free0 (_tmp9_);
-#line 1125 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_free0 (_tmp7_);
-#line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_error_free0 (err);
-#line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_object_unref0 (parser);
-#line 1127 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 8020 "RESTSupport.c"
-	}
-	__finally8:
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_object_unref0 (parser);
-#line 1122 "/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 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_clear_error (&_inner_error_);
-#line 1122 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		return;
-#line 8033 "RESTSupport.c"
-	}
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp10_ = parser;
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp11_ = json_parser_get_root (_tmp10_);
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp12_ = json_node_get_object (_tmp11_);
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp13_ = _json_object_ref0 (_tmp12_);
-#line 1130 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	response_obj = _tmp13_;
-#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp14_ = response_obj;
-#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp15_ = json_object_has_member (_tmp14_, "name");
-#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp15_) {
-#line 8051 "RESTSupport.c"
-		gchar* username = NULL;
-		JsonObject* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp16_ = response_obj;
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp17_ = json_object_get_string_member (_tmp16_, "name");
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp18_ = g_strdup (_tmp17_);
-#line 1133 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		username = _tmp18_;
-#line 1135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp19_ = username;
-#line 1135 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (g_strcmp0 (_tmp19_, "") != 0) {
-#line 8069 "RESTSupport.c"
-			PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp20_ = NULL;
-			const gchar* _tmp21_ = NULL;
-			gchar* _tmp22_ = NULL;
-#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp20_ = self->priv->session;
-#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp21_ = username;
-#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp22_ = g_strdup (_tmp21_);
-#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_g_free0 (_tmp20_->user_name);
-#line 1136 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp20_->user_name = _tmp22_;
-#line 8083 "RESTSupport.c"
-		}
-#line 1132 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_free0 (username);
-#line 8087 "RESTSupport.c"
-	}
-#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp23_ = response_obj;
-#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp24_ = json_object_has_member (_tmp23_, "access_token");
-#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp24_) {
-#line 8095 "RESTSupport.c"
-		gchar* access_token = NULL;
-		JsonObject* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp25_ = response_obj;
-#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp26_ = json_object_get_string_member (_tmp25_, "access_token");
-#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp27_ = g_strdup (_tmp26_);
-#line 1140 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		access_token = _tmp27_;
-#line 1142 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp28_ = access_token;
-#line 1142 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (g_strcmp0 (_tmp28_, "") != 0) {
-#line 8113 "RESTSupport.c"
-			PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp29_ = NULL;
-			const gchar* _tmp30_ = NULL;
-			gchar* _tmp31_ = NULL;
-#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp29_ = self->priv->session;
-#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp30_ = access_token;
-#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp31_ = g_strdup (_tmp30_);
-#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_g_free0 (_tmp29_->access_token);
-#line 1143 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp29_->access_token = _tmp31_;
-#line 8127 "RESTSupport.c"
-		}
-#line 1139 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_free0 (access_token);
-#line 8131 "RESTSupport.c"
-	}
-#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp32_ = self->priv->session;
-#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp33_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 1148 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_vala_assert (_tmp33_, "session.is_authenticated()");
-#line 1150 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_on_login_flow_complete (self);
-#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_json_object_unref0 (response_obj);
-#line 1117 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (parser);
-#line 8145 "RESTSupport.c"
+SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self) {
+#line 819 "/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"
+	return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->get_authenticator (self);
+#line 6662 "RESTSupport.c"
 }
 
 
 SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self) {
 	SpitPublishingPluginHost* result = NULL;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->host;
-#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_;
-#line 1154 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 822 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8160 "RESTSupport.c"
+#line 6677 "RESTSupport.c"
 }
 
 
@@ -8187,177 +6689,107 @@ PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get
 	PublishingRESTSupportGoogleSession* result = NULL;
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-#line 1157 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), NULL);
-#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->session;
-#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 826 "/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 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 1158 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8178 "RESTSupport.c"
-}
-
-
-void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSupportGooglePublisher* self, const gchar* refresh_token) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-#line 1161 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = refresh_token;
-#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp1_ != NULL) {
-#line 8191 "RESTSupport.c"
-		const gchar* _tmp2_ = NULL;
-#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp2_ = refresh_token;
-#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp0_ = g_strcmp0 (_tmp2_, "") != 0;
-#line 8197 "RESTSupport.c"
-	} else {
-#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp0_ = FALSE;
-#line 8201 "RESTSupport.c"
-	}
-#line 1162 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp0_) {
-#line 8205 "RESTSupport.c"
-		PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp3_ = NULL;
-		const gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp3_ = self->priv->session;
-#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp4_ = refresh_token;
-#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp5_ = g_strdup (_tmp4_);
-#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_free0 (_tmp3_->refresh_token);
-#line 1163 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp3_->refresh_token = _tmp5_;
-#line 1164 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		publishing_rest_support_google_publisher_do_exchange_refresh_token_for_access_token (self);
-#line 8221 "RESTSupport.c"
-	} else {
-		gboolean _tmp6_ = FALSE;
-#line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp6_ = publishing_rest_support_google_publisher_web_authentication_pane_is_cache_dirty ();
-#line 1166 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (_tmp6_) {
-#line 8228 "RESTSupport.c"
-			SpitPublishingPluginHost* _tmp7_ = NULL;
-			const gchar* _tmp8_ = NULL;
-#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp7_ = self->priv->host;
-#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_tmp8_ = _ ("You have already logged in and out of a Google service during this Sho" \
-"twell session.\n" \
-"\n" \
-"To continue publishing to Google services, quit and restart Shotwell, " \
-"then try publishing again.");
-#line 1167 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			spit_publishing_plugin_host_install_static_message_pane (_tmp7_, _tmp8_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 1168 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			return;
-#line 8239 "RESTSupport.c"
-		}
-#line 1171 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		publishing_rest_support_google_publisher_do_hosted_web_authentication (self);
-#line 8243 "RESTSupport.c"
-	}
+#line 6695 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
-#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 829 "/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 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 8253 "RESTSupport.c"
+#line 6704 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self) {
-#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1175 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->on_login_flow_complete (self);
-#line 8262 "RESTSupport.c"
+#line 6713 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* self) {
-#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 831 "/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 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 8271 "RESTSupport.c"
+#line 6722 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self) {
-#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1177 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->do_logout (self);
-#line 8280 "RESTSupport.c"
+#line 6731 "RESTSupport.c"
 }
 
 
 static gboolean publishing_rest_support_google_publisher_real_is_running (PublishingRESTSupportGooglePublisher* self) {
-#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 833 "/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 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return FALSE;
-#line 8289 "RESTSupport.c"
+#line 6740 "RESTSupport.c"
 }
 
 
 gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self) {
-#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self), FALSE);
-#line 1179 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->is_running (self);
-#line 8298 "RESTSupport.c"
+#line 6749 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_real_start (PublishingRESTSupportGooglePublisher* self) {
-#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 835 "/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 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 8307 "RESTSupport.c"
+#line 6758 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_start (PublishingRESTSupportGooglePublisher* self) {
-#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1181 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 835 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->start (self);
-#line 8316 "RESTSupport.c"
+#line 6767 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_real_stop (PublishingRESTSupportGooglePublisher* self) {
-#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 837 "/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 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return;
-#line 8325 "RESTSupport.c"
+#line 6776 "RESTSupport.c"
 }
 
 
 void publishing_rest_support_google_publisher_stop (PublishingRESTSupportGooglePublisher* self) {
-#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_PUBLISHER (self));
-#line 1183 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_CLASS (self)->stop (self);
-#line 8334 "RESTSupport.c"
+#line 6785 "RESTSupport.c"
 }
 
 
@@ -8366,46 +6798,166 @@ static SpitPublishingService* publishing_rest_support_google_publisher_real_get_
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingService* _tmp1_ = NULL;
-#line 1185 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 839 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
-#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->priv->service;
-#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp1_;
-#line 1186 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 840 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8353 "RESTSupport.c"
+#line 6804 "RESTSupport.c"
+}
+
+
+static gpointer _g_variant_ref0 (gpointer self) {
+#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	return self ? g_variant_ref (self) : NULL;
+#line 6811 "RESTSupport.c"
+}
+
+
+static void publishing_rest_support_google_publisher_on_authenticator_authenticated (PublishingRESTSupportGooglePublisher* self) {
+	GHashTable* params = NULL;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	GHashTable* _tmp1_ = NULL;
+	GVariant* refresh_token = NULL;
+	GVariant* access_token = NULL;
+	GVariant* user_name = NULL;
+	gconstpointer _tmp2_ = NULL;
+	GVariant* _tmp3_ = NULL;
+	gconstpointer _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+	gconstpointer _tmp6_ = NULL;
+	GVariant* _tmp7_ = NULL;
+	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp8_ = NULL;
+	GVariant* _tmp9_ = NULL;
+	const gchar* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp12_ = NULL;
+	GVariant* _tmp13_ = NULL;
+	const gchar* _tmp14_ = NULL;
+	gchar* _tmp15_ = NULL;
+	PublishingRESTSupportGooglePublisherGoogleSessionImpl* _tmp16_ = NULL;
+	GVariant* _tmp17_ = NULL;
+	const gchar* _tmp18_ = NULL;
+	gchar* _tmp19_ = NULL;
+#line 843 "/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"
+	_tmp0_ = self->priv->authenticator;
+#line 844 "/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"
+	params = _tmp1_;
+#line 845 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	refresh_token = NULL;
+#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	access_token = NULL;
+#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	user_name = NULL;
+#line 849 "/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"
+	_g_variant_unref0 (refresh_token);
+#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp3_ = _g_variant_ref0 (_tmp2_);
+#line 849 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	refresh_token = _tmp3_;
+#line 850 "/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"
+	_g_variant_unref0 (access_token);
+#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp5_ = _g_variant_ref0 (_tmp4_);
+#line 850 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	access_token = _tmp5_;
+#line 851 "/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"
+	_g_variant_unref0 (user_name);
+#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp7_ = _g_variant_ref0 (_tmp6_);
+#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	user_name = _tmp7_;
+#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp8_ = self->priv->session;
+#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp9_ = refresh_token;
+#line 853 "/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"
+	_tmp11_ = g_strdup (_tmp10_);
+#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_free0 (_tmp8_->refresh_token);
+#line 853 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp8_->refresh_token = _tmp11_;
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp12_ = self->priv->session;
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp13_ = access_token;
+#line 854 "/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"
+	_tmp15_ = g_strdup (_tmp14_);
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_free0 (_tmp12_->access_token);
+#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp12_->access_token = _tmp15_;
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp16_ = self->priv->session;
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp17_ = user_name;
+#line 855 "/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"
+	_tmp19_ = g_strdup (_tmp18_);
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_free0 (_tmp16_->user_name);
+#line 855 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_tmp16_->user_name = _tmp19_;
+#line 857 "/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"
+	_g_variant_unref0 (user_name);
+#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_variant_unref0 (access_token);
+#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_variant_unref0 (refresh_token);
+#line 843 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_hash_table_unref0 (params);
+#line 6924 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_construct (GType object_type) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl* self = NULL;
-#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = (PublishingRESTSupportGooglePublisherGoogleSessionImpl*) publishing_rest_support_google_session_construct (object_type);
-#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->access_token);
-#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->access_token = NULL;
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->user_name);
-#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->user_name = NULL;
-#line 765 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->refresh_token);
-#line 765 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->refresh_token = NULL;
-#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 8375 "RESTSupport.c"
+#line 6946 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherGoogleSessionImpl* publishing_rest_support_google_publisher_google_session_impl_new (void) {
-#line 762 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_google_session_impl_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GOOGLE_SESSION_IMPL);
-#line 8382 "RESTSupport.c"
+#line 6953 "RESTSupport.c"
 }
 
 
@@ -8413,15 +6965,15 @@ static gboolean publishing_rest_support_google_publisher_google_session_impl_rea
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 767 "/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 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->access_token;
-#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp0_ != NULL;
-#line 769 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8398 "RESTSupport.c"
+#line 6969 "RESTSupport.c"
 }
 
 
@@ -8431,21 +6983,21 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 771 "/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 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = self->user_name;
-#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_ != NULL, "user_name != null");
-#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->user_name;
-#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 774 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8422 "RESTSupport.c"
+#line 6993 "RESTSupport.c"
 }
 
 
@@ -8455,84 +7007,58 @@ static gchar* publishing_rest_support_google_publisher_google_session_impl_real_
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 776 "/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 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 777 "/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 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp0_, "is_authenticated()");
-#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = self->access_token;
-#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	result = _tmp2_;
-#line 779 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return result;
-#line 8446 "RESTSupport.c"
-}
-
-
-static gchar* publishing_rest_support_google_publisher_google_session_impl_real_get_refresh_token (PublishingRESTSupportGoogleSession* base) {
-	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
-	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-#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 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = self->refresh_token;
-#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_vala_assert (_tmp0_ != NULL, "refresh_token != null");
-#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = self->refresh_token;
-#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	result = _tmp2_;
-#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return result;
-#line 8470 "RESTSupport.c"
+#line 7017 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate (PublishingRESTSupportGoogleSession* base) {
 	PublishingRESTSupportGooglePublisherGoogleSessionImpl * self;
-#line 787 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 781 "/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 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->access_token);
-#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->access_token = NULL;
-#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->user_name);
-#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->user_name = NULL;
-#line 790 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->refresh_token);
-#line 790 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->refresh_token = NULL;
-#line 8490 "RESTSupport.c"
+#line 7037 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_google_session_impl_class_init (PublishingRESTSupportGooglePublisherGoogleSessionImplClass * klass) {
-#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 756 "/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 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_rest_support_google_publisher_google_session_impl_finalize;
-#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_rest_support_google_publisher_google_session_impl_real_is_authenticated;
-#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_user_name = publishing_rest_support_google_publisher_google_session_impl_real_get_user_name;
-#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->get_access_token = publishing_rest_support_google_publisher_google_session_impl_real_get_access_token;
-#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((PublishingRESTSupportGoogleSessionClass *) klass)->get_refresh_token = publishing_rest_support_google_publisher_google_session_impl_real_get_refresh_token;
-#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGoogleSessionClass *) klass)->deauthenticate = publishing_rest_support_google_publisher_google_session_impl_real_deauthenticate;
-#line 8509 "RESTSupport.c"
+#line 7054 "RESTSupport.c"
 }
 
 
@@ -8542,17 +7068,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 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 756 "/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 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->access_token);
-#line 759 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->user_name);
-#line 760 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->refresh_token);
-#line 757 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	PUBLISHING_REST_SUPPORT_SESSION_CLASS (publishing_rest_support_google_publisher_google_session_impl_parent_class)->finalize (obj);
-#line 8529 "RESTSupport.c"
+#line 7074 "RESTSupport.c"
 }
 
 
@@ -8568,523 +7094,33 @@ static GType publishing_rest_support_google_publisher_google_session_impl_get_ty
 }
 
 
-static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_rest_support_google_publisher_web_authentication_pane_construct (GType object_type, const gchar* auth_sequence_start_url) {
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane * self = NULL;
-	const gchar* _tmp0_ = NULL;
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_val_if_fail (auth_sequence_start_url != NULL, NULL);
-#line 800 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = auth_sequence_start_url;
-#line 800 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self = (PublishingRESTSupportGooglePublisherWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp0_, NULL);
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return self;
-#line 8556 "RESTSupport.c"
-}
-
-
-static PublishingRESTSupportGooglePublisherWebAuthenticationPane* publishing_rest_support_google_publisher_web_authentication_pane_new (const gchar* auth_sequence_start_url) {
-#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return publishing_rest_support_google_publisher_web_authentication_pane_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, auth_sequence_start_url);
-#line 8563 "RESTSupport.c"
-}
-
-
-static gboolean publishing_rest_support_google_publisher_web_authentication_pane_is_cache_dirty (void) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty;
-#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	result = _tmp0_;
-#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return result;
-#line 8576 "RESTSupport.c"
-}
-
-
-static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
-	gint result = 0;
-	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 8603 "RESTSupport.c"
-		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 8611 "RESTSupport.c"
-	} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 8617 "RESTSupport.c"
-	}
-}
-
-
-static glong string_strnlen (gchar* str, glong maxlen) {
-	glong result = 0L;
-	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 8641 "RESTSupport.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 8649 "RESTSupport.c"
-	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 8661 "RESTSupport.c"
-	}
-}
-
-
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 8685 "RESTSupport.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 8691 "RESTSupport.c"
-	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = FALSE;
-#line 8695 "RESTSupport.c"
-	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp0_) {
-#line 8699 "RESTSupport.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 8711 "RESTSupport.c"
-	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 8721 "RESTSupport.c"
-	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 8727 "RESTSupport.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 8741 "RESTSupport.c"
-	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 8751 "RESTSupport.c"
-	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 8757 "RESTSupport.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 8766 "RESTSupport.c"
-	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 8786 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
-	gchar* page_title = NULL;
-	WebKitWebView* _tmp0_ = NULL;
-	WebKitWebView* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.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 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = _tmp0_;
-#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = webkit_web_view_get_title (_tmp1_);
-#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp4_ = _tmp3_;
-#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (_tmp1_);
-#line 808 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	page_title = _tmp4_;
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp5_ = page_title;
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp6_ = string_index_of (_tmp5_, "state=connect", 0);
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	if (_tmp6_ > 0) {
-#line 8822 "RESTSupport.c"
-		gint auth_code_field_start = 0;
-		const gchar* _tmp7_ = NULL;
-		gint _tmp8_ = 0;
-		gint _tmp9_ = 0;
-		gchar* auth_code = NULL;
-		const gchar* _tmp10_ = NULL;
-		gint _tmp11_ = 0;
-		gchar* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-#line 810 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp7_ = page_title;
-#line 810 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp8_ = string_index_of (_tmp7_, "code=", 0);
-#line 810 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		auth_code_field_start = _tmp8_;
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp9_ = auth_code_field_start;
-#line 811 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		if (_tmp9_ < 0) {
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			_g_free0 (page_title);
-#line 812 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-			return;
-#line 8846 "RESTSupport.c"
-		}
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp10_ = page_title;
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp11_ = auth_code_field_start;
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp12_ = string_substring (_tmp10_, (glong) (_tmp11_ + 5), (glong) -1);
-#line 814 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		auth_code = _tmp12_;
-#line 817 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		publishing_rest_support_google_publisher_web_authentication_pane_cache_dirty = TRUE;
-#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_tmp13_ = auth_code;
-#line 819 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		g_signal_emit_by_name (self, "authorized", _tmp13_);
-#line 809 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-		_g_free0 (auth_code);
-#line 8864 "RESTSupport.c"
-	}
-#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (page_title);
-#line 8868 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_class_init (PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass * klass) {
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_rest_support_google_publisher_web_authentication_pane_real_on_page_load;
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_web_authentication_pane_finalize;
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_signal_new ("authorized", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 8881 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_instance_init (PublishingRESTSupportGooglePublisherWebAuthenticationPane * self) {
-}
-
-
-static void publishing_rest_support_google_publisher_web_authentication_pane_finalize (GObject* obj) {
-	PublishingRESTSupportGooglePublisherWebAuthenticationPane * self;
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_WEB_AUTHENTICATION_PANE, PublishingRESTSupportGooglePublisherWebAuthenticationPane);
-#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	G_OBJECT_CLASS (publishing_rest_support_google_publisher_web_authentication_pane_parent_class)->finalize (obj);
-#line 8895 "RESTSupport.c"
-}
-
-
-static GType publishing_rest_support_google_publisher_web_authentication_pane_get_type (void) {
-	static volatile gsize publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisherWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_web_authentication_pane_instance_init, NULL };
-		GType publishing_rest_support_google_publisher_web_authentication_pane_type_id;
-		publishing_rest_support_google_publisher_web_authentication_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, "PublishingRESTSupportGooglePublisherWebAuthenticationPane", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile, publishing_rest_support_google_publisher_web_authentication_pane_type_id);
-	}
-	return publishing_rest_support_google_publisher_web_authentication_pane_type_id__volatile;
-}
-
-
-static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishing_rest_support_google_publisher_get_access_tokens_transaction_construct (GType object_type, PublishingRESTSupportSession* session, const gchar* auth_code) {
-	PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* self = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_val_if_fail (auth_code != NULL, NULL);
-#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = session;
-#line 828 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self = (PublishingRESTSupportGooglePublisherGetAccessTokensTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_ACCESS_TOKENS_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = auth_code;
-#line 830 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "code", _tmp1_);
-#line 831 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_ID);
-#line 832 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_secret", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_SECRET);
-#line 833 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "redirect_uri", "urn:ietf:wg:oauth:2.0:oob");
-#line 834 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "authorization_code");
-#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return self;
-#line 8937 "RESTSupport.c"
-}
-
-
-static PublishingRESTSupportGooglePublisherGetAccessTokensTransaction* publishing_rest_support_google_publisher_get_access_tokens_transaction_new (PublishingRESTSupportSession* session, const gchar* auth_code) {
-#line 827 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return publishing_rest_support_google_publisher_get_access_tokens_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_GET_ACCESS_TOKENS_TRANSACTION, session, auth_code);
-#line 8944 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_get_access_tokens_transaction_class_init (PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass * klass) {
-#line 824 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_get_access_tokens_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 8951 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_get_access_tokens_transaction_instance_init (PublishingRESTSupportGooglePublisherGetAccessTokensTransaction * self) {
-}
-
-
-static GType publishing_rest_support_google_publisher_get_access_tokens_transaction_get_type (void) {
-	static volatile gsize publishing_rest_support_google_publisher_get_access_tokens_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_rest_support_google_publisher_get_access_tokens_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherGetAccessTokensTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_get_access_tokens_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisherGetAccessTokensTransaction), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_get_access_tokens_transaction_instance_init, NULL };
-		GType publishing_rest_support_google_publisher_get_access_tokens_transaction_type_id;
-		publishing_rest_support_google_publisher_get_access_tokens_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingRESTSupportGooglePublisherGetAccessTokensTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_rest_support_google_publisher_get_access_tokens_transaction_type_id__volatile, publishing_rest_support_google_publisher_get_access_tokens_transaction_type_id);
-	}
-	return publishing_rest_support_google_publisher_get_access_tokens_transaction_type_id__volatile;
-}
-
-
-static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publishing_rest_support_google_publisher_refresh_access_token_transaction_construct (GType object_type, PublishingRESTSupportSession* session) {
-	PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* self = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingRESTSupportSession* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_SESSION (session), NULL);
-#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = session;
-#line 842 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self = (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction*) publishing_rest_support_transaction_construct_with_endpoint_url (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_REFRESH_ACCESS_TOKEN_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 844 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_id", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_ID);
-#line 845 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "client_secret", PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_OAUTH_CLIENT_SECRET);
-#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp1_ = session;
-#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp2_ = publishing_rest_support_google_session_get_refresh_token (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession));
-#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp3_ = _tmp2_;
-#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "refresh_token", _tmp3_);
-#line 846 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_free0 (_tmp3_);
-#line 847 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "grant_type", "refresh_token");
-#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return self;
-#line 9001 "RESTSupport.c"
-}
-
-
-static PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction* publishing_rest_support_google_publisher_refresh_access_token_transaction_new (PublishingRESTSupportSession* session) {
-#line 841 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return publishing_rest_support_google_publisher_refresh_access_token_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_REFRESH_ACCESS_TOKEN_TRANSACTION, session);
-#line 9008 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_refresh_access_token_transaction_class_init (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass * klass) {
-#line 838 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_refresh_access_token_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9015 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_refresh_access_token_transaction_instance_init (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction * self) {
-}
-
-
-static GType publishing_rest_support_google_publisher_refresh_access_token_transaction_get_type (void) {
-	static volatile gsize publishing_rest_support_google_publisher_refresh_access_token_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_rest_support_google_publisher_refresh_access_token_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_refresh_access_token_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_refresh_access_token_transaction_instance_init, NULL };
-		GType publishing_rest_support_google_publisher_refresh_access_token_transaction_type_id;
-		publishing_rest_support_google_publisher_refresh_access_token_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, "PublishingRESTSupportGooglePublisherRefreshAccessTokenTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_rest_support_google_publisher_refresh_access_token_transaction_type_id__volatile, publishing_rest_support_google_publisher_refresh_access_token_transaction_type_id);
-	}
-	return publishing_rest_support_google_publisher_refresh_access_token_transaction_type_id__volatile;
-}
-
-
 static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (GType object_type, PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
 	PublishingRESTSupportGooglePublisherAuthenticatedTransaction* self = NULL;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	PublishingRESTSupportHttpMethod _tmp2_ = 0;
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = endpoint_url;
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 791 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = method;
-#line 854 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 791 "/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 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 9054 "RESTSupport.c"
+#line 7109 "RESTSupport.c"
 }
 
 
 static PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new_with_endpoint_url (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 852 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_authenticated_transaction_construct_with_endpoint_url (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 9061 "RESTSupport.c"
+#line 7116 "RESTSupport.c"
 }
 
 
@@ -9100,57 +7136,57 @@ PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_su
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_return_val_if_fail (endpoint_url != NULL, NULL);
-#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp0_ = session;
-#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp1_ = endpoint_url;
-#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 796 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp2_ = method;
-#line 859 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 796 "/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 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp3_ = session;
-#line 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 797 "/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 860 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_vala_assert (_tmp4_, "session.is_authenticated()");
-#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp5_ = session;
-#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp6_ = publishing_rest_support_google_session_get_access_token (_tmp5_);
-#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp7_ = _tmp6_;
-#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp8_ = g_strconcat ("Bearer ", _tmp7_, NULL);
-#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/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 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp9_);
-#line 862 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (_tmp7_);
-#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return self;
-#line 9113 "RESTSupport.c"
+#line 7168 "RESTSupport.c"
 }
 
 
 PublishingRESTSupportGooglePublisherAuthenticatedTransaction* publishing_rest_support_google_publisher_authenticated_transaction_new (PublishingRESTSupportGoogleSession* session, const gchar* endpoint_url, PublishingRESTSupportHttpMethod method) {
-#line 857 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	return publishing_rest_support_google_publisher_authenticated_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, session, endpoint_url, method);
-#line 9120 "RESTSupport.c"
+#line 7175 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_authenticated_transaction_class_init (PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass * klass) {
-#line 851 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 788 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_authenticated_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9127 "RESTSupport.c"
+#line 7182 "RESTSupport.c"
 }
 
 
@@ -9170,107 +7206,64 @@ GType publishing_rest_support_google_publisher_authenticated_transaction_get_typ
 }
 
 
-static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_rest_support_google_publisher_username_fetch_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session) {
-	PublishingRESTSupportGooglePublisherUsernameFetchTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_tmp0_ = session;
-#line 870 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	self = (PublishingRESTSupportGooglePublisherUsernameFetchTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_USERNAME_FETCH_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return self;
-#line 9158 "RESTSupport.c"
-}
-
-
-static PublishingRESTSupportGooglePublisherUsernameFetchTransaction* publishing_rest_support_google_publisher_username_fetch_transaction_new (PublishingRESTSupportGoogleSession* session) {
-#line 869 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	return publishing_rest_support_google_publisher_username_fetch_transaction_construct (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_USERNAME_FETCH_TRANSACTION, session);
-#line 9165 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_username_fetch_transaction_class_init (PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass * klass) {
-#line 866 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	publishing_rest_support_google_publisher_username_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 9172 "RESTSupport.c"
-}
-
-
-static void publishing_rest_support_google_publisher_username_fetch_transaction_instance_init (PublishingRESTSupportGooglePublisherUsernameFetchTransaction * self) {
-}
-
-
-static GType publishing_rest_support_google_publisher_username_fetch_transaction_get_type (void) {
-	static volatile gsize publishing_rest_support_google_publisher_username_fetch_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_rest_support_google_publisher_username_fetch_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingRESTSupportGooglePublisherUsernameFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_rest_support_google_publisher_username_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingRESTSupportGooglePublisherUsernameFetchTransaction), 0, (GInstanceInitFunc) publishing_rest_support_google_publisher_username_fetch_transaction_instance_init, NULL };
-		GType publishing_rest_support_google_publisher_username_fetch_transaction_type_id;
-		publishing_rest_support_google_publisher_username_fetch_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, "PublishingRESTSupportGooglePublisherUsernameFetchTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_rest_support_google_publisher_username_fetch_transaction_type_id__volatile, publishing_rest_support_google_publisher_username_fetch_transaction_type_id);
-	}
-	return publishing_rest_support_google_publisher_username_fetch_transaction_type_id__volatile;
-}
-
-
 static void publishing_rest_support_google_publisher_class_init (PublishingRESTSupportGooglePublisherClass * klass) {
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	publishing_rest_support_google_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	g_type_class_add_private (klass, sizeof (PublishingRESTSupportGooglePublisherPrivate));
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = publishing_rest_support_google_publisher_real_get_authenticator;
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = publishing_rest_support_google_publisher_real_on_login_flow_complete;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_rest_support_google_publisher_real_do_logout;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = publishing_rest_support_google_publisher_real_is_running;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->start = publishing_rest_support_google_publisher_real_start;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_rest_support_google_publisher_real_stop;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_rest_support_google_publisher_finalize;
-#line 9209 "RESTSupport.c"
+#line 7221 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/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 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_is_running;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_start;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_stop;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_rest_support_google_publisher_real_get_service;
-#line 9224 "RESTSupport.c"
+#line 7236 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_instance_init (PublishingRESTSupportGooglePublisher * self) {
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self->priv = PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_GET_PRIVATE (self);
-#line 9231 "RESTSupport.c"
+#line 7243 "RESTSupport.c"
 }
 
 
 static void publishing_rest_support_google_publisher_finalize (GObject* obj) {
 	PublishingRESTSupportGooglePublisher * self;
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher);
-#line 874 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 803 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_g_free0 (self->priv->scope);
-#line 875 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 876 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
-	_g_object_unref0 (self->priv->web_auth_pane);
-#line 753 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+#line 807 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 752 "/home/jens/Source/shotwell/plugins/common/RESTSupport.vala"
 	G_OBJECT_CLASS (publishing_rest_support_google_publisher_parent_class)->finalize (obj);
-#line 9247 "RESTSupport.c"
+#line 7259 "RESTSupport.c"
 }
 
 
diff --git a/plugins/common/RESTSupport.vala b/plugins/common/RESTSupport.vala
index 1a9052b..f06473c 100644
--- a/plugins/common/RESTSupport.vala
+++ b/plugins/common/RESTSupport.vala
@@ -746,7 +746,6 @@ public string asciify_string(string s) {
 public abstract class GoogleSession : Session {
     public abstract string get_user_name();
     public abstract string get_access_token();
-    public abstract string get_refresh_token();
     public abstract void deauthenticate();
 }
 
@@ -779,11 +778,6 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher {
             return access_token;
         }
         
-        public override string get_refresh_token() {
-            assert(refresh_token != null);
-            return refresh_token;
-        }
-        
         public override void deauthenticate() {
             access_token = null;
             user_name = null;
@@ -791,63 +785,6 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher {
         }
     }
     
-    private class WebAuthenticationPane : Shotwell.Plugins.Common.WebAuthenticationPane {
-        public static bool cache_dirty = false;
-        
-        public signal void authorized(string auth_code);
-
-        public WebAuthenticationPane(string auth_sequence_start_url) {
-            Object (login_uri : auth_sequence_start_url);
-        }
-        
-        public static bool is_cache_dirty() {
-            return cache_dirty;
-        }
-        
-        public override void on_page_load() {
-            string page_title = get_view ().get_title();
-            if (page_title.index_of("state=connect") > 0) {
-                int auth_code_field_start = page_title.index_of("code=");
-                if (auth_code_field_start < 0)
-                    return;
-
-                string auth_code =
-                    page_title.substring(auth_code_field_start + 5); // 5 = "code=".length
-
-                cache_dirty = true;
-
-                authorized(auth_code);
-            }
-        }
-    }
-    
-    private class GetAccessTokensTransaction : Publishing.RESTSupport.Transaction {
-        private const string ENDPOINT_URL = "https://accounts.google.com/o/oauth2/token";
-        
-        public GetAccessTokensTransaction(Session session, string auth_code) {
-            base.with_endpoint_url(session, ENDPOINT_URL);
-            
-            add_argument("code", auth_code);
-            add_argument("client_id", OAUTH_CLIENT_ID);
-            add_argument("client_secret", OAUTH_CLIENT_SECRET);
-            add_argument("redirect_uri", "urn:ietf:wg:oauth:2.0:oob");
-            add_argument("grant_type", "authorization_code");
-        }
-    }
-
-    private class RefreshAccessTokenTransaction : Publishing.RESTSupport.Transaction {
-        private const string ENDPOINT_URL = "https://accounts.google.com/o/oauth2/token";
-        
-        public RefreshAccessTokenTransaction(Session session) {
-            base.with_endpoint_url(session, ENDPOINT_URL);
-        
-            add_argument("client_id", OAUTH_CLIENT_ID);
-            add_argument("client_secret", OAUTH_CLIENT_SECRET);
-            add_argument("refresh_token", ((GoogleSession) session).get_refresh_token());
-            add_argument("grant_type", "refresh_token");
-        }
-    }
-
     public class AuthenticatedTransaction : Publishing.RESTSupport.Transaction {
         private AuthenticatedTransaction.with_endpoint_url(GoogleSession session,
             string endpoint_url, Publishing.RESTSupport.HttpMethod method) {
@@ -863,19 +800,11 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher {
         }
     }
 
-    private class UsernameFetchTransaction : AuthenticatedTransaction {
-        private const string ENDPOINT_URL = "https://www.googleapis.com/oauth2/v1/userinfo";
-        
-        public UsernameFetchTransaction(GoogleSession session) {
-            base(session, ENDPOINT_URL, Publishing.RESTSupport.HttpMethod.GET);
-        }
-    }
-    
     private string scope;
     private GoogleSessionImpl session;
-    private WebAuthenticationPane? web_auth_pane;
     private weak Spit.Publishing.PluginHost host;
     private weak Spit.Publishing.Service service;
+    private Spit.Publishing.Authenticator authenticator;
     
     protected GooglePublisher(Spit.Publishing.Service service, Spit.Publishing.PluginHost host,
         string scope) {
@@ -883,272 +812,11 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher {
         this.session = new GoogleSessionImpl();
         this.service = service;
         this.host = host;
-        this.web_auth_pane = null;
-    }
-    
-    private void on_web_auth_pane_authorized(string auth_code) {
-        web_auth_pane.authorized.disconnect(on_web_auth_pane_authorized);
-        
-        debug("EVENT: user authorized scope %s with auth_code %s", scope, auth_code);
-        
-        if (!is_running())
-            return;
-        
-        do_get_access_tokens(auth_code);
-    }
-
-    private void on_get_access_tokens_complete(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_get_access_tokens_complete);
-        txn.network_error.disconnect(on_get_access_tokens_error);
-
-        debug("EVENT: network transaction to exchange authorization code for access tokens " +
-            "completed successfully.");
-
-        if (!is_running())
-            return;
-
-        do_extract_tokens(txn.get_response());
+        this.authenticator = this.get_authenticator();
+        this.authenticator.authenticated.connect(on_authenticator_authenticated);
     }
 
-    private void on_get_access_tokens_error(Publishing.RESTSupport.Transaction txn,
-        Spit.Publishing.PublishingError err) {
-        txn.completed.disconnect(on_get_access_tokens_complete);
-        txn.network_error.disconnect(on_get_access_tokens_error);
-
-        debug("EVENT: network transaction to exchange authorization code for access tokens " +
-            "failed; response = '%s'", txn.get_response());
-
-        if (!is_running())
-            return;
-
-        host.post_error(err);
-    }
-
-    private void on_refresh_access_token_transaction_completed(Publishing.RESTSupport.Transaction
-        txn) {
-        txn.completed.disconnect(on_refresh_access_token_transaction_completed);
-        txn.network_error.disconnect(on_refresh_access_token_transaction_error);
-
-        debug("EVENT: refresh access token transaction completed successfully.");
-
-        if (!is_running())
-            return;
-
-        if (session.is_authenticated()) // ignore these events if the session is already auth'd
-            return;
-        
-        do_extract_tokens(txn.get_response());
-    }
-    
-    private void on_refresh_access_token_transaction_error(Publishing.RESTSupport.Transaction txn,
-        Spit.Publishing.PublishingError err) {
-        txn.completed.disconnect(on_refresh_access_token_transaction_completed);
-        txn.network_error.disconnect(on_refresh_access_token_transaction_error);
-
-        debug("EVENT: refresh access token transaction caused a network error.");
-
-        if (!is_running())
-            return;
-
-        if (session.is_authenticated()) // ignore these events if the session is already auth'd
-            return;
-        
-        // 400 errors indicate that the OAuth client ID and secret have become invalid. In most
-        // cases, this can be fixed by logging the user out
-        if (txn.get_status_code() == 400) {
-            do_logout();
-            return;
-        }
-        
-        host.post_error(err);       
-    }
-
-    private void on_refresh_token_available(string token) {
-        debug("EVENT: an OAuth refresh token has become available; token = '%s'.", token);
-
-        if (!is_running())
-            return;
-
-        session.refresh_token = token;
-    }
-    
-    private void on_access_token_available(string token) {
-        debug("EVENT: an OAuth access token has become available; token = '%s'.", token);
-
-        if (!is_running())
-            return;
-
-        session.access_token = token;
-        
-        do_fetch_username();
-    }
-
-    private void on_fetch_username_transaction_completed(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_fetch_username_transaction_completed);
-        txn.network_error.disconnect(on_fetch_username_transaction_error);
-        
-        debug("EVENT: username fetch transaction completed successfully.");
-
-        if (!is_running())
-            return;
-
-        do_extract_username(txn.get_response());
-    }
-    
-    private void on_fetch_username_transaction_error(Publishing.RESTSupport.Transaction txn,
-        Spit.Publishing.PublishingError err) {
-        txn.completed.disconnect(on_fetch_username_transaction_completed);
-        txn.network_error.disconnect(on_fetch_username_transaction_error);
-
-        debug("EVENT: username fetch transaction caused a network error");
-
-        if (!is_running())
-            return;
-
-        host.post_error(err);
-    }
-
-    private void do_get_access_tokens(string auth_code) {
-        debug("ACTION: exchanging authorization code for access & refresh tokens");
-        
-        host.install_login_wait_pane();
-        
-        GetAccessTokensTransaction tokens_txn = new GetAccessTokensTransaction(session, auth_code);
-        tokens_txn.completed.connect(on_get_access_tokens_complete);
-        tokens_txn.network_error.connect(on_get_access_tokens_error);
-        
-        try {
-            tokens_txn.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            host.post_error(err);
-        }
-    }
-    
-    private void do_hosted_web_authentication() {
-        debug("ACTION: running OAuth authentication flow in hosted web pane.");
-        
-        string user_authorization_url = "https://accounts.google.com/o/oauth2/auth?" +
-            "response_type=code&" +
-            "client_id=" + OAUTH_CLIENT_ID + "&" +
-            "redirect_uri=" + Soup.URI.encode("urn:ietf:wg:oauth:2.0:oob", null) + "&" +
-            "scope=" + Soup.URI.encode(scope, null) + "+" +
-            Soup.URI.encode("https://www.googleapis.com/auth/userinfo.profile", null) + "&" +
-            "state=connect&" +
-            "access_type=offline&" +
-            "approval_prompt=force";
-
-        web_auth_pane = new WebAuthenticationPane(user_authorization_url);
-        web_auth_pane.authorized.connect(on_web_auth_pane_authorized);
-        
-        host.install_dialog_pane(web_auth_pane);
-        
-    }
-
-    private void do_exchange_refresh_token_for_access_token() {
-        debug("ACTION: exchanging OAuth refresh token for OAuth access token.");
-        
-        host.install_login_wait_pane();
-        
-        RefreshAccessTokenTransaction txn = new RefreshAccessTokenTransaction(session);
-        
-        txn.completed.connect(on_refresh_access_token_transaction_completed);
-        txn.network_error.connect(on_refresh_access_token_transaction_error);
-        
-        try {
-            txn.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            host.post_error(err);
-        }
-    }
-
-    private void do_extract_tokens(string response_body) {
-        debug("ACTION: extracting OAuth tokens from body of server response");
-        
-        Json.Parser parser = new Json.Parser();
-        
-        try {
-            parser.load_from_data(response_body);
-        } catch (Error err) {
-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                "Couldn't parse JSON response: " + err.message));
-            return;
-        }
-        
-        Json.Object response_obj = parser.get_root().get_object();
-        
-        if ((!response_obj.has_member("access_token")) && (!response_obj.has_member("refresh_token"))) {
-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                "neither access_token nor refresh_token not present in server response"));
-            return;
-        }
-
-        if (response_obj.has_member("refresh_token")) {
-            string refresh_token = response_obj.get_string_member("refresh_token");
-
-            if (refresh_token != "")
-                on_refresh_token_available(refresh_token);
-        }
-        
-        if (response_obj.has_member("access_token")) {
-            string access_token = response_obj.get_string_member("access_token");
-
-            if (access_token != "")
-                on_access_token_available(access_token);
-        }
-    }
-
-    private void do_fetch_username() {
-        debug("ACTION: running network transaction to fetch username.");
-
-        host.install_login_wait_pane();
-        host.set_service_locked(true);
-        
-        UsernameFetchTransaction txn = new UsernameFetchTransaction(session);
-        txn.completed.connect(on_fetch_username_transaction_completed);
-        txn.network_error.connect(on_fetch_username_transaction_error);
-        
-        try {
-            txn.execute();
-        } catch (Error err) {
-            host.post_error(err);
-        }
-    }
-
-    private void do_extract_username(string response_body) {
-        debug("ACTION: extracting username from body of server response");
-        
-        Json.Parser parser = new Json.Parser();
-        
-        try {
-            parser.load_from_data(response_body);
-        } catch (Error err) {
-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                "Couldn't parse JSON response: " + err.message));
-            return;
-        }
-        
-        Json.Object response_obj = parser.get_root().get_object();
-
-        if (response_obj.has_member("name")) {
-            string username = response_obj.get_string_member("name");
-
-            if (username != "")
-                session.user_name = username;
-        }
-        
-        if (response_obj.has_member("access_token")) {
-            string access_token = response_obj.get_string_member("access_token");
-
-            if (access_token != "")
-                session.access_token = access_token;
-        }
-        
-        // by the time we get a username, the session should be authenticated, or else something
-        // really tragic has happened
-        assert(session.is_authenticated());
-        
-        on_login_flow_complete();
-    }
+    protected abstract Spit.Publishing.Authenticator get_authenticator();
 
     protected unowned Spit.Publishing.PluginHost get_host() {
         return host;
@@ -1158,20 +826,6 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher {
         return session;
     }
 
-    protected void start_oauth_flow(string? refresh_token = null) {
-        if (refresh_token != null && refresh_token != "") {
-            session.refresh_token = refresh_token;
-            do_exchange_refresh_token_for_access_token();
-        } else {
-            if (WebAuthenticationPane.is_cache_dirty()) {
-                host.install_static_message_pane(_("You have already logged in and out of a Google service during this Shotwell session.\n\nTo continue publishing to Google services, quit and restart Shotwell, then try publishing again."));
-                return;
-            }
-
-            do_hosted_web_authentication();
-        }
-    }
-    
     protected abstract void on_login_flow_complete();
     
     protected abstract void do_logout();
@@ -1185,6 +839,23 @@ public abstract class GooglePublisher : Object, Spit.Publishing.Publisher {
     public Spit.Publishing.Service get_service() {
         return service;
     }
+
+    private void on_authenticator_authenticated() {
+        var params = this.authenticator.get_authentication_parameter();
+        Variant refresh_token = null;
+        Variant access_token = null;
+        Variant user_name = null;
+
+        params.lookup_extended("RefreshToken", null, out refresh_token);
+        params.lookup_extended("AccessToken", null, out access_token);
+        params.lookup_extended("UserName", null, out user_name);
+
+        this.session.refresh_token = refresh_token.get_string();
+        this.session.access_token = access_token.get_string();
+        this.session.user_name = user_name.get_string();
+
+        this.on_login_flow_complete();
+    }
 }
 
 }
diff --git a/plugins/common/Resources.c b/plugins/common/Resources.c
index 902db2b..b3ddcbb 100644
--- a/plugins/common/Resources.c
+++ b/plugins/common/Resources.c
@@ -115,7 +115,7 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 97 "Resources.c"
-			goto __catch9_g_error;
+			goto __catch4_g_error;
 		}
 #line 43 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp6_ = _tmp0_;
@@ -129,8 +129,8 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 		_g_object_unref0 (_tmp0_);
 #line 110 "Resources.c"
 	}
-	goto __finally9;
-	__catch9_g_error:
+	goto __finally4;
+	__catch4_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp7_ = NULL;
@@ -154,7 +154,7 @@ GdkPixbuf** resources_load_icon_set (GFile* icon_file, int* result_length1) {
 		_g_error_free0 (err);
 #line 135 "Resources.c"
 	}
-	__finally9:
+	__finally4:
 #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 42 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
@@ -281,7 +281,7 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
 #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 263 "Resources.c"
-			goto __catch10_g_error;
+			goto __catch5_g_error;
 		}
 #line 60 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 		_tmp3_ = _tmp0_;
@@ -295,8 +295,8 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
 		_g_object_unref0 (_tmp0_);
 #line 276 "Resources.c"
 	}
-	goto __finally10;
-	__catch10_g_error:
+	goto __finally5;
+	__catch5_g_error:
 	{
 		GError* _error_ = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -312,7 +312,7 @@ GdkPixbuf** resources_load_from_resource (const gchar* resource_path, int* resul
 		_g_error_free0 (_error_);
 #line 293 "Resources.c"
 	}
-	__finally10:
+	__finally5:
 #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 59 "/home/jens/Source/shotwell/plugins/common/Resources.vala"
diff --git a/plugins/shotwell-plugin-common.h b/plugins/shotwell-plugin-common.h
index 731434a..3bcb68a 100644
--- a/plugins/shotwell-plugin-common.h
+++ b/plugins/shotwell-plugin-common.h
@@ -234,7 +234,6 @@ struct _PublishingRESTSupportGoogleSessionClass {
 	PublishingRESTSupportSessionClass parent_class;
 	gchar* (*get_user_name) (PublishingRESTSupportGoogleSession* self);
 	gchar* (*get_access_token) (PublishingRESTSupportGoogleSession* self);
-	gchar* (*get_refresh_token) (PublishingRESTSupportGoogleSession* self);
 	void (*deauthenticate) (PublishingRESTSupportGoogleSession* self);
 };
 
@@ -245,6 +244,7 @@ struct _PublishingRESTSupportGooglePublisher {
 
 struct _PublishingRESTSupportGooglePublisherClass {
 	GObjectClass parent_class;
+	SpitPublishingAuthenticator* (*get_authenticator) (PublishingRESTSupportGooglePublisher* self);
 	void (*on_login_flow_complete) (PublishingRESTSupportGooglePublisher* self);
 	void (*do_logout) (PublishingRESTSupportGooglePublisher* self);
 	gboolean (*is_running) (PublishingRESTSupportGooglePublisher* self);
@@ -381,14 +381,13 @@ gchar* publishing_rest_support_asciify_string (const gchar* s);
 GType publishing_rest_support_google_session_get_type (void) G_GNUC_CONST;
 gchar* publishing_rest_support_google_session_get_user_name (PublishingRESTSupportGoogleSession* self);
 gchar* publishing_rest_support_google_session_get_access_token (PublishingRESTSupportGoogleSession* self);
-gchar* publishing_rest_support_google_session_get_refresh_token (PublishingRESTSupportGoogleSession* self);
 void publishing_rest_support_google_session_deauthenticate (PublishingRESTSupportGoogleSession* self);
 PublishingRESTSupportGoogleSession* publishing_rest_support_google_session_construct (GType object_type);
 GType publishing_rest_support_google_publisher_get_type (void) G_GNUC_CONST;
 PublishingRESTSupportGooglePublisher* publishing_rest_support_google_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host, const gchar* scope);
+SpitPublishingAuthenticator* publishing_rest_support_google_publisher_get_authenticator (PublishingRESTSupportGooglePublisher* self);
 SpitPublishingPluginHost* publishing_rest_support_google_publisher_get_host (PublishingRESTSupportGooglePublisher* self);
 PublishingRESTSupportGoogleSession* publishing_rest_support_google_publisher_get_session (PublishingRESTSupportGooglePublisher* self);
-void publishing_rest_support_google_publisher_start_oauth_flow (PublishingRESTSupportGooglePublisher* self, const gchar* refresh_token);
 void publishing_rest_support_google_publisher_on_login_flow_complete (PublishingRESTSupportGooglePublisher* self);
 void publishing_rest_support_google_publisher_do_logout (PublishingRESTSupportGooglePublisher* self);
 gboolean publishing_rest_support_google_publisher_is_running (PublishingRESTSupportGooglePublisher* self);
diff --git a/plugins/shotwell-plugin-common.vapi b/plugins/shotwell-plugin-common.vapi
index 93e24e1..8d3965b 100644
--- a/plugins/shotwell-plugin-common.vapi
+++ b/plugins/shotwell-plugin-common.vapi
@@ -28,12 +28,12 @@ namespace Publishing {
 			}
 			protected GooglePublisher (Spit.Publishing.Service service, Spit.Publishing.PluginHost host, string scope);
 			protected abstract void do_logout ();
+			protected abstract Spit.Publishing.Authenticator get_authenticator ();
 			protected unowned Spit.Publishing.PluginHost get_host ();
 			protected Publishing.RESTSupport.GoogleSession get_session ();
 			public abstract bool is_running ();
 			protected abstract void on_login_flow_complete ();
 			public abstract void start ();
-			protected void start_oauth_flow (string? refresh_token = null);
 			public abstract void stop ();
 		}
 		[CCode (cheader_filename = "shotwell-plugin-common.h")]
@@ -41,7 +41,6 @@ namespace Publishing {
 			public GoogleSession ();
 			public abstract void deauthenticate ();
 			public abstract string get_access_token ();
-			public abstract string get_refresh_token ();
 			public abstract string get_user_name ();
 		}
 		[CCode (cheader_filename = "shotwell-plugin-common.h")]
diff --git a/plugins/shotwell-plugin-dev-1.0.h b/plugins/shotwell-plugin-dev-1.0.h
index 668df4d..ac74eca 100644
--- a/plugins/shotwell-plugin-dev-1.0.h
+++ b/plugins/shotwell-plugin-dev-1.0.h
@@ -15,6 +15,7 @@
 #include <gdk/gdk.h>
 #include <cairo.h>
 #include <gtk/gtk.h>
+#include <gee.h>
 #include <time.h>
 
 G_BEGIN_DECLS
@@ -136,6 +137,22 @@ typedef struct _SpitPublishingPublishableIface SpitPublishingPublishableIface;
 
 #define SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE (spit_publishing_publisher_media_type_get_type ())
 
+#define SPIT_PUBLISHING_TYPE_AUTHENTICATOR (spit_publishing_authenticator_get_type ())
+#define SPIT_PUBLISHING_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator))
+#define SPIT_PUBLISHING_IS_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR))
+#define SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticatorIface))
+
+typedef struct _SpitPublishingAuthenticator SpitPublishingAuthenticator;
+typedef struct _SpitPublishingAuthenticatorIface SpitPublishingAuthenticatorIface;
+
+#define SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY (spit_publishing_authenticator_factory_get_type ())
+#define SPIT_PUBLISHING_AUTHENTICATOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory))
+#define SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY))
+#define SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactoryIface))
+
+typedef struct _SpitPublishingAuthenticatorFactory SpitPublishingAuthenticatorFactory;
+typedef struct _SpitPublishingAuthenticatorFactoryIface SpitPublishingAuthenticatorFactoryIface;
+
 #define SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER (spit_data_imports_data_importer_get_type ())
 #define SPIT_DATA_IMPORTS_DATA_IMPORTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER, SpitDataImportsDataImporter))
 #define SPIT_DATA_IMPORTS_IS_DATA_IMPORTER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER))
@@ -483,6 +500,21 @@ struct _SpitPublishingPublisherIface {
 	void (*reserved7) (SpitPublishingPublisher* self);
 };
 
+struct _SpitPublishingAuthenticatorIface {
+	GTypeInterface parent_iface;
+	void (*authenticate) (SpitPublishingAuthenticator* self);
+	gboolean (*can_logout) (SpitPublishingAuthenticator* self);
+	void (*logout) (SpitPublishingAuthenticator* self);
+	void (*refresh) (SpitPublishingAuthenticator* self);
+	GHashTable* (*get_authentication_parameter) (SpitPublishingAuthenticator* self);
+};
+
+struct _SpitPublishingAuthenticatorFactoryIface {
+	GTypeInterface parent_iface;
+	GeeList* (*get_available_authenticators) (SpitPublishingAuthenticatorFactory* self);
+	SpitPublishingAuthenticator* (*create) (SpitPublishingAuthenticatorFactory* self, const gchar* provider, SpitPublishingPluginHost* host);
+};
+
 typedef enum  {
 	SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR_UNSUPPORTED_VERSION
 } SpitDataImportsDataImportError;
@@ -811,6 +843,15 @@ void spit_publishing_service_reserved4 (SpitPublishingService* self);
 void spit_publishing_service_reserved5 (SpitPublishingService* self);
 void spit_publishing_service_reserved6 (SpitPublishingService* self);
 void spit_publishing_service_reserved7 (SpitPublishingService* self);
+GType spit_publishing_authenticator_get_type (void) G_GNUC_CONST;
+void spit_publishing_authenticator_authenticate (SpitPublishingAuthenticator* self);
+gboolean spit_publishing_authenticator_can_logout (SpitPublishingAuthenticator* self);
+void spit_publishing_authenticator_logout (SpitPublishingAuthenticator* self);
+void spit_publishing_authenticator_refresh (SpitPublishingAuthenticator* self);
+GHashTable* spit_publishing_authenticator_get_authentication_parameter (SpitPublishingAuthenticator* self);
+GType spit_publishing_authenticator_factory_get_type (void) G_GNUC_CONST;
+GeeList* spit_publishing_authenticator_factory_get_available_authenticators (SpitPublishingAuthenticatorFactory* self);
+SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitPublishingAuthenticatorFactory* self, const gchar* provider, SpitPublishingPluginHost* host);
 #define SPIT_DATA_IMPORTS_CURRENT_INTERFACE 0
 GQuark spit_data_imports_data_import_error_quark (void);
 GType spit_data_imports_dialog_pane_geometry_options_get_type (void) G_GNUC_CONST;
diff --git a/plugins/shotwell-plugin-dev-1.0.vapi b/plugins/shotwell-plugin-dev-1.0.vapi
index d88dfd2..fd0d0a8 100644
--- a/plugins/shotwell-plugin-dev-1.0.vapi
+++ b/plugins/shotwell-plugin-dev-1.0.vapi
@@ -119,6 +119,21 @@ namespace Spit {
 	}
 	namespace Publishing {
 		[CCode (cheader_filename = "shotwell-plugin-dev-1.0.h")]
+		public interface Authenticator : GLib.Object {
+			public abstract void authenticate ();
+			public abstract bool can_logout ();
+			public abstract GLib.HashTable<string,GLib.Variant> get_authentication_parameter ();
+			public abstract void logout ();
+			public abstract void refresh ();
+			public signal void authenticated ();
+			public signal void authentication_failed ();
+		}
+		[CCode (cheader_filename = "shotwell-plugin-dev-1.0.h")]
+		public interface AuthenticatorFactory : GLib.Object {
+			public abstract Spit.Publishing.Authenticator? create (string provider, Spit.Publishing.PluginHost host);
+			public abstract Gee.List<string> get_available_authenticators ();
+		}
+		[CCode (cheader_filename = "shotwell-plugin-dev-1.0.h")]
 		public interface DialogPane : GLib.Object {
 			public enum GeometryOptions {
 				NONE,
diff --git a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
index 6b17a54..d45c9d1 100644
--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
+++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.c
@@ -121,68 +121,68 @@ 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 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	if ((*length) == (*size)) {
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#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 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	(*array)[(*length)++] = value;
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#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 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 18 "/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"
+#line 18 "/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"
+#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 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 18 "/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"
+#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 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	if ((*length) == (*size)) {
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#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 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	(*array)[(*length)++] = value;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#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 16 "/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"
 	if ((*length) == (*size)) {
-#line 16 "/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"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 16 "/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"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
 #line 182 "shotwell-publishing-extras.c"
 	}
-#line 16 "/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"
 	(*array)[(*length)++] = value;
-#line 16 "/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"
 	(*array)[*length] = NULL;
 #line 188 "shotwell-publishing-extras.c"
 }
@@ -215,61 +215,61 @@ ShotwellPublishingExtraServices* shotwell_publishing_extra_services_construct (G
 	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 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp0_ = self->priv->pluggables;
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp0__length1 = self->priv->pluggables_length1;
-#line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp1_ = yandex_service_new ();
-#line 13 "/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 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 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp2__length1 = self->priv->pluggables_length1;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp3_ = module_file;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp4_ = g_file_get_parent (_tmp3_);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp5_ = _tmp4_;
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp6_ = tumblr_service_new (_tmp5_);
-#line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#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 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_g_object_unref0 (_tmp5_);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp7_ = self->priv->pluggables;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp7__length1 = self->priv->pluggables_length1;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp8_ = module_file;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp9_ = g_file_get_parent (_tmp8_);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp10_ = _tmp9_;
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp11_ = rajce_service_new (_tmp10_);
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#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));
-#line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_g_object_unref0 (_tmp10_);
-#line 16 "/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"
 	_tmp12_ = self->priv->pluggables;
-#line 16 "/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"
 	_tmp12__length1 = self->priv->pluggables_length1;
-#line 16 "/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"
 	_tmp13_ = module_file;
-#line 16 "/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"
 	_tmp14_ = g_file_get_parent (_tmp13_);
-#line 16 "/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"
 	_tmp15_ = _tmp14_;
-#line 16 "/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"
 	_tmp16_ = gallery3_service_new (_tmp15_);
-#line 16 "/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"
 	_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 16 "/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"
 	_g_object_unref0 (_tmp15_);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return self;
@@ -288,13 +288,13 @@ static const gchar* shotwell_publishing_extra_services_real_get_module_name (Spi
 	ShotwellPublishingExtraServices * self;
 	const gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
-#line 19 "/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 20 "/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"
 	_tmp0_ = _ ("Shotwell Extra Publishing Services");
-#line 20 "/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 = _tmp0_;
-#line 20 "/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 300 "shotwell-publishing-extras.c"
 }
@@ -303,11 +303,11 @@ static const gchar* shotwell_publishing_extra_services_real_get_module_name (Spi
 static const gchar* shotwell_publishing_extra_services_real_get_version (SpitModule* base) {
 	ShotwellPublishingExtraServices * self;
 	const gchar* result = NULL;
-#line 23 "/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 24 "/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 = _VERSION;
-#line 24 "/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 313 "shotwell-publishing-extras.c"
 }
@@ -316,11 +316,11 @@ static const gchar* shotwell_publishing_extra_services_real_get_version (SpitMod
 static const gchar* shotwell_publishing_extra_services_real_get_id (SpitModule* base) {
 	ShotwellPublishingExtraServices * self;
 	const gchar* result = NULL;
-#line 27 "/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 28 "/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 = "org.yorba.shotwell.publishing.extras";
-#line 28 "/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 326 "shotwell-publishing-extras.c"
 }
@@ -333,25 +333,25 @@ static SpitPluggable** shotwell_publishing_extra_services_real_get_pluggables (S
 	gint _tmp0__length1 = 0;
 	SpitPluggable** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 31 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 42 "/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 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp0_ = self->priv->pluggables;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp0__length1 = self->priv->pluggables_length1;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp1_ = _tmp0_;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	if (result_length1) {
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		*result_length1 = _tmp1__length1;
 #line 351 "shotwell-publishing-extras.c"
 	}
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	result = _tmp1_;
-#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
 #line 357 "shotwell-publishing-extras.c"
 }
@@ -435,49 +435,49 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	ShotwellPublishingExtraServices* _tmp5_ = NULL;
 	SpitEntryPointParams* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
-#line 38 "/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"
 	_tmp0_ = params;
-#line 38 "/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"
 	_tmp1_ = (*_tmp0_).host_min_spit_interface;
-#line 38 "/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"
 	_tmp2_ = params;
-#line 38 "/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"
 	_tmp3_ = (*_tmp2_).host_max_spit_interface;
-#line 38 "/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"
 	_tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
-#line 38 "/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"
 	(*params).module_spit_interface = _tmp4_;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp6_ = params;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	_tmp7_ = (*_tmp6_).module_spit_interface;
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
 #line 457 "shotwell-publishing-extras.c"
 		SpitEntryPointParams* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
 		ShotwellPublishingExtraServices* _tmp10_ = NULL;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_tmp8_ = params;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_tmp9_ = (*_tmp8_).module_file;
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_tmp10_ = shotwell_publishing_extra_services_new (_tmp9_);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_g_object_unref0 (_tmp5_);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_tmp5_ = _tmp10_;
 #line 471 "shotwell-publishing-extras.c"
 	} else {
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_g_object_unref0 (_tmp5_);
-#line 42 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 53 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 		_tmp5_ = NULL;
 #line 477 "shotwell-publishing-extras.c"
 	}
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
-#line 41 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
+#line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala"
 	return result;
 #line 483 "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 9e70d30..2f47771 100644
--- a/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
+++ b/plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala
@@ -10,10 +10,21 @@ private class ShotwellPublishingExtraServices : Object, Spit.Module {
     private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];
 
     public ShotwellPublishingExtraServices(GLib.File module_file) {
+#if HAVE_YANDEX
         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
+
+#if HAVE_GALLERY3
         pluggables += new Gallery3Service(module_file.get_parent());
+#endif
     }
     
     public unowned string get_module_name() {
diff --git a/plugins/shotwell-publishing/FacebookPublishing.c b/plugins/shotwell-publishing/FacebookPublishing.c
index de24060..7e06d66 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.c
+++ b/plugins/shotwell-publishing/FacebookPublishing.c
@@ -16,13 +16,12 @@
 #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 <gtk/gtk.h>
-#include <libsoup/soup.h>
 #include <float.h>
 #include <math.h>
-#include <locale.h>
-#include <webkit2/webkit2.h>
+#include <libsoup/soup.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -76,16 +75,6 @@ typedef struct _PublishingFacebookPublishingParametersPrivate PublishingFacebook
 typedef struct _PublishingFacebookParamSpecPublishingParameters PublishingFacebookParamSpecPublishingParameters;
 typedef struct _PublishingFacebookFacebookPublisherPrivate PublishingFacebookFacebookPublisherPrivate;
 
-#define PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE (publishing_facebook_web_authentication_pane_get_type ())
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPane))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPaneClass))
-#define PUBLISHING_FACEBOOK_IS_WEB_AUTHENTICATION_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE))
-#define PUBLISHING_FACEBOOK_IS_WEB_AUTHENTICATION_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPaneClass))
-
-typedef struct _PublishingFacebookWebAuthenticationPane PublishingFacebookWebAuthenticationPane;
-typedef struct _PublishingFacebookWebAuthenticationPaneClass PublishingFacebookWebAuthenticationPaneClass;
-
 #define PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION (publishing_facebook_graph_session_get_type ())
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSession))
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSessionClass))
@@ -134,21 +123,8 @@ typedef struct _PublishingFacebookGraphMessageClass PublishingFacebookGraphMessa
 #define __vala_JsonNode_free0(var) ((var == NULL) ? NULL : (var = (_vala_JsonNode_free (var), NULL)))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _json_array_unref0(var) ((var == NULL) ? NULL : (var = (json_array_unref (var), NULL)))
-#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
-typedef struct _PublishingFacebookWebAuthenticationPanePrivate PublishingFacebookWebAuthenticationPanePrivate;
-
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP (publishing_facebook_web_authentication_pane_locale_lookup_get_type ())
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingFacebookWebAuthenticationPaneLocaleLookup))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingFacebookWebAuthenticationPaneLocaleLookupClass))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_IS_LOCALE_LOOKUP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_IS_LOCALE_LOOKUP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP))
-#define PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingFacebookWebAuthenticationPaneLocaleLookupClass))
-
-typedef struct _PublishingFacebookWebAuthenticationPaneLocaleLookup PublishingFacebookWebAuthenticationPaneLocaleLookup;
-typedef struct _PublishingFacebookWebAuthenticationPaneLocaleLookupClass PublishingFacebookWebAuthenticationPaneLocaleLookupClass;
-typedef struct _PublishingFacebookWebAuthenticationPaneLocaleLookupPrivate PublishingFacebookWebAuthenticationPaneLocaleLookupPrivate;
-#define _publishing_facebook_web_authentication_pane_locale_lookup_unref0(var) ((var == NULL) ? NULL : (var = (publishing_facebook_web_authentication_pane_locale_lookup_unref (var), NULL)))
-typedef struct _PublishingFacebookWebAuthenticationPaneParamSpecLocaleLookup PublishingFacebookWebAuthenticationPaneParamSpecLocaleLookup;
+#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)))
 typedef struct _PublishingFacebookPublishingOptionsPanePrivate PublishingFacebookPublishingOptionsPanePrivate;
 
 #define PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION (publishing_facebook_publishing_options_pane_privacy_description_get_type ())
@@ -181,16 +157,6 @@ typedef struct _PublishingFacebookGraphSessionGraphMessageImpl PublishingFaceboo
 typedef struct _PublishingFacebookGraphSessionGraphMessageImplClass PublishingFacebookGraphSessionGraphMessageImplClass;
 typedef struct _PublishingFacebookGraphSessionGraphMessageImplPrivate PublishingFacebookGraphSessionGraphMessageImplPrivate;
 
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE (publishing_facebook_graph_session_graph_endpoint_probe_message_get_type ())
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessage))
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessageClass))
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_ENDPOINT_PROBE_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE))
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_ENDPOINT_PROBE_MESSAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE))
-#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessageClass))
-
-typedef struct _PublishingFacebookGraphSessionGraphEndpointProbeMessage PublishingFacebookGraphSessionGraphEndpointProbeMessage;
-typedef struct _PublishingFacebookGraphSessionGraphEndpointProbeMessageClass PublishingFacebookGraphSessionGraphEndpointProbeMessageClass;
-
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_QUERY_MESSAGE (publishing_facebook_graph_session_graph_query_message_get_type ())
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_QUERY_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_QUERY_MESSAGE, PublishingFacebookGraphSessionGraphQueryMessage))
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_QUERY_MESSAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_QUERY_MESSAGE, PublishingFacebookGraphSessionGraphQueryMessageClass))
@@ -220,8 +186,19 @@ typedef struct _PublishingFacebookGraphSessionGraphUploadMessageClass Publishing
 
 typedef struct _PublishingFacebookGraphSessionGraphCreateAlbumMessage PublishingFacebookGraphSessionGraphCreateAlbumMessage;
 typedef struct _PublishingFacebookGraphSessionGraphCreateAlbumMessageClass PublishingFacebookGraphSessionGraphCreateAlbumMessageClass;
+#define _g_regex_unref0(var) ((var == NULL) ? NULL : (var = (g_regex_unref (var), NULL)))
 typedef struct _PublishingFacebookGraphSessionGraphQueryMessagePrivate PublishingFacebookGraphSessionGraphQueryMessagePrivate;
 #define __vala_SoupURI_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupURI_free (var), NULL)))
+
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE (publishing_facebook_graph_session_graph_endpoint_probe_message_get_type ())
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessage))
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessageClass))
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_ENDPOINT_PROBE_MESSAGE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE))
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_ENDPOINT_PROBE_MESSAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE))
+#define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, PublishingFacebookGraphSessionGraphEndpointProbeMessageClass))
+
+typedef struct _PublishingFacebookGraphSessionGraphEndpointProbeMessage PublishingFacebookGraphSessionGraphEndpointProbeMessage;
+typedef struct _PublishingFacebookGraphSessionGraphEndpointProbeMessageClass PublishingFacebookGraphSessionGraphEndpointProbeMessageClass;
 typedef struct _PublishingFacebookGraphSessionGraphEndpointProbeMessagePrivate PublishingFacebookGraphSessionGraphEndpointProbeMessagePrivate;
 typedef struct _PublishingFacebookGraphSessionGraphUploadMessagePrivate PublishingFacebookGraphSessionGraphUploadMessagePrivate;
 #define _g_mapped_file_unref0(var) ((var == NULL) ? NULL : (var = (g_mapped_file_unref (var), NULL)))
@@ -303,11 +280,11 @@ struct _PublishingFacebookFacebookPublisherClass {
 struct _PublishingFacebookFacebookPublisherPrivate {
 	PublishingFacebookPublishingParameters* publishing_params;
 	SpitPublishingPluginHost* host;
-	PublishingFacebookWebAuthenticationPane* web_auth_pane;
 	SpitPublishingProgressCallback progress_reporter;
 	gpointer progress_reporter_target;
 	GDestroyNotify progress_reporter_target_destroy_notify;
 	SpitPublishingService* service;
+	SpitPublishingAuthenticator* authenticator;
 	gboolean running;
 	PublishingFacebookGraphSession* graph_session;
 	PublishingFacebookPublishingOptionsPane* publishing_options_pane;
@@ -316,36 +293,6 @@ struct _PublishingFacebookFacebookPublisherPrivate {
 	gchar* username;
 };
 
-struct _PublishingFacebookWebAuthenticationPane {
-	ShotwellPluginsCommonWebAuthenticationPane parent_instance;
-	PublishingFacebookWebAuthenticationPanePrivate * priv;
-};
-
-struct _PublishingFacebookWebAuthenticationPaneClass {
-	ShotwellPluginsCommonWebAuthenticationPaneClass parent_class;
-};
-
-struct _PublishingFacebookWebAuthenticationPaneLocaleLookup {
-	GTypeInstance parent_instance;
-	volatile int ref_count;
-	PublishingFacebookWebAuthenticationPaneLocaleLookupPrivate * priv;
-	gchar* prefix;
-	gchar* translation;
-	gchar* exception_code;
-	gchar* exception_translation;
-	gchar* exception_code_2;
-	gchar* exception_translation_2;
-};
-
-struct _PublishingFacebookWebAuthenticationPaneLocaleLookupClass {
-	GTypeClass parent_class;
-	void (*finalize) (PublishingFacebookWebAuthenticationPaneLocaleLookup *self);
-};
-
-struct _PublishingFacebookWebAuthenticationPaneParamSpecLocaleLookup {
-	GParamSpec parent_instance;
-};
-
 struct _PublishingFacebookPublishingOptionsPane {
 	GObject parent_instance;
 	PublishingFacebookPublishingOptionsPanePrivate * priv;
@@ -538,15 +485,6 @@ static gpointer publishing_facebook_album_parent_class = NULL;
 static gpointer publishing_facebook_publishing_parameters_parent_class = NULL;
 static gpointer publishing_facebook_facebook_publisher_parent_class = NULL;
 static SpitPublishingPublisherIface* publishing_facebook_facebook_publisher_spit_publishing_publisher_parent_iface = NULL;
-static gpointer publishing_facebook_web_authentication_pane_parent_class = NULL;
-static gboolean publishing_facebook_web_authentication_pane_cache_dirty;
-static gboolean publishing_facebook_web_authentication_pane_cache_dirty = FALSE;
-static PublishingFacebookWebAuthenticationPaneLocaleLookup** publishing_facebook_web_authentication_pane_locale_lookup_table;
-static gint publishing_facebook_web_authentication_pane_locale_lookup_table_length1;
-static PublishingFacebookWebAuthenticationPaneLocaleLookup** publishing_facebook_web_authentication_pane_locale_lookup_table = NULL;
-static gint publishing_facebook_web_authentication_pane_locale_lookup_table_length1 = 0;
-static gint _publishing_facebook_web_authentication_pane_locale_lookup_table_size_ = 0;
-static gpointer publishing_facebook_web_authentication_pane_locale_lookup_parent_class = NULL;
 static gpointer publishing_facebook_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_facebook_publishing_options_pane_privacy_description_parent_class = NULL;
 static SpitPublishingDialogPaneIface* publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
@@ -580,19 +518,7 @@ static SpitPublishingPublisherMediaType facebook_service_real_get_supported_medi
 static void facebook_service_finalize (GObject* obj);
 #define PUBLISHING_FACEBOOK_SERVICE_NAME "facebook"
 #define PUBLISHING_FACEBOOK_USER_VISIBLE_NAME "Facebook"
-#define PUBLISHING_FACEBOOK_APPLICATION_ID "1612018629063184"
 #define PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME _ ("Shotwell Connect")
-#define PUBLISHING_FACEBOOK_SERVICE_WELCOME_MESSAGE _ ("You are not currently logged into Facebook.\n" \
-"\n" \
-"If you don’t yet have a Facebook account, you can create one during th" \
-"e login process. During login, Shotwell Connect may ask you for permis" \
-"sion to upload photos and publish to your feed. These permissions are " \
-"required for Shotwell Connect to function.")
-#define PUBLISHING_FACEBOOK_RESTART_ERROR_MESSAGE _ ("You have already logged in and out of Facebook during this Shotwell se" \
-"ssion.\n" \
-"To continue publishing to Facebook, quit and restart Shotwell, then tr" \
-"y publishing again.")
-#define PUBLISHING_FACEBOOK_USER_AGENT "Java/1.6.0_16"
 #define PUBLISHING_FACEBOOK_EXPIRED_SESSION_STATUS_CODE 400
 gpointer publishing_facebook_album_ref (gpointer instance);
 void publishing_facebook_album_unref (gpointer instance);
@@ -630,7 +556,6 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 gchar* publishing_facebook_publishing_parameters_get_target_album_name (PublishingFacebookPublishingParameters* self);
 gchar* publishing_facebook_publishing_parameters_get_target_album_id (PublishingFacebookPublishingParameters* self);
 static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters* obj);
-GType publishing_facebook_web_authentication_pane_get_type (void) G_GNUC_CONST;
 gpointer publishing_facebook_graph_session_ref (gpointer instance);
 void publishing_facebook_graph_session_unref (gpointer instance);
 GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -654,18 +579,11 @@ PublishingFacebookGraphSession* publishing_facebook_graph_session_new (void);
 PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GType object_type);
 static void publishing_facebook_facebook_publisher_on_session_authenticated (PublishingFacebookFacebookPublisher* self);
 static void _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender, gpointer self);
-static gboolean publishing_facebook_facebook_publisher_is_persistent_session_valid (PublishingFacebookFacebookPublisher* self);
-static gchar* publishing_facebook_facebook_publisher_get_persistent_access_token (PublishingFacebookFacebookPublisher* self);
 static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_set_persistent_access_token (PublishingFacebookFacebookPublisher* self, const gchar* access_token);
 static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self, gboolean strip_metadata);
 gint publishing_facebook_facebook_publisher_get_persistent_default_size (PublishingFacebookFacebookPublisher* self);
 void publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self, gint size);
-static void publishing_facebook_facebook_publisher_invalidate_persistent_session (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_do_show_service_welcome_pane (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_on_login_clicked (PublishingFacebookFacebookPublisher* self);
-static void _publishing_facebook_facebook_publisher_on_login_clicked_spit_publishing_login_callback (gpointer self);
-static void publishing_facebook_facebook_publisher_do_test_connection_to_endpoint (PublishingFacebookFacebookPublisher* self);
+static void publishing_facebook_facebook_publisher_do_fetch_user_info (PublishingFacebookFacebookPublisher* self);
 gpointer publishing_facebook_graph_message_ref (gpointer instance);
 void publishing_facebook_graph_message_unref (gpointer instance);
 GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -673,18 +591,12 @@ void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_obje
 void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_object);
 gpointer publishing_facebook_value_get_graph_message (const GValue* value);
 GType publishing_facebook_graph_message_get_type (void) G_GNUC_CONST;
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_endpoint_test (PublishingFacebookGraphSession* self);
-static void publishing_facebook_facebook_publisher_on_endpoint_test_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message);
-static void _publishing_facebook_facebook_publisher_on_endpoint_test_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
-static void publishing_facebook_facebook_publisher_on_endpoint_test_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* _error_);
-static void _publishing_facebook_facebook_publisher_on_endpoint_test_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
-void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* message);
-static void publishing_facebook_facebook_publisher_do_fetch_user_info (PublishingFacebookFacebookPublisher* self);
 PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (PublishingFacebookGraphSession* self, const gchar* resource_path);
 static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message);
 static void _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
 static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* _error_);
 static void _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
+void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* message);
 static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (PublishingFacebookFacebookPublisher* self);
 static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message);
 static void _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self);
@@ -703,8 +615,8 @@ static void _publishing_facebook_facebook_publisher_on_create_album_completed_pu
 static void publishing_facebook_facebook_publisher_on_create_album_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* err);
 static void _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self);
 static void publishing_facebook_facebook_publisher_do_show_publishing_options_pane (PublishingFacebookFacebookPublisher* self);
-PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_new (const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata);
-PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata);
+PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_new (const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout);
+PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout);
 static void publishing_facebook_facebook_publisher_on_publishing_options_pane_logout (PublishingFacebookFacebookPublisher* self);
 static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self);
 static void publishing_facebook_facebook_publisher_on_publishing_options_pane_publish (PublishingFacebookFacebookPublisher* self, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution resolution, gboolean strip_metadata);
@@ -712,17 +624,10 @@ static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_p
 static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebookFacebookPublisher* self);
 static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (PublishingFacebookFacebookPublisher* self, const gchar* album_name, const gchar* json);
 static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebookFacebookPublisher* self);
-static void publishing_facebook_facebook_publisher_do_hosted_web_authentication (PublishingFacebookFacebookPublisher* self);
-PublishingFacebookWebAuthenticationPane* publishing_facebook_web_authentication_pane_new (void);
-PublishingFacebookWebAuthenticationPane* publishing_facebook_web_authentication_pane_construct (GType object_type);
-static void publishing_facebook_facebook_publisher_on_web_auth_pane_login_succeeded (PublishingFacebookFacebookPublisher* self, const gchar* success_url);
-static void _publishing_facebook_facebook_publisher_on_web_auth_pane_login_succeeded_publishing_facebook_web_authentication_pane_login_succeeded (PublishingFacebookWebAuthenticationPane* _sender, const gchar* success_url, gpointer self);
-static void publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed (PublishingFacebookFacebookPublisher* self);
-static void _publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed_publishing_facebook_web_authentication_pane_login_failed (PublishingFacebookWebAuthenticationPane* _sender, gpointer self);
-static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self, const gchar* good_login_uri);
+static void publishing_facebook_facebook_publisher_on_authenticator_succeeded (PublishingFacebookFacebookPublisher* self);
+static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self);
+static void publishing_facebook_facebook_publisher_on_authenticator_failed (PublishingFacebookFacebookPublisher* self);
 void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self, const gchar* access_token);
-static void publishing_facebook_facebook_publisher_do_save_session_information (PublishingFacebookFacebookPublisher* self);
-gchar* publishing_facebook_graph_session_get_access_token (PublishingFacebookGraphSession* self);
 PublishingFacebookUploader* publishing_facebook_uploader_new (PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1);
 PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object_type, PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1);
 static void publishing_facebook_facebook_publisher_on_upload_complete (PublishingFacebookFacebookPublisher* self, PublishingFacebookUploader* uploader, gint num_published);
@@ -740,31 +645,12 @@ static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_se
 gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebookFacebookPublisher* self);
 gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingFacebookFacebookPublisher* self);
 static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPublisher* base);
-gboolean publishing_facebook_web_authentication_pane_is_cache_dirty (void);
+static void _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self);
+static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed (SpitPublishingAuthenticator* _sender, gpointer self);
 static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base);
 void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self);
 static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPublishingPublisher* base);
 static void publishing_facebook_facebook_publisher_finalize (GObject* obj);
-enum  {
-	PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_DUMMY_PROPERTY
-};
-static gpointer publishing_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance);
-static void publishing_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance);
-static GParamSpec* publishing_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void publishing_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void publishing_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static gpointer publishing_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value) G_GNUC_UNUSED;
-static GType publishing_facebook_web_authentication_pane_locale_lookup_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static PublishingFacebookWebAuthenticationPaneLocaleLookup* publishing_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2);
-static PublishingFacebookWebAuthenticationPaneLocaleLookup* publishing_facebook_web_authentication_pane_locale_lookup_construct (GType object_type, const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2);
-static gchar* publishing_facebook_web_authentication_pane_get_login_url (void);
-static gchar* publishing_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void);
-static void publishing_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base);
-enum  {
-	PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_DUMMY_PROPERTY
-};
-static void publishing_facebook_web_authentication_pane_locale_lookup_finalize (PublishingFacebookWebAuthenticationPaneLocaleLookup* obj);
-static void publishing_facebook_web_authentication_pane_finalize (GObject* obj);
 static gpointer publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance);
 static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance);
 static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
@@ -841,9 +727,6 @@ static void publishing_facebook_graph_session_unmanage_message (PublishingFacebo
 static GType publishing_facebook_graph_session_graph_message_impl_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data (PublishingFacebookGraphSessionGraphMessageImpl* self, SoupBuffer* chunk);
 static void _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self);
-static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session);
-static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type, PublishingFacebookGraphSession* host_session);
-static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_new (PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token);
 static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_construct (GType object_type, PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token);
 static GType publishing_facebook_graph_session_graph_query_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
@@ -867,9 +750,12 @@ enum  {
 	PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_QUERY_MESSAGE_DUMMY_PROPERTY
 };
 static void _vala_SoupURI_free (SoupURI* self);
+static GType publishing_facebook_graph_session_graph_endpoint_probe_message_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 enum  {
 	PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_ENDPOINT_PROBE_MESSAGE_DUMMY_PROPERTY
 };
+static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session);
+static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_construct (GType object_type, PublishingFacebookGraphSession* host_session);
 #define PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessagePrivate))
 enum  {
 	PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_DUMMY_PROPERTY
@@ -898,7 +784,6 @@ static void publishing_facebook_uploader_send_files (PublishingFacebookUploader*
 static void publishing_facebook_uploader_finalize (PublishingFacebookUploader* 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);
 
 
 FacebookService* facebook_service_construct (GType object_type, GFile* resource_directory) {
@@ -915,7 +800,7 @@ FacebookService* facebook_service_construct (GType object_type, GFile* resource_
 	_tmp0__length1 = facebook_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 911 "FacebookPublishing.c"
+#line 804 "FacebookPublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
@@ -928,18 +813,18 @@ FacebookService* facebook_service_construct (GType object_type, GFile* resource_
 		facebook_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_facebook_service_icon_pixbuf_set_size_ = facebook_service_icon_pixbuf_set_length1;
-#line 924 "FacebookPublishing.c"
+#line 817 "FacebookPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 928 "FacebookPublishing.c"
+#line 821 "FacebookPublishing.c"
 }
 
 
 FacebookService* facebook_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return facebook_service_construct (TYPE_FACEBOOK_SERVICE, resource_directory);
-#line 935 "FacebookPublishing.c"
+#line 828 "FacebookPublishing.c"
 }
 
 
@@ -961,7 +846,7 @@ static gint facebook_service_real_get_pluggable_interface (SpitPluggable* base,
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 957 "FacebookPublishing.c"
+#line 850 "FacebookPublishing.c"
 }
 
 
@@ -974,7 +859,7 @@ static const gchar* facebook_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.facebook";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 970 "FacebookPublishing.c"
+#line 863 "FacebookPublishing.c"
 }
 
 
@@ -987,14 +872,14 @@ static const gchar* facebook_service_real_get_pluggable_name (SpitPluggable* bas
 	result = "Facebook";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 983 "FacebookPublishing.c"
+#line 876 "FacebookPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 990 "FacebookPublishing.c"
+#line 883 "FacebookPublishing.c"
 }
 
 
@@ -1005,17 +890,17 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 1001 "FacebookPublishing.c"
+#line 894 "FacebookPublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 1007 "FacebookPublishing.c"
+#line 900 "FacebookPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1011 "FacebookPublishing.c"
+#line 904 "FacebookPublishing.c"
 }
 
 
@@ -1097,7 +982,7 @@ static void facebook_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 1093 "FacebookPublishing.c"
+#line 986 "FacebookPublishing.c"
 }
 
 
@@ -1105,7 +990,7 @@ static void facebook_service_real_activation (SpitPluggable* base, gboolean enab
 	FacebookService * self;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FACEBOOK_SERVICE, FacebookService);
-#line 1101 "FacebookPublishing.c"
+#line 994 "FacebookPublishing.c"
 }
 
 
@@ -1126,7 +1011,7 @@ static SpitPublishingPublisher* facebook_service_real_create_publisher (SpitPubl
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1122 "FacebookPublishing.c"
+#line 1015 "FacebookPublishing.c"
 }
 
 
@@ -1139,7 +1024,7 @@ static SpitPublishingPublisherMediaType facebook_service_real_get_supported_medi
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1135 "FacebookPublishing.c"
+#line 1028 "FacebookPublishing.c"
 }
 
 
@@ -1148,7 +1033,7 @@ static void facebook_service_class_init (FacebookServiceClass * klass) {
 	facebook_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = facebook_service_finalize;
-#line 1144 "FacebookPublishing.c"
+#line 1037 "FacebookPublishing.c"
 }
 
 
@@ -1165,7 +1050,7 @@ static void facebook_service_spit_pluggable_interface_init (SpitPluggableIface *
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) facebook_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) facebook_service_real_activation;
-#line 1161 "FacebookPublishing.c"
+#line 1054 "FacebookPublishing.c"
 }
 
 
@@ -1176,7 +1061,7 @@ static void facebook_service_spit_publishing_service_interface_init (SpitPublish
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) facebook_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) facebook_service_real_get_supported_media;
-#line 1172 "FacebookPublishing.c"
+#line 1065 "FacebookPublishing.c"
 }
 
 
@@ -1190,7 +1075,7 @@ static void facebook_service_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FACEBOOK_SERVICE, FacebookService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (facebook_service_parent_class)->finalize (obj);
-#line 1186 "FacebookPublishing.c"
+#line 1079 "FacebookPublishing.c"
 }
 
 
@@ -1216,248 +1101,248 @@ PublishingFacebookAlbum* publishing_facebook_album_construct (GType object_type,
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookAlbum*) g_type_create_instance (object_type);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = name;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->name);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->name = _tmp1_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = id;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->id);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->id = _tmp3_;
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 1236 "FacebookPublishing.c"
+#line 1129 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookAlbum* publishing_facebook_album_new (const gchar* name, const gchar* id) {
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_album_construct (PUBLISHING_FACEBOOK_TYPE_ALBUM, name, id);
-#line 1243 "FacebookPublishing.c"
+#line 1136 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_album_init (GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1250 "FacebookPublishing.c"
+#line 1143 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_album_free_value (GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (value->data[0].v_pointer);
-#line 1259 "FacebookPublishing.c"
+#line 1152 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_album_ref (src_value->data[0].v_pointer);
-#line 1269 "FacebookPublishing.c"
+#line 1162 "FacebookPublishing.c"
 	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1273 "FacebookPublishing.c"
+#line 1166 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_album_peek_pointer (const GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1281 "FacebookPublishing.c"
+#line 1174 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1288 "FacebookPublishing.c"
+#line 1181 "FacebookPublishing.c"
 		PublishingFacebookAlbum* object;
 		object = collect_values[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1295 "FacebookPublishing.c"
+#line 1188 "FacebookPublishing.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/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 1299 "FacebookPublishing.c"
+#line 1192 "FacebookPublishing.c"
 		}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_album_ref (object);
-#line 1303 "FacebookPublishing.c"
+#line 1196 "FacebookPublishing.c"
 	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1307 "FacebookPublishing.c"
+#line 1200 "FacebookPublishing.c"
 	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1311 "FacebookPublishing.c"
+#line 1204 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookAlbum** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1322 "FacebookPublishing.c"
+#line 1215 "FacebookPublishing.c"
 	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 1328 "FacebookPublishing.c"
+#line 1221 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1332 "FacebookPublishing.c"
+#line 1225 "FacebookPublishing.c"
 	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1336 "FacebookPublishing.c"
+#line 1229 "FacebookPublishing.c"
 	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1340 "FacebookPublishing.c"
+#line 1233 "FacebookPublishing.c"
 }
 
 
 GParamSpec* publishing_facebook_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookParamSpecAlbum* spec;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_ALBUM), NULL);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1354 "FacebookPublishing.c"
+#line 1247 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_album (const GValue* value) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM), NULL);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1363 "FacebookPublishing.c"
+#line 1256 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_album (GValue* value, gpointer v_object) {
 	PublishingFacebookAlbum* old;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_ALBUM));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_ref (value->data[0].v_pointer);
-#line 1383 "FacebookPublishing.c"
+#line 1276 "FacebookPublishing.c"
 	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1387 "FacebookPublishing.c"
+#line 1280 "FacebookPublishing.c"
 	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (old);
-#line 1393 "FacebookPublishing.c"
+#line 1286 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_album (GValue* value, gpointer v_object) {
 	PublishingFacebookAlbum* old;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_ALBUM));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_ALBUM));
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1412 "FacebookPublishing.c"
+#line 1305 "FacebookPublishing.c"
 	} else {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1416 "FacebookPublishing.c"
+#line 1309 "FacebookPublishing.c"
 	}
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_album_unref (old);
-#line 1422 "FacebookPublishing.c"
+#line 1315 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_album_class_init (PublishingFacebookAlbumClass * klass) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_album_parent_class = g_type_class_peek_parent (klass);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookAlbumClass *) klass)->finalize = publishing_facebook_album_finalize;
-#line 1432 "FacebookPublishing.c"
+#line 1325 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_album_instance_init (PublishingFacebookAlbum * self) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 1439 "FacebookPublishing.c"
+#line 1332 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_album_finalize (PublishingFacebookAlbum* obj) {
 	PublishingFacebookAlbum * self;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_ALBUM, PublishingFacebookAlbum);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->name);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->id);
-#line 1453 "FacebookPublishing.c"
+#line 1346 "FacebookPublishing.c"
 }
 
 
@@ -1478,72 +1363,72 @@ GType publishing_facebook_album_get_type (void) {
 gpointer publishing_facebook_album_ref (gpointer instance) {
 	PublishingFacebookAlbum* self;
 	self = instance;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 1478 "FacebookPublishing.c"
+#line 1371 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_album_unref (gpointer instance) {
 	PublishingFacebookAlbum* self;
 	self = instance;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_ALBUM_GET_CLASS (self)->finalize (self);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1491 "FacebookPublishing.c"
+#line 1384 "FacebookPublishing.c"
 	}
 }
 
 
 gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution self) {
 	gchar* result = NULL;
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (self) {
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1502 "FacebookPublishing.c"
+#line 1395 "FacebookPublishing.c"
 		{
 			const gchar* _tmp0_ = NULL;
 			gchar* _tmp1_ = NULL;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp0_ = _ ("Standard (720 pixels)");
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = g_strdup (_tmp0_);
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp1_;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1514 "FacebookPublishing.c"
+#line 1407 "FacebookPublishing.c"
 		}
-#line 85 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1518 "FacebookPublishing.c"
+#line 1411 "FacebookPublishing.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp2_ = _ ("Large (2048 pixels)");
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp3_;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1530 "FacebookPublishing.c"
+#line 1423 "FacebookPublishing.c"
 		}
 		default:
 		{
 			GEnumValue* _tmp4_;
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp4_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			g_error ("FacebookPublishing.vala:93: Unknown resolution %s", (_tmp4_ != NULL) ? _tmp4_->value_name : NULL);
-#line 1539 "FacebookPublishing.c"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+			g_error ("FacebookPublishing.vala:87: Unknown resolution %s", (_tmp4_ != NULL) ? _tmp4_->value_name : NULL);
+#line 1432 "FacebookPublishing.c"
 		}
 	}
 }
@@ -1551,36 +1436,36 @@ gchar* publishing_facebook_resolution_get_name (PublishingFacebookResolution sel
 
 gint publishing_facebook_resolution_get_pixels (PublishingFacebookResolution self) {
 	gint result = 0;
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (self) {
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_STANDARD:
-#line 1551 "FacebookPublishing.c"
+#line 1444 "FacebookPublishing.c"
 		{
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = 720;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1557 "FacebookPublishing.c"
+#line 1450 "FacebookPublishing.c"
 		}
-#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_RESOLUTION_HIGH:
-#line 1561 "FacebookPublishing.c"
+#line 1454 "FacebookPublishing.c"
 		{
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = 2048;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 1567 "FacebookPublishing.c"
+#line 1460 "FacebookPublishing.c"
 		}
 		default:
 		{
 			GEnumValue* _tmp0_;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp0_ = g_enum_get_value (g_type_class_ref (PUBLISHING_FACEBOOK_TYPE_RESOLUTION), self);
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			g_error ("FacebookPublishing.vala:106: Unknown resolution %s", (_tmp0_ != NULL) ? _tmp0_->value_name : NULL);
-#line 1576 "FacebookPublishing.c"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+			g_error ("FacebookPublishing.vala:100: Unknown resolution %s", (_tmp0_ != NULL) ? _tmp0_->value_name : NULL);
+#line 1469 "FacebookPublishing.c"
 		}
 	}
 }
@@ -1600,64 +1485,64 @@ GType publishing_facebook_resolution_get_type (void) {
 
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_construct (GType object_type) {
 	PublishingFacebookPublishingParameters* self = NULL;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookPublishingParameters*) g_type_create_instance (object_type);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->albums = (_vala_array_free (self->albums, self->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->albums = NULL;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->albums_length1 = 0;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->_albums_size_ = self->albums_length1;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_object);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->privacy_object = NULL;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->new_album_name);
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->new_album_name = NULL;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->strip_metadata = FALSE;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->resolution = PUBLISHING_FACEBOOK_RESOLUTION_HIGH;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->resolution = PUBLISHING_FACEBOOK_RESOLUTION_HIGH;
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 1622 "FacebookPublishing.c"
+#line 1515 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookPublishingParameters* publishing_facebook_publishing_parameters_new (void) {
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_publishing_parameters_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS);
-#line 1629 "FacebookPublishing.c"
+#line 1522 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_album_ref0 (gpointer self) {
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_album_ref (self) : NULL;
-#line 1636 "FacebookPublishing.c"
+#line 1529 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add6 (PublishingFacebookAlbum*** array, int* length, int* size, PublishingFacebookAlbum* value) {
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookAlbum*, *array, (*size) + 1);
-#line 1647 "FacebookPublishing.c"
+#line 1540 "FacebookPublishing.c"
 	}
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 1653 "FacebookPublishing.c"
+#line 1546 "FacebookPublishing.c"
 }
 
 
@@ -1671,80 +1556,80 @@ void publishing_facebook_publishing_parameters_add_album (PublishingFacebookPubl
 	PublishingFacebookAlbum** _tmp5_ = NULL;
 	gint _tmp5__length1 = 0;
 	PublishingFacebookAlbum* _tmp6_ = NULL;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self));
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (name != NULL);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (id != NULL);
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->albums;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->albums_length1;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 1679 "FacebookPublishing.c"
+#line 1572 "FacebookPublishing.c"
 		PublishingFacebookAlbum** _tmp1_ = NULL;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->albums = (_vala_array_free (self->albums, self->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->albums = _tmp1_;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->albums_length1 = 0;
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->_albums_size_ = self->albums_length1;
-#line 1691 "FacebookPublishing.c"
+#line 1584 "FacebookPublishing.c"
 	}
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = name;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = id;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishing_facebook_album_new (_tmp2_, _tmp3_);
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	new_album = _tmp4_;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = self->albums;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5__length1 = self->albums_length1;
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _publishing_facebook_album_ref0 (new_album);
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add6 (&self->albums, &self->albums_length1, &self->_albums_size_, _tmp6_);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_album_unref0 (new_album);
-#line 1711 "FacebookPublishing.c"
+#line 1604 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_publishing_parameters_set_target_album_by_name (PublishingFacebookPublishingParameters* self, const gchar* name) {
 	const gchar* _tmp0_ = NULL;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self));
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = name;
-#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 1727 "FacebookPublishing.c"
+#line 1620 "FacebookPublishing.c"
 	}
 	{
 		gint i = 0;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		i = 0;
-#line 1733 "FacebookPublishing.c"
+#line 1626 "FacebookPublishing.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = TRUE;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			while (TRUE) {
-#line 1740 "FacebookPublishing.c"
+#line 1633 "FacebookPublishing.c"
 				gint _tmp3_ = 0;
 				PublishingFacebookAlbum** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -1754,60 +1639,60 @@ void publishing_facebook_publishing_parameters_set_target_album_by_name (Publish
 				PublishingFacebookAlbum* _tmp7_ = NULL;
 				const gchar* _tmp8_ = NULL;
 				const gchar* _tmp9_ = NULL;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (!_tmp1_) {
-#line 1752 "FacebookPublishing.c"
+#line 1645 "FacebookPublishing.c"
 					gint _tmp2_ = 0;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp2_ = i;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					i = _tmp2_ + 1;
-#line 1758 "FacebookPublishing.c"
+#line 1651 "FacebookPublishing.c"
 				}
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp1_ = FALSE;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp3_ = i;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp4_ = self->albums;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp4__length1 = self->albums_length1;
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (!(_tmp3_ < _tmp4__length1)) {
-#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					break;
-#line 1772 "FacebookPublishing.c"
+#line 1665 "FacebookPublishing.c"
 				}
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp5_ = self->albums;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp5__length1 = self->albums_length1;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp6_ = i;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp7_ = _tmp5_[_tmp6_];
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp8_ = _tmp7_->name;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp9_ = name;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				if (g_strcmp0 (_tmp8_, _tmp9_) == 0) {
-#line 1788 "FacebookPublishing.c"
+#line 1681 "FacebookPublishing.c"
 					gint _tmp10_ = 0;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp10_ = i;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					self->target_album = _tmp10_;
-#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					return;
-#line 1796 "FacebookPublishing.c"
+#line 1689 "FacebookPublishing.c"
 				}
 			}
 		}
 	}
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->target_album = PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1803 "FacebookPublishing.c"
+#line 1696 "FacebookPublishing.c"
 }
 
 
@@ -1822,50 +1707,50 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_name (Publishi
 	PublishingFacebookAlbum* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->albums;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = self->albums_length1;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp1_ == NULL) {
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = TRUE;
-#line 1828 "FacebookPublishing.c"
+#line 1721 "FacebookPublishing.c"
 	} else {
 		gint _tmp2_ = 0;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = self->target_album;
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1835 "FacebookPublishing.c"
+#line 1728 "FacebookPublishing.c"
 	}
-#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = NULL;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 1843 "FacebookPublishing.c"
+#line 1736 "FacebookPublishing.c"
 	}
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->albums;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3__length1 = self->albums_length1;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = self->target_album;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_->name;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp7_;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1861 "FacebookPublishing.c"
+#line 1754 "FacebookPublishing.c"
 }
 
 
@@ -1880,262 +1765,262 @@ gchar* publishing_facebook_publishing_parameters_get_target_album_id (Publishing
 	PublishingFacebookAlbum* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->albums;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = self->albums_length1;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp1_ == NULL) {
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = TRUE;
-#line 1886 "FacebookPublishing.c"
+#line 1779 "FacebookPublishing.c"
 	} else {
 		gint _tmp2_ = 0;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = self->target_album;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM;
-#line 1893 "FacebookPublishing.c"
+#line 1786 "FacebookPublishing.c"
 	}
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = NULL;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 1901 "FacebookPublishing.c"
+#line 1794 "FacebookPublishing.c"
 	}
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->albums;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3__length1 = self->albums_length1;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = self->target_album;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp3_[_tmp4_];
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_->id;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = g_strdup (_tmp6_);
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp7_;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 1919 "FacebookPublishing.c"
+#line 1812 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_publishing_parameters_init (GValue* value) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1926 "FacebookPublishing.c"
+#line 1819 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_publishing_parameters_free_value (GValue* value) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1935 "FacebookPublishing.c"
+#line 1828 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 1945 "FacebookPublishing.c"
+#line 1838 "FacebookPublishing.c"
 	} else {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1949 "FacebookPublishing.c"
+#line 1842 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1957 "FacebookPublishing.c"
+#line 1850 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1964 "FacebookPublishing.c"
+#line 1857 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* object;
 		object = collect_values[0].v_pointer;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1971 "FacebookPublishing.c"
+#line 1864 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1975 "FacebookPublishing.c"
+#line 1868 "FacebookPublishing.c"
 		}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_publishing_parameters_ref (object);
-#line 1979 "FacebookPublishing.c"
+#line 1872 "FacebookPublishing.c"
 	} else {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1983 "FacebookPublishing.c"
+#line 1876 "FacebookPublishing.c"
 	}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 1987 "FacebookPublishing.c"
+#line 1880 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookPublishingParameters** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1998 "FacebookPublishing.c"
+#line 1891 "FacebookPublishing.c"
 	}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 2004 "FacebookPublishing.c"
+#line 1897 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2008 "FacebookPublishing.c"
+#line 1901 "FacebookPublishing.c"
 	} else {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2012 "FacebookPublishing.c"
+#line 1905 "FacebookPublishing.c"
 	}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 2016 "FacebookPublishing.c"
+#line 1909 "FacebookPublishing.c"
 }
 
 
 GParamSpec* publishing_facebook_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookParamSpecPublishingParameters* spec;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 2030 "FacebookPublishing.c"
+#line 1923 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_publishing_parameters (const GValue* value) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 2039 "FacebookPublishing.c"
+#line 1932 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingFacebookPublishingParameters* old;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_ref (value->data[0].v_pointer);
-#line 2059 "FacebookPublishing.c"
+#line 1952 "FacebookPublishing.c"
 	} else {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2063 "FacebookPublishing.c"
+#line 1956 "FacebookPublishing.c"
 	}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (old);
-#line 2069 "FacebookPublishing.c"
+#line 1962 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingFacebookPublishingParameters* old;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS));
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 2088 "FacebookPublishing.c"
+#line 1981 "FacebookPublishing.c"
 	} else {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 2092 "FacebookPublishing.c"
+#line 1985 "FacebookPublishing.c"
 	}
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_unref (old);
-#line 2098 "FacebookPublishing.c"
+#line 1991 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_parameters_class_init (PublishingFacebookPublishingParametersClass * klass) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookPublishingParametersClass *) klass)->finalize = publishing_facebook_publishing_parameters_finalize;
-#line 2108 "FacebookPublishing.c"
+#line 2001 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_parameters_instance_init (PublishingFacebookPublishingParameters * self) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 2115 "FacebookPublishing.c"
+#line 2008 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_parameters_finalize (PublishingFacebookPublishingParameters* obj) {
 	PublishingFacebookPublishingParameters * self;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_PARAMETERS, PublishingFacebookPublishingParameters);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->albums = (_vala_array_free (self->albums, self->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->new_album_name);
-#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_object);
-#line 2131 "FacebookPublishing.c"
+#line 2024 "FacebookPublishing.c"
 }
 
 
@@ -2156,32 +2041,32 @@ GType publishing_facebook_publishing_parameters_get_type (void) {
 gpointer publishing_facebook_publishing_parameters_ref (gpointer instance) {
 	PublishingFacebookPublishingParameters* self;
 	self = instance;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 2156 "FacebookPublishing.c"
+#line 2049 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_publishing_parameters_unref (gpointer instance) {
 	PublishingFacebookPublishingParameters* self;
 	self = instance;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2169 "FacebookPublishing.c"
+#line 2062 "FacebookPublishing.c"
 	}
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated (PublishingFacebookGraphSession* _sender, gpointer self) {
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_session_authenticated ((PublishingFacebookFacebookPublisher*) self);
-#line 2177 "FacebookPublishing.c"
+#line 2070 "FacebookPublishing.c"
 }
 
 
@@ -2190,109 +2075,68 @@ PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_cons
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
 	PublishingFacebookPublishingParameters* _tmp2_ = NULL;
-	PublishingFacebookGraphSession* _tmp3_ = NULL;
-	PublishingFacebookGraphSession* _tmp4_ = NULL;
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	PublishingAuthenticatorFactory* _tmp3_ = NULL;
+	PublishingAuthenticatorFactory* _tmp4_ = NULL;
+	SpitPublishingPluginHost* _tmp5_ = NULL;
+	SpitPublishingAuthenticator* _tmp6_ = NULL;
+	PublishingFacebookGraphSession* _tmp7_ = NULL;
+	PublishingFacebookGraphSession* _tmp8_ = NULL;
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookFacebookPublisher*) g_object_new (object_type, NULL);
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:189: FacebookPublisher instantiated.");
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:183: FacebookPublisher instantiated.");
+#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = service;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->service = _tmp0_;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = host;
-#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->host = _tmp1_;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishing_facebook_publishing_parameters_new ();
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishing_params = _tmp2_;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = publishing_facebook_graph_session_new ();
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp3_ = publishing_authenticator_factory_get_instance ();
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp4_ = _tmp3_;
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp5_ = host;
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp6_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "facebook", _tmp5_);
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->authenticator = _tmp6_;
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_object_unref0 (_tmp4_);
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp7_ = publishing_facebook_graph_session_new ();
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_session_unref0 (self->priv->graph_session);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->graph_session = _tmp3_;
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = self->priv->graph_session;
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp4_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0);
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->graph_session = _tmp7_;
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp8_ = self->priv->graph_session;
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp8_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0);
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 2222 "FacebookPublishing.c"
+#line 2133 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookFacebookPublisher* publishing_facebook_facebook_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_facebook_publisher_construct (PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, service, host);
-#line 2229 "FacebookPublishing.c"
-}
-
-
-static gboolean publishing_facebook_facebook_publisher_is_persistent_session_valid (PublishingFacebookFacebookPublisher* self) {
-	gboolean result = FALSE;
-	gchar* token = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp3_ = NULL;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), FALSE);
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_facebook_publisher_get_persistent_access_token (self);
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	token = _tmp0_;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = token;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp1_ != NULL) {
-#line 2249 "FacebookPublishing.c"
-		const gchar* _tmp2_ = NULL;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp2_ = token;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_debug ("FacebookPublishing.vala:204: existing Facebook session found in config" \
-"uration database (access_token = %s).", _tmp2_);
-#line 2255 "FacebookPublishing.c"
-	} else {
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_debug ("FacebookPublishing.vala:207: no existing Facebook session available.");
-#line 2259 "FacebookPublishing.c"
-	}
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = token;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp3_ != NULL;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (token);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 2269 "FacebookPublishing.c"
-}
-
-
-static gchar* publishing_facebook_facebook_publisher_get_persistent_access_token (PublishingFacebookFacebookPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), NULL);
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_token", NULL);
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp1_;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 2287 "FacebookPublishing.c"
+#line 2140 "FacebookPublishing.c"
 }
 
 
@@ -2300,49 +2144,32 @@ static gboolean publishing_facebook_facebook_publisher_get_persistent_strip_meta
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), FALSE);
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", FALSE);
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2305 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_set_persistent_access_token (PublishingFacebookFacebookPublisher* self, const gchar* access_token) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (access_token != NULL);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = access_token;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_token", _tmp1_);
-#line 2322 "FacebookPublishing.c"
+#line 2158 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_set_persistent_strip_metadata (PublishingFacebookFacebookPublisher* self, gboolean strip_metadata) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = strip_metadata;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp1_);
-#line 2337 "FacebookPublishing.c"
+#line 2173 "FacebookPublishing.c"
 }
 
 
@@ -2350,140 +2177,46 @@ gint publishing_facebook_facebook_publisher_get_persistent_default_size (Publish
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), 0);
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", 0);
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 2355 "FacebookPublishing.c"
+#line 2191 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_facebook_publisher_set_persistent_default_size (PublishingFacebookFacebookPublisher* self, gint size) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = size;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default_size", _tmp1_);
-#line 2370 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_invalidate_persistent_session (PublishingFacebookFacebookPublisher* self) {
-#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:239: invalidating saved Facebook session.");
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_set_persistent_access_token (self, "");
-#line 2381 "FacebookPublishing.c"
-}
-
-
-static void _publishing_facebook_facebook_publisher_on_login_clicked_spit_publishing_login_callback (gpointer self) {
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_on_login_clicked ((PublishingFacebookFacebookPublisher*) self);
-#line 2388 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_do_show_service_welcome_pane (PublishingFacebookFacebookPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:245: ACTION: showing service welcome pane.");
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_FACEBOOK_SERVICE_WELCOME_MESSAGE, _publishing_facebook_facebook_publisher_on_login_clicked_spit_publishing_login_callback, self);
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp1_, FALSE);
-#line 2407 "FacebookPublishing.c"
-}
-
-
-static void _publishing_facebook_facebook_publisher_on_endpoint_test_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_on_endpoint_test_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2414 "FacebookPublishing.c"
-}
-
-
-static void _publishing_facebook_facebook_publisher_on_endpoint_test_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_on_endpoint_test_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2421 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_do_test_connection_to_endpoint (PublishingFacebookFacebookPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingFacebookGraphMessage* endpoint_test_message = NULL;
-	PublishingFacebookGraphSession* _tmp3_ = NULL;
-	PublishingFacebookGraphMessage* _tmp4_ = NULL;
-	PublishingFacebookGraphSession* _tmp5_ = NULL;
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:252: ACTION: testing connection to Facebook en" \
-"dpoint.");
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = _ ("Testing connection to Facebook…");
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _tmp2_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = self->priv->graph_session;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = publishing_facebook_graph_session_new_endpoint_test (_tmp3_);
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	endpoint_test_message = _tmp4_;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (endpoint_test_message, "completed", (GCallback) _publishing_facebook_facebook_publisher_on_endpoint_test_completed_publishing_facebook_graph_message_completed, self, 0);
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (endpoint_test_message, "failed", (GCallback) _publishing_facebook_facebook_publisher_on_endpoint_test_error_publishing_facebook_graph_message_failed, self, 0);
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = self->priv->graph_session;
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_graph_session_send_message (_tmp5_, endpoint_test_message);
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_publishing_facebook_graph_message_unref0 (endpoint_test_message);
-#line 2463 "FacebookPublishing.c"
+#line 2206 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_user_info_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2470 "FacebookPublishing.c"
+#line 2213 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_user_info_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2477 "FacebookPublishing.c"
+#line 2220 "FacebookPublishing.c"
 }
 
 
@@ -2494,49 +2227,49 @@ static void publishing_facebook_facebook_publisher_do_fetch_user_info (Publishin
 	PublishingFacebookGraphSession* _tmp2_ = NULL;
 	PublishingFacebookGraphMessage* _tmp3_ = NULL;
 	PublishingFacebookGraphSession* _tmp4_ = NULL;
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:265: ACTION: fetching user information.");
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:231: ACTION: fetching user information.");
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->graph_session;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = publishing_facebook_graph_session_new_query (_tmp2_, "/me");
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	user_info_message = _tmp3_;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (user_info_message, "completed", (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self, 0);
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (user_info_message, "failed", (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self, 0);
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = self->priv->graph_session;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_send_message (_tmp4_, user_info_message);
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (user_info_message);
-#line 2516 "FacebookPublishing.c"
+#line 2259 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_albums_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 2523 "FacebookPublishing.c"
+#line 2266 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_fetch_albums_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 2530 "FacebookPublishing.c"
+#line 2273 "FacebookPublishing.c"
 }
 
 
@@ -2551,86 +2284,86 @@ static void publishing_facebook_facebook_publisher_do_fetch_album_descriptions (
 	PublishingFacebookGraphMessage* _tmp6_ = NULL;
 	PublishingFacebookGraphMessage* _tmp7_ = NULL;
 	PublishingFacebookGraphSession* _tmp8_ = NULL;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:279: ACTION: fetching album list.");
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:245: ACTION: fetching album list.");
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->graph_session;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->uid;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = g_strdup_printf ("/%s/albums", _tmp3_);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_graph_session_new_query (_tmp2_, _tmp5_);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp5_);
-#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	albums_message = _tmp7_;
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (albums_message, "completed", (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self, 0);
-#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (albums_message, "failed", (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self, 0);
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->graph_session;
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_send_message (_tmp8_, albums_message);
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (albums_message);
-#line 2583 "FacebookPublishing.c"
+#line 2326 "FacebookPublishing.c"
 }
 
 
 static JsonNode* _vala_JsonNode_copy (JsonNode* self) {
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return g_boxed_copy (json_node_get_type (), self);
-#line 2590 "FacebookPublishing.c"
+#line 2333 "FacebookPublishing.c"
 }
 
 
 static gpointer __vala_JsonNode_copy0 (gpointer self) {
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? _vala_JsonNode_copy (self) : NULL;
-#line 2597 "FacebookPublishing.c"
+#line 2340 "FacebookPublishing.c"
 }
 
 
 static gpointer _json_object_ref0 (gpointer self) {
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? json_object_ref (self) : NULL;
-#line 2604 "FacebookPublishing.c"
+#line 2347 "FacebookPublishing.c"
 }
 
 
 static void _vala_JsonNode_free (JsonNode* self) {
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (json_node_get_type (), self);
-#line 2611 "FacebookPublishing.c"
+#line 2354 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_extract_user_info_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json) {
 	GError * _inner_error_ = NULL;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (json != NULL);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:293: ACTION: extracting user info from JSON re" \
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:259: ACTION: extracting user info from JSON re" \
 "sponse.");
-#line 2623 "FacebookPublishing.c"
+#line 2366 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_ = NULL;
@@ -2650,66 +2383,66 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		JsonObject* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		parser = _tmp0_;
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = parser;
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = json;
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2657 "FacebookPublishing.c"
+#line 2400 "FacebookPublishing.c"
 			goto __catch0_g_error;
 		}
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = parser;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = json_parser_get_root (_tmp3_);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		root = _tmp5_;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = root;
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = json_node_get_object (_tmp6_);
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _json_object_ref0 (_tmp7_);
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		response_object = _tmp8_;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = response_object;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = json_object_get_string_member (_tmp9_, "id");
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = g_strdup (_tmp10_);
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (self->priv->uid);
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->priv->uid = _tmp11_;
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = response_object;
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = json_object_get_string_member (_tmp12_, "name");
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = g_strdup (_tmp13_);
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (self->priv->username);
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->priv->username = _tmp14_;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_json_object_unref0 (response_object);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		__vala_JsonNode_free0 (root);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 2702 "FacebookPublishing.c"
+#line 2445 "FacebookPublishing.c"
 	}
 	goto __finally0;
 	__catch0_g_error:
@@ -2720,64 +2453,64 @@ static void publishing_facebook_facebook_publisher_do_extract_user_info_from_jso
 		const gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		GError* _tmp19_ = NULL;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = self->priv->host;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = _error_;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = _tmp16_->message;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp17_);
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp19_ = _tmp18_;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp15_, _tmp19_);
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp19_);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_error_);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2735 "FacebookPublishing.c"
+#line 2478 "FacebookPublishing.c"
 	}
 	__finally0:
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2746 "FacebookPublishing.c"
+#line 2489 "FacebookPublishing.c"
 	}
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_user_info_extracted (self);
-#line 2750 "FacebookPublishing.c"
+#line 2493 "FacebookPublishing.c"
 }
 
 
 static gpointer _json_array_ref0 (gpointer self) {
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? json_array_ref (self) : NULL;
-#line 2757 "FacebookPublishing.c"
+#line 2500 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (PublishingFacebookFacebookPublisher* self, const gchar* json) {
 	GError * _inner_error_ = NULL;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (json != NULL);
-#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:312: ACTION: extracting album info from JSON r" \
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:278: ACTION: extracting album info from JSON r" \
 "esponse.");
-#line 2769 "FacebookPublishing.c"
+#line 2512 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_ = NULL;
@@ -2797,72 +2530,72 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		JsonArray* _tmp11_ = NULL;
 		PublishingFacebookPublishingParameters* _tmp12_ = NULL;
 		PublishingFacebookAlbum** _tmp13_ = NULL;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		parser = _tmp0_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = parser;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = json;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 2803 "FacebookPublishing.c"
+#line 2546 "FacebookPublishing.c"
 			goto __catch1_g_error;
 		}
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = parser;
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = json_parser_get_root (_tmp3_);
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		root = _tmp5_;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = root;
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = json_node_get_object (_tmp6_);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _json_object_ref0 (_tmp7_);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		response_object = _tmp8_;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = response_object;
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = json_object_get_array_member (_tmp9_, "data");
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = _json_array_ref0 (_tmp10_);
-#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		album_list = _tmp11_;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = self->priv->publishing_params;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = g_new0 (PublishingFacebookAlbum*, 0 + 1);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_->albums = (_vala_array_free (_tmp12_->albums, _tmp12_->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_->albums = _tmp13_;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_->albums_length1 = 0;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_->_albums_size_ = _tmp12_->albums_length1;
-#line 2842 "FacebookPublishing.c"
+#line 2585 "FacebookPublishing.c"
 		{
 			gint i = 0;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			i = 0;
-#line 2847 "FacebookPublishing.c"
+#line 2590 "FacebookPublishing.c"
 			{
 				gboolean _tmp14_ = FALSE;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp14_ = TRUE;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				while (TRUE) {
-#line 2854 "FacebookPublishing.c"
+#line 2597 "FacebookPublishing.c"
 					gint _tmp16_ = 0;
 					JsonArray* _tmp17_ = NULL;
 					guint _tmp18_ = 0U;
@@ -2882,83 +2615,83 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 					PublishingFacebookPublishingParameters* _tmp29_ = NULL;
 					const gchar* _tmp30_ = NULL;
 					const gchar* _tmp31_ = NULL;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					if (!_tmp14_) {
-#line 2876 "FacebookPublishing.c"
+#line 2619 "FacebookPublishing.c"
 						gint _tmp15_ = 0;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp15_ = i;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						i = _tmp15_ + 1;
-#line 2882 "FacebookPublishing.c"
+#line 2625 "FacebookPublishing.c"
 					}
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp14_ = FALSE;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp16_ = i;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp17_ = album_list;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp18_ = json_array_get_length (_tmp17_);
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					if (!(((guint) _tmp16_) < _tmp18_)) {
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						break;
-#line 2896 "FacebookPublishing.c"
+#line 2639 "FacebookPublishing.c"
 					}
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp19_ = album_list;
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp20_ = i;
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp21_ = json_array_get_object_element (_tmp19_, (guint) _tmp20_);
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp22_ = _json_object_ref0 (_tmp21_);
-#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					current_album = _tmp22_;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp23_ = current_album;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp24_ = json_object_get_string_member (_tmp23_, "id");
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp25_ = g_strdup (_tmp24_);
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					album_id = _tmp25_;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp26_ = current_album;
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp27_ = json_object_get_string_member (_tmp26_, "name");
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp28_ = g_strdup (_tmp27_);
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					album_name = _tmp28_;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp29_ = self->priv->publishing_params;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp30_ = album_name;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp31_ = album_id;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					publishing_facebook_publishing_parameters_add_album (_tmp29_, _tmp30_, _tmp31_);
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_g_free0 (album_name);
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_g_free0 (album_id);
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_json_object_unref0 (current_album);
-#line 2938 "FacebookPublishing.c"
+#line 2681 "FacebookPublishing.c"
 				}
 			}
 		}
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_json_array_unref0 (album_list);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_json_object_unref0 (response_object);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		__vala_JsonNode_free0 (root);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 2950 "FacebookPublishing.c"
+#line 2693 "FacebookPublishing.c"
 	}
 	goto __finally1;
 	__catch1_g_error:
@@ -2969,58 +2702,58 @@ static void publishing_facebook_facebook_publisher_do_extract_albums_from_json (
 		const gchar* _tmp34_ = NULL;
 		GError* _tmp35_ = NULL;
 		GError* _tmp36_ = NULL;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp32_ = self->priv->host;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp33_ = _error_;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp34_ = _tmp33_->message;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp35_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp34_);
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp36_ = _tmp35_;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp32_, _tmp36_);
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp36_);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_error_);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2983 "FacebookPublishing.c"
+#line 2726 "FacebookPublishing.c"
 	}
 	__finally1:
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 2994 "FacebookPublishing.c"
+#line 2737 "FacebookPublishing.c"
 	}
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_albums_extracted (self);
-#line 2998 "FacebookPublishing.c"
+#line 2741 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_create_album_completed ((PublishingFacebookFacebookPublisher*) self, _sender);
-#line 3005 "FacebookPublishing.c"
+#line 2748 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_create_album_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 3012 "FacebookPublishing.c"
+#line 2755 "FacebookPublishing.c"
 }
 
 
@@ -3038,64 +2771,64 @@ static void publishing_facebook_facebook_publisher_do_create_new_album (Publishi
 	const gchar* _tmp9_ = NULL;
 	PublishingFacebookGraphMessage* _tmp10_ = NULL;
 	PublishingFacebookGraphSession* _tmp11_ = NULL;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishing_params;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _tmp0_->new_album_name;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:345: ACTION: creating a new album named \"%s\"" \
+#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:311: ACTION: creating a new album named \"%s\"" \
 ".\n", _tmp1_);
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->host;
-#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp2_, TRUE);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->host;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _ ("Creating album…");
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_static_message_pane (_tmp3_, _tmp4_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = self->priv->graph_session;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = self->priv->publishing_params;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_->new_album_name;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->publishing_params;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = _tmp8_->privacy_object;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = publishing_facebook_graph_session_new_create_album (_tmp5_, _tmp7_, _tmp9_);
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	create_album_message = _tmp10_;
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (create_album_message, "completed", (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self, 0);
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (create_album_message, "failed", (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self, 0);
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = self->priv->graph_session;
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_send_message (_tmp11_, create_album_message);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (create_album_message);
-#line 3072 "FacebookPublishing.c"
+#line 2815 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) {
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_publishing_options_pane_logout ((PublishingFacebookFacebookPublisher*) self);
-#line 3079 "FacebookPublishing.c"
+#line 2822 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self) {
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_publishing_options_pane_publish ((PublishingFacebookFacebookPublisher*) self, target_album, privacy_setting, target_resolution, strip_metadata);
-#line 3086 "FacebookPublishing.c"
+#line 2829 "FacebookPublishing.c"
 }
 
 
@@ -3111,34 +2844,36 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 	SpitPublishingPublisherMediaType _tmp13_ = 0;
 	GtkBuilder* _tmp14_ = NULL;
 	gboolean _tmp15_ = FALSE;
-	PublishingFacebookPublishingOptionsPane* _tmp16_ = NULL;
-	PublishingFacebookPublishingOptionsPane* _tmp17_ = NULL;
+	SpitPublishingAuthenticator* _tmp16_ = NULL;
+	gboolean _tmp17_ = FALSE;
 	PublishingFacebookPublishingOptionsPane* _tmp18_ = NULL;
-	SpitPublishingPluginHost* _tmp19_ = NULL;
+	PublishingFacebookPublishingOptionsPane* _tmp19_ = NULL;
 	PublishingFacebookPublishingOptionsPane* _tmp20_ = NULL;
+	SpitPublishingPluginHost* _tmp21_ = NULL;
+	PublishingFacebookPublishingOptionsPane* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:360: ACTION: showing publishing options pane.");
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:326: ACTION: showing publishing options pane.");
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = gtk_builder_new ();
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	builder = _tmp1_;
-#line 3120 "FacebookPublishing.c"
+#line 2865 "FacebookPublishing.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = builder;
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_builder_add_from_resource (_tmp2_, PLUGIN_RESOURCE_PATH "/" "facebook_publishing_options_pane.ui", &_inner_error_);
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3129 "FacebookPublishing.c"
+#line 2874 "FacebookPublishing.c"
 			goto __catch2_g_error;
 		}
 	}
@@ -3152,105 +2887,112 @@ static void publishing_facebook_facebook_publisher_do_show_publishing_options_pa
 		const gchar* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		e = _inner_error_;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = e;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = _tmp3_->message;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_warning ("FacebookPublishing.vala:371: Could not parse UI file! Error: %s.", _tmp4_);
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		g_warning ("FacebookPublishing.vala:337: Could not parse UI file! Error: %s.", _tmp4_);
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = self->priv->host;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Facebook " \
 "can’t continue.");
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_);
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp8_);
-#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp8_);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (e);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (builder);
-#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3171 "FacebookPublishing.c"
+#line 2916 "FacebookPublishing.c"
 	}
 	__finally2:
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (builder);
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_critical ("file %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/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3184 "FacebookPublishing.c"
+#line 2929 "FacebookPublishing.c"
 	}
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = self->priv->username;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = self->priv->publishing_params;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = _tmp10_->albums;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11__length1 = _tmp10_->albums_length1;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = self->priv->host;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp12_);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = builder;
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = publishing_facebook_facebook_publisher_get_persistent_strip_metadata (self);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp16_ = publishing_facebook_publishing_options_pane_new (_tmp9_, _tmp11_, _tmp11__length1, _tmp13_, self, _tmp14_, _tmp15_);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp16_ = self->priv->authenticator;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp17_ = spit_publishing_authenticator_can_logout (_tmp16_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp18_ = publishing_facebook_publishing_options_pane_new (_tmp9_, _tmp11_, _tmp11__length1, _tmp13_, self, _tmp14_, _tmp15_, _tmp17_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->publishing_options_pane = _tmp16_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp17_ = self->priv->publishing_options_pane;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp17_, "logout", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self, 0);
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp18_ = self->priv->publishing_options_pane;
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp18_, "publish", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp19_ = self->priv->host;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->publishing_options_pane = _tmp18_;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp19_ = self->priv->publishing_options_pane;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp19_, "logout", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self, 0);
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = self->priv->publishing_options_pane;
-#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp20_, "publish", (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp21_ = self->priv->host;
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp22_ = self->priv->publishing_options_pane;
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (builder);
-#line 3224 "FacebookPublishing.c"
+#line 2973 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_logout (PublishingFacebookFacebookPublisher* self) {
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:387: ACTION: clearing persistent session infor" \
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:354: ACTION: clearing persistent session infor" \
 "mation and restaring interaction.");
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_invalidate_persistent_session (self);
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	spit_publishing_authenticator_logout (_tmp0_);
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->running = FALSE;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_publisher_start (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 3239 "FacebookPublishing.c"
+#line 2991 "FacebookPublishing.c"
 }
 
 
@@ -3258,13 +3000,13 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 	PublishingFacebookPublishingParameters* _tmp20_ = NULL;
 	const gchar* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (album_name != NULL);
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (json != NULL);
-#line 3253 "FacebookPublishing.c"
+#line 3005 "FacebookPublishing.c"
 	{
 		JsonParser* parser = NULL;
 		JsonParser* _tmp0_ = NULL;
@@ -3285,64 +3027,64 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		PublishingFacebookPublishingParameters* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = json_parser_new ();
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		parser = _tmp0_;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = parser;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = json;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		json_parser_load_from_data (_tmp1_, _tmp2_, (gssize) -1, &_inner_error_);
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_object_unref0 (parser);
-#line 3288 "FacebookPublishing.c"
+#line 3040 "FacebookPublishing.c"
 			goto __catch3_g_error;
 		}
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = parser;
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = json_parser_get_root (_tmp3_);
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = __vala_JsonNode_copy0 (_tmp4_);
-#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		root = _tmp5_;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = root;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = json_node_get_object (_tmp6_);
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _json_object_ref0 (_tmp7_);
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		response_object = _tmp8_;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = response_object;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = json_object_get_string_member (_tmp9_, "id");
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = g_strdup (_tmp10_);
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		album_id = _tmp11_;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = self->priv->publishing_params;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = album_name;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = album_id;
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_add_album (_tmp12_, _tmp13_, _tmp14_);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (album_id);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_json_object_unref0 (response_object);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		__vala_JsonNode_free0 (root);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (parser);
-#line 3331 "FacebookPublishing.c"
+#line 3083 "FacebookPublishing.c"
 	}
 	goto __finally3;
 	__catch3_g_error:
@@ -3353,652 +3095,150 @@ static void publishing_facebook_facebook_publisher_do_add_new_local_album_from_j
 		const gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		GError* _tmp19_ = NULL;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_error_ = _inner_error_;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = self->priv->host;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = _error_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = _tmp16_->message;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, _tmp17_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp19_ = _tmp18_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp15_, _tmp19_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp19_);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_error_);
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3364 "FacebookPublishing.c"
+#line 3116 "FacebookPublishing.c"
 	}
 	__finally3:
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 3375 "FacebookPublishing.c"
+#line 3127 "FacebookPublishing.c"
 	}
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = self->priv->publishing_params;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = album_name;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp20_, _tmp21_);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_upload (self);
-#line 3385 "FacebookPublishing.c"
-}
-
-
-static void _publishing_facebook_facebook_publisher_on_web_auth_pane_login_succeeded_publishing_facebook_web_authentication_pane_login_succeeded (PublishingFacebookWebAuthenticationPane* _sender, const gchar* success_url, gpointer self) {
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_on_web_auth_pane_login_succeeded ((PublishingFacebookFacebookPublisher*) self, success_url);
-#line 3392 "FacebookPublishing.c"
+#line 3137 "FacebookPublishing.c"
 }
 
 
-static void _publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed_publishing_facebook_web_authentication_pane_login_failed (PublishingFacebookWebAuthenticationPane* _sender, gpointer self) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed ((PublishingFacebookFacebookPublisher*) self);
-#line 3399 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_do_hosted_web_authentication (PublishingFacebookFacebookPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	PublishingFacebookWebAuthenticationPane* _tmp1_ = NULL;
-	PublishingFacebookWebAuthenticationPane* _tmp2_ = NULL;
-	PublishingFacebookWebAuthenticationPane* _tmp3_ = NULL;
-	SpitPublishingPluginHost* _tmp4_ = NULL;
-	PublishingFacebookWebAuthenticationPane* _tmp5_ = NULL;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+static void publishing_facebook_facebook_publisher_on_authenticator_succeeded (PublishingFacebookFacebookPublisher* self) {
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:415: ACTION: doing hosted web authentication.");
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = publishing_facebook_web_authentication_pane_new ();
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (self->priv->web_auth_pane);
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->web_auth_pane = _tmp1_;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = self->priv->web_auth_pane;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp2_, "login-succeeded", (GCallback) _publishing_facebook_facebook_publisher_on_web_auth_pane_login_succeeded_publishing_facebook_web_authentication_pane_login_succeeded, self, 0);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = self->priv->web_auth_pane;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp3_, "login-failed", (GCallback) _publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed_publishing_facebook_web_authentication_pane_login_failed, self, 0);
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = self->priv->host;
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = self->priv->web_auth_pane;
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 3438 "FacebookPublishing.c"
-}
-
-
-static gint string_index_of (const gchar* self, const gchar* needle, gint start_index) {
-	gint result = 0;
-	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 3465 "FacebookPublishing.c"
-		gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 3473 "FacebookPublishing.c"
-	} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 3479 "FacebookPublishing.c"
-	}
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:382: EVENT: Authenticator login succeeded.");
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	publishing_facebook_facebook_publisher_do_authenticate_session (self);
+#line 3148 "FacebookPublishing.c"
 }
 
 
-static gchar* string_slice (const gchar* self, glong start, glong end) {
-	gchar* result = NULL;
-	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
-	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
-	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp2_ < ((glong) 0)) {
-#line 3513 "FacebookPublishing.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		start = _tmp3_ + _tmp4_;
-#line 3522 "FacebookPublishing.c"
-	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp5_ < ((glong) 0)) {
-#line 3528 "FacebookPublishing.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		end = _tmp6_ + _tmp7_;
-#line 3537 "FacebookPublishing.c"
-	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp9_ >= ((glong) 0)) {
-#line 3543 "FacebookPublishing.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 3552 "FacebookPublishing.c"
-	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = FALSE;
-#line 3556 "FacebookPublishing.c"
-	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp13_ >= ((glong) 0)) {
-#line 3564 "FacebookPublishing.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 3573 "FacebookPublishing.c"
-	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp12_ = FALSE;
-#line 3577 "FacebookPublishing.c"
-	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 3599 "FacebookPublishing.c"
+static void publishing_facebook_facebook_publisher_on_authenticator_failed (PublishingFacebookFacebookPublisher* self) {
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
+#line 3155 "FacebookPublishing.c"
 }
 
 
-static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
-	gint result = 0;
-	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (_tmp3_ != NULL) {
-#line 3624 "FacebookPublishing.c"
-		gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 3632 "FacebookPublishing.c"
-	} else {
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = -1;
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 3638 "FacebookPublishing.c"
-	}
+static gpointer _g_variant_ref0 (gpointer self) {
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	return self ? g_variant_ref (self) : NULL;
+#line 3162 "FacebookPublishing.c"
 }
 
 
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
-	gchar* result = NULL;
-	GError * _inner_error_ = NULL;
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (old != NULL, NULL);
-#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (replacement != NULL, NULL);
-#line 3652 "FacebookPublishing.c"
-	{
-		GRegex* regex = NULL;
-		const gchar* _tmp0_ = NULL;
-		gchar* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		GRegex* _tmp3_ = NULL;
-		GRegex* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GRegex* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp0_ = old;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp1_ = g_regex_escape_string (_tmp0_, -1);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp2_ = _tmp1_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp4_ = _tmp3_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp2_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		regex = _tmp4_;
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3683 "FacebookPublishing.c"
-				goto __catch4_g_regex_error;
-			}
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			return NULL;
-#line 3692 "FacebookPublishing.c"
-		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp6_ = regex;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp7_ = replacement;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = _tmp8_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3708 "FacebookPublishing.c"
-				goto __catch4_g_regex_error;
-			}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			g_clear_error (&_inner_error_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-			return NULL;
-#line 3719 "FacebookPublishing.c"
-		}
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp9_ = _tmp5_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_tmp5_ = NULL;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		result = _tmp9_;
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp5_);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_regex_unref0 (regex);
-#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return result;
-#line 3733 "FacebookPublishing.c"
-	}
-	goto __finally4;
-	__catch4_g_regex_error:
-	{
-		GError* e = NULL;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		e = _inner_error_;
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_inner_error_ = NULL;
-#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self) {
+	GHashTable* parameter = NULL;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	GHashTable* _tmp1_ = NULL;
+	GVariant* access_token = NULL;
+	gconstpointer _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+	GVariant* _tmp4_ = NULL;
+	PublishingFacebookGraphSession* _tmp5_ = NULL;
+	PublishingFacebookGraphSession* _tmp6_ = NULL;
+	const gchar* _tmp7_ = NULL;
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp1_ = spit_publishing_authenticator_get_authentication_parameter (_tmp0_);
+#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	parameter = _tmp1_;
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp3_ = g_hash_table_lookup_extended (parameter, "AccessToken", NULL, &_tmp2_);
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_variant_unref0 (access_token);
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp4_ = _g_variant_ref0 (_tmp2_);
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	access_token = _tmp4_;
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (!_tmp3_) {
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		g_critical ("FacebookPublishing.vala:394: Authenticator signalled success, but does" \
+" not provide access token");
+#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_assert_not_reached ();
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		_g_error_free0 (e);
-#line 3747 "FacebookPublishing.c"
+#line 3199 "FacebookPublishing.c"
 	}
-	__finally4:
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		g_clear_error (&_inner_error_);
-#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		return NULL;
-#line 3758 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_facebook_publisher_do_authenticate_session (PublishingFacebookFacebookPublisher* self, const gchar* good_login_uri) {
-	const gchar* _tmp0_ = NULL;
-	gchar* decoded_uri = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* access_token = NULL;
-	gint index = 0;
-	const gchar* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* trailing_params = NULL;
-	const gchar* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
-	gint _tmp18_ = 0;
-	const gchar* _tmp25_ = NULL;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	PublishingFacebookGraphSession* _tmp31_ = NULL;
-	PublishingFacebookGraphSession* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (good_login_uri != NULL);
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = good_login_uri;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:429: ACTION: preparing to extract session info" \
-"rmation encoded in uri = '%s'", _tmp0_);
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = good_login_uri;
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = soup_uri_decode (_tmp1_);
-#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	decoded_uri = _tmp2_;
-#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	access_token = NULL;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = decoded_uri;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = string_index_of (_tmp3_, "#access_token=", 0);
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	index = _tmp4_;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = index;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp5_ >= 0) {
-#line 3810 "FacebookPublishing.c"
-		const gchar* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
-		const gchar* _tmp8_ = NULL;
-		gint _tmp9_ = 0;
-		gint _tmp10_ = 0;
-		gchar* _tmp11_ = NULL;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = decoded_uri;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp7_ = index;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp8_ = decoded_uri;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp9_ = strlen (_tmp8_);
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp10_ = _tmp9_;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp11_ = string_slice (_tmp6_, (glong) _tmp7_, (glong) _tmp10_);
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (access_token);
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		access_token = _tmp11_;
-#line 3833 "FacebookPublishing.c"
-	}
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = access_token;
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp12_ == NULL) {
-#line 3839 "FacebookPublishing.c"
-		SpitPublishingPluginHost* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = self->priv->host;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp14_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "Server redirect URL contained no access token");
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp15_ = _tmp14_;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp13_, _tmp15_);
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_error_free0 (_tmp15_);
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (access_token);
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (decoded_uri);
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 3859 "FacebookPublishing.c"
-	}
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	trailing_params = NULL;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp16_ = access_token;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp17_ = string_index_of_char (_tmp16_, (gunichar) '&', 0);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	index = _tmp17_;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp18_ = index;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp18_ >= 0) {
-#line 3873 "FacebookPublishing.c"
-		const gchar* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		const gchar* _tmp21_ = NULL;
-		gint _tmp22_ = 0;
-		gint _tmp23_ = 0;
-		gchar* _tmp24_ = NULL;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp19_ = access_token;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp20_ = index;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp21_ = access_token;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp22_ = strlen (_tmp21_);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp23_ = _tmp22_;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp24_ = string_slice (_tmp19_, (glong) _tmp20_, (glong) _tmp23_);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (trailing_params);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		trailing_params = _tmp24_;
-#line 3896 "FacebookPublishing.c"
-	}
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp25_ = trailing_params;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp25_ != NULL) {
-#line 3902 "FacebookPublishing.c"
-		const gchar* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
-		gchar* _tmp28_ = NULL;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp26_ = access_token;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp27_ = trailing_params;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp28_ = string_replace (_tmp26_, _tmp27_, "");
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (access_token);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		access_token = _tmp28_;
-#line 3916 "FacebookPublishing.c"
-	}
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp29_ = access_token;
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp30_ = string_replace (_tmp29_, "#access_token=", "");
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (access_token);
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	access_token = _tmp30_;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp31_ = self->priv->graph_session;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp31_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0);
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp32_ = self->priv->graph_session;
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp33_ = access_token;
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_graph_session_authenticate (_tmp32_, _tmp33_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (trailing_params);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (access_token);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (decoded_uri);
-#line 3942 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_do_save_session_information (PublishingFacebookFacebookPublisher* self) {
-	PublishingFacebookGraphSession* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:463: ACTION: saving session information to con" \
-"figuration system.");
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = self->priv->graph_session;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = publishing_facebook_graph_session_get_access_token (_tmp0_);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_set_persistent_access_token (self, _tmp2_);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp2_);
-#line 3964 "FacebookPublishing.c"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp5_ = self->priv->graph_session;
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp5_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self, 0);
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp6_ = self->priv->graph_session;
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp7_ = g_variant_get_string (access_token, NULL);
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	publishing_facebook_graph_session_authenticate (_tmp6_, _tmp7_);
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_variant_unref0 (access_token);
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_hash_table_unref0 (parameter);
+#line 3215 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete (PublishingFacebookUploader* _sender, gint num_photos_published, gpointer self) {
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_complete ((PublishingFacebookFacebookPublisher*) self, _sender, num_photos_published);
-#line 3971 "FacebookPublishing.c"
+#line 3222 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error (PublishingFacebookUploader* _sender, GError* err, gpointer self) {
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_error ((PublishingFacebookFacebookPublisher*) self, _sender, err);
-#line 3978 "FacebookPublishing.c"
+#line 3229 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_upload_status_updated ((PublishingFacebookFacebookPublisher*) self, file_number, fraction_complete);
-#line 3985 "FacebookPublishing.c"
+#line 3236 "FacebookPublishing.c"
 }
 
 
@@ -4031,326 +3271,165 @@ static void publishing_facebook_facebook_publisher_do_upload (PublishingFacebook
 	PublishingFacebookUploader* _tmp24_ = NULL;
 	PublishingFacebookUploader* _tmp25_ = NULL;
 	PublishingFacebookUploader* _tmp26_ = NULL;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->publishing_params;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_->target_album;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_ == PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
-#line 4026 "FacebookPublishing.c"
+#line 3277 "FacebookPublishing.c"
 		gchar* _tmp3_ = NULL;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = g_strdup ("(none)");
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp0_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp3_;
-#line 4034 "FacebookPublishing.c"
+#line 3285 "FacebookPublishing.c"
 	} else {
 		PublishingFacebookPublishingParameters* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = self->priv->publishing_params;
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = publishing_facebook_publishing_parameters_get_target_album_name (_tmp4_);
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp0_);
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _tmp5_;
-#line 4046 "FacebookPublishing.c"
+#line 3297 "FacebookPublishing.c"
 	}
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:469: ACTION: uploading photos to album '%s'", _tmp0_);
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:402: ACTION: uploading photos to album '%s'", _tmp0_);
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = self->priv->host;
-#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp6_, TRUE);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = self->priv->host;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->publishing_params;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = _tmp8_->resolution;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = publishing_facebook_resolution_get_pixels (_tmp9_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = self->priv->publishing_params;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = _tmp11_->strip_metadata;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = spit_publishing_plugin_host_serialize_publishables (_tmp7_, _tmp10_, _tmp12_, &_tmp13_, &_tmp14_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter = _tmp15_;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target = _tmp13_;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp14_;
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp16_) {
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp0_);
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4090 "FacebookPublishing.c"
+#line 3341 "FacebookPublishing.c"
 	}
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp17_ = self->priv->host;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = spit_publishing_plugin_host_get_publishables (_tmp17_, &_tmp18_);
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishables = _tmp19_;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishables_length1 = _tmp18_;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = self->priv->graph_session;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = self->priv->publishing_params;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = publishables;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22__length1 = publishables_length1;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = publishing_facebook_uploader_new (_tmp20_, _tmp21_, _tmp22_, _tmp22__length1);
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_uploader_unref0 (self->priv->uploader);
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->uploader = _tmp23_;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = self->priv->uploader;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (_tmp24_, "upload-complete", (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self, 0);
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = self->priv->uploader;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (_tmp25_, "upload-error", (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self, 0);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = self->priv->uploader;
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_upload (_tmp26_, _publishing_facebook_facebook_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp0_);
-#line 4132 "FacebookPublishing.c"
+#line 3383 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_do_show_success_pane (PublishingFacebookFacebookPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:495: ACTION: showing success pane.");
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:428: ACTION: showing success pane.");
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 4151 "FacebookPublishing.c"
+#line 3402 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_on_generic_error (PublishingFacebookFacebookPublisher* self, GError* _error_) {
 	GError* _tmp0_ = NULL;
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = _error_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_error_matches (_tmp0_, SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION)) {
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_facebook_publisher_do_logout (self);
-#line 4165 "FacebookPublishing.c"
+#line 3416 "FacebookPublishing.c"
 	} else {
 		SpitPublishingPluginHost* _tmp1_ = NULL;
 		GError* _tmp2_ = NULL;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->host;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = _error_;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp1_, _tmp2_);
-#line 4175 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_facebook_publisher_on_login_clicked (PublishingFacebookFacebookPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp0_) {
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 4190 "FacebookPublishing.c"
-	}
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:512: EVENT: user clicked 'Login' on welcome pa" \
-"ne.");
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_do_test_connection_to_endpoint (self);
-#line 4196 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_on_endpoint_test_completed (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_endpoint_test_completed_publishing_facebook_graph_message_completed, self);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_endpoint_test_error_publishing_facebook_graph_message_failed, self);
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
-#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 4228 "FacebookPublishing.c"
-	}
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:524: EVENT: endpoint test transaction detected" \
-" that the Facebook endpoint is alive.");
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_do_hosted_web_authentication (self);
-#line 4234 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_on_endpoint_test_error (PublishingFacebookFacebookPublisher* self, PublishingFacebookGraphMessage* message, GError* _error_) {
-	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	GError* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GError* _tmp9_ = NULL;
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = message;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_endpoint_test_completed_publishing_facebook_graph_message_completed, self);
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = message;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_endpoint_test_error_publishing_facebook_graph_message_failed, self);
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp4_) {
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 4271 "FacebookPublishing.c"
-	}
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = _error_;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = _tmp5_->message;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = g_strconcat ("EVENT: endpoint test transaction failed to detect a connection to the " \
-"Facebook " "endpoint", _tmp6_, NULL);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:537: %s", _tmp8_);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp8_);
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = _error_;
-#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp9_);
-#line 4289 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_on_web_auth_pane_login_succeeded (PublishingFacebookFacebookPublisher* self, const gchar* success_url) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (success_url != NULL);
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!_tmp0_) {
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 4306 "FacebookPublishing.c"
+#line 3426 "FacebookPublishing.c"
 	}
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:547: EVENT: hosted web login succeeded.");
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = success_url;
-#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_do_authenticate_session (self, _tmp1_);
-#line 4314 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_facebook_publisher_on_web_auth_pane_login_failed (PublishingFacebookFacebookPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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/FacebookPublishing.vala"
-	if (!_tmp0_) {
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 4328 "FacebookPublishing.c"
-	}
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:558: EVENT: hosted web login failed.");
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_do_show_service_welcome_pane (self);
-#line 4334 "FacebookPublishing.c"
 }
 
 
@@ -4360,36 +3439,34 @@ static void publishing_facebook_facebook_publisher_on_session_authenticated (Pub
 	gboolean _tmp2_ = FALSE;
 	PublishingFacebookGraphSession* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->graph_session;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("authenticated", PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, &_tmp1_, NULL, FALSE);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_session_authenticated_publishing_facebook_graph_session_authenticated, self);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp2_) {
-#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4358 "FacebookPublishing.c"
+#line 3451 "FacebookPublishing.c"
 	}
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->graph_session;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishing_facebook_graph_session_is_authenticated (_tmp3_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp4_, "graph_session.is_authenticated()");
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:576: EVENT: an authenticated session has becom" \
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:476: EVENT: an authenticated session has becom" \
 "e available.");
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_facebook_publisher_do_save_session_information (self);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_fetch_user_info (self);
-#line 4372 "FacebookPublishing.c"
+#line 3463 "FacebookPublishing.c"
 }
 
 
@@ -4405,52 +3482,52 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_completed
 	PublishingFacebookGraphMessage* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4410 "FacebookPublishing.c"
+#line 3501 "FacebookPublishing.c"
 	}
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = message;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_graph_message_get_response_body (_tmp5_);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:589: EVENT: user info fetch completed; respons" \
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:488: EVENT: user info fetch completed; respons" \
 "e = '%s'.", _tmp7_);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = message;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishing_facebook_graph_message_get_response_body (_tmp8_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_extract_user_info_from_json (self, _tmp10_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp10_);
-#line 4432 "FacebookPublishing.c"
+#line 3523 "FacebookPublishing.c"
 }
 
 
@@ -4461,38 +3538,38 @@ static void publishing_facebook_facebook_publisher_on_fetch_user_info_error (Pub
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	GError* _tmp5_ = NULL;
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_completed_publishing_facebook_graph_message_completed, self);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_user_info_error_publishing_facebook_graph_message_failed, self);
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4465 "FacebookPublishing.c"
+#line 3556 "FacebookPublishing.c"
 	}
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:602: EVENT: fetching user info generated and e" \
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:501: EVENT: fetching user info generated and e" \
 "rror.");
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _error_;
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 4473 "FacebookPublishing.c"
+#line 3564 "FacebookPublishing.c"
 }
 
 
@@ -4500,26 +3577,26 @@ static void publishing_facebook_facebook_publisher_on_user_info_extracted (Publi
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp0_) {
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4489 "FacebookPublishing.c"
+#line 3580 "FacebookPublishing.c"
 	}
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->uid;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->username;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:611: EVENT: user info extracted from JSON resp" \
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:510: EVENT: user info extracted from JSON resp" \
 "onse: uid = %s; name = %s.", _tmp1_, _tmp2_);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_fetch_album_descriptions (self);
-#line 4499 "FacebookPublishing.c"
+#line 3590 "FacebookPublishing.c"
 }
 
 
@@ -4535,52 +3612,52 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_completed (Pu
 	PublishingFacebookGraphMessage* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4537 "FacebookPublishing.c"
+#line 3628 "FacebookPublishing.c"
 	}
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = message;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_graph_message_get_response_body (_tmp5_);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:623: EVENT: album descriptions fetch transacti" \
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:522: EVENT: album descriptions fetch transacti" \
 "on completed; response = '%s'.", _tmp7_);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = message;
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishing_facebook_graph_message_get_response_body (_tmp8_);
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_extract_albums_from_json (self, _tmp10_);
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp10_);
-#line 4559 "FacebookPublishing.c"
+#line 3650 "FacebookPublishing.c"
 }
 
 
@@ -4591,38 +3668,38 @@ static void publishing_facebook_facebook_publisher_on_fetch_albums_error (Publis
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	GError* _tmp5_ = NULL;
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_completed_publishing_facebook_graph_message_completed, self);
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_fetch_albums_error_publishing_facebook_graph_message_failed, self);
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4592 "FacebookPublishing.c"
+#line 3683 "FacebookPublishing.c"
 	}
-#line 637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:637: EVENT: album description fetch attempt ge" \
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:536: EVENT: album description fetch attempt ge" \
 "nerated an error.");
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = err;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 4600 "FacebookPublishing.c"
+#line 3691 "FacebookPublishing.c"
 }
 
 
@@ -4631,28 +3708,28 @@ static void publishing_facebook_facebook_publisher_on_albums_extracted (Publishi
 	PublishingFacebookPublishingParameters* _tmp1_ = NULL;
 	PublishingFacebookAlbum** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp0_) {
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4617 "FacebookPublishing.c"
+#line 3708 "FacebookPublishing.c"
 	}
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->publishing_params;
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_->albums;
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__length1 = _tmp1_->albums_length1;
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:646: EVENT: successfully extracted %d albums f" \
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:545: EVENT: successfully extracted %d albums f" \
 "rom JSON response", _tmp2__length1);
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_show_publishing_options_pane (self);
-#line 4629 "FacebookPublishing.c"
+#line 3720 "FacebookPublishing.c"
 }
 
 
@@ -4662,34 +3739,34 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_lo
 	PublishingFacebookPublishingOptionsPane* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self);
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4659 "FacebookPublishing.c"
+#line 3750 "FacebookPublishing.c"
 	}
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:659: EVENT: user clicked 'Logout' in publishin" \
+#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:558: EVENT: user clicked 'Logout' in publishin" \
 "g options pane.");
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_logout (self);
-#line 4665 "FacebookPublishing.c"
+#line 3756 "FacebookPublishing.c"
 }
 
 
@@ -4709,109 +3786,109 @@ static void publishing_facebook_facebook_publisher_on_publishing_options_pane_pu
 	const gchar* _tmp12_ = NULL;
 	gchar* _tmp13_ = NULL;
 	const gchar* _tmp14_ = NULL;
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (privacy_setting != NULL);
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_publish_publishing_facebook_publishing_options_pane_publish, self);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_publishing_options_pane_logout_publishing_facebook_publishing_options_pane_logout, self);
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4707 "FacebookPublishing.c"
+#line 3798 "FacebookPublishing.c"
 	}
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:672: EVENT: user clicked 'Publish' in publishi" \
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:571: EVENT: user clicked 'Publish' in publishi" \
 "ng options pane.");
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = self->priv->publishing_params;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = strip_metadata;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_->strip_metadata = _tmp6_;
-#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = strip_metadata;
-#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_set_persistent_strip_metadata (self, _tmp7_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->publishing_params;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = resolution;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_->resolution = _tmp9_;
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = resolution;
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_set_persistent_default_size (self, (gint) _tmp10_);
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = self->priv->publishing_params;
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = privacy_setting;
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = g_strdup (_tmp12_);
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp11_->privacy_object);
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_->privacy_object = _tmp13_;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = target_album;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp14_ != NULL) {
-#line 4745 "FacebookPublishing.c"
+#line 3836 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		PublishingFacebookPublishingParameters* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = self->priv->publishing_params;
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = target_album;
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_parameters_set_target_album_by_name (_tmp15_, _tmp16_);
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = self->priv->publishing_params;
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = _tmp17_->target_album;
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 583 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp18_ != PUBLISHING_FACEBOOK_PUBLISHING_PARAMETERS_UNKNOWN_ALBUM) {
-#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			publishing_facebook_facebook_publisher_do_upload (self);
-#line 4764 "FacebookPublishing.c"
+#line 3855 "FacebookPublishing.c"
 		} else {
 			PublishingFacebookPublishingParameters* _tmp19_ = NULL;
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp19_ = self->priv->publishing_params;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp20_ = target_album;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp21_ = g_strdup (_tmp20_);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp19_->new_album_name);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp19_->new_album_name = _tmp21_;
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			publishing_facebook_facebook_publisher_do_create_new_album (self);
-#line 4781 "FacebookPublishing.c"
+#line 3872 "FacebookPublishing.c"
 		}
 	} else {
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_facebook_publisher_do_upload (self);
-#line 4786 "FacebookPublishing.c"
+#line 3877 "FacebookPublishing.c"
 	}
 }
 
@@ -4832,62 +3909,62 @@ static void publishing_facebook_facebook_publisher_on_create_album_completed (Pu
 	PublishingFacebookGraphMessage* _tmp12_ = NULL;
 	gchar* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = self->priv->publishing_params;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_->new_album_name;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp5_ != NULL, "publishing_params.new_album_name != null");
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp6_) {
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4835 "FacebookPublishing.c"
+#line 3926 "FacebookPublishing.c"
 	}
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = message;
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = publishing_facebook_graph_message_get_response_body (_tmp7_);
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:705: EVENT: created new album resource on remo" \
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:604: EVENT: created new album resource on remo" \
 "te host; response body = %s.\n", _tmp9_);
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = self->priv->publishing_params;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = _tmp10_->new_album_name;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = message;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = publishing_facebook_graph_message_get_response_body (_tmp12_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_add_new_local_album_from_json (self, _tmp11_, _tmp14_);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp14_);
-#line 4861 "FacebookPublishing.c"
+#line 3952 "FacebookPublishing.c"
 }
 
 
@@ -4898,38 +3975,38 @@ static void publishing_facebook_facebook_publisher_on_create_album_error (Publis
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	GError* _tmp5_ = NULL;
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_completed_publishing_facebook_graph_message_completed, self);
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_create_album_error_publishing_facebook_graph_message_failed, self);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4894 "FacebookPublishing.c"
+#line 3985 "FacebookPublishing.c"
 	}
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:719: EVENT: attempt to create new album genera" \
+#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:618: EVENT: attempt to create new album genera" \
 "ted an error.");
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = err;
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_on_generic_error (self, _tmp5_);
-#line 4902 "FacebookPublishing.c"
+#line 3993 "FacebookPublishing.c"
 }
 
 
@@ -4942,38 +4019,38 @@ static void publishing_facebook_facebook_publisher_on_upload_status_updated (Pub
 	void* _tmp3__target = NULL;
 	gint _tmp4_ = 0;
 	gdouble _tmp5_ = 0.0;
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp0_) {
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4923 "FacebookPublishing.c"
+#line 4014 "FacebookPublishing.c"
 	}
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = completed_fraction;
-#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:728: EVENT: uploader reports upload %.2f perce" \
+#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:627: EVENT: uploader reports upload %.2f perce" \
 "nt complete.", 100.0 * _tmp1_);
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->progress_reporter;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__target = self->priv->progress_reporter_target;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3__target = self->priv->progress_reporter_target;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = file_number;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = completed_fraction;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 4945 "FacebookPublishing.c"
+#line 4036 "FacebookPublishing.c"
 }
 
 
@@ -4984,38 +4061,38 @@ static void publishing_facebook_facebook_publisher_on_upload_complete (Publishin
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	gint _tmp5_ = 0;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (uploader));
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = uploader;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self);
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = uploader;
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self);
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 4978 "FacebookPublishing.c"
+#line 4069 "FacebookPublishing.c"
 	}
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = num_published;
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:742: EVENT: uploader reports upload complete; " \
+#line 641 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:641: EVENT: uploader reports upload complete; " \
 "%d items published.", _tmp5_);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_do_show_success_pane (self);
-#line 4986 "FacebookPublishing.c"
+#line 4077 "FacebookPublishing.c"
 }
 
 
@@ -5029,44 +4106,44 @@ static void publishing_facebook_facebook_publisher_on_upload_error (PublishingFa
 	const gchar* _tmp6_ = NULL;
 	SpitPublishingPluginHost* _tmp7_ = NULL;
 	GError* _tmp8_ = NULL;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self));
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (uploader));
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = uploader;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_complete_publishing_facebook_uploader_upload_complete, self);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = uploader;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_facebook_publisher_on_upload_error_publishing_facebook_uploader_upload_error, self);
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp4_) {
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 5022 "FacebookPublishing.c"
+#line 4113 "FacebookPublishing.c"
 	}
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = err;
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_->message;
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:754: EVENT: uploader reports upload error = '%" \
+#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:653: EVENT: uploader reports upload error = '%" \
 "s'.", _tmp6_);
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = self->priv->host;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = err;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 5036 "FacebookPublishing.c"
+#line 4127 "FacebookPublishing.c"
 }
 
 
@@ -5075,47 +4152,61 @@ static SpitPublishingService* publishing_facebook_facebook_publisher_real_get_se
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingService* _tmp1_ = NULL;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->service;
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5055 "FacebookPublishing.c"
+#line 4146 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_facebook_publisher_get_service_name (PublishingFacebookFacebookPublisher* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 662 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), NULL);
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = g_strdup (PUBLISHING_FACEBOOK_SERVICE_NAME);
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp0_;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 663 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5070 "FacebookPublishing.c"
+#line 4161 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_facebook_publisher_get_user_visible_name (PublishingFacebookFacebookPublisher* self) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (self), NULL);
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = g_strdup (PUBLISHING_FACEBOOK_USER_VISIBLE_NAME);
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp0_;
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5085 "FacebookPublishing.c"
+#line 4176 "FacebookPublishing.c"
+}
+
+
+static void _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated (SpitPublishingAuthenticator* _sender, gpointer self) {
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	publishing_facebook_facebook_publisher_on_authenticator_succeeded ((PublishingFacebookFacebookPublisher*) self);
+#line 4183 "FacebookPublishing.c"
+}
+
+
+static void _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed (SpitPublishingAuthenticator* _sender, gpointer self) {
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	publishing_facebook_facebook_publisher_on_authenticator_failed ((PublishingFacebookFacebookPublisher*) self);
+#line 4190 "FacebookPublishing.c"
 }
 
 
@@ -5123,97 +4214,69 @@ static void publishing_facebook_facebook_publisher_real_start (SpitPublishingPub
 	PublishingFacebookFacebookPublisher * self;
 	gboolean _tmp0_ = FALSE;
 	PublishingFacebookPublishingParameters* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	SpitPublishingAuthenticator* _tmp2_ = NULL;
+	SpitPublishingAuthenticator* _tmp3_ = NULL;
+	SpitPublishingAuthenticator* _tmp4_ = NULL;
+#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 5102 "FacebookPublishing.c"
+#line 4209 "FacebookPublishing.c"
 	}
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:775: FacebookPublisher: starting interaction.");
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:674: FacebookPublisher: starting interaction.");
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->running = TRUE;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = publishing_facebook_publishing_parameters_new ();
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishing_params = _tmp1_;
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = publishing_facebook_facebook_publisher_is_persistent_session_valid (self);
-#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp2_) {
-#line 5118 "FacebookPublishing.c"
-		PublishingFacebookGraphSession* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp3_ = self->priv->graph_session;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp4_ = publishing_facebook_facebook_publisher_get_persistent_access_token (self);
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp5_ = _tmp4_;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_graph_session_authenticate (_tmp3_, _tmp5_);
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (_tmp5_);
-#line 5132 "FacebookPublishing.c"
-	} else {
-		gboolean _tmp6_ = FALSE;
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp6_ = publishing_facebook_web_authentication_pane_is_cache_dirty ();
-#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		if (_tmp6_) {
-#line 5139 "FacebookPublishing.c"
-			SpitPublishingPluginHost* _tmp7_ = NULL;
-			SpitPublishingPluginHost* _tmp8_ = NULL;
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp7_ = self->priv->host;
-#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			spit_publishing_plugin_host_set_service_locked (_tmp7_, FALSE);
-#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp8_ = self->priv->host;
-#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			spit_publishing_plugin_host_install_static_message_pane (_tmp8_, PUBLISHING_FACEBOOK_RESTART_ERROR_MESSAGE, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 5150 "FacebookPublishing.c"
-		} else {
-#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			publishing_facebook_facebook_publisher_do_show_service_welcome_pane (self);
-#line 5154 "FacebookPublishing.c"
-		}
-	}
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp2_ = self->priv->authenticator;
+#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp2_, "authenticated", (GCallback) _publishing_facebook_facebook_publisher_on_authenticator_succeeded_spit_publishing_authenticator_authenticated, self, 0);
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp3_ = self->priv->authenticator;
+#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp3_, "authentication-failed", (GCallback) _publishing_facebook_facebook_publisher_on_authenticator_failed_spit_publishing_authenticator_authentication_failed, self, 0);
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp4_ = self->priv->authenticator;
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	spit_publishing_authenticator_authenticate (_tmp4_);
+#line 4233 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_real_stop (SpitPublishingPublisher* base) {
 	PublishingFacebookFacebookPublisher * self;
 	PublishingFacebookGraphSession* _tmp0_ = NULL;
-#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:800: FacebookPublisher: stop( ) invoked.");
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:688: FacebookPublisher: stop( ) invoked.");
+#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->graph_session;
-#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 5171 "FacebookPublishing.c"
+#line 4248 "FacebookPublishing.c"
 		PublishingFacebookGraphSession* _tmp1_ = NULL;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->graph_session;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_stop_transactions (_tmp1_);
-#line 5177 "FacebookPublishing.c"
+#line 4254 "FacebookPublishing.c"
 	}
-#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->host = NULL;
-#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->running = FALSE;
-#line 5183 "FacebookPublishing.c"
+#line 4260 "FacebookPublishing.c"
 }
 
 
@@ -5221,98 +4284,98 @@ static gboolean publishing_facebook_facebook_publisher_real_is_running (SpitPubl
 	PublishingFacebookFacebookPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp0_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 5199 "FacebookPublishing.c"
+#line 4276 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_class_init (PublishingFacebookFacebookPublisherClass * klass) {
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookFacebookPublisherPrivate));
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_facebook_publisher_finalize;
-#line 5210 "FacebookPublishing.c"
+#line 4287 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_spit_publishing_publisher_parent_iface = g_type_interface_peek_parent (iface);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_get_service;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_start;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_stop;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_facebook_facebook_publisher_real_is_running;
-#line 5225 "FacebookPublishing.c"
+#line 4302 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_instance_init (PublishingFacebookFacebookPublisher * self) {
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_FACEBOOK_PUBLISHER_GET_PRIVATE (self);
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->host = NULL;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->web_auth_pane = NULL;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->service = NULL;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->authenticator = NULL;
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->running = FALSE;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishing_options_pane = NULL;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->uploader = NULL;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->uid = NULL;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->username = NULL;
-#line 5250 "FacebookPublishing.c"
+#line 4327 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_facebook_publisher_finalize (GObject* obj) {
 	PublishingFacebookFacebookPublisher * self;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_FACEBOOK_PUBLISHER, PublishingFacebookFacebookPublisher);
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (self->priv->web_auth_pane);
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_session_unref0 (self->priv->graph_session);
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_uploader_unref0 (self->priv->uploader);
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->uid);
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (publishing_facebook_facebook_publisher_parent_class)->finalize (obj);
-#line 5282 "FacebookPublishing.c"
+#line 4359 "FacebookPublishing.c"
 }
 
 
@@ -5330,1162 +4393,63 @@ GType publishing_facebook_facebook_publisher_get_type (void) {
 }
 
 
-PublishingFacebookWebAuthenticationPane* publishing_facebook_web_authentication_pane_construct (GType object_type) {
-	PublishingFacebookWebAuthenticationPane * self = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_web_authentication_pane_get_login_url ();
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = _tmp0_;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self = (PublishingFacebookWebAuthenticationPane*) g_object_new (object_type, "login-uri", _tmp1_, NULL);
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp1_);
-#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return self;
-#line 5314 "FacebookPublishing.c"
-}
-
-
-PublishingFacebookWebAuthenticationPane* publishing_facebook_web_authentication_pane_new (void) {
-#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return publishing_facebook_web_authentication_pane_construct (PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE);
-#line 5321 "FacebookPublishing.c"
-}
-
-
-static gpointer _publishing_facebook_web_authentication_pane_locale_lookup_ref0 (gpointer self) {
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return self ? publishing_facebook_web_authentication_pane_locale_lookup_ref (self) : NULL;
-#line 5328 "FacebookPublishing.c"
-}
-
-
-static gboolean string_contains (const gchar* self, const gchar* needle) {
-	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, FALSE);
-#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (needle != NULL, FALSE);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = needle;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_);
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp1_ != NULL;
-#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 5348 "FacebookPublishing.c"
-}
-
-
-static gchar* publishing_facebook_web_authentication_pane_get_system_locale_as_facebook_locale (void) {
-	gchar* result = NULL;
-	const gchar* raw_system_locale = NULL;
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
-	gchar* system_locale = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	const gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	gchar* _tmp43_ = NULL;
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = setlocale (LC_ALL, "");
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	raw_system_locale = _tmp0_;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = raw_system_locale;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp2_ == NULL) {
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp1_ = TRUE;
-#line 5380 "FacebookPublishing.c"
-	} else {
-		const gchar* _tmp3_ = NULL;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp3_ = raw_system_locale;
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp1_ = g_strcmp0 (_tmp3_, "") == 0;
-#line 5387 "FacebookPublishing.c"
-	}
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp1_) {
-#line 5391 "FacebookPublishing.c"
-		gchar* _tmp4_ = NULL;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp4_ = g_strdup ("www");
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		result = _tmp4_;
-#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return result;
-#line 5399 "FacebookPublishing.c"
-	}
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = raw_system_locale;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = _tmp6_ = g_strsplit (_tmp5_, ".", 0);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8__length1 = _vala_array_length (_tmp6_);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = _tmp8_[0];
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = g_strdup (_tmp9_);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = _tmp10_;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = (_vala_array_free (_tmp8_, _tmp8__length1, (GDestroyNotify) g_free), NULL);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	system_locale = _tmp11_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = publishing_facebook_web_authentication_pane_locale_lookup_table;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12__length1 = publishing_facebook_web_authentication_pane_locale_lookup_table_length1;
-#line 5423 "FacebookPublishing.c"
-	{
-		PublishingFacebookWebAuthenticationPaneLocaleLookup** locale_lookup_collection = NULL;
-		gint locale_lookup_collection_length1 = 0;
-		gint _locale_lookup_collection_size_ = 0;
-		gint locale_lookup_it = 0;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		locale_lookup_collection = _tmp12_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		locale_lookup_collection_length1 = _tmp12__length1;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		for (locale_lookup_it = 0; locale_lookup_it < _tmp12__length1; locale_lookup_it = locale_lookup_it + 1) {
-#line 5435 "FacebookPublishing.c"
-			PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp13_ = NULL;
-			PublishingFacebookWebAuthenticationPaneLocaleLookup* locale_lookup = NULL;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			_tmp13_ = _publishing_facebook_web_authentication_pane_locale_lookup_ref0 (locale_lookup_collection[locale_lookup_it]);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			locale_lookup = _tmp13_;
-#line 5442 "FacebookPublishing.c"
-			{
-				const gchar* _tmp14_ = NULL;
-				PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp15_ = NULL;
-				const gchar* _tmp16_ = NULL;
-				gboolean _tmp17_ = FALSE;
-				PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp18_ = NULL;
-				const gchar* _tmp19_ = NULL;
-				PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp29_ = NULL;
-				const gchar* _tmp30_ = NULL;
-				PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp40_ = NULL;
-				const gchar* _tmp41_ = NULL;
-				gchar* _tmp42_ = NULL;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp14_ = system_locale;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp15_ = locale_lookup;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp16_ = _tmp15_->prefix;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp17_ = g_str_has_prefix (_tmp14_, _tmp16_);
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				if (!_tmp17_) {
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_publishing_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					continue;
-#line 5469 "FacebookPublishing.c"
-				}
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp18_ = locale_lookup;
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp19_ = _tmp18_->exception_code;
-#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				if (_tmp19_ != NULL) {
-#line 5477 "FacebookPublishing.c"
-					PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp20_ = NULL;
-					const gchar* _tmp21_ = NULL;
-					const gchar* _tmp22_ = NULL;
-					PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-					gboolean _tmp25_ = FALSE;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp20_ = locale_lookup;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp21_ = _tmp20_->exception_translation;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_vala_assert (_tmp21_ != NULL, "locale_lookup.exception_translation != null");
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp22_ = system_locale;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp23_ = locale_lookup;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp24_ = _tmp23_->exception_code;
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp25_ = string_contains (_tmp22_, _tmp24_);
-#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					if (_tmp25_) {
-#line 5500 "FacebookPublishing.c"
-						PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp26_ = NULL;
-						const gchar* _tmp27_ = NULL;
-						gchar* _tmp28_ = NULL;
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp26_ = locale_lookup;
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp27_ = _tmp26_->exception_translation;
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp28_ = g_strdup (_tmp27_);
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						result = _tmp28_;
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_publishing_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_g_free0 (system_locale);
-#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						return result;
-#line 5518 "FacebookPublishing.c"
-					}
-				}
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp29_ = locale_lookup;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp30_ = _tmp29_->exception_code_2;
-#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				if (_tmp30_ != NULL) {
-#line 5527 "FacebookPublishing.c"
-					PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp31_ = NULL;
-					const gchar* _tmp32_ = NULL;
-					const gchar* _tmp33_ = NULL;
-					PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp34_ = NULL;
-					const gchar* _tmp35_ = NULL;
-					gboolean _tmp36_ = FALSE;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp31_ = locale_lookup;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp32_ = _tmp31_->exception_translation_2;
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_vala_assert (_tmp32_ != NULL, "locale_lookup.exception_translation_2 != null");
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp33_ = system_locale;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp34_ = locale_lookup;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp35_ = _tmp34_->exception_code_2;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					_tmp36_ = string_contains (_tmp33_, _tmp35_);
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-					if (_tmp36_) {
-#line 5550 "FacebookPublishing.c"
-						PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp37_ = NULL;
-						const gchar* _tmp38_ = NULL;
-						gchar* _tmp39_ = NULL;
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp37_ = locale_lookup;
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp38_ = _tmp37_->exception_translation_2;
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_tmp39_ = g_strdup (_tmp38_);
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						result = _tmp39_;
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_publishing_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						_g_free0 (system_locale);
-#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-						return result;
-#line 5568 "FacebookPublishing.c"
-					}
-				}
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp40_ = locale_lookup;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp41_ = _tmp40_->translation;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_tmp42_ = g_strdup (_tmp41_);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				result = _tmp42_;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_publishing_facebook_web_authentication_pane_locale_lookup_unref0 (locale_lookup);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				_g_free0 (system_locale);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				return result;
-#line 5585 "FacebookPublishing.c"
-			}
-		}
-	}
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp43_ = g_strdup ("www");
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp43_;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (system_locale);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 5597 "FacebookPublishing.c"
-}
-
-
-static gchar* publishing_facebook_web_authentication_pane_get_login_url (void) {
-	gchar* result = NULL;
-	gchar* facebook_locale = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_web_authentication_pane_get_system_locale_as_facebook_locale ();
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	facebook_locale = _tmp0_;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = g_strdup_printf ("https://%s.facebook.com/dialog/oauth?client_id=%s&redirect_uri=https:/" \
-"/www.facebook.com/connect/login_success.html&display=popup&scope=publi" \
-"sh_actions,user_photos,user_videos&response_type=token", facebook_locale, PUBLISHING_FACEBOOK_APPLICATION_ID);
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp1_;
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (facebook_locale);
-#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 5618 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_real_on_page_load (ShotwellPluginsCommonWebAuthenticationPane* base) {
-	PublishingFacebookWebAuthenticationPane * self;
-	gchar* loaded_url = NULL;
-	WebKitWebView* _tmp0_ = NULL;
-	WebKitWebView* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	gboolean _tmp10_ = FALSE;
-	const gchar* _tmp22_ = NULL;
-	gboolean _tmp23_ = FALSE;
-	const gchar* _tmp28_ = NULL;
-	gboolean _tmp29_ = FALSE;
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPane);
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = _tmp0_;
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = webkit_web_view_get_uri (_tmp1_);
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = g_strdup (_tmp3_);
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_object_unref0 (_tmp1_);
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	loaded_url = _tmp5_;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = loaded_url;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = g_strconcat ("loaded url: ", _tmp6_, NULL);
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:933: %s", _tmp8_);
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (_tmp8_);
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = loaded_url;
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = string_contains (_tmp9_, "?");
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp10_) {
-#line 5674 "FacebookPublishing.c"
-		gint index = 0;
-		const gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
-		gchar* params = NULL;
-		const gchar* _tmp13_ = NULL;
-		gint _tmp14_ = 0;
-		const gchar* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		gint _tmp17_ = 0;
-		gchar* _tmp18_ = NULL;
-		const gchar* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp11_ = loaded_url;
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp12_ = string_index_of_char (_tmp11_, (gunichar) '?', 0);
-#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		index = _tmp12_;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp13_ = loaded_url;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp14_ = index;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp15_ = loaded_url;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp16_ = strlen (_tmp15_);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp17_ = _tmp16_;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp18_ = string_slice (_tmp13_, (glong) _tmp14_, (glong) _tmp17_);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		params = _tmp18_;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp19_ = loaded_url;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp20_ = params;
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp21_ = string_replace (_tmp19_, _tmp20_, "");
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (loaded_url);
-#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		loaded_url = _tmp21_;
-#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (params);
-#line 5720 "FacebookPublishing.c"
-	}
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp22_ = loaded_url;
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp23_ = string_contains (_tmp22_, "login_success");
-#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp23_) {
-#line 5728 "FacebookPublishing.c"
-		WebKitWebView* _tmp24_ = NULL;
-		WebKitWebView* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		const gchar* _tmp27_ = NULL;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_web_authentication_pane_cache_dirty = TRUE;
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp24_ = shotwell_plugins_common_web_authentication_pane_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, ShotwellPluginsCommonWebAuthenticationPane));
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp25_ = _tmp24_;
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp26_ = webkit_web_view_get_uri (_tmp25_);
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp27_ = _tmp26_;
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_signal_emit_by_name (self, "login-succeeded", _tmp27_);
-#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_object_unref0 (_tmp25_);
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (loaded_url);
-#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 5751 "FacebookPublishing.c"
-	}
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp28_ = loaded_url;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp29_ = string_contains (_tmp28_, "login_failure");
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp29_) {
-#line 951 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_signal_emit_by_name (self, "login-failed");
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_g_free0 (loaded_url);
-#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return;
-#line 5765 "FacebookPublishing.c"
-	}
-#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (loaded_url);
-#line 5769 "FacebookPublishing.c"
-}
-
-
-gboolean publishing_facebook_web_authentication_pane_is_cache_dirty (void) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_web_authentication_pane_cache_dirty;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp0_;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 5782 "FacebookPublishing.c"
-}
-
-
-static PublishingFacebookWebAuthenticationPaneLocaleLookup* publishing_facebook_web_authentication_pane_locale_lookup_construct (GType object_type, const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (prefix != NULL, NULL);
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (translation != NULL, NULL);
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self = (PublishingFacebookWebAuthenticationPaneLocaleLookup*) g_type_create_instance (object_type);
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = prefix;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->prefix);
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->prefix = _tmp1_;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = translation;
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->translation);
-#line 836 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->translation = _tmp3_;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = exception_code;
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_code);
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->exception_code = _tmp5_;
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = exception_translation;
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = g_strdup (_tmp6_);
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_translation);
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->exception_translation = _tmp7_;
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = exception_code_2;
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = g_strdup (_tmp8_);
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_code_2);
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->exception_code_2 = _tmp9_;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = exception_translation_2;
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = g_strdup (_tmp10_);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_translation_2);
-#line 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->exception_translation_2 = _tmp11_;
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return self;
-#line 5856 "FacebookPublishing.c"
-}
-
-
-static PublishingFacebookWebAuthenticationPaneLocaleLookup* publishing_facebook_web_authentication_pane_locale_lookup_new (const gchar* prefix, const gchar* translation, const gchar* exception_code, const gchar* exception_translation, const gchar* exception_code_2, const gchar* exception_translation_2) {
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return publishing_facebook_web_authentication_pane_locale_lookup_construct (PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, prefix, translation, exception_code, exception_translation, exception_code_2, exception_translation_2);
-#line 5863 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_value_locale_lookup_init (GValue* value) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	value->data[0].v_pointer = NULL;
-#line 5870 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_value_locale_lookup_free_value (GValue* value) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (value->data[0].v_pointer) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_web_authentication_pane_locale_lookup_unref (value->data[0].v_pointer);
-#line 5879 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_web_authentication_pane_value_locale_lookup_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (src_value->data[0].v_pointer) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		dest_value->data[0].v_pointer = publishing_facebook_web_authentication_pane_locale_lookup_ref (src_value->data[0].v_pointer);
-#line 5889 "FacebookPublishing.c"
-	} else {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		dest_value->data[0].v_pointer = NULL;
-#line 5893 "FacebookPublishing.c"
-	}
-}
-
-
-static gpointer publishing_facebook_web_authentication_pane_value_locale_lookup_peek_pointer (const GValue* value) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return value->data[0].v_pointer;
-#line 5901 "FacebookPublishing.c"
-}
-
-
-static gchar* publishing_facebook_web_authentication_pane_value_locale_lookup_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (collect_values[0].v_pointer) {
-#line 5908 "FacebookPublishing.c"
-		PublishingFacebookWebAuthenticationPaneLocaleLookup* object;
-		object = collect_values[0].v_pointer;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		if (object->parent_instance.g_class == NULL) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5915 "FacebookPublishing.c"
-		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 5919 "FacebookPublishing.c"
-		}
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		value->data[0].v_pointer = publishing_facebook_web_authentication_pane_locale_lookup_ref (object);
-#line 5923 "FacebookPublishing.c"
-	} else {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 5927 "FacebookPublishing.c"
-	}
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return NULL;
-#line 5931 "FacebookPublishing.c"
-}
-
-
-static gchar* publishing_facebook_web_authentication_pane_value_locale_lookup_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup** object_p;
-	object_p = collect_values[0].v_pointer;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!object_p) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5942 "FacebookPublishing.c"
-	}
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (!value->data[0].v_pointer) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		*object_p = NULL;
-#line 5948 "FacebookPublishing.c"
-	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		*object_p = value->data[0].v_pointer;
-#line 5952 "FacebookPublishing.c"
-	} else {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		*object_p = publishing_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer);
-#line 5956 "FacebookPublishing.c"
-	}
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return NULL;
-#line 5960 "FacebookPublishing.c"
-}
-
-
-static GParamSpec* publishing_facebook_web_authentication_pane_param_spec_locale_lookup (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
-	PublishingFacebookWebAuthenticationPaneParamSpecLocaleLookup* spec;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP), NULL);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return G_PARAM_SPEC (spec);
-#line 5974 "FacebookPublishing.c"
-}
-
-
-static gpointer publishing_facebook_web_authentication_pane_value_get_locale_lookup (const GValue* value) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP), NULL);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return value->data[0].v_pointer;
-#line 5983 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_value_set_locale_lookup (GValue* value, gpointer v_object) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* old;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (v_object) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_web_authentication_pane_locale_lookup_ref (value->data[0].v_pointer);
-#line 6003 "FacebookPublishing.c"
-	} else {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 6007 "FacebookPublishing.c"
-	}
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (old) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_web_authentication_pane_locale_lookup_unref (old);
-#line 6013 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_web_authentication_pane_value_take_locale_lookup (GValue* value, gpointer v_object) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* old;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	old = value->data[0].v_pointer;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (v_object) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP));
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		value->data[0].v_pointer = v_object;
-#line 6032 "FacebookPublishing.c"
-	} else {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		value->data[0].v_pointer = NULL;
-#line 6036 "FacebookPublishing.c"
-	}
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (old) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		publishing_facebook_web_authentication_pane_locale_lookup_unref (old);
-#line 6042 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_web_authentication_pane_locale_lookup_class_init (PublishingFacebookWebAuthenticationPaneLocaleLookupClass * klass) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_web_authentication_pane_locale_lookup_parent_class = g_type_class_peek_parent (klass);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	((PublishingFacebookWebAuthenticationPaneLocaleLookupClass *) klass)->finalize = publishing_facebook_web_authentication_pane_locale_lookup_finalize;
-#line 6052 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_locale_lookup_instance_init (PublishingFacebookWebAuthenticationPaneLocaleLookup * self) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->ref_count = 1;
-#line 6059 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_locale_lookup_finalize (PublishingFacebookWebAuthenticationPaneLocaleLookup* obj) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup * self;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_TYPE_LOCALE_LOOKUP, PublishingFacebookWebAuthenticationPaneLocaleLookup);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_handlers_destroy (self);
-#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->prefix);
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->translation);
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_code);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_translation);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_code_2);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_g_free0 (self->exception_translation_2);
-#line 6081 "FacebookPublishing.c"
-}
-
-
-static GType publishing_facebook_web_authentication_pane_locale_lookup_get_type (void) {
-	static volatile gsize publishing_facebook_web_authentication_pane_locale_lookup_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_facebook_web_authentication_pane_locale_lookup_type_id__volatile)) {
-		static const GTypeValueTable g_define_type_value_table = { publishing_facebook_web_authentication_pane_value_locale_lookup_init, publishing_facebook_web_authentication_pane_value_locale_lookup_free_value, publishing_facebook_web_authentication_pane_value_locale_lookup_copy_value, publishing_facebook_web_authentication_pane_value_locale_lookup_peek_pointer, "p", publishing_facebook_web_authentication_pane_value_locale_lookup_collect_value, "p", publishing_facebook_web_authentication_pane_value_locale_lookup_lcopy_value };
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookWebAuthenticationPaneLocaleLookupClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_web_authentication_pane_locale_lookup_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookWebAuthenticationPaneLocaleLookup), 0, (GInstanceInitFunc) publishing_facebook_web_authentication_pane_locale_lookup_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_facebook_web_authentication_pane_locale_lookup_type_id;
-		publishing_facebook_web_authentication_pane_locale_lookup_type_id = g_type_register_fundamental (g_type_fundamental_next (), "PublishingFacebookWebAuthenticationPaneLocaleLookup", &g_define_type_info, &g_define_type_fundamental_info, 0);
-		g_once_init_leave (&publishing_facebook_web_authentication_pane_locale_lookup_type_id__volatile, publishing_facebook_web_authentication_pane_locale_lookup_type_id);
-	}
-	return publishing_facebook_web_authentication_pane_locale_lookup_type_id__volatile;
-}
-
-
-static gpointer publishing_facebook_web_authentication_pane_locale_lookup_ref (gpointer instance) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* self;
-	self = instance;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_atomic_int_inc (&self->ref_count);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return instance;
-#line 6106 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_locale_lookup_unref (gpointer instance) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* self;
-	self = instance;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		PUBLISHING_FACEBOOK_WEB_AUTHENTICATION_PANE_LOCALE_LOOKUP_GET_CLASS (self)->finalize (self);
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		g_type_free_instance ((GTypeInstance *) self);
-#line 6119 "FacebookPublishing.c"
-	}
-}
-
-
-static void publishing_facebook_web_authentication_pane_class_init (PublishingFacebookWebAuthenticationPaneClass * klass) {
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp0_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp1_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp2_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp3_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp4_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp5_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp6_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp7_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp8_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp9_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp10_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp11_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp12_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp13_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp14_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp15_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp16_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp17_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp18_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp19_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp20_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp21_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp22_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp23_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp24_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp25_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp26_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp27_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp28_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp29_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp30_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp31_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp32_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp33_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp34_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp35_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp36_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp37_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp38_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp39_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp40_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp41_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp42_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp43_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup* _tmp44_ = NULL;
-	PublishingFacebookWebAuthenticationPaneLocaleLookup** _tmp45_ = NULL;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_web_authentication_pane_parent_class = g_type_class_peek_parent (klass);
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	((ShotwellPluginsCommonWebAuthenticationPaneClass *) klass)->on_page_load = publishing_facebook_web_authentication_pane_real_on_page_load;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_web_authentication_pane_finalize;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("login_succeeded", PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_new ("login_failed", PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("es", "es-la", "ES", "es-es", NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("en", "en-gb", "US", "en-us", NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("fr", "fr-fr", "CA", "fr-ca", NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp3_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("pt", "pt-br", "PT", "pt-pt", NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp4_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("zh", "zh-cn", "HK", "zh-hk", "TW", "zh-tw");
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp5_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("af", "af-za", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp6_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ar", "ar-ar", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp7_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("nb", "nb-no", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp8_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("no", "nb-no", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp9_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("id", "id-id", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp10_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ms", "ms-my", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp11_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ca", "ca-es", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp12_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("cs", "cs-cz", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp13_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("cy", "cy-gb", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp14_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("da", "da-dk", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp15_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("de", "de-de", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp16_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("tl", "tl-ph", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp17_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ko", "ko-kr", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp18_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("hr", "hr-hr", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp19_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("it", "it-it", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp20_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("lt", "lt-lt", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp21_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("hu", "hu-hu", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp22_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("nl", "nl-nl", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp23_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ja", "ja-jp", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp24_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("nb", "nb-no", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp25_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("no", "nb-no", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp26_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("pl", "pl-pl", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp27_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ro", "ro-ro", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp28_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ru", "ru-ru", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp29_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("sk", "sk-sk", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp30_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("sl", "sl-si", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp31_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("sv", "sv-se", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp32_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("th", "th-th", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp33_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("vi", "vi-vn", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp34_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("tr", "tr-tr", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp35_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("el", "el-gr", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp36_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("bg", "bg-bg", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp37_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("sr", "sr-rs", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp38_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("he", "he-il", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp39_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("hi", "hi-in", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp40_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("bn", "bn-in", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp41_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("pa", "pa-in", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp42_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ta", "ta-in", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp43_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("te", "te-in", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp44_ = publishing_facebook_web_authentication_pane_locale_lookup_new ("ml", "ml-in", NULL, NULL, NULL, NULL);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_ = g_new0 (PublishingFacebookWebAuthenticationPaneLocaleLookup*, 45 + 1);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[0] = _tmp0_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[1] = _tmp1_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[2] = _tmp2_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[3] = _tmp3_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[4] = _tmp4_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[5] = _tmp5_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[6] = _tmp6_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[7] = _tmp7_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[8] = _tmp8_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[9] = _tmp9_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[10] = _tmp10_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[11] = _tmp11_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[12] = _tmp12_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[13] = _tmp13_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[14] = _tmp14_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[15] = _tmp15_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[16] = _tmp16_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[17] = _tmp17_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[18] = _tmp18_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[19] = _tmp19_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[20] = _tmp20_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[21] = _tmp21_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[22] = _tmp22_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[23] = _tmp23_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[24] = _tmp24_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[25] = _tmp25_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[26] = _tmp26_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[27] = _tmp27_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[28] = _tmp28_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[29] = _tmp29_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[30] = _tmp30_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[31] = _tmp31_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[32] = _tmp32_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[33] = _tmp33_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[34] = _tmp34_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[35] = _tmp35_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[36] = _tmp36_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[37] = _tmp37_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[38] = _tmp38_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[39] = _tmp39_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[40] = _tmp40_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[41] = _tmp41_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[42] = _tmp42_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[43] = _tmp43_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_[44] = _tmp44_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_web_authentication_pane_locale_lookup_table = _tmp45_;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	publishing_facebook_web_authentication_pane_locale_lookup_table_length1 = 45;
-#line 6367 "FacebookPublishing.c"
-}
-
-
-static void publishing_facebook_web_authentication_pane_instance_init (PublishingFacebookWebAuthenticationPane * self) {
-}
-
-
-static void publishing_facebook_web_authentication_pane_finalize (GObject* obj) {
-	PublishingFacebookWebAuthenticationPane * self;
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_WEB_AUTHENTICATION_PANE, PublishingFacebookWebAuthenticationPane);
-#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	G_OBJECT_CLASS (publishing_facebook_web_authentication_pane_parent_class)->finalize (obj);
-#line 6381 "FacebookPublishing.c"
-}
-
-
-GType publishing_facebook_web_authentication_pane_get_type (void) {
-	static volatile gsize publishing_facebook_web_authentication_pane_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_facebook_web_authentication_pane_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFacebookWebAuthenticationPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_facebook_web_authentication_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFacebookWebAuthenticationPane), 0, (GInstanceInitFunc) publishing_facebook_web_authentication_pane_instance_init, NULL };
-		GType publishing_facebook_web_authentication_pane_type_id;
-		publishing_facebook_web_authentication_pane_type_id = g_type_register_static (SHOTWELL_PLUGINS_COMMON_TYPE_WEB_AUTHENTICATION_PANE, "PublishingFacebookWebAuthenticationPane", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_facebook_web_authentication_pane_type_id__volatile, publishing_facebook_web_authentication_pane_type_id);
-	}
-	return publishing_facebook_web_authentication_pane_type_id__volatile;
-}
-
-
 static PublishingFacebookAlbum** _vala_array_dup2 (PublishingFacebookAlbum** self, int length) {
 	PublishingFacebookAlbum** result;
 	int i;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = g_new0 (PublishingFacebookAlbum*, length + 1);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 6404 "FacebookPublishing.c"
+#line 4384 "FacebookPublishing.c"
 		PublishingFacebookAlbum* _tmp0_ = NULL;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _publishing_facebook_album_ref0 (self[i]);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 6410 "FacebookPublishing.c"
+#line 4390 "FacebookPublishing.c"
 	}
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 6414 "FacebookPublishing.c"
+#line 4394 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_create_new_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6421 "FacebookPublishing.c"
+#line 4401 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_use_existing_toggled ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6428 "FacebookPublishing.c"
+#line 4408 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_publish_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6435 "FacebookPublishing.c"
+#line 4415 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_logout_button_clicked ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6442 "FacebookPublishing.c"
+#line 4422 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_on_size_changed ((PublishingFacebookPublishingOptionsPane*) self);
-#line 6449 "FacebookPublishing.c"
+#line 4429 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata) {
+PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_construct (GType object_type, const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout) {
 	PublishingFacebookPublishingOptionsPane * self = NULL;
 	GtkBuilder* _tmp0_ = NULL;
 	GtkBuilder* _tmp1_ = NULL;
@@ -6527,467 +4491,489 @@ PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_
 	GtkBuilder* _tmp35_ = NULL;
 	GObject* _tmp36_ = NULL;
 	GtkButton* _tmp37_ = NULL;
-	GtkBuilder* _tmp38_ = NULL;
-	GObject* _tmp39_ = NULL;
-	GtkEntry* _tmp40_ = NULL;
-	GtkBuilder* _tmp41_ = NULL;
-	GObject* _tmp42_ = NULL;
-	GtkComboBoxText* _tmp43_ = NULL;
-	GtkBuilder* _tmp44_ = NULL;
-	GObject* _tmp45_ = NULL;
-	GtkLabel* _tmp46_ = NULL;
-	GtkBuilder* _tmp47_ = NULL;
-	GObject* _tmp48_ = NULL;
-	GtkCheckButton* _tmp49_ = NULL;
-	GtkRadioButton* _tmp50_ = NULL;
-	GtkRadioButton* _tmp51_ = NULL;
+	gboolean _tmp38_ = FALSE;
+	GtkBuilder* _tmp43_ = NULL;
+	GObject* _tmp44_ = NULL;
+	GtkEntry* _tmp45_ = NULL;
+	GtkBuilder* _tmp46_ = NULL;
+	GObject* _tmp47_ = NULL;
+	GtkComboBoxText* _tmp48_ = NULL;
+	GtkBuilder* _tmp49_ = NULL;
+	GObject* _tmp50_ = NULL;
+	GtkLabel* _tmp51_ = NULL;
+	GtkBuilder* _tmp52_ = NULL;
+	GObject* _tmp53_ = NULL;
+	GtkCheckButton* _tmp54_ = NULL;
+	GtkRadioButton* _tmp55_ = NULL;
+	GtkRadioButton* _tmp56_ = NULL;
 	gchar* label_text = NULL;
-	const gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	SpitPublishingPublisherMediaType _tmp54_ = 0;
-	GtkLabel* _tmp57_ = NULL;
-	const gchar* _tmp58_ = NULL;
-	GtkCheckButton* _tmp59_ = NULL;
-	gboolean _tmp60_ = FALSE;
-	GtkComboBoxText* _tmp61_ = NULL;
-	GtkButton* _tmp62_ = NULL;
-	GtkButton* _tmp63_ = NULL;
-	GtkComboBoxText* _tmp64_ = NULL;
-	PublishingFacebookFacebookPublisher* _tmp65_ = NULL;
-	gint _tmp66_ = 0;
-	GtkComboBoxText* _tmp67_ = NULL;
-	gboolean _tmp68_ = FALSE;
-	gboolean _tmp69_ = FALSE;
-	GtkRadioButton* _tmp70_ = NULL;
-	GtkComboBoxText* _tmp75_ = NULL;
-	SpitPublishingPublisherMediaType _tmp76_ = 0;
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	const gchar* _tmp57_ = NULL;
+	gchar* _tmp58_ = NULL;
+	SpitPublishingPublisherMediaType _tmp59_ = 0;
+	GtkLabel* _tmp62_ = NULL;
+	const gchar* _tmp63_ = NULL;
+	GtkCheckButton* _tmp64_ = NULL;
+	gboolean _tmp65_ = FALSE;
+	GtkComboBoxText* _tmp66_ = NULL;
+	GtkButton* _tmp67_ = NULL;
+	GtkButton* _tmp68_ = NULL;
+	GtkComboBoxText* _tmp69_ = NULL;
+	PublishingFacebookFacebookPublisher* _tmp70_ = NULL;
+	gint _tmp71_ = 0;
+	GtkComboBoxText* _tmp72_ = NULL;
+	gboolean _tmp73_ = FALSE;
+	gboolean _tmp74_ = FALSE;
+	GtkRadioButton* _tmp75_ = NULL;
+	GtkComboBoxText* _tmp80_ = NULL;
+	SpitPublishingPublisherMediaType _tmp81_ = 0;
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (username != NULL, NULL);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_FACEBOOK_PUBLISHER (publisher), NULL);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = builder;
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1006 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->builder = _tmp1_;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = builder;
-#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = builder;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = g_slist_length (_tmp5_);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_slist_free0 (_tmp5_);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = albums;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7__length1 = albums_length1;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup2 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8__length1 = _tmp7__length1;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums = _tmp8_;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums_length1 = _tmp8__length1;
-#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = publishing_facebook_publishing_options_pane_create_privacy_descriptions (self, &_tmp9_);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->privacy_descriptions = (_vala_array_free (self->priv->privacy_descriptions, self->priv->privacy_descriptions_length1, (GDestroyNotify) publishing_facebook_publishing_options_pane_privacy_description_unref), NULL);
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->privacy_descriptions = _tmp10_;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->privacy_descriptions_length1 = _tmp9_;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_privacy_descriptions_size_ = self->priv->privacy_descriptions_length1;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = publishing_facebook_publishing_options_pane_create_resolution_list (self, &_tmp11_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions = (g_free (self->priv->possible_resolutions), NULL);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions = _tmp12_;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions_length1 = _tmp11_;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_possible_resolutions_size_ = self->priv->possible_resolutions_length1;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = publisher;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = _g_object_ref0 (_tmp13_);
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publisher = _tmp14_;
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = media_type;
-#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->media_type = _tmp15_;
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = builder;
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp17_ = gtk_builder_get_object (_tmp16_, "facebook_pane_box");
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_box_get_type (), GtkBox));
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->pane_widget = _tmp18_;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = self->priv->pane_widget;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_container_get_type (), GtkContainer), (guint) 16);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = self->priv->builder;
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = gtk_builder_get_object (_tmp20_, "use_existing_radio");
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->use_existing_radio);
-#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->use_existing_radio = _tmp22_;
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = self->priv->builder;
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = gtk_builder_get_object (_tmp23_, "create_new_radio");
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->create_new_radio);
-#line 1023 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->create_new_radio = _tmp25_;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = self->priv->builder;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = gtk_builder_get_object (_tmp26_, "existing_albums_combo");
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->existing_albums_combo = _tmp28_;
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp29_ = self->priv->builder;
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp30_ = gtk_builder_get_object (_tmp29_, "visibility_combo");
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->visibility_combo = _tmp31_;
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp32_ = self->priv->builder;
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp33_ = gtk_builder_get_object (_tmp32_, "publish_button");
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_button_get_type (), GtkButton));
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publish_button = _tmp34_;
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp35_ = self->priv->builder;
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp36_ = gtk_builder_get_object (_tmp35_, "logout_button");
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_button_get_type (), GtkButton));
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->logout_button = _tmp37_;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp38_ = self->priv->builder;
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp39_ = gtk_builder_get_object (_tmp38_, "new_album_entry");
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_entry_get_type (), GtkEntry));
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp38_ = can_logout;
+#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (!_tmp38_) {
+#line 4668 "FacebookPublishing.c"
+		GtkButton* _tmp39_ = NULL;
+		GtkContainer* _tmp40_ = NULL;
+		GtkContainer* _tmp41_ = NULL;
+		GtkButton* _tmp42_ = NULL;
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp39_ = self->priv->logout_button;
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp40_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp41_ = _tmp40_;
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp42_ = self->priv->logout_button;
+#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
+#line 4683 "FacebookPublishing.c"
+	}
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp43_ = self->priv->builder;
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp44_ = gtk_builder_get_object (_tmp43_, "new_album_entry");
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_entry_get_type (), GtkEntry));
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->new_album_entry);
-#line 1028 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->new_album_entry = _tmp40_;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp41_ = self->priv->builder;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp42_ = gtk_builder_get_object (_tmp41_, "resolution_combo");
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->new_album_entry = _tmp45_;
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp46_ = self->priv->builder;
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp47_ = gtk_builder_get_object (_tmp46_, "resolution_combo");
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->resolution_combo);
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->resolution_combo = _tmp43_;
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp44_ = self->priv->builder;
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp45_ = gtk_builder_get_object (_tmp44_, "how_to_label");
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_label_get_type (), GtkLabel));
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->resolution_combo = _tmp48_;
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp49_ = self->priv->builder;
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp50_ = gtk_builder_get_object (_tmp49_, "how_to_label");
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp51_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_label_get_type (), GtkLabel));
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->how_to_label);
-#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->how_to_label = _tmp46_;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp47_ = self->priv->builder;
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp48_ = gtk_builder_get_object (_tmp47_, "strip_metadata_check");
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp49_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_check_button_get_type (), GtkCheckButton));
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->how_to_label = _tmp51_;
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp52_ = self->priv->builder;
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp53_ = gtk_builder_get_object (_tmp52_, "strip_metadata_check");
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp54_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_check_button_get_type (), GtkCheckButton));
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1031 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	self->priv->strip_metadata_check = _tmp49_;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp50_ = self->priv->create_new_radio;
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked, self, 0);
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp51_ = self->priv->use_existing_radio;
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked, self, 0);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp52_ = username;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp53_ = g_strdup_printf (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_HEADER_LABEL_TEXT, _tmp52_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	label_text = _tmp53_;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp54_ = media_type;
-#line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if ((_tmp54_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 6741 "FacebookPublishing.c"
-		const gchar* _tmp55_ = NULL;
-		gchar* _tmp56_ = NULL;
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp55_ = label_text;
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp56_ = g_strconcat (_tmp55_, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PHOTOS_LABEL_TEXT, NULL);
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	self->priv->strip_metadata_check = _tmp54_;
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp55_ = self->priv->create_new_radio;
+#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_create_new_toggled_gtk_button_clicked, self, 0);
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp56_ = self->priv->use_existing_radio;
+#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_use_existing_toggled_gtk_button_clicked, self, 0);
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp57_ = username;
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp58_ = g_strdup_printf (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_HEADER_LABEL_TEXT, _tmp57_);
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	label_text = _tmp58_;
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp59_ = media_type;
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if ((_tmp59_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
+#line 4743 "FacebookPublishing.c"
+		const gchar* _tmp60_ = NULL;
+		gchar* _tmp61_ = NULL;
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp60_ = label_text;
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp61_ = g_strconcat (_tmp60_, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PHOTOS_LABEL_TEXT, NULL);
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (label_text);
-#line 1038 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		label_text = _tmp56_;
-#line 6752 "FacebookPublishing.c"
-	}
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp57_ = self->priv->how_to_label;
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp58_ = label_text;
-#line 1039 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gtk_label_set_label (_tmp57_, _tmp58_);
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp59_ = self->priv->strip_metadata_check;
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp60_ = strip_metadata;
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp60_);
-#line 1042 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		label_text = _tmp61_;
+#line 4754 "FacebookPublishing.c"
+	}
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp62_ = self->priv->how_to_label;
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp63_ = label_text;
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gtk_label_set_label (_tmp62_, _tmp63_);
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp64_ = self->priv->strip_metadata_check;
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp65_ = strip_metadata;
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp65_);
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_setup_visibility_combo (self);
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp61_ = self->priv->visibility_combo;
-#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp62_ = self->priv->publish_button;
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp62_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked, self, 0);
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp63_ = self->priv->logout_button;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (_tmp63_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked, self, 0);
-#line 1048 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp66_ = self->priv->visibility_combo;
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_combo_box_get_type (), GtkComboBox), 0);
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp67_ = self->priv->publish_button;
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp67_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_publish_button_clicked_gtk_button_clicked, self, 0);
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp68_ = self->priv->logout_button;
+#line 790 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (_tmp68_, "clicked", (GCallback) _publishing_facebook_publishing_options_pane_on_logout_button_clicked_gtk_button_clicked, self, 0);
+#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_setup_resolution_combo (self);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp64_ = self->priv->resolution_combo;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp65_ = publisher;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp66_ = publishing_facebook_facebook_publisher_get_persistent_default_size (_tmp65_);
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_combo_box_get_type (), GtkComboBox), _tmp66_);
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp67_ = self->priv->resolution_combo;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp70_ = self->priv->create_new_radio;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp70_ != NULL) {
-#line 6798 "FacebookPublishing.c"
-		GtkRadioButton* _tmp71_ = NULL;
-		gboolean _tmp72_ = FALSE;
-		gboolean _tmp73_ = FALSE;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp71_ = self->priv->create_new_radio;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp72_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp73_ = _tmp72_;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp69_ = _tmp73_;
-#line 6810 "FacebookPublishing.c"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp69_ = self->priv->resolution_combo;
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp70_ = publisher;
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp71_ = publishing_facebook_facebook_publisher_get_persistent_default_size (_tmp70_);
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_combo_box_get_type (), GtkComboBox), _tmp71_);
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp72_ = self->priv->resolution_combo;
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_facebook_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp75_ = self->priv->create_new_radio;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (_tmp75_ != NULL) {
+#line 4800 "FacebookPublishing.c"
+		GtkRadioButton* _tmp76_ = NULL;
+		gboolean _tmp77_ = FALSE;
+		gboolean _tmp78_ = FALSE;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp76_ = self->priv->create_new_radio;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp77_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp78_ = _tmp77_;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp74_ = _tmp78_;
+#line 4812 "FacebookPublishing.c"
 	} else {
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp69_ = FALSE;
-#line 6814 "FacebookPublishing.c"
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp74_ = FALSE;
+#line 4816 "FacebookPublishing.c"
 	}
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp69_) {
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp68_ = TRUE;
-#line 6820 "FacebookPublishing.c"
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (_tmp74_) {
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp73_ = TRUE;
+#line 4822 "FacebookPublishing.c"
 	} else {
-		SpitPublishingPublisherMediaType _tmp74_ = 0;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp74_ = media_type;
-#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp68_ = (_tmp74_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
-#line 6827 "FacebookPublishing.c"
-	}
-#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp75_ = self->priv->visibility_combo;
-#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_widget_get_type (), GtkWidget), _tmp68_);
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp76_ = media_type;
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	if (_tmp76_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 6837 "FacebookPublishing.c"
-		GtkCheckButton* _tmp77_ = NULL;
-		GtkCheckButton* _tmp78_ = NULL;
-		GtkComboBoxText* _tmp79_ = NULL;
-		GtkRadioButton* _tmp80_ = NULL;
-		GtkRadioButton* _tmp81_ = NULL;
-		GtkComboBoxText* _tmp82_ = NULL;
-		GtkEntry* _tmp83_ = NULL;
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp77_ = self->priv->strip_metadata_check;
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_toggle_button_get_type (), GtkToggleButton), FALSE);
-#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp78_ = self->priv->strip_metadata_check;
-#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp79_ = self->priv->resolution_combo;
-#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp80_ = self->priv->use_existing_radio;
-#line 1064 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp81_ = self->priv->create_new_radio;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp82_ = self->priv->existing_albums_combo;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		_tmp83_ = self->priv->new_album_entry;
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 6873 "FacebookPublishing.c"
+		SpitPublishingPublisherMediaType _tmp79_ = 0;
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp79_ = media_type;
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp73_ = (_tmp79_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0;
+#line 4829 "FacebookPublishing.c"
 	}
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp80_ = self->priv->visibility_combo;
+#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget), _tmp73_);
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	_tmp81_ = media_type;
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	if (_tmp81_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 4839 "FacebookPublishing.c"
+		GtkCheckButton* _tmp82_ = NULL;
+		GtkCheckButton* _tmp83_ = NULL;
+		GtkComboBoxText* _tmp84_ = NULL;
+		GtkRadioButton* _tmp85_ = NULL;
+		GtkRadioButton* _tmp86_ = NULL;
+		GtkComboBoxText* _tmp87_ = NULL;
+		GtkEntry* _tmp88_ = NULL;
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp82_ = self->priv->strip_metadata_check;
+#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_toggle_button_get_type (), GtkToggleButton), FALSE);
+#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp83_ = self->priv->strip_metadata_check;
+#line 806 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp84_ = self->priv->resolution_combo;
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp85_ = self->priv->use_existing_radio;
+#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp86_ = self->priv->create_new_radio;
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp87_ = self->priv->existing_albums_combo;
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		_tmp88_ = self->priv->new_album_entry;
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 4875 "FacebookPublishing.c"
+	}
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (label_text);
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 6879 "FacebookPublishing.c"
+#line 4881 "FacebookPublishing.c"
 }
 
 
-PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_new (const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata) {
-#line 1002 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return publishing_facebook_publishing_options_pane_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, username, albums, albums_length1, media_type, publisher, builder, strip_metadata);
-#line 6886 "FacebookPublishing.c"
+PublishingFacebookPublishingOptionsPane* publishing_facebook_publishing_options_pane_new (const gchar* username, PublishingFacebookAlbum** albums, int albums_length1, SpitPublishingPublisherMediaType media_type, PublishingFacebookFacebookPublisher* publisher, GtkBuilder* builder, gboolean strip_metadata, gboolean can_logout) {
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	return publishing_facebook_publishing_options_pane_construct (PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, username, albums, albums_length1, media_type, publisher, builder, strip_metadata, can_logout);
+#line 4888 "FacebookPublishing.c"
 }
 
 
 static gboolean publishing_facebook_publishing_options_pane_publishing_photos (PublishingFacebookPublishingOptionsPane* self) {
 	gboolean result = FALSE;
 	SpitPublishingPublisherMediaType _tmp0_ = 0;
-#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 815 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), FALSE);
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->media_type;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = (_tmp0_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 6901 "FacebookPublishing.c"
+#line 4903 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_publishing_options_pane_privacy_description_ref0 (gpointer self) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 6908 "FacebookPublishing.c"
+#line 4910 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_setup_visibility_combo (PublishingFacebookPublishingOptionsPane* self) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->privacy_descriptions;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->privacy_descriptions_length1;
-#line 6921 "FacebookPublishing.c"
+#line 4923 "FacebookPublishing.c"
 	{
 		PublishingFacebookPublishingOptionsPanePrivacyDescription** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		p_collection = _tmp0_;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		p_collection_length1 = _tmp0__length1;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		for (p_it = 0; p_it < _tmp0__length1; p_it = p_it + 1) {
-#line 6933 "FacebookPublishing.c"
+#line 4935 "FacebookPublishing.c"
 			PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp1_ = NULL;
 			PublishingFacebookPublishingOptionsPanePrivacyDescription* p = NULL;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = _publishing_facebook_publishing_options_pane_privacy_description_ref0 (p_collection[p_it]);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			p = _tmp1_;
-#line 6940 "FacebookPublishing.c"
+#line 4942 "FacebookPublishing.c"
 			{
 				GtkComboBoxText* _tmp2_ = NULL;
 				PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp2_ = self->priv->visibility_combo;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp3_ = p;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp4_ = _tmp3_->description;
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp2_, _tmp4_);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_publishing_facebook_publishing_options_pane_privacy_description_unref0 (p);
-#line 6955 "FacebookPublishing.c"
+#line 4957 "FacebookPublishing.c"
 			}
 		}
 	}
@@ -6997,47 +4983,47 @@ static void publishing_facebook_publishing_options_pane_setup_visibility_combo (
 static void publishing_facebook_publishing_options_pane_setup_resolution_combo (PublishingFacebookPublishingOptionsPane* self) {
 	PublishingFacebookResolution* _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->possible_resolutions;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->possible_resolutions_length1;
-#line 6971 "FacebookPublishing.c"
+#line 4973 "FacebookPublishing.c"
 	{
 		PublishingFacebookResolution* res_collection = NULL;
 		gint res_collection_length1 = 0;
 		gint _res_collection_size_ = 0;
 		gint res_it = 0;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		res_collection = _tmp0_;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		res_collection_length1 = _tmp0__length1;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		for (res_it = 0; res_it < _tmp0__length1; res_it = res_it + 1) {
-#line 6983 "FacebookPublishing.c"
+#line 4985 "FacebookPublishing.c"
 			PublishingFacebookResolution res = 0;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			res = res_collection[res_it];
-#line 6987 "FacebookPublishing.c"
+#line 4989 "FacebookPublishing.c"
 			{
 				GtkComboBoxText* _tmp1_ = NULL;
 				PublishingFacebookResolution _tmp2_ = 0;
 				gchar* _tmp3_ = NULL;
 				gchar* _tmp4_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp1_ = self->priv->resolution_combo;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp2_ = res;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp3_ = publishing_facebook_resolution_get_name (_tmp2_);
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp4_ = _tmp3_;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp1_, _tmp4_);
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp4_);
-#line 7005 "FacebookPublishing.c"
+#line 5007 "FacebookPublishing.c"
 			}
 		}
 	}
@@ -7048,41 +5034,41 @@ static void publishing_facebook_publishing_options_pane_on_use_existing_toggled
 	GtkRadioButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->use_existing_radio;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_) {
-#line 7026 "FacebookPublishing.c"
+#line 5028 "FacebookPublishing.c"
 		GtkComboBoxText* _tmp3_ = NULL;
 		GtkEntry* _tmp4_ = NULL;
 		GtkComboBoxText* _tmp5_ = NULL;
 		SpitPublishingPublisherMediaType _tmp6_ = 0;
 		GtkComboBoxText* _tmp7_ = NULL;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = self->priv->existing_albums_combo;
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = self->priv->new_album_entry;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = self->priv->visibility_combo;
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = self->priv->media_type;
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), (_tmp6_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) != 0);
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->existing_albums_combo;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 7050 "FacebookPublishing.c"
+#line 5052 "FacebookPublishing.c"
 	}
 }
 
@@ -7091,38 +5077,38 @@ static void publishing_facebook_publishing_options_pane_on_create_new_toggled (P
 	GtkRadioButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->create_new_radio;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 844 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_) {
-#line 7069 "FacebookPublishing.c"
+#line 5071 "FacebookPublishing.c"
 		GtkComboBoxText* _tmp3_ = NULL;
 		GtkEntry* _tmp4_ = NULL;
 		GtkEntry* _tmp5_ = NULL;
 		GtkComboBoxText* _tmp6_ = NULL;
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = self->priv->existing_albums_combo;
-#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = self->priv->new_album_entry;
-#line 1102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = self->priv->new_album_entry;
-#line 1103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = self->priv->visibility_combo;
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 7090 "FacebookPublishing.c"
+#line 5092 "FacebookPublishing.c"
 	}
 }
 
@@ -7131,26 +5117,26 @@ static void publishing_facebook_publishing_options_pane_on_size_changed (Publish
 	PublishingFacebookFacebookPublisher* _tmp0_ = NULL;
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->resolution_combo;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_facebook_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 7109 "FacebookPublishing.c"
+#line 5111 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_on_logout_button_clicked (PublishingFacebookPublishingOptionsPane* self) {
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 7118 "FacebookPublishing.c"
+#line 5120 "FacebookPublishing.c"
 }
 
 
@@ -7171,29 +5157,29 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 	PublishingFacebookResolution _tmp21_ = 0;
 	GtkCheckButton* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->privacy_descriptions;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->privacy_descriptions_length1;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->visibility_combo;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _tmp0_[_tmp2_];
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _tmp3_->privacy_setting;
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	privacy_setting = _tmp5_;
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
-#line 1125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 869 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_) {
-#line 7161 "FacebookPublishing.c"
+#line 5163 "FacebookPublishing.c"
 		PublishingFacebookResolution* _tmp7_ = NULL;
 		gint _tmp7__length1 = 0;
 		GtkComboBoxText* _tmp8_ = NULL;
@@ -7202,131 +5188,131 @@ static void publishing_facebook_publishing_options_pane_on_publish_button_clicke
 		GtkRadioButton* _tmp11_ = NULL;
 		gboolean _tmp12_ = FALSE;
 		gboolean _tmp13_ = FALSE;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->possible_resolutions;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7__length1 = self->priv->possible_resolutions_length1;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = self->priv->resolution_combo;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_combo_box_get_type (), GtkComboBox));
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = _tmp7_[_tmp9_];
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		resolution_setting = _tmp10_;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = self->priv->use_existing_radio;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 871 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp13_) {
-#line 7190 "FacebookPublishing.c"
+#line 5192 "FacebookPublishing.c"
 			GtkComboBoxText* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp14_ = self->priv->existing_albums_combo;
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp15_ = gtk_combo_box_text_get_active_text (_tmp14_);
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (album_name);
-#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			album_name = _tmp15_;
-#line 7201 "FacebookPublishing.c"
+#line 5203 "FacebookPublishing.c"
 		} else {
 			GtkEntry* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp16_ = self->priv->new_album_entry;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp17_ = gtk_entry_get_text (_tmp16_);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (album_name);
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			album_name = _tmp18_;
-#line 7216 "FacebookPublishing.c"
+#line 5218 "FacebookPublishing.c"
 		}
 	} else {
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		resolution_setting = PUBLISHING_FACEBOOK_RESOLUTION_STANDARD;
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (album_name);
-#line 1134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		album_name = NULL;
-#line 7225 "FacebookPublishing.c"
+#line 5227 "FacebookPublishing.c"
 	}
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = album_name;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp20_ = privacy_setting;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = resolution_setting;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = self->priv->strip_metadata_check;
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp19_, _tmp20_, _tmp21_, _tmp23_);
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (privacy_setting);
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (album_name);
-#line 7243 "FacebookPublishing.c"
+#line 5245 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add7 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 7254 "FacebookPublishing.c"
+#line 5256 "FacebookPublishing.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7260 "FacebookPublishing.c"
+#line 5262 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add8 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 7271 "FacebookPublishing.c"
+#line 5273 "FacebookPublishing.c"
 	}
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7277 "FacebookPublishing.c"
+#line 5279 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add9 (PublishingFacebookPublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingFacebookPublishingOptionsPanePrivacyDescription* value) {
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookPublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 7288 "FacebookPublishing.c"
+#line 5290 "FacebookPublishing.c"
 	}
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7294 "FacebookPublishing.c"
+#line 5296 "FacebookPublishing.c"
 }
 
 
@@ -7350,91 +5336,91 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription** publishing_fa
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* _tmp9_ = NULL;
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 884 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFacebookPublishingOptionsPanePrivacyDescription*, 0 + 1);
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result_ = _tmp0_;
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result__length1 = 0;
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _result_;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _ ("Just me");
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp2_, "{ 'value' : 'SELF' }");
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add7 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _result_;
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _ ("Friends");
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp5_, "{ 'value' : 'ALL_FRIENDS' }");
-#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 888 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add8 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _result_;
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = _ ("Everyone");
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishing_facebook_publishing_options_pane_privacy_description_new (_tmp8_, "{ 'value' : 'EVERYONE' }");
-#line 1145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add9 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _result_;
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (result_length1) {
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*result_length1 = _tmp10__length1;
-#line 7366 "FacebookPublishing.c"
+#line 5368 "FacebookPublishing.c"
 	}
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp10_;
-#line 1147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7372 "FacebookPublishing.c"
+#line 5374 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add10 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value) {
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 7383 "FacebookPublishing.c"
+#line 5385 "FacebookPublishing.c"
 	}
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 7387 "FacebookPublishing.c"
+#line 5389 "FacebookPublishing.c"
 }
 
 
 static void _vala_array_add11 (PublishingFacebookResolution** array, int* length, int* size, PublishingFacebookResolution value) {
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*array = g_renew (PublishingFacebookResolution, *array, *size);
-#line 7398 "FacebookPublishing.c"
+#line 5400 "FacebookPublishing.c"
 	}
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 7402 "FacebookPublishing.c"
+#line 5404 "FacebookPublishing.c"
 }
 
 
@@ -7450,120 +5436,120 @@ static PublishingFacebookResolution* publishing_facebook_publishing_options_pane
 	gint _tmp2__length1 = 0;
 	PublishingFacebookResolution* _tmp3_ = NULL;
 	gint _tmp3__length1 = 0;
-#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFacebookResolution, 0);
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result_ = _tmp0_;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_result__length1 = 0;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _result_;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add10 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_STANDARD);
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _result_;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__length1 = _result__length1;
-#line 1154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_array_add11 (&_result_, &_result__length1, &__result__size_, PUBLISHING_FACEBOOK_RESOLUTION_HIGH);
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _result_;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3__length1 = _result__length1;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (result_length1) {
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*result_length1 = _tmp3__length1;
-#line 7448 "FacebookPublishing.c"
+#line 5450 "FacebookPublishing.c"
 	}
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp3_;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7454 "FacebookPublishing.c"
+#line 5456 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPublishingOptionsPane* self) {
 	gboolean _tmp0_ = FALSE;
 	GtkButton* _tmp24_ = NULL;
-#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = publishing_facebook_publishing_options_pane_publishing_photos (self);
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_) {
-#line 7467 "FacebookPublishing.c"
+#line 5469 "FacebookPublishing.c"
 		PublishingFacebookAlbum** _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->albums;
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1__length1 = self->priv->albums_length1;
-#line 1161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp1__length1 == 0) {
-#line 7476 "FacebookPublishing.c"
+#line 5478 "FacebookPublishing.c"
 			GtkRadioButton* _tmp2_ = NULL;
 			GtkEntry* _tmp3_ = NULL;
 			GtkComboBoxText* _tmp4_ = NULL;
 			GtkRadioButton* _tmp5_ = NULL;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp2_ = self->priv->create_new_radio;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp3_ = self->priv->new_album_entry;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			gtk_entry_set_text (_tmp3_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
-#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp4_ = self->priv->existing_albums_combo;
-#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp5_ = self->priv->use_existing_radio;
-#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7497 "FacebookPublishing.c"
+#line 5499 "FacebookPublishing.c"
 		} else {
 			gint default_album_seq_num = 0;
 			gint ticker = 0;
 			PublishingFacebookAlbum** _tmp6_ = NULL;
 			gint _tmp6__length1 = 0;
 			gint _tmp15_ = 0;
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			default_album_seq_num = -1;
-#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			ticker = 0;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp6_ = self->priv->albums;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp6__length1 = self->priv->albums_length1;
-#line 7512 "FacebookPublishing.c"
+#line 5514 "FacebookPublishing.c"
 			{
 				PublishingFacebookAlbum** album_collection = NULL;
 				gint album_collection_length1 = 0;
 				gint _album_collection_size_ = 0;
 				gint album_it = 0;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				album_collection = _tmp6_;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				album_collection_length1 = _tmp6__length1;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				for (album_it = 0; album_it < _tmp6__length1; album_it = album_it + 1) {
-#line 7524 "FacebookPublishing.c"
+#line 5526 "FacebookPublishing.c"
 					PublishingFacebookAlbum* _tmp7_ = NULL;
 					PublishingFacebookAlbum* album = NULL;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					_tmp7_ = _publishing_facebook_album_ref0 (album_collection[album_it]);
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 					album = _tmp7_;
-#line 7531 "FacebookPublishing.c"
+#line 5533 "FacebookPublishing.c"
 					{
 						GtkComboBoxText* _tmp8_ = NULL;
 						PublishingFacebookAlbum* _tmp9_ = NULL;
@@ -7571,101 +5557,101 @@ void publishing_facebook_publishing_options_pane_installed (PublishingFacebookPu
 						PublishingFacebookAlbum* _tmp11_ = NULL;
 						const gchar* _tmp12_ = NULL;
 						gint _tmp14_ = 0;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp8_ = self->priv->existing_albums_combo;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp9_ = album;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp10_ = _tmp9_->name;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						gtk_combo_box_text_append_text (_tmp8_, _tmp10_);
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp11_ = album;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp12_ = _tmp11_->name;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						if (g_strcmp0 (_tmp12_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME) == 0) {
-#line 7553 "FacebookPublishing.c"
+#line 5555 "FacebookPublishing.c"
 							gint _tmp13_ = 0;
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 							_tmp13_ = ticker;
-#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 							default_album_seq_num = _tmp13_;
-#line 7559 "FacebookPublishing.c"
+#line 5561 "FacebookPublishing.c"
 						}
-#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_tmp14_ = ticker;
-#line 1173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						ticker = _tmp14_ + 1;
-#line 1169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 						_publishing_facebook_album_unref0 (album);
-#line 7567 "FacebookPublishing.c"
+#line 5569 "FacebookPublishing.c"
 					}
 				}
 			}
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp15_ = default_album_seq_num;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_tmp15_ != -1) {
-#line 7575 "FacebookPublishing.c"
+#line 5577 "FacebookPublishing.c"
 				GtkComboBoxText* _tmp16_ = NULL;
 				gint _tmp17_ = 0;
 				GtkRadioButton* _tmp18_ = NULL;
 				GtkEntry* _tmp19_ = NULL;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp16_ = self->priv->existing_albums_combo;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp17_ = default_album_seq_num;
-#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), _tmp17_);
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp18_ = self->priv->use_existing_radio;
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp19_ = self->priv->new_album_entry;
-#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7594 "FacebookPublishing.c"
+#line 5596 "FacebookPublishing.c"
 			} else {
 				GtkRadioButton* _tmp20_ = NULL;
 				GtkComboBoxText* _tmp21_ = NULL;
 				GtkComboBoxText* _tmp22_ = NULL;
 				GtkEntry* _tmp23_ = NULL;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp20_ = self->priv->create_new_radio;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp21_ = self->priv->existing_albums_combo;
-#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp22_ = self->priv->existing_albums_combo;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp23_ = self->priv->new_album_entry;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 928 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				gtk_entry_set_text (_tmp23_, PUBLISHING_FACEBOOK_DEFAULT_ALBUM_NAME);
-#line 7616 "FacebookPublishing.c"
+#line 5618 "FacebookPublishing.c"
 			}
 		}
 	}
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = self->priv->publish_button;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget));
-#line 7624 "FacebookPublishing.c"
+#line 5626 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_notify_logout (PublishingFacebookPublishingOptionsPane* self) {
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 937 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 7633 "FacebookPublishing.c"
+#line 5635 "FacebookPublishing.c"
 }
 
 
@@ -7675,23 +5661,23 @@ static void publishing_facebook_publishing_options_pane_notify_publish (Publishi
 	PublishingFacebookResolution _tmp2_ = 0;
 	GtkCheckButton* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (privacy_setting != NULL);
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = target_album;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = privacy_setting;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = target_resolution;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->strip_metadata_check;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp0_, _tmp1_, _tmp2_, _tmp4_);
-#line 7659 "FacebookPublishing.c"
+#line 5661 "FacebookPublishing.c"
 }
 
 
@@ -7700,58 +5686,58 @@ static GtkWidget* publishing_facebook_publishing_options_pane_real_get_widget (S
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 1201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 945 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7678 "FacebookPublishing.c"
+#line 5680 "FacebookPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_facebook_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingFacebookPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 7691 "FacebookPublishing.c"
+#line 5693 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout (PublishingFacebookPublishingOptionsPane* _sender, gpointer self) {
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_notify_logout ((PublishingFacebookPublishingOptionsPane*) self);
-#line 7698 "FacebookPublishing.c"
+#line 5700 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish (PublishingFacebookPublishingOptionsPane* _sender, const gchar* target_album, const gchar* privacy_setting, PublishingFacebookResolution target_resolution, gboolean strip_metadata, gpointer self) {
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_notify_publish ((PublishingFacebookPublishingOptionsPane*) self, target_album, privacy_setting, target_resolution);
-#line 7705 "FacebookPublishing.c"
+#line 5707 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingFacebookPublishingOptionsPane * self;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 952 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (self, "logout", (GCallback) _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout, self, 0);
-#line 1210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect_object (self, "publish", (GCallback) _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish, self, 0);
-#line 1212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_installed (self);
-#line 7719 "FacebookPublishing.c"
+#line 5721 "FacebookPublishing.c"
 }
 
 
@@ -7759,17 +5745,17 @@ static void publishing_facebook_publishing_options_pane_real_on_pane_uninstalled
 	PublishingFacebookPublishingOptionsPane * self;
 	guint _tmp0_ = 0U;
 	guint _tmp1_ = 0U;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 960 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _publishing_facebook_publishing_options_pane_notify_logout_publishing_facebook_publishing_options_pane_logout, self);
-#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 1217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (self, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_publishing_options_pane_notify_publish_publishing_facebook_publishing_options_pane_publish, self);
-#line 7737 "FacebookPublishing.c"
+#line 5739 "FacebookPublishing.c"
 }
 
 
@@ -7780,27 +5766,27 @@ static void g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN (GClosure *
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (n_param_values == 5);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = closure->data;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 7756 "FacebookPublishing.c"
+#line 5758 "FacebookPublishing.c"
 	} else {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = closure->data;
-#line 7762 "FacebookPublishing.c"
+#line 5764 "FacebookPublishing.c"
 	}
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback = (GMarshalFunc_VOID__STRING_STRING_ENUM_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback (data1, g_value_get_string (param_values + 1), g_value_get_string (param_values + 2), g_value_get_enum (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 7768 "FacebookPublishing.c"
+#line 5770 "FacebookPublishing.c"
 }
 
 
@@ -7810,248 +5796,248 @@ static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_fac
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (description != NULL, NULL);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (privacy_setting != NULL, NULL);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookPublishingOptionsPanePrivacyDescription*) g_type_create_instance (object_type);
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = description;
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->description);
-#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->description = _tmp1_;
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = privacy_setting;
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_setting);
-#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->privacy_setting = _tmp3_;
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 7802 "FacebookPublishing.c"
+#line 5804 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookPublishingOptionsPanePrivacyDescription* publishing_facebook_publishing_options_pane_privacy_description_new (const gchar* description, const gchar* privacy_setting) {
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_publishing_options_pane_privacy_description_construct (PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting);
-#line 7809 "FacebookPublishing.c"
+#line 5811 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_privacy_description_init (GValue* value) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 7816 "FacebookPublishing.c"
+#line 5818 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_privacy_description_free_value (GValue* value) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer);
-#line 7825 "FacebookPublishing.c"
+#line 5827 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer);
-#line 7835 "FacebookPublishing.c"
+#line 5837 "FacebookPublishing.c"
 	} else {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7839 "FacebookPublishing.c"
+#line 5841 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7847 "FacebookPublishing.c"
+#line 5849 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 7854 "FacebookPublishing.c"
+#line 5856 "FacebookPublishing.c"
 		PublishingFacebookPublishingOptionsPanePrivacyDescription* object;
 		object = collect_values[0].v_pointer;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7861 "FacebookPublishing.c"
+#line 5863 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 7865 "FacebookPublishing.c"
+#line 5867 "FacebookPublishing.c"
 		}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_publishing_options_pane_privacy_description_ref (object);
-#line 7869 "FacebookPublishing.c"
+#line 5871 "FacebookPublishing.c"
 	} else {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7873 "FacebookPublishing.c"
+#line 5875 "FacebookPublishing.c"
 	}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 7877 "FacebookPublishing.c"
+#line 5879 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7888 "FacebookPublishing.c"
+#line 5890 "FacebookPublishing.c"
 	}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 7894 "FacebookPublishing.c"
+#line 5896 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7898 "FacebookPublishing.c"
+#line 5900 "FacebookPublishing.c"
 	} else {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 7902 "FacebookPublishing.c"
+#line 5904 "FacebookPublishing.c"
 	}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 7906 "FacebookPublishing.c"
+#line 5908 "FacebookPublishing.c"
 }
 
 
 static GParamSpec* publishing_facebook_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookPublishingOptionsPaneParamSpecPrivacyDescription* spec;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 7920 "FacebookPublishing.c"
+#line 5922 "FacebookPublishing.c"
 }
 
 
 static gpointer publishing_facebook_publishing_options_pane_value_get_privacy_description (const GValue* value) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7929 "FacebookPublishing.c"
+#line 5931 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* old;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 7949 "FacebookPublishing.c"
+#line 5951 "FacebookPublishing.c"
 	} else {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7953 "FacebookPublishing.c"
+#line 5955 "FacebookPublishing.c"
 	}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 7959 "FacebookPublishing.c"
+#line 5961 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* old;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 7978 "FacebookPublishing.c"
+#line 5980 "FacebookPublishing.c"
 	} else {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7982 "FacebookPublishing.c"
+#line 5984 "FacebookPublishing.c"
 	}
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_publishing_options_pane_privacy_description_unref (old);
-#line 7988 "FacebookPublishing.c"
+#line 5990 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_class_init (PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass * klass) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookPublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_facebook_publishing_options_pane_privacy_description_finalize;
-#line 7998 "FacebookPublishing.c"
+#line 6000 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_instance_init (PublishingFacebookPublishingOptionsPanePrivacyDescription * self) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 8005 "FacebookPublishing.c"
+#line 6007 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_finalize (PublishingFacebookPublishingOptionsPanePrivacyDescription* obj) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription * self;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, PublishingFacebookPublishingOptionsPanePrivacyDescription);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->description);
-#line 994 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->privacy_setting);
-#line 8019 "FacebookPublishing.c"
+#line 6021 "FacebookPublishing.c"
 }
 
 
@@ -8072,134 +6058,134 @@ static GType publishing_facebook_publishing_options_pane_privacy_description_get
 static gpointer publishing_facebook_publishing_options_pane_privacy_description_ref (gpointer instance) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* self;
 	self = instance;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 8044 "FacebookPublishing.c"
+#line 6046 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_privacy_description_unref (gpointer instance) {
 	PublishingFacebookPublishingOptionsPanePrivacyDescription* self;
 	self = instance;
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
-#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8057 "FacebookPublishing.c"
+#line 6059 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_publishing_options_pane_class_init (PublishingFacebookPublishingOptionsPaneClass * klass) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookPublishingOptionsPanePrivate));
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_facebook_publishing_options_pane_finalize;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("publish", PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__STRING_STRING_ENUM_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_STRING, G_TYPE_STRING, PUBLISHING_FACEBOOK_TYPE_RESOLUTION, G_TYPE_BOOLEAN);
-#line 8073 "FacebookPublishing.c"
+#line 6075 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_get_widget;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_get_preferred_geometry;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_on_pane_installed;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_facebook_publishing_options_pane_real_on_pane_uninstalled;
-#line 8088 "FacebookPublishing.c"
+#line 6090 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_instance_init (PublishingFacebookPublishingOptionsPane * self) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->use_existing_radio = NULL;
-#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->create_new_radio = NULL;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->existing_albums_combo = NULL;
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->visibility_combo = NULL;
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->new_album_entry = NULL;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publish_button = NULL;
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->how_to_label = NULL;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums = NULL;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums_length1 = 0;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publisher = NULL;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->resolution_combo = NULL;
-#line 8125 "FacebookPublishing.c"
+#line 6127 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_publishing_options_pane_finalize (GObject* obj) {
 	PublishingFacebookPublishingOptionsPane * self;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFacebookPublishingOptionsPane);
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 964 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->use_existing_radio);
-#line 965 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->create_new_radio);
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
-#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 968 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->new_album_entry);
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 710 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->how_to_label);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_facebook_album_unref), NULL);
-#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->privacy_descriptions = (_vala_array_free (self->priv->privacy_descriptions, self->priv->privacy_descriptions_length1, (GDestroyNotify) publishing_facebook_publishing_options_pane_privacy_description_unref), NULL);
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->possible_resolutions = (g_free (self->priv->possible_resolutions), NULL);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->resolution_combo);
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_OBJECT_CLASS (publishing_facebook_publishing_options_pane_parent_class)->finalize (obj);
-#line 8167 "FacebookPublishing.c"
+#line 6169 "FacebookPublishing.c"
 }
 
 
@@ -8219,52 +6205,52 @@ GType publishing_facebook_publishing_options_pane_get_type (void) {
 
 gchar* publishing_facebook_endpoint_to_uri (PublishingFacebookEndpoint self) {
 	gchar* result = NULL;
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (self) {
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT:
-#line 8191 "FacebookPublishing.c"
+#line 6193 "FacebookPublishing.c"
 		{
 			gchar* _tmp0_ = NULL;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp0_ = g_strdup ("https://graph.facebook.com/");
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp0_;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 8200 "FacebookPublishing.c"
+#line 6202 "FacebookPublishing.c"
 		}
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_VIDEO:
-#line 8204 "FacebookPublishing.c"
+#line 6206 "FacebookPublishing.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp1_ = g_strdup ("https://graph-video.facebook.com/");
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp1_;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 8213 "FacebookPublishing.c"
+#line 6215 "FacebookPublishing.c"
 		}
-#line 1227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION:
-#line 8217 "FacebookPublishing.c"
+#line 6219 "FacebookPublishing.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp2_ = g_strdup ("https://www.facebook.com/");
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			result = _tmp2_;
-#line 1235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return result;
-#line 8226 "FacebookPublishing.c"
+#line 6228 "FacebookPublishing.c"
 		}
 		default:
 		{
-#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 982 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_assert_not_reached ();
-#line 8232 "FacebookPublishing.c"
+#line 6234 "FacebookPublishing.c"
 		}
 	}
 }
@@ -8283,48 +6269,48 @@ GType publishing_facebook_endpoint_get_type (void) {
 
 
 static gchar* publishing_facebook_graph_message_real_get_uri (PublishingFacebookGraphMessage* self) {
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_facebook_graph_message_get_uri'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8255 "FacebookPublishing.c"
+#line 6257 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_graph_message_get_uri (PublishingFacebookGraphMessage* self) {
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 992 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_uri (self);
-#line 8264 "FacebookPublishing.c"
+#line 6266 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_graph_message_real_get_response_body (PublishingFacebookGraphMessage* self) {
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_critical ("Type `%s' does not implement abstract method `publishing_facebook_graph_message_get_response_body'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8273 "FacebookPublishing.c"
+#line 6275 "FacebookPublishing.c"
 }
 
 
 gchar* publishing_facebook_graph_message_get_response_body (PublishingFacebookGraphMessage* self) {
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (self), NULL);
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->get_response_body (self);
-#line 8282 "FacebookPublishing.c"
+#line 6284 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphMessage* publishing_facebook_graph_message_construct (GType object_type) {
 	PublishingFacebookGraphMessage* self = NULL;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphMessage*) g_type_create_instance (object_type);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8292 "FacebookPublishing.c"
+#line 6294 "FacebookPublishing.c"
 }
 
 
@@ -8335,243 +6321,243 @@ static void g_cclosure_user_marshal_VOID__INT_INT (GClosure * closure, GValue *
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = closure->data;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 8311 "FacebookPublishing.c"
+#line 6313 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		data2 = closure->data;
-#line 8317 "FacebookPublishing.c"
+#line 6319 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback = (GMarshalFunc_VOID__INT_INT) (marshal_data ? marshal_data : cc->callback);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	callback (data1, g_value_get_int (param_values + 1), g_value_get_int (param_values + 2), data2);
-#line 8323 "FacebookPublishing.c"
+#line 6325 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_graph_message_init (GValue* value) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8330 "FacebookPublishing.c"
+#line 6332 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_graph_message_free_value (GValue* value) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (value->data[0].v_pointer);
-#line 8339 "FacebookPublishing.c"
+#line 6341 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_graph_message_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_graph_message_ref (src_value->data[0].v_pointer);
-#line 8349 "FacebookPublishing.c"
+#line 6351 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8353 "FacebookPublishing.c"
+#line 6355 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_graph_message_peek_pointer (const GValue* value) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8361 "FacebookPublishing.c"
+#line 6363 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_message_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8368 "FacebookPublishing.c"
+#line 6370 "FacebookPublishing.c"
 		PublishingFacebookGraphMessage* object;
 		object = collect_values[0].v_pointer;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8375 "FacebookPublishing.c"
+#line 6377 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 8379 "FacebookPublishing.c"
+#line 6381 "FacebookPublishing.c"
 		}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_graph_message_ref (object);
-#line 8383 "FacebookPublishing.c"
+#line 6385 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8387 "FacebookPublishing.c"
+#line 6389 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8391 "FacebookPublishing.c"
+#line 6393 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_message_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookGraphMessage** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8402 "FacebookPublishing.c"
+#line 6404 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 8408 "FacebookPublishing.c"
+#line 6410 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8412 "FacebookPublishing.c"
+#line 6414 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 8416 "FacebookPublishing.c"
+#line 6418 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 8420 "FacebookPublishing.c"
+#line 6422 "FacebookPublishing.c"
 }
 
 
 GParamSpec* publishing_facebook_param_spec_graph_message (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookParamSpecGraphMessage* spec;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE), NULL);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8434 "FacebookPublishing.c"
+#line 6436 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_graph_message (const GValue* value) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE), NULL);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8443 "FacebookPublishing.c"
+#line 6445 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_graph_message (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphMessage* old;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_ref (value->data[0].v_pointer);
-#line 8463 "FacebookPublishing.c"
+#line 6465 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8467 "FacebookPublishing.c"
+#line 6469 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (old);
-#line 8473 "FacebookPublishing.c"
+#line 6475 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_graph_message (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphMessage* old;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE));
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8492 "FacebookPublishing.c"
+#line 6494 "FacebookPublishing.c"
 	} else {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8496 "FacebookPublishing.c"
+#line 6498 "FacebookPublishing.c"
 	}
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_message_unref (old);
-#line 8502 "FacebookPublishing.c"
+#line 6504 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_graph_message_class_init (PublishingFacebookGraphMessageClass * klass) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_message_parent_class = g_type_class_peek_parent (klass);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_message_finalize;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_uri = publishing_facebook_graph_message_real_get_uri;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_response_body = publishing_facebook_graph_message_real_get_response_body;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("data_transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, 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 8522 "FacebookPublishing.c"
+#line 6524 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_message_instance_init (PublishingFacebookGraphMessage * self) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 8529 "FacebookPublishing.c"
+#line 6531 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_message_finalize (PublishingFacebookGraphMessage* obj) {
 	PublishingFacebookGraphMessage * self;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 8539 "FacebookPublishing.c"
+#line 6541 "FacebookPublishing.c"
 }
 
 
@@ -8592,32 +6578,32 @@ GType publishing_facebook_graph_message_get_type (void) {
 gpointer publishing_facebook_graph_message_ref (gpointer instance) {
 	PublishingFacebookGraphMessage* self;
 	self = instance;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 8564 "FacebookPublishing.c"
+#line 6566 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_message_unref (gpointer instance) {
 	PublishingFacebookGraphMessage* self;
 	self = instance;
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_GRAPH_MESSAGE_GET_CLASS (self)->finalize (self);
-#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8577 "FacebookPublishing.c"
+#line 6579 "FacebookPublishing.c"
 	}
 }
 
 
 static void _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued (SoupSession* _sender, SoupMessage* msg, gpointer self) {
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_on_request_unqueued ((PublishingFacebookGraphSession*) self, msg);
-#line 8585 "FacebookPublishing.c"
+#line 6587 "FacebookPublishing.c"
 }
 
 
@@ -8627,51 +6613,51 @@ PublishingFacebookGraphSession* publishing_facebook_graph_session_construct (GTy
 	SoupSession* _tmp1_ = NULL;
 	SoupSession* _tmp2_ = NULL;
 	SoupSession* _tmp3_ = NULL;
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSession*) g_type_create_instance (object_type);
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = soup_session_new ();
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->soup_session);
-#line 1419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->soup_session = _tmp0_;
-#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->soup_session;
-#line 1420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp1_, "request-unqueued", (GCallback) _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued, self);
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = self->priv->soup_session;
-#line 1421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_set (_tmp2_, "timeout", (guint) 15, NULL);
-#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->access_token);
-#line 1422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->access_token = NULL;
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 1423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = NULL;
-#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->soup_session;
-#line 1424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_set (_tmp3_, "ssl-use-system-ca-file", TRUE, NULL);
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 8625 "FacebookPublishing.c"
+#line 6627 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookGraphSession* publishing_facebook_graph_session_new (void) {
-#line 1418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_construct (PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION);
-#line 8632 "FacebookPublishing.c"
+#line 6634 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_graph_message_ref0 (gpointer self) {
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_graph_message_ref (self) : NULL;
-#line 8639 "FacebookPublishing.c"
+#line 6641 "FacebookPublishing.c"
 }
 
 
@@ -8679,48 +6665,48 @@ static void publishing_facebook_graph_session_manage_message (PublishingFacebook
 	PublishingFacebookGraphMessage* _tmp0_ = NULL;
 	PublishingFacebookGraphMessage* _tmp1_ = NULL;
 	PublishingFacebookGraphMessage* _tmp2_ = NULL;
-#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (msg));
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->current_message;
-#line 1432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp0_ == NULL, "current_message == null");
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = msg;
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _publishing_facebook_graph_message_ref0 (_tmp1_);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 1434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = _tmp2_;
-#line 8663 "FacebookPublishing.c"
+#line 6665 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_unmanage_message (PublishingFacebookGraphSession* self, PublishingFacebookGraphMessage* msg) {
 	PublishingFacebookGraphMessage* _tmp0_ = NULL;
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (msg));
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->current_message;
-#line 1438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "current_message != null");
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 1440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_message = NULL;
-#line 8681 "FacebookPublishing.c"
+#line 6683 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data (SoupMessage* _sender, SoupBuffer* chunk, gpointer self) {
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data ((PublishingFacebookGraphSessionGraphMessageImpl*) self, chunk);
-#line 8688 "FacebookPublishing.c"
+#line 6690 "FacebookPublishing.c"
 }
 
 
@@ -8747,149 +6733,149 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 	guint _tmp27_ = 0U;
 	GError* _tmp68_ = NULL;
 	GError* _tmp80_ = NULL;
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (SOUP_IS_MESSAGE (msg));
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->current_message;
-#line 1444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "current_message != null");
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->current_message;
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _publishing_facebook_graph_message_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
-#line 1445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	real_message = _tmp2_;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = real_message;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = _tmp3_->soup_message;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = msg;
-#line 1446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp4_ == _tmp5_, "real_message.soup_message == msg");
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = msg;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_get (_tmp8_, "status-code", &_tmp9_, NULL);
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp10_ == ((guint) SOUP_STATUS_IO_ERROR)) {
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = TRUE;
-#line 8747 "FacebookPublishing.c"
+#line 6749 "FacebookPublishing.c"
 	} else {
 		SoupMessage* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
 		guint _tmp13_ = 0U;
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = msg;
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_object_get (_tmp11_, "status-code", &_tmp12_, NULL);
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = _tmp13_ == ((guint) SOUP_STATUS_MALFORMED);
-#line 8760 "FacebookPublishing.c"
+#line 6762 "FacebookPublishing.c"
 	}
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp7_) {
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = TRUE;
-#line 8766 "FacebookPublishing.c"
+#line 6768 "FacebookPublishing.c"
 	} else {
 		SoupMessage* _tmp14_ = NULL;
 		guint _tmp15_ = 0U;
 		guint _tmp16_ = 0U;
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = msg;
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_object_get (_tmp14_, "status-code", &_tmp15_, NULL);
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = _tmp15_;
-#line 1452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = _tmp16_ == ((guint) SOUP_STATUS_TRY_AGAIN);
-#line 8779 "FacebookPublishing.c"
+#line 6781 "FacebookPublishing.c"
 	}
-#line 1450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_) {
-#line 8783 "FacebookPublishing.c"
+#line 6785 "FacebookPublishing.c"
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp17_ = NULL;
 		SoupSession* _tmp18_ = NULL;
 		SoupMessage* _tmp19_ = NULL;
 		SoupMessage* _tmp20_ = NULL;
-#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = real_message;
-#line 1453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_->bytes_so_far = 0;
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = self->priv->soup_session;
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp19_ = msg;
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_session_queue_message (_tmp18_, _tmp20_, NULL, NULL);
-#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_publishing_facebook_graph_message_unref0 (real_message);
-#line 1455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 8804 "FacebookPublishing.c"
+#line 6806 "FacebookPublishing.c"
 	}
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = real_message;
-#line 1458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_unmanage_message (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = msg;
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = real_message;
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("wrote-body-data", soup_message_get_type (), &_tmp24_, NULL, FALSE);
-#line 1459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp22_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp24_, 0, NULL, (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, _tmp23_);
-#line 1461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_error_ = NULL;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = msg;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_object_get (_tmp25_, "status-code", &_tmp26_, NULL);
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = _tmp26_;
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	switch (_tmp27_) {
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_OK:
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CREATED:
-#line 8832 "FacebookPublishing.c"
+#line 6834 "FacebookPublishing.c"
 		{
-#line 1467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 8836 "FacebookPublishing.c"
+#line 6838 "FacebookPublishing.c"
 		}
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case PUBLISHING_FACEBOOK_EXPIRED_SESSION_STATUS_CODE:
-#line 8840 "FacebookPublishing.c"
+#line 6842 "FacebookPublishing.c"
 		{
 			GError* _tmp28_ = NULL;
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp28_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_EXPIRED_SESSION, "OAuth Access Token has Expired. Logout user.");
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp28_;
-#line 1472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 8851 "FacebookPublishing.c"
+#line 6853 "FacebookPublishing.c"
 		}
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_RESOLVE:
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_RESOLVE_PROXY:
-#line 8857 "FacebookPublishing.c"
+#line 6859 "FacebookPublishing.c"
 		{
 			PublishingFacebookGraphSessionGraphMessageImpl* _tmp29_ = NULL;
 			gchar* _tmp30_ = NULL;
@@ -8898,35 +6884,35 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			guint _tmp33_ = 0U;
 			guint _tmp34_ = 0U;
 			GError* _tmp35_ = NULL;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp29_ = real_message;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp30_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp31_ = _tmp30_;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp32_ = msg;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_object_get (_tmp32_, "status-code", &_tmp33_, NULL);
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp34_ = _tmp33_;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp35_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to resolve %s (error code %u)", _tmp31_, _tmp34_);
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp35_;
-#line 1476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp31_);
-#line 1478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 8888 "FacebookPublishing.c"
+#line 6890 "FacebookPublishing.c"
 		}
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_CONNECT:
-#line 1462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		case SOUP_STATUS_CANT_CONNECT_PROXY:
-#line 8894 "FacebookPublishing.c"
+#line 6896 "FacebookPublishing.c"
 		{
 			PublishingFacebookGraphSessionGraphMessageImpl* _tmp36_ = NULL;
 			gchar* _tmp37_ = NULL;
@@ -8935,44 +6921,44 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 			guint _tmp40_ = 0U;
 			guint _tmp41_ = 0U;
 			GError* _tmp42_ = NULL;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp36_ = real_message;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp37_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp38_ = _tmp37_;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp39_ = msg;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_object_get (_tmp39_, "status-code", &_tmp40_, NULL);
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp41_ = _tmp40_;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp42_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Unable to connect to %s (error code %u)", _tmp38_, _tmp41_);
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp42_;
-#line 1482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp38_);
-#line 1484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 8925 "FacebookPublishing.c"
+#line 6927 "FacebookPublishing.c"
 		}
 		default:
 		{
 			SoupMessage* _tmp43_ = NULL;
 			guint _tmp44_ = 0U;
 			guint _tmp45_ = 0U;
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp43_ = msg;
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_object_get (_tmp43_, "status-code", &_tmp44_, NULL);
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp45_ = _tmp44_;
-#line 1489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_tmp45_ >= ((guint) 100)) {
-#line 8940 "FacebookPublishing.c"
+#line 6942 "FacebookPublishing.c"
 				PublishingFacebookGraphSessionGraphMessageImpl* _tmp46_ = NULL;
 				gchar* _tmp47_ = NULL;
 				gchar* _tmp48_ = NULL;
@@ -8984,37 +6970,37 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 				gchar* _tmp54_ = NULL;
 				gchar* _tmp55_ = NULL;
 				GError* _tmp56_ = NULL;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp46_ = real_message;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp47_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp48_ = _tmp47_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp49_ = msg;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp49_, "status-code", &_tmp50_, NULL);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp51_ = _tmp50_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp52_ = msg;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp52_, "reason-phrase", &_tmp53_, NULL);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp54_ = _tmp53_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp55_ = _tmp54_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp56_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Service %s returned HTTP status code %u %s", _tmp48_, _tmp51_, _tmp55_);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_error_free0 (_error_);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_error_ = _tmp56_;
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp55_);
-#line 1490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp48_);
-#line 8982 "FacebookPublishing.c"
+#line 6984 "FacebookPublishing.c"
 			} else {
 				SoupMessage* _tmp57_ = NULL;
 				gchar* _tmp58_ = NULL;
@@ -9027,210 +7013,172 @@ static void publishing_facebook_graph_session_on_request_unqueued (PublishingFac
 				guint _tmp65_ = 0U;
 				guint _tmp66_ = 0U;
 				GError* _tmp67_ = NULL;
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp57_ = msg;
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp57_, "reason-phrase", &_tmp58_, NULL);
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp59_ = _tmp58_;
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp60_ = _tmp59_;
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-				g_debug ("FacebookPublishing.vala:1494: %s", _tmp60_);
-#line 1494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+				g_debug ("FacebookPublishing.vala:1238: %s", _tmp60_);
+#line 1238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp60_);
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp61_ = real_message;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp62_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp63_ = _tmp62_;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp64_ = msg;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				g_object_get (_tmp64_, "status-code", &_tmp65_, NULL);
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp66_ = _tmp65_;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_tmp67_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_NO_ANSWER, "Failure communicating with %s (error code %u)", _tmp63_, _tmp66_);
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_error_free0 (_error_);
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_error_ = _tmp67_;
-#line 1495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 				_g_free0 (_tmp63_);
-#line 9027 "FacebookPublishing.c"
+#line 7029 "FacebookPublishing.c"
 			}
-#line 1499 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			break;
-#line 9031 "FacebookPublishing.c"
+#line 7033 "FacebookPublishing.c"
 		}
 	}
-#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp68_ = _error_;
-#line 1503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp68_ == NULL) {
-#line 9038 "FacebookPublishing.c"
+#line 7040 "FacebookPublishing.c"
 		gboolean _tmp69_ = FALSE;
 		SoupMessage* _tmp70_ = NULL;
 		SoupMessageBody* _tmp71_ = NULL;
 		guint8* _tmp72_ = NULL;
 		gint _tmp72__length1 = 0;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp70_ = msg;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp71_ = _tmp70_->response_body;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp72_ = _tmp71_->data;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp72__length1 = (gint) _tmp71_->length;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp72_ == NULL) {
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp69_ = TRUE;
-#line 9056 "FacebookPublishing.c"
+#line 7058 "FacebookPublishing.c"
 		} else {
 			SoupMessage* _tmp73_ = NULL;
 			SoupMessageBody* _tmp74_ = NULL;
 			guint8* _tmp75_ = NULL;
 			gint _tmp75__length1 = 0;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp73_ = msg;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp74_ = _tmp73_->response_body;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp75_ = _tmp74_->data;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp75__length1 = (gint) _tmp74_->length;
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp69_ = _tmp75__length1 == 0;
-#line 9072 "FacebookPublishing.c"
+#line 7074 "FacebookPublishing.c"
 		}
-#line 1504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (_tmp69_) {
-#line 9076 "FacebookPublishing.c"
+#line 7078 "FacebookPublishing.c"
 			PublishingFacebookGraphSessionGraphMessageImpl* _tmp76_ = NULL;
 			gchar* _tmp77_ = NULL;
 			gchar* _tmp78_ = NULL;
 			GError* _tmp79_ = NULL;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp76_ = real_message;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp77_ = publishing_facebook_graph_message_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage));
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp78_ = _tmp77_;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_tmp79_ = g_error_new (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "No response data from %s", _tmp78_);
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_error_free0 (_error_);
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_error_ = _tmp79_;
-#line 1505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (_tmp78_);
-#line 9095 "FacebookPublishing.c"
+#line 7097 "FacebookPublishing.c"
 		}
 	}
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp80_ = _error_;
-#line 1508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp80_ == NULL) {
-#line 9102 "FacebookPublishing.c"
+#line 7104 "FacebookPublishing.c"
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp81_ = NULL;
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp81_ = real_message;
-#line 1509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "completed");
-#line 9108 "FacebookPublishing.c"
+#line 7110 "FacebookPublishing.c"
 	} else {
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp82_ = NULL;
 		GError* _tmp83_ = NULL;
-#line 1511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp82_ = real_message;
-#line 1511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp83_ = _error_;
-#line 1511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "failed", _tmp83_);
-#line 9118 "FacebookPublishing.c"
+#line 7120 "FacebookPublishing.c"
 	}
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_error_free0 (_error_);
-#line 1443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (real_message);
-#line 9124 "FacebookPublishing.c"
+#line 7126 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_authenticate (PublishingFacebookGraphSession* self, const gchar* access_token) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (access_token != NULL);
-#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = access_token;
-#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->access_token);
-#line 1515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->access_token = _tmp1_;
-#line 1516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "authenticated");
-#line 9145 "FacebookPublishing.c"
+#line 7147 "FacebookPublishing.c"
 }
 
 
 gboolean publishing_facebook_graph_session_is_authenticated (PublishingFacebookGraphSession* self) {
 	gboolean result = FALSE;
 	const gchar* _tmp0_ = NULL;
-#line 1519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), FALSE);
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->access_token;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp0_ != NULL;
-#line 1520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 9160 "FacebookPublishing.c"
-}
-
-
-gchar* publishing_facebook_graph_session_get_access_token (PublishingFacebookGraphSession* self) {
-	gchar* result = NULL;
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-#line 1523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_graph_session_is_authenticated (self);
-#line 1524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_vala_assert (_tmp0_, "is_authenticated()");
-#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp1_ = self->priv->access_token;
-#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = _tmp2_;
-#line 1525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	return result;
-#line 9183 "FacebookPublishing.c"
-}
-
-
-PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_endpoint_test (PublishingFacebookGraphSession* self) {
-	PublishingFacebookGraphMessage* result = NULL;
-	PublishingFacebookGraphSessionGraphEndpointProbeMessage* _tmp0_ = NULL;
-#line 1528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	_tmp0_ = publishing_facebook_graph_session_graph_endpoint_probe_message_new (self);
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9198 "FacebookPublishing.c"
+#line 7162 "FacebookPublishing.c"
 }
 
 
@@ -9239,21 +7187,21 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_query (Pub
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	PublishingFacebookGraphSessionGraphQueryMessage* _tmp2_ = NULL;
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (resource_path != NULL, NULL);
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = resource_path;
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->access_token;
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishing_facebook_graph_session_graph_query_message_new (self, _tmp0_, _tmp1_);
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9221 "FacebookPublishing.c"
+#line 7185 "FacebookPublishing.c"
 }
 
 
@@ -9265,29 +7213,29 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_upload (Pu
 	gboolean _tmp3_ = FALSE;
 	const gchar* _tmp4_ = NULL;
 	PublishingFacebookGraphSessionGraphUploadMessage* _tmp5_ = NULL;
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (resource_path != NULL, NULL);
-#line 1536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->access_token;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = resource_path;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishable;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = suppress_titling;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = resource_privacy;
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = publishing_facebook_graph_session_graph_upload_message_new (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9255 "FacebookPublishing.c"
+#line 7219 "FacebookPublishing.c"
 }
 
 
@@ -9297,25 +7245,25 @@ PublishingFacebookGraphMessage* publishing_facebook_graph_session_new_create_alb
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	PublishingFacebookGraphSessionGraphCreateAlbumMessage* _tmp3_ = NULL;
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self), NULL);
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (album_name != NULL, NULL);
-#line 1542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (privacy != NULL, NULL);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->access_token;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = album_name;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = privacy;
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = publishing_facebook_graph_session_graph_create_album_message_new (self, _tmp0_, _tmp1_, _tmp2_);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage);
-#line 1543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9283 "FacebookPublishing.c"
+#line 7247 "FacebookPublishing.c"
 }
 
 
@@ -9333,81 +7281,81 @@ void publishing_facebook_graph_session_send_message (PublishingFacebookGraphSess
 	gchar* _tmp9_ = NULL;
 	PublishingFacebookGraphSessionGraphMessageImpl* _tmp10_ = NULL;
 	gboolean _tmp11_ = FALSE;
-#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _publishing_facebook_graph_message_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
-#line 1547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	real_message = _tmp1_;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = real_message;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _tmp2_->soup_message;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = soup_message_get_uri (_tmp3_);
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = soup_uri_to_string (_tmp5_, FALSE);
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = g_strconcat ("making HTTP request to URI: ", _tmp7_, NULL);
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
-	g_debug ("FacebookPublishing.vala:1549: %s", _tmp9_);
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	g_debug ("FacebookPublishing.vala:1290: %s", _tmp9_);
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 1549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = real_message;
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (_tmp10_);
-#line 1551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp11_) {
-#line 9339 "FacebookPublishing.c"
+#line 7303 "FacebookPublishing.c"
 		PublishingFacebookGraphMessage* _tmp12_ = NULL;
 		SoupSession* _tmp13_ = NULL;
 		PublishingFacebookGraphSessionGraphMessageImpl* _tmp14_ = NULL;
 		SoupMessage* _tmp15_ = NULL;
 		SoupMessage* _tmp16_ = NULL;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = message;
-#line 1552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_manage_message (self, _tmp12_);
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = self->priv->soup_session;
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = real_message;
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = _tmp14_->soup_message;
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 1553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_session_queue_message (_tmp13_, _tmp16_, NULL, NULL);
-#line 9359 "FacebookPublishing.c"
+#line 7323 "FacebookPublishing.c"
 	}
-#line 1546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (real_message);
-#line 9363 "FacebookPublishing.c"
+#line 7327 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_stop_transactions (PublishingFacebookGraphSession* self) {
 	SoupSession* _tmp0_ = NULL;
-#line 1557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (self));
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->soup_session;
-#line 1558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_session_abort (_tmp0_);
-#line 9375 "FacebookPublishing.c"
+#line 7339 "FacebookPublishing.c"
 }
 
 
@@ -9421,39 +7369,39 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 	PublishingFacebookEndpoint _tmp4_ = 0;
 	gchar* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (relative_uri != NULL, NULL);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphMessageImpl*) publishing_facebook_graph_message_construct (object_type);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = method;
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1007 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->method = _tmp0_;
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = access_token;
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->access_token);
-#line 1264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->access_token = _tmp2_;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = host_session;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->host_session = _tmp3_;
-#line 1266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1010 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->bytes_so_far = 0;
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = endpoint;
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = publishing_facebook_endpoint_to_uri (_tmp4_);
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	endpoint_uri = _tmp5_;
-#line 9421 "FacebookPublishing.c"
+#line 7385 "FacebookPublishing.c"
 	{
 		GRegex* starting_slashes = NULL;
 		GRegex* _tmp6_ = NULL;
@@ -9465,129 +7413,129 @@ static PublishingFacebookGraphSessionGraphMessageImpl* publishing_facebook_graph
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = g_regex_new ("^/+", 0, 0, &_inner_error_);
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		starting_slashes = _tmp6_;
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 9441 "FacebookPublishing.c"
-				goto __catch5_g_regex_error;
+#line 7405 "FacebookPublishing.c"
+				goto __catch4_g_regex_error;
 			}
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (endpoint_uri);
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 9452 "FacebookPublishing.c"
+#line 7416 "FacebookPublishing.c"
 		}
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = starting_slashes;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = relative_uri;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = g_regex_replace (_tmp8_, _tmp9_, (gssize) -1, 0, "", 0, &_inner_error_);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = _tmp10_;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_regex_unref0 (starting_slashes);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 9468 "FacebookPublishing.c"
-				goto __catch5_g_regex_error;
+#line 7432 "FacebookPublishing.c"
+				goto __catch4_g_regex_error;
 			}
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_regex_unref0 (starting_slashes);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			_g_free0 (endpoint_uri);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 9481 "FacebookPublishing.c"
+#line 7445 "FacebookPublishing.c"
 		}
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = endpoint_uri;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = _tmp7_;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = NULL;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = g_strconcat (_tmp11_, _tmp13_, NULL);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (self->uri);
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->uri = _tmp14_;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1015 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_regex_unref0 (starting_slashes);
-#line 9503 "FacebookPublishing.c"
+#line 7467 "FacebookPublishing.c"
 	}
-	goto __finally5;
-	__catch5_g_regex_error:
+	goto __finally4;
+	__catch4_g_regex_error:
 	{
 		GError* err = NULL;
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		err = _inner_error_;
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1017 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_assert_not_reached ();
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (err);
-#line 9517 "FacebookPublishing.c"
+#line 7481 "FacebookPublishing.c"
 	}
-	__finally5:
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	__finally4:
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (endpoint_uri);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return NULL;
-#line 9530 "FacebookPublishing.c"
+#line 7494 "FacebookPublishing.c"
 	}
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (endpoint_uri);
-#line 1261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 9536 "FacebookPublishing.c"
+#line 7500 "FacebookPublishing.c"
 }
 
 
 static gboolean publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self) {
 	gboolean result = FALSE;
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = TRUE;
-#line 1278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1022 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9546 "FacebookPublishing.c"
+#line 7510 "FacebookPublishing.c"
 }
 
 
 gboolean publishing_facebook_graph_session_graph_message_impl_prepare_for_transmission (PublishingFacebookGraphSessionGraphMessageImpl* self) {
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_MESSAGE_IMPL (self), FALSE);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_MESSAGE_IMPL_GET_CLASS (self)->prepare_for_transmission (self);
-#line 9555 "FacebookPublishing.c"
+#line 7519 "FacebookPublishing.c"
 }
 
 
@@ -9596,17 +7544,17 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_uri
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl);
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->uri;
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp1_;
-#line 1282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9574 "FacebookPublishing.c"
+#line 7538 "FacebookPublishing.c"
 }
 
 
@@ -9618,23 +7566,23 @@ static gchar* publishing_facebook_graph_session_graph_message_impl_real_get_resp
 	guint8* _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
 	gchar* _tmp3_ = NULL;
-#line 1285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->soup_message;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = _tmp0_->response_body;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_->data;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2__length1 = (gint) _tmp1_->length;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = g_strdup ((const gchar*) _tmp2_);
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = _tmp3_;
-#line 1286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1030 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 9602 "FacebookPublishing.c"
+#line 7566 "FacebookPublishing.c"
 }
 
 
@@ -9646,44 +7594,44 @@ static void publishing_facebook_graph_session_graph_message_impl_on_wrote_body_d
 	SoupMessage* _tmp4_ = NULL;
 	SoupMessageBody* _tmp5_ = NULL;
 	gint64 _tmp6_ = 0LL;
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_GRAPH_SESSION_IS_GRAPH_MESSAGE_IMPL (self));
-#line 1289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (chunk != NULL);
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->bytes_so_far;
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = chunk;
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp1_->length;
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->bytes_so_far = _tmp0_ + ((gint) _tmp2_);
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->bytes_so_far;
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = self->soup_message;
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_->request_body;
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_->length;
-#line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "data-transmitted", _tmp3_, (gint) _tmp6_);
-#line 9636 "FacebookPublishing.c"
+#line 7600 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_message_impl_class_init (PublishingFacebookGraphSessionGraphMessageImplClass * klass) {
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_message_impl_parent_class = g_type_class_peek_parent (klass);
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_session_graph_message_impl_finalize;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = publishing_facebook_graph_session_graph_message_impl_real_prepare_for_transmission;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_uri = publishing_facebook_graph_session_graph_message_impl_real_get_uri;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->get_response_body = publishing_facebook_graph_session_graph_message_impl_real_get_response_body;
-#line 9651 "FacebookPublishing.c"
+#line 7615 "FacebookPublishing.c"
 }
 
 
@@ -9693,17 +7641,17 @@ static void publishing_facebook_graph_session_graph_message_impl_instance_init (
 
 static void publishing_facebook_graph_session_graph_message_impl_finalize (PublishingFacebookGraphMessage* obj) {
 	PublishingFacebookGraphSessionGraphMessageImpl * self;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl);
-#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->uri);
-#line 1256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->access_token);
-#line 1257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->soup_message);
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_CLASS (publishing_facebook_graph_session_graph_message_impl_parent_class)->finalize (obj);
-#line 9671 "FacebookPublishing.c"
+#line 7635 "FacebookPublishing.c"
 }
 
 
@@ -9720,9 +7668,9 @@ static GType publishing_facebook_graph_session_graph_message_impl_get_type (void
 
 
 static void _vala_SoupURI_free (SoupURI* self) {
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_uri_get_type (), self);
-#line 9690 "FacebookPublishing.c"
+#line 7654 "FacebookPublishing.c"
 }
 
 
@@ -9745,79 +7693,79 @@ static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_grap
 	gchar* _tmp13_ = NULL;
 	SoupMessage* _tmp14_ = NULL;
 	SoupMessage* _tmp15_ = NULL;
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (relative_uri != NULL, NULL);
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = host_session;
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = relative_uri;
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = access_token;
-#line 1299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1043 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphQueryMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, _tmp1_, _tmp2_, PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = g_strconcat (_tmp3_, "?access_token=", NULL);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = access_token;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = g_strconcat (_tmp5_, _tmp6_, NULL);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = soup_uri_new (_tmp8_);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp5_);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	destination_uri = _tmp10_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = publishing_rest_support_http_method_to_string (_tmp11_);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = _tmp12_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = soup_message_new_from_uri (_tmp13_, destination_uri);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp14_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp13_);
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1047 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp15_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (destination_uri);
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 9771 "FacebookPublishing.c"
+#line 7735 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphQueryMessage* publishing_facebook_graph_session_graph_query_message_new (PublishingFacebookGraphSession* host_session, const gchar* relative_uri, const gchar* access_token) {
-#line 1297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_query_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_QUERY_MESSAGE, host_session, relative_uri, access_token);
-#line 9778 "FacebookPublishing.c"
+#line 7742 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_query_message_class_init (PublishingFacebookGraphSessionGraphQueryMessageClass * klass) {
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_query_message_parent_class = g_type_class_peek_parent (klass);
-#line 9785 "FacebookPublishing.c"
+#line 7749 "FacebookPublishing.c"
 }
 
 
@@ -9848,55 +7796,55 @@ static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_faceb
 	SoupURI* _tmp6_ = NULL;
 	SoupMessage* _tmp7_ = NULL;
 	SoupMessage* _tmp8_ = NULL;
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = host_session;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1053 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphEndpointProbeMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET, "/", "", PUBLISHING_FACEBOOK_ENDPOINT_TEST_CONNECTION);
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = soup_uri_new (_tmp4_);
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = soup_message_new_from_uri (_tmp3_, _tmp6_);
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp7_;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (_tmp6_);
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1057 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp8_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 9850 "FacebookPublishing.c"
+#line 7814 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphEndpointProbeMessage* publishing_facebook_graph_session_graph_endpoint_probe_message_new (PublishingFacebookGraphSession* host_session) {
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1052 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_endpoint_probe_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_ENDPOINT_PROBE_MESSAGE, host_session);
-#line 9857 "FacebookPublishing.c"
+#line 7821 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_endpoint_probe_message_class_init (PublishingFacebookGraphSessionGraphEndpointProbeMessageClass * klass) {
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_endpoint_probe_message_parent_class = g_type_class_peek_parent (klass);
-#line 9864 "FacebookPublishing.c"
+#line 7828 "FacebookPublishing.c"
 }
 
 
@@ -9927,21 +7875,21 @@ static gchar* g_date_time_to_string (GDateTime* self) {
 	result = _tmp0_;
 #line 2835 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 9895 "FacebookPublishing.c"
+#line 7859 "FacebookPublishing.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 9902 "FacebookPublishing.c"
+#line 7866 "FacebookPublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 9909 "FacebookPublishing.c"
+#line 7873 "FacebookPublishing.c"
 }
 
 
@@ -10014,64 +7962,64 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 	SoupMessage* _tmp79_ = NULL;
 	SoupMessageBody* _tmp80_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (relative_uri != NULL, NULL);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = publishable;
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = spit_publishing_publishable_get_media_type (_tmp1_);
-#line 1325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1069 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp2_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_VIDEO;
-#line 9998 "FacebookPublishing.c"
+#line 7962 "FacebookPublishing.c"
 	} else {
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT;
-#line 10002 "FacebookPublishing.c"
+#line 7966 "FacebookPublishing.c"
 	}
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = host_session;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = relative_uri;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = access_token;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1068 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphUploadMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, _tmp4_, _tmp5_, _tmp0_);
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = publishable;
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = spit_publishing_publishable_get_media_type (_tmp7_);
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp8_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = TRUE;
-#line 10020 "FacebookPublishing.c"
+#line 7984 "FacebookPublishing.c"
 	} else {
 		const gchar* _tmp9_ = NULL;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = resource_privacy;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = _tmp9_ != NULL;
-#line 10027 "FacebookPublishing.c"
+#line 7991 "FacebookPublishing.c"
 	}
-#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1075 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp6_, "publishable.get_media_type() != Spit.Publishing.Publisher.MediaType.VIDEO ||                 resource_privacy != null");
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = publishable;
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishable = _tmp11_;
-#line 10039 "FacebookPublishing.c"
+#line 8003 "FacebookPublishing.c"
 	{
 		GMappedFile* _tmp12_ = NULL;
 		SpitPublishingPublishable* _tmp13_ = NULL;
@@ -10082,330 +8030,330 @@ static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_gra
 		GMappedFile* _tmp18_ = NULL;
 		GMappedFile* _tmp19_ = NULL;
 		GMappedFile* _tmp20_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = publishable;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = spit_publishing_publishable_get_serialized_file (_tmp13_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = _tmp14_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp16_ = g_file_get_path (_tmp15_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = _tmp16_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp18_ = g_mapped_file_new (_tmp17_, FALSE, &_inner_error_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp19_ = _tmp18_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp17_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (_tmp15_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = _tmp19_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 10074 "FacebookPublishing.c"
-				goto __catch6_g_file_error;
+#line 8038 "FacebookPublishing.c"
+				goto __catch5_g_file_error;
 			}
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return NULL;
-#line 10083 "FacebookPublishing.c"
+#line 8047 "FacebookPublishing.c"
 		}
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp20_ = _tmp12_;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_mapped_file_unref0 (self->priv->mapped_file);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->priv->mapped_file = _tmp20_;
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_mapped_file_unref0 (_tmp12_);
-#line 10095 "FacebookPublishing.c"
+#line 8059 "FacebookPublishing.c"
 	}
-	goto __finally6;
-	__catch6_g_file_error:
+	goto __finally5;
+	__catch5_g_file_error:
 	{
 		GError* e = NULL;
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		e = _inner_error_;
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_inner_error_ = NULL;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (e);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1085 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return self;
-#line 10109 "FacebookPublishing.c"
+#line 8073 "FacebookPublishing.c"
 	}
-	__finally6:
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+	__finally5:
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return NULL;
-#line 10120 "FacebookPublishing.c"
+#line 8084 "FacebookPublishing.c"
 	}
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = publishing_rest_support_http_method_to_string (_tmp21_);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = _tmp22_;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = soup_uri_new (_tmp24_);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = _tmp25_;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = soup_message_new_from_uri (_tmp23_, _tmp26_);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp27_;
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (_tmp26_);
-#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp23_);
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp28_, "wrote-body-data", (GCallback) _publishing_facebook_graph_session_graph_message_impl_on_wrote_body_data_soup_message_wrote_body_data, G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl));
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp29_ = self->priv->mapped_file;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp30_ = g_mapped_file_get_contents (_tmp29_);
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	payload = (guint8*) _tmp30_;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	payload_length1 = -1;
-#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_payload_size_ = payload_length1;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp31_ = self->priv->mapped_file;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp32_ = g_mapped_file_get_length (_tmp31_);
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	payload_length1 = (gint) _tmp32_;
-#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp33_ = payload_length1;
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34_ = payload;
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34__length1 = payload_length1;
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp35_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, _tmp34_, _tmp34__length1);
-#line 1350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	image_data = _tmp35_;
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp36_ = soup_multipart_new ("multipart/form-data");
-#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	mp_envelope = _tmp36_;
-#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp37_ = mp_envelope;
-#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp38_ = access_token;
-#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (_tmp37_, "access_token", _tmp38_);
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp39_ = publishable;
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp40_ = spit_publishing_publishable_get_media_type (_tmp39_);
-#line 1356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp40_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 10190 "FacebookPublishing.c"
+#line 8154 "FacebookPublishing.c"
 		SoupMultipart* _tmp41_ = NULL;
 		const gchar* _tmp42_ = NULL;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp41_ = mp_envelope;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp42_ = resource_privacy;
-#line 1357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp41_, "privacy", _tmp42_);
-#line 10199 "FacebookPublishing.c"
+#line 8163 "FacebookPublishing.c"
 	}
-#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp43_ = publishable;
-#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp44_ = spit_publishing_publishable_get_param_string (_tmp43_, "title");
-#line 1360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishable_title = _tmp44_;
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp46_ = suppress_titling;
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp46_) {
-#line 10211 "FacebookPublishing.c"
+#line 8175 "FacebookPublishing.c"
 		const gchar* _tmp47_ = NULL;
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp47_ = publishable_title;
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp45_ = _tmp47_ != NULL;
-#line 10217 "FacebookPublishing.c"
+#line 8181 "FacebookPublishing.c"
 	} else {
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp45_ = FALSE;
-#line 10221 "FacebookPublishing.c"
+#line 8185 "FacebookPublishing.c"
 	}
-#line 1361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp45_) {
-#line 10225 "FacebookPublishing.c"
+#line 8189 "FacebookPublishing.c"
 		SoupMultipart* _tmp48_ = NULL;
 		const gchar* _tmp49_ = NULL;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp48_ = mp_envelope;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp49_ = publishable_title;
-#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp48_, "name", _tmp49_);
-#line 10234 "FacebookPublishing.c"
+#line 8198 "FacebookPublishing.c"
 	}
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp50_ = publishable;
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp51_ = spit_publishing_publishable_get_param_string (_tmp50_, "comment");
-#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishable_comment = _tmp51_;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp53_ = suppress_titling;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp53_) {
-#line 10246 "FacebookPublishing.c"
+#line 8210 "FacebookPublishing.c"
 		const gchar* _tmp54_ = NULL;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp54_ = publishable_comment;
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp52_ = _tmp54_ != NULL;
-#line 10252 "FacebookPublishing.c"
+#line 8216 "FacebookPublishing.c"
 	} else {
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp52_ = FALSE;
-#line 10256 "FacebookPublishing.c"
+#line 8220 "FacebookPublishing.c"
 	}
-#line 1366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp52_) {
-#line 10260 "FacebookPublishing.c"
+#line 8224 "FacebookPublishing.c"
 		SoupMultipart* _tmp55_ = NULL;
 		const gchar* _tmp56_ = NULL;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp55_ = mp_envelope;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp56_ = publishable_comment;
-#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp55_, "message", _tmp56_);
-#line 10269 "FacebookPublishing.c"
+#line 8233 "FacebookPublishing.c"
 	}
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp57_ = suppress_titling;
-#line 1370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!_tmp57_) {
-#line 10275 "FacebookPublishing.c"
+#line 8239 "FacebookPublishing.c"
 		SoupMultipart* _tmp58_ = NULL;
 		SpitPublishingPublishable* _tmp59_ = NULL;
 		GDateTime* _tmp60_ = NULL;
 		GDateTime* _tmp61_ = NULL;
 		gchar* _tmp62_ = NULL;
 		gchar* _tmp63_ = NULL;
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp58_ = mp_envelope;
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp59_ = publishable;
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp60_ = spit_publishing_publishable_get_exposure_date_time (_tmp59_);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp61_ = _tmp60_;
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp62_ = g_date_time_to_string (_tmp61_);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp63_ = _tmp62_;
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		soup_multipart_append_form_string (_tmp58_, "backdated_time", _tmp63_);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp63_);
-#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_date_time_unref0 (_tmp61_);
-#line 10300 "FacebookPublishing.c"
+#line 8264 "FacebookPublishing.c"
 	}
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp65_ = publishable;
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp66_ = spit_publishing_publishable_get_media_type (_tmp65_);
-#line 1374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp66_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp64_ = "video";
-#line 10310 "FacebookPublishing.c"
+#line 8274 "FacebookPublishing.c"
 	} else {
-#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp64_ = "image/jpeg";
-#line 10314 "FacebookPublishing.c"
+#line 8278 "FacebookPublishing.c"
 	}
-#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp67_ = g_strdup (_tmp64_);
-#line 1373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	source_file_mime_type = _tmp67_;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp68_ = mp_envelope;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp69_ = publishable;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp70_ = spit_publishing_publishable_get_serialized_file (_tmp69_);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp71_ = _tmp70_;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp72_ = g_file_get_basename (_tmp71_);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp73_ = _tmp72_;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp74_ = source_file_mime_type;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp75_ = image_data;
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_file (_tmp68_, "source", _tmp73_, _tmp74_, _tmp75_);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp73_);
-#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (_tmp71_);
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp76_ = mp_envelope;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp77_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp78_ = _tmp77_->request_headers;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp79_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp80_ = _tmp79_->request_body;
-#line 1379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_to_message (_tmp76_, _tmp78_, _tmp80_);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (source_file_mime_type);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (publishable_comment);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (publishable_title);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupMultipart_free0 (mp_envelope);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupBuffer_free0 (image_data);
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 10366 "FacebookPublishing.c"
+#line 8330 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphUploadMessage* publishing_facebook_graph_session_graph_upload_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* relative_uri, SpitPublishingPublishable* publishable, gboolean suppress_titling, const gchar* resource_privacy) {
-#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_upload_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, host_session, access_token, relative_uri, publishable, suppress_titling, resource_privacy);
-#line 10373 "FacebookPublishing.c"
+#line 8337 "FacebookPublishing.c"
 }
 
 
@@ -10413,13 +8361,13 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
 	PublishingFacebookGraphSessionGraphUploadMessage * self;
 	gboolean result = FALSE;
 	GMappedFile* _tmp0_ = NULL;
-#line 1382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessage);
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->mapped_file;
-#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 10387 "FacebookPublishing.c"
+#line 8351 "FacebookPublishing.c"
 		SpitPublishingPublishable* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
@@ -10429,82 +8377,82 @@ static gboolean publishing_facebook_graph_session_graph_upload_message_real_prep
 		gchar* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
 		GError* _tmp9_ = NULL;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp1_ = self->priv->publishable;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = spit_publishing_publishable_get_serialized_file (_tmp1_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp3_ = _tmp2_;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = g_file_get_path (_tmp3_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp5_ = _tmp4_;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp6_ = g_strdup_printf ("File %s is unavailable.", _tmp5_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp7_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = _tmp8_;
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, PublishingFacebookGraphMessage), "failed", _tmp9_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_error_free0 (_tmp9_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp5_);
-#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = FALSE;
-#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 10429 "FacebookPublishing.c"
+#line 8393 "FacebookPublishing.c"
 	} else {
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result = TRUE;
-#line 1388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return result;
-#line 10435 "FacebookPublishing.c"
+#line 8399 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_graph_session_graph_upload_message_class_init (PublishingFacebookGraphSessionGraphUploadMessageClass * klass) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_upload_message_parent_class = g_type_class_peek_parent (klass);
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphMessageClass *) klass)->finalize = publishing_facebook_graph_session_graph_upload_message_finalize;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionGraphUploadMessagePrivate));
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphSessionGraphMessageImplClass *) klass)->prepare_for_transmission = publishing_facebook_graph_session_graph_upload_message_real_prepare_for_transmission;
-#line 10449 "FacebookPublishing.c"
+#line 8413 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_upload_message_instance_init (PublishingFacebookGraphSessionGraphUploadMessage * self) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GRAPH_UPLOAD_MESSAGE_GET_PRIVATE (self);
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->mapped_file = NULL;
-#line 10458 "FacebookPublishing.c"
+#line 8422 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_upload_message_finalize (PublishingFacebookGraphMessage* obj) {
 	PublishingFacebookGraphSessionGraphUploadMessage * self;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_UPLOAD_MESSAGE, PublishingFacebookGraphSessionGraphUploadMessage);
-#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1062 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_mapped_file_unref0 (self->priv->mapped_file);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1063 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	PUBLISHING_FACEBOOK_GRAPH_MESSAGE_CLASS (publishing_facebook_graph_session_graph_upload_message_parent_class)->finalize (obj);
-#line 10472 "FacebookPublishing.c"
+#line 8436 "FacebookPublishing.c"
 }
 
 
@@ -10542,105 +8490,105 @@ static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_faceboo
 	SoupMessageHeaders* _tmp17_ = NULL;
 	SoupMessage* _tmp18_ = NULL;
 	SoupMessageBody* _tmp19_ = NULL;
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (host_session), NULL);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (access_token != NULL, NULL);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (album_name != NULL, NULL);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (album_privacy != NULL, NULL);
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = host_session;
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = access_token;
-#line 1396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookGraphSessionGraphCreateAlbumMessage*) publishing_facebook_graph_session_graph_message_impl_construct (object_type, _tmp0_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST, "/me/albums", _tmp1_, PUBLISHING_FACEBOOK_ENDPOINT_DEFAULT);
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = album_privacy;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp3_ != NULL) {
-#line 10528 "FacebookPublishing.c"
+#line 8492 "FacebookPublishing.c"
 		const gchar* _tmp4_ = NULL;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp4_ = album_privacy;
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 10534 "FacebookPublishing.c"
+#line 8498 "FacebookPublishing.c"
 	} else {
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp2_ = FALSE;
-#line 10538 "FacebookPublishing.c"
+#line 8502 "FacebookPublishing.c"
 	}
-#line 1398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_vala_assert (_tmp2_, "album_privacy != null && album_privacy != \"\"");
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->method;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = publishing_rest_support_http_method_to_string (_tmp5_);
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->uri;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = soup_uri_new (_tmp8_);
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = _tmp9_;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp11_ = soup_message_new_from_uri (_tmp7_, _tmp10_);
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message);
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message = _tmp11_;
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupURI_free0 (_tmp10_);
-#line 1400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp12_ = soup_multipart_new ("multipart/form-data");
-#line 1402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	mp_envelope = _tmp12_;
-#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp13_ = access_token;
-#line 1404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (mp_envelope, "access_token", _tmp13_);
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp14_ = album_name;
-#line 1405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (mp_envelope, "name", _tmp14_);
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp15_ = album_privacy;
-#line 1406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_append_form_string (mp_envelope, "privacy", _tmp15_);
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp17_ = _tmp16_->request_headers;
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_MESSAGE_IMPL, PublishingFacebookGraphSessionGraphMessageImpl)->soup_message;
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = _tmp18_->request_body;
-#line 1408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	soup_multipart_to_message (mp_envelope, _tmp17_, _tmp19_);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	__vala_SoupMultipart_free0 (mp_envelope);
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 10594 "FacebookPublishing.c"
+#line 8558 "FacebookPublishing.c"
 }
 
 
 static PublishingFacebookGraphSessionGraphCreateAlbumMessage* publishing_facebook_graph_session_graph_create_album_message_new (PublishingFacebookGraphSession* host_session, const gchar* access_token, const gchar* album_name, const gchar* album_privacy) {
-#line 1394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_graph_session_graph_create_album_message_construct (PUBLISHING_FACEBOOK_GRAPH_SESSION_TYPE_GRAPH_CREATE_ALBUM_MESSAGE, host_session, access_token, album_name, album_privacy);
-#line 10601 "FacebookPublishing.c"
+#line 8565 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_graph_create_album_message_class_init (PublishingFacebookGraphSessionGraphCreateAlbumMessageClass * klass) {
-#line 1393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_graph_create_album_message_parent_class = g_type_class_peek_parent (klass);
-#line 10608 "FacebookPublishing.c"
+#line 8572 "FacebookPublishing.c"
 }
 
 
@@ -10661,204 +8609,204 @@ static GType publishing_facebook_graph_session_graph_create_album_message_get_ty
 
 
 static void publishing_facebook_value_graph_session_init (GValue* value) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 10631 "FacebookPublishing.c"
+#line 8595 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_graph_session_free_value (GValue* value) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (value->data[0].v_pointer);
-#line 10640 "FacebookPublishing.c"
+#line 8604 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_graph_session_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_graph_session_ref (src_value->data[0].v_pointer);
-#line 10650 "FacebookPublishing.c"
+#line 8614 "FacebookPublishing.c"
 	} else {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 10654 "FacebookPublishing.c"
+#line 8618 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_graph_session_peek_pointer (const GValue* value) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 10662 "FacebookPublishing.c"
+#line 8626 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_session_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 10669 "FacebookPublishing.c"
+#line 8633 "FacebookPublishing.c"
 		PublishingFacebookGraphSession* object;
 		object = collect_values[0].v_pointer;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 10676 "FacebookPublishing.c"
+#line 8640 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 10680 "FacebookPublishing.c"
+#line 8644 "FacebookPublishing.c"
 		}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_graph_session_ref (object);
-#line 10684 "FacebookPublishing.c"
+#line 8648 "FacebookPublishing.c"
 	} else {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 10688 "FacebookPublishing.c"
+#line 8652 "FacebookPublishing.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 10692 "FacebookPublishing.c"
+#line 8656 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_graph_session_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookGraphSession** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 10703 "FacebookPublishing.c"
+#line 8667 "FacebookPublishing.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 10709 "FacebookPublishing.c"
+#line 8673 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 10713 "FacebookPublishing.c"
+#line 8677 "FacebookPublishing.c"
 	} else {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 10717 "FacebookPublishing.c"
+#line 8681 "FacebookPublishing.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 10721 "FacebookPublishing.c"
+#line 8685 "FacebookPublishing.c"
 }
 
 
 GParamSpec* publishing_facebook_param_spec_graph_session (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookParamSpecGraphSession* spec;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION), NULL);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 10735 "FacebookPublishing.c"
+#line 8699 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_graph_session (const GValue* value) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION), NULL);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 10744 "FacebookPublishing.c"
+#line 8708 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_graph_session (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphSession* old;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_ref (value->data[0].v_pointer);
-#line 10764 "FacebookPublishing.c"
+#line 8728 "FacebookPublishing.c"
 	} else {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 10768 "FacebookPublishing.c"
+#line 8732 "FacebookPublishing.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (old);
-#line 10774 "FacebookPublishing.c"
+#line 8738 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_graph_session (GValue* value, gpointer v_object) {
 	PublishingFacebookGraphSession* old;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION));
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 10793 "FacebookPublishing.c"
+#line 8757 "FacebookPublishing.c"
 	} else {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 10797 "FacebookPublishing.c"
+#line 8761 "FacebookPublishing.c"
 	}
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_graph_session_unref (old);
-#line 10803 "FacebookPublishing.c"
+#line 8767 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_graph_session_class_init (PublishingFacebookGraphSessionClass * klass) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_parent_class = g_type_class_peek_parent (klass);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookGraphSessionClass *) klass)->finalize = publishing_facebook_graph_session_finalize;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookGraphSessionPrivate));
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("authenticated", PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 10817 "FacebookPublishing.c"
+#line 8781 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_graph_session_instance_init (PublishingFacebookGraphSession * self) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_PRIVATE (self);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 10826 "FacebookPublishing.c"
+#line 8790 "FacebookPublishing.c"
 }
 
 
@@ -10866,23 +8814,23 @@ static void publishing_facebook_graph_session_finalize (PublishingFacebookGraphS
 	PublishingFacebookGraphSession * self;
 	SoupSession* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_GRAPH_SESSION, PublishingFacebookGraphSession);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->soup_session;
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("request-unqueued", soup_session_get_type (), &_tmp1_, NULL, FALSE);
-#line 1428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_graph_session_on_request_unqueued_soup_session_request_unqueued, self);
-#line 1414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (self->priv->soup_session);
-#line 1415 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (self->priv->access_token);
-#line 1416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (self->priv->current_message);
-#line 10850 "FacebookPublishing.c"
+#line 8814 "FacebookPublishing.c"
 }
 
 
@@ -10903,24 +8851,24 @@ GType publishing_facebook_graph_session_get_type (void) {
 gpointer publishing_facebook_graph_session_ref (gpointer instance) {
 	PublishingFacebookGraphSession* self;
 	self = instance;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 10875 "FacebookPublishing.c"
+#line 8839 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_graph_session_unref (gpointer instance) {
 	PublishingFacebookGraphSession* self;
 	self = instance;
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_GRAPH_SESSION_GET_CLASS (self)->finalize (self);
-#line 1252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 10888 "FacebookPublishing.c"
+#line 8852 "FacebookPublishing.c"
 	}
 }
 
@@ -10928,35 +8876,35 @@ void publishing_facebook_graph_session_unref (gpointer instance) {
 static SpitPublishingPublishable** _vala_array_dup3 (SpitPublishingPublishable** self, int length) {
 	SpitPublishingPublishable** result;
 	int i;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	result = g_new0 (SpitPublishingPublishable*, length + 1);
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 10900 "FacebookPublishing.c"
+#line 8864 "FacebookPublishing.c"
 		SpitPublishingPublishable* _tmp0_ = NULL;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		result[i] = _tmp0_;
-#line 10906 "FacebookPublishing.c"
+#line 8870 "FacebookPublishing.c"
 	}
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return result;
-#line 10910 "FacebookPublishing.c"
+#line 8874 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_graph_session_ref0 (gpointer self) {
-#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_graph_session_ref (self) : NULL;
-#line 10917 "FacebookPublishing.c"
+#line 8881 "FacebookPublishing.c"
 }
 
 
 static gpointer _publishing_facebook_publishing_parameters_ref0 (gpointer self) {
-#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self ? publishing_facebook_publishing_parameters_ref (self) : NULL;
-#line 10924 "FacebookPublishing.c"
+#line 8888 "FacebookPublishing.c"
 }
 
 
@@ -10970,77 +8918,77 @@ PublishingFacebookUploader* publishing_facebook_uploader_construct (GType object
 	PublishingFacebookGraphSession* _tmp3_ = NULL;
 	PublishingFacebookPublishingParameters* _tmp4_ = NULL;
 	PublishingFacebookPublishingParameters* _tmp5_ = NULL;
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_SESSION (session), NULL);
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FACEBOOK_IS_PUBLISHING_PARAMETERS (publishing_params), NULL);
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = (PublishingFacebookUploader*) g_type_create_instance (object_type);
-#line 1574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_file = 0;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = publishables;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = publishables_length1;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup3 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishables = _tmp1_;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishables_length1 = _tmp1__length1;
-#line 1575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->_publishables_size_ = self->priv->publishables_length1;
-#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = session;
-#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _publishing_facebook_graph_session_ref0 (_tmp2_);
-#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_session_unref0 (self->priv->session);
-#line 1576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->session = _tmp3_;
-#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishing_params;
-#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = _publishing_facebook_publishing_parameters_ref0 (_tmp4_);
-#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 1577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishing_params = _tmp5_;
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return self;
-#line 10980 "FacebookPublishing.c"
+#line 8944 "FacebookPublishing.c"
 }
 
 
 PublishingFacebookUploader* publishing_facebook_uploader_new (PublishingFacebookGraphSession* session, PublishingFacebookPublishingParameters* publishing_params, SpitPublishingPublishable** publishables, int publishables_length1) {
-#line 1572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return publishing_facebook_uploader_construct (PUBLISHING_FACEBOOK_TYPE_UPLOADER, session, publishing_params, publishables, publishables_length1);
-#line 10987 "FacebookPublishing.c"
+#line 8951 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted (PublishingFacebookGraphMessage* _sender, gint bytes_sent_so_far, gint total_bytes, gpointer self) {
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_chunk_transmitted ((PublishingFacebookUploader*) self, bytes_sent_so_far, total_bytes);
-#line 10994 "FacebookPublishing.c"
+#line 8958 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed (PublishingFacebookGraphMessage* _sender, gpointer self) {
-#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_message_completed ((PublishingFacebookUploader*) self, _sender);
-#line 11001 "FacebookPublishing.c"
+#line 8965 "FacebookPublishing.c"
 }
 
 
 static void _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed (PublishingFacebookGraphMessage* _sender, GError* err, gpointer self) {
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_on_message_failed ((PublishingFacebookUploader*) self, _sender, err);
-#line 11008 "FacebookPublishing.c"
+#line 8972 "FacebookPublishing.c"
 }
 
 
@@ -11078,167 +9026,167 @@ static void publishing_facebook_uploader_send_current_file (PublishingFacebookUp
 	PublishingFacebookGraphMessage* _tmp32_ = NULL;
 	PublishingFacebookGraphSession* _tmp33_ = NULL;
 	PublishingFacebookGraphMessage* _tmp34_ = NULL;
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishables;
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->current_file;
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = _tmp0_[_tmp1_];
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishable = _tmp3_;
-#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = publishable;
-#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 1582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	file = _tmp5_;
-#line 1585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = file;
-#line 1585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp6_ == NULL) {
-#line 11070 "FacebookPublishing.c"
+#line 9034 "FacebookPublishing.c"
 		gint _tmp7_ = 0;
-#line 1586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp7_ = self->priv->current_file;
-#line 1586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		self->priv->current_file = _tmp7_ + 1;
-#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (file);
-#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_object_unref0 (publishable);
-#line 1587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return;
-#line 11082 "FacebookPublishing.c"
+#line 9046 "FacebookPublishing.c"
 	}
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp9_ = publishable;
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp10_ = spit_publishing_publishable_get_media_type (_tmp9_);
-#line 1591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp10_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 11090 "FacebookPublishing.c"
+#line 9054 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp11_ = self->priv->publishing_params;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp12_ = publishing_facebook_publishing_parameters_get_target_album_id (_tmp11_);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp14_ = g_strdup_printf ("/%s/photos", _tmp13_);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _tmp14_;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 11109 "FacebookPublishing.c"
+#line 9073 "FacebookPublishing.c"
 	} else {
 		gchar* _tmp15_ = NULL;
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp15_ = g_strdup ("/me/videos");
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 1592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = _tmp15_;
-#line 11118 "FacebookPublishing.c"
+#line 9082 "FacebookPublishing.c"
 	}
-#line 1590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp16_ = g_strdup (_tmp8_);
-#line 1590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	resource_uri = _tmp16_;
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp18_ = publishable;
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp19_ = spit_publishing_publishable_get_media_type (_tmp18_);
-#line 1594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp19_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 11130 "FacebookPublishing.c"
+#line 9094 "FacebookPublishing.c"
 		PublishingFacebookPublishingParameters* _tmp20_ = NULL;
 		const gchar* _tmp21_ = NULL;
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp20_ = self->priv->publishing_params;
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp21_ = _tmp20_->privacy_object;
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = _tmp21_;
-#line 11139 "FacebookPublishing.c"
+#line 9103 "FacebookPublishing.c"
 	} else {
-#line 1595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp17_ = NULL;
-#line 11143 "FacebookPublishing.c"
+#line 9107 "FacebookPublishing.c"
 	}
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp22_ = g_strdup (_tmp17_);
-#line 1593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	resource_privacy = _tmp22_;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp23_ = self->priv->session;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp24_ = resource_uri;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp25_ = publishable;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp26_ = self->priv->publishing_params;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp27_ = _tmp26_->strip_metadata;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp28_ = resource_privacy;
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp29_ = publishing_facebook_graph_session_new_upload (_tmp23_, _tmp24_, _tmp25_, _tmp27_, _tmp28_);
-#line 1596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	upload_message = _tmp29_;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp30_ = upload_message;
-#line 1599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp30_, "data-transmitted", (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
-#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp31_ = upload_message;
-#line 1600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp31_, "completed", (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp32_ = upload_message;
-#line 1601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_connect (_tmp32_, "failed", (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp33_ = self->priv->session;
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp34_ = upload_message;
-#line 1603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_graph_session_send_message (_tmp33_, _tmp34_);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_message_unref0 (upload_message);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (resource_privacy);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (resource_uri);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (file);
-#line 1580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_g_object_unref0 (publishable);
-#line 11195 "FacebookPublishing.c"
+#line 9159 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_uploader_send_files (PublishingFacebookUploader* self) {
-#line 1606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_file = 0;
-#line 1608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_send_current_file (self);
-#line 11206 "FacebookPublishing.c"
+#line 9170 "FacebookPublishing.c"
 }
 
 
@@ -11256,52 +9204,52 @@ static void publishing_facebook_uploader_on_chunk_transmitted (PublishingFaceboo
 	gdouble _tmp6_ = 0.0;
 	SpitPublishingProgressCallback _tmp7_ = NULL;
 	void* _tmp7__target = NULL;
-#line 1611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = self->priv->publishables;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__length1 = self->priv->publishables_length1;
-#line 1612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	file_span = 1.0 / _tmp0__length1;
-#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = bytes_written_so_far;
-#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = total_bytes;
-#line 1613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	this_file_fraction_complete = ((gdouble) _tmp1_) / _tmp2_;
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp3_ = self->priv->current_file;
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = file_span;
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp5_ = this_file_fraction_complete;
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = file_span;
-#line 1614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	fraction_complete = (_tmp3_ * _tmp4_) + (_tmp5_ * _tmp6_);
-#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = self->priv->status_updated;
-#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7__target = self->priv->status_updated_target;
-#line 1617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp7_ != NULL) {
-#line 11254 "FacebookPublishing.c"
+#line 9218 "FacebookPublishing.c"
 		SpitPublishingProgressCallback _tmp8_ = NULL;
 		void* _tmp8__target = NULL;
 		gint _tmp9_ = 0;
 		gdouble _tmp10_ = 0.0;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ = self->priv->status_updated;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8__target = self->priv->status_updated_target;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = self->priv->current_file;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp10_ = fraction_complete;
-#line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp8_ (_tmp9_ + 1, _tmp10_, _tmp8__target);
-#line 11269 "FacebookPublishing.c"
+#line 9233 "FacebookPublishing.c"
 	}
 }
 
@@ -11317,50 +9265,50 @@ static void publishing_facebook_uploader_on_message_completed (PublishingFaceboo
 	gint _tmp7_ = 0;
 	SpitPublishingPublishable** _tmp8_ = NULL;
 	gint _tmp8__length1 = 0;
-#line 1621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 1622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
-#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 1623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
-#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = message;
-#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp5_, NULL, FALSE);
-#line 1624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
-#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = self->priv->current_file;
-#line 1626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->current_file = _tmp6_ + 1;
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp7_ = self->priv->current_file;
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8_ = self->priv->publishables;
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp8__length1 = self->priv->publishables_length1;
-#line 1627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp7_ < _tmp8__length1) {
-#line 1628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_send_current_file (self);
-#line 11321 "FacebookPublishing.c"
+#line 9285 "FacebookPublishing.c"
 	} else {
 		gint _tmp9_ = 0;
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		_tmp9_ = self->priv->current_file;
-#line 1630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_signal_emit_by_name (self, "upload-complete", _tmp9_);
-#line 11328 "FacebookPublishing.c"
+#line 9292 "FacebookPublishing.c"
 	}
 }
 
@@ -11373,33 +9321,33 @@ static void publishing_facebook_uploader_on_message_failed (PublishingFacebookUp
 	PublishingFacebookGraphMessage* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	GError* _tmp6_ = NULL;
-#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_GRAPH_MESSAGE (message));
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = message;
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("data-transmitted", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp1_, NULL, FALSE);
-#line 1635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_chunk_transmitted_publishing_facebook_graph_message_data_transmitted, self);
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp2_ = message;
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp3_, NULL, FALSE);
-#line 1636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_completed_publishing_facebook_graph_message_completed, self);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp4_ = message;
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_parse_name ("failed", PUBLISHING_FACEBOOK_TYPE_GRAPH_MESSAGE, &_tmp5_, NULL, FALSE);
-#line 1637 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_facebook_uploader_on_message_failed_publishing_facebook_graph_message_failed, self);
-#line 1639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp6_ = _error_;
-#line 1639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_emit_by_name (self, "upload-error", _tmp6_);
-#line 11367 "FacebookPublishing.c"
+#line 9331 "FacebookPublishing.c"
 }
 
 
@@ -11408,248 +9356,248 @@ void publishing_facebook_uploader_upload (PublishingFacebookUploader* self, Spit
 	void* _tmp0__target = NULL;
 	SpitPublishingPublishable** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 1642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (PUBLISHING_FACEBOOK_IS_UPLOADER (self));
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0_ = status_updated;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp0__target = status_updated_target;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->status_updated = _tmp0_;
-#line 1643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->status_updated_target = _tmp0__target;
-#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1_ = self->priv->publishables;
-#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_tmp1__length1 = self->priv->publishables_length1;
-#line 1645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (_tmp1__length1 > 0) {
-#line 1646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_send_files (self);
-#line 11394 "FacebookPublishing.c"
+#line 9358 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_uploader_init (GValue* value) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 11402 "FacebookPublishing.c"
+#line 9366 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_value_uploader_free_value (GValue* value) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (value->data[0].v_pointer);
-#line 11411 "FacebookPublishing.c"
+#line 9375 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_value_uploader_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_facebook_uploader_ref (src_value->data[0].v_pointer);
-#line 11421 "FacebookPublishing.c"
+#line 9385 "FacebookPublishing.c"
 	} else {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11425 "FacebookPublishing.c"
+#line 9389 "FacebookPublishing.c"
 	}
 }
 
 
 static gpointer publishing_facebook_value_uploader_peek_pointer (const GValue* value) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 11433 "FacebookPublishing.c"
+#line 9397 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_uploader_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 11440 "FacebookPublishing.c"
+#line 9404 "FacebookPublishing.c"
 		PublishingFacebookUploader* object;
 		object = collect_values[0].v_pointer;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11447 "FacebookPublishing.c"
+#line 9411 "FacebookPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.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 11451 "FacebookPublishing.c"
+#line 9415 "FacebookPublishing.c"
 		}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = publishing_facebook_uploader_ref (object);
-#line 11455 "FacebookPublishing.c"
+#line 9419 "FacebookPublishing.c"
 	} else {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 11459 "FacebookPublishing.c"
+#line 9423 "FacebookPublishing.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 11463 "FacebookPublishing.c"
+#line 9427 "FacebookPublishing.c"
 }
 
 
 static gchar* publishing_facebook_value_uploader_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingFacebookUploader** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!object_p) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11474 "FacebookPublishing.c"
+#line 9438 "FacebookPublishing.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = NULL;
-#line 11480 "FacebookPublishing.c"
+#line 9444 "FacebookPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11484 "FacebookPublishing.c"
+#line 9448 "FacebookPublishing.c"
 	} else {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		*object_p = publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 11488 "FacebookPublishing.c"
+#line 9452 "FacebookPublishing.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return NULL;
-#line 11492 "FacebookPublishing.c"
+#line 9456 "FacebookPublishing.c"
 }
 
 
 GParamSpec* publishing_facebook_param_spec_uploader (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingFacebookParamSpecUploader* spec;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_FACEBOOK_TYPE_UPLOADER), NULL);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 11506 "FacebookPublishing.c"
+#line 9470 "FacebookPublishing.c"
 }
 
 
 gpointer publishing_facebook_value_get_uploader (const GValue* value) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER), NULL);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return value->data[0].v_pointer;
-#line 11515 "FacebookPublishing.c"
+#line 9479 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_value_set_uploader (GValue* value, gpointer v_object) {
 	PublishingFacebookUploader* old;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_ref (value->data[0].v_pointer);
-#line 11535 "FacebookPublishing.c"
+#line 9499 "FacebookPublishing.c"
 	} else {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 11539 "FacebookPublishing.c"
+#line 9503 "FacebookPublishing.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (old);
-#line 11545 "FacebookPublishing.c"
+#line 9509 "FacebookPublishing.c"
 	}
 }
 
 
 void publishing_facebook_value_take_uploader (GValue* value, gpointer v_object) {
 	PublishingFacebookUploader* old;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (v_object) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_FACEBOOK_TYPE_UPLOADER));
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 11564 "FacebookPublishing.c"
+#line 9528 "FacebookPublishing.c"
 	} else {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 11568 "FacebookPublishing.c"
+#line 9532 "FacebookPublishing.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (old) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		publishing_facebook_uploader_unref (old);
-#line 11574 "FacebookPublishing.c"
+#line 9538 "FacebookPublishing.c"
 	}
 }
 
 
 static void publishing_facebook_uploader_class_init (PublishingFacebookUploaderClass * klass) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	publishing_facebook_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	((PublishingFacebookUploaderClass *) klass)->finalize = publishing_facebook_uploader_finalize;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFacebookUploaderPrivate));
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("upload_complete", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_new ("upload_error", PUBLISHING_FACEBOOK_TYPE_UPLOADER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER);
-#line 11590 "FacebookPublishing.c"
+#line 9554 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_uploader_instance_init (PublishingFacebookUploader * self) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv = PUBLISHING_FACEBOOK_UPLOADER_GET_PRIVATE (self);
-#line 1567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->status_updated = NULL;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->ref_count = 1;
-#line 11601 "FacebookPublishing.c"
+#line 9565 "FacebookPublishing.c"
 }
 
 
 static void publishing_facebook_uploader_finalize (PublishingFacebookUploader* obj) {
 	PublishingFacebookUploader * self;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FACEBOOK_TYPE_UPLOADER, PublishingFacebookUploader);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	self->priv->publishables = (_vala_array_free (self->priv->publishables, self->priv->publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 1565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_graph_session_unref0 (self->priv->session);
-#line 1566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	_publishing_facebook_publishing_parameters_unref0 (self->priv->publishing_params);
-#line 11617 "FacebookPublishing.c"
+#line 9581 "FacebookPublishing.c"
 }
 
 
@@ -11670,24 +9618,24 @@ GType publishing_facebook_uploader_get_type (void) {
 gpointer publishing_facebook_uploader_ref (gpointer instance) {
 	PublishingFacebookUploader* self;
 	self = instance;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	return instance;
-#line 11642 "FacebookPublishing.c"
+#line 9606 "FacebookPublishing.c"
 }
 
 
 void publishing_facebook_uploader_unref (gpointer instance) {
 	PublishingFacebookUploader* self;
 	self = instance;
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		PUBLISHING_FACEBOOK_UPLOADER_GET_CLASS (self)->finalize (self);
-#line 1562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
+#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FacebookPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 11655 "FacebookPublishing.c"
+#line 9619 "FacebookPublishing.c"
 	}
 }
 
@@ -11710,16 +9658,4 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 }
 
 
-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/FacebookPublishing.vala b/plugins/shotwell-publishing/FacebookPublishing.vala
index 3fafe37..c979b26 100644
--- a/plugins/shotwell-publishing/FacebookPublishing.vala
+++ b/plugins/shotwell-publishing/FacebookPublishing.vala
@@ -58,13 +58,7 @@ namespace Publishing.Facebook {
 // truly, deep-down know what you're doing)
 public const string SERVICE_NAME = "facebook";
 internal const string USER_VISIBLE_NAME = "Facebook";
-internal const string APPLICATION_ID = "1612018629063184";
 internal const string DEFAULT_ALBUM_NAME = _("Shotwell Connect");
-internal const string SERVICE_WELCOME_MESSAGE =
-    _("You are not currently logged into Facebook.\n\nIf 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.");
-internal const string RESTART_ERROR_MESSAGE =
-    _("You have already logged in and out of Facebook during this Shotwell session.\nTo continue publishing to Facebook, quit and restart Shotwell, then try publishing again.");
-internal const string USER_AGENT = "Java/1.6.0_16";
 internal const int EXPIRED_SESSION_STATUS_CODE = 400;
 
 internal class Album {
@@ -174,9 +168,9 @@ internal class PublishingParameters {
 public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
     private PublishingParameters publishing_params;
     private weak Spit.Publishing.PluginHost host = null;
-    private WebAuthenticationPane web_auth_pane = null;
     private Spit.Publishing.ProgressCallback progress_reporter = null;
     private weak Spit.Publishing.Service service = null;
+    private Spit.Publishing.Authenticator authenticator = null;
     private bool running = false;
     private GraphSession graph_session;
     private PublishingOptionsPane? publishing_options_pane = null;
@@ -185,42 +179,25 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
     private string? username = null;
 
     public FacebookPublisher(Spit.Publishing.Service service,
-        Spit.Publishing.PluginHost host) {
+                             Spit.Publishing.PluginHost host) {
         debug("FacebookPublisher instantiated.");
 
         this.service = service;
         this.host = host;
 
         this.publishing_params = new PublishingParameters();
+        this.authenticator =
+            Publishing.Authenticator.Factory.get_instance().create("facebook",
+                    host);
 
         this.graph_session = new GraphSession();
         graph_session.authenticated.connect(on_session_authenticated);
     }
 
-    private bool is_persistent_session_valid() {
-        string? token = get_persistent_access_token();
-
-        if (token != null)
-            debug("existing Facebook session found in configuration database (access_token = %s).",
-                token);
-        else
-            debug("no existing Facebook session available.");
-
-        return token != null;
-    }
-
-    private string? get_persistent_access_token() {
-        return host.get_config_string("access_token", null);
-    }
-    
     private bool get_persistent_strip_metadata() {
         return host.get_config_bool("strip_metadata", false);
     }
 
-    private void set_persistent_access_token(string access_token) {
-        host.set_config_string("access_token", access_token);
-    }
-    
     private void set_persistent_strip_metadata(bool strip_metadata) {
         host.set_config_bool("strip_metadata", strip_metadata);
     }
@@ -235,19 +212,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         host.set_config_int("default_size", size);
     }
 
-    private void invalidate_persistent_session() {
-        debug("invalidating saved Facebook session.");
-
-        set_persistent_access_token("");
-    }
-
-    private void do_show_service_welcome_pane() {
-        debug("ACTION: showing service welcome pane.");
-
-        host.install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_login_clicked);
-        host.set_service_locked(false);
-    }
-
+    /*
     private void do_test_connection_to_endpoint() {
         debug("ACTION: testing connection to Facebook endpoint.");
         host.set_service_locked(true);
@@ -260,6 +225,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         
         graph_session.send_message(endpoint_test_message);
     }
+    */
     
     private void do_fetch_user_info() {
         debug("ACTION: fetching user information.");
@@ -376,7 +342,8 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         }
         
         publishing_options_pane = new PublishingOptionsPane(username, publishing_params.albums,
-            host.get_publishable_media_type(), this, builder, get_persistent_strip_metadata());
+            host.get_publishable_media_type(), this, builder, get_persistent_strip_metadata(),
+            authenticator.can_logout());
         publishing_options_pane.logout.connect(on_publishing_options_pane_logout);
         publishing_options_pane.publish.connect(on_publishing_options_pane_publish);
         host.install_dialog_pane(publishing_options_pane,
@@ -385,8 +352,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
 
     private void do_logout() {
         debug("ACTION: clearing persistent session information and restaring interaction.");
-
-        invalidate_persistent_session();
+        this.authenticator.logout();
 
         running = false;
         start();
@@ -411,60 +377,27 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         do_upload();
     }
 
-    private void do_hosted_web_authentication() {
-        debug("ACTION: doing hosted web authentication.");
-
-        host.set_service_locked(false);
-
-        web_auth_pane = new WebAuthenticationPane();
-        web_auth_pane.login_succeeded.connect(on_web_auth_pane_login_succeeded);
-        web_auth_pane.login_failed.connect(on_web_auth_pane_login_failed);
 
-        host.install_dialog_pane(web_auth_pane,
-            Spit.Publishing.PluginHost.ButtonMode.CANCEL);
+    private void on_authenticator_succeeded() {
+        debug("EVENT: Authenticator login succeeded.");
 
+        do_authenticate_session();
     }
 
-    private void do_authenticate_session(string good_login_uri) {
-        debug("ACTION: preparing to extract session information encoded in uri = '%s'",
-             good_login_uri);
-
-        // the raw uri is percent-encoded, so decode it
-        string decoded_uri = Soup.URI.decode(good_login_uri);
+    private void on_authenticator_failed() {
+    }
 
-        // locate the access token within the URI
-        string? access_token = null;
-        int index = decoded_uri.index_of("#access_token=");
-        if (index >= 0)
-            access_token = decoded_uri[index:decoded_uri.length];
-        if (access_token == null) {
-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                "Server redirect URL contained no access token"));
-            return;
+    private void do_authenticate_session() {
+        var parameter = this.authenticator.get_authentication_parameter();
+        Variant access_token;
+        if (!parameter.lookup_extended("AccessToken", null, out access_token)) {
+            critical("Authenticator signalled success, but does not provide access token");
+            assert_not_reached();
         }
-
-        // remove any trailing parameters from the session description string
-        string? trailing_params = null;
-        index = access_token.index_of_char('&');
-        if (index >= 0)
-            trailing_params = access_token[index:access_token.length];
-        if (trailing_params != null)
-            access_token = access_token.replace(trailing_params, "");
-
-        // remove the key from the session description string
-        access_token = access_token.replace("#access_token=", "");
-        
-        // we've got an access token!
         graph_session.authenticated.connect(on_session_authenticated);
-        graph_session.authenticate(access_token);
+        graph_session.authenticate(access_token.get_string());
     }
 
-    private void do_save_session_information() {
-        debug("ACTION: saving session information to configuration system.");
-
-        set_persistent_access_token(graph_session.get_access_token());
-    }
-    
     private void do_upload() {
         debug("ACTION: uploading photos to album '%s'",
             publishing_params.target_album == PublishingParameters.UNKNOWN_ALBUM ? "(none)" :
@@ -505,15 +438,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
             host.post_error(error);
     }
 
-    private void on_login_clicked() {
-        if (!is_running())
-            return;
-
-        debug("EVENT: user clicked 'Login' on welcome pane.");
-
-        do_test_connection_to_endpoint();
-    }
-
+#if 0
     private void on_endpoint_test_completed(GraphMessage message) {
         message.completed.disconnect(on_endpoint_test_completed);
         message.failed.disconnect(on_endpoint_test_error);
@@ -539,32 +464,7 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
 
         on_generic_error(error);
     }
-
-    private void on_web_auth_pane_login_succeeded(string success_url) {
-        if (!is_running())
-            return;
-
-        debug("EVENT: hosted web login succeeded.");
-
-        do_authenticate_session(success_url);
-    }
-
-
-
-    private void on_web_auth_pane_login_failed() {
-        if (!is_running())
-            return;
-
-        debug("EVENT: hosted web login failed.");
-
-        // In this case, "failed" doesn't mean that the user didn't enter the right username and
-        // password -- Facebook handles that case inside the Facebook Connect web control. Instead,
-        // it means that no session was initiated in response to our login request. The only
-        // way this happens is if the user clicks the "Cancel" button that appears inside
-        // the web control. In this case, the correct behavior is to return the user to the
-        // service welcome pane so that they can start the web interaction again.
-        do_show_service_welcome_pane();
-    }
+#endif
 
     private void on_session_authenticated() {
         graph_session.authenticated.disconnect(on_session_authenticated);
@@ -575,7 +475,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         assert(graph_session.is_authenticated());
         debug("EVENT: an authenticated session has become available.");
 
-        do_save_session_information();
         do_fetch_user_info();
     }
     
@@ -780,20 +679,9 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
         // actually a restart
         publishing_params = new PublishingParameters();
 
-        // Do we have saved user credentials? If so, go ahead and authenticate the session
-        // with the saved credentials and proceed with the publishing interaction. Otherwise, show
-        // the Welcome pane
-        if (is_persistent_session_valid()) {
-            graph_session.authenticate(get_persistent_access_token());
-        } else {
-            if (WebAuthenticationPane.is_cache_dirty()) {
-                host.set_service_locked(false);
-                host.install_static_message_pane(RESTART_ERROR_MESSAGE,
-                    Spit.Publishing.PluginHost.ButtonMode.CANCEL);
-            } else {
-                do_show_service_welcome_pane();
-            }
-        }
+        this.authenticator.authenticated.connect(on_authenticator_succeeded);
+        this.authenticator.authentication_failed.connect(on_authenticator_failed);
+        this.authenticator.authenticate();
     }
 
     public void stop() {
@@ -811,153 +699,6 @@ public class FacebookPublisher : Spit.Publishing.Publisher, GLib.Object {
     }
 }
 
-internal class WebAuthenticationPane : Shotwell.Plugins.Common.WebAuthenticationPane {
-    private static bool cache_dirty = false;
-
-    public signal void login_succeeded(string success_url);
-    public signal void login_failed();
-
-    public WebAuthenticationPane() {
-        Object (login_uri : get_login_url ());
-    }
-
-    private class LocaleLookup {
-        public string prefix;
-        public string translation;
-        public string? exception_code;
-        public string? exception_translation;
-        public string? exception_code_2;
-        public string? exception_translation_2;
-        
-        public LocaleLookup(string prefix, string translation, string? exception_code = null, 
-            string? exception_translation  = null, string? exception_code_2  = null, 
-            string? exception_translation_2 = null) {
-            this.prefix = prefix;
-            this.translation = translation;
-            this.exception_code = exception_code;
-            this.exception_translation = exception_translation;
-            this.exception_code_2 = exception_code_2;
-            this.exception_translation_2 = exception_translation_2;
-        }
-        
-    }
-    
-    private static LocaleLookup[] locale_lookup_table = {
-        new LocaleLookup( "es", "es-la", "ES", "es-es" ),
-        new LocaleLookup( "en", "en-gb", "US", "en-us" ),
-        new LocaleLookup( "fr", "fr-fr", "CA", "fr-ca" ),
-        new LocaleLookup( "pt", "pt-br", "PT", "pt-pt" ),
-        new LocaleLookup( "zh", "zh-cn", "HK", "zh-hk", "TW", "zh-tw" ),
-        new LocaleLookup( "af", "af-za" ),
-        new LocaleLookup( "ar", "ar-ar" ),
-        new LocaleLookup( "nb", "nb-no" ),
-        new LocaleLookup( "no", "nb-no" ),
-        new LocaleLookup( "id", "id-id" ),
-        new LocaleLookup( "ms", "ms-my" ),
-        new LocaleLookup( "ca", "ca-es" ),
-        new LocaleLookup( "cs", "cs-cz" ),
-        new LocaleLookup( "cy", "cy-gb" ),
-        new LocaleLookup( "da", "da-dk" ),
-        new LocaleLookup( "de", "de-de" ),
-        new LocaleLookup( "tl", "tl-ph" ),
-        new LocaleLookup( "ko", "ko-kr" ),
-        new LocaleLookup( "hr", "hr-hr" ),
-        new LocaleLookup( "it", "it-it" ),
-        new LocaleLookup( "lt", "lt-lt" ),
-        new LocaleLookup( "hu", "hu-hu" ),
-        new LocaleLookup( "nl", "nl-nl" ),
-        new LocaleLookup( "ja", "ja-jp" ),
-        new LocaleLookup( "nb", "nb-no" ),
-        new LocaleLookup( "no", "nb-no" ),
-        new LocaleLookup( "pl", "pl-pl" ),
-        new LocaleLookup( "ro", "ro-ro" ),
-        new LocaleLookup( "ru", "ru-ru" ),
-        new LocaleLookup( "sk", "sk-sk" ),
-        new LocaleLookup( "sl", "sl-si" ),
-        new LocaleLookup( "sv", "sv-se" ),
-        new LocaleLookup( "th", "th-th" ),
-        new LocaleLookup( "vi", "vi-vn" ),
-        new LocaleLookup( "tr", "tr-tr" ),
-        new LocaleLookup( "el", "el-gr" ),
-        new LocaleLookup( "bg", "bg-bg" ),
-        new LocaleLookup( "sr", "sr-rs" ),
-        new LocaleLookup( "he", "he-il" ),
-        new LocaleLookup( "hi", "hi-in" ),
-        new LocaleLookup( "bn", "bn-in" ),
-        new LocaleLookup( "pa", "pa-in" ),
-        new LocaleLookup( "ta", "ta-in" ),
-        new LocaleLookup( "te", "te-in" ),
-        new LocaleLookup( "ml", "ml-in" )
-    };
-    
-    private static string get_system_locale_as_facebook_locale() {
-        unowned string? raw_system_locale = Intl.setlocale(LocaleCategory.ALL, "");
-        if (raw_system_locale == null || raw_system_locale == "")
-            return "www";
-        
-        string system_locale = raw_system_locale.split(".")[0];
-        
-        foreach (LocaleLookup locale_lookup in locale_lookup_table) {
-            if (!system_locale.has_prefix(locale_lookup.prefix))
-                continue;
-            
-            if (locale_lookup.exception_code != null) {
-                assert(locale_lookup.exception_translation != null);
-                
-                if (system_locale.contains(locale_lookup.exception_code))
-                    return locale_lookup.exception_translation;
-            }
-            
-            if (locale_lookup.exception_code_2 != null) {
-                assert(locale_lookup.exception_translation_2 != null);
-                
-                if (system_locale.contains(locale_lookup.exception_code_2))
-                    return locale_lookup.exception_translation_2;
-            }
-            
-            return locale_lookup.translation;
-        }
-        
-        // default
-        return "www";
-    }
-
-    private static string get_login_url() {
-        var facebook_locale = get_system_locale_as_facebook_locale();
-
-        return "https://%s.facebook.com/dialog/oauth?client_id=%s&redirect_uri=https://www.facebook.com/connect/login_success.html&display=popup&scope=publish_actions,user_photos,user_videos&response_type=token".printf(facebook_locale, APPLICATION_ID);
-    }
-
-    public override void on_page_load() {
-        string loaded_url = get_view ().uri.dup();
-        debug("loaded url: " + loaded_url);
-
-        // strip parameters from the loaded url
-        if (loaded_url.contains("?")) {
-            int index = loaded_url.index_of_char('?');
-            string params = loaded_url[index:loaded_url.length];
-            loaded_url = loaded_url.replace(params, "");
-        }
-
-        // were we redirected to the facebook login success page?
-        if (loaded_url.contains("login_success")) {
-            cache_dirty = true;
-            login_succeeded(get_view ().uri);
-            return;
-        }
-
-        // were we redirected to the login total failure page?
-        if (loaded_url.contains("login_failure")) {
-            login_failed();
-            return;
-        }
-    }
-
-    public static bool is_cache_dirty() {
-        return cache_dirty;
-    }
-}
-
 internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     private Gtk.Builder builder;
     private Gtk.Box pane_widget = null;
@@ -1001,7 +742,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
 
     public PublishingOptionsPane(string username, Album[] albums,
         Spit.Publishing.Publisher.MediaType media_type, FacebookPublisher publisher,
-        Gtk.Builder builder, bool strip_metadata) {
+        Gtk.Builder builder, bool strip_metadata, bool can_logout) {
 
         this.builder = builder;
         assert(builder != null);
@@ -1025,6 +766,9 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         visibility_combo = (Gtk.ComboBoxText) this.builder.get_object("visibility_combo");
         publish_button = (Gtk.Button) this.builder.get_object("publish_button");
         logout_button = (Gtk.Button) this.builder.get_object("logout_button");
+        if (!can_logout) {
+            logout_button.parent.remove (logout_button);
+        }
         new_album_entry = (Gtk.Entry) this.builder.get_object("new_album_entry");
         resolution_combo = (Gtk.ComboBoxText) this.builder.get_object("resolution_combo");
         how_to_label = (Gtk.Label) this.builder.get_object("how_to_label");
@@ -1520,14 +1264,11 @@ internal class GraphSession {
         return access_token != null;
     }
     
-    public string get_access_token() {
-        assert(is_authenticated());
-        return access_token;
-    }
-    
+#if 0
     public GraphMessage new_endpoint_test() {
         return new GraphEndpointProbeMessage(this);
     }
+#endif
     
     public GraphMessage new_query(string resource_path) {
         return new GraphQueryMessage(this, resource_path, access_token);
diff --git a/plugins/shotwell-publishing/FlickrPublishing.c b/plugins/shotwell-publishing/FlickrPublishing.c
index f0a92e8..55ad837 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.c
+++ b/plugins/shotwell-publishing/FlickrPublishing.c
@@ -16,12 +16,13 @@
 #include <gio/gio.h>
 #include "shotwell-plugin-common.h"
 #include <glib/gi18n-lib.h>
+#include "shotwell-authenticator.h"
 #include <float.h>
 #include <math.h>
-#include <libsoup/soup.h>
-#include <gtk/gtk.h>
 #include <libxml/tree.h>
+#include <gtk/gtk.h>
 #include <gee.h>
+#include <libsoup/soup.h>
 #include <gexiv2/gexiv2.h>
 #include <gobject/gvaluecollector.h>
 
@@ -98,16 +99,8 @@ typedef struct _PublishingFlickrPublishingOptionsPaneClass PublishingFlickrPubli
 #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_flickr_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_flickr_publishing_parameters_unref (var), NULL)))
-
-#define PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE (publishing_flickr_pin_entry_pane_get_type ())
-#define PUBLISHING_FLICKR_PIN_ENTRY_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane))
-#define PUBLISHING_FLICKR_PIN_ENTRY_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPaneClass))
-#define PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE))
-#define PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE))
-#define PUBLISHING_FLICKR_PIN_ENTRY_PANE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPaneClass))
-
-typedef struct _PublishingFlickrPinEntryPane PublishingFlickrPinEntryPane;
-typedef struct _PublishingFlickrPinEntryPaneClass PublishingFlickrPinEntryPaneClass;
+#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))
@@ -119,29 +112,6 @@ typedef struct _PublishingFlickrPinEntryPaneClass PublishingFlickrPinEntryPaneCl
 typedef struct _PublishingFlickrTransaction PublishingFlickrTransaction;
 typedef struct _PublishingFlickrTransactionClass PublishingFlickrTransactionClass;
 
-#define PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION (publishing_flickr_authentication_request_transaction_get_type ())
-#define PUBLISHING_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, PublishingFlickrAuthenticationRequestTransaction))
-#define PUBLISHING_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, PublishingFlickrAuthenticationRequestTransactionClass))
-#define PUBLISHING_FLICKR_IS_AUTHENTICATION_REQUEST_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION))
-#define PUBLISHING_FLICKR_IS_AUTHENTICATION_REQUEST_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION))
-#define PUBLISHING_FLICKR_AUTHENTICATION_REQUEST_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, PublishingFlickrAuthenticationRequestTransactionClass))
-
-typedef struct _PublishingFlickrAuthenticationRequestTransaction PublishingFlickrAuthenticationRequestTransaction;
-typedef struct _PublishingFlickrAuthenticationRequestTransactionClass PublishingFlickrAuthenticationRequestTransactionClass;
-#define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
-#define _g_hash_table_unref0(var) ((var == NULL) ? NULL : (var = (g_hash_table_unref (var), NULL)))
-
-#define PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION (publishing_flickr_access_token_fetch_transaction_get_type ())
-#define PUBLISHING_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingFlickrAccessTokenFetchTransaction))
-#define PUBLISHING_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingFlickrAccessTokenFetchTransactionClass))
-#define PUBLISHING_FLICKR_IS_ACCESS_TOKEN_FETCH_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
-#define PUBLISHING_FLICKR_IS_ACCESS_TOKEN_FETCH_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION))
-#define PUBLISHING_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, PublishingFlickrAccessTokenFetchTransactionClass))
-
-typedef struct _PublishingFlickrAccessTokenFetchTransaction PublishingFlickrAccessTokenFetchTransaction;
-typedef struct _PublishingFlickrAccessTokenFetchTransactionClass PublishingFlickrAccessTokenFetchTransactionClass;
-
 #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))
@@ -151,6 +121,8 @@ typedef struct _PublishingFlickrAccessTokenFetchTransactionClass PublishingFlick
 
 typedef struct _PublishingFlickrAccountInfoFetchTransaction PublishingFlickrAccountInfoFetchTransaction;
 typedef struct _PublishingFlickrAccountInfoFetchTransactionClass PublishingFlickrAccountInfoFetchTransactionClass;
+#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_rest_support_xml_document_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_xml_document_unref (var), NULL)))
 #define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
 
@@ -164,11 +136,7 @@ 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 _PublishingFlickrPinEntryPanePrivate PublishingFlickrPinEntryPanePrivate;
-#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
 typedef struct _PublishingFlickrTransactionPrivate PublishingFlickrTransactionPrivate;
-typedef struct _PublishingFlickrAuthenticationRequestTransactionPrivate PublishingFlickrAuthenticationRequestTransactionPrivate;
-typedef struct _PublishingFlickrAccessTokenFetchTransactionPrivate PublishingFlickrAccessTokenFetchTransactionPrivate;
 typedef struct _PublishingFlickrAccountInfoFetchTransactionPrivate PublishingFlickrAccountInfoFetchTransactionPrivate;
 
 #define PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION (publishing_flickr_upload_transaction_get_type ())
@@ -204,6 +172,7 @@ typedef struct _PublishingFlickrPublishingOptionsPaneVisibilityEntryClass Publis
 
 typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntry PublishingFlickrPublishingOptionsPaneSizeEntry;
 typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryClass PublishingFlickrPublishingOptionsPaneSizeEntryClass;
+#define _g_slist_free0(var) ((var == NULL) ? NULL : (var = (g_slist_free (var), NULL)))
 typedef struct _PublishingFlickrPublishingOptionsPaneVisibilityEntryPrivate PublishingFlickrPublishingOptionsPaneVisibilityEntryPrivate;
 typedef struct _PublishingFlickrPublishingOptionsPaneSizeEntryPrivate PublishingFlickrPublishingOptionsPaneSizeEntryPrivate;
 #define _publishing_flickr_publishing_options_pane_visibility_entry_unref0(var) ((var == NULL) ? NULL : (var = (publishing_flickr_publishing_options_pane_visibility_entry_unref (var), NULL)))
@@ -287,27 +256,10 @@ struct _PublishingFlickrFlickrPublisherPrivate {
 	gboolean was_started;
 	PublishingFlickrSession* session;
 	PublishingFlickrPublishingOptionsPane* publishing_options_pane;
+	SpitPublishingAuthenticator* authenticator;
 	PublishingFlickrPublishingParameters* parameters;
 };
 
-struct _PublishingFlickrPinEntryPane {
-	GObject parent_instance;
-	PublishingFlickrPinEntryPanePrivate * priv;
-};
-
-struct _PublishingFlickrPinEntryPaneClass {
-	GObjectClass parent_class;
-};
-
-struct _PublishingFlickrPinEntryPanePrivate {
-	GtkBox* pane_widget;
-	GtkButton* continue_button;
-	GtkEntry* pin_entry;
-	GtkLabel* pin_entry_caption;
-	GtkLabel* explanatory_text;
-	GtkBuilder* builder;
-};
-
 struct _PublishingFlickrTransaction {
 	PublishingRESTSupportTransaction parent_instance;
 	PublishingFlickrTransactionPrivate * priv;
@@ -317,24 +269,6 @@ struct _PublishingFlickrTransactionClass {
 	PublishingRESTSupportTransactionClass parent_class;
 };
 
-struct _PublishingFlickrAuthenticationRequestTransaction {
-	PublishingFlickrTransaction parent_instance;
-	PublishingFlickrAuthenticationRequestTransactionPrivate * priv;
-};
-
-struct _PublishingFlickrAuthenticationRequestTransactionClass {
-	PublishingFlickrTransactionClass parent_class;
-};
-
-struct _PublishingFlickrAccessTokenFetchTransaction {
-	PublishingFlickrTransaction parent_instance;
-	PublishingFlickrAccessTokenFetchTransactionPrivate * priv;
-};
-
-struct _PublishingFlickrAccessTokenFetchTransactionClass {
-	PublishingFlickrTransactionClass parent_class;
-};
-
 struct _PublishingFlickrAccountInfoFetchTransaction {
 	PublishingFlickrTransaction parent_instance;
 	PublishingFlickrAccountInfoFetchTransactionPrivate * priv;
@@ -371,11 +305,11 @@ struct _PublishingFlickrSessionClass {
 };
 
 struct _PublishingFlickrSessionPrivate {
-	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 _PublishingFlickrPublishingOptionsPane {
@@ -470,11 +404,7 @@ 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_pin_entry_pane_parent_class = NULL;
-static SpitPublishingDialogPaneIface* publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = NULL;
 static gpointer publishing_flickr_transaction_parent_class = NULL;
-static gpointer publishing_flickr_authentication_request_transaction_parent_class = NULL;
-static gpointer publishing_flickr_access_token_fetch_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;
@@ -504,17 +434,7 @@ GType publishing_flickr_flickr_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType flickr_service_real_get_supported_media (SpitPublishingService* base);
 static void flickr_service_finalize (GObject* obj);
 #define PUBLISHING_FLICKR_SERVICE_NAME "Flickr"
-#define PUBLISHING_FLICKR_SERVICE_WELCOME_MESSAGE _ ("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.")
-#define PUBLISHING_FLICKR_RESTART_ERROR_MESSAGE _ ("You have already logged in and out of Flickr during this Shotwell sess" \
-"ion.\n" \
-"To continue publishing to Flickr, quit and restart Shotwell, then try " \
-"publishing again.")
 #define PUBLISHING_FLICKR_ENDPOINT_URL "https://api.flickr.com/services/rest"
-#define PUBLISHING_FLICKR_API_KEY "60dd96d4a2ad04888b09c9e18d82c26f"
-#define PUBLISHING_FLICKR_API_SECRET "d0960565e03547c1"
 #define PUBLISHING_FLICKR_ORIGINAL_SIZE -1
 #define PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE "98"
 #define PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA "!*'();:@&=+$,/?%#[] \\"
@@ -552,43 +472,15 @@ enum  {
 	PUBLISHING_FLICKR_FLICKR_PUBLISHER_DUMMY_PROPERTY
 };
 static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self);
-static void _publishing_flickr_flickr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer 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);
-static void publishing_flickr_flickr_publisher_invalidate_persistent_session (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_token (PublishingFlickrFlickrPublisher* self, const gchar* token);
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_token_secret (PublishingFlickrFlickrPublisher* self, const gchar* secret);
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_username (PublishingFlickrFlickrPublisher* self, const gchar* username);
-static gboolean publishing_flickr_flickr_publisher_is_persistent_session_valid (PublishingFlickrFlickrPublisher* self);
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_username (PublishingFlickrFlickrPublisher* self);
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_token (PublishingFlickrFlickrPublisher* self);
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_token_secret (PublishingFlickrFlickrPublisher* self);
+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);
-static void publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_do_run_authentication_request_transaction (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_on_auth_request_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_flickr_flickr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_flickr_flickr_publisher_on_auth_request_txn_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_flickr_flickr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_request (PublishingFlickrFlickrPublisher* self, const gchar* response);
-static void publishing_flickr_flickr_publisher_on_authentication_token_available (PublishingFlickrFlickrPublisher* self, const gchar* token, const gchar* token_secret);
-void publishing_flickr_session_set_request_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret);
-static void publishing_flickr_flickr_publisher_do_launch_system_browser (PublishingFlickrFlickrPublisher* self, const gchar* token);
-static void publishing_flickr_flickr_publisher_on_system_browser_launched (PublishingFlickrFlickrPublisher* self);
-static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (PublishingFlickrFlickrPublisher* self);
-GType publishing_flickr_pin_entry_pane_get_type (void) G_GNUC_CONST;
-static void publishing_flickr_flickr_publisher_on_pin_entry_proceed (PublishingFlickrFlickrPublisher* self, PublishingFlickrPinEntryPane* sender, const gchar* pin);
-static void _publishing_flickr_flickr_publisher_on_pin_entry_proceed_publishing_flickr_pin_entry_pane_proceed (PublishingFlickrPinEntryPane* _sender, PublishingFlickrPinEntryPane* sender, const gchar* authorization_pin, gpointer self);
-static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFlickrPublisher* self, const gchar* pin);
-static void publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_flickr_flickr_publisher_on_access_token_fetch_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err);
-static void _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentials_from_reponse (PublishingFlickrFlickrPublisher* self, const gchar* response);
+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);
-gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession* self);
-gchar* publishing_flickr_session_get_access_phase_token_secret (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);
@@ -609,23 +501,11 @@ 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);
-static void publishing_flickr_flickr_publisher_do_show_login_welcome_pane (PublishingFlickrFlickrPublisher* self);
-static void _publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self);
 GType publishing_flickr_transaction_get_type (void) G_GNUC_CONST;
-GType publishing_flickr_authentication_request_transaction_get_type (void) G_GNUC_CONST;
-PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_new (PublishingFlickrSession* session);
-PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_construct (GType object_type, PublishingFlickrSession* session);
-PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_new (GtkBuilder* builder);
-PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_construct (GType object_type, GtkBuilder* builder);
-GType publishing_flickr_access_token_fetch_transaction_get_type (void) G_GNUC_CONST;
-PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetch_transaction_new (PublishingFlickrSession* session, const gchar* user_verifier);
-PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session, const gchar* user_verifier);
-void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username);
 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);
 PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_response (const gchar* xml, GError** error);
-void publishing_flickr_session_deauthenticate (PublishingFlickrSession* self);
 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);
 PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_construct (GType object_type, PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata);
@@ -641,24 +521,9 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF
 void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size);
 static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_service (SpitPublishingPublisher* base);
 static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishingPublisher* base);
-void publishing_flickr_session_authenticate_from_persistent_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username);
 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);
-#define PUBLISHING_FLICKR_PIN_ENTRY_PANE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPanePrivate))
-enum  {
-	PUBLISHING_FLICKR_PIN_ENTRY_PANE_DUMMY_PROPERTY
-};
-static void publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (PublishingFlickrPinEntryPane* self);
-static void publishing_flickr_pin_entry_pane_on_continue_clicked (PublishingFlickrPinEntryPane* self);
-static GtkWidget* publishing_flickr_pin_entry_pane_real_get_widget (SpitPublishingDialogPane* base);
-static SpitPublishingDialogPaneGeometryOptions publishing_flickr_pin_entry_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base);
-static void publishing_flickr_pin_entry_pane_real_on_pane_installed (SpitPublishingDialogPane* base);
-static void _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
-static void publishing_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_flickr_pin_entry_pane_finalize (GObject* obj);
 enum  {
 	PUBLISHING_FLICKR_TRANSACTION_DUMMY_PROPERTY
 };
@@ -666,6 +531,7 @@ PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickr
 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);
@@ -673,15 +539,9 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 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_AUTHENTICATION_REQUEST_TRANSACTION_DUMMY_PROPERTY
-};
-enum  {
-	PUBLISHING_FLICKR_ACCESS_TOKEN_FETCH_TRANSACTION_DUMMY_PROPERTY
-};
-gchar* publishing_flickr_session_get_request_phase_token (PublishingFlickrSession* 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  {
@@ -691,7 +551,7 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (Pub
 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);
 static void _g_free0_ (gpointer var);
-static void _vala_array_add18 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
+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);
@@ -702,7 +562,7 @@ enum  {
 	PUBLISHING_FLICKR_SESSION_DUMMY_PROPERTY
 };
 static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTSupportSession* base);
-static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value);
+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);
@@ -736,18 +596,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);
@@ -770,7 +630,7 @@ enum  {
 	PUBLISHING_FLICKR_UPLOADER_DUMMY_PROPERTY
 };
 static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrUploader* self, SpitPublishingPublishable* publishable);
-static void _vala_array_add30 (gchar*** array, int* length, int* size, gchar* value);
+static void _vala_array_add31 (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);
@@ -792,7 +652,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 790 "FlickrPublishing.c"
+#line 656 "FlickrPublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
@@ -805,18 +665,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 803 "FlickrPublishing.c"
+#line 669 "FlickrPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 807 "FlickrPublishing.c"
+#line 673 "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 814 "FlickrPublishing.c"
+#line 680 "FlickrPublishing.c"
 }
 
 
@@ -838,7 +698,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 836 "FlickrPublishing.c"
+#line 702 "FlickrPublishing.c"
 }
 
 
@@ -851,7 +711,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 849 "FlickrPublishing.c"
+#line 715 "FlickrPublishing.c"
 }
 
 
@@ -864,14 +724,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 862 "FlickrPublishing.c"
+#line 728 "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 869 "FlickrPublishing.c"
+#line 735 "FlickrPublishing.c"
 }
 
 
@@ -882,17 +742,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 880 "FlickrPublishing.c"
+#line 746 "FlickrPublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #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 886 "FlickrPublishing.c"
+#line 752 "FlickrPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 890 "FlickrPublishing.c"
+#line 756 "FlickrPublishing.c"
 }
 
 
@@ -974,7 +834,7 @@ static void flickr_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 972 "FlickrPublishing.c"
+#line 838 "FlickrPublishing.c"
 }
 
 
@@ -982,7 +842,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 980 "FlickrPublishing.c"
+#line 846 "FlickrPublishing.c"
 }
 
 
@@ -1003,7 +863,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 1001 "FlickrPublishing.c"
+#line 867 "FlickrPublishing.c"
 }
 
 
@@ -1016,7 +876,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 1014 "FlickrPublishing.c"
+#line 880 "FlickrPublishing.c"
 }
 
 
@@ -1025,7 +885,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 1023 "FlickrPublishing.c"
+#line 889 "FlickrPublishing.c"
 }
 
 
@@ -1042,7 +902,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 1040 "FlickrPublishing.c"
+#line 906 "FlickrPublishing.c"
 }
 
 
@@ -1053,7 +913,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 1051 "FlickrPublishing.c"
+#line 917 "FlickrPublishing.c"
 }
 
 
@@ -1067,7 +927,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 1065 "FlickrPublishing.c"
+#line 931 "FlickrPublishing.c"
 }
 
 
@@ -1104,236 +964,236 @@ PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specificat
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrVisibilitySpecification*) g_type_create_instance (object_type);
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = friends_level;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->friends_level = _tmp0_;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = family_level;
-#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->family_level = _tmp1_;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = everyone_level;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->everyone_level = _tmp2_;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 1118 "FlickrPublishing.c"
+#line 984 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrVisibilitySpecification* publishing_flickr_visibility_specification_new (gint friends_level, gint family_level, gint everyone_level) {
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 74 "/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 1125 "FlickrPublishing.c"
+#line 991 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_visibility_specification_init (GValue* value) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1132 "FlickrPublishing.c"
+#line 998 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_visibility_specification_free_value (GValue* value) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (value->data[0].v_pointer);
-#line 1141 "FlickrPublishing.c"
+#line 1007 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_value_visibility_specification_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 1151 "FlickrPublishing.c"
+#line 1017 "FlickrPublishing.c"
 	} else {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1155 "FlickrPublishing.c"
+#line 1021 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_value_visibility_specification_peek_pointer (const GValue* value) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1163 "FlickrPublishing.c"
+#line 1029 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_visibility_specification_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1170 "FlickrPublishing.c"
+#line 1036 "FlickrPublishing.c"
 		PublishingFlickrVisibilitySpecification* object;
 		object = collect_values[0].v_pointer;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 1177 "FlickrPublishing.c"
+#line 1043 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 1181 "FlickrPublishing.c"
+#line 1047 "FlickrPublishing.c"
 		}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_visibility_specification_ref (object);
-#line 1185 "FlickrPublishing.c"
+#line 1051 "FlickrPublishing.c"
 	} else {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1189 "FlickrPublishing.c"
+#line 1055 "FlickrPublishing.c"
 	}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1193 "FlickrPublishing.c"
+#line 1059 "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 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 1204 "FlickrPublishing.c"
+#line 1070 "FlickrPublishing.c"
 	}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 1210 "FlickrPublishing.c"
+#line 1076 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1214 "FlickrPublishing.c"
+#line 1080 "FlickrPublishing.c"
 	} else {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 1218 "FlickrPublishing.c"
+#line 1084 "FlickrPublishing.c"
 	}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1222 "FlickrPublishing.c"
+#line 1088 "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 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1236 "FlickrPublishing.c"
+#line 1102 "FlickrPublishing.c"
 }
 
 
 gpointer publishing_flickr_value_get_visibility_specification (const GValue* value) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1245 "FlickrPublishing.c"
+#line 1111 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_value_set_visibility_specification (GValue* value, gpointer v_object) {
 	PublishingFlickrVisibilitySpecification* old;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_ref (value->data[0].v_pointer);
-#line 1265 "FlickrPublishing.c"
+#line 1131 "FlickrPublishing.c"
 	} else {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1269 "FlickrPublishing.c"
+#line 1135 "FlickrPublishing.c"
 	}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (old);
-#line 1275 "FlickrPublishing.c"
+#line 1141 "FlickrPublishing.c"
 	}
 }
 
 
 void publishing_flickr_value_take_visibility_specification (GValue* value, gpointer v_object) {
 	PublishingFlickrVisibilitySpecification* old;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/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 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1294 "FlickrPublishing.c"
+#line 1160 "FlickrPublishing.c"
 	} else {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1298 "FlickrPublishing.c"
+#line 1164 "FlickrPublishing.c"
 	}
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_visibility_specification_unref (old);
-#line 1304 "FlickrPublishing.c"
+#line 1170 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_visibility_specification_class_init (PublishingFlickrVisibilitySpecificationClass * klass) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_visibility_specification_parent_class = g_type_class_peek_parent (klass);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrVisibilitySpecificationClass *) klass)->finalize = publishing_flickr_visibility_specification_finalize;
-#line 1314 "FlickrPublishing.c"
+#line 1180 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_visibility_specification_instance_init (PublishingFlickrVisibilitySpecification * self) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 1321 "FlickrPublishing.c"
+#line 1187 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_visibility_specification_finalize (PublishingFlickrVisibilitySpecification* obj) {
 	PublishingFlickrVisibilitySpecification * self;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_VISIBILITY_SPECIFICATION, PublishingFlickrVisibilitySpecification);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1331 "FlickrPublishing.c"
+#line 1197 "FlickrPublishing.c"
 }
 
 
@@ -1354,252 +1214,252 @@ GType publishing_flickr_visibility_specification_get_type (void) {
 gpointer publishing_flickr_visibility_specification_ref (gpointer instance) {
 	PublishingFlickrVisibilitySpecification* self;
 	self = instance;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 1356 "FlickrPublishing.c"
+#line 1222 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_visibility_specification_unref (gpointer instance) {
 	PublishingFlickrVisibilitySpecification* self;
 	self = instance;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_VISIBILITY_SPECIFICATION_GET_CLASS (self)->finalize (self);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1369 "FlickrPublishing.c"
+#line 1235 "FlickrPublishing.c"
 	}
 }
 
 
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_construct (GType object_type) {
 	PublishingFlickrPublishingParameters* self = NULL;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingParameters*) g_type_create_instance (object_type);
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 1380 "FlickrPublishing.c"
+#line 1246 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrPublishingParameters* publishing_flickr_publishing_parameters_new (void) {
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_publishing_parameters_construct (PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS);
-#line 1387 "FlickrPublishing.c"
+#line 1253 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_publishing_parameters_init (GValue* value) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1394 "FlickrPublishing.c"
+#line 1260 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_value_publishing_parameters_free_value (GValue* value) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (value->data[0].v_pointer);
-#line 1403 "FlickrPublishing.c"
+#line 1269 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 1413 "FlickrPublishing.c"
+#line 1279 "FlickrPublishing.c"
 	} else {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1417 "FlickrPublishing.c"
+#line 1283 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1425 "FlickrPublishing.c"
+#line 1291 "FlickrPublishing.c"
 }
 
 
 static gchar* publishing_flickr_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1432 "FlickrPublishing.c"
+#line 1298 "FlickrPublishing.c"
 		PublishingFlickrPublishingParameters* object;
 		object = collect_values[0].v_pointer;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 1439 "FlickrPublishing.c"
+#line 1305 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 1443 "FlickrPublishing.c"
+#line 1309 "FlickrPublishing.c"
 		}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_parameters_ref (object);
-#line 1447 "FlickrPublishing.c"
+#line 1313 "FlickrPublishing.c"
 	} else {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1451 "FlickrPublishing.c"
+#line 1317 "FlickrPublishing.c"
 	}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1455 "FlickrPublishing.c"
+#line 1321 "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 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 1466 "FlickrPublishing.c"
+#line 1332 "FlickrPublishing.c"
 	}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 1472 "FlickrPublishing.c"
+#line 1338 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1476 "FlickrPublishing.c"
+#line 1342 "FlickrPublishing.c"
 	} else {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1480 "FlickrPublishing.c"
+#line 1346 "FlickrPublishing.c"
 	}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 1484 "FlickrPublishing.c"
+#line 1350 "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 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1498 "FlickrPublishing.c"
+#line 1364 "FlickrPublishing.c"
 }
 
 
 gpointer publishing_flickr_value_get_publishing_parameters (const GValue* value) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 1507 "FlickrPublishing.c"
+#line 1373 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_value_set_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingParameters* old;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1527 "FlickrPublishing.c"
+#line 1393 "FlickrPublishing.c"
 	} else {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1531 "FlickrPublishing.c"
+#line 1397 "FlickrPublishing.c"
 	}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (old);
-#line 1537 "FlickrPublishing.c"
+#line 1403 "FlickrPublishing.c"
 	}
 }
 
 
 void publishing_flickr_value_take_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingParameters* old;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/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 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1556 "FlickrPublishing.c"
+#line 1422 "FlickrPublishing.c"
 	} else {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1560 "FlickrPublishing.c"
+#line 1426 "FlickrPublishing.c"
 	}
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_parameters_unref (old);
-#line 1566 "FlickrPublishing.c"
+#line 1432 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_parameters_class_init (PublishingFlickrPublishingParametersClass * klass) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingParametersClass *) klass)->finalize = publishing_flickr_publishing_parameters_finalize;
-#line 1576 "FlickrPublishing.c"
+#line 1442 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_parameters_instance_init (PublishingFlickrPublishingParameters * self) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 1583 "FlickrPublishing.c"
+#line 1449 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_parameters_finalize (PublishingFlickrPublishingParameters* obj) {
 	PublishingFlickrPublishingParameters * self;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_PARAMETERS, PublishingFlickrPublishingParameters);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->username);
-#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->visibility_specification);
-#line 1597 "FlickrPublishing.c"
+#line 1463 "FlickrPublishing.c"
 }
 
 
@@ -1620,32 +1480,32 @@ GType publishing_flickr_publishing_parameters_get_type (void) {
 gpointer publishing_flickr_publishing_parameters_ref (gpointer instance) {
 	PublishingFlickrPublishingParameters* self;
 	self = instance;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 1622 "FlickrPublishing.c"
+#line 1488 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_parameters_unref (gpointer instance) {
 	PublishingFlickrPublishingParameters* self;
 	self = instance;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1635 "FlickrPublishing.c"
+#line 1501 "FlickrPublishing.c"
 	}
 }
 
 
-static void _publishing_flickr_flickr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated (PublishingRESTSupportSession* _sender, gpointer self) {
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+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"
 	publishing_flickr_flickr_publisher_on_session_authenticated ((PublishingFlickrFlickrPublisher*) self);
-#line 1643 "FlickrPublishing.c"
+#line 1509 "FlickrPublishing.c"
 }
 
 
@@ -1657,238 +1517,93 @@ PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_construct (G
 	SpitPublishingPluginHost* _tmp3_ = NULL;
 	PublishingFlickrSession* _tmp4_ = NULL;
 	PublishingFlickrPublishingParameters* _tmp5_ = NULL;
-	PublishingFlickrSession* _tmp6_ = NULL;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	PublishingAuthenticatorFactory* _tmp6_ = NULL;
+	PublishingAuthenticatorFactory* _tmp7_ = NULL;
+	SpitPublishingPluginHost* _tmp8_ = NULL;
+	SpitPublishingAuthenticator* _tmp9_ = NULL;
+	SpitPublishingAuthenticator* _tmp10_ = NULL;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrFlickrPublisher*) g_object_new (object_type, NULL);
-#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:112: FlickrPublisher instantiated.");
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 113 "/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->service);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->service = _tmp1_;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = host;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->host);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->host = _tmp3_;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = publishing_flickr_session_new ();
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->session = _tmp4_;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = publishing_flickr_publishing_parameters_new ();
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp5_;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = self->priv->session;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated", (GCallback) _publishing_flickr_flickr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated, self, 0);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 112 "/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"
+	_tmp7_ = _tmp6_;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp8_ = host;
+#line 112 "/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"
+	_g_object_unref0 (self->priv->authenticator);
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->authenticator = _tmp9_;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_object_unref0 (_tmp7_);
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = self->priv->authenticator;
+#line 114 "/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"
 	return self;
-#line 1698 "FlickrPublishing.c"
+#line 1582 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrFlickrPublisher* publishing_flickr_flickr_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_flickr_publisher_construct (PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, service, host);
-#line 1705 "FlickrPublishing.c"
+#line 1589 "FlickrPublishing.c"
 }
 
 
-static void publishing_flickr_flickr_publisher_invalidate_persistent_session (PublishingFlickrFlickrPublisher* self) {
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_token (self, "");
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_token_secret (self, "");
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_username (self, "");
-#line 1718 "FlickrPublishing.c"
-}
-
-
-static gboolean publishing_flickr_flickr_publisher_is_persistent_session_valid (PublishingFlickrFlickrPublisher* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_ = FALSE;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gboolean _tmp4_ = FALSE;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), FALSE);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_username (self);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_ != NULL;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp3_);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp4_) {
-#line 1741 "FlickrPublishing.c"
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token (self);
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = _tmp5_;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = _tmp6_ != NULL;
-#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp6_);
-#line 1752 "FlickrPublishing.c"
-	} else {
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = FALSE;
-#line 1756 "FlickrPublishing.c"
-	}
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp1_) {
-#line 1760 "FlickrPublishing.c"
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token_secret (self);
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = _tmp7_;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp0_ = _tmp8_ != NULL;
-#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp8_);
-#line 1771 "FlickrPublishing.c"
-	} else {
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp0_ = FALSE;
-#line 1775 "FlickrPublishing.c"
-	}
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp0_;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 1781 "FlickrPublishing.c"
-}
-
-
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_username (PublishingFlickrFlickrPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+SpitPublishingAuthenticator* publishing_flickr_flickr_publisher_get_authenticator (PublishingFlickrFlickrPublisher* self) {
+	SpitPublishingAuthenticator* result = NULL;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	SpitPublishingAuthenticator* _tmp1_ = NULL;
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), NULL);
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", NULL);
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp1_;
-#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 1799 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_username (PublishingFlickrFlickrPublisher* self, const gchar* username) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (username != NULL);
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = username;
-#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_username", _tmp1_);
-#line 1816 "FlickrPublishing.c"
-}
-
-
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_token (PublishingFlickrFlickrPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), NULL);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", NULL);
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp1_;
-#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 1834 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_token (PublishingFlickrFlickrPublisher* self, const gchar* token) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = token;
-#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token", _tmp1_);
-#line 1851 "FlickrPublishing.c"
-}
-
-
-static gchar* publishing_flickr_flickr_publisher_get_persistent_access_phase_token_secret (PublishingFlickrFlickrPublisher* self) {
-	gchar* result = NULL;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), NULL);
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 122 "/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"
 	result = _tmp1_;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 1869 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_set_persistent_access_phase_token_secret (PublishingFlickrFlickrPublisher* self, const gchar* secret) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = secret;
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "access_phase_token_secret", _tmp1_);
-#line 1886 "FlickrPublishing.c"
+#line 1607 "FlickrPublishing.c"
 }
 
 
@@ -1896,468 +1611,228 @@ static gboolean publishing_flickr_flickr_publisher_get_persistent_strip_metadata
 	gboolean result = FALSE;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), FALSE);
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 126 "/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 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 1904 "FlickrPublishing.c"
+#line 1625 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_set_persistent_strip_metadata (PublishingFlickrFlickrPublisher* self, gboolean strip_metadata) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = strip_metadata;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 130 "/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 1919 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked (PublishingFlickrFlickrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->running;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp0_) {
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 1933 "FlickrPublishing.c"
-	}
-#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:173: EVENT: user clicked 'Login' button in the w" \
-"elcome pane");
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_run_authentication_request_transaction (self);
-#line 1939 "FlickrPublishing.c"
+#line 1640 "FlickrPublishing.c"
 }
 
 
-static void _publishing_flickr_flickr_publisher_on_auth_request_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_auth_request_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender);
-#line 1946 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_flickr_publisher_on_auth_request_txn_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_auth_request_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 1953 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_auth_request_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	PublishingRESTSupportTransaction* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 179 "/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_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = txn;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 180 "/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_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 182 "/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 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp4_) {
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 1991 "FlickrPublishing.c"
-	}
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = txn;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:185: EVENT: OAuth authentication request transac" \
-"tion completed; response = '%s'", _tmp7_);
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = txn;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = publishing_rest_support_transaction_get_response (_tmp8_);
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = _tmp9_;
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_request (self, _tmp10_);
-#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp10_);
-#line 2013 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_auth_request_txn_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	GError* _tmp6_ = NULL;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
-#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 193 "/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_auth_request_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = txn;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 194 "/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_auth_request_txn_error_publishing_rest_support_transaction_network_error, self);
-#line 196 "/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"
-	if (!_tmp4_) {
-#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2047 "FlickrPublishing.c"
-	}
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:199: EVENT: OAuth authentication request transac" \
-"tion caused a network error");
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = self->priv->host;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = err;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 2057 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_authentication_token_available (PublishingFlickrFlickrPublisher* self, const gchar* token, const gchar* token_secret) {
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingFlickrSession* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token_secret != NULL);
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = token;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = token_secret;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:204: EVENT: OAuth authentication token (%s) and " \
-"token secret (%s) available", _tmp0_, _tmp1_);
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->session;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = token;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = token_secret;
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_session_set_request_phase_credentials (_tmp2_, _tmp3_, _tmp4_);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = token;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_launch_system_browser (self, _tmp5_);
-#line 2092 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_system_browser_launched (PublishingFlickrFlickrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 213 "/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 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp0_) {
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2106 "FlickrPublishing.c"
-	}
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:216: EVENT: system browser launched.");
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_show_pin_entry_pane (self);
-#line 2112 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_flickr_publisher_on_pin_entry_proceed_publishing_flickr_pin_entry_pane_proceed (PublishingFlickrPinEntryPane* _sender, PublishingFlickrPinEntryPane* sender, const gchar* authorization_pin, gpointer self) {
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_pin_entry_proceed ((PublishingFlickrFlickrPublisher*) self, sender, authorization_pin);
-#line 2119 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_pin_entry_proceed (PublishingFlickrFlickrPublisher* self, PublishingFlickrPinEntryPane* sender, const gchar* pin) {
-	PublishingFlickrPinEntryPane* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	gboolean _tmp2_ = FALSE;
-	const gchar* _tmp3_ = NULL;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE (sender));
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (pin != NULL);
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = sender;
-#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("proceed", PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, &_tmp1_, NULL, FALSE);
-#line 222 "/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_pin_entry_proceed_publishing_flickr_pin_entry_pane_proceed, self);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = spit_publishing_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher));
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp2_) {
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2146 "FlickrPublishing.c"
-	}
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:227: EVENT: user clicked 'Continue' in PIN entry" \
-" pane.");
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = pin;
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_verify_pin (self, _tmp3_);
-#line 2154 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed ((PublishingFlickrFlickrPublisher*) self, _sender);
-#line 2161 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_access_token_fetch_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 2168 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 233 "/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_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = txn;
-#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 234 "/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_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 236 "/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 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp4_) {
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2203 "FlickrPublishing.c"
-	}
-#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:239: EVENT: fetching OAuth access token over the" \
-" network succeeded");
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = txn;
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_do_extract_access_phase_credentials_from_reponse (self, _tmp7_);
-#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 2217 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_on_access_token_fetch_error (PublishingFlickrFlickrPublisher* self, PublishingRESTSupportTransaction* txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	GError* _tmp6_ = NULL;
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = txn;
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 246 "/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_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self);
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = txn;
-#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 247 "/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_access_token_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 249 "/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 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (!_tmp4_) {
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2251 "FlickrPublishing.c"
-	}
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:252: EVENT: fetching OAuth access token over the" \
-" network caused an error.");
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = self->priv->host;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = err;
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 2261 "FlickrPublishing.c"
+static gpointer _g_variant_ref0 (gpointer self) {
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	return self ? g_variant_ref (self) : NULL;
+#line 1647 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_session_authenticated (PublishingFlickrFlickrPublisher* self) {
 	gboolean _tmp0_ = FALSE;
-	PublishingFlickrPublishingParameters* _tmp1_ = NULL;
-	PublishingFlickrSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingFlickrSession* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	PublishingFlickrSession* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	PublishingFlickrSession* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-#line 257 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	GHashTable* params = NULL;
+	SpitPublishingAuthenticator* _tmp1_ = NULL;
+	GHashTable* _tmp2_ = NULL;
+	GVariant* consumer_key = NULL;
+	GVariant* consumer_secret = NULL;
+	GVariant* auth_token = NULL;
+	GVariant* auth_token_secret = NULL;
+	GVariant* username = NULL;
+	GHashTable* _tmp3_ = NULL;
+	gconstpointer _tmp4_ = NULL;
+	GVariant* _tmp5_ = NULL;
+	GHashTable* _tmp6_ = NULL;
+	gconstpointer _tmp7_ = NULL;
+	GVariant* _tmp8_ = NULL;
+	PublishingFlickrSession* _tmp9_ = NULL;
+	GVariant* _tmp10_ = NULL;
+	const gchar* _tmp11_ = NULL;
+	GVariant* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	GHashTable* _tmp14_ = NULL;
+	gconstpointer _tmp15_ = NULL;
+	GVariant* _tmp16_ = NULL;
+	GHashTable* _tmp17_ = NULL;
+	gconstpointer _tmp18_ = NULL;
+	GVariant* _tmp19_ = NULL;
+	GHashTable* _tmp20_ = NULL;
+	gconstpointer _tmp21_ = NULL;
+	GVariant* _tmp22_ = NULL;
+	PublishingFlickrSession* _tmp23_ = NULL;
+	GVariant* _tmp24_ = NULL;
+	const gchar* _tmp25_ = NULL;
+	GVariant* _tmp26_ = NULL;
+	const gchar* _tmp27_ = NULL;
+	GVariant* _tmp28_ = NULL;
+	const gchar* _tmp29_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp30_ = NULL;
+	PublishingFlickrSession* _tmp31_ = NULL;
+	gchar* _tmp32_ = NULL;
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 134 "/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 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 134 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2287 "FlickrPublishing.c"
+#line 1699 "FlickrPublishing.c"
 	}
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:261: EVENT: a fully authenticated session has be" \
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:137: EVENT: a fully authenticated session has be" \
 "come available");
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->parameters;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->session;
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = publishing_flickr_session_get_username (_tmp2_);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp1_->username);
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_->username = _tmp3_;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = self->priv->session;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = publishing_flickr_session_get_access_phase_token (_tmp4_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = _tmp5_;
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_token (self, _tmp6_);
-#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp6_);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = self->priv->session;
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = publishing_flickr_session_get_access_phase_token_secret (_tmp7_);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_token_secret (self, _tmp9_);
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = self->priv->session;
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = publishing_flickr_session_get_username (_tmp10_);
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = _tmp11_;
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_set_persistent_access_phase_username (self, _tmp12_);
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp12_);
-#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp1_ = self->priv->authenticator;
+#line 139 "/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"
+	params = _tmp2_;
+#line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	consumer_key = NULL;
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	consumer_secret = NULL;
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	auth_token = NULL;
+#line 143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	auth_token_secret = NULL;
+#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	username = NULL;
+#line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp3_ = params;
+#line 146 "/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"
+	_g_variant_unref0 (consumer_key);
+#line 146 "/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"
+	consumer_key = _tmp5_;
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp6_ = params;
+#line 147 "/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"
+	_g_variant_unref0 (consumer_secret);
+#line 147 "/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"
+	consumer_secret = _tmp8_;
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp9_ = self->priv->session;
+#line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp10_ = consumer_key;
+#line 148 "/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"
+	_tmp12_ = consumer_secret;
+#line 148 "/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"
+	_tmp14_ = params;
+#line 150 "/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"
+	_g_variant_unref0 (auth_token);
+#line 150 "/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"
+	auth_token = _tmp16_;
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp17_ = params;
+#line 151 "/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"
+	_g_variant_unref0 (auth_token_secret);
+#line 151 "/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"
+	auth_token_secret = _tmp19_;
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp20_ = params;
+#line 152 "/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"
+	_g_variant_unref0 (username);
+#line 152 "/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"
+	username = _tmp22_;
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp23_ = self->priv->session;
+#line 153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp24_ = auth_token;
+#line 153 "/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"
+	_tmp26_ = auth_token_secret;
+#line 153 "/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"
+	_tmp28_ = username;
+#line 153 "/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"
+	_tmp30_ = self->priv->parameters;
+#line 156 "/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"
+	_g_free0 (_tmp30_->username);
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp30_->username = _tmp32_;
+#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_fetch_account_info (self);
-#line 2333 "FlickrPublishing.c"
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_variant_unref0 (username);
+#line 133 "/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"
+	_g_variant_unref0 (auth_token);
+#line 133 "/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"
+	_g_variant_unref0 (consumer_key);
+#line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_hash_table_unref0 (params);
+#line 1821 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 273 "/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_completed ((PublishingFlickrFlickrPublisher*) self, _sender);
-#line 2340 "FlickrPublishing.c"
+#line 1828 "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 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_fetch_txn_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 2347 "FlickrPublishing.c"
+#line 1835 "FlickrPublishing.c"
 }
 
 
@@ -2370,44 +1845,44 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_completed (P
 	PublishingRESTSupportTransaction* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = txn;
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 273 "/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 (_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 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = txn;
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 163 "/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 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 165 "/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 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2382 "FlickrPublishing.c"
+#line 1870 "FlickrPublishing.c"
 	}
-#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:279: EVENT: account fetch transaction response r" \
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:168: EVENT: account fetch transaction response r" \
 "eceived over the network");
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = txn;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (self, _tmp7_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 2396 "FlickrPublishing.c"
+#line 1884 "FlickrPublishing.c"
 }
 
 
@@ -2419,75 +1894,75 @@ static void publishing_flickr_flickr_publisher_on_account_fetch_txn_error (Publi
 	gboolean _tmp4_ = FALSE;
 	SpitPublishingPluginHost* _tmp5_ = NULL;
 	GError* _tmp6_ = NULL;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = txn;
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 285 "/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 (_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 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = txn;
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 175 "/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 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 177 "/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 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2430 "FlickrPublishing.c"
+#line 1918 "FlickrPublishing.c"
 	}
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:291: EVENT: account fetch transaction caused a n" \
+#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:180: EVENT: account fetch transaction caused a n" \
 "etwork error");
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = self->priv->host;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = err;
-#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 2440 "FlickrPublishing.c"
+#line 1928 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_on_account_info_available (PublishingFlickrFlickrPublisher* self) {
 	gboolean _tmp0_ = FALSE;
-#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 185 "/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 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2454 "FlickrPublishing.c"
+#line 1942 "FlickrPublishing.c"
 	}
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:299: EVENT: account information has become avail" \
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:188: EVENT: account information has become avail" \
 "able");
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_show_publishing_options_pane (self);
-#line 2460 "FlickrPublishing.c"
+#line 1948 "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 304 "/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_publish ((PublishingFlickrFlickrPublisher*) self, strip_metadata);
-#line 2467 "FlickrPublishing.c"
+#line 1955 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_publishing_options_pane_logout ((PublishingFlickrFlickrPublisher*) self);
-#line 2474 "FlickrPublishing.c"
+#line 1962 "FlickrPublishing.c"
 }
 
 
@@ -2498,36 +1973,36 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_publis
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 304 "/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 (_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 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 194 "/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 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 196 "/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 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2505 "FlickrPublishing.c"
+#line 1993 "FlickrPublishing.c"
 	}
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:310: EVENT: user clicked the 'Publish' button in" \
+#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:199: EVENT: user clicked the 'Publish' button in" \
 " the publishing options pane");
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = strip_metadata;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_publish (self, _tmp5_);
-#line 2513 "FlickrPublishing.c"
+#line 2001 "FlickrPublishing.c"
 }
 
 
@@ -2537,34 +2012,34 @@ static void publishing_flickr_flickr_publisher_on_publishing_options_pane_logout
 	PublishingFlickrPublishingOptionsPane* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publishing_options_pane;
-#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 315 "/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 (_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 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->publishing_options_pane;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp3_, NULL, FALSE);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 205 "/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 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 207 "/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 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp4_) {
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2543 "FlickrPublishing.c"
+#line 2031 "FlickrPublishing.c"
 	}
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:321: EVENT: user clicked the 'Logout' button in " \
+#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:210: EVENT: user clicked the 'Logout' button in " \
 "the publishing options pane");
-#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_logout (self);
-#line 2549 "FlickrPublishing.c"
+#line 2037 "FlickrPublishing.c"
 }
 
 
@@ -2577,52 +2052,52 @@ static void publishing_flickr_flickr_publisher_on_upload_status_updated (Publish
 	void* _tmp3__target = NULL;
 	gint _tmp4_ = 0;
 	gdouble _tmp5_ = 0.0;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 216 "/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 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2570 "FlickrPublishing.c"
+#line 2058 "FlickrPublishing.c"
 	}
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = completed_fraction;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:330: EVENT: uploader reports upload %.2f percent" \
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:219: EVENT: uploader reports upload %.2f percent" \
 " complete.", 100.0 * _tmp1_);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->progress_reporter;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2__target = self->priv->progress_reporter_target;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__target = self->priv->progress_reporter_target;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = file_number;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = completed_fraction;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 2592 "FlickrPublishing.c"
+#line 2080 "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 344 "/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_complete ((PublishingFlickrFlickrPublisher*) self, _sender, num_photos_published);
-#line 2599 "FlickrPublishing.c"
+#line 2087 "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 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_error ((PublishingFlickrFlickrPublisher*) self, _sender, err);
-#line 2606 "FlickrPublishing.c"
+#line 2094 "FlickrPublishing.c"
 }
 
 
@@ -2633,38 +2108,38 @@ static void publishing_flickr_flickr_publisher_on_upload_complete (PublishingFli
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportBatchUploader* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 226 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 228 "/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 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2627 "FlickrPublishing.c"
+#line 2115 "FlickrPublishing.c"
 	}
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = num_published;
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:342: EVENT: uploader reports upload complete; %d" \
+#line 231 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:231: EVENT: uploader reports upload complete; %d" \
 " items published.", _tmp1_);
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = uploader;
-#line 344 "/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-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 344 "/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 (_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 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = uploader;
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 234 "/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 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 234 "/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 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_do_show_success_pane (self);
-#line 2647 "FlickrPublishing.c"
+#line 2135 "FlickrPublishing.c"
 }
 
 
@@ -2678,753 +2153,44 @@ static void publishing_flickr_flickr_publisher_on_upload_error (PublishingFlickr
 	guint _tmp6_ = 0U;
 	SpitPublishingPluginHost* _tmp7_ = NULL;
 	GError* _tmp8_ = NULL;
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 241 "/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 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp0_) {
-#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 2671 "FlickrPublishing.c"
+#line 2159 "FlickrPublishing.c"
 	}
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = err;
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_->message;
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:355: EVENT: uploader reports upload error = '%s'" \
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:244: EVENT: uploader reports upload error = '%s'" \
 ".", _tmp2_);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = uploader;
-#line 357 "/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-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE);
-#line 357 "/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 (_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 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = uploader;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 247 "/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 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 247 "/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 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = self->priv->host;
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = err;
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 2697 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked_spit_publishing_login_callback (gpointer self) {
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked ((PublishingFlickrFlickrPublisher*) self);
-#line 2704 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_show_login_welcome_pane (PublishingFlickrFlickrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:364: ACTION: installing login welcome pane");
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_install_welcome_pane (_tmp1_, PUBLISHING_FLICKR_SERVICE_WELCOME_MESSAGE, _publishing_flickr_flickr_publisher_on_welcome_pane_login_clicked_spit_publishing_login_callback, self);
-#line 2723 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_run_authentication_request_transaction (PublishingFlickrFlickrPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	PublishingFlickrAuthenticationRequestTransaction* txn = NULL;
-	PublishingFlickrSession* _tmp3_ = NULL;
-	PublishingFlickrAuthenticationRequestTransaction* _tmp4_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:371: ACTION: running authentication request tran" \
-"saction");
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->host;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _ ("Preparing for login…");
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp1_, _tmp2_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = self->priv->session;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = publishing_flickr_authentication_request_transaction_new (_tmp3_);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	txn = _tmp4_;
-#line 377 "/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_auth_request_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 378 "/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_auth_request_txn_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 2759 "FlickrPublishing.c"
-	{
-#line 381 "/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 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2767 "FlickrPublishing.c"
-				goto __catch16_spit_publishing_publishing_error;
-			}
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (txn);
-#line 381 "/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 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			return;
-#line 2778 "FlickrPublishing.c"
-		}
-	}
-	goto __finally16;
-	__catch16_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		err = _inner_error_;
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_inner_error_ = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = self->priv->host;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = err;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp5_, _tmp6_);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (err);
-#line 2799 "FlickrPublishing.c"
-	}
-	__finally16:
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (txn);
-#line 380 "/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 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 2812 "FlickrPublishing.c"
-	}
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (txn);
-#line 2816 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_parse_token_info_from_auth_request (PublishingFlickrFlickrPublisher* self, const gchar* response) {
-	const gchar* _tmp0_ = NULL;
-	gchar* oauth_token = NULL;
-	gchar* oauth_token_secret = NULL;
-	GHashTable* data = NULL;
-	const gchar* _tmp1_ = NULL;
-	GHashTable* _tmp2_ = NULL;
-	GHashTable* _tmp3_ = NULL;
-	gconstpointer _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
-	gconstpointer _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gboolean _tmp9_ = FALSE;
-	const gchar* _tmp10_ = NULL;
-	const gchar* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (response != NULL);
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = response;
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:388: ACTION: parsing authorization request respo" \
-"nse '%s' into token and secret", _tmp0_);
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	oauth_token = NULL;
-#line 391 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	oauth_token_secret = NULL;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = response;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = soup_form_decode (_tmp1_);
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	data = _tmp2_;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = data;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (oauth_token);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	oauth_token = _tmp5_;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = data;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (oauth_token_secret);
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = g_strdup (_tmp7_);
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	oauth_token_secret = _tmp8_;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = oauth_token;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp10_ == NULL) {
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9_ = TRUE;
-#line 2881 "FlickrPublishing.c"
-	} else {
-		const gchar* _tmp11_ = NULL;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp11_ = oauth_token_secret;
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9_ = _tmp11_ == NULL;
-#line 2888 "FlickrPublishing.c"
-	}
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp9_) {
-#line 2892 "FlickrPublishing.c"
-		SpitPublishingPluginHost* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp12_ = self->priv->host;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp13_ = response;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp15_ = _tmp14_;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp12_, _tmp15_);
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (_tmp15_);
-#line 2909 "FlickrPublishing.c"
-	}
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = oauth_token;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = oauth_token_secret;
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_authentication_token_available (self, _tmp16_, _tmp17_);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_hash_table_unref0 (data);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (oauth_token_secret);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (oauth_token);
-#line 2923 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_launch_system_browser (PublishingFlickrFlickrPublisher* self, const gchar* token) {
-	gchar* login_uri = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = token;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = g_strconcat ("https://www.flickr.com/services/oauth/authorize?oauth_token=", _tmp0_, NULL);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = _tmp1_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = g_strconcat (_tmp2_, "&perms=write", NULL);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp2_);
-#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	login_uri = _tmp4_;
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = login_uri;
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:409: ACTION: launching system browser with uri =" \
-" '%s'", _tmp5_);
-#line 2958 "FlickrPublishing.c"
-	{
-		const gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = login_uri;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = g_strconcat ("xdg-open ", _tmp6_, NULL);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = _tmp7_;
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_spawn_command_line_async (_tmp8_, &_inner_error_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp8_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			if (_inner_error_->domain == G_SPAWN_ERROR) {
-#line 2977 "FlickrPublishing.c"
-				goto __catch17_g_spawn_error;
-			}
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (login_uri);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			return;
-#line 2988 "FlickrPublishing.c"
-		}
-	}
-	goto __finally17;
-	__catch17_g_spawn_error:
-	{
-		GError* e = NULL;
-		SpitPublishingPluginHost* _tmp9_ = NULL;
-		GError* _tmp10_ = NULL;
-		GError* _tmp11_ = NULL;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		e = _inner_error_;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_inner_error_ = NULL;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp9_ = self->priv->host;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp10_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, "couldn't launch system web browser to complete Flickr login");
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp11_ = _tmp10_;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp9_, _tmp11_);
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (_tmp11_);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (e);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (login_uri);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 3018 "FlickrPublishing.c"
-	}
-	__finally17:
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (login_uri);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 3031 "FlickrPublishing.c"
-	}
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_on_system_browser_launched (self);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (login_uri);
-#line 3037 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_show_pin_entry_pane (PublishingFlickrFlickrPublisher* self) {
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	PublishingFlickrPinEntryPane* pin_entry_pane = NULL;
-	GtkBuilder* _tmp8_ = NULL;
-	PublishingFlickrPinEntryPane* _tmp9_ = NULL;
-	PublishingFlickrPinEntryPane* _tmp10_ = NULL;
-	SpitPublishingPluginHost* _tmp11_ = NULL;
-	PublishingFlickrPinEntryPane* _tmp12_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:423: ACTION: showing PIN entry pane");
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = gtk_builder_new ();
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	builder = _tmp0_;
-#line 3059 "FlickrPublishing.c"
-	{
-		GtkBuilder* _tmp1_ = NULL;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = builder;
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "flickr_pin_entry_pane.ui", &_inner_error_);
-#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3068 "FlickrPublishing.c"
-			goto __catch18_g_error;
-		}
-	}
-	goto __finally18;
-	__catch18_g_error:
-	{
-		GError* e = NULL;
-		GError* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		SpitPublishingPluginHost* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		e = _inner_error_;
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_inner_error_ = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp2_ = e;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp3_ = _tmp2_->message;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_warning ("FlickrPublishing.vala:431: Could not parse UI file! Error: %s.", _tmp3_);
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp4_ = self->priv->host;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
-"n’t continue.");
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = _tmp6_;
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
-#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (_tmp7_);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (e);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_object_unref0 (builder);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 3110 "FlickrPublishing.c"
-	}
-	__finally18:
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_object_unref0 (builder);
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 3123 "FlickrPublishing.c"
-	}
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = builder;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = publishing_flickr_pin_entry_pane_new (_tmp8_);
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	pin_entry_pane = _tmp9_;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = pin_entry_pane;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp10_, "proceed", (GCallback) _publishing_flickr_flickr_publisher_on_pin_entry_proceed_publishing_flickr_pin_entry_pane_proceed, self, 0);
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = self->priv->host;
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = pin_entry_pane;
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (pin_entry_pane);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (builder);
-#line 3145 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_verify_pin (PublishingFlickrFlickrPublisher* self, const gchar* pin) {
-	const gchar* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	PublishingFlickrAccessTokenFetchTransaction* txn = NULL;
-	PublishingFlickrSession* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
-	PublishingFlickrAccessTokenFetchTransaction* _tmp6_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (pin != NULL);
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = pin;
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:444: ACTION: validating authorization PIN %s", _tmp0_);
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->host;
-#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->host;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _ ("Verifying authorization…");
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp2_, _tmp3_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = self->priv->session;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = pin;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = publishing_flickr_access_token_fetch_transaction_new (_tmp4_, _tmp5_);
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	txn = _tmp6_;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_flickr_flickr_publisher_on_access_token_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 3189 "FlickrPublishing.c"
-	{
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (txn, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3197 "FlickrPublishing.c"
-				goto __catch19_spit_publishing_publishing_error;
-			}
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (txn);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			return;
-#line 3208 "FlickrPublishing.c"
-		}
-	}
-	goto __finally19;
-	__catch19_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		err = _inner_error_;
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_inner_error_ = NULL;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = self->priv->host;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp8_ = err;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (err);
-#line 3229 "FlickrPublishing.c"
-	}
-	__finally19:
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (txn);
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		return;
-#line 3242 "FlickrPublishing.c"
-	}
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (txn);
-#line 3246 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_flickr_publisher_do_extract_access_phase_credentials_from_reponse (PublishingFlickrFlickrPublisher* self, const gchar* response) {
-	const gchar* _tmp0_ = NULL;
-	gchar* token = NULL;
-	gchar* token_secret = NULL;
-	gchar* username = NULL;
-	GHashTable* data = NULL;
-	const gchar* _tmp1_ = NULL;
-	GHashTable* _tmp2_ = NULL;
-	GHashTable* _tmp3_ = NULL;
-	gconstpointer _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	GHashTable* _tmp6_ = NULL;
-	gconstpointer _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	GHashTable* _tmp9_ = NULL;
-	gconstpointer _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	const gchar* _tmp14_ = NULL;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_ = FALSE;
-	const gchar* _tmp17_ = NULL;
-	PublishingFlickrSession* _tmp23_ = NULL;
-	const gchar* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	const gchar* _tmp26_ = NULL;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (response != NULL);
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = response;
-#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:461: ACTION: extracting access phase credentials" \
-" from '%s'", _tmp0_);
-#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	token = NULL;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	token_secret = NULL;
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	username = NULL;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = response;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = soup_form_decode (_tmp1_);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	data = _tmp2_;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = data;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp3_, "oauth_token", NULL, &_tmp4_);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (token);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	token = _tmp5_;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = data;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp6_, "oauth_token_secret", NULL, &_tmp7_);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (token_secret);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = g_strdup (_tmp7_);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	token_secret = _tmp8_;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = data;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_lookup_extended (_tmp9_, "username", NULL, &_tmp10_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (username);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = g_strdup (_tmp10_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	username = _tmp11_;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = token;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = token_secret;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = username;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:472: access phase credentials: { token = '%s'; t" \
-"oken_secret = '%s'; username = '%s' }", _tmp12_, _tmp13_, _tmp14_);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = token;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp17_ == NULL) {
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp16_ = TRUE;
-#line 3341 "FlickrPublishing.c"
-	} else {
-		const gchar* _tmp18_ = NULL;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp18_ = token_secret;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp16_ = _tmp18_ == NULL;
-#line 3348 "FlickrPublishing.c"
-	}
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp16_) {
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp15_ = TRUE;
-#line 3354 "FlickrPublishing.c"
-	} else {
-		const gchar* _tmp19_ = NULL;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp19_ = username;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp15_ = _tmp19_ == NULL;
-#line 3361 "FlickrPublishing.c"
-	}
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp15_) {
-#line 3365 "FlickrPublishing.c"
-		SpitPublishingPluginHost* _tmp20_ = NULL;
-		GError* _tmp21_ = NULL;
-		GError* _tmp22_ = NULL;
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp20_ = self->priv->host;
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp21_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "expected " "access phase credentials to contain token, token secret, and username " \
-"but at " "least one of these is absent");
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp22_ = _tmp21_;
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp20_, _tmp22_);
-#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_error_free0 (_tmp22_);
-#line 3379 "FlickrPublishing.c"
-	}
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp23_ = self->priv->session;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp24_ = token;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp25_ = token_secret;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp26_ = username;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_session_set_access_phase_credentials (_tmp23_, _tmp24_, _tmp25_, _tmp26_);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_hash_table_unref0 (data);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (username);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (token_secret);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (token);
-#line 3399 "FlickrPublishing.c"
+#line 2185 "FlickrPublishing.c"
 }
 
 
@@ -3435,87 +2201,87 @@ static void publishing_flickr_flickr_publisher_do_fetch_account_info (Publishing
 	PublishingFlickrSession* _tmp2_ = NULL;
 	PublishingFlickrAccountInfoFetchTransaction* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:484: ACTION: running network transaction to fetc" \
+#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:253: ACTION: running network transaction to fetc" \
 "h account information");
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->session;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_account_info_fetch_transaction_new (_tmp2_);
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	txn = _tmp3_;
-#line 490 "/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), "completed", (GCallback) _publishing_flickr_flickr_publisher_on_account_fetch_txn_completed_publishing_rest_support_transaction_completed, self, 0);
-#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 260 "/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 3432 "FlickrPublishing.c"
+#line 2218 "FlickrPublishing.c"
 	{
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/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 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3440 "FlickrPublishing.c"
-				goto __catch20_spit_publishing_publishing_error;
+#line 2226 "FlickrPublishing.c"
+				goto __catch13_spit_publishing_publishing_error;
 			}
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (txn);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/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 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3451 "FlickrPublishing.c"
+#line 2237 "FlickrPublishing.c"
 		}
 	}
-	goto __finally20;
-	__catch20_spit_publishing_publishing_error:
+	goto __finally13;
+	__catch13_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp4_ = NULL;
 		GError* _tmp5_ = NULL;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = self->priv->host;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = err;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp5_);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 3472 "FlickrPublishing.c"
+#line 2258 "FlickrPublishing.c"
 	}
-	__finally20:
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally13:
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 493 "/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 493 "/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: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3485 "FlickrPublishing.c"
+#line 2271 "FlickrPublishing.c"
 	}
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (txn);
-#line 3489 "FlickrPublishing.c"
+#line 2275 "FlickrPublishing.c"
 }
 
 
@@ -3533,23 +2299,23 @@ static gint64 int64_parse (const gchar* str) {
 	result = _tmp1_;
 #line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3507 "FlickrPublishing.c"
+#line 2293 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (PublishingFlickrFlickrPublisher* self, const gchar* xml) {
 	const gchar* _tmp0_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (xml != NULL);
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = xml;
-#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:501: ACTION: parsing account information from xm" \
+#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:270: ACTION: parsing account information from xm" \
 "l = '%s'", _tmp0_);
-#line 3522 "FlickrPublishing.c"
+#line 2308 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* response_doc = NULL;
 		const gchar* _tmp1_ = NULL;
@@ -3582,293 +2348,302 @@ static void publishing_flickr_flickr_publisher_do_parse_account_info_from_xml (P
 		gint64 _tmp23_ = 0LL;
 		PublishingFlickrPublishingParameters* _tmp24_ = NULL;
 		PublishingFlickrUserKind _tmp25_ = 0;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = xml;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_transaction_parse_flickr_response (_tmp1_, &_inner_error_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		response_doc = _tmp2_;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3565 "FlickrPublishing.c"
-				goto __catch21_spit_publishing_publishing_error;
+#line 2351 "FlickrPublishing.c"
+				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/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 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3574 "FlickrPublishing.c"
+#line 2360 "FlickrPublishing.c"
 		}
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = response_doc;
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = publishing_rest_support_xml_document_get_root_node (_tmp3_);
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		root_node = _tmp4_;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = response_doc;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = root_node;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = publishing_rest_support_xml_document_get_named_child (_tmp5_, _tmp6_, "user", &_inner_error_);
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		user_node = _tmp7_;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3596 "FlickrPublishing.c"
-				goto __catch21_spit_publishing_publishing_error;
+#line 2382 "FlickrPublishing.c"
+				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/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 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3607 "FlickrPublishing.c"
+#line 2393 "FlickrPublishing.c"
 		}
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = response_doc;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = user_node;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_property_value (_tmp8_, _tmp9_, "ispro", &_inner_error_);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		is_pro_str = _tmp10_;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3623 "FlickrPublishing.c"
-				goto __catch21_spit_publishing_publishing_error;
+#line 2409 "FlickrPublishing.c"
+				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/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 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3634 "FlickrPublishing.c"
+#line 2420 "FlickrPublishing.c"
 		}
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = response_doc;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = user_node;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = publishing_rest_support_xml_document_get_named_child (_tmp11_, _tmp12_, "bandwidth", &_inner_error_);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		bandwidth_node = _tmp13_;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3652 "FlickrPublishing.c"
-				goto __catch21_spit_publishing_publishing_error;
+#line 2438 "FlickrPublishing.c"
+				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/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 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3665 "FlickrPublishing.c"
+#line 2451 "FlickrPublishing.c"
 		}
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp14_ = response_doc;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp15_ = bandwidth_node;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp16_ = publishing_rest_support_xml_document_get_property_value (_tmp14_, _tmp15_, "remainingkb", &_inner_error_);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		remaining_kb_str = _tmp16_;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3683 "FlickrPublishing.c"
-				goto __catch21_spit_publishing_publishing_error;
+#line 2469 "FlickrPublishing.c"
+				goto __catch14_spit_publishing_publishing_error;
 			}
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (is_pro_str);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/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 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3696 "FlickrPublishing.c"
+#line 2482 "FlickrPublishing.c"
 		}
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp17_ = is_pro_str;
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (g_strcmp0 (_tmp17_, "0") == 0) {
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			user_kind = PUBLISHING_FLICKR_USER_KIND_FREE;
-#line 3704 "FlickrPublishing.c"
+#line 2490 "FlickrPublishing.c"
 		} else {
 			const gchar* _tmp18_ = NULL;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp18_ = is_pro_str;
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (g_strcmp0 (_tmp18_, "1") == 0) {
-#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				user_kind = PUBLISHING_FLICKR_USER_KIND_PRO;
-#line 3713 "FlickrPublishing.c"
+#line 2499 "FlickrPublishing.c"
 			} else {
 				GError* _tmp19_ = NULL;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/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 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_inner_error_ = _tmp19_;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (remaining_kb_str);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (is_pro_str);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 3728 "FlickrPublishing.c"
-					goto __catch21_spit_publishing_publishing_error;
+#line 2514 "FlickrPublishing.c"
+					goto __catch14_spit_publishing_publishing_error;
 				}
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (remaining_kb_str);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (is_pro_str);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/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 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				return;
-#line 3743 "FlickrPublishing.c"
+#line 2529 "FlickrPublishing.c"
 			}
 		}
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp20_ = remaining_kb_str;
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp21_ = int64_parse (_tmp20_);
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		quota_bytes_left = _tmp21_ * 1024;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp22_ = self->priv->parameters;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp23_ = quota_bytes_left;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp22_->quota_free_bytes = _tmp23_;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp24_ = self->priv->parameters;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp25_ = user_kind;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp24_->user_kind = _tmp25_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (remaining_kb_str);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (is_pro_str);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 3770 "FlickrPublishing.c"
+#line 2556 "FlickrPublishing.c"
 	}
-	goto __finally21;
-	__catch21_spit_publishing_publishing_error:
+	goto __finally14;
+	__catch14_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_ = NULL;
 		SpitPublishingPluginHost* _tmp27_ = NULL;
 		GError* _tmp28_ = NULL;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp26_ = err;
-#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 301 "/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 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			publishing_flickr_flickr_publisher_do_logout (self);
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (err);
-#line 534 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 3793 "FlickrPublishing.c"
+#line 2579 "FlickrPublishing.c"
 		}
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp27_ = self->priv->host;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp28_ = err;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp27_, _tmp28_);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3805 "FlickrPublishing.c"
+#line 2591 "FlickrPublishing.c"
 	}
-	__finally21:
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally14:
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 502 "/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: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 502 "/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 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3816 "FlickrPublishing.c"
+#line 2602 "FlickrPublishing.c"
 	}
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_account_info_available (self);
-#line 3820 "FlickrPublishing.c"
+#line 2606 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_logout (PublishingFlickrFlickrPublisher* self) {
-	PublishingFlickrSession* _tmp0_ = NULL;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	gboolean _tmp1_ = FALSE;
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:545: ACTION: logging user out, deauthenticating " \
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:314: ACTION: logging user out, deauthenticating " \
 "session, and erasing stored credentials");
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_session_deauthenticate (_tmp0_);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_flickr_publisher_invalidate_persistent_session (self);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 316 "/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"
+	if (_tmp1_) {
+#line 2623 "FlickrPublishing.c"
+		SpitPublishingAuthenticator* _tmp2_ = NULL;
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp2_ = self->priv->authenticator;
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		spit_publishing_authenticator_logout (_tmp2_);
+#line 2629 "FlickrPublishing.c"
+	}
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_attempt_start (self);
-#line 3840 "FlickrPublishing.c"
+#line 2635 "FlickrPublishing.c"
 }
 
 
@@ -3887,33 +2662,33 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 	SpitPublishingPluginHost* _tmp17_ = NULL;
 	PublishingFlickrPublishingOptionsPane* _tmp18_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:556: ACTION: displaying publishing options pane");
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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"
 	_tmp0_ = self->priv->host;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = gtk_builder_new ();
-#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	builder = _tmp1_;
-#line 3871 "FlickrPublishing.c"
+#line 2666 "FlickrPublishing.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = builder;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 335 "/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 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3880 "FlickrPublishing.c"
-			goto __catch22_g_error;
+#line 2675 "FlickrPublishing.c"
+			goto __catch15_g_error;
 		}
 	}
-	goto __finally22;
-	__catch22_g_error:
+	goto __finally15;
+	__catch15_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
@@ -3922,83 +2697,83 @@ static void publishing_flickr_flickr_publisher_do_show_publishing_options_pane (
 		const gchar* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = e;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = _tmp3_->message;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_warning ("FlickrPublishing.vala:568: Could not parse UI file! Error: %s.", _tmp4_);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = _ ("A file required for publishing is unavailable. Publishing to Flickr ca" \
 "n’t continue.");
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp6_);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp5_, _tmp8_);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (_tmp8_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3922 "FlickrPublishing.c"
+#line 2717 "FlickrPublishing.c"
 	}
-	__finally22:
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally15:
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (builder);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/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 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 3935 "FlickrPublishing.c"
+#line 2730 "FlickrPublishing.c"
 	}
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->parameters;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->host;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = spit_publishing_plugin_host_get_publishable_media_type (_tmp10_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = builder;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = publishing_flickr_flickr_publisher_get_persistent_strip_metadata (self);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishing_flickr_publishing_options_pane_new (self, _tmp9_, _tmp11_, _tmp12_, _tmp13_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publishing_options_pane);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publishing_options_pane = _tmp14_;
-#line 577 "/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 577 "/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_, "publish", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_publish_publishing_flickr_publishing_options_pane_publish, self, 0);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = self->priv->publishing_options_pane;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_connect_object (_tmp16_, "logout", (GCallback) _publishing_flickr_flickr_publisher_on_publishing_options_pane_logout_publishing_flickr_publishing_options_pane_logout, self, 0);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = self->priv->host;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = self->priv->publishing_options_pane;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_dialog_pane (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (builder);
-#line 3969 "FlickrPublishing.c"
+#line 2764 "FlickrPublishing.c"
 }
 
 
@@ -4012,51 +2787,51 @@ gint publishing_flickr_flickr_publisher_flickr_date_time_compare_func (SpitPubli
 	GDateTime* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (a), 0);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (b), 0);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = a;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_publishing_publishable_get_exposure_date_time (_tmp0_);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = b;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = spit_publishing_publishable_get_exposure_date_time (_tmp3_);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_date_time_compare (_tmp2_, _tmp5_);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_date_time_unref0 (_tmp5_);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_date_time_unref0 (_tmp2_);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp7_;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4011 "FlickrPublishing.c"
+#line 2806 "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 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4020 "FlickrPublishing.c"
+#line 2815 "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 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_on_upload_status_updated ((PublishingFlickrFlickrPublisher*) self, file_number, fraction_complete);
-#line 4027 "FlickrPublishing.c"
+#line 2822 "FlickrPublishing.c"
 }
 
 
@@ -4096,168 +2871,168 @@ static void publishing_flickr_flickr_publisher_do_publish (PublishingFlickrFlick
 	PublishingFlickrUploader* _tmp28_ = NULL;
 	PublishingFlickrUploader* _tmp29_ = NULL;
 	PublishingFlickrUploader* _tmp30_ = NULL;
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = strip_metadata;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_strip_metadata (self, _tmp0_);
-#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:589: ACTION: uploading media items to remote ser" \
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_debug ("FlickrPublishing.vala:359: ACTION: uploading media items to remote ser" \
 "ver.");
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->host;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->parameters;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_->photo_major_axis_size;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = strip_metadata;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp2_, _tmp4_, _tmp5_, &_tmp6_, &_tmp7_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/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 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = _tmp8_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = _tmp6_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp7_;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 368 "/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 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp9_) {
-#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 4109 "FlickrPublishing.c"
+#line 2904 "FlickrPublishing.c"
 	}
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->host;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables = _tmp12_;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables_length1 = _tmp11_;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 372 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = gee_array_list_new (SPIT_PUBLISHING_TYPE_PUBLISHABLE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_list = _tmp13_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishables;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14__length1 = publishables_length1;
-#line 4129 "FlickrPublishing.c"
+#line 2924 "FlickrPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		p_collection = _tmp14_;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		p_collection_length1 = _tmp14__length1;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (p_it = 0; p_it < _tmp14__length1; p_it = p_it + 1) {
-#line 4141 "FlickrPublishing.c"
+#line 2936 "FlickrPublishing.c"
 			SpitPublishingPublishable* _tmp15_ = NULL;
 			SpitPublishingPublishable* p = NULL;
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp15_ = _g_object_ref0 (p_collection[p_it]);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			p = _tmp15_;
-#line 4148 "FlickrPublishing.c"
+#line 2943 "FlickrPublishing.c"
 			{
 				GeeArrayList* _tmp16_ = NULL;
 				SpitPublishingPublishable* _tmp17_ = NULL;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = sorted_list;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp17_ = p;
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 375 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_object_unref0 (p);
-#line 4160 "FlickrPublishing.c"
+#line 2955 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = sorted_list;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 378 "/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 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = self->priv->session;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = sorted_list;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/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 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = _tmp22_;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23__length1 = _tmp21_;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = self->priv->parameters;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = strip_metadata;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = publishing_flickr_uploader_new (_tmp19_, _tmp23_, _tmp21_, _tmp24_, _tmp25_);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp27_ = _tmp26_;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = (_vala_array_free (_tmp23_, _tmp23__length1, (GDestroyNotify) g_object_unref), NULL);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	uploader = _tmp27_;
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp28_ = uploader;
-#line 611 "/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 (_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 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp29_ = uploader;
-#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 382 "/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 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp30_ = uploader;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 383 "/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 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (sorted_list);
-#line 587 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 4208 "FlickrPublishing.c"
+#line 3003 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_do_show_success_pane (PublishingFlickrFlickrPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:617: ACTION: showing success pane.");
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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"
 	_tmp0_ = self->priv->host;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->host;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 4227 "FlickrPublishing.c"
+#line 3022 "FlickrPublishing.c"
 }
 
 
@@ -4265,32 +3040,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_visibility (PublishingFli
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 394 "/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 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4245 "FlickrPublishing.c"
+#line 3040 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_flickr_publisher_set_persistent_visibility (PublishingFlickrFlickrPublisher* self, gint vis) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = vis;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 398 "/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 4260 "FlickrPublishing.c"
+#line 3055 "FlickrPublishing.c"
 }
 
 
@@ -4298,32 +3073,32 @@ gint publishing_flickr_flickr_publisher_get_persistent_default_size (PublishingF
 	gint result = 0;
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self), 0);
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 402 "/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 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 632 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4278 "FlickrPublishing.c"
+#line 3073 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_flickr_publisher_set_persistent_default_size (PublishingFlickrFlickrPublisher* self, gint size) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->host;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = size;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 406 "/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 4293 "FlickrPublishing.c"
+#line 3088 "FlickrPublishing.c"
 }
 
 
@@ -4332,17 +3107,17 @@ static SpitPublishingService* publishing_flickr_flickr_publisher_real_get_servic
 	SpitPublishingService* result = NULL;
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingService* _tmp1_ = NULL;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->service;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4312 "FlickrPublishing.c"
+#line 3107 "FlickrPublishing.c"
 }
 
 
@@ -4350,72 +3125,31 @@ static gboolean publishing_flickr_flickr_publisher_real_is_running (SpitPublishi
 	PublishingFlickrFlickrPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp0_;
-#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 4328 "FlickrPublishing.c"
+#line 3123 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_attempt_start (PublishingFlickrFlickrPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (self));
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = TRUE;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->was_started = TRUE;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = publishing_flickr_flickr_publisher_is_persistent_session_valid (self);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp0_) {
-#line 4344 "FlickrPublishing.c"
-		PublishingFlickrSession* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:654: attempt start: a persistent session is avai" \
-"lable; using it");
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp1_ = self->priv->session;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp2_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token (self);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp3_ = _tmp2_;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp4_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_token_secret (self);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp5_ = _tmp4_;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp6_ = publishing_flickr_flickr_publisher_get_persistent_access_phase_username (self);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp7_ = _tmp6_;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_flickr_session_authenticate_from_persistent_credentials (_tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp7_);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp5_);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp3_);
-#line 4376 "FlickrPublishing.c"
-	} else {
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:659: attempt start: no persistent session availa" \
-"ble; showing login welcome pane");
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_flickr_flickr_publisher_do_show_login_welcome_pane (self);
-#line 4382 "FlickrPublishing.c"
-	}
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	spit_publishing_authenticator_authenticate (_tmp0_);
+#line 3139 "FlickrPublishing.c"
 }
 
 
@@ -4423,136 +3157,140 @@ static void publishing_flickr_flickr_publisher_real_start (SpitPublishingPublish
 	PublishingFlickrFlickrPublisher * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/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 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_) {
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 4399 "FlickrPublishing.c"
+#line 3155 "FlickrPublishing.c"
 	}
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->was_started;
-#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_) {
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_error ("FlickrPublishing.vala:670: FlickrPublisher: start( ): can't start; thi" \
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_error ("FlickrPublishing.vala:431: FlickrPublisher: start( ): can't start; thi" \
 "s publisher is not restartable.");
-#line 4407 "FlickrPublishing.c"
+#line 3163 "FlickrPublishing.c"
 	}
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:672: FlickrPublisher: starting interaction.");
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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"
 	publishing_flickr_flickr_publisher_attempt_start (self);
-#line 4413 "FlickrPublishing.c"
+#line 3169 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_real_stop (SpitPublishingPublisher* base) {
 	PublishingFlickrFlickrPublisher * self;
 	PublishingFlickrSession* _tmp0_ = NULL;
-#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 678 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:678: FlickrPublisher: stop( ) invoked.");
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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"
 	_tmp0_ = self->priv->session;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ != NULL) {
-#line 4428 "FlickrPublishing.c"
+#line 3184 "FlickrPublishing.c"
 		PublishingFlickrSession* _tmp1_ = NULL;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = self->priv->session;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 442 "/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 4434 "FlickrPublishing.c"
+#line 3190 "FlickrPublishing.c"
 	}
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 4438 "FlickrPublishing.c"
+#line 3194 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_class_init (PublishingFlickrFlickrPublisherClass * klass) {
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrFlickrPublisherPrivate));
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_flickr_publisher_finalize;
-#line 4449 "FlickrPublishing.c"
+#line 3205 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_spit_publishing_publisher_interface_init (SpitPublishingPublisherIface * iface) {
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/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 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_service = (SpitPublishingService* (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_get_service;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->is_running = (gboolean (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_is_running;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->start = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_start;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->stop = (void (*)(SpitPublishingPublisher*)) publishing_flickr_flickr_publisher_real_stop;
-#line 4464 "FlickrPublishing.c"
+#line 3220 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_instance_init (PublishingFlickrFlickrPublisher * self) {
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_FLICKR_PUBLISHER_GET_PRIVATE (self);
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->running = FALSE;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->was_started = FALSE;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->session = NULL;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publishing_options_pane = NULL;
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->authenticator = NULL;
+#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = NULL;
-#line 4483 "FlickrPublishing.c"
+#line 3241 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_flickr_publisher_finalize (GObject* obj) {
 	PublishingFlickrFlickrPublisher * self;
-	PublishingFlickrSession* _tmp0_ = NULL;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_FLICKR_PUBLISHER, PublishingFlickrFlickrPublisher);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->session;
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("authenticated", PUBLISHING_REST_SUPPORT_TYPE_SESSION, &_tmp1_, NULL, FALSE);
-#line 122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.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_flickr_flickr_publisher_on_session_authenticated_publishing_rest_support_session_authenticated, self);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 118 "/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"
+	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"
 	_g_object_unref0 (self->priv->service);
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->host);
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/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 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 106 "/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->publishing_options_pane);
-#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 101 "/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"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_flickr_publisher_parent_class)->finalize (obj);
-#line 4519 "FlickrPublishing.c"
+#line 3279 "FlickrPublishing.c"
 }
 
 
@@ -4570,366 +3308,6 @@ GType publishing_flickr_flickr_publisher_get_type (void) {
 }
 
 
-PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_construct (GType object_type, GtkBuilder* builder) {
-	PublishingFlickrPinEntryPane * self = NULL;
-	GtkBuilder* _tmp0_ = NULL;
-	GtkBuilder* _tmp1_ = NULL;
-	GtkBuilder* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GSList* _tmp4_ = NULL;
-	GSList* _tmp5_ = NULL;
-	guint _tmp6_ = 0U;
-	GtkBuilder* _tmp7_ = NULL;
-	GObject* _tmp8_ = NULL;
-	GtkLabel* _tmp9_ = NULL;
-	GtkBuilder* _tmp10_ = NULL;
-	GObject* _tmp11_ = NULL;
-	GtkLabel* _tmp12_ = NULL;
-	GtkBuilder* _tmp13_ = NULL;
-	GObject* _tmp14_ = NULL;
-	GtkEntry* _tmp15_ = NULL;
-	GtkBuilder* _tmp16_ = NULL;
-	GObject* _tmp17_ = NULL;
-	GtkButton* _tmp18_ = NULL;
-	GtkBuilder* _tmp19_ = NULL;
-	GObject* _tmp20_ = NULL;
-	GtkBox* _tmp21_ = NULL;
-	GtkBox* _tmp22_ = NULL;
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = (PublishingFlickrPinEntryPane*) g_object_new (object_type, NULL);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = builder;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->builder = _tmp1_;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = builder;
-#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = builder;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp6_ = g_slist_length (_tmp5_);
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_slist_free0 (_tmp5_);
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp7_ = builder;
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp8_ = gtk_builder_get_object (_tmp7_, "explanatory_text");
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp9_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp8_) : NULL);
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->explanatory_text);
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->explanatory_text = _tmp9_;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp10_ = builder;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp11_ = gtk_builder_get_object (_tmp10_, "pin_entry_caption");
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp11_) : NULL);
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pin_entry_caption);
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pin_entry_caption = _tmp12_;
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp13_ = builder;
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = gtk_builder_get_object (_tmp13_, "pin_entry");
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp14_) : NULL);
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pin_entry);
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pin_entry = _tmp15_;
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = builder;
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = gtk_builder_get_object (_tmp16_, "continue_button");
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp18_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp17_, gtk_button_get_type ()) ? ((GtkButton*) _tmp17_) : NULL);
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->continue_button);
-#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->continue_button = _tmp18_;
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp19_ = builder;
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20_ = gtk_builder_get_object (_tmp19_, "pane_widget");
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, gtk_box_get_type ()) ? ((GtkBox*) _tmp20_) : NULL);
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pane_widget = _tmp21_;
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp22_ = self->priv->pane_widget;
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
-#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (self);
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self;
-#line 4648 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrPinEntryPane* publishing_flickr_pin_entry_pane_new (GtkBuilder* builder) {
-#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return publishing_flickr_pin_entry_pane_construct (PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, builder);
-#line 4655 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_on_continue_clicked (PublishingFlickrPinEntryPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE (self));
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->pin_entry;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_emit_by_name (self, "proceed", self, _tmp1_);
-#line 4670 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed (PublishingFlickrPinEntryPane* self) {
-	GtkButton* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
-	guint _tmp3_ = 0U;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_PIN_ENTRY_PANE (self));
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->continue_button;
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->pin_entry;
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = gtk_entry_get_text_length (_tmp1_);
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp3_ > ((guint) 0));
-#line 4691 "FlickrPublishing.c"
-}
-
-
-static GtkWidget* publishing_flickr_pin_entry_pane_real_get_widget (SpitPublishingDialogPane* base) {
-	PublishingFlickrPinEntryPane * self;
-	GtkWidget* result = NULL;
-	GtkBox* _tmp0_ = NULL;
-	GtkWidget* _tmp1_ = NULL;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->pane_widget;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp1_;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4710 "FlickrPublishing.c"
-}
-
-
-static SpitPublishingDialogPaneGeometryOptions publishing_flickr_pin_entry_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
-	PublishingFlickrPinEntryPane * self;
-	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 4723 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_pin_entry_pane_on_continue_clicked ((PublishingFlickrPinEntryPane*) self);
-#line 4730 "FlickrPublishing.c"
-}
-
-
-static void _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed ((PublishingFlickrPinEntryPane*) self);
-#line 4737 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
-	PublishingFlickrPinEntryPane * self;
-	GtkButton* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->continue_button;
-#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp0_, "clicked", (GCallback) _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked, self, 0);
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->pin_entry;
-#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self, 0);
-#line 4755 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
-	PublishingFlickrPinEntryPane * self;
-	GtkButton* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	GtkEntry* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->continue_button;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp1_, NULL, FALSE);
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_flickr_pin_entry_pane_on_continue_clicked_gtk_button_clicked, self);
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = self->priv->pin_entry;
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_parse_name ("changed", GTK_TYPE_EDITABLE, &_tmp3_, NULL, FALSE);
-#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_flickr_pin_entry_pane_on_pin_entry_contents_changed_gtk_editable_changed, self);
-#line 4779 "FlickrPublishing.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 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (n_param_values == 3);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		data1 = closure->data;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		data2 = param_values->data[0].v_pointer;
-#line 4798 "FlickrPublishing.c"
-	} else {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		data1 = param_values->data[0].v_pointer;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		data2 = closure->data;
-#line 4804 "FlickrPublishing.c"
-	}
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	callback = (GMarshalFunc_VOID__OBJECT_STRING) (marshal_data ? marshal_data : cc->callback);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	callback (data1, g_value_get_object (param_values + 1), g_value_get_string (param_values + 2), data2);
-#line 4810 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_class_init (PublishingFlickrPinEntryPaneClass * klass) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_pin_entry_pane_parent_class = g_type_class_peek_parent (klass);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_type_class_add_private (klass, sizeof (PublishingFlickrPinEntryPanePrivate));
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_pin_entry_pane_finalize;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_new ("proceed", PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_STRING, G_TYPE_NONE, 2, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, G_TYPE_STRING);
-#line 4823 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_get_widget;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_get_preferred_geometry;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_on_pane_installed;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_flickr_pin_entry_pane_real_on_pane_uninstalled;
-#line 4838 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_instance_init (PublishingFlickrPinEntryPane * self) {
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv = PUBLISHING_FLICKR_PIN_ENTRY_PANE_GET_PRIVATE (self);
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pane_widget = NULL;
-#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->continue_button = NULL;
-#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pin_entry = NULL;
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->pin_entry_caption = NULL;
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->explanatory_text = NULL;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->builder = NULL;
-#line 4857 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_pin_entry_pane_finalize (GObject* obj) {
-	PublishingFlickrPinEntryPane * self;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PIN_ENTRY_PANE, PublishingFlickrPinEntryPane);
-#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pane_widget);
-#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->continue_button);
-#line 690 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pin_entry);
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->pin_entry_caption);
-#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->explanatory_text);
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_object_unref0 (self->priv->builder);
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	G_OBJECT_CLASS (publishing_flickr_pin_entry_pane_parent_class)->finalize (obj);
-#line 4879 "FlickrPublishing.c"
-}
-
-
-GType publishing_flickr_pin_entry_pane_get_type (void) {
-	static volatile gsize publishing_flickr_pin_entry_pane_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_flickr_pin_entry_pane_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrPinEntryPaneClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_pin_entry_pane_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrPinEntryPane), 0, (GInstanceInitFunc) publishing_flickr_pin_entry_pane_instance_init, NULL };
-		static const GInterfaceInfo spit_publishing_dialog_pane_info = { (GInterfaceInitFunc) publishing_flickr_pin_entry_pane_spit_publishing_dialog_pane_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
-		GType publishing_flickr_pin_entry_pane_type_id;
-		publishing_flickr_pin_entry_pane_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingFlickrPinEntryPane", &g_define_type_info, 0);
-		g_type_add_interface_static (publishing_flickr_pin_entry_pane_type_id, SPIT_PUBLISHING_TYPE_DIALOG_PANE, &spit_publishing_dialog_pane_info);
-		g_once_init_leave (&publishing_flickr_pin_entry_pane_type_id__volatile, publishing_flickr_pin_entry_pane_type_id);
-	}
-	return publishing_flickr_pin_entry_pane_type_id__volatile;
-}
-
-
 PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType object_type, PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) {
 	PublishingFlickrTransaction* self = NULL;
 	PublishingFlickrSession* _tmp0_ = NULL;
@@ -4940,52 +3318,63 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct (GType obje
 	PublishingFlickrSession* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	PublishingFlickrSession* _tmp8_ = NULL;
+	gchar* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = method;
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = session;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_session_get_oauth_nonce (_tmp2_);
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = session;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_session_get_oauth_timestamp (_tmp5_);
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 751 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY);
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 4945 "FlickrPublishing.c"
+#line 3356 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrTransaction* publishing_flickr_transaction_new (PublishingFlickrSession* session, PublishingRESTSupportHttpMethod method) {
-#line 742 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_transaction_construct (PUBLISHING_FLICKR_TYPE_TRANSACTION, session, method);
-#line 4952 "FlickrPublishing.c"
+#line 3363 "FlickrPublishing.c"
 }
 
 
@@ -5000,56 +3389,67 @@ PublishingFlickrTransaction* publishing_flickr_transaction_construct_with_uri (G
 	PublishingFlickrSession* _tmp6_ = NULL;
 	gchar* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	PublishingFlickrSession* _tmp9_ = NULL;
+	gchar* _tmp10_ = NULL;
+	gchar* _tmp11_ = NULL;
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (uri != NULL, NULL);
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = uri;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = method;
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = session;
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = publishing_flickr_session_get_oauth_nonce (_tmp3_);
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp5_);
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = session;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = publishing_flickr_session_get_oauth_timestamp (_tmp6_);
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = _tmp7_;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp8_);
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY);
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 5009 "FlickrPublishing.c"
+#line 3431 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrTransaction* publishing_flickr_transaction_new_with_uri (PublishingFlickrSession* session, const gchar* uri, PublishingRESTSupportHttpMethod method) {
-#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 5016 "FlickrPublishing.c"
+#line 3438 "FlickrPublishing.c"
 }
 
 
@@ -5058,35 +3458,35 @@ static void publishing_flickr_transaction_real_execute (PublishingRESTSupportTra
 	PublishingRESTSupportSession* _tmp0_ = NULL;
 	PublishingFlickrSession* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_TRANSACTION, PublishingFlickrTransaction);
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 767 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 5045 "FlickrPublishing.c"
+#line 3467 "FlickrPublishing.c"
 		} else {
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 476 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 5053 "FlickrPublishing.c"
+#line 3475 "FlickrPublishing.c"
 		}
 	}
 }
@@ -5112,152 +3512,152 @@ gchar* publishing_flickr_transaction_validate_xml (PublishingRESTSupportXmlDocum
 	gchar* _tmp18_ = NULL;
 	gchar* _tmp19_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 772 "/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 (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = doc;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	root = _tmp1_;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = root;
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = (gchar*) xmlGetProp (_tmp2_, (xmlChar*) "stat");
-#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	status = _tmp3_;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = status;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp4_ == NULL) {
-#line 5097 "FlickrPublishing.c"
+#line 3519 "FlickrPublishing.c"
 		gchar* _tmp5_ = NULL;
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = g_strdup ("No status property in root node");
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = _tmp5_;
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 5107 "FlickrPublishing.c"
+#line 3529 "FlickrPublishing.c"
 	}
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = status;
-#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_strcmp0 (_tmp6_, "ok") == 0) {
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = NULL;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 5119 "FlickrPublishing.c"
+#line 3541 "FlickrPublishing.c"
 	}
 	{
 		xmlNode* _tmp7_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp8_ = NULL;
 		xmlNode* _tmp9_ = NULL;
 		xmlNode* _tmp10_ = NULL;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = doc;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = root;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = publishing_rest_support_xml_document_get_named_child (_tmp8_, _tmp9_, "err", &_inner_error_);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp10_;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5138 "FlickrPublishing.c"
-				goto __catch23_spit_publishing_publishing_error;
+#line 3560 "FlickrPublishing.c"
+				goto __catch16_spit_publishing_publishing_error;
 			}
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (status);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/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 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5149 "FlickrPublishing.c"
+#line 3571 "FlickrPublishing.c"
 		}
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		errcode = _tmp7_;
-#line 5153 "FlickrPublishing.c"
+#line 3575 "FlickrPublishing.c"
 	}
-	goto __finally23;
-	__catch23_spit_publishing_publishing_error:
+	goto __finally16;
+	__catch16_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp11_ = NULL;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = g_strdup ("No error code specified");
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result = _tmp11_;
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return result;
-#line 5174 "FlickrPublishing.c"
+#line 3596 "FlickrPublishing.c"
 	}
-	__finally23:
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally16:
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (status);
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/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 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return NULL;
-#line 5187 "FlickrPublishing.c"
+#line 3609 "FlickrPublishing.c"
 	}
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = errcode;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = (gchar*) xmlGetProp (_tmp12_, (xmlChar*) "msg");
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = errcode;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = (gchar*) xmlGetProp (_tmp15_, (xmlChar*) "code");
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = _tmp16_;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = g_strdup_printf ("%s (error code %s)", _tmp14_, _tmp17_);
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = _tmp18_;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp17_);
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp14_);
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp19_;
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (status);
-#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5215 "FlickrPublishing.c"
+#line 3637 "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 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5224 "FlickrPublishing.c"
+#line 3646 "FlickrPublishing.c"
 }
 
 
@@ -5277,14 +3677,14 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 5244 "FlickrPublishing.c"
+#line 3666 "FlickrPublishing.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 5251 "FlickrPublishing.c"
+#line 3673 "FlickrPublishing.c"
 }
 
 
@@ -5292,53 +3692,53 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 	PublishingRESTSupportXmlDocument* result = NULL;
 	PublishingRESTSupportXmlDocument* _result_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (xml != NULL, NULL);
-#line 805 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = NULL;
-#line 5263 "FlickrPublishing.c"
+#line 3685 "FlickrPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
 		const gchar* _tmp1_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp2_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp3_ = NULL;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = xml;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/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 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _tmp2_;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 5279 "FlickrPublishing.c"
-				goto __catch24_spit_publishing_publishing_error;
+#line 3701 "FlickrPublishing.c"
+				goto __catch17_spit_publishing_publishing_error;
 			}
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5290 "FlickrPublishing.c"
+#line 3712 "FlickrPublishing.c"
 		}
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = _tmp0_;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = NULL;
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_result_);
-#line 808 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_result_ = _tmp3_;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 5302 "FlickrPublishing.c"
+#line 3724 "FlickrPublishing.c"
 	}
-	goto __finally24;
-	__catch24_spit_publishing_publishing_error:
+	goto __finally17;
+	__catch17_spit_publishing_publishing_error:
 	{
 		GError* e = NULL;
 		GError* _tmp4_ = NULL;
@@ -5347,98 +3747,98 @@ PublishingRESTSupportXmlDocument* publishing_flickr_transaction_parse_flickr_res
 		gchar* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e = _inner_error_;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = e;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = _tmp4_->message;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = g_strdup_printf ("(error code %s)", PUBLISHING_FLICKR_EXPIRED_SESSION_ERROR_CODE);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = string_contains (_tmp5_, _tmp7_);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = _tmp8_;
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp7_);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp9_) {
-#line 5334 "FlickrPublishing.c"
+#line 3756 "FlickrPublishing.c"
 			GError* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
 			GError* _tmp12_ = NULL;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp10_ = e;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp11_ = _tmp10_->message;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 518 "/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 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = _tmp12_;
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 518 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 5348 "FlickrPublishing.c"
-			goto __finally24;
+#line 3770 "FlickrPublishing.c"
+			goto __finally17;
 		} else {
 			GError* _tmp13_ = NULL;
 			GError* _tmp14_ = NULL;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp13_ = e;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp14_ = _g_error_copy0 (_tmp13_);
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = _tmp14_;
-#line 813 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (e);
-#line 5361 "FlickrPublishing.c"
-			goto __finally24;
+#line 3783 "FlickrPublishing.c"
+			goto __finally17;
 		}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (e);
-#line 5366 "FlickrPublishing.c"
+#line 3788 "FlickrPublishing.c"
 	}
-	__finally24:
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally17:
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5379 "FlickrPublishing.c"
+#line 3801 "FlickrPublishing.c"
 		} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (_result_);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return NULL;
-#line 5389 "FlickrPublishing.c"
+#line 3811 "FlickrPublishing.c"
 		}
 	}
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _result_;
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5396 "FlickrPublishing.c"
+#line 3818 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_transaction_class_init (PublishingFlickrTransactionClass * klass) {
-#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 741 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_transaction_real_execute;
-#line 5405 "FlickrPublishing.c"
+#line 3827 "FlickrPublishing.c"
 }
 
 
@@ -5458,157 +3858,47 @@ GType publishing_flickr_transaction_get_type (void) {
 }
 
 
-PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_construct (GType object_type, PublishingFlickrSession* session) {
-	PublishingFlickrAuthenticationRequestTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_ = NULL;
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = session;
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = (PublishingFlickrAuthenticationRequestTransaction*) publishing_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/request_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self;
-#line 5436 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrAuthenticationRequestTransaction* publishing_flickr_authentication_request_transaction_new (PublishingFlickrSession* session) {
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return publishing_flickr_authentication_request_transaction_construct (PUBLISHING_FLICKR_TYPE_AUTHENTICATION_REQUEST_TRANSACTION, session);
-#line 5443 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_authentication_request_transaction_class_init (PublishingFlickrAuthenticationRequestTransactionClass * klass) {
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_authentication_request_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5450 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_authentication_request_transaction_instance_init (PublishingFlickrAuthenticationRequestTransaction * self) {
-}
-
-
-GType publishing_flickr_authentication_request_transaction_get_type (void) {
-	static volatile gsize publishing_flickr_authentication_request_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_flickr_authentication_request_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrAuthenticationRequestTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_authentication_request_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrAuthenticationRequestTransaction), 0, (GInstanceInitFunc) publishing_flickr_authentication_request_transaction_instance_init, NULL };
-		GType publishing_flickr_authentication_request_transaction_type_id;
-		publishing_flickr_authentication_request_transaction_type_id = g_type_register_static (PUBLISHING_FLICKR_TYPE_TRANSACTION, "PublishingFlickrAuthenticationRequestTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_flickr_authentication_request_transaction_type_id__volatile, publishing_flickr_authentication_request_transaction_type_id);
-	}
-	return publishing_flickr_authentication_request_transaction_type_id__volatile;
-}
-
-
-PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session, const gchar* user_verifier) {
-	PublishingFlickrAccessTokenFetchTransaction* self = NULL;
-	PublishingFlickrSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingFlickrSession* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (user_verifier != NULL, NULL);
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = session;
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self = (PublishingFlickrAccessTokenFetchTransaction*) publishing_flickr_transaction_construct_with_uri (object_type, _tmp0_, "https://www.flickr.com/services/oauth/access_token", PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = user_verifier;
-#line 832 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_verifier", _tmp1_);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = session;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = publishing_flickr_session_get_request_phase_token (_tmp2_);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "oauth_token", _tmp4_);
-#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp4_);
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return self;
-#line 5501 "FlickrPublishing.c"
-}
-
-
-PublishingFlickrAccessTokenFetchTransaction* publishing_flickr_access_token_fetch_transaction_new (PublishingFlickrSession* session, const gchar* user_verifier) {
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return publishing_flickr_access_token_fetch_transaction_construct (PUBLISHING_FLICKR_TYPE_ACCESS_TOKEN_FETCH_TRANSACTION, session, user_verifier);
-#line 5508 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_access_token_fetch_transaction_class_init (PublishingFlickrAccessTokenFetchTransactionClass * klass) {
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_access_token_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5515 "FlickrPublishing.c"
-}
-
-
-static void publishing_flickr_access_token_fetch_transaction_instance_init (PublishingFlickrAccessTokenFetchTransaction * self) {
-}
-
-
-GType publishing_flickr_access_token_fetch_transaction_get_type (void) {
-	static volatile gsize publishing_flickr_access_token_fetch_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_flickr_access_token_fetch_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingFlickrAccessTokenFetchTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_flickr_access_token_fetch_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingFlickrAccessTokenFetchTransaction), 0, (GInstanceInitFunc) publishing_flickr_access_token_fetch_transaction_instance_init, NULL };
-		GType publishing_flickr_access_token_fetch_transaction_type_id;
-		publishing_flickr_access_token_fetch_transaction_type_id = g_type_register_static (PUBLISHING_FLICKR_TYPE_TRANSACTION, "PublishingFlickrAccessTokenFetchTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_flickr_access_token_fetch_transaction_type_id__volatile, publishing_flickr_access_token_fetch_transaction_type_id);
-	}
-	return publishing_flickr_access_token_fetch_transaction_type_id__volatile;
-}
-
-
 PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_construct (GType object_type, PublishingFlickrSession* session) {
 	PublishingFlickrAccountInfoFetchTransaction* self = NULL;
 	PublishingFlickrSession* _tmp0_ = NULL;
 	PublishingFlickrSession* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 840 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 531 "/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 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = session;
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_flickr_session_get_access_phase_token (_tmp1_);
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 532 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 5561 "FlickrPublishing.c"
+#line 3873 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrAccountInfoFetchTransaction* publishing_flickr_account_info_fetch_transaction_new (PublishingFlickrSession* session) {
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 529 "/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 5568 "FlickrPublishing.c"
+#line 3880 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_account_info_fetch_transaction_class_init (PublishingFlickrAccountInfoFetchTransactionClass * klass) {
-#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_account_info_fetch_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 5575 "FlickrPublishing.c"
+#line 3887 "FlickrPublishing.c"
 }
 
 
@@ -5629,23 +3919,23 @@ GType publishing_flickr_account_info_fetch_transaction_get_type (void) {
 
 
 static gpointer _publishing_flickr_publishing_parameters_ref0 (gpointer self) {
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_parameters_ref (self) : NULL;
-#line 5598 "FlickrPublishing.c"
+#line 3910 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 5605 "FlickrPublishing.c"
+#line 3917 "FlickrPublishing.c"
 }
 
 
 static void _g_free0_ (gpointer var) {
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	var = (g_free (var), NULL);
-#line 5612 "FlickrPublishing.c"
+#line 3924 "FlickrPublishing.c"
 }
 
 
@@ -5667,261 +3957,272 @@ PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_construc
 	PublishingFlickrSession* _tmp13_ = NULL;
 	gchar* _tmp14_ = NULL;
 	gchar* _tmp15_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp16_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp21_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp26_ = NULL;
-	PublishingFlickrVisibilitySpecification* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
+	PublishingFlickrSession* _tmp16_ = NULL;
+	gchar* _tmp17_ = NULL;
+	gchar* _tmp18_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp19_ = NULL;
+	PublishingFlickrVisibilitySpecification* _tmp20_ = NULL;
+	gint _tmp21_ = 0;
+	gchar* _tmp22_ = NULL;
+	gchar* _tmp23_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp24_ = NULL;
+	PublishingFlickrVisibilitySpecification* _tmp25_ = NULL;
+	gint _tmp26_ = 0;
+	gchar* _tmp27_ = NULL;
+	gchar* _tmp28_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp29_ = NULL;
+	PublishingFlickrVisibilitySpecification* _tmp30_ = NULL;
+	gint _tmp31_ = 0;
+	gchar* _tmp32_ = NULL;
+	gchar* _tmp33_ = NULL;
 	GHashTable* disposition_table = NULL;
-	GHashFunc _tmp31_ = NULL;
-	GEqualFunc _tmp32_ = NULL;
-	GHashTable* _tmp33_ = NULL;
+	GHashFunc _tmp34_ = NULL;
+	GEqualFunc _tmp35_ = NULL;
+	GHashTable* _tmp36_ = NULL;
 	gchar* filename = NULL;
-	SpitPublishingPublishable* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	gboolean _tmp36_ = FALSE;
-	const gchar* _tmp37_ = NULL;
-	GHashTable* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	SpitPublishingPublishable* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
+	SpitPublishingPublishable* _tmp37_ = NULL;
+	gchar* _tmp38_ = NULL;
+	gboolean _tmp39_ = FALSE;
+	const gchar* _tmp40_ = NULL;
+	GHashTable* _tmp44_ = NULL;
 	gchar* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	GHashTable* _tmp47_ = NULL;
+	SpitPublishingPublishable* _tmp46_ = NULL;
+	gchar* _tmp47_ = NULL;
 	gchar* _tmp48_ = NULL;
 	gchar* _tmp49_ = NULL;
 	GHashTable* _tmp50_ = NULL;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gchar* _tmp51_ = NULL;
+	gchar* _tmp52_ = NULL;
+	GHashTable* _tmp53_ = NULL;
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishable;
-#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = parameters;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = session;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _publishing_rest_support_session_ref0 (_tmp4_);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->session = _tmp5_;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_new0 (PublishingRESTSupportArgument*, 0 + 1);
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->auth_header_fields = _tmp6_;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->auth_header_fields_length1 = 0;
-#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_auth_header_fields_size_ = self->priv->auth_header_fields_length1;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = session;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_flickr_session_get_oauth_nonce (_tmp7_);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_nonce", _tmp9_);
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 861 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_callback", "oob");
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = session;
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = publishing_flickr_session_get_oauth_timestamp (_tmp10_);
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = _tmp11_;
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_timestamp", _tmp12_);
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp12_);
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_consumer_key", PUBLISHING_FLICKR_API_KEY);
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = session;
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp14_ = publishing_flickr_session_get_access_phase_token (_tmp13_);
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_flickr_upload_transaction_add_authorization_header_field (self, "oauth_token", _tmp15_);
-#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp16_ = parameters;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp17_ = _tmp16_->visibility_specification;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp18_ = _tmp17_->everyone_level;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp19_ = g_strdup_printf ("%d", _tmp18_);
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp20_ = _tmp19_;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_public", _tmp20_);
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp20_);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp21_ = parameters;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp22_ = _tmp21_->visibility_specification;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp23_ = _tmp22_->friends_level;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp24_ = g_strdup_printf ("%d", _tmp23_);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp25_ = _tmp24_;
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_friend", _tmp25_);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp25_);
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp26_ = parameters;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp27_ = _tmp26_->visibility_specification;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp28_ = _tmp27_->family_level;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp29_ = g_strdup_printf ("%d", _tmp28_);
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp30_ = _tmp29_;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_transaction_add_argument (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "is_family", _tmp30_);
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp30_);
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp31_ = g_str_hash;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp32_ = g_str_equal;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp33_ = g_hash_table_new_full (_tmp31_, _tmp32_, _g_free0_, _g_free0_);
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	disposition_table = _tmp33_;
-#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp34_ = publishable;
-#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp35_ = spit_publishing_publishable_get_publishing_name (_tmp34_);
-#line 872 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	filename = _tmp35_;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp37_ = filename;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp37_ == NULL) {
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp36_ = TRUE;
-#line 5806 "FlickrPublishing.c"
+#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"
+	_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"
+	_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 4129 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp38_ = NULL;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp38_ = filename;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp36_ = g_strcmp0 (_tmp38_, "") == 0;
-#line 5813 "FlickrPublishing.c"
-	}
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp36_) {
-#line 5817 "FlickrPublishing.c"
-		SpitPublishingPublishable* _tmp39_ = NULL;
-		gchar* _tmp40_ = NULL;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp39_ = publishable;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp40_ = spit_publishing_publishable_get_param_string (_tmp39_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		const gchar* _tmp41_ = NULL;
+#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 4136 "FlickrPublishing.c"
+	}
+#line 564 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp39_) {
+#line 4140 "FlickrPublishing.c"
+		SpitPublishingPublishable* _tmp42_ = NULL;
+		gchar* _tmp43_ = NULL;
+#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"
 		_g_free0 (filename);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		filename = _tmp40_;
-#line 5828 "FlickrPublishing.c"
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		filename = _tmp43_;
+#line 4151 "FlickrPublishing.c"
 	}
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp41_ = disposition_table;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp42_ = g_strdup ("filename");
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp43_ = publishable;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp44_ = spit_publishing_publishable_get_param_string (_tmp43_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp45_ = _tmp44_;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp46_ = soup_uri_encode (_tmp45_, NULL);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_insert (_tmp41_, _tmp42_, _tmp46_);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp45_);
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp47_ = disposition_table;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp48_ = g_strdup ("name");
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp49_ = g_strdup ("photo");
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_hash_table_insert (_tmp47_, _tmp48_, _tmp49_);
-#line 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 883 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp50_);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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"
 	_g_free0 (filename);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_hash_table_unref0 (disposition_table);
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 5864 "FlickrPublishing.c"
+#line 4187 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrUploadTransaction* publishing_flickr_upload_transaction_new (PublishingFlickrSession* session, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_upload_transaction_construct (PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 5871 "FlickrPublishing.c"
+#line 4194 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add18 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+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 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 5882 "FlickrPublishing.c"
+#line 4205 "FlickrPublishing.c"
 	}
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5888 "FlickrPublishing.c"
+#line 4211 "FlickrPublishing.c"
 }
 
 
@@ -5931,53 +4232,53 @@ void publishing_flickr_upload_transaction_add_authorization_header_field (Publis
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	PublishingRESTSupportArgument* _tmp3_ = NULL;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self));
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (key != NULL);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (value != NULL);
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->auth_header_fields;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = key;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = value;
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_rest_support_argument_new (_tmp1_, _tmp2_);
-#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add18 (&self->priv->auth_header_fields, &self->priv->auth_header_fields_length1, &self->priv->_auth_header_fields_size_, _tmp3_);
-#line 5916 "FlickrPublishing.c"
+#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 4239 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_argument_ref0 (gpointer self) {
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_argument_ref (self) : NULL;
-#line 5923 "FlickrPublishing.c"
+#line 4246 "FlickrPublishing.c"
 }
 
 
 static PublishingRESTSupportArgument** _vala_array_dup8 (PublishingRESTSupportArgument** self, int length) {
 	PublishingRESTSupportArgument** result;
 	int i;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = g_new0 (PublishingRESTSupportArgument*, length + 1);
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 5934 "FlickrPublishing.c"
+#line 4257 "FlickrPublishing.c"
 		PublishingRESTSupportArgument* _tmp0_ = NULL;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _publishing_rest_support_argument_ref0 (self[i]);
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		result[i] = _tmp0_;
-#line 5940 "FlickrPublishing.c"
+#line 4263 "FlickrPublishing.c"
 	}
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5944 "FlickrPublishing.c"
+#line 4267 "FlickrPublishing.c"
 }
 
 
@@ -5989,31 +4290,31 @@ PublishingRESTSupportArgument** publishing_flickr_upload_transaction_get_authori
 	gint _tmp1__length1 = 0;
 	PublishingRESTSupportArgument** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->auth_header_fields;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->auth_header_fields_length1;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2__length1 = _tmp1__length1;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 5974 "FlickrPublishing.c"
+#line 4297 "FlickrPublishing.c"
 	}
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 891 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 5980 "FlickrPublishing.c"
+#line 4303 "FlickrPublishing.c"
 }
 
 
@@ -6021,25 +4322,25 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
 	gchar* _tmp0_ = NULL;
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_UPLOAD_TRANSACTION (self), NULL);
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_strdup ("OAuth ");
-#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 5994 "FlickrPublishing.c"
+#line 4317 "FlickrPublishing.c"
 	{
 		gint i = 0;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		i = 0;
-#line 5999 "FlickrPublishing.c"
+#line 4322 "FlickrPublishing.c"
 		{
 			gboolean _tmp1_ = FALSE;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp1_ = TRUE;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			while (TRUE) {
-#line 6006 "FlickrPublishing.c"
+#line 4329 "FlickrPublishing.c"
 				gint _tmp3_ = 0;
 				PublishingRESTSupportArgument** _tmp4_ = NULL;
 				gint _tmp4__length1 = 0;
@@ -6066,115 +4367,115 @@ gchar* publishing_flickr_upload_transaction_get_authorization_header_string (Pub
 				gint _tmp23_ = 0;
 				PublishingRESTSupportArgument** _tmp24_ = NULL;
 				gint _tmp24__length1 = 0;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!_tmp1_) {
-#line 6035 "FlickrPublishing.c"
+#line 4358 "FlickrPublishing.c"
 					gint _tmp2_ = 0;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp2_ = i;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					i = _tmp2_ + 1;
-#line 6041 "FlickrPublishing.c"
+#line 4364 "FlickrPublishing.c"
 				}
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp1_ = FALSE;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp3_ = i;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp4_ = self->priv->auth_header_fields;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp4__length1 = self->priv->auth_header_fields_length1;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!(_tmp3_ < _tmp4__length1)) {
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					break;
-#line 6055 "FlickrPublishing.c"
+#line 4378 "FlickrPublishing.c"
 				}
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = _result_;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = self->priv->auth_header_fields;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6__length1 = self->priv->auth_header_fields_length1;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = i;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp8_ = _tmp6_[_tmp7_];
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp9_ = _tmp8_->key;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp10_ = g_strconcat (_tmp5_, _tmp9_, NULL);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_result_);
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_result_ = _tmp10_;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp11_ = _result_;
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp12_ = g_strconcat (_tmp11_, "=", NULL);
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_result_);
-#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_result_ = _tmp12_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp13_ = _result_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp14_ = self->priv->auth_header_fields;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp14__length1 = self->priv->auth_header_fields_length1;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp15_ = i;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = _tmp14_[_tmp15_];
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp17_ = _tmp16_->value;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp18_ = g_strconcat ("\"", _tmp17_, NULL);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp19_ = _tmp18_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp20_ = g_strconcat (_tmp19_, "\"", NULL);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp21_ = _tmp20_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp22_ = g_strconcat (_tmp13_, _tmp21_, NULL);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_result_);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_result_ = _tmp22_;
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp21_);
-#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp19_);
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp23_ = i;
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp24_ = self->priv->auth_header_fields;
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp24__length1 = self->priv->auth_header_fields_length1;
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 593 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_tmp23_ < (_tmp24__length1 - 1)) {
-#line 6121 "FlickrPublishing.c"
+#line 4444 "FlickrPublishing.c"
 					const gchar* _tmp25_ = NULL;
 					gchar* _tmp26_ = NULL;
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp25_ = _result_;
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp26_ = g_strconcat (_tmp25_, ", ", NULL);
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_g_free0 (_result_);
-#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_result_ = _tmp26_;
-#line 6132 "FlickrPublishing.c"
+#line 4455 "FlickrPublishing.c"
 				}
 			}
 		}
 	}
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _result_;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6141 "FlickrPublishing.c"
+#line 4464 "FlickrPublishing.c"
 }
 
 
@@ -6184,85 +4485,85 @@ static void publishing_flickr_upload_transaction_real_execute (PublishingRESTSup
 	gchar* authorization_header = NULL;
 	gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 601 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->session;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishing_flickr_upload_transaction_get_authorization_header_string (self);
-#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	authorization_header = _tmp1_;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:914: executing upload transaction: authorization" \
+#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 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (authorization_header);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 6177 "FlickrPublishing.c"
+#line 4500 "FlickrPublishing.c"
 		} else {
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (authorization_header);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/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 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 6187 "FlickrPublishing.c"
+#line 4510 "FlickrPublishing.c"
 		}
 	}
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (authorization_header);
-#line 6192 "FlickrPublishing.c"
+#line 4515 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_class_init (PublishingFlickrUploadTransactionClass * klass) {
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_flickr_upload_transaction_finalize;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploadTransactionPrivate));
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_flickr_upload_transaction_real_execute;
-#line 6205 "FlickrPublishing.c"
+#line 4528 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_instance_init (PublishingFlickrUploadTransaction * self) {
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 6212 "FlickrPublishing.c"
+#line 4535 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingFlickrUploadTransaction * self;
-#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOAD_TRANSACTION, PublishingFlickrUploadTransaction);
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_flickr_upload_transaction_parent_class)->finalize (obj);
-#line 6228 "FlickrPublishing.c"
+#line 4551 "FlickrPublishing.c"
 }
 
 
@@ -6280,18 +4581,18 @@ GType publishing_flickr_upload_transaction_get_type (void) {
 
 PublishingFlickrSession* publishing_flickr_session_construct (GType object_type) {
 	PublishingFlickrSession* self = NULL;
-#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 6250 "FlickrPublishing.c"
+#line 4573 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrSession* publishing_flickr_session_new (void) {
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return publishing_flickr_session_construct (PUBLISHING_FLICKR_TYPE_SESSION);
-#line 6257 "FlickrPublishing.c"
+#line 4580 "FlickrPublishing.c"
 }
 
 
@@ -6301,131 +4602,98 @@ static gboolean publishing_flickr_session_real_is_authenticated (PublishingRESTS
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	const gchar* _tmp2_ = NULL;
-#line 933 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->access_phase_token;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp2_ != NULL) {
-#line 6273 "FlickrPublishing.c"
+#line 4596 "FlickrPublishing.c"
 		const gchar* _tmp3_ = NULL;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = self->priv->access_phase_token_secret;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6279 "FlickrPublishing.c"
+#line 4602 "FlickrPublishing.c"
 	} else {
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp1_ = FALSE;
-#line 6283 "FlickrPublishing.c"
+#line 4606 "FlickrPublishing.c"
 	}
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_) {
-#line 6287 "FlickrPublishing.c"
+#line 4610 "FlickrPublishing.c"
 		const gchar* _tmp4_ = NULL;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = self->priv->username;
-#line 935 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = _tmp4_ != NULL;
-#line 6293 "FlickrPublishing.c"
+#line 4616 "FlickrPublishing.c"
 	} else {
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp0_ = FALSE;
-#line 6297 "FlickrPublishing.c"
+#line 4620 "FlickrPublishing.c"
 	}
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp0_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 6303 "FlickrPublishing.c"
+#line 4626 "FlickrPublishing.c"
 }
 
 
-void publishing_flickr_session_authenticate_from_persistent_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret, const gchar* username) {
+void publishing_flickr_session_set_api_credentials (PublishingFlickrSession* self, const gchar* consumer_key, const gchar* consumer_secret) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (username != NULL);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = token;
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 940 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token = _tmp1_;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = secret;
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 941 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token_secret = _tmp3_;
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp4_ = username;
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp5_ = g_strdup (_tmp4_);
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->username = _tmp5_;
-#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), "authenticated");
-#line 6348 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_session_deauthenticate (PublishingFlickrSession* self) {
-#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token);
-#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token = NULL;
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->access_phase_token_secret);
-#line 949 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->access_phase_token_secret = NULL;
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->username);
-#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->username = NULL;
-#line 6367 "FlickrPublishing.c"
+#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 4657 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 6374 "FlickrPublishing.c"
+#line 4664 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add19 (PublishingRESTSupportArgument*** array, int* length, int* size, PublishingRESTSupportArgument* value) {
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+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 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingRESTSupportArgument*, *array, (*size) + 1);
-#line 6385 "FlickrPublishing.c"
+#line 4675 "FlickrPublishing.c"
 	}
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 6391 "FlickrPublishing.c"
+#line 4681 "FlickrPublishing.c"
 }
 
 
@@ -6459,11 +4727,10 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 	gchar* signing_key = NULL;
 	const gchar* _tmp46_ = NULL;
 	gchar* signature_base_string = NULL;
-	const gchar* _tmp53_ = NULL;
-	gchar* _tmp54_ = NULL;
+	const gchar* _tmp54_ = NULL;
 	gchar* _tmp55_ = NULL;
-	PublishingRESTSupportTransaction* _tmp56_ = NULL;
-	gchar* _tmp57_ = NULL;
+	gchar* _tmp56_ = NULL;
+	PublishingRESTSupportTransaction* _tmp57_ = NULL;
 	gchar* _tmp58_ = NULL;
 	gchar* _tmp59_ = NULL;
 	gchar* _tmp60_ = NULL;
@@ -6471,66 +4738,67 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 	gchar* _tmp62_ = NULL;
 	gchar* _tmp63_ = NULL;
 	gchar* _tmp64_ = NULL;
-	const gchar* _tmp65_ = NULL;
-	gchar* _tmp66_ = NULL;
+	gchar* _tmp65_ = NULL;
+	const gchar* _tmp66_ = NULL;
 	gchar* _tmp67_ = NULL;
 	gchar* _tmp68_ = NULL;
 	gchar* _tmp69_ = NULL;
-	const gchar* _tmp70_ = NULL;
+	gchar* _tmp70_ = NULL;
 	const gchar* _tmp71_ = NULL;
-	gchar* signature = NULL;
 	const gchar* _tmp72_ = NULL;
+	gchar* signature = NULL;
 	const gchar* _tmp73_ = NULL;
-	gchar* _tmp74_ = NULL;
-	const gchar* _tmp75_ = NULL;
-	gchar* _tmp76_ = NULL;
-	const gchar* _tmp77_ = NULL;
-	PublishingFlickrUploadTransaction* _tmp78_ = NULL;
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	const gchar* _tmp74_ = NULL;
+	gchar* _tmp75_ = NULL;
+	const gchar* _tmp76_ = NULL;
+	gchar* _tmp77_ = NULL;
+	const gchar* _tmp78_ = NULL;
+	PublishingFlickrUploadTransaction* _tmp79_ = NULL;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = txn;
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishing_rest_support_transaction_get_method (_tmp0_);
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = publishing_rest_support_http_method_to_string (_tmp1_);
-#line 954 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	http_method = _tmp2_;
-#line 956 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:956: signing transaction with parameters:");
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = g_strconcat ("HTTP method = ", _tmp3_, NULL);
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:957: %s", _tmp5_);
-#line 957 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = txn;
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_rest_support_transaction_get_arguments (_tmp6_, &_tmp7_);
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	base_string_arguments = _tmp8_;
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	base_string_arguments_length1 = _tmp7_;
-#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_base_string_arguments_size_ = base_string_arguments_length1;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = txn;
-#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	upload_txn = _tmp10_;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = upload_txn;
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp11_ != NULL) {
-#line 6496 "FlickrPublishing.c"
+#line 4786 "FlickrPublishing.c"
 		PublishingRESTSupportArgument** auth_header_args = NULL;
 		PublishingFlickrUploadTransaction* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
@@ -6539,97 +4807,97 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 		gint _auth_header_args_size_ = 0;
 		PublishingRESTSupportArgument** _tmp15_ = NULL;
 		gint _tmp15__length1 = 0;
-#line 963 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:963: %s", "this transaction is an UploadTransaction; including Authorization head" \
+#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 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = upload_txn;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp14_ = publishing_flickr_upload_transaction_get_authorization_header_fields (_tmp12_, &_tmp13_);
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		auth_header_args = _tmp14_;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		auth_header_args_length1 = _tmp13_;
-#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_auth_header_args_size_ = auth_header_args_length1;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp15_ = auth_header_args;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp15__length1 = auth_header_args_length1;
-#line 6521 "FlickrPublishing.c"
+#line 4811 "FlickrPublishing.c"
 		{
 			PublishingRESTSupportArgument** arg_collection = NULL;
 			gint arg_collection_length1 = 0;
 			gint _arg_collection_size_ = 0;
 			gint arg_it = 0;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			arg_collection = _tmp15_;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			arg_collection_length1 = _tmp15__length1;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 6533 "FlickrPublishing.c"
+#line 4823 "FlickrPublishing.c"
 				PublishingRESTSupportArgument* _tmp16_ = NULL;
 				PublishingRESTSupportArgument* arg = NULL;
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp16_ = _publishing_rest_support_argument_ref0 (arg_collection[arg_it]);
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				arg = _tmp16_;
-#line 6540 "FlickrPublishing.c"
+#line 4830 "FlickrPublishing.c"
 				{
 					PublishingRESTSupportArgument** _tmp17_ = NULL;
 					gint _tmp17__length1 = 0;
 					PublishingRESTSupportArgument* _tmp18_ = NULL;
 					PublishingRESTSupportArgument* _tmp19_ = NULL;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp17_ = base_string_arguments;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp17__length1 = base_string_arguments_length1;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp18_ = arg;
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp19_ = _publishing_rest_support_argument_ref0 (_tmp18_);
-#line 970 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-					_vala_array_add19 (&base_string_arguments, &base_string_arguments_length1, &_base_string_arguments_size_, _tmp19_);
-#line 969 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 6558 "FlickrPublishing.c"
+#line 4848 "FlickrPublishing.c"
 				}
 			}
 		}
-#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 6564 "FlickrPublishing.c"
+#line 4854 "FlickrPublishing.c"
 	}
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = base_string_arguments;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20__length1 = base_string_arguments_length1;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = publishing_rest_support_argument_sort (_tmp20_, _tmp20__length1, &_tmp21_);
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_args = _tmp22_;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	sorted_args_length1 = _tmp21_;
-#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_sorted_args_size_ = sorted_args_length1;
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = g_strdup ("");
-#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 657 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	arguments_string = _tmp23_;
-#line 6582 "FlickrPublishing.c"
+#line 4872 "FlickrPublishing.c"
 	{
 		gint i = 0;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		i = 0;
-#line 6587 "FlickrPublishing.c"
+#line 4877 "FlickrPublishing.c"
 		{
 			gboolean _tmp24_ = FALSE;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp24_ = TRUE;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			while (TRUE) {
-#line 6594 "FlickrPublishing.c"
+#line 4884 "FlickrPublishing.c"
 				gint _tmp26_ = 0;
 				PublishingRESTSupportArgument** _tmp27_ = NULL;
 				gint _tmp27__length1 = 0;
@@ -6652,299 +4920,260 @@ void publishing_flickr_session_sign_transaction (PublishingFlickrSession* self,
 				gint _tmp42_ = 0;
 				PublishingRESTSupportArgument** _tmp43_ = NULL;
 				gint _tmp43__length1 = 0;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!_tmp24_) {
-#line 6619 "FlickrPublishing.c"
+#line 4909 "FlickrPublishing.c"
 					gint _tmp25_ = 0;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp25_ = i;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					i = _tmp25_ + 1;
-#line 6625 "FlickrPublishing.c"
+#line 4915 "FlickrPublishing.c"
 				}
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp24_ = FALSE;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp26_ = i;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp27_ = sorted_args;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp27__length1 = sorted_args_length1;
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (!(_tmp26_ < _tmp27__length1)) {
-#line 977 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					break;
-#line 6639 "FlickrPublishing.c"
+#line 4929 "FlickrPublishing.c"
 				}
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp28_ = arguments_string;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp29_ = sorted_args;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp29__length1 = sorted_args_length1;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp30_ = i;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp31_ = _tmp29_[_tmp30_];
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp32_ = _tmp31_->key;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp33_ = g_strconcat (_tmp32_, "=", NULL);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp34_ = _tmp33_;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp35_ = sorted_args;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp35__length1 = sorted_args_length1;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp36_ = i;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp37_ = _tmp35_[_tmp36_];
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp38_ = _tmp37_->value;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp39_ = g_strconcat (_tmp34_, _tmp38_, NULL);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp40_ = _tmp39_;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp41_ = g_strconcat (_tmp28_, _tmp40_, NULL);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (arguments_string);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				arguments_string = _tmp41_;
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp40_);
-#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_g_free0 (_tmp34_);
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp42_ = i;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp43_ = sorted_args;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp43__length1 = sorted_args_length1;
-#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 660 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				if (_tmp42_ < (_tmp43__length1 - 1)) {
-#line 6689 "FlickrPublishing.c"
+#line 4979 "FlickrPublishing.c"
 					const gchar* _tmp44_ = NULL;
 					gchar* _tmp45_ = NULL;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp44_ = arguments_string;
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp45_ = g_strconcat (_tmp44_, "&", NULL);
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_g_free0 (arguments_string);
-#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					arguments_string = _tmp45_;
-#line 6700 "FlickrPublishing.c"
+#line 4990 "FlickrPublishing.c"
 				}
 			}
 		}
 	}
-#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	signing_key = NULL;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp46_ = self->priv->access_phase_token_secret;
-#line 984 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp46_ != NULL) {
-#line 6711 "FlickrPublishing.c"
+#line 5001 "FlickrPublishing.c"
 		const gchar* _tmp47_ = NULL;
 		gchar* _tmp48_ = NULL;
-#line 985 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_debug ("FlickrPublishing.vala:985: access phase token secret available; using " \
+		gchar* _tmp49_ = NULL;
+		const gchar* _tmp50_ = NULL;
+		gchar* _tmp51_ = NULL;
+#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 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp47_ = self->priv->access_phase_token_secret;
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp48_ = g_strconcat (PUBLISHING_FLICKR_API_SECRET "&", _tmp47_, NULL);
-#line 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 987 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		signing_key = _tmp48_;
-#line 6724 "FlickrPublishing.c"
+#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 5025 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp49_ = NULL;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp49_ = self->priv->request_phase_token_secret;
-#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (_tmp49_ != NULL) {
-#line 6731 "FlickrPublishing.c"
-			const gchar* _tmp50_ = NULL;
-			gchar* _tmp51_ = NULL;
-#line 989 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_debug ("FlickrPublishing.vala:989: request phase token secret available; using" \
-" it as signing key");
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp50_ = self->priv->request_phase_token_secret;
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp51_ = g_strconcat (PUBLISHING_FLICKR_API_SECRET "&", _tmp50_, NULL);
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (signing_key);
-#line 991 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			signing_key = _tmp51_;
-#line 6744 "FlickrPublishing.c"
-		} else {
-			gchar* _tmp52_ = NULL;
-#line 993 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_debug ("FlickrPublishing.vala:993: %s", "neither access phase nor request phase token secrets available; using " \
+		const gchar* _tmp52_ = NULL;
+		gchar* _tmp53_ = NULL;
+#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 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp52_ = g_strdup (PUBLISHING_FLICKR_API_SECRET "&");
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_g_free0 (signing_key);
-#line 996 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			signing_key = _tmp52_;
-#line 6755 "FlickrPublishing.c"
-		}
-	}
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp53_ = http_method;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp54_ = g_strconcat (_tmp53_, "&", NULL);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp55_ = _tmp54_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp56_ = txn;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp57_ = publishing_rest_support_transaction_get_endpoint_url (_tmp56_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp58_ = _tmp57_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp59_ = soup_uri_encode (_tmp58_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp60_ = _tmp59_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp61_ = g_strconcat (_tmp55_, _tmp60_, NULL);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp62_ = _tmp61_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp63_ = g_strconcat (_tmp62_, "&", NULL);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp64_ = _tmp63_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp65_ = arguments_string;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp66_ = soup_uri_encode (_tmp65_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp67_ = _tmp66_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp68_ = g_strconcat (_tmp64_, _tmp67_, NULL);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp69_ = _tmp68_;
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp67_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp64_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp62_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp60_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp58_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (_tmp55_);
-#line 999 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	signature_base_string = _tmp69_;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp70_ = signature_base_string;
-#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:1003: signature base string = '%s'", _tmp70_);
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp71_ = signing_key;
-#line 1005 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:1005: signing key = '%s'", _tmp71_);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 5039 "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 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp73_ = signature_base_string;
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp74_ = publishing_rest_support_hmac_sha1 (_tmp72_, _tmp73_);
-#line 1008 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	signature = _tmp74_;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp75_ = signature;
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp76_ = soup_uri_encode (_tmp75_, PUBLISHING_FLICKR_ENCODE_RFC_3986_EXTRA);
-#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	signature = _tmp76_;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp77_ = signature;
-#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_debug ("FlickrPublishing.vala:1011: signature = '%s'", _tmp77_);
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp78_ = upload_txn;
-#line 1013 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp78_ != NULL) {
-#line 6838 "FlickrPublishing.c"
-		PublishingFlickrUploadTransaction* _tmp79_ = NULL;
-		const gchar* _tmp80_ = NULL;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp79_ = upload_txn;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp80_ = signature;
-#line 1014 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_flickr_upload_transaction_add_authorization_header_field (_tmp79_, "oauth_signature", _tmp80_);
-#line 6847 "FlickrPublishing.c"
+#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 5121 "FlickrPublishing.c"
+		PublishingFlickrUploadTransaction* _tmp80_ = NULL;
+		const gchar* _tmp81_ = NULL;
+#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 5130 "FlickrPublishing.c"
 	} else {
-		PublishingRESTSupportTransaction* _tmp81_ = NULL;
-		const gchar* _tmp82_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp81_ = txn;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp82_ = signature;
-#line 1016 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		publishing_rest_support_transaction_add_argument (_tmp81_, "oauth_signature", _tmp82_);
-#line 6857 "FlickrPublishing.c"
-	}
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		PublishingRESTSupportTransaction* _tmp82_ = NULL;
+		const gchar* _tmp83_ = NULL;
+#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 5140 "FlickrPublishing.c"
+	}
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signature);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signature_base_string);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (signing_key);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (arguments_string);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (upload_txn);
-#line 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 953 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (http_method);
-#line 6875 "FlickrPublishing.c"
-}
-
-
-void publishing_flickr_session_set_request_phase_credentials (PublishingFlickrSession* self, const gchar* token, const gchar* secret) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (token != NULL);
-#line 1019 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_if_fail (secret != NULL);
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = token;
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->request_phase_token);
-#line 1020 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->request_phase_token = _tmp1_;
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = secret;
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp3_ = g_strdup (_tmp2_);
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->request_phase_token_secret);
-#line 1021 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->request_phase_token_secret = _tmp3_;
-#line 6906 "FlickrPublishing.c"
+#line 5158 "FlickrPublishing.c"
 }
 
 
@@ -6955,41 +5184,41 @@ void publishing_flickr_session_set_access_phase_credentials (PublishingFlickrSes
 	gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_SESSION (self));
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (token != NULL);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (secret != NULL);
-#line 1024 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (username != NULL);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = token;
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token);
-#line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token = _tmp1_;
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = secret;
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 1026 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token_secret = _tmp3_;
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = username;
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 1027 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 699 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->username = _tmp5_;
-#line 1029 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 6951 "FlickrPublishing.c"
+#line 5203 "FlickrPublishing.c"
 }
 
 
@@ -7008,47 +5237,47 @@ gchar* publishing_flickr_session_get_oauth_nonce (PublishingFlickrSession* self)
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1033 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 705 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_get_current_time (&currtime);
-#line 1034 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_get_current_time (&currtime);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = currtime;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _tmp0_.tv_sec;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup_printf ("%li", _tmp1_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = currtime;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_.tv_usec;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_strdup_printf ("%li", _tmp5_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = g_strconcat (_tmp3_, _tmp7_, NULL);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = g_compute_checksum_for_string (G_CHECKSUM_MD5, _tmp9_, (gsize) -1);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _tmp10_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp11_;
-#line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7010 "FlickrPublishing.c"
+#line 5262 "FlickrPublishing.c"
 }
 
 
@@ -7071,7 +5300,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 7033 "FlickrPublishing.c"
+#line 5285 "FlickrPublishing.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -7079,7 +5308,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 7041 "FlickrPublishing.c"
+#line 5293 "FlickrPublishing.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -7091,7 +5320,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 7053 "FlickrPublishing.c"
+#line 5305 "FlickrPublishing.c"
 	}
 }
 
@@ -7115,21 +5344,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 7077 "FlickrPublishing.c"
+#line 5329 "FlickrPublishing.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 7083 "FlickrPublishing.c"
+#line 5335 "FlickrPublishing.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 7087 "FlickrPublishing.c"
+#line 5339 "FlickrPublishing.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 7091 "FlickrPublishing.c"
+#line 5343 "FlickrPublishing.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -7141,7 +5370,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 7103 "FlickrPublishing.c"
+#line 5355 "FlickrPublishing.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -7151,13 +5380,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 7113 "FlickrPublishing.c"
+#line 5365 "FlickrPublishing.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 7119 "FlickrPublishing.c"
+#line 5371 "FlickrPublishing.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -7171,7 +5400,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 7133 "FlickrPublishing.c"
+#line 5385 "FlickrPublishing.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -7181,13 +5410,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 7143 "FlickrPublishing.c"
+#line 5395 "FlickrPublishing.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 7149 "FlickrPublishing.c"
+#line 5401 "FlickrPublishing.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7196,7 +5425,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 7158 "FlickrPublishing.c"
+#line 5410 "FlickrPublishing.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -7216,7 +5445,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 7178 "FlickrPublishing.c"
+#line 5430 "FlickrPublishing.c"
 }
 
 
@@ -7227,48 +5456,48 @@ gchar* publishing_flickr_session_get_oauth_timestamp (PublishingFlickrSession* s
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 1040 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_get_real_time ();
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp0_);
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = string_substring (_tmp2_, (glong) 0, (glong) 10);
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (_tmp2_);
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp4_;
-#line 1041 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7207 "FlickrPublishing.c"
+#line 5459 "FlickrPublishing.c"
 }
 
 
-gchar* publishing_flickr_session_get_request_phase_token (PublishingFlickrSession* self) {
+gchar* publishing_flickr_session_get_consumer_key (PublishingFlickrSession* self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1044 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->request_phase_token;
-#line 1045 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp0_ != NULL, "request_phase_token != null");
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->request_phase_token;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 1046 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7230 "FlickrPublishing.c"
+#line 5482 "FlickrPublishing.c"
 }
 
 
@@ -7277,44 +5506,21 @@ gchar* publishing_flickr_session_get_access_phase_token (PublishingFlickrSession
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1049 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->access_phase_token;
-#line 1050 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "access_phase_token != null");
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->access_phase_token;
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	result = _tmp2_;
-#line 1051 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	return result;
-#line 7253 "FlickrPublishing.c"
-}
-
-
-gchar* publishing_flickr_session_get_access_phase_token_secret (PublishingFlickrSession* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-#line 1054 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp0_ = self->priv->access_phase_token_secret;
-#line 1055 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_assert (_tmp0_ != NULL, "access_phase_token_secret != null");
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp1_ = self->priv->access_phase_token_secret;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 1056 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7276 "FlickrPublishing.c"
+#line 5505 "FlickrPublishing.c"
 }
 
 
@@ -7323,71 +5529,71 @@ gchar* publishing_flickr_session_get_username (PublishingFlickrSession* self) {
 	gboolean _tmp0_ = FALSE;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 1059 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (self), NULL);
-#line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp0_, "is_authenticated()");
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->username;
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp2_;
-#line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 7299 "FlickrPublishing.c"
+#line 5528 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_session_class_init (PublishingFlickrSessionClass * klass) {
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_session_parent_class = g_type_class_peek_parent (klass);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->finalize = publishing_flickr_session_finalize;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrSessionPrivate));
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportSessionClass *) klass)->is_authenticated = publishing_flickr_session_real_is_authenticated;
-#line 7312 "FlickrPublishing.c"
+#line 5541 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_session_instance_init (PublishingFlickrSession * self) {
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_SESSION_GET_PRIVATE (self);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->request_phase_token = NULL;
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->request_phase_token_secret = NULL;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token = NULL;
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->access_phase_token_secret = NULL;
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->username = NULL;
-#line 7329 "FlickrPublishing.c"
+#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 5558 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_session_finalize (PublishingRESTSupportSession* obj) {
 	PublishingFlickrSession * self;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->request_phase_token);
-#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_g_free0 (self->priv->request_phase_token_secret);
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token);
-#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->access_phase_token_secret);
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->priv->username);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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 7349 "FlickrPublishing.c"
+#line 5578 "FlickrPublishing.c"
 }
 
 
@@ -7404,30 +5610,30 @@ GType publishing_flickr_session_get_type (void) {
 
 
 static void _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_visibility_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7368 "FlickrPublishing.c"
+#line 5597 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_size_changed ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7375 "FlickrPublishing.c"
+#line 5604 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_logout_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7382 "FlickrPublishing.c"
+#line 5611 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_on_publish_clicked ((PublishingFlickrPublishingOptionsPane*) self);
-#line 7389 "FlickrPublishing.c"
+#line 5618 "FlickrPublishing.c"
 }
 
 
@@ -7467,399 +5673,435 @@ PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane
 	GtkBuilder* _tmp31_ = NULL;
 	GObject* _tmp32_ = NULL;
 	GtkCheckButton* _tmp33_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp34_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp35_ = NULL;
-	PublishingFlickrFlickrPublisher* _tmp36_ = NULL;
-	PublishingFlickrFlickrPublisher* _tmp37_ = NULL;
-	SpitPublishingPublisherMediaType _tmp38_ = 0;
-	gint _tmp39_ = 0;
-	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp42_ = NULL;
-	gchar* upload_label_text = NULL;
-	const gchar* _tmp43_ = NULL;
+	PublishingFlickrFlickrPublisher* _tmp34_ = NULL;
+	SpitPublishingAuthenticator* _tmp35_ = NULL;
+	SpitPublishingAuthenticator* _tmp36_ = NULL;
+	gboolean _tmp37_ = FALSE;
+	gboolean _tmp38_ = FALSE;
+	PublishingFlickrPublishingParameters* _tmp43_ = NULL;
 	PublishingFlickrPublishingParameters* _tmp44_ = NULL;
-	const gchar* _tmp45_ = NULL;
-	gchar* _tmp46_ = NULL;
-	PublishingFlickrPublishingParameters* _tmp47_ = NULL;
-	PublishingFlickrUserKind _tmp48_ = 0;
-	GtkLabel* _tmp61_ = NULL;
-	const gchar* _tmp62_ = NULL;
+	PublishingFlickrFlickrPublisher* _tmp45_ = NULL;
+	PublishingFlickrFlickrPublisher* _tmp46_ = NULL;
+	SpitPublishingPublisherMediaType _tmp47_ = 0;
+	gint _tmp48_ = 0;
+	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp49_ = NULL;
+	gint _tmp50_ = 0;
+	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp51_ = NULL;
+	gchar* upload_label_text = NULL;
+	const gchar* _tmp52_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp53_ = NULL;
+	const gchar* _tmp54_ = NULL;
+	gchar* _tmp55_ = NULL;
+	PublishingFlickrPublishingParameters* _tmp56_ = NULL;
+	PublishingFlickrUserKind _tmp57_ = 0;
+	GtkLabel* _tmp70_ = NULL;
+	const gchar* _tmp71_ = NULL;
 	gchar* visibility_label_text = NULL;
-	const gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	SpitPublishingPublisherMediaType _tmp65_ = 0;
-	GtkLabel* _tmp71_ = NULL;
 	const gchar* _tmp72_ = NULL;
-	GtkComboBoxText* _tmp73_ = NULL;
+	gchar* _tmp73_ = NULL;
 	SpitPublishingPublisherMediaType _tmp74_ = 0;
-	GtkCheckButton* _tmp78_ = NULL;
-	gboolean _tmp79_ = FALSE;
-	GtkButton* _tmp80_ = NULL;
-	GtkButton* _tmp81_ = NULL;
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	GtkLabel* _tmp80_ = NULL;
+	const gchar* _tmp81_ = NULL;
+	GtkComboBoxText* _tmp82_ = NULL;
+	SpitPublishingPublisherMediaType _tmp83_ = 0;
+	GtkCheckButton* _tmp87_ = NULL;
+	gboolean _tmp88_ = FALSE;
+	GtkButton* _tmp89_ = NULL;
+	GtkButton* _tmp90_ = NULL;
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_FLICKR_PUBLISHER (publisher), NULL);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = builder;
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->builder = _tmp1_;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = builder;
-#line 1108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "builder != null");
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = builder;
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = gtk_builder_get_objects (_tmp3_);
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = g_slist_length (_tmp5_);
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_vala_assert (_tmp6_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 1109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_slist_free0 (_tmp5_);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = self->priv->builder;
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = gtk_builder_get_object (_tmp7_, "flickr_pane");
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/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 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pane_widget = _tmp9_;
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = self->priv->builder;
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = gtk_builder_get_object (_tmp10_, "visibility_label");
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/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 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_label);
-#line 1113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 780 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_label = _tmp12_;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = self->priv->builder;
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = gtk_builder_get_object (_tmp13_, "upload_info_label");
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/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 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->upload_info_label);
-#line 1114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->upload_info_label = _tmp15_;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = self->priv->builder;
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = gtk_builder_get_object (_tmp16_, "logout_button");
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/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 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->logout_button = _tmp18_;
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = self->priv->builder;
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = gtk_builder_get_object (_tmp19_, "publish_button");
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/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 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publish_button = _tmp21_;
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = self->priv->builder;
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = gtk_builder_get_object (_tmp22_, "visibility_combo");
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/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 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 1117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_combo = _tmp24_;
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = self->priv->builder;
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = gtk_builder_get_object (_tmp25_, "size_combo");
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/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 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 1118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_combo = _tmp27_;
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp28_ = self->priv->builder;
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp29_ = gtk_builder_get_object (_tmp28_, "size_label");
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/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 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_label);
-#line 1119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 786 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_label = _tmp30_;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp31_ = self->priv->builder;
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp32_ = gtk_builder_get_object (_tmp31_, "strip_metadata_check");
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/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 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 787 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata_check = _tmp33_;
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp34_ = parameters;
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp35_ = _publishing_flickr_publishing_parameters_ref0 (_tmp34_);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp34_ = publisher;
+#line 789 "/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"
+	_tmp36_ = _tmp35_;
+#line 789 "/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"
+	_tmp38_ = !_tmp37_;
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_g_object_unref0 (_tmp36_);
+#line 789 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp38_) {
+#line 5829 "FlickrPublishing.c"
+		GtkButton* _tmp39_ = NULL;
+		GtkContainer* _tmp40_ = NULL;
+		GtkContainer* _tmp41_ = NULL;
+		GtkButton* _tmp42_ = NULL;
+#line 790 "/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"
+		_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"
+		_tmp41_ = _tmp40_;
+#line 790 "/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"
+		gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
+#line 5844 "FlickrPublishing.c"
+	}
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp43_ = parameters;
+#line 793 "/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"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1122 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->parameters = _tmp35_;
-#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp36_ = publisher;
-#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp37_ = _g_object_ref0 (_tmp36_);
-#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 793 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->parameters = _tmp44_;
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp45_ = publisher;
+#line 794 "/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"
 	_g_object_unref0 (self->priv->publisher);
-#line 1123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->publisher = _tmp37_;
-#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp38_ = media_type;
-#line 1124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->media_type = _tmp38_;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp40_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp39_);
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 794 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->publisher = _tmp46_;
+#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp47_ = media_type;
+#line 795 "/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"
+	_tmp49_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp48_);
+#line 797 "/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 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->visibilities = _tmp40_;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->visibilities_length1 = _tmp39_;
-#line 1126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 797 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->visibilities = _tmp49_;
+#line 797 "/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"
 	self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp42_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp41_);
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 798 "/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"
 	self->priv->sizes = (_vala_array_free (self->priv->sizes, self->priv->sizes_length1, (GDestroyNotify) publishing_flickr_publishing_options_pane_size_entry_unref), NULL);
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->sizes = _tmp42_;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	self->priv->sizes_length1 = _tmp41_;
-#line 1127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 798 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	self->priv->sizes = _tmp51_;
+#line 798 "/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"
 	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp43_ = _ ("You are logged into Flickr as %s.\n\n");
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp44_ = parameters;
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp45_ = _tmp44_->username;
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp46_ = g_strdup_printf (_tmp43_, _tmp45_);
-#line 1129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	upload_label_text = _tmp46_;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp47_ = parameters;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp48_ = _tmp47_->user_kind;
-#line 1130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp48_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
-#line 7637 "FlickrPublishing.c"
-		const gchar* _tmp49_ = NULL;
-		const gchar* _tmp50_ = NULL;
-		PublishingFlickrPublishingParameters* _tmp51_ = NULL;
-		gint64 _tmp52_ = 0LL;
-		gchar* _tmp53_ = NULL;
-		gchar* _tmp54_ = NULL;
-		gchar* _tmp55_ = NULL;
-		gchar* _tmp56_ = NULL;
-		gchar* _tmp57_ = NULL;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp49_ = upload_label_text;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp50_ = _ ("Your free Flickr account limits how much data you can upload per month" \
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp52_ = _ ("You are logged into Flickr as %s.\n\n");
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp53_ = parameters;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp54_ = _tmp53_->username;
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp55_ = g_strdup_printf (_tmp52_, _tmp54_);
+#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	upload_label_text = _tmp55_;
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp56_ = parameters;
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp57_ = _tmp56_->user_kind;
+#line 801 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp57_ == PUBLISHING_FLICKR_USER_KIND_FREE) {
+#line 5902 "FlickrPublishing.c"
+		const gchar* _tmp58_ = NULL;
+		const gchar* _tmp59_ = NULL;
+		PublishingFlickrPublishingParameters* _tmp60_ = NULL;
+		gint64 _tmp61_ = 0LL;
+		gchar* _tmp62_ = NULL;
+		gchar* _tmp63_ = NULL;
+		gchar* _tmp64_ = NULL;
+		gchar* _tmp65_ = NULL;
+		gchar* _tmp66_ = NULL;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp58_ = upload_label_text;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp59_ = _ ("Your free Flickr account limits how much data you can upload per month" \
 ".\n" \
 "This month you have %s remaining in your upload quota.");
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp51_ = parameters;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp52_ = _tmp51_->quota_free_bytes;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp53_ = g_format_size_full ((guint64) _tmp52_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp54_ = _tmp53_;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp55_ = g_strdup_printf (_tmp50_, _tmp54_);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp56_ = _tmp55_;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp57_ = g_strconcat (_tmp49_, _tmp56_, NULL);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp60_ = parameters;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp61_ = _tmp60_->quota_free_bytes;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp62_ = g_format_size_full ((guint64) _tmp61_, G_FORMAT_SIZE_LONG_FORMAT | G_FORMAT_SIZE_IEC_UNITS);
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp63_ = _tmp62_;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp64_ = g_strdup_printf (_tmp59_, _tmp63_);
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp65_ = _tmp64_;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp66_ = g_strconcat (_tmp58_, _tmp65_, NULL);
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		upload_label_text = _tmp57_;
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp56_);
-#line 1131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_g_free0 (_tmp54_);
-#line 7673 "FlickrPublishing.c"
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		upload_label_text = _tmp66_;
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp65_);
+#line 802 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_g_free0 (_tmp63_);
+#line 5938 "FlickrPublishing.c"
 	} else {
-		const gchar* _tmp58_ = NULL;
-		const gchar* _tmp59_ = NULL;
-		gchar* _tmp60_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp58_ = upload_label_text;
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp59_ = _ ("Your Flickr Pro account entitles you to unlimited uploads.");
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp60_ = g_strconcat (_tmp58_, _tmp59_, NULL);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		const gchar* _tmp67_ = NULL;
+		const gchar* _tmp68_ = NULL;
+		gchar* _tmp69_ = NULL;
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp67_ = upload_label_text;
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp68_ = _ ("Your Flickr Pro account entitles you to unlimited uploads.");
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp69_ = g_strconcat (_tmp67_, _tmp68_, NULL);
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (upload_label_text);
-#line 1133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		upload_label_text = _tmp60_;
-#line 7688 "FlickrPublishing.c"
-	}
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp61_ = self->priv->upload_info_label;
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp62_ = upload_label_text;
-#line 1136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_label_set_label (_tmp61_, _tmp62_);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp63_ = _ ("Photos _visible to:");
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp64_ = g_strdup (_tmp63_);
-#line 1138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	visibility_label_text = _tmp64_;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp65_ = media_type;
-#line 1139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp65_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 7706 "FlickrPublishing.c"
-		const gchar* _tmp66_ = NULL;
-		gchar* _tmp67_ = NULL;
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp66_ = _ ("Videos _visible to:");
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp67_ = g_strdup (_tmp66_);
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 804 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		upload_label_text = _tmp69_;
+#line 5953 "FlickrPublishing.c"
+	}
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp70_ = self->priv->upload_info_label;
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp71_ = upload_label_text;
+#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gtk_label_set_label (_tmp70_, _tmp71_);
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp72_ = _ ("Photos _visible to:");
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp73_ = g_strdup (_tmp72_);
+#line 809 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	visibility_label_text = _tmp73_;
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp74_ = media_type;
+#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp74_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 5971 "FlickrPublishing.c"
+		const gchar* _tmp75_ = NULL;
+		gchar* _tmp76_ = NULL;
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp75_ = _ ("Videos _visible to:");
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp76_ = g_strdup (_tmp75_);
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (visibility_label_text);
-#line 1140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		visibility_label_text = _tmp67_;
-#line 7717 "FlickrPublishing.c"
+#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		visibility_label_text = _tmp76_;
+#line 5982 "FlickrPublishing.c"
 	} else {
-		SpitPublishingPublisherMediaType _tmp68_ = 0;
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp68_ = media_type;
-#line 1141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		if (_tmp68_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
-#line 7724 "FlickrPublishing.c"
-			const gchar* _tmp69_ = NULL;
-			gchar* _tmp70_ = NULL;
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp69_ = _ ("Photos and videos _visible to:");
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			_tmp70_ = g_strdup (_tmp69_);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		SpitPublishingPublisherMediaType _tmp77_ = 0;
+#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp77_ = media_type;
+#line 812 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		if (_tmp77_ == (SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO)) {
+#line 5989 "FlickrPublishing.c"
+			const gchar* _tmp78_ = NULL;
+			gchar* _tmp79_ = NULL;
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp78_ = _ ("Photos and videos _visible to:");
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			_tmp79_ = g_strdup (_tmp78_);
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (visibility_label_text);
-#line 1143 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			visibility_label_text = _tmp70_;
-#line 7735 "FlickrPublishing.c"
+#line 814 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+			visibility_label_text = _tmp79_;
+#line 6000 "FlickrPublishing.c"
 		}
 	}
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp71_ = self->priv->visibility_label;
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp72_ = visibility_label_text;
-#line 1146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_label_set_label (_tmp71_, _tmp72_);
-#line 1148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp80_ = self->priv->visibility_label;
+#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp81_ = visibility_label_text;
+#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gtk_label_set_label (_tmp80_, _tmp81_);
+#line 819 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_populate_visibility_combo (self);
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp73_ = self->priv->visibility_combo;
-#line 1149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_visibility_changed_gtk_combo_box_changed, self, 0);
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp74_ = media_type;
-#line 1151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	if (_tmp74_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 7754 "FlickrPublishing.c"
-		GtkComboBoxText* _tmp75_ = NULL;
-#line 1152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp82_ = self->priv->visibility_combo;
+#line 820 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, 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"
+	_tmp83_ = media_type;
+#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	if (_tmp83_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 6019 "FlickrPublishing.c"
+		GtkComboBoxText* _tmp84_ = NULL;
+#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_populate_size_combo (self);
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp75_ = self->priv->size_combo;
-#line 1153 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
-#line 7762 "FlickrPublishing.c"
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp84_ = self->priv->size_combo;
+#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _publishing_flickr_publishing_options_pane_on_size_changed_gtk_combo_box_changed, self, 0);
+#line 6027 "FlickrPublishing.c"
 	} else {
-		GtkComboBoxText* _tmp76_ = NULL;
-		GtkLabel* _tmp77_ = NULL;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp76_ = self->priv->size_combo;
-#line 1156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_tmp77_ = self->priv->size_label;
-#line 1157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 7774 "FlickrPublishing.c"
-	}
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp78_ = self->priv->strip_metadata_check;
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp79_ = strip_metadata;
-#line 1160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp79_);
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp80_ = self->priv->logout_button;
-#line 1162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp80_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_tmp81_ = self->priv->publish_button;
-#line 1163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	g_signal_connect_object (_tmp81_, "clicked", (GCallback) _publishing_flickr_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		GtkComboBoxText* _tmp85_ = NULL;
+		GtkLabel* _tmp86_ = NULL;
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp85_ = self->priv->size_combo;
+#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		_tmp86_ = self->priv->size_label;
+#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 6039 "FlickrPublishing.c"
+	}
+#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp87_ = self->priv->strip_metadata_check;
+#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp88_ = strip_metadata;
+#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp87_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp88_);
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_tmp89_ = self->priv->logout_button;
+#line 833 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (_tmp89_, "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"
+	_tmp90_ = self->priv->publish_button;
+#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	g_signal_connect_object (_tmp90_, "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"
 	_g_free0 (visibility_label_text);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (upload_label_text);
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 7796 "FlickrPublishing.c"
+#line 6061 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrPublishingOptionsPane* publishing_flickr_publishing_options_pane_new (PublishingFlickrFlickrPublisher* publisher, PublishingFlickrPublishingParameters* parameters, SpitPublishingPublisherMediaType media_type, GtkBuilder* builder, gboolean strip_metadata) {
-#line 1105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 772 "/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 7803 "FlickrPublishing.c"
+#line 6068 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_on_logout_clicked (PublishingFlickrPublishingOptionsPane* self) {
-#line 1166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 837 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 7812 "FlickrPublishing.c"
+#line 6077 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_visibility_specification_ref0 (gpointer self) {
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_visibility_specification_ref (self) : NULL;
-#line 7819 "FlickrPublishing.c"
+#line 6084 "FlickrPublishing.c"
 }
 
 
@@ -7875,33 +6117,33 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 	SpitPublishingPublisherMediaType _tmp7_ = 0;
 	GtkCheckButton* _tmp14_ = NULL;
 	gboolean _tmp15_ = FALSE;
-#line 1170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 841 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->parameters;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->visibilities;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = self->priv->visibilities_length1;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = self->priv->visibility_combo;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/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 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp1_[_tmp3_];
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _tmp4_->specification;
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _publishing_flickr_visibility_specification_ref0 (_tmp5_);
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp0_->visibility_specification);
-#line 1171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_->visibility_specification = _tmp6_;
-#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = self->priv->media_type;
-#line 1174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 845 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((_tmp7_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) != 0) {
-#line 7861 "FlickrPublishing.c"
+#line 6126 "FlickrPublishing.c"
 		PublishingFlickrPublishingParameters* _tmp8_ = NULL;
 		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp9_ = NULL;
 		gint _tmp9__length1 = 0;
@@ -7909,116 +6151,116 @@ static void publishing_flickr_publishing_options_pane_on_publish_clicked (Publis
 		gint _tmp11_ = 0;
 		PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = self->priv->parameters;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = self->priv->sizes;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9__length1 = self->priv->sizes_length1;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = self->priv->size_combo;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/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 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = _tmp9_[_tmp11_];
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = _tmp12_->size;
-#line 1175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_->photo_major_axis_size = _tmp13_;
-#line 7885 "FlickrPublishing.c"
+#line 6150 "FlickrPublishing.c"
 	}
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = self->priv->strip_metadata_check;
-#line 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 848 "/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 1177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 848 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp15_);
-#line 7893 "FlickrPublishing.c"
+#line 6158 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add20 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 7904 "FlickrPublishing.c"
+#line 6169 "FlickrPublishing.c"
 	}
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7910 "FlickrPublishing.c"
+#line 6175 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add21 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 7921 "FlickrPublishing.c"
+#line 6186 "FlickrPublishing.c"
 	}
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7927 "FlickrPublishing.c"
+#line 6192 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add22 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 7938 "FlickrPublishing.c"
+#line 6203 "FlickrPublishing.c"
 	}
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7944 "FlickrPublishing.c"
+#line 6209 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add23 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 7955 "FlickrPublishing.c"
+#line 6220 "FlickrPublishing.c"
 	}
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7961 "FlickrPublishing.c"
+#line 6226 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add24 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneVisibilityEntry* value) {
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, *array, (*size) + 1);
-#line 7972 "FlickrPublishing.c"
+#line 6237 "FlickrPublishing.c"
 	}
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 7978 "FlickrPublishing.c"
+#line 6243 "FlickrPublishing.c"
 }
 
 
@@ -8060,118 +6302,118 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry** publishing_flickr_
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp25_ = NULL;
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp26_ = NULL;
 	gint _tmp26__length1 = 0;
-#line 1180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneVisibilityEntry*, 0 + 1);
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result__length1 = 0;
-#line 1181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 852 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _result_;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _ ("Everyone");
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_visibility_specification_new (1, 1, 1);
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp2_, _tmp4_);
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add20 (&_result_, &_result__length1, &__result__size_, _tmp5_);
-#line 1183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp5_);
+#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp4_);
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _result_;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6__length1 = _result__length1;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _ ("Friends & family only");
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = publishing_flickr_visibility_specification_new (1, 1, 0);
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp7_, _tmp9_);
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add21 (&_result_, &_result__length1, &__result__size_, _tmp10_);
-#line 1184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp10_);
+#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp9_);
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _result_;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11__length1 = _result__length1;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = _ ("Family only");
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = publishing_flickr_visibility_specification_new (0, 1, 0);
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp12_, _tmp14_);
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add22 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+#line 856 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp14_);
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = _result_;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = _ ("Friends only");
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp18_ = publishing_flickr_visibility_specification_new (1, 0, 0);
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp19_ = _tmp18_;
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp20_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp17_, _tmp19_);
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add23 (&_result_, &_result__length1, &__result__size_, _tmp20_);
-#line 1186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp20_);
+#line 857 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp19_);
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21_ = _result_;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp21__length1 = _result__length1;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp22_ = _ ("Just me");
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp23_ = publishing_flickr_visibility_specification_new (0, 0, 0);
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = _tmp23_;
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = publishing_flickr_publishing_options_pane_visibility_entry_new (_tmp22_, _tmp24_);
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add24 (&_result_, &_result__length1, &__result__size_, _tmp25_);
-#line 1187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp25_);
+#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (_tmp24_);
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26_ = _result_;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp26__length1 = _result__length1;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp26__length1;
-#line 8118 "FlickrPublishing.c"
+#line 6383 "FlickrPublishing.c"
 	}
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp26_;
-#line 1189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 860 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8124 "FlickrPublishing.c"
+#line 6389 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (gpointer self) {
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_visibility_entry_ref (self) : NULL;
-#line 8131 "FlickrPublishing.c"
+#line 6396 "FlickrPublishing.c"
 }
 
 
@@ -8183,165 +6425,165 @@ static void publishing_flickr_publishing_options_pane_populate_visibility_combo
 	GtkComboBoxText* _tmp8_ = NULL;
 	PublishingFlickrFlickrPublisher* _tmp9_ = NULL;
 	gint _tmp10_ = 0;
-#line 1192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->visibilities;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->visibilities_length1;
-#line 1193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 864 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 8151 "FlickrPublishing.c"
+#line 6416 "FlickrPublishing.c"
 		gint _tmp1_ = 0;
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry** _tmp2_ = NULL;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_visibilities (self, &_tmp1_);
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 865 "/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 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities = _tmp2_;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->visibilities_length1 = _tmp1_;
-#line 1194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 865 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 8164 "FlickrPublishing.c"
+#line 6429 "FlickrPublishing.c"
 	}
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->visibilities;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->visibilities_length1;
-#line 8170 "FlickrPublishing.c"
+#line 6435 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry** v_collection = NULL;
 		gint v_collection_length1 = 0;
 		gint _v_collection_size_ = 0;
 		gint v_it = 0;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		v_collection = _tmp3_;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		v_collection_length1 = _tmp3__length1;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (v_it = 0; v_it < _tmp3__length1; v_it = v_it + 1) {
-#line 8182 "FlickrPublishing.c"
+#line 6447 "FlickrPublishing.c"
 			PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp4_ = NULL;
 			PublishingFlickrPublishingOptionsPaneVisibilityEntry* v = NULL;
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_visibility_entry_ref0 (v_collection[v_it]);
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			v = _tmp4_;
-#line 8189 "FlickrPublishing.c"
+#line 6454 "FlickrPublishing.c"
 			{
 				GtkComboBoxText* _tmp5_ = NULL;
 				PublishingFlickrPublishingOptionsPaneVisibilityEntry* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->visibility_combo;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = v;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = _tmp6_->title;
-#line 1197 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
-#line 1196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_visibility_entry_unref0 (v);
-#line 8204 "FlickrPublishing.c"
+#line 6469 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->visibility_combo;
-#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->publisher;
-#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_visibility (_tmp9_);
-#line 1199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 870 "/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 8216 "FlickrPublishing.c"
+#line 6481 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add25 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8227 "FlickrPublishing.c"
+#line 6492 "FlickrPublishing.c"
 	}
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8233 "FlickrPublishing.c"
+#line 6498 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add26 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8244 "FlickrPublishing.c"
+#line 6509 "FlickrPublishing.c"
 	}
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8250 "FlickrPublishing.c"
+#line 6515 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add27 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8261 "FlickrPublishing.c"
+#line 6526 "FlickrPublishing.c"
 	}
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8267 "FlickrPublishing.c"
+#line 6532 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add28 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8278 "FlickrPublishing.c"
+#line 6543 "FlickrPublishing.c"
 	}
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8284 "FlickrPublishing.c"
+#line 6549 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add29 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add30 (PublishingFlickrPublishingOptionsPaneSizeEntry*** array, int* length, int* size, PublishingFlickrPublishingOptionsPaneSizeEntry* value) {
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (PublishingFlickrPublishingOptionsPaneSizeEntry*, *array, (*size) + 1);
-#line 8295 "FlickrPublishing.c"
+#line 6560 "FlickrPublishing.c"
 	}
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 8301 "FlickrPublishing.c"
+#line 6566 "FlickrPublishing.c"
 }
 
 
@@ -8373,88 +6615,88 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry** publishing_flickr_publis
 	PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp15_ = NULL;
 	PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp16_ = NULL;
 	gint _tmp16__length1 = 0;
-#line 1202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = g_new0 (PublishingFlickrPublishingOptionsPaneSizeEntry*, 0 + 1);
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result_ = _tmp0_;
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_result__length1 = 0;
-#line 1203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	__result__size_ = _result__length1;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _result_;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = _ ("500 × 375 pixels");
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp2_, 500);
-#line 1205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add25 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 876 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = _result_;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp5_ = _ ("1024 × 768 pixels");
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp5_, 1024);
-#line 1206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add26 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = _result_;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = _ ("2048 × 1536 pixels");
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp8_, 2048);
-#line 1207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add27 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = _result_;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp11_ = _ ("4096 × 3072 pixels");
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp12_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp11_, 4096);
-#line 1208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add28 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 879 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13_ = _result_;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp13__length1 = _result__length1;
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = _ ("Original size");
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = publishing_flickr_publishing_options_pane_size_entry_new (_tmp14_, PUBLISHING_FLICKR_ORIGINAL_SIZE);
-#line 1209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-	_vala_array_add29 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 880 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	_vala_array_add30 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = _result_;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (result_length1) {
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*result_length1 = _tmp16__length1;
-#line 8401 "FlickrPublishing.c"
+#line 6666 "FlickrPublishing.c"
 	}
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp16_;
-#line 1211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8407 "FlickrPublishing.c"
+#line 6672 "FlickrPublishing.c"
 }
 
 
 static gpointer _publishing_flickr_publishing_options_pane_size_entry_ref0 (gpointer self) {
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self ? publishing_flickr_publishing_options_pane_size_entry_ref (self) : NULL;
-#line 8414 "FlickrPublishing.c"
+#line 6679 "FlickrPublishing.c"
 }
 
 
@@ -8466,80 +6708,80 @@ static void publishing_flickr_publishing_options_pane_populate_size_combo (Publi
 	GtkComboBoxText* _tmp8_ = NULL;
 	PublishingFlickrFlickrPublisher* _tmp9_ = NULL;
 	gint _tmp10_ = 0;
-#line 1214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->sizes;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0__length1 = self->priv->sizes_length1;
-#line 1215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 8434 "FlickrPublishing.c"
+#line 6699 "FlickrPublishing.c"
 		gint _tmp1_ = 0;
 		PublishingFlickrPublishingOptionsPaneSizeEntry** _tmp2_ = NULL;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp2_ = publishing_flickr_publishing_options_pane_create_sizes (self, &_tmp1_);
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/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 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes = _tmp2_;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->sizes_length1 = _tmp1_;
-#line 1216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 887 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 8447 "FlickrPublishing.c"
+#line 6712 "FlickrPublishing.c"
 	}
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = self->priv->sizes;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3__length1 = self->priv->sizes_length1;
-#line 8453 "FlickrPublishing.c"
+#line 6718 "FlickrPublishing.c"
 	{
 		PublishingFlickrPublishingOptionsPaneSizeEntry** e_collection = NULL;
 		gint e_collection_length1 = 0;
 		gint _e_collection_size_ = 0;
 		gint e_it = 0;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e_collection = _tmp3_;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		e_collection_length1 = _tmp3__length1;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		for (e_it = 0; e_it < _tmp3__length1; e_it = e_it + 1) {
-#line 8465 "FlickrPublishing.c"
+#line 6730 "FlickrPublishing.c"
 			PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp4_ = NULL;
 			PublishingFlickrPublishingOptionsPaneSizeEntry* e = NULL;
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp4_ = _publishing_flickr_publishing_options_pane_size_entry_ref0 (e_collection[e_it]);
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			e = _tmp4_;
-#line 8472 "FlickrPublishing.c"
+#line 6737 "FlickrPublishing.c"
 			{
 				GtkComboBoxText* _tmp5_ = NULL;
 				PublishingFlickrPublishingOptionsPaneSizeEntry* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp5_ = self->priv->size_combo;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp6_ = e;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_tmp7_ = _tmp6_->title;
-#line 1219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp5_, _tmp7_);
-#line 1218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				_publishing_flickr_publishing_options_pane_size_entry_unref0 (e);
-#line 8487 "FlickrPublishing.c"
+#line 6752 "FlickrPublishing.c"
 			}
 		}
 	}
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = self->priv->size_combo;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp9_ = self->priv->publisher;
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 892 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp10_ = publishing_flickr_flickr_publisher_get_persistent_default_size (_tmp9_);
-#line 1221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 892 "/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 8499 "FlickrPublishing.c"
+#line 6764 "FlickrPublishing.c"
 }
 
 
@@ -8547,17 +6789,17 @@ static void publishing_flickr_publishing_options_pane_on_size_changed (Publishin
 	PublishingFlickrFlickrPublisher* _tmp0_ = NULL;
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 895 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->size_combo;
-#line 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 896 "/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 1225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 896 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_default_size (_tmp0_, _tmp2_);
-#line 8517 "FlickrPublishing.c"
+#line 6782 "FlickrPublishing.c"
 }
 
 
@@ -8565,41 +6807,41 @@ static void publishing_flickr_publishing_options_pane_on_visibility_changed (Pub
 	PublishingFlickrFlickrPublisher* _tmp0_ = NULL;
 	GtkComboBoxText* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 899 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->publisher;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = self->priv->visibility_combo;
-#line 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/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 1229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 900 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_flickr_publisher_set_persistent_visibility (_tmp0_, _tmp2_);
-#line 8535 "FlickrPublishing.c"
+#line 6800 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_options_pane_notify_publish (PublishingFlickrPublishingOptionsPane* self) {
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 903 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->strip_metadata_check;
-#line 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 904 "/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 1233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 904 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "publish", _tmp1_);
-#line 8550 "FlickrPublishing.c"
+#line 6815 "FlickrPublishing.c"
 }
 
 
 void publishing_flickr_publishing_options_pane_notify_logout (PublishingFlickrPublishingOptionsPane* self) {
-#line 1236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 907 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 1237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 908 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 8559 "FlickrPublishing.c"
+#line 6824 "FlickrPublishing.c"
 }
 
 
@@ -8608,56 +6850,56 @@ static GtkWidget* publishing_flickr_publishing_options_pane_real_get_widget (Spi
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 1240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 911 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 912 "/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 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp1_;
-#line 1241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 912 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8578 "FlickrPublishing.c"
+#line 6843 "FlickrPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_flickr_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingFlickrPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 1244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 915 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 1245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 916 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 8591 "FlickrPublishing.c"
+#line 6856 "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 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 920 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_publish ((PublishingFlickrPublishingOptionsPane*) self);
-#line 8598 "FlickrPublishing.c"
+#line 6863 "FlickrPublishing.c"
 }
 
 
 static void _publishing_flickr_publishing_options_pane_notify_logout_publishing_flickr_publishing_options_pane_logout (PublishingFlickrPublishingOptionsPane* _sender, gpointer self) {
-#line 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 921 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_notify_logout ((PublishingFlickrPublishingOptionsPane*) self);
-#line 8605 "FlickrPublishing.c"
+#line 6870 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingFlickrPublishingOptionsPane * self;
-#line 1248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 919 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 920 "/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 1250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 921 "/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 8617 "FlickrPublishing.c"
+#line 6882 "FlickrPublishing.c"
 }
 
 
@@ -8665,17 +6907,17 @@ static void publishing_flickr_publishing_options_pane_real_on_pane_uninstalled (
 	PublishingFlickrPublishingOptionsPane * self;
 	guint _tmp0_ = 0U;
 	guint _tmp1_ = 0U;
-#line 1253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 924 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp0_, NULL, FALSE);
-#line 1254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 925 "/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 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 926 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_parse_name ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, &_tmp1_, NULL, FALSE);
-#line 1255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 926 "/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 8635 "FlickrPublishing.c"
+#line 6900 "FlickrPublishing.c"
 }
 
 
@@ -8684,240 +6926,240 @@ static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publish
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPaneSizeEntry*) g_type_create_instance (object_type);
-#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = creator_title;
-#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 1071 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 738 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->title = _tmp1_;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = creator_size;
-#line 1072 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->size = _tmp2_;
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 8662 "FlickrPublishing.c"
+#line 6927 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneSizeEntry* publishing_flickr_publishing_options_pane_size_entry_new (const gchar* creator_title, gint creator_size) {
-#line 1070 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 737 "/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 8669 "FlickrPublishing.c"
+#line 6934 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_init (GValue* value) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8676 "FlickrPublishing.c"
+#line 6941 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_free_value (GValue* value) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (value->data[0].v_pointer);
-#line 8685 "FlickrPublishing.c"
+#line 6950 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_size_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 8695 "FlickrPublishing.c"
+#line 6960 "FlickrPublishing.c"
 	} else {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8699 "FlickrPublishing.c"
+#line 6964 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_size_entry_peek_pointer (const GValue* value) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8707 "FlickrPublishing.c"
+#line 6972 "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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8714 "FlickrPublishing.c"
+#line 6979 "FlickrPublishing.c"
 		PublishingFlickrPublishingOptionsPaneSizeEntry* object;
 		object = collect_values[0].v_pointer;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 8721 "FlickrPublishing.c"
+#line 6986 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 8725 "FlickrPublishing.c"
+#line 6990 "FlickrPublishing.c"
 		}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_size_entry_ref (object);
-#line 8729 "FlickrPublishing.c"
+#line 6994 "FlickrPublishing.c"
 	} else {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8733 "FlickrPublishing.c"
+#line 6998 "FlickrPublishing.c"
 	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 8737 "FlickrPublishing.c"
+#line 7002 "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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 8748 "FlickrPublishing.c"
+#line 7013 "FlickrPublishing.c"
 	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 8754 "FlickrPublishing.c"
+#line 7019 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8758 "FlickrPublishing.c"
+#line 7023 "FlickrPublishing.c"
 	} else {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 8762 "FlickrPublishing.c"
+#line 7027 "FlickrPublishing.c"
 	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 8766 "FlickrPublishing.c"
+#line 7031 "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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8780 "FlickrPublishing.c"
+#line 7045 "FlickrPublishing.c"
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_get_size_entry (const GValue* value) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8789 "FlickrPublishing.c"
+#line 7054 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_set_size_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* old;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_ref (value->data[0].v_pointer);
-#line 8809 "FlickrPublishing.c"
+#line 7074 "FlickrPublishing.c"
 	} else {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8813 "FlickrPublishing.c"
+#line 7078 "FlickrPublishing.c"
 	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 8819 "FlickrPublishing.c"
+#line 7084 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_take_size_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* old;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8838 "FlickrPublishing.c"
+#line 7103 "FlickrPublishing.c"
 	} else {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8842 "FlickrPublishing.c"
+#line 7107 "FlickrPublishing.c"
 	}
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_size_entry_unref (old);
-#line 8848 "FlickrPublishing.c"
+#line 7113 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_class_init (PublishingFlickrPublishingOptionsPaneSizeEntryClass * klass) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneSizeEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_size_entry_finalize;
-#line 8858 "FlickrPublishing.c"
+#line 7123 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_instance_init (PublishingFlickrPublishingOptionsPaneSizeEntry * self) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 8865 "FlickrPublishing.c"
+#line 7130 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_finalize (PublishingFlickrPublishingOptionsPaneSizeEntry* obj) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry * self;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1067 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 8877 "FlickrPublishing.c"
+#line 7142 "FlickrPublishing.c"
 }
 
 
@@ -8938,24 +7180,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 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 8902 "FlickrPublishing.c"
+#line 7167 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_size_entry_unref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneSizeEntry* self;
 	self = instance;
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_SIZE_ENTRY_GET_CLASS (self)->finalize (self);
-#line 1066 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8915 "FlickrPublishing.c"
+#line 7180 "FlickrPublishing.c"
 	}
 }
 
@@ -8966,248 +7208,248 @@ static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_p
 	PublishingFlickrVisibilitySpecification* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (creator_title != NULL, NULL);
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_VISIBILITY_SPECIFICATION (creator_specification), NULL);
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = (PublishingFlickrPublishingOptionsPaneVisibilityEntry*) g_type_create_instance (object_type);
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = creator_specification;
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _publishing_flickr_visibility_specification_ref0 (_tmp0_);
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->specification);
-#line 1081 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->specification = _tmp1_;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = creator_title;
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 1082 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->title = _tmp3_;
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 8950 "FlickrPublishing.c"
+#line 7215 "FlickrPublishing.c"
 }
 
 
 static PublishingFlickrPublishingOptionsPaneVisibilityEntry* publishing_flickr_publishing_options_pane_visibility_entry_new (const gchar* creator_title, PublishingFlickrVisibilitySpecification* creator_specification) {
-#line 1080 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 747 "/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 8957 "FlickrPublishing.c"
+#line 7222 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_init (GValue* value) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8964 "FlickrPublishing.c"
+#line 7229 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_free_value (GValue* value) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (value->data[0].v_pointer);
-#line 8973 "FlickrPublishing.c"
+#line 7238 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_visibility_entry_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 8983 "FlickrPublishing.c"
+#line 7248 "FlickrPublishing.c"
 	} else {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8987 "FlickrPublishing.c"
+#line 7252 "FlickrPublishing.c"
 	}
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_visibility_entry_peek_pointer (const GValue* value) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 8995 "FlickrPublishing.c"
+#line 7260 "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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 9002 "FlickrPublishing.c"
+#line 7267 "FlickrPublishing.c"
 		PublishingFlickrPublishingOptionsPaneVisibilityEntry* object;
 		object = collect_values[0].v_pointer;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 9009 "FlickrPublishing.c"
+#line 7274 "FlickrPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 9013 "FlickrPublishing.c"
+#line 7278 "FlickrPublishing.c"
 		}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = publishing_flickr_publishing_options_pane_visibility_entry_ref (object);
-#line 9017 "FlickrPublishing.c"
+#line 7282 "FlickrPublishing.c"
 	} else {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9021 "FlickrPublishing.c"
+#line 7286 "FlickrPublishing.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 9025 "FlickrPublishing.c"
+#line 7290 "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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!object_p) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 9036 "FlickrPublishing.c"
+#line 7301 "FlickrPublishing.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = NULL;
-#line 9042 "FlickrPublishing.c"
+#line 7307 "FlickrPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9046 "FlickrPublishing.c"
+#line 7311 "FlickrPublishing.c"
 	} else {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 9050 "FlickrPublishing.c"
+#line 7315 "FlickrPublishing.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return NULL;
-#line 9054 "FlickrPublishing.c"
+#line 7319 "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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 9068 "FlickrPublishing.c"
+#line 7333 "FlickrPublishing.c"
 }
 
 
 static gpointer publishing_flickr_publishing_options_pane_value_get_visibility_entry (const GValue* value) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return value->data[0].v_pointer;
-#line 9077 "FlickrPublishing.c"
+#line 7342 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_set_visibility_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* old;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_ref (value->data[0].v_pointer);
-#line 9097 "FlickrPublishing.c"
+#line 7362 "FlickrPublishing.c"
 	} else {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9101 "FlickrPublishing.c"
+#line 7366 "FlickrPublishing.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 9107 "FlickrPublishing.c"
+#line 7372 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_value_take_visibility_entry (GValue* value, gpointer v_object) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* old;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (v_object) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 9126 "FlickrPublishing.c"
+#line 7391 "FlickrPublishing.c"
 	} else {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 9130 "FlickrPublishing.c"
+#line 7395 "FlickrPublishing.c"
 	}
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (old) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		publishing_flickr_publishing_options_pane_visibility_entry_unref (old);
-#line 9136 "FlickrPublishing.c"
+#line 7401 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_class_init (PublishingFlickrPublishingOptionsPaneVisibilityEntryClass * klass) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingFlickrPublishingOptionsPaneVisibilityEntryClass *) klass)->finalize = publishing_flickr_publishing_options_pane_visibility_entry_finalize;
-#line 9146 "FlickrPublishing.c"
+#line 7411 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_instance_init (PublishingFlickrPublishingOptionsPaneVisibilityEntry * self) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->ref_count = 1;
-#line 9153 "FlickrPublishing.c"
+#line 7418 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_finalize (PublishingFlickrPublishingOptionsPaneVisibilityEntry* obj) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry * self;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 1077 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_visibility_specification_unref0 (self->specification);
-#line 1078 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_free0 (self->title);
-#line 9167 "FlickrPublishing.c"
+#line 7432 "FlickrPublishing.c"
 }
 
 
@@ -9228,134 +7470,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 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return instance;
-#line 9192 "FlickrPublishing.c"
+#line 7457 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_visibility_entry_unref (gpointer instance) {
 	PublishingFlickrPublishingOptionsPaneVisibilityEntry* self;
 	self = instance;
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_VISIBILITY_ENTRY_GET_CLASS (self)->finalize (self);
-#line 1076 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9205 "FlickrPublishing.c"
+#line 7470 "FlickrPublishing.c"
 	}
 }
 
 
 static void publishing_flickr_publishing_options_pane_class_init (PublishingFlickrPublishingOptionsPaneClass * klass) {
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrPublishingOptionsPanePrivate));
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_flickr_publishing_options_pane_finalize;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_new ("publish", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 9221 "FlickrPublishing.c"
+#line 7486 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/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 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_flickr_publishing_options_pane_real_get_widget;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/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 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/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 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/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 9236 "FlickrPublishing.c"
+#line 7501 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_instance_init (PublishingFlickrPublishingOptionsPane * self) {
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_label = NULL;
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->upload_info_label = NULL;
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_label = NULL;
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publish_button = NULL;
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibility_combo = NULL;
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->size_combo = NULL;
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities = NULL;
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->visibilities_length1 = 0;
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_visibilities_size_ = self->priv->visibilities_length1;
-#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes = NULL;
-#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->sizes_length1 = 0;
-#line 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->_sizes_size_ = self->priv->sizes_length1;
-#line 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = NULL;
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->publisher = NULL;
-#line 9277 "FlickrPublishing.c"
+#line 7542 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_publishing_options_pane_finalize (GObject* obj) {
 	PublishingFlickrPublishingOptionsPane * self;
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_PUBLISHING_OPTIONS_PANE, PublishingFlickrPublishingOptionsPane);
-#line 1086 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 1087 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 754 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 1088 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_label);
-#line 1089 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->upload_info_label);
-#line 1090 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_label);
-#line 1091 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 758 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 1092 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 1093 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 760 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->visibility_combo);
-#line 1094 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 1095 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 1096 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 763 "/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 1097 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 764 "/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 1098 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1099 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 766 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (self->priv->publisher);
-#line 1065 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	G_OBJECT_CLASS (publishing_flickr_publishing_options_pane_parent_class)->finalize (obj);
-#line 9315 "FlickrPublishing.c"
+#line 7580 "FlickrPublishing.c"
 }
 
 
@@ -9381,57 +7623,57 @@ PublishingFlickrUploader* publishing_flickr_uploader_construct (GType object_typ
 	PublishingFlickrPublishingParameters* _tmp2_ = NULL;
 	PublishingFlickrPublishingParameters* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_SESSION (session), NULL);
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_FLICKR_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = session;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = publishables;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 936 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 1265 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 936 "/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 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = parameters;
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = _publishing_flickr_publishing_parameters_ref0 (_tmp2_);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 938 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = strip_metadata;
-#line 1268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 939 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv->strip_metadata = _tmp4_;
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return self;
-#line 9367 "FlickrPublishing.c"
+#line 7632 "FlickrPublishing.c"
 }
 
 
 PublishingFlickrUploader* publishing_flickr_uploader_new (PublishingFlickrSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingFlickrPublishingParameters* parameters, gboolean strip_metadata) {
-#line 1263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 934 "/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 9374 "FlickrPublishing.c"
+#line 7639 "FlickrPublishing.c"
 }
 
 
-static void _vala_array_add30 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+static void _vala_array_add31 (gchar*** array, int* length, int* size, gchar* value) {
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if ((*length) == (*size)) {
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 9385 "FlickrPublishing.c"
+#line 7650 "FlickrPublishing.c"
 	}
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	(*array)[*length] = NULL;
-#line 9391 "FlickrPublishing.c"
+#line 7656 "FlickrPublishing.c"
 }
 
 
@@ -9449,25 +7691,25 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 	GExiv2Metadata* _tmp32_ = NULL;
 	gboolean _tmp33_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (PUBLISHING_FLICKR_IS_UPLOADER (self));
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable));
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp0_ = publishable;
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = spit_publishing_publishable_get_media_type (_tmp0_);
-#line 1272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 943 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp1_ != SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) {
-#line 1273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 944 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 9421 "FlickrPublishing.c"
+#line 7686 "FlickrPublishing.c"
 	}
-#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp2_ = gexiv2_metadata_new ();
-#line 1275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 946 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishable_metadata = _tmp2_;
-#line 9427 "FlickrPublishing.c"
+#line 7692 "FlickrPublishing.c"
 	{
 		GExiv2Metadata* _tmp3_ = NULL;
 		SpitPublishingPublishable* _tmp4_ = NULL;
@@ -9475,32 +7717,32 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GFile* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp3_ = publishable_metadata;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp4_ = publishable;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp5_ = spit_publishing_publishable_get_serialized_file (_tmp4_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp6_ = _tmp5_;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp7_ = g_file_get_path (_tmp6_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_open_path (_tmp3_, _tmp8_, &_inner_error_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1277 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 948 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9455 "FlickrPublishing.c"
-			goto __catch25_g_error;
+#line 7720 "FlickrPublishing.c"
+			goto __catch18_g_error;
 		}
 	}
-	goto __finally25;
-	__catch25_g_error:
+	goto __finally18;
+	__catch18_g_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPublishable* _tmp9_ = NULL;
@@ -9508,129 +7750,129 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		err = _inner_error_;
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_inner_error_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp9_ = publishable;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp10_ = spit_publishing_publishable_get_serialized_file (_tmp9_);
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp11_ = _tmp10_;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp13_ = _tmp12_;
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		g_warning ("FlickrPublishing.vala:1279: couldn't read metadata from file '%s' for " \
-"upload preprocessing.", _tmp13_);
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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" \
+"pload preprocessing.", _tmp13_);
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp13_);
-#line 1279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 950 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_error_free0 (err);
-#line 9490 "FlickrPublishing.c"
+#line 7755 "FlickrPublishing.c"
 	}
-	__finally25:
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+	__finally18:
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (publishable_metadata);
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/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 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 1276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 947 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 9503 "FlickrPublishing.c"
+#line 7768 "FlickrPublishing.c"
 	}
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp14_ = publishable_metadata;
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp15_ = gexiv2_metadata_has_iptc (_tmp14_);
-#line 1287 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 958 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (!_tmp15_) {
-#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (publishable_metadata);
-#line 1288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 959 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		return;
-#line 9515 "FlickrPublishing.c"
+#line 7780 "FlickrPublishing.c"
 	}
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp16_ = publishable_metadata;
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp17_ = gexiv2_metadata_has_tag (_tmp16_, "Iptc.Application2.Caption");
-#line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 961 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp17_) {
-#line 9523 "FlickrPublishing.c"
+#line 7788 "FlickrPublishing.c"
 		GExiv2Metadata* _tmp18_ = NULL;
 		GExiv2Metadata* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp18_ = publishable_metadata;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp19_ = publishable_metadata;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp20_ = gexiv2_metadata_get_tag_string (_tmp19_, "Iptc.Application2.Caption");
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp21_ = _tmp20_;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp22_ = publishing_rest_support_asciify_string (_tmp21_);
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp23_ = _tmp22_;
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_string (_tmp18_, "Iptc.Application2.Caption", _tmp23_);
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp23_);
-#line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 962 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp21_);
-#line 9548 "FlickrPublishing.c"
+#line 7813 "FlickrPublishing.c"
 	}
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp24_ = publishable_metadata;
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp25_ = gexiv2_metadata_has_tag (_tmp24_, "Iptc.Application2.Headline");
-#line 1295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 966 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp25_) {
-#line 9556 "FlickrPublishing.c"
+#line 7821 "FlickrPublishing.c"
 		GExiv2Metadata* _tmp26_ = NULL;
 		GExiv2Metadata* _tmp27_ = NULL;
 		gchar* _tmp28_ = NULL;
 		gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp26_ = publishable_metadata;
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp27_ = publishable_metadata;
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp28_ = gexiv2_metadata_get_tag_string (_tmp27_, "Iptc.Application2.Headline");
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp29_ = _tmp28_;
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp30_ = publishing_rest_support_asciify_string (_tmp29_);
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp31_ = _tmp30_;
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_string (_tmp26_, "Iptc.Application2.Headline", _tmp31_);
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp31_);
-#line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 967 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp29_);
-#line 9581 "FlickrPublishing.c"
+#line 7846 "FlickrPublishing.c"
 	}
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp32_ = publishable_metadata;
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp33_ = gexiv2_metadata_has_tag (_tmp32_, "Iptc.Application2.Keywords");
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	if (_tmp33_) {
-#line 9589 "FlickrPublishing.c"
+#line 7854 "FlickrPublishing.c"
 		GeeSet* keyword_set = NULL;
 		GeeHashSet* _tmp34_ = NULL;
 		gchar** iptc_keywords = NULL;
@@ -9670,179 +7912,179 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 		GExiv2Metadata* _tmp60_ = NULL;
 		gchar** _tmp61_ = NULL;
 		gint _tmp61__length1 = 0;
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp34_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 1301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 972 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		keyword_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_SET, GeeSet);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp35_ = publishable_metadata;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp37_ = _tmp36_ = gexiv2_metadata_get_tag_multiple (_tmp35_, "Iptc.Application2.Keywords");
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords = _tmp37_;
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords_length1 = _vala_array_length (_tmp36_);
-#line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 973 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_iptc_keywords_size_ = iptc_keywords_length1;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp38_ = iptc_keywords;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp38__length1 = iptc_keywords_length1;
-#line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 974 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp38_ != NULL) {
-#line 9649 "FlickrPublishing.c"
+#line 7914 "FlickrPublishing.c"
 			gchar** _tmp39_ = NULL;
 			gint _tmp39__length1 = 0;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp39_ = iptc_keywords;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp39__length1 = iptc_keywords_length1;
-#line 9656 "FlickrPublishing.c"
+#line 7921 "FlickrPublishing.c"
 			{
 				gchar** keyword_collection = NULL;
 				gint keyword_collection_length1 = 0;
 				gint _keyword_collection_size_ = 0;
 				gint keyword_it = 0;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection = _tmp39_;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection_length1 = _tmp39__length1;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				for (keyword_it = 0; keyword_it < _tmp39__length1; keyword_it = keyword_it + 1) {
-#line 9668 "FlickrPublishing.c"
+#line 7933 "FlickrPublishing.c"
 					gchar* _tmp40_ = NULL;
 					gchar* keyword = NULL;
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp40_ = g_strdup (keyword_collection[keyword_it]);
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					keyword = _tmp40_;
-#line 9675 "FlickrPublishing.c"
+#line 7940 "FlickrPublishing.c"
 					{
 						GeeSet* _tmp41_ = NULL;
 						const gchar* _tmp42_ = NULL;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp41_ = keyword_set;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp42_ = keyword;
-#line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 976 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_COLLECTION, GeeCollection), _tmp42_);
-#line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 975 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_g_free0 (keyword);
-#line 9687 "FlickrPublishing.c"
+#line 7952 "FlickrPublishing.c"
 					}
 				}
 			}
 		}
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp43_ = publishable_metadata;
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp45_ = _tmp44_ = gexiv2_metadata_get_tag_multiple (_tmp43_, "Xmp.dc.subject");
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords = _tmp45_;
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords_length1 = _vala_array_length (_tmp44_);
-#line 1307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 978 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_xmp_keywords_size_ = xmp_keywords_length1;
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp46_ = xmp_keywords;
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp46__length1 = xmp_keywords_length1;
-#line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 979 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (_tmp46_ != NULL) {
-#line 9708 "FlickrPublishing.c"
+#line 7973 "FlickrPublishing.c"
 			gchar** _tmp47_ = NULL;
 			gint _tmp47__length1 = 0;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp47_ = xmp_keywords;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp47__length1 = xmp_keywords_length1;
-#line 9715 "FlickrPublishing.c"
+#line 7980 "FlickrPublishing.c"
 			{
 				gchar** keyword_collection = NULL;
 				gint keyword_collection_length1 = 0;
 				gint _keyword_collection_size_ = 0;
 				gint keyword_it = 0;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection = _tmp47_;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				keyword_collection_length1 = _tmp47__length1;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 				for (keyword_it = 0; keyword_it < _tmp47__length1; keyword_it = keyword_it + 1) {
-#line 9727 "FlickrPublishing.c"
+#line 7992 "FlickrPublishing.c"
 					gchar* _tmp48_ = NULL;
 					gchar* keyword = NULL;
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					_tmp48_ = g_strdup (keyword_collection[keyword_it]);
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 					keyword = _tmp48_;
-#line 9734 "FlickrPublishing.c"
+#line 7999 "FlickrPublishing.c"
 					{
 						GeeSet* _tmp49_ = NULL;
 						const gchar* _tmp50_ = NULL;
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp49_ = keyword_set;
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_tmp50_ = keyword;
-#line 1310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 981 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_COLLECTION, GeeCollection), _tmp50_);
-#line 1309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 980 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 						_g_free0 (keyword);
-#line 9746 "FlickrPublishing.c"
+#line 8011 "FlickrPublishing.c"
 					}
 				}
 			}
 		}
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp51_ = keyword_set;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 983 "/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 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords = _tmp53_;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords_length1 = _tmp52_;
-#line 1312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 983 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_all_keywords_size_ = all_keywords_length1;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp54_ = all_keywords;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 988 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp54__length1 = all_keywords_length1;
-#line 1317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-		_vala_array_add30 (&all_keywords, &all_keywords_length1, &_all_keywords_size_, NULL);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#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"
 		_tmp55_ = g_new0 (gchar*, 1 + 1);
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords = _tmp55_;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords_length1 = 1;
-#line 1319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 990 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_no_keywords_size_ = no_keywords_length1;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56_ = no_keywords;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56__length1 = no_keywords_length1;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_free0 (_tmp56_[0]);
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp56_[0] = NULL;
-#line 1324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 995 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp57_ = _tmp56_[0];
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp58_ = publishable_metadata;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp59_ = all_keywords;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp59__length1 = all_keywords_length1;
-#line 1326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 997 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_multiple (_tmp58_, "Xmp.dc.subject", _tmp59_);
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp60_ = publishable_metadata;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp61_ = no_keywords;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_tmp61__length1 = no_keywords_length1;
-#line 1327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 998 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		gexiv2_metadata_set_tag_multiple (_tmp60_, "Iptc.Application2.Keywords", _tmp61_);
-#line 9801 "FlickrPublishing.c"
+#line 8066 "FlickrPublishing.c"
 		{
 			GExiv2Metadata* _tmp62_ = NULL;
 			SpitPublishingPublishable* _tmp63_ = NULL;
@@ -9850,32 +8092,32 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 			GFile* _tmp65_ = NULL;
 			gchar* _tmp66_ = NULL;
 			gchar* _tmp67_ = NULL;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp62_ = publishable_metadata;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp63_ = publishable;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp64_ = spit_publishing_publishable_get_serialized_file (_tmp63_);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp65_ = _tmp64_;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp66_ = g_file_get_path (_tmp65_);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp67_ = _tmp66_;
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			gexiv2_metadata_save_file (_tmp62_, _tmp67_, &_inner_error_);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (_tmp67_);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (_tmp65_);
-#line 1330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1001 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9829 "FlickrPublishing.c"
-				goto __catch26_g_error;
+#line 8094 "FlickrPublishing.c"
+				goto __catch19_g_error;
 			}
 		}
-		goto __finally26;
-		__catch26_g_error:
+		goto __finally19;
+		__catch19_g_error:
 		{
 			GError* err = NULL;
 			SpitPublishingPublishable* _tmp68_ = NULL;
@@ -9883,69 +8125,69 @@ static void publishing_flickr_uploader_preprocess_publishable (PublishingFlickrU
 			GFile* _tmp70_ = NULL;
 			gchar* _tmp71_ = NULL;
 			gchar* _tmp72_ = NULL;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			err = _inner_error_;
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_inner_error_ = NULL;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp68_ = publishable;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp69_ = spit_publishing_publishable_get_serialized_file (_tmp68_);
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp70_ = _tmp69_;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp71_ = g_file_get_path (_tmp70_);
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_tmp72_ = _tmp71_;
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
-			g_warning ("FlickrPublishing.vala:1332: couldn't write metadata to file '%s' for u" \
+#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 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_free0 (_tmp72_);
-#line 1332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1003 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (_tmp70_);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_error_free0 (err);
-#line 9864 "FlickrPublishing.c"
+#line 8129 "FlickrPublishing.c"
 		}
-		__finally26:
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+		__finally19:
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (keyword_set);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			_g_object_unref0 (publishable_metadata);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/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 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 1329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1000 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 			return;
-#line 9887 "FlickrPublishing.c"
+#line 8152 "FlickrPublishing.c"
 		}
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		no_keywords = (_vala_array_free (no_keywords, no_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		all_keywords = (_vala_array_free (all_keywords, all_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		xmp_keywords = (_vala_array_free (xmp_keywords, xmp_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		iptc_keywords = (_vala_array_free (iptc_keywords, iptc_keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 1300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 971 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 		_g_object_unref0 (keyword_set);
-#line 9899 "FlickrPublishing.c"
+#line 8164 "FlickrPublishing.c"
 	}
-#line 1271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 942 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (publishable_metadata);
-#line 9903 "FlickrPublishing.c"
+#line 8168 "FlickrPublishing.c"
 }
 
 
@@ -9961,73 +8203,73 @@ static PublishingRESTSupportTransaction* publishing_flickr_uploader_real_create_
 	SpitPublishingPublishable* _tmp6_ = NULL;
 	PublishingFlickrUploadTransaction* _tmp7_ = NULL;
 	PublishingRESTSupportTransaction* _tmp8_ = NULL;
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
-#line 1338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1009 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1011 "/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 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_uploader_preprocess_publishable (self, _tmp1_);
-#line 1340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1011 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/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 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, PUBLISHING_FLICKR_TYPE_SESSION, PublishingFlickrSession);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp4_ = self->priv->parameters;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/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 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp7_ = publishing_flickr_upload_transaction_new (_tmp3_, _tmp4_, _tmp6_);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp3_);
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	result = _tmp8_;
-#line 1341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 1012 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	return result;
-#line 9953 "FlickrPublishing.c"
+#line 8218 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_class_init (PublishingFlickrUploaderClass * klass) {
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	publishing_flickr_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_flickr_uploader_finalize;
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingFlickrUploaderPrivate));
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_flickr_uploader_real_create_transaction;
-#line 9966 "FlickrPublishing.c"
+#line 8231 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_instance_init (PublishingFlickrUploader * self) {
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self->priv = PUBLISHING_FLICKR_UPLOADER_GET_PRIVATE (self);
-#line 9973 "FlickrPublishing.c"
+#line 8238 "FlickrPublishing.c"
 }
 
 
 static void publishing_flickr_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingFlickrUploader * self;
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_FLICKR_TYPE_UPLOADER, PublishingFlickrUploader);
-#line 1260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 931 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	_publishing_flickr_publishing_parameters_unref0 (self->priv->parameters);
-#line 1259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
+#line 930 "/home/jens/Source/shotwell/plugins/shotwell-publishing/FlickrPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_flickr_uploader_parent_class)->finalize (obj);
-#line 9985 "FlickrPublishing.c"
+#line 8250 "FlickrPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/FlickrPublishing.vala b/plugins/shotwell-publishing/FlickrPublishing.vala
index 1702288..24b2b61 100644
--- a/plugins/shotwell-publishing/FlickrPublishing.vala
+++ b/plugins/shotwell-publishing/FlickrPublishing.vala
@@ -56,13 +56,7 @@ public class FlickrService : Object, Spit.Pluggable, Spit.Publishing.Service {
 namespace Publishing.Flickr {
 
 internal const string SERVICE_NAME = "Flickr";
-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 const string RESTART_ERROR_MESSAGE = 
-    _("You have already logged in and out of Flickr during this Shotwell session.\nTo continue publishing to Flickr, quit and restart Shotwell, then try publishing again.");
 internal const string ENDPOINT_URL = "https://api.flickr.com/services/rest";
-internal const string API_KEY = "60dd96d4a2ad04888b09c9e18d82c26f";
-internal const string API_SECRET = "d0960565e03547c1";
 internal const int ORIGINAL_SIZE = -1;
 internal const string EXPIRED_SESSION_ERROR_CODE = "98";
 internal const string ENCODE_RFC_3986_EXTRA = "!*'();:@&=+$,/?%#[] \\";
@@ -104,168 +98,63 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
     private bool was_started = false;
     private Session session = null;
     private PublishingOptionsPane publishing_options_pane = null;
+    private Spit.Publishing.Authenticator authenticator = null;
    
     private PublishingParameters parameters = null;
 
     public FlickrPublisher(Spit.Publishing.Service service,
-        Spit.Publishing.PluginHost host) {
+                           Spit.Publishing.PluginHost host) {
         debug("FlickrPublisher instantiated.");
         this.service = service;
         this.host = host;
         this.session = new Session();
         this.parameters = new PublishingParameters();
-        
-        session.authenticated.connect(on_session_authenticated);
+        this.authenticator = Publishing.Authenticator.Factory.get_instance().create("flickr", host);
+
+        this.authenticator.authenticated.connect(on_session_authenticated);
     }
     
     ~FlickrPublisher() {
-        session.authenticated.disconnect(on_session_authenticated);
-    }
-    
-    private 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);
+        this.authenticator.authenticated.disconnect(on_session_authenticated);
     }
 
-    private string? get_persistent_access_phase_token() {
-        return host.get_config_string("access_phase_token", null);
-    }
-
-    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 Spit.Publishing.Authenticator get_authenticator() {
+        return this.authenticator;
     }
 
     private bool get_persistent_strip_metadata() {
         return host.get_config_bool("strip_metadata", false);
     }
-    
+
     private void set_persistent_strip_metadata(bool strip_metadata) {
         host.set_config_bool("strip_metadata", strip_metadata);
-    }    
-
-    private void on_welcome_pane_login_clicked() {
-        if (!running)
-            return;
-
-        debug("EVENT: user clicked 'Login' button in the welcome pane");
-        
-        do_run_authentication_request_transaction();
     }
 
-    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 on_authentication_token_available(string token, string token_secret) {
-        debug("EVENT: OAuth authentication token (%s) and token secret (%s) available",
-            token, token_secret);
-
-        session.set_request_phase_credentials(token, token_secret);
-
-        do_launch_system_browser(token);
-    }
-    
-    private void on_system_browser_launched() {
-        if (!is_running())
-            return;
-
-        debug("EVENT: system browser launched.");
-        
-        do_show_pin_entry_pane();
-    }
-    
-    private void on_pin_entry_proceed(PinEntryPane sender, string pin) {
-        sender.proceed.disconnect(on_pin_entry_proceed);
-        
+    private void on_session_authenticated() {
         if (!is_running())
             return;
 
-        debug("EVENT: user clicked 'Continue' in PIN entry pane.");
-        
-        do_verify_pin(pin);
-    }
+        debug("EVENT: a fully authenticated session has become available");
 
-    private void on_access_token_fetch_txn_completed(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_access_token_fetch_txn_completed);
-        txn.network_error.disconnect(on_access_token_fetch_error);
-        
-        if (!is_running())
-            return;
-        
-        debug("EVENT: fetching OAuth access token over the network succeeded");
-        
-        do_extract_access_phase_credentials_from_reponse(txn.get_response());
-    }
+        var params = this.authenticator.get_authentication_parameter();
+        Variant consumer_key = null;
+        Variant consumer_secret = null;
+        Variant auth_token = null;
+        Variant auth_token_secret = null;
+        Variant username = null;
 
-    private void on_access_token_fetch_error(Publishing.RESTSupport.Transaction txn,
-        Spit.Publishing.PublishingError err) {
-        txn.completed.disconnect(on_access_token_fetch_txn_completed);
-        txn.network_error.disconnect(on_access_token_fetch_error);
-        
-        if (!is_running())
-            return;
+        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());
 
-        debug("EVENT: fetching OAuth access token over the network caused an error.");
-        
-        host.post_error(err);
-    }
-    
-    private void on_session_authenticated() {
-        if (!is_running())
-            return;
+        params.lookup_extended("AuthToken", null, out auth_token);
+        params.lookup_extended("AuthTokenSecret", null, out auth_token_secret);
+        params.lookup_extended("Username", null, out username);
+        session.set_access_phase_credentials(auth_token.get_string(),
+                auth_token_secret.get_string(), username.get_string());
 
-        debug("EVENT: a fully authenticated session has become available");
-        
         parameters.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());
-        
+
         do_fetch_account_info();
     }
 
@@ -360,126 +249,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
         host.post_error(err);
     }
 
-    private void do_show_login_welcome_pane() {
-        debug("ACTION: installing login welcome pane");
-
-        host.set_service_locked(false);
-        host.install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_welcome_pane_login_clicked);
-    }
-    
-    private void do_run_authentication_request_transaction() {
-        debug("ACTION: running authentication request transaction");
-
-        host.set_service_locked(true);
-        host.install_static_message_pane(_("Preparing for login…"));
-
-        AuthenticationRequestTransaction txn = new AuthenticationRequestTransaction(session);
-        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 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;
-
-        var data = Soup.Form.decode(response);
-        data.lookup_extended("oauth_token", null, out oauth_token);
-        data.lookup_extended("oauth_token_secret", null, out oauth_token_secret);
-        
-        if (oauth_token == null || oauth_token_secret == null)
-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                "'%s' isn't a valid response to an OAuth authentication request", response));
-        
-        
-        on_authentication_token_available(oauth_token, oauth_token_secret);
-    }
-    
-    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 do_verify_pin(string pin) {
-        debug("ACTION: validating authorization PIN %s", pin);
-        
-        host.set_service_locked(true);
-        host.install_static_message_pane(_("Verifying authorization…"));
-        
-        AccessTokenFetchTransaction txn = new AccessTokenFetchTransaction(session, pin);
-        txn.completed.connect(on_access_token_fetch_txn_completed);
-        txn.network_error.connect(on_access_token_fetch_error);
-        
-        try {
-            txn.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            host.post_error(err);
-        }
-    }
-    
-    private void do_extract_access_phase_credentials_from_reponse(string response) {
-        debug("ACTION: extracting access phase credentials from '%s'", response);
-
-        string? token = null;
-        string? token_secret = null;
-        string? username = 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);
-        data.lookup_extended("username", null, out username);
-
-        debug("access phase credentials: { token = '%s'; token_secret = '%s'; username = '%s' }",
-            token, token_secret, username);
-
-        if (token == null || token_secret == null || username == null)
-            host.post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("expected " +
-                "access phase credentials to contain token, token secret, and username but at " +
-                "least one of these is absent"));
-
-        session.set_access_phase_credentials(token, token_secret, username);
-    }
-
     private void do_fetch_account_info() {
         debug("ACTION: running network transaction to fetch account information");
 
@@ -544,8 +313,9 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
     private void do_logout() {
         debug("ACTION: logging user out, deauthenticating session, and erasing stored credentials");
 
-        session.deauthenticate();
-        invalidate_persistent_session();
+        if (authenticator.can_logout()) {
+            authenticator.logout();
+        }
 
         running = false;
 
@@ -650,16 +420,7 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
         running = true;
         was_started = 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(), get_persistent_access_phase_username());
-        } else {
-            debug("attempt start: no persistent session available; showing login welcome pane");
-
-            do_show_login_welcome_pane();
-        }
+        authenticator.authenticate();
     }
     
     public void start() {
@@ -684,60 +445,6 @@ public class FlickrPublisher : Spit.Publishing.Publisher, GLib.Object {
     }
 }
 
-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;
-        
-        pane_widget.show_all();
-        
-        on_pin_entry_contents_changed();
-    }
-    
-    private void on_continue_clicked() {
-        proceed(this, pin_entry.get_text());
-    }
-    
-    private void on_pin_entry_contents_changed() {
-        continue_button.set_sensitive(pin_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() {
-        continue_button.clicked.connect(on_continue_clicked);
-        pin_entry.changed.connect(on_pin_entry_contents_changed);
-    }
-
-    public void on_pane_uninstalled() {
-        continue_button.clicked.disconnect(on_continue_clicked);
-        pin_entry.changed.disconnect(on_pin_entry_contents_changed);
-    }
-}
-
 internal class Transaction : Publishing.RESTSupport.Transaction {
     public Transaction(Session session, Publishing.RESTSupport.HttpMethod method =
         Publishing.RESTSupport.HttpMethod.POST) {
@@ -748,7 +455,7 @@ internal class Transaction : Publishing.RESTSupport.Transaction {
         add_argument("oauth_version", "1.0");
         add_argument("oauth_callback", "oob");
         add_argument("oauth_timestamp", session.get_oauth_timestamp());
-        add_argument("oauth_consumer_key", API_KEY);
+        add_argument("oauth_consumer_key", session.get_consumer_key());
     }
     
     public Transaction.with_uri(Session session, string uri,
@@ -760,7 +467,7 @@ internal class Transaction : Publishing.RESTSupport.Transaction {
         add_argument("oauth_version", "1.0");
         add_argument("oauth_callback", "oob");
         add_argument("oauth_timestamp", session.get_oauth_timestamp());
-        add_argument("oauth_consumer_key", API_KEY);
+        add_argument("oauth_consumer_key", session.get_consumer_key());
     }
 
     public override void execute() throws Spit.Publishing.PublishingError {
@@ -818,22 +525,6 @@ internal class Transaction : Publishing.RESTSupport.Transaction {
     }
 }
 
-internal class AuthenticationRequestTransaction : Transaction {
-    public AuthenticationRequestTransaction(Session session) {
-        base.with_uri(session, "https://www.flickr.com/services/oauth/request_token",
-            Publishing.RESTSupport.HttpMethod.GET);
-    }
-}
-
-internal class AccessTokenFetchTransaction : Transaction {
-    public AccessTokenFetchTransaction(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());
-    }
-}
-
 internal class AccountInfoFetchTransaction : Transaction {
     public AccountInfoFetchTransaction(Session session) {
         base(session, Publishing.RESTSupport.HttpMethod.GET);
@@ -860,7 +551,7 @@ private class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
         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", API_KEY);
+        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)));
@@ -920,11 +611,11 @@ private class UploadTransaction : Publishing.RESTSupport.UploadTransaction {
 }
 
 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(ENDPOINT_URL);
@@ -935,19 +626,9 @@ internal class Session : Publishing.RESTSupport.Session {
             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;
-        
-        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) {
@@ -984,16 +665,12 @@ internal class Session : Publishing.RESTSupport.Session {
         if (access_phase_token_secret != null) {
             debug("access phase token secret available; using it as signing key");
 
-            signing_key = API_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 = API_SECRET + "&" + request_phase_token_secret;
+            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 = API_SECRET + "&";
+            signing_key = consumer_secret + "&";
         }
         
         string signature_base_string = http_method + "&" + Soup.URI.encode(
@@ -1016,11 +693,6 @@ internal class Session : Publishing.RESTSupport.Session {
             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;
@@ -1040,22 +712,17 @@ internal class Session : Publishing.RESTSupport.Session {
     public string get_oauth_timestamp() {
         return GLib.get_real_time().to_string().substring(0, 10);
     }
-    
-    public string get_request_phase_token() {
-        assert(request_phase_token != null);
-        return request_phase_token;
+
+    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_access_phase_token_secret() {
-        assert(access_phase_token_secret != null);
-        return access_phase_token_secret;
-    }
-    
     public string get_username() {
         assert(is_authenticated());
         return username;
@@ -1119,6 +786,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         size_label = (Gtk.Label) this.builder.get_object("size_label");
         strip_metadata_check = (Gtk.CheckButton) this.builder.get_object("strip_metadata_check");
 
+        if (!publisher.get_authenticator().can_logout()) {
+            logout_button.parent.remove(logout_button);
+        }
+
         this.parameters = parameters;
         this.publisher = publisher;
         this.media_type = media_type;
diff --git a/plugins/shotwell-publishing/PicasaPublishing.c b/plugins/shotwell-publishing/PicasaPublishing.c
index 8547ca8..a040029 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.c
+++ b/plugins/shotwell-publishing/PicasaPublishing.c
@@ -20,6 +20,7 @@
 #include <float.h>
 #include <math.h>
 #include <gtk/gtk.h>
+#include "shotwell-authenticator.h"
 #include <libsoup/soup.h>
 #include <gobject/gvaluecollector.h>
 
@@ -79,20 +80,9 @@ typedef struct _PublishingPicasaAlbumClass PublishingPicasaAlbumClass;
 
 typedef struct _PublishingPicasaAlbumDirectoryTransaction PublishingPicasaAlbumDirectoryTransaction;
 typedef struct _PublishingPicasaAlbumDirectoryTransactionClass PublishingPicasaAlbumDirectoryTransactionClass;
-
-#define PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION (publishing_picasa_album_creation_transaction_get_type ())
-#define PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, PublishingPicasaAlbumCreationTransaction))
-#define PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, PublishingPicasaAlbumCreationTransactionClass))
-#define PUBLISHING_PICASA_IS_ALBUM_CREATION_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION))
-#define PUBLISHING_PICASA_IS_ALBUM_CREATION_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION))
-#define PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, PublishingPicasaAlbumCreationTransactionClass))
-
-typedef struct _PublishingPicasaAlbumCreationTransaction PublishingPicasaAlbumCreationTransaction;
-typedef struct _PublishingPicasaAlbumCreationTransactionClass PublishingPicasaAlbumCreationTransactionClass;
-#define _publishing_rest_support_xml_document_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_xml_document_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)))
-typedef struct _PublishingPicasaAlbumPrivate PublishingPicasaAlbumPrivate;
+#define _publishing_rest_support_xml_document_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_xml_document_unref (var), NULL)))
 
 #define PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE (publishing_picasa_publishing_options_pane_get_type ())
 #define PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane))
@@ -114,9 +104,9 @@ typedef struct _PublishingPicasaPublishingOptionsPaneClass PublishingPicasaPubli
 typedef struct _PublishingPicasaUploader PublishingPicasaUploader;
 typedef struct _PublishingPicasaUploaderClass PublishingPicasaUploaderClass;
 #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
+typedef struct _PublishingPicasaAlbumPrivate PublishingPicasaAlbumPrivate;
 typedef struct _PublishingPicasaParamSpecAlbum PublishingPicasaParamSpecAlbum;
 typedef struct _PublishingPicasaAlbumDirectoryTransactionPrivate PublishingPicasaAlbumDirectoryTransactionPrivate;
-typedef struct _PublishingPicasaAlbumCreationTransactionPrivate PublishingPicasaAlbumCreationTransactionPrivate;
 
 #define PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION (publishing_picasa_upload_transaction_get_type ())
 #define PUBLISHING_PICASA_UPLOAD_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction))
@@ -179,7 +169,7 @@ struct _PublishingPicasaPicasaPublisherPrivate {
 	gpointer progress_reporter_target;
 	GDestroyNotify progress_reporter_target_destroy_notify;
 	PublishingPicasaPublishingParameters* publishing_parameters;
-	gchar* refresh_token;
+	SpitPublishingAuthenticator* authenticator;
 };
 
 struct _PublishingPicasaAlbum {
@@ -208,15 +198,6 @@ struct _PublishingPicasaAlbumDirectoryTransactionClass {
 	PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass parent_class;
 };
 
-struct _PublishingPicasaAlbumCreationTransaction {
-	PublishingRESTSupportGooglePublisherAuthenticatedTransaction parent_instance;
-	PublishingPicasaAlbumCreationTransactionPrivate * priv;
-};
-
-struct _PublishingPicasaAlbumCreationTransactionClass {
-	PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass parent_class;
-};
-
 struct _PublishingPicasaUploadTransaction {
 	PublishingRESTSupportGooglePublisherAuthenticatedTransaction parent_instance;
 	PublishingPicasaUploadTransactionPrivate * priv;
@@ -248,10 +229,7 @@ struct _PublishingPicasaPublishingOptionsPanePrivate {
 	GtkBox* pane_widget;
 	GtkLabel* login_identity_label;
 	GtkLabel* publish_to_label;
-	GtkRadioButton* use_existing_radio;
 	GtkComboBoxText* existing_albums_combo;
-	GtkRadioButton* create_new_radio;
-	GtkEntry* new_album_entry;
 	GtkCheckButton* public_check;
 	GtkComboBoxText* size_combo;
 	GtkCheckButton* strip_metadata_check;
@@ -303,7 +281,6 @@ struct _PublishingPicasaPublishingParametersPrivate {
 	gint albums_length1;
 	gint _albums_size_;
 	SpitPublishingPublisherMediaType media_type;
-	gboolean to_new_album;
 };
 
 struct _PublishingPicasaParamSpecPublishingParameters {
@@ -335,7 +312,6 @@ static SpitPublishingServiceIface* picasa_service_spit_publishing_service_parent
 static gpointer publishing_picasa_picasa_publisher_parent_class = NULL;
 static gpointer publishing_picasa_album_parent_class = NULL;
 static gpointer publishing_picasa_album_directory_transaction_parent_class = NULL;
-static gpointer publishing_picasa_album_creation_transaction_parent_class = NULL;
 static gpointer publishing_picasa_upload_transaction_parent_class = NULL;
 static gpointer publishing_picasa_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_picasa_publishing_options_pane_size_description_parent_class = NULL;
@@ -362,11 +338,6 @@ GType publishing_picasa_picasa_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media (SpitPublishingService* base);
 static void picasa_service_real_activation (SpitPluggable* base, gboolean enabled);
 static void picasa_service_finalize (GObject* obj);
-#define PUBLISHING_PICASA_SERVICE_WELCOME_MESSAGE _ ("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.")
 #define PUBLISHING_PICASA_DEFAULT_ALBUM_NAME _ ("Shotwell Connect")
 gpointer publishing_picasa_publishing_parameters_ref (gpointer instance);
 void publishing_picasa_publishing_parameters_unref (gpointer instance);
@@ -379,6 +350,8 @@ GType publishing_picasa_publishing_parameters_get_type (void) G_GNUC_CONST;
 enum  {
 	PUBLISHING_PICASA_PICASA_PUBLISHER_DUMMY_PROPERTY
 };
+#define PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL "https://picasaweb.google.com/data/feed/api/user/default/albumid/defaul" \
+"t"
 PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void);
 PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_construct (GType object_type);
 static void publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (PublishingPicasaPicasaPublisher* self, PublishingPicasaPublishingParameters* parameters);
@@ -394,6 +367,7 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 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);
 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);
@@ -401,7 +375,6 @@ static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_
 gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self);
 gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingPicasaPublishingParameters* self);
 gchar* publishing_picasa_publishing_parameters_get_target_album_name (PublishingPicasaPublishingParameters* self);
-static void publishing_picasa_picasa_publisher_on_service_welcome_login (PublishingPicasaPicasaPublisher* self);
 static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base);
 void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self, const gchar* user_name);
 static void publishing_picasa_picasa_publisher_do_fetch_account_information (PublishingPicasaPicasaPublisher* self);
@@ -413,36 +386,24 @@ GType publishing_picasa_album_directory_transaction_get_type (void) G_GNUC_CONST
 static void publishing_picasa_picasa_publisher_do_parse_and_display_account_information (PublishingPicasaPicasaPublisher* self, PublishingPicasaAlbumDirectoryTransaction* transaction);
 static void publishing_picasa_picasa_publisher_on_publishing_options_logout (PublishingPicasaPicasaPublisher* self);
 static void publishing_picasa_picasa_publisher_on_publishing_options_publish (PublishingPicasaPicasaPublisher* self);
-gboolean publishing_picasa_publishing_parameters_is_to_new_album (PublishingPicasaPublishingParameters* self);
-static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasaPicasaPublisher* self);
 static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasaPublisher* self);
-static void publishing_picasa_picasa_publisher_on_album_creation_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_picasa_picasa_publisher_on_album_creation_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-GType publishing_picasa_album_creation_transaction_get_type (void) G_GNUC_CONST;
-gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url);
 static void publishing_picasa_picasa_publisher_on_upload_status_updated (PublishingPicasaPicasaPublisher* self, gint file_number, gdouble completed_fraction);
 static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, gint num_published);
 static void _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self);
 static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
 static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
 static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingPicasaPicasaPublisher* self);
-static void publishing_picasa_picasa_publisher_do_show_service_welcome_pane (PublishingPicasaPicasaPublisher* self);
-static void _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self);
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session);
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session);
+gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
+static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
 void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublishingParameters* self, PublishingPicasaAlbum** albums, int albums_length1);
 static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (PublishingPicasaPicasaPublisher* self);
 GType publishing_picasa_publishing_options_pane_get_type (void) G_GNUC_CONST;
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters);
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters);
+PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout);
+PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout);
 static void _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender, gpointer self);
 static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender, gpointer self);
-PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters);
-PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters);
 gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (PublishingPicasaPublishingParameters* self);
 GType publishing_picasa_uploader_get_type (void) G_GNUC_CONST;
 PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters);
@@ -452,6 +413,7 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup
 static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base);
 static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base);
 static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportGooglePublisher* base);
+static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base);
 static void publishing_picasa_picasa_publisher_finalize (GObject* obj);
 enum  {
 	PUBLISHING_PICASA_ALBUM_DUMMY_PROPERTY
@@ -461,16 +423,6 @@ enum  {
 	PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_DUMMY_PROPERTY
 };
 #define PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL "https://picasaweb.google.com/data/feed/api/user/" "default"
-enum  {
-	PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_DUMMY_PROPERTY
-};
-#define PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_ENDPOINT_URL "https://picasaweb.google.com/data/feed/api/user/" "default"
-#define PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_ALBUM_ENTRY_TEMPLATE "<?xml version='1.0' encoding='utf-8'?><entry xmlns='http://www.w3.org/" \
-"2005/Atom' xmlns:gphoto='http://schemas.google.com/photos/2007'><title" \
-" type='text'>%s</title><gphoto:access>%s</gphoto:access><category sche" \
-"me='http://schemas.google.com/g/2005#kind' term='http://schemas.google" \
-".com/photos/2007#album'></category></entry>"
-gboolean publishing_picasa_publishing_parameters_is_new_album_public (PublishingPicasaPublishingParameters* self);
 GType publishing_picasa_upload_transaction_get_type (void) G_GNUC_CONST;
 #define PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransactionPrivate))
 enum  {
@@ -504,29 +456,21 @@ enum  {
 static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_publishing_options_pane_create_size_descriptions (PublishingPicasaPublishingOptionsPane* self, int* result_length1);
 gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPublishingParameters* self);
 SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_media_type (PublishingPicasaPublishingParameters* self);
-static void publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked (PublishingPicasaPublishingOptionsPane* self);
-static void _publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void publishing_picasa_publishing_options_pane_on_create_new_radio_clicked (PublishingPicasaPublishingOptionsPane* self);
-static void _publishing_picasa_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void publishing_picasa_publishing_options_pane_on_new_album_entry_changed (PublishingPicasaPublishingOptionsPane* self);
-static void _publishing_picasa_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self);
 static void publishing_picasa_publishing_options_pane_on_logout_clicked (PublishingPicasaPublishingOptionsPane* self);
 static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void publishing_picasa_publishing_options_pane_on_publish_clicked (PublishingPicasaPublishingOptionsPane* self);
 static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
 void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self, gint pixels);
 PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (PublishingPicasaPublishingParameters* self, int* result_length1);
-void publishing_picasa_publishing_parameters_set_is_to_new_album (PublishingPicasaPublishingParameters* self, gboolean to_new_album);
-void publishing_picasa_publishing_parameters_set_is_new_album_public (PublishingPicasaPublishingParameters* self, gboolean album_public);
-static void publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (PublishingPicasaPublishingOptionsPane* self);
+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_add13 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value);
 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);
-#define PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE -1
 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);
 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);
@@ -570,7 +514,7 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
 	_tmp0__length1 = picasa_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 562 "PicasaPublishing.c"
+#line 513 "PicasaPublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
@@ -583,18 +527,18 @@ PicasaService* picasa_service_construct (GType object_type, GFile* resource_dire
 		picasa_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_picasa_service_icon_pixbuf_set_size_ = picasa_service_icon_pixbuf_set_length1;
-#line 575 "PicasaPublishing.c"
+#line 526 "PicasaPublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 579 "PicasaPublishing.c"
+#line 530 "PicasaPublishing.c"
 }
 
 
 PicasaService* picasa_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return picasa_service_construct (TYPE_PICASA_SERVICE, resource_directory);
-#line 586 "PicasaPublishing.c"
+#line 537 "PicasaPublishing.c"
 }
 
 
@@ -616,7 +560,7 @@ static gint picasa_service_real_get_pluggable_interface (SpitPluggable* base, gi
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 608 "PicasaPublishing.c"
+#line 559 "PicasaPublishing.c"
 }
 
 
@@ -629,7 +573,7 @@ static const gchar* picasa_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.picasa";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 621 "PicasaPublishing.c"
+#line 572 "PicasaPublishing.c"
 }
 
 
@@ -642,14 +586,14 @@ static const gchar* picasa_service_real_get_pluggable_name (SpitPluggable* base)
 	result = "Picasa Web Albums";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 634 "PicasaPublishing.c"
+#line 585 "PicasaPublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 641 "PicasaPublishing.c"
+#line 592 "PicasaPublishing.c"
 }
 
 
@@ -660,17 +604,17 @@ static GdkPixbuf** _vala_array_dup4 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 652 "PicasaPublishing.c"
+#line 603 "PicasaPublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 658 "PicasaPublishing.c"
+#line 609 "PicasaPublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 662 "PicasaPublishing.c"
+#line 613 "PicasaPublishing.c"
 }
 
 
@@ -752,7 +696,7 @@ static void picasa_service_real_get_info (SpitPluggable* base, SpitPluggableInfo
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 744 "PicasaPublishing.c"
+#line 695 "PicasaPublishing.c"
 }
 
 
@@ -773,7 +717,7 @@ static SpitPublishingPublisher* picasa_service_real_create_publisher (SpitPublis
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 765 "PicasaPublishing.c"
+#line 716 "PicasaPublishing.c"
 }
 
 
@@ -786,7 +730,7 @@ static SpitPublishingPublisherMediaType picasa_service_real_get_supported_media
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO | SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 778 "PicasaPublishing.c"
+#line 729 "PicasaPublishing.c"
 }
 
 
@@ -794,7 +738,7 @@ static void picasa_service_real_activation (SpitPluggable* base, gboolean enable
 	PicasaService * self;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PICASA_SERVICE, PicasaService);
-#line 786 "PicasaPublishing.c"
+#line 737 "PicasaPublishing.c"
 }
 
 
@@ -803,7 +747,7 @@ static void picasa_service_class_init (PicasaServiceClass * klass) {
 	picasa_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = picasa_service_finalize;
-#line 795 "PicasaPublishing.c"
+#line 746 "PicasaPublishing.c"
 }
 
 
@@ -820,7 +764,7 @@ static void picasa_service_spit_pluggable_interface_init (SpitPluggableIface * i
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) picasa_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) picasa_service_real_activation;
-#line 812 "PicasaPublishing.c"
+#line 763 "PicasaPublishing.c"
 }
 
 
@@ -831,7 +775,7 @@ static void picasa_service_spit_publishing_service_interface_init (SpitPublishin
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) picasa_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) picasa_service_real_get_supported_media;
-#line 823 "PicasaPublishing.c"
+#line 774 "PicasaPublishing.c"
 }
 
 
@@ -845,7 +789,7 @@ static void picasa_service_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PICASA_SERVICE, PicasaService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (picasa_service_parent_class)->finalize (obj);
-#line 837 "PicasaPublishing.c"
+#line 788 "PicasaPublishing.c"
 }
 
 
@@ -877,130 +821,137 @@ PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_construct (G
 	SpitPublishingPublishable** _tmp6_ = NULL;
 	PublishingPicasaPublishingParameters* _tmp11_ = NULL;
 	SpitPublishingPublisherMediaType _tmp12_ = 0;
-	SpitPublishingPluginHost* _tmp13_ = NULL;
-	gchar* _tmp14_ = NULL;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = service;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = host;
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 69 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaPicasaPublisher*) publishing_rest_support_google_publisher_construct (object_type, _tmp0_, _tmp1_, "https://picasaweb.google.com/data/");
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = publishing_picasa_publishing_parameters_new ();
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->publishing_parameters);
-#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->publishing_parameters = _tmp2_;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = self->priv->publishing_parameters;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_load_parameters_from_configuration_system (self, _tmp3_);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_NONE;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = host;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = spit_publishing_plugin_host_get_publishables (_tmp4_, &_tmp5_);
-#line 897 "PicasaPublishing.c"
+#line 846 "PicasaPublishing.c"
 	{
 		SpitPublishingPublishable** p_collection = NULL;
 		gint p_collection_length1 = 0;
 		gint _p_collection_size_ = 0;
 		gint p_it = 0;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		p_collection = _tmp6_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		p_collection_length1 = _tmp5_;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		for (p_it = 0; p_it < _tmp5_; p_it = p_it + 1) {
-#line 909 "PicasaPublishing.c"
+#line 858 "PicasaPublishing.c"
 			SpitPublishingPublishable* _tmp7_ = NULL;
 			SpitPublishingPublishable* p = NULL;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp7_ = _g_object_ref0 (p_collection[p_it]);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			p = _tmp7_;
-#line 916 "PicasaPublishing.c"
+#line 865 "PicasaPublishing.c"
 			{
 				SpitPublishingPublisherMediaType _tmp8_ = 0;
 				SpitPublishingPublishable* _tmp9_ = NULL;
 				SpitPublishingPublisherMediaType _tmp10_ = 0;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp8_ = media_type;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp9_ = p;
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp10_ = spit_publishing_publishable_get_media_type (_tmp9_);
-#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				media_type = _tmp8_ | _tmp10_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				media_type = _tmp8_ | _tmp10_;
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_g_object_unref0 (p);
-#line 931 "PicasaPublishing.c"
+#line 880 "PicasaPublishing.c"
 			}
 		}
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		p_collection = (_vala_array_free (p_collection, p_collection_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 936 "PicasaPublishing.c"
+#line 885 "PicasaPublishing.c"
 	}
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = self->priv->publishing_parameters;
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = media_type;
-#line 78 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_set_media_type (_tmp11_, _tmp12_);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13_ = host;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp14_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", NULL);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (self->priv->refresh_token);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->refresh_token = _tmp14_;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 81 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 968 "PicasaPublishing.c"
+#line 909 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaPicasaPublisher* publishing_picasa_picasa_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_picasa_publisher_construct (PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, service, host);
-#line 975 "PicasaPublishing.c"
+#line 916 "PicasaPublishing.c"
 }
 
 
 static void _vala_array_add12 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value) {
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#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"
+		*size = (*size) ? (2 * (*size)) : 4;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		*array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1);
+#line 927 "PicasaPublishing.c"
+	}
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	(*array)[(*length)++] = value;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	(*array)[*length] = NULL;
+#line 933 "PicasaPublishing.c"
+}
+
+
+static void _vala_array_add13 (PublishingPicasaAlbum*** array, int* length, int* size, PublishingPicasaAlbum* value) {
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaAlbum*, *array, (*size) + 1);
-#line 986 "PicasaPublishing.c"
+#line 944 "PicasaPublishing.c"
 	}
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 992 "PicasaPublishing.c"
+#line 950 "PicasaPublishing.c"
 }
 
 
@@ -1013,270 +964,298 @@ static PublishingPicasaAlbum** publishing_picasa_picasa_publisher_extract_albums
 	xmlNode* doc_node_iter = NULL;
 	xmlNode* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-	PublishingPicasaAlbum** _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
+	PublishingPicasaAlbum** _tmp9_ = NULL;
+	gint _tmp9__length1 = 0;
+	const gchar* _tmp10_ = NULL;
+	PublishingPicasaAlbum* _tmp11_ = NULL;
+	PublishingPicasaAlbum** _tmp40_ = NULL;
+	gint _tmp40__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 82 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self), NULL);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = g_new0 (PublishingPicasaAlbum*, 0 + 1);
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_result_ = _tmp0_;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_result__length1 = 0;
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__result__size_ = _result__length1;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 86 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	doc_node_iter = NULL;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = document_root;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = _tmp1_->name;
-#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_strcmp0 (_tmp2_, "feed") == 0) {
-#line 1026 "PicasaPublishing.c"
+#line 988 "PicasaPublishing.c"
 		xmlNode* _tmp3_ = NULL;
 		xmlNode* _tmp4_ = NULL;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = document_root;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp4_ = _tmp3_->children;
-#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		doc_node_iter = _tmp4_;
-#line 1035 "PicasaPublishing.c"
+#line 997 "PicasaPublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp5_ = document_root;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = _tmp5_->name;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 89 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (g_strcmp0 (_tmp6_, "entry") == 0) {
-#line 1045 "PicasaPublishing.c"
+#line 1007 "PicasaPublishing.c"
 			xmlNode* _tmp7_ = NULL;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp7_ = document_root;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 90 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			doc_node_iter = _tmp7_;
-#line 1051 "PicasaPublishing.c"
+#line 1013 "PicasaPublishing.c"
 		} else {
 			GError* _tmp8_ = NULL;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "response root node " "isn't a <feed> or <entry>");
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_inner_error_ = _tmp8_;
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				g_propagate_error (error, _inner_error_);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				return NULL;
-#line 1066 "PicasaPublishing.c"
+#line 1028 "PicasaPublishing.c"
 			} else {
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_result_ = (_vala_array_free (_result_, _result__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				g_clear_error (&_inner_error_);
-#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				return NULL;
-#line 1076 "PicasaPublishing.c"
+#line 1038 "PicasaPublishing.c"
 			}
 		}
 	}
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp9_ = _result_;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp9__length1 = _result__length1;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp10_ = _ ("Default album");
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp11_ = publishing_picasa_album_new (_tmp10_, 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_, _tmp11_);
+#line 1052 "PicasaPublishing.c"
 	{
-		gboolean _tmp9_ = FALSE;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp9_ = TRUE;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gboolean _tmp12_ = FALSE;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp12_ = TRUE;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		while (TRUE) {
-#line 1086 "PicasaPublishing.c"
-			xmlNode* _tmp12_ = NULL;
-			xmlNode* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
+#line 1059 "PicasaPublishing.c"
+			xmlNode* _tmp15_ = NULL;
+			xmlNode* _tmp16_ = NULL;
+			const gchar* _tmp17_ = NULL;
 			gchar* name_val = NULL;
 			gchar* url_val = NULL;
 			xmlNode* album_node_iter = NULL;
-			xmlNode* _tmp15_ = NULL;
-			xmlNode* _tmp16_ = NULL;
-			PublishingPicasaAlbum** _tmp32_ = NULL;
-			gint _tmp32__length1 = 0;
-			const gchar* _tmp33_ = NULL;
-			const gchar* _tmp34_ = NULL;
-			PublishingPicasaAlbum* _tmp35_ = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (!_tmp9_) {
-#line 1102 "PicasaPublishing.c"
-				xmlNode* _tmp10_ = NULL;
-				xmlNode* _tmp11_ = NULL;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp10_ = doc_node_iter;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp11_ = _tmp10_->next;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				doc_node_iter = _tmp11_;
-#line 1111 "PicasaPublishing.c"
-			}
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp9_ = FALSE;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp12_ = doc_node_iter;
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (!(_tmp12_ != NULL)) {
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				break;
-#line 1121 "PicasaPublishing.c"
+			xmlNode* _tmp18_ = NULL;
+			xmlNode* _tmp19_ = NULL;
+			const gchar* _tmp35_ = NULL;
+			PublishingPicasaAlbum** _tmp36_ = NULL;
+			gint _tmp36__length1 = 0;
+			const gchar* _tmp37_ = NULL;
+			const gchar* _tmp38_ = NULL;
+			PublishingPicasaAlbum* _tmp39_ = NULL;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			if (!_tmp12_) {
+#line 1076 "PicasaPublishing.c"
+				xmlNode* _tmp13_ = NULL;
+				xmlNode* _tmp14_ = NULL;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_tmp13_ = doc_node_iter;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_tmp14_ = _tmp13_->next;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				doc_node_iter = _tmp14_;
+#line 1085 "PicasaPublishing.c"
 			}
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp13_ = doc_node_iter;
+			_tmp12_ = FALSE;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp15_ = doc_node_iter;
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp14_ = _tmp13_->name;
+			if (!(_tmp15_ != NULL)) {
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (g_strcmp0 (_tmp14_, "entry") != 0) {
+				break;
+#line 1095 "PicasaPublishing.c"
+			}
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp16_ = doc_node_iter;
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp17_ = _tmp16_->name;
+#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			if (g_strcmp0 (_tmp17_, "entry") != 0) {
+#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				continue;
-#line 1131 "PicasaPublishing.c"
+#line 1105 "PicasaPublishing.c"
 			}
-#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			name_val = NULL;
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			url_val = NULL;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp15_ = doc_node_iter;
-#line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp16_ = _tmp15_->children;
+			name_val = NULL;
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			album_node_iter = _tmp16_;
-#line 1143 "PicasaPublishing.c"
-			{
-				gboolean _tmp17_ = FALSE;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp17_ = TRUE;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				while (TRUE) {
-#line 1150 "PicasaPublishing.c"
-					xmlNode* _tmp20_ = NULL;
-					xmlNode* _tmp21_ = NULL;
-					const gchar* _tmp22_ = NULL;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (!_tmp17_) {
-#line 1156 "PicasaPublishing.c"
-						xmlNode* _tmp18_ = NULL;
-						xmlNode* _tmp19_ = NULL;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp18_ = album_node_iter;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp19_ = _tmp18_->next;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						album_node_iter = _tmp19_;
-#line 1165 "PicasaPublishing.c"
-					}
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp17_ = FALSE;
+			url_val = NULL;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp20_ = album_node_iter;
+			_tmp18_ = doc_node_iter;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (!(_tmp20_ != NULL)) {
+			_tmp19_ = _tmp18_->children;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						break;
-#line 1175 "PicasaPublishing.c"
+			album_node_iter = _tmp19_;
+#line 1117 "PicasaPublishing.c"
+			{
+				gboolean _tmp20_ = FALSE;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_tmp20_ = TRUE;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				while (TRUE) {
+#line 1124 "PicasaPublishing.c"
+					xmlNode* _tmp23_ = NULL;
+					xmlNode* _tmp24_ = NULL;
+					const gchar* _tmp25_ = NULL;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					if (!_tmp20_) {
+#line 1130 "PicasaPublishing.c"
+						xmlNode* _tmp21_ = NULL;
+						xmlNode* _tmp22_ = NULL;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp21_ = album_node_iter;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp22_ = _tmp21_->next;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						album_node_iter = _tmp22_;
+#line 1139 "PicasaPublishing.c"
 					}
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp21_ = album_node_iter;
+					_tmp20_ = FALSE;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp22_ = _tmp21_->name;
+					_tmp23_ = album_node_iter;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (g_strcmp0 (_tmp22_, "title") == 0) {
-#line 1183 "PicasaPublishing.c"
-						xmlNode* _tmp23_ = NULL;
-						gchar* _tmp24_ = NULL;
-#line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp23_ = album_node_iter;
+					if (!(_tmp23_ != NULL)) {
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						break;
+#line 1149 "PicasaPublishing.c"
+					}
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp24_ = (gchar*) xmlNodeGetContent (_tmp23_);
+					_tmp24_ = album_node_iter;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_g_free0 (name_val);
+					_tmp25_ = _tmp24_->name;
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						name_val = _tmp24_;
-#line 1194 "PicasaPublishing.c"
-					} else {
-						xmlNode* _tmp25_ = NULL;
-						const gchar* _tmp26_ = NULL;
+					if (g_strcmp0 (_tmp25_, "title") == 0) {
+#line 1157 "PicasaPublishing.c"
+						xmlNode* _tmp26_ = NULL;
+						gchar* _tmp27_ = NULL;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp25_ = album_node_iter;
+						_tmp26_ = album_node_iter;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp26_ = _tmp25_->name;
+						_tmp27_ = (gchar*) xmlNodeGetContent (_tmp26_);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						if (g_strcmp0 (_tmp26_, "id") == 0) {
-#line 1204 "PicasaPublishing.c"
-							xmlNode* _tmp27_ = NULL;
-							xmlNs* _tmp28_ = NULL;
-							const gchar* _tmp29_ = NULL;
+						_g_free0 (name_val);
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						name_val = _tmp27_;
+#line 1168 "PicasaPublishing.c"
+					} else {
+						xmlNode* _tmp28_ = NULL;
+						const gchar* _tmp29_ = NULL;
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp28_ = album_node_iter;
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp29_ = _tmp28_->name;
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						if (g_strcmp0 (_tmp29_, "id") == 0) {
+#line 1178 "PicasaPublishing.c"
 							xmlNode* _tmp30_ = NULL;
-							gchar* _tmp31_ = NULL;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp27_ = album_node_iter;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp28_ = _tmp27_->ns;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp29_ = _tmp28_->prefix;
-#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							if (_tmp29_ != NULL) {
+							xmlNs* _tmp31_ = NULL;
+							const gchar* _tmp32_ = NULL;
+							xmlNode* _tmp33_ = NULL;
+							gchar* _tmp34_ = NULL;
 #line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-								continue;
-#line 1220 "PicasaPublishing.c"
-							}
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 							_tmp30_ = album_node_iter;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							_tmp31_ = _tmp30_->ns;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							_tmp32_ = _tmp31_->prefix;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							if (_tmp32_ != NULL) {
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							_tmp31_ = (gchar*) xmlNodeGetContent (_tmp30_);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+								continue;
+#line 1194 "PicasaPublishing.c"
+							}
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							_tmp33_ = album_node_iter;
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							_tmp34_ = (gchar*) xmlNodeGetContent (_tmp33_);
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 							_g_free0 (url_val);
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-							url_val = _tmp31_;
-#line 1230 "PicasaPublishing.c"
+#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+							url_val = _tmp34_;
+#line 1204 "PicasaPublishing.c"
 						}
 					}
 				}
 			}
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp32_ = _result_;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp32__length1 = _result__length1;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp33_ = name_val;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp34_ = url_val;
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp35_ = publishing_picasa_album_new (_tmp33_, _tmp34_);
-#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_vala_array_add12 (&_result_, &_result__length1, &__result__size_, _tmp35_);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp35_ = url_val;
+#line 119 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			if (g_strcmp0 (_tmp35_, PUBLISHING_PICASA_PICASA_PUBLISHER_DEFAULT_ALBUM_FEED_URL) == 0) {
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_g_free0 (url_val);
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_g_free0 (name_val);
+#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				continue;
+#line 1219 "PicasaPublishing.c"
+			}
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp36_ = _result_;
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp36__length1 = _result__length1;
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp37_ = name_val;
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp38_ = url_val;
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp39_ = publishing_picasa_album_new (_tmp37_, _tmp38_);
+#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp39_);
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (url_val);
-#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (name_val);
-#line 1251 "PicasaPublishing.c"
+#line 1237 "PicasaPublishing.c"
 		}
 	}
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp36_ = _result_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp36__length1 = _result__length1;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp40_ = _result_;
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp40__length1 = _result__length1;
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (result_length1) {
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		*result_length1 = _tmp36__length1;
-#line 1262 "PicasaPublishing.c"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		*result_length1 = _tmp40__length1;
+#line 1248 "PicasaPublishing.c"
 	}
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	result = _tmp36_;
-#line 120 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	result = _tmp40_;
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 1268 "PicasaPublishing.c"
+#line 1254 "PicasaPublishing.c"
 }
 
 
@@ -1291,39 +1270,39 @@ static void publishing_picasa_picasa_publisher_load_parameters_from_configuratio
 	SpitPublishingPluginHost* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters));
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = parameters;
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = spit_host_interface_get_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default-size", 0);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (_tmp0_, _tmp2_);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = parameters;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = spit_host_interface_get_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip-metadata", FALSE);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_set_strip_metadata (_tmp3_, _tmp5_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = parameters;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", NULL);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_set_target_album_name (_tmp6_, _tmp9_);
-#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp9_);
-#line 1315 "PicasaPublishing.c"
+#line 1301 "PicasaPublishing.c"
 }
 
 
@@ -1338,131 +1317,86 @@ static void publishing_picasa_picasa_publisher_save_parameters_to_configuration_
 	PublishingPicasaPublishingParameters* _tmp7_ = NULL;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters));
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = parameters;
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp1_);
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_host_interface_set_config_int (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "default-size", _tmp2_);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = parameters;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp4_);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_host_interface_set_config_bool (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "strip_metadata", _tmp5_);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = parameters;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = publishing_picasa_publishing_parameters_get_target_album_name (_tmp7_);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", _tmp9_);
-#line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 1362 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_picasa_publisher_on_service_welcome_login (PublishingPicasaPicasaPublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-#line 135 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 136 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:136: EVENT: user clicked 'Login' in welcome pane" \
-".");
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "last-album", _tmp9_);
 #line 138 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp0_) {
-#line 139 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1379 "PicasaPublishing.c"
-	}
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = self->priv->refresh_token;
-#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp1_);
-#line 1385 "PicasaPublishing.c"
+	_g_free0 (_tmp9_);
+#line 1348 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) {
 	PublishingPicasaPicasaPublisher * self;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp5_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp6_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-#line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
+#line 142 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:142: EVENT: OAuth login flow complete.");
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp0_ = self->priv->publishing_parameters;
 #line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:145: EVENT: OAuth login flow complete.");
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = publishing_rest_support_google_session_get_refresh_token (_tmp2_);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp3_ = publishing_rest_support_google_session_get_user_name (_tmp2_);
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", _tmp4_);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_user_name (_tmp0_, _tmp4_);
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 145 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp2_);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = self->priv->publishing_parameters;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = publishing_rest_support_google_session_get_user_name (_tmp7_);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_user_name (_tmp5_, _tmp9_);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp9_);
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp7_);
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 147 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_fetch_account_information (self);
-#line 1439 "PicasaPublishing.c"
+#line 1381 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_initial_album_fetch_complete ((PublishingPicasaPicasaPublisher*) self, _sender);
-#line 1446 "PicasaPublishing.c"
+#line 1388 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_initial_album_fetch_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 1453 "PicasaPublishing.c"
+#line 1395 "PicasaPublishing.c"
 }
 
 
@@ -1473,38 +1407,38 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_complete (
 	guint _tmp3_ = 0U;
 	gboolean _tmp4_ = FALSE;
 	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 150 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = txn;
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = txn;
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 158 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp4_) {
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1486 "PicasaPublishing.c"
+#line 1428 "PicasaPublishing.c"
 	}
-#line 161 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:161: EVENT: finished fetching account and album " \
+#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:157: EVENT: finished fetching account and album " \
 "information.");
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = txn;
-#line 163 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, PublishingPicasaAlbumDirectoryTransaction));
-#line 1494 "PicasaPublishing.c"
+#line 1436 "PicasaPublishing.c"
 }
 
 
@@ -1520,535 +1454,124 @@ static void publishing_picasa_picasa_publisher_on_initial_album_fetch_error (Pub
 	gboolean _tmp8_ = FALSE;
 	PublishingRESTSupportTransaction* _tmp9_ = NULL;
 	guint _tmp10_ = 0U;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = bad_txn;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = bad_txn;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 165 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 171 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp4_) {
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1532 "PicasaPublishing.c"
+#line 1474 "PicasaPublishing.c"
 	}
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = bad_txn;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:174: EVENT: fetching account and album informati" \
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:170: EVENT: fetching account and album informati" \
 "on failed; response = '%s'.", _tmp7_);
-#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp7_);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = bad_txn;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = publishing_rest_support_transaction_get_status_code (_tmp9_);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp10_ == ((guint) 403)) {
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp8_ = TRUE;
-#line 1552 "PicasaPublishing.c"
+#line 1494 "PicasaPublishing.c"
 	} else {
 		PublishingRESTSupportTransaction* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp11_ = bad_txn;
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp12_ = publishing_rest_support_transaction_get_status_code (_tmp11_);
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp8_ = _tmp12_ == ((guint) 404);
-#line 1562 "PicasaPublishing.c"
+#line 1504 "PicasaPublishing.c"
 	}
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp8_) {
-#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 174 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1568 "PicasaPublishing.c"
+#line 1510 "PicasaPublishing.c"
 	} else {
 		SpitPublishingPluginHost* _tmp13_ = NULL;
 		GError* _tmp14_ = NULL;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp13_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp14_ = err;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_);
-#line 1578 "PicasaPublishing.c"
+#line 1520 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_picasa_publisher_on_publishing_options_logout (PublishingPicasaPicasaPublisher* self) {
 	gboolean _tmp0_ = FALSE;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 186 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp0_) {
-#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1593 "PicasaPublishing.c"
+#line 1535 "PicasaPublishing.c"
 	}
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:189: EVENT: user clicked 'Logout' in the publish" \
+#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:185: EVENT: user clicked 'Logout' in the publish" \
 "ing options pane.");
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1599 "PicasaPublishing.c"
+#line 1541 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_on_publishing_options_publish (PublishingPicasaPicasaPublisher* self) {
 	gboolean _tmp0_ = FALSE;
 	PublishingPicasaPublishingParameters* _tmp1_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp0_) {
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 1616 "PicasaPublishing.c"
+#line 1556 "PicasaPublishing.c"
 	}
-#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:198: EVENT: user clicked 'Publish' in the publis" \
+#line 194 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:194: EVENT: user clicked 'Publish' in the publis" \
 "hing options pane.");
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = self->priv->publishing_parameters;
-#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_save_parameters_to_configuration_system (self, _tmp1_);
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = self->priv->publishing_parameters;
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = publishing_picasa_publishing_parameters_is_to_new_album (_tmp2_);
-#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp3_) {
-#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_picasa_publisher_do_create_album (self);
-#line 1632 "PicasaPublishing.c"
-	} else {
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_picasa_publisher_do_upload (self);
-#line 1636 "PicasaPublishing.c"
-	}
-}
-
-
-static void _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_picasa_publisher_on_album_creation_complete ((PublishingPicasaPicasaPublisher*) self, _sender);
-#line 1644 "PicasaPublishing.c"
-}
-
-
-static void _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_picasa_publisher_on_album_creation_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 1651 "PicasaPublishing.c"
-}
-
-
-static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return self ? publishing_rest_support_transaction_ref (self) : NULL;
-#line 1658 "PicasaPublishing.c"
-}
-
-
-static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
-	gchar* result;
-	result = publishing_picasa_album_directory_transaction_validate_xml (doc);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return result;
-#line 1667 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_picasa_publisher_on_album_creation_complete (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingPicasaAlbumCreationTransaction* downcast_txn = NULL;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	PublishingPicasaAlbumCreationTransaction* _tmp6_ = NULL;
-	PublishingRESTSupportXmlDocument* response_doc = NULL;
-	PublishingPicasaAlbum** response_albums = NULL;
-	gint response_albums_length1 = 0;
-	gint _response_albums_size_ = 0;
-	PublishingPicasaAlbum** _tmp24_ = NULL;
-	gint _tmp24__length1 = 0;
-	PublishingPicasaPublishingParameters* _tmp28_ = NULL;
-	PublishingPicasaAlbum** _tmp29_ = NULL;
-	gint _tmp29__length1 = 0;
-	PublishingPicasaAlbum* _tmp30_ = NULL;
-	const gchar* _tmp31_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = txn;
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = txn;
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp4_) {
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1714 "PicasaPublishing.c"
-	}
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:216: EVENT: finished creating album on remote se" \
-"rver.");
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = txn;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = _publishing_rest_support_transaction_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, PublishingPicasaAlbumCreationTransaction));
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	downcast_txn = _tmp6_;
-#line 1724 "PicasaPublishing.c"
-	{
-		PublishingRESTSupportXmlDocument* _tmp7_ = NULL;
-		PublishingPicasaAlbumCreationTransaction* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp11_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp12_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp13_ = NULL;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp8_ = downcast_txn;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp9_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp10_ = _tmp9_;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp11_ = publishing_rest_support_xml_document_parse_string (_tmp10_, _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp12_ = _tmp11_;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_free0 (_tmp10_);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp7_ = _tmp12_;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1751 "PicasaPublishing.c"
-				goto __catch7_spit_publishing_publishing_error;
-			}
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			g_critical ("file %s: line %d: unexpected 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/plugins/shotwell-publishing/PicasaPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			return;
-#line 1764 "PicasaPublishing.c"
-		}
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp13_ = _tmp7_;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp7_ = NULL;
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_doc = _tmp13_;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (_tmp7_);
-#line 1776 "PicasaPublishing.c"
-	}
-	goto __finally7;
-	__catch7_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		err = _inner_error_;
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_inner_error_ = NULL;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp15_ = err;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_error_free0 (err);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1802 "PicasaPublishing.c"
-	}
-	__finally7:
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1817 "PicasaPublishing.c"
-	}
-	{
-		PublishingPicasaAlbum** _tmp16_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp17_ = NULL;
-		xmlNode* _tmp18_ = NULL;
-		gint _tmp19_ = 0;
-		PublishingPicasaAlbum** _tmp20_ = NULL;
-		gint _tmp16__length1 = 0;
-		gint __tmp16__size_ = 0;
-		PublishingPicasaAlbum** _tmp21_ = NULL;
-		gint _tmp21__length1 = 0;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp17_ = response_doc;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp18_ = publishing_rest_support_xml_document_get_root_node (_tmp17_);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp20_ = publishing_picasa_picasa_publisher_extract_albums_helper (self, _tmp18_, &_tmp19_, &_inner_error_);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp16_ = _tmp20_;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp16__length1 = _tmp19_;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		__tmp16__size_ = _tmp16__length1;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1845 "PicasaPublishing.c"
-				goto __catch8_spit_publishing_publishing_error;
-			}
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			return;
-#line 1860 "PicasaPublishing.c"
-		}
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp21_ = _tmp16_;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp21__length1 = _tmp16__length1;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp16_ = NULL;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp16__length1 = 0;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums = _tmp21_;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums_length1 = _tmp21__length1;
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_response_albums_size_ = response_albums_length1;
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp16_ = (_vala_array_free (_tmp16_, _tmp16__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 1880 "PicasaPublishing.c"
-	}
-	goto __finally8;
-	__catch8_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp22_ = NULL;
-		GError* _tmp23_ = NULL;
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		err = _inner_error_;
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_inner_error_ = NULL;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp22_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp23_ = err;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp22_, _tmp23_);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_error_free0 (err);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1908 "PicasaPublishing.c"
-	}
-	__finally8:
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1925 "PicasaPublishing.c"
-	}
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp24_ = response_albums;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp24__length1 = response_albums_length1;
-#line 236 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp24__length1 != 1) {
-#line 1933 "PicasaPublishing.c"
-		SpitPublishingPluginHost* _tmp25_ = NULL;
-		GError* _tmp26_ = NULL;
-		GError* _tmp27_ = NULL;
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp25_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp26_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "album " "creation transaction responses must contain one and only one album dir" \
-"ectory " "entry");
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp27_ = _tmp26_;
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp25_, _tmp27_);
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_error_free0 (_tmp27_);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 1955 "PicasaPublishing.c"
-	}
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp28_ = self->priv->publishing_parameters;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp29_ = response_albums;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp29__length1 = response_albums_length1;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp30_ = _tmp29_[0];
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp31_ = _tmp30_->url;
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp28_, _tmp31_);
-#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_upload (self);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	response_albums = (_vala_array_free (response_albums, response_albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (downcast_txn);
-#line 1977 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_picasa_publisher_on_album_creation_error (PublishingPicasaPicasaPublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	SpitPublishingPluginHost* _tmp8_ = NULL;
-	GError* _tmp9_ = NULL;
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = bad_txn;
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed, self);
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = bad_txn;
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error, self);
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (!_tmp4_) {
-#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 2014 "PicasaPublishing.c"
-	}
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = bad_txn;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = publishing_rest_support_transaction_get_response (_tmp5_);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:256: EVENT: creating album on remote server fail" \
-"ed; response = '%s'.", _tmp7_);
-#line 256 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp7_);
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = err;
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 2032 "PicasaPublishing.c"
+#line 1566 "PicasaPublishing.c"
 }
 
 
@@ -2061,52 +1584,52 @@ static void publishing_picasa_picasa_publisher_on_upload_status_updated (Publish
 	void* _tmp3__target = NULL;
 	gint _tmp4_ = 0;
 	gdouble _tmp5_ = 0.0;
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 202 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp0_) {
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2053 "PicasaPublishing.c"
+#line 1587 "PicasaPublishing.c"
 	}
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = completed_fraction;
-#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:266: EVENT: uploader reports upload %.2f percent" \
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:205: EVENT: uploader reports upload %.2f percent" \
 " complete.", 100.0 * _tmp1_);
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = self->priv->progress_reporter;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2__target = self->priv->progress_reporter_target;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_vala_assert (_tmp2_ != NULL, "progress_reporter != null");
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3__target = self->priv->progress_reporter_target;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = file_number;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = completed_fraction;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 209 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 2075 "PicasaPublishing.c"
+#line 1609 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_complete ((PublishingPicasaPicasaPublisher*) self, _sender, num_photos_published);
-#line 2082 "PicasaPublishing.c"
+#line 1616 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_error ((PublishingPicasaPicasaPublisher*) self, _sender, err);
-#line 2089 "PicasaPublishing.c"
+#line 1623 "PicasaPublishing.c"
 }
 
 
@@ -2117,38 +1640,38 @@ static void publishing_picasa_picasa_publisher_on_upload_complete (PublishingPic
 	guint _tmp3_ = 0U;
 	PublishingRESTSupportBatchUploader* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 212 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp0_) {
-#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 215 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2110 "PicasaPublishing.c"
+#line 1644 "PicasaPublishing.c"
 	}
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = num_published;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:278: EVENT: uploader reports upload complete; %d" \
+#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:217: EVENT: uploader reports upload complete; %d" \
 " items published.", _tmp1_);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = uploader;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = uploader;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp5_, NULL, FALSE);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 222 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_show_success_pane (self);
-#line 2130 "PicasaPublishing.c"
+#line 1664 "PicasaPublishing.c"
 }
 
 
@@ -2162,65 +1685,44 @@ static void publishing_picasa_picasa_publisher_on_upload_error (PublishingPicasa
 	guint _tmp6_ = 0U;
 	SpitPublishingPluginHost* _tmp7_ = NULL;
 	GError* _tmp8_ = NULL;
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp0_) {
-#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 228 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2154 "PicasaPublishing.c"
+#line 1688 "PicasaPublishing.c"
 	}
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = err;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = _tmp1_->message;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:291: EVENT: uploader reports upload error = '%s'" \
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:230: EVENT: uploader reports upload error = '%s'" \
 ".", _tmp2_);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = uploader;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp4_, NULL, FALSE);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = uploader;
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp6_, NULL, FALSE);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp5_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = err;
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 2180 "PicasaPublishing.c"
-}
-
-
-static void _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_picasa_publisher_on_service_welcome_login ((PublishingPicasaPicasaPublisher*) self);
-#line 2187 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_picasa_publisher_do_show_service_welcome_pane (PublishingPicasaPicasaPublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:300: ACTION: showing service welcome pane.");
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_PICASA_SERVICE_WELCOME_MESSAGE, _publishing_picasa_picasa_publisher_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 2201 "PicasaPublishing.c"
+#line 1714 "PicasaPublishing.c"
 }
 
 
@@ -2233,104 +1735,113 @@ static void publishing_picasa_picasa_publisher_do_fetch_account_information (Pub
 	PublishingPicasaAlbumDirectoryTransaction* _tmp4_ = NULL;
 	PublishingPicasaAlbumDirectoryTransaction* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:306: ACTION: fetching account and album informat" \
+#line 239 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:239: ACTION: fetching account and album informat" \
 "ion.");
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp0_);
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 309 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_picasa_album_directory_transaction_new (_tmp3_);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = _tmp4_;
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp3_);
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	directory_trans = _tmp5_;
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 247 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_picasa_picasa_publisher_on_initial_album_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 2242 "PicasaPublishing.c"
+#line 1755 "PicasaPublishing.c"
 	{
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2250 "PicasaPublishing.c"
-				goto __catch9_spit_publishing_publishing_error;
+#line 1763 "PicasaPublishing.c"
+				goto __catch6_spit_publishing_publishing_error;
 			}
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 2261 "PicasaPublishing.c"
+#line 1774 "PicasaPublishing.c"
 		}
 	}
-	goto __finally9;
-	__catch9_spit_publishing_publishing_error:
+	goto __finally6;
+	__catch6_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		err = _inner_error_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = err;
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_picasa_publisher_on_initial_album_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (err);
-#line 2279 "PicasaPublishing.c"
+#line 1792 "PicasaPublishing.c"
 	}
-	__finally9:
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	__finally6:
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2292 "PicasaPublishing.c"
+#line 1805 "PicasaPublishing.c"
 	}
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 2296 "PicasaPublishing.c"
+#line 1809 "PicasaPublishing.c"
+}
+
+
+static gchar* _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
+	gchar* result;
+	result = publishing_picasa_album_directory_transaction_validate_xml (doc);
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	return result;
+#line 1818 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_do_parse_and_display_account_information (PublishingPicasaPicasaPublisher* self, PublishingPicasaAlbumDirectoryTransaction* transaction) {
 	PublishingRESTSupportXmlDocument* response_doc = NULL;
 	GError * _inner_error_ = NULL;
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_ALBUM_DIRECTORY_TRANSACTION (transaction));
-#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:327: ACTION: parsing account and album informati" \
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:260: ACTION: parsing account and album informati" \
 "on from server response XML");
-#line 2309 "PicasaPublishing.c"
+#line 1831 "PicasaPublishing.c"
 	{
 		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
 		PublishingPicasaAlbumDirectoryTransaction* _tmp1_ = NULL;
@@ -2339,85 +1850,85 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		PublishingRESTSupportXmlDocument* _tmp4_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp5_ = NULL;
 		PublishingRESTSupportXmlDocument* _tmp6_ = NULL;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp1_ = transaction;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = _tmp2_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp4_ = publishing_rest_support_xml_document_parse_string (_tmp3_, _publishing_picasa_album_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp5_ = _tmp4_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp3_);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _tmp5_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2336 "PicasaPublishing.c"
-				goto __catch10_spit_publishing_publishing_error;
+#line 1858 "PicasaPublishing.c"
+				goto __catch7_spit_publishing_publishing_error;
 			}
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 2347 "PicasaPublishing.c"
+#line 1869 "PicasaPublishing.c"
 		}
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = _tmp0_;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = NULL;
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		response_doc = _tmp6_;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 2359 "PicasaPublishing.c"
+#line 1881 "PicasaPublishing.c"
 	}
-	goto __finally10;
-	__catch10_spit_publishing_publishing_error:
+	goto __finally7;
+	__catch7_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		err = _inner_error_;
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp8_ = err;
-#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (err);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2383 "PicasaPublishing.c"
+#line 1905 "PicasaPublishing.c"
 	}
-	__finally10:
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	__finally7:
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2396 "PicasaPublishing.c"
+#line 1918 "PicasaPublishing.c"
 	}
 	{
 		PublishingPicasaAlbum** _tmp9_ = NULL;
@@ -2428,99 +1939,99 @@ static void publishing_picasa_picasa_publisher_do_parse_and_display_account_info
 		gint _tmp9__length1 = 0;
 		gint __tmp9__size_ = 0;
 		PublishingPicasaPublishingParameters* _tmp14_ = NULL;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp10_ = response_doc;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp11_ = publishing_rest_support_xml_document_get_root_node (_tmp10_);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp13_ = publishing_picasa_picasa_publisher_extract_albums_helper (self, _tmp11_, &_tmp12_, &_inner_error_);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp9_ = _tmp13_;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp9__length1 = _tmp12_;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		__tmp9__size_ = _tmp9__length1;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2423 "PicasaPublishing.c"
-				goto __catch11_spit_publishing_publishing_error;
+#line 1945 "PicasaPublishing.c"
+				goto __catch8_spit_publishing_publishing_error;
 			}
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 2434 "PicasaPublishing.c"
+#line 1956 "PicasaPublishing.c"
 		}
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp14_ = self->priv->publishing_parameters;
-#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_set_albums (_tmp14_, _tmp9_, _tmp9__length1);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp9_ = (_vala_array_free (_tmp9_, _tmp9__length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 2442 "PicasaPublishing.c"
+#line 1964 "PicasaPublishing.c"
 	}
-	goto __finally11;
-	__catch11_spit_publishing_publishing_error:
+	goto __finally8;
+	__catch8_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		SpitPublishingPluginHost* _tmp15_ = NULL;
 		GError* _tmp16_ = NULL;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		err = _inner_error_;
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp16_ = err;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 274 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp15_, _tmp16_);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (err);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 342 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2466 "PicasaPublishing.c"
+#line 1988 "PicasaPublishing.c"
 	}
-	__finally11:
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	__finally8:
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 271 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2479 "PicasaPublishing.c"
+#line 2001 "PicasaPublishing.c"
 	}
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_do_show_publishing_options_pane (self);
-#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2485 "PicasaPublishing.c"
+#line 2007 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) {
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_publishing_options_publish ((PublishingPicasaPicasaPublisher*) self);
-#line 2492 "PicasaPublishing.c"
+#line 2014 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout (PublishingPicasaPublishingOptionsPane* _sender, gpointer self) {
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_publishing_options_logout ((PublishingPicasaPicasaPublisher*) self);
-#line 2499 "PicasaPublishing.c"
+#line 2021 "PicasaPublishing.c"
 }
 
 
@@ -2530,36 +2041,38 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 	PublishingPicasaPublishingOptionsPane* opts_pane = NULL;
 	GtkBuilder* _tmp8_ = NULL;
 	PublishingPicasaPublishingParameters* _tmp9_ = NULL;
-	PublishingPicasaPublishingOptionsPane* _tmp10_ = NULL;
-	PublishingPicasaPublishingOptionsPane* _tmp11_ = NULL;
+	SpitPublishingAuthenticator* _tmp10_ = NULL;
+	gboolean _tmp11_ = FALSE;
 	PublishingPicasaPublishingOptionsPane* _tmp12_ = NULL;
-	SpitPublishingPluginHost* _tmp13_ = NULL;
+	PublishingPicasaPublishingOptionsPane* _tmp13_ = NULL;
 	PublishingPicasaPublishingOptionsPane* _tmp14_ = NULL;
 	SpitPublishingPluginHost* _tmp15_ = NULL;
+	PublishingPicasaPublishingOptionsPane* _tmp16_ = NULL;
+	SpitPublishingPluginHost* _tmp17_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:349: ACTION: showing publishing options pane.");
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:282: ACTION: showing publishing options pane.");
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = gtk_builder_new ();
-#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	builder = _tmp0_;
-#line 2524 "PicasaPublishing.c"
+#line 2048 "PicasaPublishing.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp1_ = builder;
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/" "picasa_publishing_options_pane.ui", &_inner_error_);
-#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2533 "PicasaPublishing.c"
-			goto __catch12_g_error;
+#line 2057 "PicasaPublishing.c"
+			goto __catch9_g_error;
 		}
 	}
-	goto __finally12;
-	__catch12_g_error:
+	goto __finally9;
+	__catch9_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp2_ = NULL;
@@ -2568,212 +2081,92 @@ static void publishing_picasa_picasa_publisher_do_show_publishing_options_pane (
 		const gchar* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		e = _inner_error_;
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = e;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = _tmp2_->message;
-#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_warning ("PicasaPublishing.vala:358: Could not parse UI file! Error: %s.", _tmp3_);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		g_warning ("PicasaPublishing.vala:288: Could not parse UI file! Error: %s.", _tmp3_);
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp4_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to Picasa ca" \
 "n’t continue.");
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
-#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (_tmp7_);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (e);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_object_unref0 (builder);
-#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2575 "PicasaPublishing.c"
+#line 2099 "PicasaPublishing.c"
 	}
-	__finally12:
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	__finally9:
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_object_unref0 (builder);
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_critical ("file %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/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2588 "PicasaPublishing.c"
+#line 2112 "PicasaPublishing.c"
 	}
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = builder;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = self->priv->publishing_parameters;
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = publishing_picasa_publishing_options_pane_new (_tmp8_, _tmp9_);
-#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	opts_pane = _tmp10_;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = opts_pane;
-#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp11_, "publish", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish, self, 0);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = opts_pane;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp12_, "logout", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout, self, 0);
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp10_ = self->priv->authenticator;
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp11_ = spit_publishing_authenticator_can_logout (_tmp10_);
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp12_ = publishing_picasa_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp11_);
+#line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	opts_pane = _tmp12_;
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp13_ = opts_pane;
+#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_signal_connect_object (_tmp13_, "publish", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_publish_publishing_picasa_publishing_options_pane_publish, self, 0);
+#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp14_ = opts_pane;
-#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_signal_connect_object (_tmp14_, "logout", (GCallback) _publishing_picasa_picasa_publisher_on_publishing_options_logout_publishing_picasa_publishing_options_pane_logout, self, 0);
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp15_, FALSE);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp16_ = opts_pane;
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp17_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp17_, FALSE);
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (opts_pane);
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (builder);
-#line 2620 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_picasa_publisher_do_create_album (PublishingPicasaPicasaPublisher* self) {
-	PublishingPicasaPublishingParameters* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
-	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	SpitPublishingPluginHost* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	SpitPublishingPluginHost* _tmp7_ = NULL;
-	PublishingPicasaAlbumCreationTransaction* creation_trans = NULL;
-	PublishingRESTSupportGoogleSession* _tmp8_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp9_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp10_ = NULL;
-	PublishingPicasaAlbumCreationTransaction* _tmp11_ = NULL;
-	PublishingPicasaAlbumCreationTransaction* _tmp12_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->publishing_parameters;
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = publishing_picasa_publishing_parameters_is_to_new_album (_tmp0_);
-#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_assert (_tmp1_, "publishing_parameters.is_to_new_album()");
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = self->priv->publishing_parameters;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = publishing_picasa_publishing_parameters_get_target_album_name (_tmp2_);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:376: ACTION: creating new album '%s' on remote s" \
-"erver.", _tmp4_);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp4_);
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = _ ("Creating album…");
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_install_static_message_pane (_tmp5_, _tmp6_, SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp7_, TRUE);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = self->priv->publishing_parameters;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = publishing_picasa_album_creation_transaction_new (_tmp9_, _tmp10_);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = _tmp11_;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp9_);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	creation_trans = _tmp12_;
-#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 386 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_picasa_picasa_publisher_on_album_creation_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 2686 "PicasaPublishing.c"
-	{
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (creation_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2694 "PicasaPublishing.c"
-				goto __catch13_spit_publishing_publishing_error;
-			}
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			return;
-#line 2705 "PicasaPublishing.c"
-		}
-	}
-	goto __finally13;
-	__catch13_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		err = _inner_error_;
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_inner_error_ = NULL;
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp13_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp14_ = err;
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp13_, _tmp14_);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_g_error_free0 (err);
-#line 2726 "PicasaPublishing.c"
-	}
-	__finally13:
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		return;
-#line 2739 "PicasaPublishing.c"
-	}
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_publishing_rest_support_transaction_unref0 (creation_trans);
-#line 2743 "PicasaPublishing.c"
+#line 2148 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_on_upload_status_updated ((PublishingPicasaPicasaPublisher*) self, file_number, fraction_complete);
-#line 2750 "PicasaPublishing.c"
+#line 2155 "PicasaPublishing.c"
 }
 
 
@@ -2805,113 +2198,113 @@ static void publishing_picasa_picasa_publisher_do_upload (PublishingPicasaPicasa
 	PublishingPicasaUploader* _tmp19_ = NULL;
 	PublishingPicasaUploader* _tmp20_ = NULL;
 	PublishingPicasaUploader* _tmp21_ = NULL;
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:395: ACTION: uploading media items to remote ser" \
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:304: ACTION: uploading media items to remote ser" \
 "ver.");
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = self->priv->publishing_parameters;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = publishing_picasa_publishing_parameters_get_major_axis_size_pixels (_tmp2_);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = self->priv->publishing_parameters;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp4_);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = spit_publishing_plugin_host_serialize_publishables (_tmp1_, _tmp3_, _tmp5_, &_tmp6_, &_tmp7_);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter = _tmp8_;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target = _tmp6_;
-#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp7_;
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!_tmp9_) {
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2822 "PicasaPublishing.c"
+#line 2227 "PicasaPublishing.c"
 	}
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = spit_publishing_plugin_host_get_publishables (_tmp10_, &_tmp11_);
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishables = _tmp12_;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishables_length1 = _tmp11_;
-#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp13_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp14_ = _tmp13_;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = publishables;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15__length1 = publishables_length1;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16_ = self->priv->publishing_parameters;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp17_ = publishing_picasa_uploader_new (_tmp14_, _tmp15_, _tmp15__length1, _tmp16_);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp18_ = _tmp17_;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp14_);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	uploader = _tmp18_;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp19_ = uploader;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_picasa_picasa_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp20_ = uploader;
-#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 323 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_picasa_picasa_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp21_ = uploader;
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 325 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_picasa_picasa_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 394 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2868 "PicasaPublishing.c"
+#line 2273 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_do_show_success_pane (PublishingPicasaPicasaPublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PICASA_PUBLISHER (self));
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:420: ACTION: showing success pane.");
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:329: ACTION: showing success pane.");
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2887 "PicasaPublishing.c"
+#line 2292 "PicasaPublishing.c"
 }
 
 
@@ -2919,30 +2312,39 @@ static void publishing_picasa_picasa_publisher_real_do_logout (PublishingRESTSup
 	PublishingPicasaPicasaPublisher * self;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	SpitPublishingAuthenticator* _tmp2_ = NULL;
+	gboolean _tmp3_ = FALSE;
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:427: ACTION: logging out user.");
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:336: ACTION: logging out user.");
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_google_session_deauthenticate (_tmp1_);
-#line 429 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (self->priv->refresh_token);
-#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->refresh_token = NULL;
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token");
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_picasa_publisher_do_show_service_welcome_pane (self);
-#line 2918 "PicasaPublishing.c"
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp2_ = self->priv->authenticator;
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp3_ = spit_publishing_authenticator_can_logout (_tmp2_);
+#line 339 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if (_tmp3_) {
+#line 2320 "PicasaPublishing.c"
+		SpitPublishingAuthenticator* _tmp4_ = NULL;
+		SpitPublishingAuthenticator* _tmp5_ = NULL;
+#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp4_ = self->priv->authenticator;
+#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		spit_publishing_authenticator_logout (_tmp4_);
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp5_ = self->priv->authenticator;
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		spit_publishing_authenticator_authenticate (_tmp5_);
+#line 2331 "PicasaPublishing.c"
+	}
 }
 
 
@@ -2950,51 +2352,41 @@ static gboolean publishing_picasa_picasa_publisher_real_is_running (PublishingRE
 	PublishingPicasaPicasaPublisher * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->running;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp0_;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 346 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 2934 "PicasaPublishing.c"
+#line 2348 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_real_start (PublishingRESTSupportGooglePublisher* base) {
 	PublishingPicasaPicasaPublisher * self;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	SpitPublishingAuthenticator* _tmp1_ = NULL;
+#line 349 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:442: PicasaPublisher: start( ) invoked.");
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 350 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:350: PicasaPublisher: start( ) invoked.");
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp0_) {
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 353 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return;
-#line 2952 "PicasaPublishing.c"
+#line 2366 "PicasaPublishing.c"
 	}
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->running = TRUE;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = self->priv->refresh_token;
-#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp1_ == NULL) {
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_picasa_publisher_do_show_service_welcome_pane (self);
-#line 2962 "PicasaPublishing.c"
-	} else {
-		const gchar* _tmp2_ = NULL;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp2_ = self->priv->refresh_token;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp2_);
-#line 2969 "PicasaPublishing.c"
-	}
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp1_ = self->priv->authenticator;
+#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	spit_publishing_authenticator_authenticate (_tmp1_);
+#line 2374 "PicasaPublishing.c"
 }
 
 
@@ -3002,71 +2394,118 @@ static void publishing_picasa_picasa_publisher_real_stop (PublishingRESTSupportG
 	PublishingPicasaPicasaPublisher * self;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_debug ("PicasaPublishing.vala:456: PicasaPublisher: stop( ) invoked.");
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_debug ("PicasaPublishing.vala:361: PicasaPublisher: stop( ) invoked.");
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 363 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->running = FALSE;
-#line 2992 "PicasaPublishing.c"
+#line 2396 "PicasaPublishing.c"
+}
+
+
+static SpitPublishingAuthenticator* publishing_picasa_picasa_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) {
+	PublishingPicasaPicasaPublisher * self;
+	SpitPublishingAuthenticator* result = NULL;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	SpitPublishingAuthenticator* _tmp5_ = NULL;
+	SpitPublishingAuthenticator* _tmp6_ = NULL;
+#line 368 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
+#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if (_tmp0_ == NULL) {
+#line 2412 "PicasaPublishing.c"
+		PublishingAuthenticatorFactory* _tmp1_ = NULL;
+		PublishingAuthenticatorFactory* _tmp2_ = NULL;
+		SpitPublishingPluginHost* _tmp3_ = NULL;
+		SpitPublishingAuthenticator* _tmp4_ = NULL;
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp1_ = publishing_authenticator_factory_get_instance ();
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp2_ = _tmp1_;
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp3_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp4_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "picasa", _tmp3_);
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_g_object_unref0 (self->priv->authenticator);
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		self->priv->authenticator = _tmp4_;
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_g_object_unref0 (_tmp2_);
+#line 2431 "PicasaPublishing.c"
+	}
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp5_ = self->priv->authenticator;
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp6_ = _g_object_ref0 (_tmp5_);
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	result = _tmp6_;
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	return result;
+#line 2441 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_class_init (PublishingPicasaPicasaPublisherClass * klass) {
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_picasa_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaPicasaPublisherPrivate));
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = publishing_picasa_picasa_publisher_real_on_login_flow_complete;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_picasa_picasa_publisher_real_do_logout;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = publishing_picasa_picasa_publisher_real_is_running;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->start = publishing_picasa_picasa_publisher_real_start;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_picasa_picasa_publisher_real_stop;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = publishing_picasa_picasa_publisher_real_get_authenticator;
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_picasa_picasa_publisher_finalize;
-#line 3013 "PicasaPublishing.c"
+#line 2464 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_instance_init (PublishingPicasaPicasaPublisher * self) {
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_PICASA_PUBLISHER_GET_PRIVATE (self);
-#line 3020 "PicasaPublishing.c"
+#line 2471 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_picasa_publisher_finalize (GObject* obj) {
 	PublishingPicasaPicasaPublisher * self;
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PICASA_PUBLISHER, PublishingPicasaPicasaPublisher);
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 65 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 64 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->publishing_parameters);
-#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (self->priv->refresh_token);
-#line 62 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 65 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 60 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (publishing_picasa_picasa_publisher_parent_class)->finalize (obj);
-#line 3042 "PicasaPublishing.c"
+#line 2493 "PicasaPublishing.c"
 }
 
 
@@ -3088,248 +2527,248 @@ PublishingPicasaAlbum* publishing_picasa_album_construct (GType object_type, con
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (url != NULL, NULL);
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaAlbum*) g_type_create_instance (object_type);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = name;
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
-#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 382 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->name = _tmp1_;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = url;
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = g_strdup (_tmp2_);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->url);
-#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->url = _tmp3_;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3088 "PicasaPublishing.c"
+#line 2539 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaAlbum* publishing_picasa_album_new (const gchar* name, const gchar* url) {
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 381 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_album_construct (PUBLISHING_PICASA_TYPE_ALBUM, name, url);
-#line 3095 "PicasaPublishing.c"
+#line 2546 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_album_init (GValue* value) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 3102 "PicasaPublishing.c"
+#line 2553 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_album_free_value (GValue* value) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (value->data[0].v_pointer);
-#line 3111 "PicasaPublishing.c"
+#line 2562 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_value_album_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_album_ref (src_value->data[0].v_pointer);
-#line 3121 "PicasaPublishing.c"
+#line 2572 "PicasaPublishing.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3125 "PicasaPublishing.c"
+#line 2576 "PicasaPublishing.c"
 	}
 }
 
 
 static gpointer publishing_picasa_value_album_peek_pointer (const GValue* value) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 3133 "PicasaPublishing.c"
+#line 2584 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_album_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 3140 "PicasaPublishing.c"
+#line 2591 "PicasaPublishing.c"
 		PublishingPicasaAlbum* object;
 		object = collect_values[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3147 "PicasaPublishing.c"
+#line 2598 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3151 "PicasaPublishing.c"
+#line 2602 "PicasaPublishing.c"
 		}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_album_ref (object);
-#line 3155 "PicasaPublishing.c"
+#line 2606 "PicasaPublishing.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3159 "PicasaPublishing.c"
+#line 2610 "PicasaPublishing.c"
 	}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 3163 "PicasaPublishing.c"
+#line 2614 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_album_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingPicasaAlbum** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!object_p) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3174 "PicasaPublishing.c"
+#line 2625 "PicasaPublishing.c"
 	}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 3180 "PicasaPublishing.c"
+#line 2631 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3184 "PicasaPublishing.c"
+#line 2635 "PicasaPublishing.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 3188 "PicasaPublishing.c"
+#line 2639 "PicasaPublishing.c"
 	}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 3192 "PicasaPublishing.c"
+#line 2643 "PicasaPublishing.c"
 }
 
 
 GParamSpec* publishing_picasa_param_spec_album (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingPicasaParamSpecAlbum* spec;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PICASA_TYPE_ALBUM), NULL);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 3206 "PicasaPublishing.c"
+#line 2657 "PicasaPublishing.c"
 }
 
 
 gpointer publishing_picasa_value_get_album (const GValue* value) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM), NULL);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 3215 "PicasaPublishing.c"
+#line 2666 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_value_set_album (GValue* value, gpointer v_object) {
 	PublishingPicasaAlbum* old;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_TYPE_ALBUM));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_ref (value->data[0].v_pointer);
-#line 3235 "PicasaPublishing.c"
+#line 2686 "PicasaPublishing.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3239 "PicasaPublishing.c"
+#line 2690 "PicasaPublishing.c"
 	}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (old);
-#line 3245 "PicasaPublishing.c"
+#line 2696 "PicasaPublishing.c"
 	}
 }
 
 
 void publishing_picasa_value_take_album (GValue* value, gpointer v_object) {
 	PublishingPicasaAlbum* old;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_ALBUM));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_TYPE_ALBUM));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 3264 "PicasaPublishing.c"
+#line 2715 "PicasaPublishing.c"
 	} else {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3268 "PicasaPublishing.c"
+#line 2719 "PicasaPublishing.c"
 	}
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_album_unref (old);
-#line 3274 "PicasaPublishing.c"
+#line 2725 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_album_class_init (PublishingPicasaAlbumClass * klass) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_album_parent_class = g_type_class_peek_parent (klass);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaAlbumClass *) klass)->finalize = publishing_picasa_album_finalize;
-#line 3284 "PicasaPublishing.c"
+#line 2735 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_album_instance_init (PublishingPicasaAlbum * self) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 3291 "PicasaPublishing.c"
+#line 2742 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_album_finalize (PublishingPicasaAlbum* obj) {
 	PublishingPicasaAlbum * self;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_ALBUM, PublishingPicasaAlbum);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
-#line 466 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->url);
-#line 3305 "PicasaPublishing.c"
+#line 2756 "PicasaPublishing.c"
 }
 
 
@@ -3350,24 +2789,24 @@ GType publishing_picasa_album_get_type (void) {
 gpointer publishing_picasa_album_ref (gpointer instance) {
 	PublishingPicasaAlbum* self;
 	self = instance;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 3330 "PicasaPublishing.c"
+#line 2781 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_album_unref (gpointer instance) {
 	PublishingPicasaAlbum* self;
 	self = instance;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		PUBLISHING_PICASA_ALBUM_GET_CLASS (self)->finalize (self);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3343 "PicasaPublishing.c"
+#line 2794 "PicasaPublishing.c"
 	}
 }
 
@@ -3375,22 +2814,22 @@ void publishing_picasa_album_unref (gpointer instance) {
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session) {
 	PublishingPicasaAlbumDirectoryTransaction* self = NULL;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = session;
-#line 480 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaAlbumDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_PICASA_ALBUM_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3359 "PicasaPublishing.c"
+#line 2810 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaAlbumDirectoryTransaction* publishing_picasa_album_directory_transaction_new (PublishingRESTSupportGoogleSession* session) {
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_album_directory_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_DIRECTORY_TRANSACTION, session);
-#line 3366 "PicasaPublishing.c"
+#line 2817 "PicasaPublishing.c"
 }
 
 
@@ -3402,58 +2841,58 @@ gchar* publishing_picasa_album_directory_transaction_validate_xml (PublishingRES
 	gboolean _tmp2_ = FALSE;
 	xmlNode* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = doc;
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 397 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	document_root = _tmp1_;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = document_root;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = _tmp3_->name;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_strcmp0 (_tmp4_, "feed") == 0) {
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = TRUE;
-#line 3394 "PicasaPublishing.c"
+#line 2845 "PicasaPublishing.c"
 	} else {
 		xmlNode* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp5_ = document_root;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = _tmp5_->name;
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0;
-#line 3404 "PicasaPublishing.c"
+#line 2855 "PicasaPublishing.c"
 	}
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp2_) {
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result = NULL;
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 399 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return result;
-#line 3412 "PicasaPublishing.c"
+#line 2863 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp7_ = NULL;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp7_ = g_strdup ("response root node isn't a <feed> or <entry>");
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result = _tmp7_;
-#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return result;
-#line 3421 "PicasaPublishing.c"
+#line 2872 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_album_directory_transaction_class_init (PublishingPicasaAlbumDirectoryTransactionClass * klass) {
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 387 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_album_directory_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3429 "PicasaPublishing.c"
+#line 2880 "PicasaPublishing.c"
 }
 
 
@@ -3473,113 +2912,17 @@ GType publishing_picasa_album_directory_transaction_get_type (void) {
 }
 
 
-PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters) {
-	PublishingPicasaAlbumCreationTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gchar* post_body = NULL;
-	PublishingPicasaPublishingParameters* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = session;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self = (PublishingPicasaAlbumCreationTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = parameters;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = publishing_picasa_publishing_parameters_is_new_album_public (_tmp2_);
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp3_) {
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp1_ = "public";
-#line 3479 "PicasaPublishing.c"
-	} else {
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp1_ = "private";
-#line 3483 "PicasaPublishing.c"
-	}
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = parameters;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = publishing_picasa_publishing_parameters_get_target_album_name (_tmp4_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = _tmp5_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = publishing_rest_support_decimal_entity_encode (_tmp6_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = _tmp7_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = g_strdup_printf (PUBLISHING_PICASA_ALBUM_CREATION_TRANSACTION_ALBUM_ENTRY_TEMPLATE, _tmp8_, _tmp1_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = _tmp9_;
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp8_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp6_);
-#line 502 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	post_body = _tmp10_;
-#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_rest_support_transaction_set_custom_payload (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), post_body, "application/atom+xml", (gulong) 0);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (post_body);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return self;
-#line 3511 "PicasaPublishing.c"
-}
-
-
-PublishingPicasaAlbumCreationTransaction* publishing_picasa_album_creation_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters) {
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return publishing_picasa_album_creation_transaction_construct (PUBLISHING_PICASA_TYPE_ALBUM_CREATION_TRANSACTION, session, parameters);
-#line 3518 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_album_creation_transaction_class_init (PublishingPicasaAlbumCreationTransactionClass * klass) {
-#line 492 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_album_creation_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 3525 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_album_creation_transaction_instance_init (PublishingPicasaAlbumCreationTransaction * self) {
-}
-
-
-GType publishing_picasa_album_creation_transaction_get_type (void) {
-	static volatile gsize publishing_picasa_album_creation_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_picasa_album_creation_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingPicasaAlbumCreationTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_picasa_album_creation_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingPicasaAlbumCreationTransaction), 0, (GInstanceInitFunc) publishing_picasa_album_creation_transaction_instance_init, NULL };
-		GType publishing_picasa_album_creation_transaction_type_id;
-		publishing_picasa_album_creation_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, "PublishingPicasaAlbumCreationTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_picasa_album_creation_transaction_type_id__volatile, publishing_picasa_album_creation_transaction_type_id);
-	}
-	return publishing_picasa_album_creation_transaction_type_id__volatile;
-}
-
-
 static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3548 "PicasaPublishing.c"
+#line 2903 "PicasaPublishing.c"
 }
 
 
 static gpointer _publishing_picasa_publishing_parameters_ref0 (gpointer self) {
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_publishing_parameters_ref (self) : NULL;
-#line 3555 "PicasaPublishing.c"
+#line 2910 "PicasaPublishing.c"
 }
 
 
@@ -3597,88 +2940,157 @@ PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_construc
 	PublishingPicasaPublishingParameters* _tmp9_ = NULL;
 	SpitPublishingPublishable* _tmp10_ = NULL;
 	SpitPublishingPublishable* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	SpitPublishingPublishable* _tmp13_ = NULL;
-	SpitPublishingPublisherMediaType _tmp14_ = 0;
-	gchar* _tmp15_ = NULL;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	SpitPublishingPublishable* _tmp12_ = NULL;
+	SpitPublishingPublisherMediaType _tmp13_ = 0;
+	GError * _inner_error_ = NULL;
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = session;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = parameters;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = publishing_picasa_publishing_parameters_get_target_album_feed_url (_tmp1_);
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = _tmp2_;
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaUploadTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, _tmp3_, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp3_);
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = session;
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_vala_assert (_tmp5_, "session.is_authenticated()");
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = session;
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = _publishing_rest_support_session_ref0 (_tmp6_);
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 419 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->session = _tmp7_;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = parameters;
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = _publishing_picasa_publishing_parameters_ref0 (_tmp8_);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->parameters = _tmp9_;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = publishable;
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->publishable = _tmp11_;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13_ = publishable;
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp14_ = spit_publishing_publishable_get_media_type (_tmp13_);
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp14_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp12_ = "video/mpeg";
-#line 3633 "PicasaPublishing.c"
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp12_ = publishable;
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp13_ = spit_publishing_publishable_get_media_type (_tmp12_);
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if (_tmp13_ == SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO) {
+#line 2985 "PicasaPublishing.c"
+		{
+			GFileInfo* info = NULL;
+			SpitPublishingPublishable* _tmp14_ = NULL;
+			GFile* _tmp15_ = NULL;
+			GFile* _tmp16_ = NULL;
+			GFileInfo* _tmp17_ = NULL;
+			GFileInfo* _tmp18_ = NULL;
+			GFileInfo* _tmp19_ = NULL;
+			const gchar* _tmp20_ = NULL;
+			gchar* _tmp21_ = NULL;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp14_ = self->priv->publishable;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp15_ = spit_publishing_publishable_get_serialized_file (_tmp14_);
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp16_ = _tmp15_;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp17_ = g_file_query_info (_tmp16_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp18_ = _tmp17_;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_g_object_unref0 (_tmp16_);
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			info = _tmp18_;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3012 "PicasaPublishing.c"
+				goto __catch10_g_error;
+			}
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp19_ = info;
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp20_ = g_file_info_get_content_type (_tmp19_);
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp21_ = g_content_type_get_mime_type (_tmp20_);
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_g_free0 (self->priv->mime_type);
+#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			self->priv->mime_type = _tmp21_;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_g_object_unref0 (info);
+#line 3027 "PicasaPublishing.c"
+		}
+		goto __finally10;
+		__catch10_g_error:
+		{
+			GError* err = NULL;
+			gchar* _tmp22_ = NULL;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			err = _inner_error_;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_inner_error_ = NULL;
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_tmp22_ = g_strdup ("video/mpeg");
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_g_free0 (self->priv->mime_type);
+#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			self->priv->mime_type = _tmp22_;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			_g_error_free0 (err);
+#line 3046 "PicasaPublishing.c"
+		}
+		__finally10:
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			g_clear_error (&_inner_error_);
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			return NULL;
+#line 3057 "PicasaPublishing.c"
+		}
 	} else {
-#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp12_ = "image/jpeg";
-#line 3637 "PicasaPublishing.c"
+		gchar* _tmp23_ = NULL;
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp23_ = g_strdup ("image/jpeg");
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_g_free0 (self->priv->mime_type);
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		self->priv->mime_type = _tmp23_;
+#line 3067 "PicasaPublishing.c"
 	}
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp15_ = g_strdup (_tmp12_);
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (self->priv->mime_type);
-#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->mime_type = _tmp15_;
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 3647 "PicasaPublishing.c"
+#line 3071 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaUploadTransaction* publishing_picasa_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingPicasaPublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_upload_transaction_construct (PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 3654 "PicasaPublishing.c"
+#line 3078 "PicasaPublishing.c"
 }
 
 
@@ -3701,7 +3113,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 3677 "PicasaPublishing.c"
+#line 3101 "PicasaPublishing.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -3709,7 +3121,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3685 "PicasaPublishing.c"
+#line 3109 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -3721,7 +3133,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3697 "PicasaPublishing.c"
+#line 3121 "PicasaPublishing.c"
 	}
 }
 
@@ -3745,21 +3157,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 3721 "PicasaPublishing.c"
+#line 3145 "PicasaPublishing.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 3727 "PicasaPublishing.c"
+#line 3151 "PicasaPublishing.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 3731 "PicasaPublishing.c"
+#line 3155 "PicasaPublishing.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 3735 "PicasaPublishing.c"
+#line 3159 "PicasaPublishing.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -3771,7 +3183,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 3747 "PicasaPublishing.c"
+#line 3171 "PicasaPublishing.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -3781,13 +3193,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 3757 "PicasaPublishing.c"
+#line 3181 "PicasaPublishing.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 3763 "PicasaPublishing.c"
+#line 3187 "PicasaPublishing.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -3801,7 +3213,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 3777 "PicasaPublishing.c"
+#line 3201 "PicasaPublishing.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -3811,13 +3223,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 3787 "PicasaPublishing.c"
+#line 3211 "PicasaPublishing.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 3793 "PicasaPublishing.c"
+#line 3217 "PicasaPublishing.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3826,7 +3238,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 3802 "PicasaPublishing.c"
+#line 3226 "PicasaPublishing.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -3846,7 +3258,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3822 "PicasaPublishing.c"
+#line 3246 "PicasaPublishing.c"
 }
 
 
@@ -3863,7 +3275,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp0_ == NULL) {
 #line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		separator = "";
-#line 3839 "PicasaPublishing.c"
+#line 3263 "PicasaPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
@@ -3873,7 +3285,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 	if (_tmp3_ != NULL) {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
-#line 3849 "PicasaPublishing.c"
+#line 3273 "PicasaPublishing.c"
 	} else {
 		gchar** _tmp4_ = NULL;
 		gint _tmp4__length1 = 0;
@@ -3883,13 +3295,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp4__length1 = str_array_length1;
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
-#line 3859 "PicasaPublishing.c"
+#line 3283 "PicasaPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 3865 "PicasaPublishing.c"
+#line 3289 "PicasaPublishing.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 		gchar** _tmp6_ = NULL;
@@ -3900,7 +3312,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp6__length1 = str_array_length1;
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
-#line 3876 "PicasaPublishing.c"
+#line 3300 "PicasaPublishing.c"
 			gchar** _tmp7_ = NULL;
 			gint _tmp7__length1 = 0;
 			const gchar* _tmp8_ = NULL;
@@ -3912,19 +3324,19 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp8_ = _tmp7_[0];
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
-#line 3888 "PicasaPublishing.c"
+#line 3312 "PicasaPublishing.c"
 		} else {
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
-#line 3892 "PicasaPublishing.c"
+#line 3316 "PicasaPublishing.c"
 		}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
-#line 3896 "PicasaPublishing.c"
+#line 3320 "PicasaPublishing.c"
 	}
 #line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 3900 "PicasaPublishing.c"
+#line 3324 "PicasaPublishing.c"
 		gint i = 0;
 		gsize len = 0UL;
 		gint _tmp31_ = 0;
@@ -3947,7 +3359,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		const gchar* _tmp62_ = NULL;
 #line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
-#line 3923 "PicasaPublishing.c"
+#line 3347 "PicasaPublishing.c"
 		{
 			gboolean _tmp9_ = FALSE;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3956,7 +3368,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp9_ = TRUE;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 3932 "PicasaPublishing.c"
+#line 3356 "PicasaPublishing.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
 				gchar** _tmp13_ = NULL;
@@ -3969,13 +3381,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				gsize _tmp30_ = 0UL;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
-#line 3945 "PicasaPublishing.c"
+#line 3369 "PicasaPublishing.c"
 					gint _tmp10_ = 0;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
-#line 3951 "PicasaPublishing.c"
+#line 3375 "PicasaPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
@@ -3985,7 +3397,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp13__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
-#line 3961 "PicasaPublishing.c"
+#line 3385 "PicasaPublishing.c"
 					gint _tmp14_ = 0;
 					gchar** _tmp15_ = NULL;
 					gint _tmp15__length1 = 0;
@@ -3997,17 +3409,17 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp15__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
-#line 3973 "PicasaPublishing.c"
+#line 3397 "PicasaPublishing.c"
 				} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
-#line 3977 "PicasaPublishing.c"
+#line 3401 "PicasaPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
-#line 3983 "PicasaPublishing.c"
+#line 3407 "PicasaPublishing.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
 					gchar** _tmp17_ = NULL;
@@ -4018,7 +3430,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp17__length1 = str_array_length1;
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
-#line 3994 "PicasaPublishing.c"
+#line 3418 "PicasaPublishing.c"
 						gchar** _tmp18_ = NULL;
 						gint _tmp18__length1 = 0;
 						gint _tmp19_ = 0;
@@ -4033,21 +3445,21 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 						_tmp20_ = _tmp18_[_tmp19_];
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
-#line 4009 "PicasaPublishing.c"
+#line 3433 "PicasaPublishing.c"
 					} else {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
-#line 4013 "PicasaPublishing.c"
+#line 3437 "PicasaPublishing.c"
 					}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
-#line 4017 "PicasaPublishing.c"
+#line 3441 "PicasaPublishing.c"
 				}
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
 #line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 4023 "PicasaPublishing.c"
+#line 3447 "PicasaPublishing.c"
 				}
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
@@ -4059,7 +3471,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp24_ = _tmp22_[_tmp23_];
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
-#line 4035 "PicasaPublishing.c"
+#line 3459 "PicasaPublishing.c"
 					gchar** _tmp25_ = NULL;
 					gint _tmp25__length1 = 0;
 					gint _tmp26_ = 0;
@@ -4080,24 +3492,24 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp29_ = _tmp28_;
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
-#line 4056 "PicasaPublishing.c"
+#line 3480 "PicasaPublishing.c"
 				} else {
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
-#line 4060 "PicasaPublishing.c"
+#line 3484 "PicasaPublishing.c"
 				}
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
 #line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
-#line 4066 "PicasaPublishing.c"
+#line 3490 "PicasaPublishing.c"
 			}
 		}
 #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
 #line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
-#line 4073 "PicasaPublishing.c"
+#line 3497 "PicasaPublishing.c"
 			gchar* _tmp32_ = NULL;
 #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
@@ -4105,7 +3517,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			result = _tmp32_;
 #line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return result;
-#line 4081 "PicasaPublishing.c"
+#line 3505 "PicasaPublishing.c"
 		}
 #line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
@@ -4143,7 +3555,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
 #line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
-#line 4119 "PicasaPublishing.c"
+#line 3543 "PicasaPublishing.c"
 		{
 			gboolean _tmp46_ = FALSE;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4152,7 +3564,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 			_tmp46_ = TRUE;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			while (TRUE) {
-#line 4128 "PicasaPublishing.c"
+#line 3552 "PicasaPublishing.c"
 				gint _tmp48_ = 0;
 				gchar** _tmp49_ = NULL;
 				gint _tmp49__length1 = 0;
@@ -4168,13 +3580,13 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				void* _tmp61_ = NULL;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
-#line 4144 "PicasaPublishing.c"
+#line 3568 "PicasaPublishing.c"
 					gint _tmp47_ = 0;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
-#line 4150 "PicasaPublishing.c"
+#line 3574 "PicasaPublishing.c"
 				}
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
@@ -4188,7 +3600,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				if (!(_tmp48_ < _tmp49__length1)) {
 #line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					break;
-#line 4164 "PicasaPublishing.c"
+#line 3588 "PicasaPublishing.c"
 				}
 #line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
@@ -4208,7 +3620,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp56_ = _tmp54_[_tmp55_];
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
-#line 4184 "PicasaPublishing.c"
+#line 3608 "PicasaPublishing.c"
 					gchar** _tmp57_ = NULL;
 					gint _tmp57__length1 = 0;
 					gint _tmp58_ = 0;
@@ -4223,11 +3635,11 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 					_tmp59_ = _tmp57_[_tmp58_];
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
-#line 4199 "PicasaPublishing.c"
+#line 3623 "PicasaPublishing.c"
 				} else {
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
-#line 4203 "PicasaPublishing.c"
+#line 3627 "PicasaPublishing.c"
 				}
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
@@ -4235,7 +3647,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
 #line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
-#line 4211 "PicasaPublishing.c"
+#line 3635 "PicasaPublishing.c"
 			}
 		}
 #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4246,7 +3658,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = (gchar*) _tmp62_;
 #line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 4222 "PicasaPublishing.c"
+#line 3646 "PicasaPublishing.c"
 	} else {
 		gchar* _tmp63_ = NULL;
 #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4255,7 +3667,7 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 		result = _tmp63_;
 #line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 4231 "PicasaPublishing.c"
+#line 3655 "PicasaPublishing.c"
 	}
 }
 
@@ -4300,27 +3712,27 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 4276 "PicasaPublishing.c"
+#line 3700 "PicasaPublishing.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 4282 "PicasaPublishing.c"
+#line 3706 "PicasaPublishing.c"
 }
 
 
 static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_boxed_free (soup_buffer_get_type (), self);
-#line 4289 "PicasaPublishing.c"
+#line 3713 "PicasaPublishing.c"
 }
 
 
 static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_boxed_free (soup_multipart_get_type (), self);
-#line 4296 "PicasaPublishing.c"
+#line 3720 "PicasaPublishing.c"
 }
 
 
@@ -4393,94 +3805,94 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 	gchar* _tmp109_ = NULL;
 	gchar* _tmp110_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = soup_multipart_new ("multipart/related");
-#line 533 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	message_parts = _tmp0_;
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup ("");
-#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	summary = _tmp1_;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = self->priv->publishable;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = spit_publishing_publishable_get_publishing_name (_tmp2_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = g_strcmp0 (_tmp4_, "") != 0;
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp4_);
-#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp5_) {
-#line 4391 "PicasaPublishing.c"
+#line 3815 "PicasaPublishing.c"
 		SpitPublishingPublishable* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp6_ = self->priv->publishable;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp7_ = spit_publishing_publishable_get_publishing_name (_tmp6_);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp8_ = _tmp7_;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp9_ = publishing_rest_support_decimal_entity_encode (_tmp8_);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp10_ = _tmp9_;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp11_ = g_strdup_printf ("<atom:summary>%s</atom:summary>", _tmp10_);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (summary);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		summary = _tmp11_;
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp10_);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp8_);
-#line 4418 "PicasaPublishing.c"
+#line 3842 "PicasaPublishing.c"
 	}
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = self->priv->publishable;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp14_ = spit_publishing_publishable_get_publishing_keywords (_tmp12_, &_tmp13_);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	keywords = _tmp14_;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	keywords_length1 = _tmp13_;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 444 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_keywords_size_ = keywords_length1;
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = g_strdup ("");
-#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	keywords_string = _tmp15_;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16_ = keywords;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16__length1 = keywords_length1;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp16__length1 > 0) {
-#line 4440 "PicasaPublishing.c"
+#line 3864 "PicasaPublishing.c"
 		const gchar* _tmp47_ = NULL;
 		gchar* _tmp48_ = NULL;
 		const gchar* _tmp49_ = NULL;
 		gchar* _tmp50_ = NULL;
 		{
 			gint i = 0;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			i = 0;
-#line 4449 "PicasaPublishing.c"
+#line 3873 "PicasaPublishing.c"
 			{
 				gboolean _tmp17_ = FALSE;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp17_ = TRUE;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				while (TRUE) {
-#line 4456 "PicasaPublishing.c"
+#line 3880 "PicasaPublishing.c"
 					gint _tmp19_ = 0;
 					gchar** _tmp20_ = NULL;
 					gint _tmp20__length1 = 0;
@@ -4495,43 +3907,43 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 					const gchar* _tmp37_ = NULL;
 					gint _tmp38_ = 0;
 					gint _tmp39_ = 0;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (!_tmp17_) {
-#line 4473 "PicasaPublishing.c"
+#line 3897 "PicasaPublishing.c"
 						gint _tmp18_ = 0;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp18_ = i;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						i = _tmp18_ + 1;
-#line 4479 "PicasaPublishing.c"
+#line 3903 "PicasaPublishing.c"
 					}
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp17_ = FALSE;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp19_ = i;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp20_ = keywords;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp20__length1 = keywords_length1;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (!(_tmp19_ < _tmp20__length1)) {
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						break;
-#line 4493 "PicasaPublishing.c"
+#line 3917 "PicasaPublishing.c"
 					}
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp21_ = keywords;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp21__length1 = keywords_length1;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp22_ = i;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp23_ = _tmp21_[_tmp22_];
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp24_ = g_str_has_prefix (_tmp23_, "/");
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (_tmp24_) {
-#line 4507 "PicasaPublishing.c"
+#line 3931 "PicasaPublishing.c"
 						gchar** _tmp25_ = NULL;
 						gint _tmp25__length1 = 0;
 						gint _tmp26_ = 0;
@@ -4540,31 +3952,31 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						gchar* _tmp29_ = NULL;
 						gchar** _tmp30_ = NULL;
 						gchar** _tmp31_ = NULL;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp25_ = keywords;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp25__length1 = keywords_length1;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp26_ = i;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp27_ = _tmp25_[_tmp26_];
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp28_ = string_substring (_tmp27_, (glong) 1, (glong) -1);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp29_ = _tmp28_;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp31_ = _tmp30_ = g_strsplit (_tmp29_, "/", 0);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp = _tmp31_;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp_length1 = _vala_array_length (_tmp30_);
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp_size_ = tmp_length1;
-#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (_tmp29_);
-#line 4540 "PicasaPublishing.c"
+#line 3964 "PicasaPublishing.c"
 					} else {
 						gchar** _tmp32_ = NULL;
 						gint _tmp32__length1 = 0;
@@ -4572,143 +3984,143 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 						const gchar* _tmp34_ = NULL;
 						gchar** _tmp35_ = NULL;
 						gchar** _tmp36_ = NULL;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp32_ = keywords;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp32__length1 = keywords_length1;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp33_ = i;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp34_ = _tmp32_[_tmp33_];
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp36_ = _tmp35_ = g_strsplit (_tmp34_, "/", 0);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp = _tmp36_;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						tmp_length1 = _vala_array_length (_tmp35_);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp_size_ = tmp_length1;
-#line 4566 "PicasaPublishing.c"
+#line 3990 "PicasaPublishing.c"
 					}
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp37_ = keywords_string;
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp38_ = strlen (_tmp37_);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp39_ = _tmp38_;
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					if (_tmp39_ > 0) {
-#line 4576 "PicasaPublishing.c"
+#line 4000 "PicasaPublishing.c"
 						const gchar* _tmp40_ = NULL;
 						gchar** _tmp41_ = NULL;
 						gint _tmp41__length1 = 0;
 						gchar* _tmp42_ = NULL;
 						gchar* _tmp43_ = NULL;
 						gchar* _tmp44_ = NULL;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp40_ = keywords_string;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp41_ = tmp;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp41__length1 = tmp_length1;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp42_ = _vala_g_strjoinv (", ", _tmp41_, _tmp41__length1);
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp43_ = _tmp42_;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp44_ = g_strjoin (", ", _tmp40_, _tmp43_, NULL);
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (keywords_string);
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						keywords_string = _tmp44_;
-#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (_tmp43_);
-#line 4601 "PicasaPublishing.c"
+#line 4025 "PicasaPublishing.c"
 					} else {
 						gchar** _tmp45_ = NULL;
 						gint _tmp45__length1 = 0;
 						gchar* _tmp46_ = NULL;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp45_ = tmp;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp45__length1 = tmp_length1;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp46_ = _vala_g_strjoinv (", ", _tmp45_, _tmp45__length1);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_g_free0 (keywords_string);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						keywords_string = _tmp46_;
-#line 4616 "PicasaPublishing.c"
+#line 4040 "PicasaPublishing.c"
 					}
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					tmp = (_vala_array_free (tmp, tmp_length1, (GDestroyNotify) g_free), NULL);
-#line 4620 "PicasaPublishing.c"
+#line 4044 "PicasaPublishing.c"
 				}
 			}
 		}
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp47_ = keywords_string;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp48_ = publishing_rest_support_decimal_entity_encode (_tmp47_);
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (keywords_string);
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 461 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		keywords_string = _tmp48_;
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp49_ = keywords_string;
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp50_ = g_strdup_printf ("<mrss:group><mrss:keywords>%s</mrss:keywords></mrss:group>", _tmp49_);
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (keywords_string);
-#line 559 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		keywords_string = _tmp50_;
-#line 4640 "PicasaPublishing.c"
+#line 4064 "PicasaPublishing.c"
 	}
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp51_ = self->priv->publishable;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp52_ = spit_publishing_publishable_get_param_string (_tmp51_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp53_ = _tmp52_;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp54_ = publishing_rest_support_decimal_entity_encode (_tmp53_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp55_ = _tmp54_;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp56_ = summary;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp57_ = keywords_string;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp58_ = g_strdup_printf (PUBLISHING_PICASA_UPLOAD_TRANSACTION_METADATA_TEMPLATE, _tmp55_, _tmp56_, _tmp57_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp59_ = _tmp58_;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp55_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp53_);
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 465 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	metadata = _tmp59_;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp60_ = metadata;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp61_ = string_get_data (_tmp60_, &_tmp61__length1);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp62_ = _tmp61_;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp62__length1 = _tmp61__length1;
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp63_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp62_, _tmp62__length1);
-#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	metadata_buffer = _tmp63_;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp64_ = message_parts;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp65_ = metadata_buffer;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	soup_multipart_append_form_file (_tmp64_, "", "", "application/atom+xml", _tmp65_);
-#line 4684 "PicasaPublishing.c"
+#line 4108 "PicasaPublishing.c"
 	{
 		GMappedFile* _tmp66_ = NULL;
 		SpitPublishingPublishable* _tmp67_ = NULL;
@@ -4719,67 +4131,67 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		GMappedFile* _tmp72_ = NULL;
 		GMappedFile* _tmp73_ = NULL;
 		GMappedFile* _tmp74_ = NULL;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp67_ = self->priv->publishable;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp68_ = spit_publishing_publishable_get_serialized_file (_tmp67_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp69_ = _tmp68_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp70_ = g_file_get_path (_tmp69_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp71_ = _tmp70_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp72_ = g_mapped_file_new (_tmp71_, FALSE, &_inner_error_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp73_ = _tmp72_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp71_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_object_unref0 (_tmp69_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp66_ = _tmp73_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 4719 "PicasaPublishing.c"
-				goto __catch14_g_file_error;
+#line 4143 "PicasaPublishing.c"
+				goto __catch11_g_file_error;
 			}
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (metadata);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (keywords_string);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (summary);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_critical ("file %s: line %d: unexpected 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/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4740 "PicasaPublishing.c"
+#line 4164 "PicasaPublishing.c"
 		}
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp74_ = _tmp66_;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp66_ = NULL;
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_mapped_file_unref0 (self->priv->mapped_file);
-#line 570 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		self->priv->mapped_file = _tmp74_;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_mapped_file_unref0 (_tmp66_);
-#line 4752 "PicasaPublishing.c"
+#line 4176 "PicasaPublishing.c"
 	}
-	goto __finally14;
-	__catch14_g_file_error:
+	goto __finally11;
+	__catch11_g_file_error:
 	{
 		GError* e = NULL;
 		gchar* msg = NULL;
@@ -4795,283 +4207,283 @@ static void publishing_picasa_upload_transaction_real_execute (PublishingRESTSup
 		const gchar* _tmp84_ = NULL;
 		const gchar* _tmp85_ = NULL;
 		GError* _tmp86_ = NULL;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		e = _inner_error_;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = NULL;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp75_ = self->priv->publishable;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp76_ = spit_publishing_publishable_get_serialized_file (_tmp75_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp77_ = _tmp76_;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp78_ = g_file_get_path (_tmp77_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp79_ = _tmp78_;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp80_ = e;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp81_ = _tmp80_->message;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp82_ = g_strdup_printf ("Picasa: couldn't read data from %s: %s", _tmp79_, _tmp81_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp83_ = _tmp82_;
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (_tmp79_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_object_unref0 (_tmp77_);
-#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		msg = _tmp83_;
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp84_ = msg;
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_warning ("PicasaPublishing.vala:574: %s", _tmp84_);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		g_warning ("PicasaPublishing.vala:477: %s", _tmp84_);
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp85_ = msg;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp86_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp85_);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_inner_error_ = _tmp86_;
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_free0 (msg);
-#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_g_error_free0 (e);
-#line 4813 "PicasaPublishing.c"
-		goto __finally14;
+#line 4237 "PicasaPublishing.c"
+		goto __finally11;
 	}
-	__finally14:
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	__finally11:
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (metadata);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (keywords_string);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (summary);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4837 "PicasaPublishing.c"
+#line 4261 "PicasaPublishing.c"
 		} else {
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (metadata);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (keywords_string);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (summary);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4857 "PicasaPublishing.c"
+#line 4281 "PicasaPublishing.c"
 		}
 	}
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp87_ = self->priv->mapped_file;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp88_ = g_mapped_file_get_contents (_tmp87_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	photo_data = (guint8*) _tmp88_;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	photo_data_length1 = -1;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 481 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_photo_data_size_ = photo_data_length1;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp89_ = self->priv->mapped_file;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp90_ = g_mapped_file_get_length (_tmp89_);
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	photo_data_length1 = (gint) _tmp90_;
-#line 579 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp91_ = photo_data_length1;
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp92_ = soup_buffer_new (SOUP_MEMORY_TEMPORARY, photo_data, photo_data_length1);
-#line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	bindable_data = _tmp92_;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp93_ = message_parts;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp94_ = self->priv->publishable;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp95_ = spit_publishing_publishable_get_serialized_file (_tmp94_);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp96_ = _tmp95_;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp97_ = g_file_get_path (_tmp96_);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp98_ = _tmp97_;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp99_ = self->priv->mime_type;
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	soup_multipart_append_form_file (_tmp93_, "", _tmp98_, _tmp99_, bindable_data);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp98_);
-#line 586 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (_tmp96_);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp100_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp101_ = _tmp100_;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp102_ = message_parts;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp103_ = soup_form_request_new_from_multipart (_tmp101_, _tmp102_);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp104_ = _tmp103_;
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp101_);
-#line 590 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	outbound_message = _tmp104_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp105_ = outbound_message->request_headers;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp106_ = self->priv->session;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp107_ = publishing_rest_support_google_session_get_access_token (_tmp106_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp108_ = _tmp107_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp109_ = g_strconcat ("Bearer ", _tmp108_, NULL);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp110_ = _tmp109_;
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	soup_message_headers_append (_tmp105_, "Authorization", _tmp110_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp110_);
-#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 495 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (_tmp108_);
-#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_object_unref0 (outbound_message);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (metadata);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (keywords_string);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (summary);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4964 "PicasaPublishing.c"
+#line 4388 "PicasaPublishing.c"
 		} else {
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_object_unref0 (outbound_message);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (bindable_data);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (metadata);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (keywords_string);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_g_free0 (summary);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			__vala_SoupMultipart_free0 (message_parts);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 501 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return;
-#line 4988 "PicasaPublishing.c"
+#line 4412 "PicasaPublishing.c"
 		}
 	}
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (outbound_message);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__vala_SoupBuffer_free0 (bindable_data);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__vala_SoupBuffer_free0 (metadata_buffer);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (metadata);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (keywords_string);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	keywords = (_vala_array_free (keywords, keywords_length1, (GDestroyNotify) g_free), NULL);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (summary);
-#line 531 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__vala_SoupMultipart_free0 (message_parts);
-#line 5007 "PicasaPublishing.c"
+#line 4431 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_upload_transaction_class_init (PublishingPicasaUploadTransactionClass * klass) {
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_picasa_upload_transaction_finalize;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaUploadTransactionPrivate));
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_picasa_upload_transaction_real_execute;
-#line 5020 "PicasaPublishing.c"
+#line 4444 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_upload_transaction_instance_init (PublishingPicasaUploadTransaction * self) {
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 5027 "PicasaPublishing.c"
+#line 4451 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingPicasaUploadTransaction * self;
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOAD_TRANSACTION, PublishingPicasaUploadTransaction);
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 514 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 515 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->mime_type);
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 517 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_mapped_file_unref0 (self->priv->mapped_file);
-#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_picasa_upload_transaction_parent_class)->finalize (obj);
-#line 5047 "PicasaPublishing.c"
+#line 4471 "PicasaPublishing.c"
 }
 
 
@@ -5088,48 +4500,27 @@ GType publishing_picasa_upload_transaction_get_type (void) {
 
 
 static gpointer _publishing_picasa_publishing_options_pane_size_description_ref0 (gpointer self) {
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_publishing_options_pane_size_description_ref (self) : NULL;
-#line 5066 "PicasaPublishing.c"
-}
-
-
-static void _publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5073 "PicasaPublishing.c"
-}
-
-
-static void _publishing_picasa_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_on_create_new_radio_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5080 "PicasaPublishing.c"
-}
-
-
-static void _publishing_picasa_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed (GtkEditable* _sender, gpointer self) {
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_on_new_album_entry_changed ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5087 "PicasaPublishing.c"
+#line 4490 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_logout_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5094 "PicasaPublishing.c"
+#line 4497 "PicasaPublishing.c"
 }
 
 
 static void _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_on_publish_clicked ((PublishingPicasaPublishingOptionsPane*) self);
-#line 5101 "PicasaPublishing.c"
+#line 4504 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters) {
+PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_construct (GType object_type, GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) {
 	PublishingPicasaPublishingOptionsPane * self = NULL;
 	gint _tmp0_ = 0;
 	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp1_ = NULL;
@@ -5153,376 +4544,344 @@ PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane
 	GtkLabel* _tmp19_ = NULL;
 	GtkBuilder* _tmp20_ = NULL;
 	GObject* _tmp21_ = NULL;
-	GtkRadioButton* _tmp22_ = NULL;
+	GtkComboBoxText* _tmp22_ = NULL;
 	GtkBuilder* _tmp23_ = NULL;
 	GObject* _tmp24_ = NULL;
-	GtkComboBoxText* _tmp25_ = NULL;
+	GtkCheckButton* _tmp25_ = NULL;
 	GtkBuilder* _tmp26_ = NULL;
 	GObject* _tmp27_ = NULL;
-	GtkRadioButton* _tmp28_ = NULL;
+	GtkComboBoxText* _tmp28_ = NULL;
 	GtkBuilder* _tmp29_ = NULL;
 	GObject* _tmp30_ = NULL;
-	GtkEntry* _tmp31_ = NULL;
+	GtkCheckButton* _tmp31_ = NULL;
 	GtkBuilder* _tmp32_ = NULL;
 	GObject* _tmp33_ = NULL;
-	GtkCheckButton* _tmp34_ = NULL;
+	GtkButton* _tmp34_ = NULL;
 	GtkBuilder* _tmp35_ = NULL;
 	GObject* _tmp36_ = NULL;
-	GtkComboBoxText* _tmp37_ = NULL;
-	GtkBuilder* _tmp38_ = NULL;
-	GObject* _tmp39_ = NULL;
-	GtkCheckButton* _tmp40_ = NULL;
-	GtkBuilder* _tmp41_ = NULL;
-	GObject* _tmp42_ = NULL;
-	GtkButton* _tmp43_ = NULL;
-	GtkBuilder* _tmp44_ = NULL;
-	GObject* _tmp45_ = NULL;
-	GtkButton* _tmp46_ = NULL;
-	GtkLabel* _tmp47_ = NULL;
-	const gchar* _tmp48_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp49_ = NULL;
-	gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
-	gchar* _tmp52_ = NULL;
-	gchar* _tmp53_ = NULL;
-	GtkCheckButton* _tmp54_ = NULL;
-	PublishingPicasaPublishingParameters* _tmp55_ = NULL;
-	gboolean _tmp56_ = FALSE;
-	PublishingPicasaPublishingParameters* _tmp57_ = NULL;
-	SpitPublishingPublisherMediaType _tmp58_ = 0;
-	GtkRadioButton* _tmp75_ = NULL;
-	GtkRadioButton* _tmp76_ = NULL;
-	GtkEntry* _tmp77_ = NULL;
-	GtkButton* _tmp78_ = NULL;
-	GtkButton* _tmp79_ = NULL;
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	GtkButton* _tmp37_ = NULL;
+	gboolean _tmp38_ = FALSE;
+	GtkLabel* _tmp43_ = NULL;
+	const gchar* _tmp44_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp45_ = NULL;
+	gchar* _tmp46_ = NULL;
+	gchar* _tmp47_ = NULL;
+	gchar* _tmp48_ = NULL;
+	gchar* _tmp49_ = NULL;
+	GtkCheckButton* _tmp50_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp51_ = NULL;
+	gboolean _tmp52_ = FALSE;
+	PublishingPicasaPublishingParameters* _tmp53_ = NULL;
+	SpitPublishingPublisherMediaType _tmp54_ = 0;
+	GtkButton* _tmp71_ = NULL;
+	GtkButton* _tmp72_ = NULL;
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaPublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_picasa_publishing_options_pane_create_size_descriptions (self, &_tmp0_);
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->size_descriptions = (_vala_array_free (self->priv->size_descriptions, self->priv->size_descriptions_length1, (GDestroyNotify) publishing_picasa_publishing_options_pane_size_description_unref), NULL);
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->size_descriptions = _tmp1_;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->size_descriptions_length1 = _tmp0_;
-#line 636 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 536 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->_size_descriptions_size_ = self->priv->size_descriptions_length1;
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = builder;
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 638 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->builder = _tmp3_;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = builder;
-#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_vala_assert (_tmp4_ != NULL, "builder != null");
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = builder;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = gtk_builder_get_objects (_tmp5_);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = _tmp6_;
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = g_slist_length (_tmp7_);
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_vala_assert (_tmp8_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 540 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_slist_free0 (_tmp7_);
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = parameters;
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = _publishing_picasa_publishing_parameters_ref0 (_tmp9_);
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 642 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 542 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->parameters = _tmp10_;
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = builder;
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = gtk_builder_get_object (_tmp11_, "picasa_pane_widget");
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_box_get_type (), GtkBox));
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 645 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->pane_widget = _tmp13_;
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp14_ = builder;
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = gtk_builder_get_object (_tmp14_, "login_identity_label");
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_label_get_type (), GtkLabel));
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->login_identity_label);
-#line 646 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->login_identity_label = _tmp16_;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp17_ = builder;
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp18_ = gtk_builder_get_object (_tmp17_, "publish_to_label");
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_label_get_type (), GtkLabel));
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publish_to_label);
-#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->publish_to_label = _tmp19_;
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp20_ = builder;
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "use_existing_radio");
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->use_existing_radio);
-#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->use_existing_radio = _tmp22_;
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp23_ = builder;
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp24_ = gtk_builder_get_object (_tmp23_, "existing_albums_combo");
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp21_ = gtk_builder_get_object (_tmp20_, "existing_albums_combo");
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
-#line 649 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->existing_albums_combo = _tmp25_;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp26_ = builder;
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp27_ = gtk_builder_get_object (_tmp26_, "create_new_radio");
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->create_new_radio);
-#line 650 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->create_new_radio = _tmp28_;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp29_ = builder;
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp30_ = gtk_builder_get_object (_tmp29_, "new_album_entry");
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_entry_get_type (), GtkEntry));
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->new_album_entry);
-#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->new_album_entry = _tmp31_;
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp32_ = builder;
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp33_ = gtk_builder_get_object (_tmp32_, "public_check");
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_check_button_get_type (), GtkCheckButton));
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 548 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->existing_albums_combo = _tmp22_;
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp23_ = builder;
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp24_ = gtk_builder_get_object (_tmp23_, "public_check");
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_check_button_get_type (), GtkCheckButton));
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->public_check);
-#line 652 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->public_check = _tmp34_;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp35_ = builder;
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp36_ = gtk_builder_get_object (_tmp35_, "size_combo");
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_combo_box_text_get_type (), GtkComboBoxText));
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 549 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->public_check = _tmp25_;
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp26_ = builder;
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp27_ = gtk_builder_get_object (_tmp26_, "size_combo");
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_combo_box_text_get_type (), GtkComboBoxText));
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 653 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->size_combo = _tmp37_;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp38_ = self->priv->builder;
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp39_ = gtk_builder_get_object (_tmp38_, "strip_metadata_check");
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp40_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_check_button_get_type (), GtkCheckButton));
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->size_combo = _tmp28_;
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp29_ = self->priv->builder;
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp30_ = gtk_builder_get_object (_tmp29_, "strip_metadata_check");
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_check_button_get_type (), GtkCheckButton));
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 654 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->strip_metadata_check = _tmp40_;
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp41_ = builder;
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp42_ = gtk_builder_get_object (_tmp41_, "publish_button");
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp43_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_button_get_type (), GtkButton));
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 551 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->strip_metadata_check = _tmp31_;
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp32_ = builder;
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp33_ = gtk_builder_get_object (_tmp32_, "publish_button");
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp34_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_button_get_type (), GtkButton));
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->publish_button = _tmp43_;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp44_ = builder;
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp45_ = gtk_builder_get_object (_tmp44_, "logout_button");
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp46_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_button_get_type (), GtkButton));
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->publish_button = _tmp34_;
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp35_ = builder;
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp36_ = gtk_builder_get_object (_tmp35_, "logout_button");
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp37_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_button_get_type (), GtkButton));
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 656 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->logout_button = _tmp46_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp47_ = self->priv->login_identity_label;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp48_ = _ ("You are logged into Picasa Web Albums as %s.");
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp49_ = parameters;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp50_ = publishing_picasa_publishing_parameters_get_user_name (_tmp49_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp51_ = _tmp50_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp52_ = g_strdup_printf (_tmp48_, _tmp51_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp53_ = _tmp52_;
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_label_set_label (_tmp47_, _tmp53_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp53_);
-#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp51_);
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp54_ = self->priv->strip_metadata_check;
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp55_ = parameters;
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp56_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp55_);
-#line 661 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp56_);
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp57_ = parameters;
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp58_ = publishing_picasa_publishing_parameters_get_media_type (_tmp57_);
-#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if ((_tmp58_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
-#line 5373 "PicasaPublishing.c"
+#line 553 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	self->priv->logout_button = _tmp37_;
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp38_ = can_logout;
+#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if (!_tmp38_) {
+#line 4705 "PicasaPublishing.c"
+		GtkButton* _tmp39_ = NULL;
+		GtkContainer* _tmp40_ = NULL;
+		GtkContainer* _tmp41_ = NULL;
+		GtkButton* _tmp42_ = NULL;
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp39_ = self->priv->logout_button;
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp40_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp41_ = _tmp40_;
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp42_ = self->priv->logout_button;
+#line 556 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_container_remove (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
+#line 4720 "PicasaPublishing.c"
+	}
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp43_ = self->priv->login_identity_label;
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp44_ = _ ("You are logged into Picasa Web Albums as %s.");
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp45_ = parameters;
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp46_ = publishing_picasa_publishing_parameters_get_user_name (_tmp45_);
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp47_ = _tmp46_;
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp48_ = g_strdup_printf (_tmp44_, _tmp47_);
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp49_ = _tmp48_;
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	gtk_label_set_label (_tmp43_, _tmp49_);
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_g_free0 (_tmp49_);
+#line 560 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_g_free0 (_tmp47_);
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp50_ = self->priv->strip_metadata_check;
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp51_ = parameters;
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp52_ = publishing_picasa_publishing_parameters_get_strip_metadata (_tmp51_);
+#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp52_);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp53_ = parameters;
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp54_ = publishing_picasa_publishing_parameters_get_media_type (_tmp53_);
+#line 565 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if ((_tmp54_ & SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO) == 0) {
+#line 4756 "PicasaPublishing.c"
+		GtkLabel* _tmp55_ = NULL;
+		const gchar* _tmp56_ = NULL;
+		GtkComboBoxText* _tmp57_ = NULL;
+		GtkComboBoxText* _tmp58_ = NULL;
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp55_ = self->priv->publish_to_label;
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp56_ = _ ("Videos will appear in:");
+#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_label_set_label (_tmp55_, _tmp56_);
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp57_ = self->priv->size_combo;
+#line 567 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp58_ = self->priv->size_combo;
+#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), FALSE);
+#line 4775 "PicasaPublishing.c"
+	} else {
 		GtkLabel* _tmp59_ = NULL;
 		const gchar* _tmp60_ = NULL;
-		GtkComboBoxText* _tmp61_ = NULL;
-		GtkComboBoxText* _tmp62_ = NULL;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp61_ = NULL;
+		gint _tmp61__length1 = 0;
+		GtkComboBoxText* _tmp66_ = NULL;
+		GtkComboBoxText* _tmp67_ = NULL;
+		GtkComboBoxText* _tmp68_ = NULL;
+		PublishingPicasaPublishingParameters* _tmp69_ = NULL;
+		gint _tmp70_ = 0;
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp59_ = self->priv->publish_to_label;
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp60_ = _ ("Videos will appear in:");
-#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp60_ = _ ("Photos will appear in:");
+#line 571 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		gtk_label_set_label (_tmp59_, _tmp60_);
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp61_ = self->priv->size_combo;
-#line 666 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp62_ = self->priv->size_combo;
-#line 667 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5392 "PicasaPublishing.c"
-	} else {
-		GtkLabel* _tmp63_ = NULL;
-		const gchar* _tmp64_ = NULL;
-		PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp65_ = NULL;
-		gint _tmp65__length1 = 0;
-		GtkComboBoxText* _tmp70_ = NULL;
-		GtkComboBoxText* _tmp71_ = NULL;
-		GtkComboBoxText* _tmp72_ = NULL;
-		PublishingPicasaPublishingParameters* _tmp73_ = NULL;
-		gint _tmp74_ = 0;
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp63_ = self->priv->publish_to_label;
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp64_ = _ ("Photos will appear in:");
-#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_label_set_label (_tmp63_, _tmp64_);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp65_ = self->priv->size_descriptions;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp65__length1 = self->priv->size_descriptions_length1;
-#line 5413 "PicasaPublishing.c"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp61_ = self->priv->size_descriptions;
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp61__length1 = self->priv->size_descriptions_length1;
+#line 4796 "PicasaPublishing.c"
 		{
 			PublishingPicasaPublishingOptionsPaneSizeDescription** desc_collection = NULL;
 			gint desc_collection_length1 = 0;
 			gint _desc_collection_size_ = 0;
 			gint desc_it = 0;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			desc_collection = _tmp65_;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			desc_collection_length1 = _tmp65__length1;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			for (desc_it = 0; desc_it < _tmp65__length1; desc_it = desc_it + 1) {
-#line 5425 "PicasaPublishing.c"
-				PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp66_ = NULL;
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			desc_collection = _tmp61_;
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			desc_collection_length1 = _tmp61__length1;
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+			for (desc_it = 0; desc_it < _tmp61__length1; desc_it = desc_it + 1) {
+#line 4808 "PicasaPublishing.c"
+				PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp62_ = NULL;
 				PublishingPicasaPublishingOptionsPaneSizeDescription* desc = NULL;
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				_tmp66_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-				desc = _tmp66_;
-#line 5432 "PicasaPublishing.c"
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				_tmp62_ = _publishing_picasa_publishing_options_pane_size_description_ref0 (desc_collection[desc_it]);
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+				desc = _tmp62_;
+#line 4815 "PicasaPublishing.c"
 				{
-					GtkComboBoxText* _tmp67_ = NULL;
-					PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp68_ = NULL;
-					const gchar* _tmp69_ = NULL;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp67_ = self->priv->size_combo;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp68_ = desc;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp69_ = _tmp68_->name;
-#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					gtk_combo_box_text_append_text (_tmp67_, _tmp69_);
-#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					GtkComboBoxText* _tmp63_ = NULL;
+					PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp64_ = NULL;
+					const gchar* _tmp65_ = NULL;
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp63_ = self->priv->size_combo;
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp64_ = desc;
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp65_ = _tmp64_->name;
+#line 573 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					gtk_combo_box_text_append_text (_tmp63_, _tmp65_);
+#line 572 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_publishing_picasa_publishing_options_pane_size_description_unref0 (desc);
-#line 5447 "PicasaPublishing.c"
+#line 4830 "PicasaPublishing.c"
 				}
 			}
 		}
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp70_ = self->priv->size_combo;
-#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp71_ = self->priv->size_combo;
-#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp72_ = self->priv->size_combo;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp73_ = parameters;
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp74_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp73_);
-#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_combo_box_get_type (), GtkComboBox), _tmp74_);
-#line 5467 "PicasaPublishing.c"
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp66_ = self->priv->size_combo;
+#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp67_ = self->priv->size_combo;
+#line 576 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), TRUE);
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp68_ = self->priv->size_combo;
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp69_ = parameters;
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp70_ = publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (_tmp69_);
+#line 577 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_combo_box_get_type (), GtkComboBox), _tmp70_);
+#line 4850 "PicasaPublishing.c"
 	}
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp75_ = self->priv->use_existing_radio;
-#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked_gtk_button_clicked, self, 0);
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp76_ = self->priv->create_new_radio;
-#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_create_new_radio_clicked_gtk_button_clicked, self, 0);
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp77_ = self->priv->new_album_entry;
-#line 682 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, GTK_TYPE_EDITABLE, GtkEditable), "changed", (GCallback) _publishing_picasa_publishing_options_pane_on_new_album_entry_changed_gtk_editable_changed, self, 0);
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp78_ = self->priv->logout_button;
-#line 683 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp78_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp79_ = self->priv->publish_button;
-#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_signal_connect_object (_tmp79_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp71_ = self->priv->logout_button;
+#line 581 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_signal_connect_object (_tmp71_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp72_ = self->priv->publish_button;
+#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_signal_connect_object (_tmp72_, "clicked", (GCallback) _publishing_picasa_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 5491 "PicasaPublishing.c"
+#line 4862 "PicasaPublishing.c"
 }
 
 
-PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters) {
-#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return publishing_picasa_publishing_options_pane_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, builder, parameters);
-#line 5498 "PicasaPublishing.c"
+PublishingPicasaPublishingOptionsPane* publishing_picasa_publishing_options_pane_new (GtkBuilder* builder, PublishingPicasaPublishingParameters* parameters, gboolean can_logout) {
+#line 535 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	return publishing_picasa_publishing_options_pane_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, builder, parameters, can_logout);
+#line 4869 "PicasaPublishing.c"
 }
 
 
@@ -5532,425 +4891,212 @@ static void publishing_picasa_publishing_options_pane_on_publish_clicked (Publis
 	gint _tmp2_ = 0;
 	gint size_combo_last_active = 0;
 	PublishingPicasaPublishingParameters* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	PublishingPicasaPublishingParameters* _tmp7_ = NULL;
-	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	PublishingPicasaPublishingParameters* _tmp6_ = NULL;
+	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp7_ = NULL;
+	gint _tmp7__length1 = 0;
+	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp8_ = NULL;
 	gint _tmp9_ = 0;
-	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	PublishingPicasaPublishingParameters* _tmp12_ = NULL;
-	GtkCheckButton* _tmp13_ = NULL;
-	gboolean _tmp14_ = FALSE;
+	PublishingPicasaPublishingParameters* _tmp10_ = NULL;
+	GtkCheckButton* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
 	PublishingPicasaAlbum** albums = NULL;
-	PublishingPicasaPublishingParameters* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	PublishingPicasaAlbum** _tmp17_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp13_ = NULL;
+	gint _tmp14_ = 0;
+	PublishingPicasaAlbum** _tmp15_ = NULL;
 	gint albums_length1 = 0;
 	gint _albums_size_ = 0;
-	GtkRadioButton* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	PublishingPicasaPublishingParameters* _tmp16_ = NULL;
+	GtkComboBoxText* _tmp17_ = NULL;
+	gint _tmp18_ = 0;
+	PublishingPicasaAlbum* _tmp19_ = NULL;
+	const gchar* _tmp20_ = NULL;
+	PublishingPicasaPublishingParameters* _tmp21_ = NULL;
+	GtkComboBoxText* _tmp22_ = NULL;
+	gint _tmp23_ = 0;
+	PublishingPicasaAlbum* _tmp24_ = NULL;
+	const gchar* _tmp25_ = NULL;
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = self->priv->size_combo;
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox));
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (_tmp2_ >= 0) {
-#line 5534 "PicasaPublishing.c"
+#line 4911 "PicasaPublishing.c"
 		GtkComboBoxText* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp3_ = self->priv->size_combo;
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp4_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox));
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _tmp4_;
-#line 5543 "PicasaPublishing.c"
+#line 4920 "PicasaPublishing.c"
 	} else {
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = 0;
-#line 5547 "PicasaPublishing.c"
+#line 4924 "PicasaPublishing.c"
 	}
-#line 691 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 589 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	size_combo_last_active = _tmp0_;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = self->priv->parameters;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = size_combo_last_active;
-#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (_tmp5_, _tmp6_);
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = self->priv->parameters;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8_ = self->priv->size_descriptions;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp8__length1 = self->priv->size_descriptions_length1;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp9_ = size_combo_last_active;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = _tmp8_[_tmp9_];
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp11_ = _tmp10_->major_axis_pixels;
-#line 694 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_major_axis_size_pixels (_tmp7_, _tmp11_);
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp12_ = self->priv->parameters;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp13_ = self->priv->strip_metadata_check;
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp14_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_parameters_set_strip_metadata (_tmp12_, _tmp14_);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp15_ = self->priv->parameters;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp17_ = publishing_picasa_publishing_parameters_get_albums (_tmp15_, &_tmp16_);
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	albums = _tmp17_;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	albums_length1 = _tmp16_;
-#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (_tmp5_, size_combo_last_active);
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp6_ = self->priv->parameters;
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp7_ = self->priv->size_descriptions;
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp7__length1 = self->priv->size_descriptions_length1;
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp8_ = _tmp7_[size_combo_last_active];
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp9_ = _tmp8_->major_axis_pixels;
+#line 592 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_major_axis_size_pixels (_tmp6_, _tmp9_);
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp10_ = self->priv->parameters;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp11_ = self->priv->strip_metadata_check;
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp12_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_toggle_button_get_type (), GtkToggleButton));
+#line 594 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_strip_metadata (_tmp10_, _tmp12_);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp13_ = self->priv->parameters;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp15_ = publishing_picasa_publishing_parameters_get_albums (_tmp13_, &_tmp14_);
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	albums = _tmp15_;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	albums_length1 = _tmp14_;
+#line 596 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_albums_size_ = albums_length1;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp18_ = self->priv->create_new_radio;
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp19_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp19_) {
-#line 5595 "PicasaPublishing.c"
-		PublishingPicasaPublishingParameters* _tmp20_ = NULL;
-		GtkEntry* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
-		PublishingPicasaPublishingParameters* _tmp23_ = NULL;
-		PublishingPicasaPublishingParameters* _tmp24_ = NULL;
-		GtkCheckButton* _tmp25_ = NULL;
-		gboolean _tmp26_ = FALSE;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp20_ = self->priv->parameters;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp21_ = self->priv->new_album_entry;
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp22_ = gtk_entry_get_text (_tmp21_);
-#line 701 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_target_album_name (_tmp20_, _tmp22_);
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp23_ = self->priv->parameters;
-#line 702 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_is_to_new_album (_tmp23_, TRUE);
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp24_ = self->priv->parameters;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp25_ = self->priv->public_check;
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp26_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_is_new_album_public (_tmp24_, _tmp26_);
-#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_signal_emit_by_name (self, "publish");
-#line 5625 "PicasaPublishing.c"
-	} else {
-		PublishingPicasaPublishingParameters* _tmp27_ = NULL;
-		PublishingPicasaAlbum** _tmp28_ = NULL;
-		gint _tmp28__length1 = 0;
-		GtkComboBoxText* _tmp29_ = NULL;
-		gint _tmp30_ = 0;
-		PublishingPicasaAlbum* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		PublishingPicasaPublishingParameters* _tmp33_ = NULL;
-		PublishingPicasaPublishingParameters* _tmp34_ = NULL;
-		PublishingPicasaAlbum** _tmp35_ = NULL;
-		gint _tmp35__length1 = 0;
-		GtkComboBoxText* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		PublishingPicasaAlbum* _tmp38_ = NULL;
-		const gchar* _tmp39_ = NULL;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp27_ = self->priv->parameters;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp28_ = albums;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp28__length1 = albums_length1;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp29_ = self->priv->existing_albums_combo;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp30_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox));
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp31_ = _tmp28_[_tmp30_];
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp32_ = _tmp31_->name;
-#line 706 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_target_album_name (_tmp27_, _tmp32_);
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp33_ = self->priv->parameters;
-#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_is_to_new_album (_tmp33_, FALSE);
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp34_ = self->priv->parameters;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp35_ = albums;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp35__length1 = albums_length1;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp36_ = self->priv->existing_albums_combo;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp37_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_combo_box_get_type (), GtkComboBox));
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp38_ = _tmp35_[_tmp37_];
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp39_ = _tmp38_->url;
-#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp34_, _tmp39_);
-#line 709 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		g_signal_emit_by_name (self, "publish");
-#line 5680 "PicasaPublishing.c"
-	}
-#line 687 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp16_ = self->priv->parameters;
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp17_ = self->priv->existing_albums_combo;
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp18_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_combo_box_get_type (), GtkComboBox));
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp19_ = albums[_tmp18_];
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp20_ = _tmp19_->name;
+#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_target_album_name (_tmp16_, _tmp20_);
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp21_ = self->priv->parameters;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp22_ = self->priv->existing_albums_combo;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp23_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox));
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp24_ = albums[_tmp23_];
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp25_ = _tmp24_->url;
+#line 599 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	publishing_picasa_publishing_parameters_set_target_album_entry_url (_tmp21_, _tmp25_);
+#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	g_signal_emit_by_name (self, "publish");
+#line 585 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 5684 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_publishing_options_pane_on_use_existing_radio_clicked (PublishingPicasaPublishingOptionsPane* self) {
-	GtkComboBoxText* _tmp0_ = NULL;
-	GtkEntry* _tmp1_ = NULL;
-	GtkComboBoxText* _tmp2_ = NULL;
-	GtkCheckButton* _tmp3_ = NULL;
-#line 713 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->existing_albums_combo;
-#line 714 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = self->priv->new_album_entry;
-#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = self->priv->existing_albums_combo;
-#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = self->priv->public_check;
-#line 718 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 5713 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_publishing_options_pane_on_create_new_radio_clicked (PublishingPicasaPublishingOptionsPane* self) {
-	GtkEntry* _tmp0_ = NULL;
-	GtkComboBoxText* _tmp1_ = NULL;
-	GtkEntry* _tmp2_ = NULL;
-	GtkCheckButton* _tmp3_ = NULL;
-#line 721 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->new_album_entry;
-#line 722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = self->priv->existing_albums_combo;
-#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = self->priv->new_album_entry;
-#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 725 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp3_ = self->priv->public_check;
-#line 726 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 5742 "PicasaPublishing.c"
+#line 4990 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_on_logout_clicked (PublishingPicasaPublishingOptionsPane* self) {
-#line 729 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 5751 "PicasaPublishing.c"
-}
-
-
-static gchar* string_strip (const gchar* self) {
-	gchar* result = NULL;
-	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 5774 "PicasaPublishing.c"
+#line 4999 "PicasaPublishing.c"
 }
 
 
-static void publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (PublishingPicasaPublishingOptionsPane* self) {
-	gchar* album_name = NULL;
-	GtkEntry* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	GtkButton* _tmp10_ = NULL;
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->new_album_entry;
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp2_ = g_strdup (_tmp1_);
-#line 734 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	album_name = _tmp2_;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp4_ = album_name;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp5_ = string_strip (_tmp4_);
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp6_ = _tmp5_;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp7_ = g_strcmp0 (_tmp6_, "") == 0;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (_tmp6_);
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp7_) {
-#line 5811 "PicasaPublishing.c"
-		GtkRadioButton* _tmp8_ = NULL;
-		gboolean _tmp9_ = FALSE;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp8_ = self->priv->create_new_radio;
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp9_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp3_ = _tmp9_;
-#line 5820 "PicasaPublishing.c"
-	} else {
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp3_ = FALSE;
-#line 5824 "PicasaPublishing.c"
-	}
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp10_ = self->priv->publish_button;
-#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), !_tmp3_);
-#line 733 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_free0 (album_name);
-#line 5832 "PicasaPublishing.c"
-}
-
-
-static void publishing_picasa_publishing_options_pane_on_new_album_entry_changed (PublishingPicasaPublishingOptionsPane* self) {
-#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 5841 "PicasaPublishing.c"
-}
-
-
-static void _vala_array_add13 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5852 "PicasaPublishing.c"
+#line 5010 "PicasaPublishing.c"
 	}
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5858 "PicasaPublishing.c"
+#line 5016 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add14 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5869 "PicasaPublishing.c"
+#line 5027 "PicasaPublishing.c"
 	}
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5875 "PicasaPublishing.c"
+#line 5033 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add15 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5886 "PicasaPublishing.c"
+#line 5044 "PicasaPublishing.c"
 	}
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5892 "PicasaPublishing.c"
+#line 5050 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add16 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5903 "PicasaPublishing.c"
+#line 5061 "PicasaPublishing.c"
 	}
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5909 "PicasaPublishing.c"
+#line 5067 "PicasaPublishing.c"
 }
 
 
-static void _vala_array_add17 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+static void _vala_array_add18 (PublishingPicasaPublishingOptionsPaneSizeDescription*** array, int* length, int* size, PublishingPicasaPublishingOptionsPaneSizeDescription* value) {
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if ((*length) == (*size)) {
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*array = g_renew (PublishingPicasaPublishingOptionsPaneSizeDescription*, *array, (*size) + 1);
-#line 5920 "PicasaPublishing.c"
+#line 5078 "PicasaPublishing.c"
 	}
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[(*length)++] = value;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	(*array)[*length] = NULL;
-#line 5926 "PicasaPublishing.c"
+#line 5084 "PicasaPublishing.c"
 }
 
 
@@ -5982,81 +5128,81 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription** publishing_picasa_
 	PublishingPicasaPublishingOptionsPaneSizeDescription* _tmp15_ = NULL;
 	PublishingPicasaPublishingOptionsPaneSizeDescription** _tmp16_ = NULL;
 	gint _tmp16__length1 = 0;
-#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = g_new0 (PublishingPicasaPublishingOptionsPaneSizeDescription*, 0 + 1);
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_result_ = _tmp0_;
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_result__length1 = 0;
-#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	__result__size_ = _result__length1;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = _result_;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = _ ("Small (640 × 480 pixels)");
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp2_, 640);
-#line 746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add13 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = _result_;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = _ ("Medium (1024 × 768 pixels)");
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp5_, 1024);
-#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add14 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7_ = _result_;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp8_ = _ ("Recommended (1600 × 1200 pixels)");
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp9_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp8_, 1600);
-#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add15 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 612 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10_ = _result_;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp11_ = _ ("Google+ (2048 × 1536 pixels)");
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp12_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp11_, 2048);
-#line 749 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add16 (&_result_, &_result__length1, &__result__size_, _tmp12_);
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp13_ = _result_;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp13__length1 = _result__length1;
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp14_ = _ ("Original Size");
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp15_ = publishing_picasa_publishing_options_pane_size_description_new (_tmp14_, PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE);
-#line 750 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_vala_array_add17 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 614 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_vala_array_add18 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16_ = _result_;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp16__length1 = _result__length1;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (result_length1) {
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*result_length1 = _tmp16__length1;
-#line 6026 "PicasaPublishing.c"
+#line 5184 "PicasaPublishing.c"
 	}
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp16_;
-#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6032 "PicasaPublishing.c"
+#line 5190 "PicasaPublishing.c"
 }
 
 
@@ -6071,41 +5217,40 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 	PublishingPicasaAlbum** _tmp4_ = NULL;
 	gint albums_length1 = 0;
 	gint _albums_size_ = 0;
-	PublishingPicasaAlbum** _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	gint _tmp33_ = 0;
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 756 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	default_album_id = -1;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->parameters;
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishing_picasa_publishing_parameters_get_target_album_name (_tmp0_);
-#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	last_album = _tmp1_;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = self->priv->parameters;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = publishing_picasa_publishing_parameters_get_albums (_tmp2_, &_tmp3_);
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	albums = _tmp4_;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	albums_length1 = _tmp3_;
-#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_albums_size_ = albums_length1;
-#line 6069 "PicasaPublishing.c"
+#line 5226 "PicasaPublishing.c"
 	{
 		gint i = 0;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		i = 0;
-#line 6074 "PicasaPublishing.c"
+#line 5231 "PicasaPublishing.c"
 		{
 			gboolean _tmp5_ = FALSE;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			_tmp5_ = TRUE;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			while (TRUE) {
-#line 6081 "PicasaPublishing.c"
+#line 5238 "PicasaPublishing.c"
 				gint _tmp7_ = 0;
 				PublishingPicasaAlbum** _tmp8_ = NULL;
 				gint _tmp8__length1 = 0;
@@ -6122,209 +5267,158 @@ void publishing_picasa_publishing_options_pane_installed (PublishingPicasaPublis
 				PublishingPicasaAlbum* _tmp17_ = NULL;
 				const gchar* _tmp18_ = NULL;
 				const gchar* _tmp19_ = NULL;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (!_tmp5_) {
-#line 6100 "PicasaPublishing.c"
+#line 5257 "PicasaPublishing.c"
 					gint _tmp6_ = 0;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp6_ = i;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					i = _tmp6_ + 1;
-#line 6106 "PicasaPublishing.c"
+#line 5263 "PicasaPublishing.c"
 				}
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp5_ = FALSE;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp7_ = i;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp8_ = albums;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp8__length1 = albums_length1;
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (!(_tmp7_ < _tmp8__length1)) {
-#line 761 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					break;
-#line 6120 "PicasaPublishing.c"
+#line 5277 "PicasaPublishing.c"
 				}
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp9_ = self->priv->existing_albums_combo;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp10_ = albums;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp10__length1 = albums_length1;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp11_ = i;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp12_ = _tmp10_[_tmp11_];
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp13_ = _tmp12_->name;
-#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				gtk_combo_box_text_append_text (_tmp9_, _tmp13_);
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp15_ = albums;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp15__length1 = albums_length1;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp16_ = i;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp17_ = _tmp15_[_tmp16_];
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp18_ = _tmp17_->name;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				_tmp19_ = last_album;
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (g_strcmp0 (_tmp18_, _tmp19_) == 0) {
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp14_ = TRUE;
-#line 6152 "PicasaPublishing.c"
+#line 5309 "PicasaPublishing.c"
 				} else {
 					gboolean _tmp20_ = FALSE;
-					PublishingPicasaAlbum** _tmp21_ = NULL;
-					gint _tmp21__length1 = 0;
-					gint _tmp22_ = 0;
-					PublishingPicasaAlbum* _tmp23_ = NULL;
-					const gchar* _tmp24_ = NULL;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp21_ = albums;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp21__length1 = albums_length1;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp22_ = i;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp23_ = _tmp21_[_tmp22_];
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp24_ = _tmp23_->name;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					if (g_strcmp0 (_tmp24_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME) == 0) {
-#line 6172 "PicasaPublishing.c"
-						gint _tmp25_ = 0;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp25_ = default_album_id;
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-						_tmp20_ = _tmp25_ == -1;
-#line 6178 "PicasaPublishing.c"
+					gboolean _tmp21_ = FALSE;
+					PublishingPicasaAlbum** _tmp22_ = NULL;
+					gint _tmp22__length1 = 0;
+					gint _tmp23_ = 0;
+					PublishingPicasaAlbum* _tmp24_ = NULL;
+					const gchar* _tmp25_ = NULL;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp22_ = albums;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp22__length1 = albums_length1;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp23_ = i;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp24_ = _tmp22_[_tmp23_];
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp25_ = _tmp24_->name;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					if (g_strcmp0 (_tmp25_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME) == 0) {
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp21_ = TRUE;
+#line 5332 "PicasaPublishing.c"
 					} else {
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						PublishingPicasaAlbum** _tmp26_ = NULL;
+						gint _tmp26__length1 = 0;
+						gint _tmp27_ = 0;
+						PublishingPicasaAlbum* _tmp28_ = NULL;
+						const gchar* _tmp29_ = NULL;
+						const gchar* _tmp30_ = NULL;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp26_ = albums;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp26__length1 = albums_length1;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp27_ = i;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp28_ = _tmp26_[_tmp27_];
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp29_ = _tmp28_->name;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp30_ = _ ("Default album");
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp21_ = g_strcmp0 (_tmp29_, _tmp30_) == 0;
+#line 5354 "PicasaPublishing.c"
+					}
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					if (_tmp21_) {
+#line 5358 "PicasaPublishing.c"
+						gint _tmp31_ = 0;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp31_ = default_album_id;
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+						_tmp20_ = _tmp31_ == -1;
+#line 5364 "PicasaPublishing.c"
+					} else {
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 						_tmp20_ = FALSE;
-#line 6182 "PicasaPublishing.c"
+#line 5368 "PicasaPublishing.c"
 					}
-#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 					_tmp14_ = _tmp20_;
-#line 6186 "PicasaPublishing.c"
+#line 5372 "PicasaPublishing.c"
 				}
-#line 763 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 				if (_tmp14_) {
-#line 6190 "PicasaPublishing.c"
-					gint _tmp26_ = 0;
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					_tmp26_ = i;
-#line 765 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-					default_album_id = _tmp26_;
-#line 6196 "PicasaPublishing.c"
+#line 5376 "PicasaPublishing.c"
+					gint _tmp32_ = 0;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					_tmp32_ = i;
+#line 631 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+					default_album_id = _tmp32_;
+#line 5382 "PicasaPublishing.c"
 				}
 			}
 		}
 	}
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp27_ = albums;
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp27__length1 = albums_length1;
-#line 768 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	if (_tmp27__length1 == 0) {
-#line 6207 "PicasaPublishing.c"
-		GtkComboBoxText* _tmp28_ = NULL;
-		GtkRadioButton* _tmp29_ = NULL;
-		GtkRadioButton* _tmp30_ = NULL;
-		GtkEntry* _tmp31_ = NULL;
-		GtkEntry* _tmp32_ = NULL;
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp28_ = self->priv->existing_albums_combo;
-#line 769 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp29_ = self->priv->use_existing_radio;
-#line 770 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp30_ = self->priv->create_new_radio;
-#line 771 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp31_ = self->priv->new_album_entry;
-#line 772 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp32_ = self->priv->new_album_entry;
-#line 773 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		gtk_entry_set_text (_tmp32_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME);
-#line 6233 "PicasaPublishing.c"
-	} else {
-		gint _tmp33_ = 0;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		_tmp33_ = default_album_id;
-#line 775 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-		if (_tmp33_ >= 0) {
-#line 6240 "PicasaPublishing.c"
-			GtkRadioButton* _tmp34_ = NULL;
-			GtkComboBoxText* _tmp35_ = NULL;
-			gint _tmp36_ = 0;
-			GtkEntry* _tmp37_ = NULL;
-			GtkCheckButton* _tmp38_ = NULL;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp34_ = self->priv->use_existing_radio;
-#line 776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp35_ = self->priv->existing_albums_combo;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp36_ = default_album_id;
-#line 777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_combo_box_get_type (), GtkComboBox), _tmp36_);
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp37_ = self->priv->new_album_entry;
-#line 778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp38_ = self->priv->public_check;
-#line 779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 6264 "PicasaPublishing.c"
-		} else {
-			GtkRadioButton* _tmp39_ = NULL;
-			GtkComboBoxText* _tmp40_ = NULL;
-			GtkEntry* _tmp41_ = NULL;
-			GtkEntry* _tmp42_ = NULL;
-			GtkCheckButton* _tmp43_ = NULL;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp39_ = self->priv->create_new_radio;
-#line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp40_ = self->priv->existing_albums_combo;
-#line 782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp41_ = self->priv->new_album_entry;
-#line 783 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_entry_set_text (_tmp41_, PUBLISHING_PICASA_DEFAULT_ALBUM_NAME);
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp42_ = self->priv->new_album_entry;
-#line 784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			_tmp43_ = self->priv->public_check;
-#line 785 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 6291 "PicasaPublishing.c"
-		}
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	_tmp33_ = default_album_id;
+#line 634 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+	if (_tmp33_ >= 0) {
+#line 5391 "PicasaPublishing.c"
+		GtkComboBoxText* _tmp34_ = NULL;
+		gint _tmp35_ = 0;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp34_ = self->priv->existing_albums_combo;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		_tmp35_ = default_album_id;
+#line 635 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_combo_box_get_type (), GtkComboBox), _tmp35_);
+#line 5400 "PicasaPublishing.c"
 	}
-#line 788 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	publishing_picasa_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	albums = (_vala_array_free (albums, albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (last_album);
-#line 6300 "PicasaPublishing.c"
+#line 5406 "PicasaPublishing.c"
 }
 
 
@@ -6333,48 +5427,48 @@ static GtkWidget* publishing_picasa_publishing_options_pane_real_get_widget (Spi
 	GtkWidget* result = NULL;
 	GtkBox* _tmp0_ = NULL;
 	GtkWidget* _tmp1_ = NULL;
-#line 791 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 639 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp1_;
-#line 792 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 640 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6319 "PicasaPublishing.c"
+#line 5425 "PicasaPublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_picasa_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingPicasaPublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 795 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 643 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 796 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 644 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6332 "PicasaPublishing.c"
+#line 5438 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingPicasaPublishingOptionsPane * self;
-#line 799 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 647 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 800 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 648 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_installed (self);
-#line 6342 "PicasaPublishing.c"
+#line 5448 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingPicasaPublishingOptionsPane * self;
-#line 803 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 651 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 6350 "PicasaPublishing.c"
+#line 5456 "PicasaPublishing.c"
 }
 
 
@@ -6383,240 +5477,240 @@ static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_p
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaPublishingOptionsPaneSizeDescription*) g_type_create_instance (object_type);
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = name;
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
-#line 608 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 511 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->name = _tmp1_;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = major_axis_pixels;
-#line 609 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->major_axis_pixels = _tmp2_;
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 6377 "PicasaPublishing.c"
+#line 5483 "PicasaPublishing.c"
 }
 
 
 static PublishingPicasaPublishingOptionsPaneSizeDescription* publishing_picasa_publishing_options_pane_size_description_new (const gchar* name, gint major_axis_pixels) {
-#line 607 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 510 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_publishing_options_pane_size_description_construct (PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, name, major_axis_pixels);
-#line 6384 "PicasaPublishing.c"
+#line 5490 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_size_description_init (GValue* value) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 6391 "PicasaPublishing.c"
+#line 5497 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_size_description_free_value (GValue* value) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (value->data[0].v_pointer);
-#line 6400 "PicasaPublishing.c"
+#line 5506 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_size_description_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (src_value->data[0].v_pointer);
-#line 6410 "PicasaPublishing.c"
+#line 5516 "PicasaPublishing.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 6414 "PicasaPublishing.c"
+#line 5520 "PicasaPublishing.c"
 	}
 }
 
 
 static gpointer publishing_picasa_publishing_options_pane_value_size_description_peek_pointer (const GValue* value) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6422 "PicasaPublishing.c"
+#line 5528 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_publishing_options_pane_value_size_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 6429 "PicasaPublishing.c"
+#line 5535 "PicasaPublishing.c"
 		PublishingPicasaPublishingOptionsPaneSizeDescription* object;
 		object = collect_values[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6436 "PicasaPublishing.c"
+#line 5542 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 6440 "PicasaPublishing.c"
+#line 5546 "PicasaPublishing.c"
 		}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_publishing_options_pane_size_description_ref (object);
-#line 6444 "PicasaPublishing.c"
+#line 5550 "PicasaPublishing.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6448 "PicasaPublishing.c"
+#line 5554 "PicasaPublishing.c"
 	}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6452 "PicasaPublishing.c"
+#line 5558 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_publishing_options_pane_value_size_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!object_p) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 6463 "PicasaPublishing.c"
+#line 5569 "PicasaPublishing.c"
 	}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 6469 "PicasaPublishing.c"
+#line 5575 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 6473 "PicasaPublishing.c"
+#line 5579 "PicasaPublishing.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer);
-#line 6477 "PicasaPublishing.c"
+#line 5583 "PicasaPublishing.c"
 	}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 6481 "PicasaPublishing.c"
+#line 5587 "PicasaPublishing.c"
 }
 
 
 static GParamSpec* publishing_picasa_publishing_options_pane_param_spec_size_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingPicasaPublishingOptionsPaneParamSpecSizeDescription* spec;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION), NULL);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 6495 "PicasaPublishing.c"
+#line 5601 "PicasaPublishing.c"
 }
 
 
 static gpointer publishing_picasa_publishing_options_pane_value_get_size_description (const GValue* value) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION), NULL);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 6504 "PicasaPublishing.c"
+#line 5610 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_set_size_description (GValue* value, gpointer v_object) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription* old;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_ref (value->data[0].v_pointer);
-#line 6524 "PicasaPublishing.c"
+#line 5630 "PicasaPublishing.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6528 "PicasaPublishing.c"
+#line 5634 "PicasaPublishing.c"
 	}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 6534 "PicasaPublishing.c"
+#line 5640 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_publishing_options_pane_value_take_size_description (GValue* value, gpointer v_object) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription* old;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 6553 "PicasaPublishing.c"
+#line 5659 "PicasaPublishing.c"
 	} else {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 6557 "PicasaPublishing.c"
+#line 5663 "PicasaPublishing.c"
 	}
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_options_pane_size_description_unref (old);
-#line 6563 "PicasaPublishing.c"
+#line 5669 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_publishing_options_pane_size_description_class_init (PublishingPicasaPublishingOptionsPaneSizeDescriptionClass * klass) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_size_description_parent_class = g_type_class_peek_parent (klass);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaPublishingOptionsPaneSizeDescriptionClass *) klass)->finalize = publishing_picasa_publishing_options_pane_size_description_finalize;
-#line 6573 "PicasaPublishing.c"
+#line 5679 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_size_description_instance_init (PublishingPicasaPublishingOptionsPaneSizeDescription * self) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 6580 "PicasaPublishing.c"
+#line 5686 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_size_description_finalize (PublishingPicasaPublishingOptionsPaneSizeDescription* obj) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription * self;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_TYPE_SIZE_DESCRIPTION, PublishingPicasaPublishingOptionsPaneSizeDescription);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 604 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 507 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->name);
-#line 6592 "PicasaPublishing.c"
+#line 5698 "PicasaPublishing.c"
 }
 
 
@@ -6637,128 +5731,116 @@ static GType publishing_picasa_publishing_options_pane_size_description_get_type
 static gpointer publishing_picasa_publishing_options_pane_size_description_ref (gpointer instance) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription* self;
 	self = instance;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 6617 "PicasaPublishing.c"
+#line 5723 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_size_description_unref (gpointer instance) {
 	PublishingPicasaPublishingOptionsPaneSizeDescription* self;
 	self = instance;
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_SIZE_DESCRIPTION_GET_CLASS (self)->finalize (self);
-#line 603 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 506 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 6630 "PicasaPublishing.c"
+#line 5736 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_publishing_options_pane_class_init (PublishingPicasaPublishingOptionsPaneClass * klass) {
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaPublishingOptionsPanePrivate));
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_picasa_publishing_options_pane_finalize;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_new ("publish", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_new ("logout", PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 6646 "PicasaPublishing.c"
+#line 5752 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_get_widget;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_get_preferred_geometry;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_installed;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_picasa_publishing_options_pane_real_on_pane_uninstalled;
-#line 6661 "PicasaPublishing.c"
+#line 5767 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_instance_init (PublishingPicasaPublishingOptionsPane * self) {
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->builder = NULL;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->login_identity_label = NULL;
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->publish_to_label = NULL;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->use_existing_radio = NULL;
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->existing_albums_combo = NULL;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->create_new_radio = NULL;
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->new_album_entry = NULL;
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->public_check = NULL;
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->size_combo = NULL;
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->strip_metadata_check = NULL;
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->publish_button = NULL;
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->logout_button = NULL;
-#line 6694 "PicasaPublishing.c"
+#line 5794 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_options_pane_finalize (GObject* obj) {
 	PublishingPicasaPublishingOptionsPane * self;
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PUBLISHING_OPTIONS_PANE, PublishingPicasaPublishingOptionsPane);
-#line 616 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 519 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 521 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->login_identity_label);
-#line 619 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 522 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publish_to_label);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->use_existing_radio);
-#line 621 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 523 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->existing_albums_combo);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->create_new_radio);
-#line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_g_object_unref0 (self->priv->new_album_entry);
-#line 624 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->public_check);
-#line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 525 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->size_combo);
-#line 626 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 526 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->strip_metadata_check);
-#line 627 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 527 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 628 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 528 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 629 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->size_descriptions = (_vala_array_free (self->priv->size_descriptions, self->priv->size_descriptions_length1, (GDestroyNotify) publishing_picasa_publishing_options_pane_size_description_unref), NULL);
-#line 630 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_OBJECT_CLASS (publishing_picasa_publishing_options_pane_parent_class)->finalize (obj);
-#line 6734 "PicasaPublishing.c"
+#line 5828 "PicasaPublishing.c"
 }
 
 
@@ -6779,106 +5861,50 @@ GType publishing_picasa_publishing_options_pane_get_type (void) {
 PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_construct (GType object_type) {
 	PublishingPicasaPublishingParameters* self = NULL;
 	gchar* _tmp0_ = NULL;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaPublishingParameters*) g_type_create_instance (object_type);
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = g_strdup ("[unknown]");
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 822 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 669 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->user_name = _tmp0_;
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_name);
-#line 823 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 670 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_name = NULL;
-#line 824 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 671 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_selection_id = 0;
-#line 825 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 672 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_pixels = PUBLISHING_PICASA_PUBLISHING_PARAMETERS_ORIGINAL_SIZE;
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_url);
-#line 826 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 673 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_url = NULL;
-#line 827 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 674 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->album_public = FALSE;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = NULL;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums_length1 = 0;
-#line 828 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 675 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 829 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 676 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->strip_metadata = FALSE;
-#line 830 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 677 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->media_type = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_PHOTO;
-#line 831 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->to_new_album = TRUE;
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 6793 "PicasaPublishing.c"
+#line 5885 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaPublishingParameters* publishing_picasa_publishing_parameters_new (void) {
-#line 821 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 668 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_publishing_parameters_construct (PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS);
-#line 6800 "PicasaPublishing.c"
-}
-
-
-gboolean publishing_picasa_publishing_parameters_is_to_new_album (PublishingPicasaPublishingParameters* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 834 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), FALSE);
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->to_new_album;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	result = _tmp0_;
-#line 835 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return result;
-#line 6815 "PicasaPublishing.c"
-}
-
-
-void publishing_picasa_publishing_parameters_set_is_to_new_album (PublishingPicasaPublishingParameters* self, gboolean to_new_album) {
-	gboolean _tmp0_ = FALSE;
-#line 838 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = to_new_album;
-#line 839 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->to_new_album = _tmp0_;
-#line 6827 "PicasaPublishing.c"
-}
-
-
-void publishing_picasa_publishing_parameters_set_is_new_album_public (PublishingPicasaPublishingParameters* self, gboolean album_public) {
-	gboolean _tmp0_ = FALSE;
-#line 842 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = album_public;
-#line 843 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	self->priv->album_public = _tmp0_;
-#line 6839 "PicasaPublishing.c"
-}
-
-
-gboolean publishing_picasa_publishing_parameters_is_new_album_public (PublishingPicasaPublishingParameters* self) {
-	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
-#line 846 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), FALSE);
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	_tmp0_ = self->priv->album_public;
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	result = _tmp0_;
-#line 847 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
-	return result;
-#line 6854 "PicasaPublishing.c"
+#line 5892 "PicasaPublishing.c"
 }
 
 
@@ -6886,55 +5912,55 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_name (Publishing
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 850 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 680 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->target_album_name;
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp1_;
-#line 851 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 681 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6872 "PicasaPublishing.c"
+#line 5910 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_target_album_name (PublishingPicasaPublishingParameters* self, const gchar* target_album_name) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 854 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 684 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (target_album_name != NULL);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = target_album_name;
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_name);
-#line 855 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 685 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_name = _tmp1_;
-#line 6891 "PicasaPublishing.c"
+#line 5929 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_target_album_entry_url (PublishingPicasaPublishingParameters* self, const gchar* target_album_url) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 858 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 688 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (target_album_url != NULL);
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = target_album_url;
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_url);
-#line 859 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 689 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->target_album_url = _tmp1_;
-#line 6910 "PicasaPublishing.c"
+#line 5948 "PicasaPublishing.c"
 }
 
 
@@ -6942,17 +5968,17 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_entry_url (Publi
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 862 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 692 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->target_album_url;
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp1_;
-#line 863 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 693 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 6928 "PicasaPublishing.c"
+#line 5966 "PicasaPublishing.c"
 }
 
 
@@ -6965,7 +5991,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 6941 "PicasaPublishing.c"
+#line 5979 "PicasaPublishing.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -6996,8 +6022,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6972 "PicasaPublishing.c"
-				goto __catch15_g_regex_error;
+#line 6010 "PicasaPublishing.c"
+				goto __catch12_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7005,7 +6031,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 6981 "PicasaPublishing.c"
+#line 6019 "PicasaPublishing.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -7021,8 +6047,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 6997 "PicasaPublishing.c"
-				goto __catch15_g_regex_error;
+#line 6035 "PicasaPublishing.c"
+				goto __catch12_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -7032,7 +6058,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 7008 "PicasaPublishing.c"
+#line 6046 "PicasaPublishing.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -7046,10 +6072,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 7022 "PicasaPublishing.c"
+#line 6060 "PicasaPublishing.c"
 	}
-	goto __finally15;
-	__catch15_g_regex_error:
+	goto __finally12;
+	__catch12_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7060,9 +6086,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 7036 "PicasaPublishing.c"
+#line 6074 "PicasaPublishing.c"
 	}
-	__finally15:
+	__finally12:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7071,7 +6097,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 7047 "PicasaPublishing.c"
+#line 6085 "PicasaPublishing.c"
 	}
 }
 
@@ -7082,23 +6108,23 @@ gchar* publishing_picasa_publishing_parameters_get_target_album_feed_url (Publis
 	gchar* _tmp0_ = NULL;
 	gchar* feed_url = NULL;
 	gchar* _tmp1_ = NULL;
-#line 866 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 696 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_picasa_publishing_parameters_get_target_album_entry_url (self);
-#line 867 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 697 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	entry_url = _tmp0_;
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = string_replace (entry_url, "entry", "feed");
-#line 868 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	feed_url = _tmp1_;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = feed_url;
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (entry_url);
-#line 870 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 700 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7074 "PicasaPublishing.c"
+#line 6112 "PicasaPublishing.c"
 }
 
 
@@ -7106,64 +6132,64 @@ gchar* publishing_picasa_publishing_parameters_get_user_name (PublishingPicasaPu
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 873 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 703 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->user_name;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp1_;
-#line 874 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 704 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7092 "PicasaPublishing.c"
+#line 6130 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_user_name (PublishingPicasaPublishingParameters* self, const gchar* user_name) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 877 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 707 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (user_name != NULL);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = user_name;
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 878 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 708 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->user_name = _tmp1_;
-#line 7111 "PicasaPublishing.c"
+#line 6149 "PicasaPublishing.c"
 }
 
 
 static gpointer _publishing_picasa_album_ref0 (gpointer self) {
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self ? publishing_picasa_album_ref (self) : NULL;
-#line 7118 "PicasaPublishing.c"
+#line 6156 "PicasaPublishing.c"
 }
 
 
 static PublishingPicasaAlbum** _vala_array_dup5 (PublishingPicasaAlbum** self, int length) {
 	PublishingPicasaAlbum** result;
 	int i;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = g_new0 (PublishingPicasaAlbum*, length + 1);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 7129 "PicasaPublishing.c"
+#line 6167 "PicasaPublishing.c"
 		PublishingPicasaAlbum* _tmp0_ = NULL;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 7135 "PicasaPublishing.c"
+#line 6173 "PicasaPublishing.c"
 	}
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7139 "PicasaPublishing.c"
+#line 6177 "PicasaPublishing.c"
 }
 
 
@@ -7175,52 +6201,52 @@ PublishingPicasaAlbum** publishing_picasa_publishing_parameters_get_albums (Publ
 	gint _tmp1__length1 = 0;
 	PublishingPicasaAlbum** _tmp2_ = NULL;
 	gint _tmp2__length1 = 0;
-#line 881 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 711 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->albums;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0__length1 = self->priv->albums_length1;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2__length1 = _tmp1__length1;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (result_length1) {
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*result_length1 = _tmp2__length1;
-#line 7169 "PicasaPublishing.c"
+#line 6207 "PicasaPublishing.c"
 	}
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp2_;
-#line 882 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 712 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7175 "PicasaPublishing.c"
+#line 6213 "PicasaPublishing.c"
 }
 
 
 static PublishingPicasaAlbum** _vala_array_dup6 (PublishingPicasaAlbum** self, int length) {
 	PublishingPicasaAlbum** result;
 	int i;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = g_new0 (PublishingPicasaAlbum*, length + 1);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 7186 "PicasaPublishing.c"
+#line 6224 "PicasaPublishing.c"
 		PublishingPicasaAlbum* _tmp0_ = NULL;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		_tmp0_ = _publishing_picasa_album_ref0 (self[i]);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		result[i] = _tmp0_;
-#line 7192 "PicasaPublishing.c"
+#line 6230 "PicasaPublishing.c"
 	}
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7196 "PicasaPublishing.c"
+#line 6234 "PicasaPublishing.c"
 }
 
 
@@ -7229,351 +6255,351 @@ void publishing_picasa_publishing_parameters_set_albums (PublishingPicasaPublish
 	gint _tmp0__length1 = 0;
 	PublishingPicasaAlbum** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 885 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 715 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = albums;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0__length1 = albums_length1;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = _tmp1_;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums_length1 = _tmp1__length1;
-#line 886 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 716 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->_albums_size_ = self->priv->albums_length1;
-#line 7223 "PicasaPublishing.c"
+#line 6261 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_major_axis_size_pixels (PublishingPicasaPublishingParameters* self, gint pixels) {
 	gint _tmp0_ = 0;
-#line 889 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 719 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = pixels;
-#line 890 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 720 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_pixels = _tmp0_;
-#line 7235 "PicasaPublishing.c"
+#line 6273 "PicasaPublishing.c"
 }
 
 
 gint publishing_picasa_publishing_parameters_get_major_axis_size_pixels (PublishingPicasaPublishingParameters* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 893 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 723 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0);
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->major_axis_size_pixels;
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp0_;
-#line 894 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 724 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7250 "PicasaPublishing.c"
+#line 6288 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self, gint selection_id) {
 	gint _tmp0_ = 0;
-#line 897 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 727 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = selection_id;
-#line 898 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 728 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->major_axis_size_selection_id = _tmp0_;
-#line 7262 "PicasaPublishing.c"
+#line 6300 "PicasaPublishing.c"
 }
 
 
 gint publishing_picasa_publishing_parameters_get_major_axis_size_selection_id (PublishingPicasaPublishingParameters* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 901 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 731 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0);
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->major_axis_size_selection_id;
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp0_;
-#line 902 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 732 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7277 "PicasaPublishing.c"
+#line 6315 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_strip_metadata (PublishingPicasaPublishingParameters* self, gboolean strip_metadata) {
 	gboolean _tmp0_ = FALSE;
-#line 905 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 735 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = strip_metadata;
-#line 906 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->strip_metadata = _tmp0_;
-#line 7289 "PicasaPublishing.c"
+#line 6327 "PicasaPublishing.c"
 }
 
 
 gboolean publishing_picasa_publishing_parameters_get_strip_metadata (PublishingPicasaPublishingParameters* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 909 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 739 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), FALSE);
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->strip_metadata;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp0_;
-#line 910 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7304 "PicasaPublishing.c"
+#line 6342 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_set_media_type (PublishingPicasaPublishingParameters* self, SpitPublishingPublisherMediaType media_type) {
 	SpitPublishingPublisherMediaType _tmp0_ = 0;
-#line 913 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 743 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self));
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = media_type;
-#line 914 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 744 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->media_type = _tmp0_;
-#line 7316 "PicasaPublishing.c"
+#line 6354 "PicasaPublishing.c"
 }
 
 
 SpitPublishingPublisherMediaType publishing_picasa_publishing_parameters_get_media_type (PublishingPicasaPublishingParameters* self) {
 	SpitPublishingPublisherMediaType result = 0;
 	SpitPublishingPublisherMediaType _tmp0_ = 0;
-#line 917 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 747 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (self), 0);
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = self->priv->media_type;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp0_;
-#line 918 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 748 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7331 "PicasaPublishing.c"
+#line 6369 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_publishing_parameters_init (GValue* value) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 7338 "PicasaPublishing.c"
+#line 6376 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_value_publishing_parameters_free_value (GValue* value) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (value->data[0].v_pointer);
-#line 7347 "PicasaPublishing.c"
+#line 6385 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 7357 "PicasaPublishing.c"
+#line 6395 "PicasaPublishing.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 7361 "PicasaPublishing.c"
+#line 6399 "PicasaPublishing.c"
 	}
 }
 
 
 static gpointer publishing_picasa_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7369 "PicasaPublishing.c"
+#line 6407 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 7376 "PicasaPublishing.c"
+#line 6414 "PicasaPublishing.c"
 		PublishingPicasaPublishingParameters* object;
 		object = collect_values[0].v_pointer;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7383 "PicasaPublishing.c"
+#line 6421 "PicasaPublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 7387 "PicasaPublishing.c"
+#line 6425 "PicasaPublishing.c"
 		}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = publishing_picasa_publishing_parameters_ref (object);
-#line 7391 "PicasaPublishing.c"
+#line 6429 "PicasaPublishing.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7395 "PicasaPublishing.c"
+#line 6433 "PicasaPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 7399 "PicasaPublishing.c"
+#line 6437 "PicasaPublishing.c"
 }
 
 
 static gchar* publishing_picasa_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingPicasaPublishingParameters** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!object_p) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 7410 "PicasaPublishing.c"
+#line 6448 "PicasaPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = NULL;
-#line 7416 "PicasaPublishing.c"
+#line 6454 "PicasaPublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 7420 "PicasaPublishing.c"
+#line 6458 "PicasaPublishing.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		*object_p = publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 7424 "PicasaPublishing.c"
+#line 6462 "PicasaPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return NULL;
-#line 7428 "PicasaPublishing.c"
+#line 6466 "PicasaPublishing.c"
 }
 
 
 GParamSpec* publishing_picasa_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingPicasaParamSpecPublishingParameters* spec;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 7442 "PicasaPublishing.c"
+#line 6480 "PicasaPublishing.c"
 }
 
 
 gpointer publishing_picasa_value_get_publishing_parameters (const GValue* value) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return value->data[0].v_pointer;
-#line 7451 "PicasaPublishing.c"
+#line 6489 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_value_set_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingPicasaPublishingParameters* old;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_ref (value->data[0].v_pointer);
-#line 7471 "PicasaPublishing.c"
+#line 6509 "PicasaPublishing.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7475 "PicasaPublishing.c"
+#line 6513 "PicasaPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (old);
-#line 7481 "PicasaPublishing.c"
+#line 6519 "PicasaPublishing.c"
 	}
 }
 
 
 void publishing_picasa_value_take_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingPicasaPublishingParameters* old;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	old = value->data[0].v_pointer;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (v_object) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 7500 "PicasaPublishing.c"
+#line 6538 "PicasaPublishing.c"
 	} else {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 7504 "PicasaPublishing.c"
+#line 6542 "PicasaPublishing.c"
 	}
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (old) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		publishing_picasa_publishing_parameters_unref (old);
-#line 7510 "PicasaPublishing.c"
+#line 6548 "PicasaPublishing.c"
 	}
 }
 
 
 static void publishing_picasa_publishing_parameters_class_init (PublishingPicasaPublishingParametersClass * klass) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingPicasaPublishingParametersClass *) klass)->finalize = publishing_picasa_publishing_parameters_finalize;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaPublishingParametersPrivate));
-#line 7522 "PicasaPublishing.c"
+#line 6560 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_parameters_instance_init (PublishingPicasaPublishingParameters * self) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->ref_count = 1;
-#line 7531 "PicasaPublishing.c"
+#line 6569 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_publishing_parameters_finalize (PublishingPicasaPublishingParameters* obj) {
 	PublishingPicasaPublishingParameters * self;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_PUBLISHING_PARAMETERS, PublishingPicasaPublishingParameters);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 810 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 658 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_name);
-#line 811 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 659 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->target_album_url);
-#line 816 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 664 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 817 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 665 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->albums = (_vala_array_free (self->priv->albums, self->priv->albums_length1, (GDestroyNotify) publishing_picasa_album_unref), NULL);
-#line 7549 "PicasaPublishing.c"
+#line 6587 "PicasaPublishing.c"
 }
 
 
@@ -7594,24 +6620,24 @@ GType publishing_picasa_publishing_parameters_get_type (void) {
 gpointer publishing_picasa_publishing_parameters_ref (gpointer instance) {
 	PublishingPicasaPublishingParameters* self;
 	self = instance;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return instance;
-#line 7574 "PicasaPublishing.c"
+#line 6612 "PicasaPublishing.c"
 }
 
 
 void publishing_picasa_publishing_parameters_unref (gpointer instance) {
 	PublishingPicasaPublishingParameters* self;
 	self = instance;
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		PUBLISHING_PICASA_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 655 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 7587 "PicasaPublishing.c"
+#line 6625 "PicasaPublishing.c"
 	}
 }
 
@@ -7623,36 +6649,36 @@ PublishingPicasaUploader* publishing_picasa_uploader_construct (GType object_typ
 	gint _tmp1__length1 = 0;
 	PublishingPicasaPublishingParameters* _tmp2_ = NULL;
 	PublishingPicasaPublishingParameters* _tmp3_ = NULL;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PICASA_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = session;
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = publishables;
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 927 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 757 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = (PublishingPicasaUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = parameters;
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = _publishing_picasa_publishing_parameters_ref0 (_tmp2_);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 929 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 759 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return self;
-#line 7621 "PicasaPublishing.c"
+#line 6659 "PicasaPublishing.c"
 }
 
 
 PublishingPicasaUploader* publishing_picasa_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingPicasaPublishingParameters* parameters) {
-#line 925 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 755 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return publishing_picasa_uploader_construct (PUBLISHING_PICASA_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 7628 "PicasaPublishing.c"
+#line 6666 "PicasaPublishing.c"
 }
 
 
@@ -7666,65 +6692,65 @@ static PublishingRESTSupportTransaction* publishing_picasa_uploader_real_create_
 	SpitPublishingPublishable* _tmp4_ = NULL;
 	PublishingPicasaUploadTransaction* _tmp5_ = NULL;
 	PublishingRESTSupportTransaction* _tmp6_ = NULL;
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploader);
-#line 932 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 762 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp2_ = self->priv->parameters;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp3_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp5_ = publishing_picasa_upload_transaction_new (_tmp1_, _tmp2_, _tmp4_);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_g_object_unref0 (_tmp4_);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	result = _tmp6_;
-#line 934 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 764 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	return result;
-#line 7668 "PicasaPublishing.c"
+#line 6706 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_uploader_class_init (PublishingPicasaUploaderClass * klass) {
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	publishing_picasa_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_picasa_uploader_finalize;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingPicasaUploaderPrivate));
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_picasa_uploader_real_create_transaction;
-#line 7681 "PicasaPublishing.c"
+#line 6719 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_uploader_instance_init (PublishingPicasaUploader * self) {
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self->priv = PUBLISHING_PICASA_UPLOADER_GET_PRIVATE (self);
-#line 7688 "PicasaPublishing.c"
+#line 6726 "PicasaPublishing.c"
 }
 
 
 static void publishing_picasa_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingPicasaUploader * self;
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_PICASA_TYPE_UPLOADER, PublishingPicasaUploader);
-#line 923 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 753 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	_publishing_picasa_publishing_parameters_unref0 (self->priv->parameters);
-#line 922 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
+#line 752 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PicasaPublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_picasa_uploader_parent_class)->finalize (obj);
-#line 7700 "PicasaPublishing.c"
+#line 6738 "PicasaPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala b/plugins/shotwell-publishing/PicasaPublishing.vala
index 976ba42..d72ce6d 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.vala
+++ b/plugins/shotwell-publishing/PicasaPublishing.vala
@@ -55,15 +55,14 @@ public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service {
 
 namespace Publishing.Picasa {
 
-internal const string SERVICE_WELCOME_MESSAGE = 
-    _("You are not currently logged into Picasa Web Albums.\n\nClick 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.");
 internal const string DEFAULT_ALBUM_NAME = _("Shotwell Connect");
 
 public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
+    private const string DEFAULT_ALBUM_FEED_URL = "https://picasaweb.google.com/data/feed/api/user/default/albumid/default";
     private bool running;
     private Spit.Publishing.ProgressCallback progress_reporter;
     private PublishingParameters publishing_parameters;
-    private string? refresh_token;
+    private Spit.Publishing.Authenticator authenticator;
 
     public PicasaPublisher(Spit.Publishing.Service service,
         Spit.Publishing.PluginHost host) {
@@ -77,7 +76,6 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
             media_type |= p.get_media_type();
         publishing_parameters.set_media_type(media_type);
         
-        this.refresh_token = host.get_config_string("refresh_token", null);
         this.progress_reporter = null;
     }
 
@@ -94,6 +92,9 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
             throw new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("response root node " +
                 "isn't a <feed> or <entry>");
 
+        // Add album that will push to the default feed for all the new users
+        result += new Album(_("Default album"), DEFAULT_ALBUM_FEED_URL);
+
         for ( ; doc_node_iter != null; doc_node_iter = doc_node_iter->next) {
             if (doc_node_iter->name != "entry")
                 continue;
@@ -114,6 +115,11 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
                 }
             }
 
+            // If default album is present in the result list, just skip it because we added it on top anyway
+            if (url_val == DEFAULT_ALBUM_FEED_URL) {
+                continue;
+            }
+
             result += new Album(name_val, url_val);
         }
 
@@ -132,19 +138,9 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
         get_host().set_config_string("last-album", parameters.get_target_album_name());
     }
 
-    private void on_service_welcome_login() {
-        debug("EVENT: user clicked 'Login' in welcome pane.");
-
-        if (!is_running())
-            return;
-        
-        start_oauth_flow(refresh_token);
-    }
-
     protected override void on_login_flow_complete() {
         debug("EVENT: OAuth login flow complete.");
 
-        get_host().set_config_string("refresh_token", get_session().get_refresh_token());
 
         publishing_parameters.set_user_name(get_session().get_user_name());
         
@@ -199,66 +195,9 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
 
         save_parameters_to_configuration_system(publishing_parameters);
 
-        if (publishing_parameters.is_to_new_album()) {
-            do_create_album();
-        } else {
-            do_upload();
-        }
-    }
-
-    private void on_album_creation_complete(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_album_creation_complete);
-        txn.network_error.disconnect(on_album_creation_error);
-        
-        if (!is_running())
-            return;
-            
-        debug("EVENT: finished creating album on remote server.");
-
-        AlbumCreationTransaction downcast_txn = (AlbumCreationTransaction) txn;
-        Publishing.RESTSupport.XmlDocument response_doc;
-        try {
-            response_doc = Publishing.RESTSupport.XmlDocument.parse_string(
-                downcast_txn.get_response(), AlbumDirectoryTransaction.validate_xml);
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host().post_error(err);
-            return;
-        }
-
-        Album[] response_albums;
-        try {
-            response_albums = extract_albums_helper(response_doc.get_root_node());
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host().post_error(err);
-            return;
-        }
-
-        if (response_albums.length != 1) {
-            get_host().post_error(new Spit.Publishing.PublishingError.MALFORMED_RESPONSE("album " +
-                "creation transaction responses must contain one and only one album directory " +
-                "entry"));
-            return;
-        }
-
-        publishing_parameters.set_target_album_entry_url(response_albums[0].url);
-
         do_upload();
     }
 
-    private void on_album_creation_error(Publishing.RESTSupport.Transaction bad_txn,
-        Spit.Publishing.PublishingError err) {
-        bad_txn.completed.disconnect(on_album_creation_complete);
-        bad_txn.network_error.disconnect(on_album_creation_error);
-        
-        if (!is_running())
-            return;
-            
-        debug("EVENT: creating album on remote server failed; response = '%s'.",
-            bad_txn.get_response());
-
-        get_host().post_error(err);
-    }
-
     private void on_upload_status_updated(int file_number, double completed_fraction) {
         if (!is_running())
             return;
@@ -296,12 +235,6 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
         get_host().post_error(err);
     }
 
-    private void do_show_service_welcome_pane() {
-        debug("ACTION: showing service welcome pane.");
-
-        get_host().install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_service_welcome_login);
-    }
-
     private void do_fetch_account_information() {
         debug("ACTION: fetching account and album information.");
 
@@ -350,10 +283,7 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
         Gtk.Builder builder = new Gtk.Builder();
 
         try {
-            // the trailing get_path() is required, since add_from_file can't cope
-            // with File objects directly and expects a pathname instead.
-            builder.add_from_resource(Resources.RESOURCE_PATH + "/" +
-                "picasa_publishing_options_pane.ui");
+            builder.add_from_resource(Resources.RESOURCE_PATH + "/" + "picasa_publishing_options_pane.ui");
         } catch (Error e) {
             warning("Could not parse UI file! Error: %s.", e.message);
             get_host().post_error(
@@ -362,7 +292,7 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
             return;
         }
 
-        PublishingOptionsPane opts_pane = new PublishingOptionsPane(builder, publishing_parameters);
+        var opts_pane = new PublishingOptionsPane(builder, publishing_parameters, this.authenticator.can_logout());
         opts_pane.publish.connect(on_publishing_options_publish);
         opts_pane.logout.connect(on_publishing_options_logout);
         get_host().install_dialog_pane(opts_pane);
@@ -370,27 +300,6 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
         get_host().set_service_locked(false);
     }
 
-    private void do_create_album() {
-        assert(publishing_parameters.is_to_new_album());
-
-        debug("ACTION: creating new album '%s' on remote server.",
-            publishing_parameters.get_target_album_name());
-
-        get_host().install_static_message_pane(_("Creating album…"));
-
-        get_host().set_service_locked(true);
-
-        AlbumCreationTransaction creation_trans = new AlbumCreationTransaction(get_session(),
-            publishing_parameters);
-        creation_trans.network_error.connect(on_album_creation_error);
-        creation_trans.completed.connect(on_album_creation_complete);
-        try {
-            creation_trans.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host().post_error(err);
-        }
-    }
-
     private void do_upload() {       
         debug("ACTION: uploading media items to remote server.");
 
@@ -425,13 +334,12 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
 
     protected override void do_logout() {
         debug("ACTION: logging out user.");
-        
         get_session().deauthenticate();
-        refresh_token = null;
-        get_host().unset_config_key("refresh_token");
-          
 
-        do_show_service_welcome_pane();
+        if (this.authenticator.can_logout()) {
+            this.authenticator.logout();
+            this.authenticator.authenticate();
+        }
     }
 
     public override bool is_running() {
@@ -446,10 +354,7 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
 
         running = true;
 
-        if (refresh_token == null)
-            do_show_service_welcome_pane();
-        else
-            start_oauth_flow(refresh_token);
+        this.authenticator.authenticate();
     }
 
     public override void stop() {
@@ -459,6 +364,14 @@ public class PicasaPublisher : Publishing.RESTSupport.GooglePublisher {
 
         running = false;
     }
+
+    protected override Spit.Publishing.Authenticator get_authenticator() {
+        if (this.authenticator == null) {
+            this.authenticator = Publishing.Authenticator.Factory.get_instance().create("picasa", get_host());
+        }
+
+        return this.authenticator;
+    }
 }
 
 internal class Album {
@@ -489,24 +402,6 @@ internal class AlbumDirectoryTransaction :
     }
 }
 
-private class AlbumCreationTransaction :
-    Publishing.RESTSupport.GooglePublisher.AuthenticatedTransaction {
-    private const string ENDPOINT_URL = "https://picasaweb.google.com/data/feed/api/user/" +
-        "default";
-    private const string ALBUM_ENTRY_TEMPLATE = "<?xml version='1.0' encoding='utf-8'?><entry xmlns='http://www.w3.org/2005/Atom' xmlns:gphoto='http://schemas.google.com/photos/2007'><title type='text'>%s</title><gphoto:access>%s</gphoto:access><category scheme='http://schemas.google.com/g/2005#kind' term='http://schemas.google.com/photos/2007#album'></category></entry>";
-    
-    public AlbumCreationTransaction(Publishing.RESTSupport.GoogleSession session,
-        PublishingParameters parameters) {
-        base(session, ENDPOINT_URL, Publishing.RESTSupport.HttpMethod.POST);
-
-        string post_body = ALBUM_ENTRY_TEMPLATE.printf(Publishing.RESTSupport.decimal_entity_encode(
-            parameters.get_target_album_name()), parameters.is_new_album_public() ?
-            "public" : "private");
-
-        set_custom_payload(post_body, "application/atom+xml");
-    }
-}
-
 internal class UploadTransaction :
     Publishing.RESTSupport.GooglePublisher.AuthenticatedTransaction {
     private PublishingParameters parameters;
@@ -524,8 +419,16 @@ internal class UploadTransaction :
         this.session = session;
         this.parameters = parameters;
         this.publishable = publishable;
-        this.mime_type = (publishable.get_media_type() == Spit.Publishing.Publisher.MediaType.VIDEO) ?
-            "video/mpeg" : "image/jpeg";
+        if (publishable.get_media_type() == Spit.Publishing.Publisher.MediaType.VIDEO) {
+            try {
+                var info = this.publishable.get_serialized_file().query_info(FileAttribute.STANDARD_CONTENT_TYPE, FileQueryInfoFlags.NONE);
+                this.mime_type = ContentType.get_mime_type(info.get_content_type());
+            } catch (Error err) {
+                this.mime_type = "video/mpeg";
+            }
+        } else {
+            this.mime_type = "image/jpeg";
+        }
     }
 
     public override void execute() throws Spit.Publishing.PublishingError {
@@ -617,10 +520,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     private Gtk.Box pane_widget = null;
     private Gtk.Label login_identity_label = null;
     private Gtk.Label publish_to_label = null;
-    private Gtk.RadioButton use_existing_radio = null;
     private Gtk.ComboBoxText existing_albums_combo = null;
-    private Gtk.RadioButton create_new_radio = null;
-    private Gtk.Entry new_album_entry = null;
     private Gtk.CheckButton public_check = null;
     private Gtk.ComboBoxText size_combo = null;
     private Gtk.CheckButton strip_metadata_check = null;
@@ -632,7 +532,7 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     public signal void publish();
     public signal void logout();
 
-    public PublishingOptionsPane(Gtk.Builder builder, PublishingParameters parameters) {
+    public PublishingOptionsPane(Gtk.Builder builder, PublishingParameters parameters, bool can_logout) {
         size_descriptions = create_size_descriptions();
 
         this.builder = builder;
@@ -645,16 +545,17 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         pane_widget = (Gtk.Box) builder.get_object("picasa_pane_widget");
         login_identity_label = (Gtk.Label) builder.get_object("login_identity_label");
         publish_to_label = (Gtk.Label) builder.get_object("publish_to_label");
-        use_existing_radio = (Gtk.RadioButton) builder.get_object("use_existing_radio");
         existing_albums_combo = (Gtk.ComboBoxText) builder.get_object("existing_albums_combo");
-        create_new_radio = (Gtk.RadioButton) builder.get_object("create_new_radio");
-        new_album_entry = (Gtk.Entry) builder.get_object("new_album_entry");
         public_check = (Gtk.CheckButton) builder.get_object("public_check");
         size_combo = (Gtk.ComboBoxText) builder.get_object("size_combo");
         strip_metadata_check = (Gtk.CheckButton) this.builder.get_object("strip_metadata_check");
         publish_button = (Gtk.Button) builder.get_object("publish_button");
         logout_button = (Gtk.Button) builder.get_object("logout_button");
 
+        if (!can_logout) {
+            logout_button.parent.remove(logout_button);
+        }
+
         // populate any widgets whose contents are programmatically-generated.
         login_identity_label.set_label(_("You are logged into Picasa Web Albums as %s.").printf(
             parameters.get_user_name()));
@@ -677,9 +578,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         }
 
         // connect all signals.
-        use_existing_radio.clicked.connect(on_use_existing_radio_clicked);
-        create_new_radio.clicked.connect(on_create_new_radio_clicked);
-        new_album_entry.changed.connect(on_new_album_entry_changed);
         logout_button.clicked.connect(on_logout_clicked);
         publish_button.clicked.connect(on_publish_clicked);
     }
@@ -697,49 +595,15 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         
         Album[] albums = parameters.get_albums();
 
-        if (create_new_radio.get_active()) {
-            parameters.set_target_album_name(new_album_entry.get_text());
-            parameters.set_is_to_new_album(true);
-            parameters.set_is_new_album_public(public_check.get_active());
-            publish();
-        } else {
-            parameters.set_target_album_name(albums[existing_albums_combo.get_active()].name);
-            parameters.set_is_to_new_album(false);
-            parameters.set_target_album_entry_url(albums[existing_albums_combo.get_active()].url);
-            publish();
-        }
-    }
-
-    private void on_use_existing_radio_clicked() {
-        existing_albums_combo.set_sensitive(true);
-        new_album_entry.set_sensitive(false);
-        existing_albums_combo.grab_focus();
-        update_publish_button_sensitivity();
-        public_check.set_sensitive(false);
-    }
-
-    private void on_create_new_radio_clicked() {
-        new_album_entry.set_sensitive(true);
-        existing_albums_combo.set_sensitive(false);
-        new_album_entry.grab_focus();
-        update_publish_button_sensitivity();
-        public_check.set_sensitive(true);
+        parameters.set_target_album_name(albums[existing_albums_combo.get_active()].name);
+        parameters.set_target_album_entry_url(albums[existing_albums_combo.get_active()].url);
+        publish();
     }
 
     private void on_logout_clicked() {
         logout();
     }
 
-    private void update_publish_button_sensitivity() {
-        string album_name = new_album_entry.get_text();
-        publish_button.set_sensitive(!(album_name.strip() == "" &&
-            create_new_radio.get_active()));
-    }
-
-    private void on_new_album_entry_changed() {
-        update_publish_button_sensitivity();
-    }
-
     private SizeDescription[] create_size_descriptions() {
         SizeDescription[] result = new SizeDescription[0];
 
@@ -760,32 +624,16 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
         
         for (int i = 0; i < albums.length; i++) {
             existing_albums_combo.append_text(albums[i].name);
+            // 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
             if (albums[i].name == last_album ||
-                (albums[i].name == DEFAULT_ALBUM_NAME && default_album_id == -1))
+                ((albums[i].name == DEFAULT_ALBUM_NAME || albums[i].name == _("Default album")) && default_album_id == -1))
                 default_album_id = i;
         }
 
-        if (albums.length == 0) {
-            existing_albums_combo.set_sensitive(false);
-            use_existing_radio.set_sensitive(false);
-            create_new_radio.set_active(true);
-            new_album_entry.grab_focus();
-            new_album_entry.set_text(DEFAULT_ALBUM_NAME);
-        } else {
-            if (default_album_id >= 0) {
-                use_existing_radio.set_active(true);
-                existing_albums_combo.set_active(default_album_id);
-                new_album_entry.set_sensitive(false);
-                public_check.set_sensitive(false);
-            } else {
-                create_new_radio.set_active(true);
-                existing_albums_combo.set_active(0);
-                new_album_entry.set_text(DEFAULT_ALBUM_NAME);
-                new_album_entry.grab_focus();
-                public_check.set_sensitive(true);
-            }
+        if (default_album_id >= 0) {
+            existing_albums_combo.set_active(default_album_id);
         }
-        update_publish_button_sensitivity();
     }
 
     public Gtk.Widget get_widget() {
@@ -816,7 +664,6 @@ internal class PublishingParameters {
     private string user_name;
     private Album[] albums;
     private Spit.Publishing.Publisher.MediaType media_type;
-    private bool to_new_album;
 
     public PublishingParameters() {
         this.user_name = "[unknown]";
@@ -828,23 +675,6 @@ internal class PublishingParameters {
         this.albums = null;
         this.strip_metadata = false;
         this.media_type = Spit.Publishing.Publisher.MediaType.PHOTO;
-        this.to_new_album = true;
-    }
-    
-    public bool is_to_new_album() {
-        return to_new_album;
-    }
-    
-    public void set_is_to_new_album(bool to_new_album) {
-        this.to_new_album = to_new_album;
-    }
-    
-    public void set_is_new_album_public(bool album_public) {
-        this.album_public = album_public;
-    }
-    
-    public bool is_new_album_public() {
-        return album_public;
     }
     
     public string get_target_album_name() {
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.c b/plugins/shotwell-publishing/PiwigoPublishing.c
index 820936f..8d6eaa6 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.c
+++ b/plugins/shotwell-publishing/PiwigoPublishing.c
@@ -698,8 +698,8 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
 GType publishing_piwigo_ssl_error_pane_get_type (void) G_GNUC_CONST;
 PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host);
 PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_construct (GType object_type, PublishingPiwigoSessionLoginTransaction* transaction, const gchar* host);
-static void __lambda6_ (PublishingPiwigoPiwigoPublisher* self);
-static void ___lambda6__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self);
+static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self);
+static void ___lambda7__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self);
 static void _vala_SoupURI_free (SoupURI* self);
 gchar* publishing_piwigo_piwigo_publisher_normalise_url (const gchar* url);
 PublishingPiwigoSessionLoginTransaction* publishing_piwigo_session_login_transaction_new (PublishingPiwigoSession* session, const gchar* url, const gchar* username, const gchar* password);
@@ -737,7 +737,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_add34 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value);
+static void _vala_array_add35 (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);
@@ -798,11 +798,11 @@ enum  {
 static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base);
 gchar* publishing_piwigo_ssl_error_pane_get_host (PublishingPiwigoSSLErrorPane* self);
 gchar* publishing_piwigo_ssl_error_pane_get_error_text (PublishingPiwigoSSLErrorPane* self);
-static void __lambda4_ (PublishingPiwigoSSLErrorPane* self);
-static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self);
-static void ___lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void __lambda5_ (PublishingPiwigoSSLErrorPane* self);
+static GTlsCertificate* publishing_piwigo_ssl_error_pane_get_cert (PublishingPiwigoSSLErrorPane* self);
 static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void __lambda6_ (PublishingPiwigoSSLErrorPane* self);
+static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self);
 static void publishing_piwigo_ssl_error_pane_set_host (PublishingPiwigoSSLErrorPane* self, const gchar* value);
 static void publishing_piwigo_ssl_error_pane_set_cert (PublishingPiwigoSSLErrorPane* self, GTlsCertificate* value);
 static void publishing_piwigo_ssl_error_pane_set_error_text (PublishingPiwigoSSLErrorPane* self, const gchar* value);
@@ -868,16 +868,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_add35 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value);
 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 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* 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_add44 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value);
+static void _vala_array_add45 (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);
@@ -3124,7 +3124,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_authentication_pane (Publ
 }
 
 
-static void __lambda6_ (PublishingPiwigoPiwigoPublisher* self) {
+static void __lambda7_ (PublishingPiwigoPiwigoPublisher* self) {
 	PublishingPiwigoSession* _tmp0_ = NULL;
 	PublishingPiwigoSession* _tmp1_ = NULL;
 	gchar* persistent_url = NULL;
@@ -3224,9 +3224,9 @@ static void __lambda6_ (PublishingPiwigoPiwigoPublisher* self) {
 }
 
 
-static void ___lambda6__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self) {
+static void ___lambda7__publishing_piwigo_ssl_error_pane_proceed (PublishingPiwigoSSLErrorPane* _sender, gpointer self) {
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	__lambda6_ ((PublishingPiwigoPiwigoPublisher*) self);
+	__lambda7_ ((PublishingPiwigoPiwigoPublisher*) self);
 #line 3229 "PiwigoPublishing.c"
 }
 
@@ -3276,7 +3276,7 @@ static void publishing_piwigo_piwigo_publisher_do_show_ssl_downgrade_pane (Publi
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	ssl_pane = _tmp5_;
 #line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (ssl_pane, "proceed", (GCallback) ___lambda6__publishing_piwigo_ssl_error_pane_proceed, self, 0);
+	g_signal_connect_object (ssl_pane, "proceed", (GCallback) ___lambda7__publishing_piwigo_ssl_error_pane_proceed, self, 0);
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = self->priv->host;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3459,7 +3459,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 3460 "PiwigoPublishing.c"
-				goto __catch32_spit_publishing_publishing_error;
+				goto __catch23_spit_publishing_publishing_error;
 			}
 #line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (login_trans);
@@ -3472,8 +3472,8 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 #line 3471 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally32;
-	__catch32_spit_publishing_publishing_error:
+	goto __finally23;
+	__catch23_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
@@ -3508,7 +3508,7 @@ static void publishing_piwigo_piwigo_publisher_do_network_login (PublishingPiwig
 		_g_error_free0 (err);
 #line 3508 "PiwigoPublishing.c"
 	}
-	__finally32:
+	__finally23:
 #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"
@@ -3722,7 +3722,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 3723 "PiwigoPublishing.c"
-				goto __catch33_spit_publishing_publishing_error;
+				goto __catch24_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);
@@ -3733,8 +3733,8 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 #line 3732 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally33;
-	__catch33_spit_publishing_publishing_error:
+	goto __finally24;
+	__catch24_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -3767,7 +3767,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 3768 "PiwigoPublishing.c"
-					goto __catch34_spit_publishing_publishing_error;
+					goto __catch25_spit_publishing_publishing_error;
 				}
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_error_free0 (err);
@@ -3780,8 +3780,8 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 #line 3779 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally34;
-		__catch34_spit_publishing_publishing_error:
+		goto __finally25;
+		__catch25_spit_publishing_publishing_error:
 		{
 			GError* code = NULL;
 			gint code_int = 0;
@@ -3824,7 +3824,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 			_g_error_free0 (code);
 #line 3824 "PiwigoPublishing.c"
 		}
-		__finally34:
+		__finally25:
 #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"
@@ -3845,7 +3845,7 @@ static void publishing_piwigo_piwigo_publisher_on_login_network_complete (Publis
 		return;
 #line 3845 "PiwigoPublishing.c"
 	}
-	__finally33:
+	__finally24:
 #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"
@@ -4038,7 +4038,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 4039 "PiwigoPublishing.c"
-					goto __catch35_spit_publishing_publishing_error;
+					goto __catch26_spit_publishing_publishing_error;
 				}
 #line 487 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
@@ -4051,8 +4051,8 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 #line 4050 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally35;
-		__catch35_spit_publishing_publishing_error:
+		goto __finally26;
+		__catch26_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
 			GError* _tmp11_ = NULL;
@@ -4071,7 +4071,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			_g_error_free0 (err);
 #line 4070 "PiwigoPublishing.c"
 		}
-		__finally35:
+		__finally26:
 #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"
@@ -4119,7 +4119,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 4119 "PiwigoPublishing.c"
-					goto __catch36_spit_publishing_publishing_error;
+					goto __catch27_spit_publishing_publishing_error;
 				}
 #line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_transaction_unref0 (status_txn);
@@ -4132,8 +4132,8 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 #line 4130 "PiwigoPublishing.c"
 			}
 		}
-		goto __finally36;
-		__catch36_spit_publishing_publishing_error:
+		goto __finally27;
+		__catch27_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
 			GError* _tmp17_ = NULL;
@@ -4152,7 +4152,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_session_status (Publishi
 			_g_error_free0 (err);
 #line 4150 "PiwigoPublishing.c"
 		}
-		__finally36:
+		__finally27:
 #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"
@@ -4266,7 +4266,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 4265 "PiwigoPublishing.c"
-					goto __catch37_spit_publishing_publishing_error;
+					goto __catch28_spit_publishing_publishing_error;
 				}
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_g_free0 (pwg_id);
@@ -4319,7 +4319,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 4318 "PiwigoPublishing.c"
-						goto __catch38_spit_publishing_publishing_error;
+						goto __catch29_spit_publishing_publishing_error;
 					}
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_publishing_rest_support_xml_document_unref0 (doc);
@@ -4383,8 +4383,8 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				_g_free0 (username);
 #line 4381 "PiwigoPublishing.c"
 			}
-			goto __finally38;
-			__catch38_spit_publishing_publishing_error:
+			goto __finally29;
+			__catch29_spit_publishing_publishing_error:
 			{
 				GError* err2 = NULL;
 				GError* _tmp35_ = NULL;
@@ -4411,7 +4411,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 				return;
 #line 4408 "PiwigoPublishing.c"
 			}
-			__finally38:
+			__finally29:
 #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"
@@ -4419,7 +4419,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 4417 "PiwigoPublishing.c"
-					goto __catch37_spit_publishing_publishing_error;
+					goto __catch28_spit_publishing_publishing_error;
 				}
 #line 529 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 				_publishing_rest_support_xml_document_unref0 (doc);
@@ -4439,8 +4439,8 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			_publishing_rest_support_xml_document_unref0 (doc);
 #line 4436 "PiwigoPublishing.c"
 		}
-		goto __finally37;
-		__catch37_spit_publishing_publishing_error:
+		goto __finally28;
+		__catch28_spit_publishing_publishing_error:
 		{
 			GError* err = NULL;
 			GError* _tmp36_ = NULL;
@@ -4465,7 +4465,7 @@ static void publishing_piwigo_piwigo_publisher_on_session_get_status_complete (P
 			return;
 #line 4461 "PiwigoPublishing.c"
 		}
-		__finally37:
+		__finally28:
 #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"
@@ -4589,7 +4589,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 4586 "PiwigoPublishing.c"
-				goto __catch39_spit_publishing_publishing_error;
+				goto __catch30_spit_publishing_publishing_error;
 			}
 #line 584 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (cat_trans);
@@ -4602,8 +4602,8 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 #line 4597 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally39;
-	__catch39_spit_publishing_publishing_error:
+	goto __finally30;
+	__catch30_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -4621,7 +4621,7 @@ static void publishing_piwigo_piwigo_publisher_do_fetch_categories (PublishingPi
 		_g_error_free0 (err);
 #line 4617 "PiwigoPublishing.c"
 	}
-	__finally39:
+	__finally30:
 #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"
@@ -4647,7 +4647,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_add34 (PublishingPiwigoCategory*** array, int* length, int* size, PublishingPiwigoCategory* value) {
+static void _vala_array_add35 (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"
@@ -4764,7 +4764,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 4761 "PiwigoPublishing.c"
-				goto __catch40_spit_publishing_publishing_error;
+				goto __catch31_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);
@@ -4889,7 +4889,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 4886 "PiwigoPublishing.c"
-						goto __catch40_spit_publishing_publishing_error;
+						goto __catch31_spit_publishing_publishing_error;
 					}
 #line 623 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (id_map);
@@ -4942,7 +4942,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 4939 "PiwigoPublishing.c"
-						goto __catch40_spit_publishing_publishing_error;
+						goto __catch31_spit_publishing_publishing_error;
 					}
 #line 625 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 					_g_object_unref0 (id_map);
@@ -5023,7 +5023,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_add34 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_);
+				_vala_array_add35 (&self->priv->categories, &self->priv->categories_length1, &self->priv->_categories_size_, _tmp51_);
 #line 5022 "PiwigoPublishing.c"
 			}
 		}
@@ -5227,8 +5227,8 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		_publishing_rest_support_xml_document_unref0 (doc);
 #line 5223 "PiwigoPublishing.c"
 	}
-	goto __finally40;
-	__catch40_spit_publishing_publishing_error:
+	goto __finally31;
+	__catch31_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp82_ = NULL;
@@ -5248,7 +5248,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_fetch_complete (Publi
 		return;
 #line 5244 "PiwigoPublishing.c"
 	}
-	__finally40:
+	__finally31:
 #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"
@@ -5437,7 +5437,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 5433 "PiwigoPublishing.c"
-				goto __catch41_spit_publishing_publishing_error;
+				goto __catch32_spit_publishing_publishing_error;
 			}
 #line 698 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (logout_trans);
@@ -5450,8 +5450,8 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 #line 5444 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally41;
-	__catch41_spit_publishing_publishing_error:
+	goto __finally32;
+	__catch32_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -5470,7 +5470,7 @@ static void publishing_piwigo_piwigo_publisher_on_publishing_options_pane_logout
 		_g_error_free0 (err);
 #line 5464 "PiwigoPublishing.c"
 	}
-	__finally41:
+	__finally32:
 #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"
@@ -5798,7 +5798,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 5792 "PiwigoPublishing.c"
-				goto __catch42_spit_publishing_publishing_error;
+				goto __catch33_spit_publishing_publishing_error;
 			}
 #line 781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_transaction_unref0 (creation_trans);
@@ -5811,8 +5811,8 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 #line 5803 "PiwigoPublishing.c"
 		}
 	}
-	goto __finally42;
-	__catch42_spit_publishing_publishing_error:
+	goto __finally33;
+	__catch33_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp25_ = NULL;
@@ -5830,7 +5830,7 @@ static void publishing_piwigo_piwigo_publisher_do_create_category (PublishingPiw
 		_g_error_free0 (err);
 #line 5823 "PiwigoPublishing.c"
 	}
-	__finally42:
+	__finally33:
 #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"
@@ -5925,7 +5925,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 5919 "PiwigoPublishing.c"
-				goto __catch43_spit_publishing_publishing_error;
+				goto __catch34_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);
@@ -5956,7 +5956,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 5950 "PiwigoPublishing.c"
-				goto __catch43_spit_publishing_publishing_error;
+				goto __catch34_spit_publishing_publishing_error;
 			}
 #line 807 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_publishing_rest_support_xml_document_unref0 (doc);
@@ -6000,8 +6000,8 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		_publishing_rest_support_xml_document_unref0 (doc);
 #line 5993 "PiwigoPublishing.c"
 	}
-	goto __finally43;
-	__catch43_spit_publishing_publishing_error:
+	goto __finally34;
+	__catch34_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		GError* _tmp23_ = NULL;
@@ -6019,7 +6019,7 @@ static void publishing_piwigo_piwigo_publisher_on_category_add_complete (Publish
 		_g_error_free0 (err);
 #line 6012 "PiwigoPublishing.c"
 	}
-	__finally43:
+	__finally34:
 #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"
@@ -6974,7 +6974,7 @@ PublishingPiwigoSSLErrorPane* publishing_piwigo_ssl_error_pane_new (PublishingPi
 }
 
 
-static void __lambda4_ (PublishingPiwigoSSLErrorPane* self) {
+static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
 	GcrSimpleCertificate* simple_cert = NULL;
 	GTlsCertificate* _tmp0_ = NULL;
 	GByteArray* _tmp1_ = NULL;
@@ -7106,23 +7106,23 @@ static void __lambda4_ (PublishingPiwigoSSLErrorPane* self) {
 }
 
 
-static void ___lambda4__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	__lambda4_ ((PublishingPiwigoSSLErrorPane*) self);
+	__lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
 #line 7103 "PiwigoPublishing.c"
 }
 
 
-static void __lambda5_ (PublishingPiwigoSSLErrorPane* self) {
+static void __lambda6_ (PublishingPiwigoSSLErrorPane* self) {
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_signal_emit_by_name (self, "proceed");
 #line 7110 "PiwigoPublishing.c"
 }
 
 
-static void ___lambda5__gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void ___lambda6__gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	__lambda5_ ((PublishingPiwigoSSLErrorPane*) self);
+	__lambda6_ ((PublishingPiwigoSSLErrorPane*) self);
 #line 7117 "PiwigoPublishing.c"
 }
 
@@ -7248,7 +7248,7 @@ static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
 #line 1036 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	info = _tmp25_;
 #line 1037 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (info, "clicked", (GCallback) ___lambda4__gtk_button_clicked, self, 0);
+	g_signal_connect_object (info, "clicked", (GCallback) ___lambda5__gtk_button_clicked, self, 0);
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp26_ = shotwell_plugins_common_builder_pane_get_builder (G_TYPE_CHECK_INSTANCE_CAST (self, SHOTWELL_PLUGINS_COMMON_TYPE_BUILDER_PANE, ShotwellPluginsCommonBuilderPane));
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -7264,7 +7264,7 @@ static void publishing_piwigo_ssl_error_pane_real_constructed (GObject* base) {
 #line 1060 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	proceed = _tmp30_;
 #line 1061 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_signal_connect_object (proceed, "clicked", (GCallback) ___lambda5__gtk_button_clicked, self, 0);
+	g_signal_connect_object (proceed, "clicked", (GCallback) ___lambda6__gtk_button_clicked, self, 0);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_object_unref0 (proceed);
 #line 1025 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8690,7 +8690,7 @@ static void publishing_piwigo_publishing_options_pane_real_constructed (GObject*
 }
 
 
-static void _vala_array_add35 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
+static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* length, int* size, PublishingPiwigoPermissionLevel* value) {
 #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"
@@ -8707,7 +8707,7 @@ static void _vala_array_add35 (PublishingPiwigoPermissionLevel*** array, int* le
 }
 
 
-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) {
 #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"
@@ -8724,7 +8724,7 @@ static void _vala_array_add36 (PublishingPiwigoPermissionLevel*** array, int* le
 }
 
 
-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) {
 #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"
@@ -8741,7 +8741,7 @@ static void _vala_array_add37 (PublishingPiwigoPermissionLevel*** array, int* le
 }
 
 
-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) {
 #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"
@@ -8758,7 +8758,7 @@ static void _vala_array_add38 (PublishingPiwigoPermissionLevel*** array, int* le
 }
 
 
-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) {
 #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"
 	_tmp3_ = publishing_piwigo_permission_level_new (0, _tmp2_);
 #line 1290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add35 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp3_);
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _result_;
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8832,7 +8832,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_permission_level_new (1, _tmp5_);
 #line 1291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add36 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8842,7 +8842,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = publishing_piwigo_permission_level_new (2, _tmp8_);
 #line 1292 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add37 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+	_vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp9_);
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _result_;
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8852,7 +8852,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = publishing_piwigo_permission_level_new (4, _tmp11_);
 #line 1293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add38 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp12_);
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = _result_;
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8862,7 +8862,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = publishing_piwigo_permission_level_new (8, _tmp14_);
 #line 1294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add39 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp15_);
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = _result_;
 #line 1296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -8881,7 +8881,7 @@ static PublishingPiwigoPermissionLevel** publishing_piwigo_publishing_options_pa
 }
 
 
-static void _vala_array_add40 (PublishingPiwigoSizeEntry*** array, int* length, int* size, PublishingPiwigoSizeEntry* value) {
+static void _vala_array_add41 (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"
@@ -8898,7 +8898,7 @@ static void _vala_array_add40 (PublishingPiwigoSizeEntry*** array, int* length,
 }
 
 
-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) {
 #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"
@@ -8915,7 +8915,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_add43 (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"
@@ -8932,7 +8932,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_add44 (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"
@@ -8949,7 +8949,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_add45 (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"
@@ -9013,7 +9013,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp3_ = publishing_piwigo_size_entry_new (500, _tmp2_);
 #line 1302 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add40 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp3_);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp4_ = _result_;
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9023,7 +9023,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp6_ = publishing_piwigo_size_entry_new (1024, _tmp5_);
 #line 1303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add41 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp6_);
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp7_ = _result_;
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9033,7 +9033,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp9_ = publishing_piwigo_size_entry_new (2048, _tmp8_);
 #line 1304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add42 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp9_);
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp10_ = _result_;
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9043,7 +9043,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = publishing_piwigo_size_entry_new (4096, _tmp11_);
 #line 1305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add43 (&_result_, &_result__length1, &__result__size_, _tmp12_);
+	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp12_);
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp13_ = _result_;
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -9053,7 +9053,7 @@ static PublishingPiwigoSizeEntry** publishing_piwigo_publishing_options_pane_cre
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp15_ = publishing_piwigo_size_entry_new (PUBLISHING_PIWIGO_ORIGINAL_SIZE, _tmp14_);
 #line 1306 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_vala_array_add44 (&_result_, &_result__length1, &__result__size_, _tmp15_);
+	_vala_array_add45 (&_result_, &_result__length1, &__result__size_, _tmp15_);
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp16_ = _result_;
 #line 1308 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -11577,7 +11577,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 11565 "PiwigoPublishing.c"
-				goto __catch44_spit_publishing_publishing_error;
+				goto __catch35_spit_publishing_publishing_error;
 			}
 #line 1618 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_g_free0 (status);
@@ -11593,8 +11593,8 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		errcode = _tmp7_;
 #line 11580 "PiwigoPublishing.c"
 	}
-	goto __finally44;
-	__catch44_spit_publishing_publishing_error:
+	goto __finally35;
+	__catch35_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp11_ = NULL;
@@ -11614,7 +11614,7 @@ gchar* publishing_piwigo_transaction_validate_xml (PublishingRESTSupportXmlDocum
 		return result;
 #line 11601 "PiwigoPublishing.c"
 	}
-	__finally44:
+	__finally35:
 #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"
@@ -11693,7 +11693,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 11681 "PiwigoPublishing.c"
-				goto __catch45_spit_publishing_publishing_error;
+				goto __catch36_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);
@@ -11707,8 +11707,8 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 		errcode = _tmp2_;
 #line 11694 "PiwigoPublishing.c"
 	}
-	goto __finally45;
-	__catch45_spit_publishing_publishing_error:
+	goto __finally36;
+	__catch36_spit_publishing_publishing_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp6_ = NULL;
@@ -11726,7 +11726,7 @@ gchar* publishing_piwigo_transaction_get_error_code (PublishingRESTSupportXmlDoc
 		return result;
 #line 11713 "PiwigoPublishing.c"
 	}
-	__finally45:
+	__finally36:
 #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"
@@ -12704,13 +12704,23 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 	GHashFunc _tmp69_ = NULL;
 	GEqualFunc _tmp70_ = NULL;
 	GHashTable* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	SpitPublishingPublishable* _tmp73_ = NULL;
-	gchar* _tmp74_ = NULL;
-	gchar* _tmp75_ = NULL;
+	gchar* basename = NULL;
+	SpitPublishingPublishable* _tmp72_ = NULL;
+	gchar* _tmp73_ = NULL;
+	gboolean _tmp74_ = FALSE;
+	const gchar* _tmp75_ = NULL;
 	gchar* _tmp76_ = NULL;
 	gchar* _tmp77_ = NULL;
-	gchar* _tmp78_ = NULL;
+	gboolean _tmp78_ = FALSE;
+	gboolean _tmp79_ = FALSE;
+	GHashTable* _tmp86_ = NULL;
+	gchar* _tmp87_ = NULL;
+	const gchar* _tmp88_ = NULL;
+	gchar* _tmp89_ = NULL;
+	GHashTable* _tmp90_ = NULL;
+	gchar* _tmp91_ = NULL;
+	gchar* _tmp92_ = NULL;
+	GHashTable* _tmp93_ = NULL;
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	g_return_val_if_fail (PUBLISHING_PIWIGO_IS_SESSION (session), NULL);
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12737,7 +12747,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 12726 "PiwigoPublishing.c"
+#line 12736 "PiwigoPublishing.c"
 		PublishingPiwigoSession* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -12759,7 +12769,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 12748 "PiwigoPublishing.c"
+#line 12758 "PiwigoPublishing.c"
 	}
 #line 1722 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp12_ = parameters;
@@ -12789,7 +12799,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 12778 "PiwigoPublishing.c"
+#line 12788 "PiwigoPublishing.c"
 		gchar** _tmp19_ = NULL;
 		gint _tmp19__length1 = 0;
 		gchar* _tmp20_ = NULL;
@@ -12803,7 +12813,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 12792 "PiwigoPublishing.c"
+#line 12802 "PiwigoPublishing.c"
 	}
 #line 1730 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_tmp21_ = publishable;
@@ -12852,18 +12862,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 12840 "PiwigoPublishing.c"
+#line 12850 "PiwigoPublishing.c"
 	} else {
 		const gchar* _tmp38_ = NULL;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp38_ = name;
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		_tmp36_ = g_strcmp0 (_tmp38_, "") == 0;
-#line 12847 "PiwigoPublishing.c"
+#line 12857 "PiwigoPublishing.c"
 	}
 #line 1736 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	if (_tmp36_) {
-#line 12851 "PiwigoPublishing.c"
+#line 12861 "PiwigoPublishing.c"
 		SpitPublishingPublishable* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
 		const gchar* _tmp41_ = NULL;
@@ -12885,27 +12895,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 12873 "PiwigoPublishing.c"
+#line 12883 "PiwigoPublishing.c"
 			const gchar* _tmp44_ = NULL;
 #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 12879 "PiwigoPublishing.c"
+#line 12889 "PiwigoPublishing.c"
 		} else {
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp42_ = FALSE;
-#line 12883 "PiwigoPublishing.c"
+#line 12893 "PiwigoPublishing.c"
 		}
 #line 1740 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp42_) {
-#line 12887 "PiwigoPublishing.c"
+#line 12897 "PiwigoPublishing.c"
 			const gchar* _tmp45_ = NULL;
 #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 12893 "PiwigoPublishing.c"
+#line 12903 "PiwigoPublishing.c"
 		}
 	} else {
 		gboolean _tmp46_ = FALSE;
@@ -12914,21 +12924,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 12902 "PiwigoPublishing.c"
+#line 12912 "PiwigoPublishing.c"
 			const gchar* _tmp48_ = NULL;
 #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 12908 "PiwigoPublishing.c"
+#line 12918 "PiwigoPublishing.c"
 		} else {
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 			_tmp46_ = FALSE;
-#line 12912 "PiwigoPublishing.c"
+#line 12922 "PiwigoPublishing.c"
 		}
 #line 1745 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 		if (_tmp46_) {
-#line 12916 "PiwigoPublishing.c"
+#line 12926 "PiwigoPublishing.c"
 			const gchar* _tmp49_ = NULL;
 			const gchar* _tmp50_ = NULL;
 #line 1746 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -12939,7 +12949,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 12927 "PiwigoPublishing.c"
+#line 12937 "PiwigoPublishing.c"
 		} else {
 			PublishingPiwigoPublishingParameters* _tmp51_ = NULL;
 			gboolean _tmp52_ = FALSE;
@@ -12949,20 +12959,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 12937 "PiwigoPublishing.c"
+#line 12947 "PiwigoPublishing.c"
 				const gchar* _tmp53_ = NULL;
 #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 12943 "PiwigoPublishing.c"
+#line 12953 "PiwigoPublishing.c"
 			} else {
 				const gchar* _tmp54_ = NULL;
 #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 12950 "PiwigoPublishing.c"
+#line 12960 "PiwigoPublishing.c"
 			}
 		}
 	}
@@ -13002,19 +13012,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 12990 "PiwigoPublishing.c"
+#line 13000 "PiwigoPublishing.c"
 		const gchar* _tmp67_ = NULL;
 #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 12996 "PiwigoPublishing.c"
+#line 13006 "PiwigoPublishing.c"
 			const gchar* _tmp68_ = NULL;
 #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 13002 "PiwigoPublishing.c"
+#line 13012 "PiwigoPublishing.c"
 		}
 	}
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -13026,27 +13036,87 @@ PublishingPiwigoImagesAddTransaction* publishing_piwigo_images_add_transaction_c
 #line 1774 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	disposition_table = _tmp71_;
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp72_ = g_strdup ("filename");
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp73_ = publishable;
+	_tmp72_ = publishable;
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp74_ = spit_publishing_publishable_get_param_string (_tmp73_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+	_tmp73_ = spit_publishing_publishable_get_param_string (_tmp72_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
 #line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp75_ = _tmp74_;
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp76_ = soup_uri_encode (_tmp75_, NULL);
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_hash_table_insert (disposition_table, _tmp72_, _tmp76_);
-#line 1776 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_g_free0 (_tmp75_);
+	basename = _tmp73_;
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp75_ = basename;
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp76_ = g_utf8_strdown (_tmp75_, (gssize) -1);
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp77_ = _tmp76_;
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp78_ = g_str_has_suffix (_tmp77_, ".jpeg");
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp79_ = !_tmp78_;
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (_tmp77_);
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp79_) {
+#line 13043 "PiwigoPublishing.c"
+		const gchar* _tmp80_ = NULL;
+		gchar* _tmp81_ = NULL;
+		gchar* _tmp82_ = NULL;
+		gboolean _tmp83_ = FALSE;
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp80_ = basename;
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp81_ = g_utf8_strdown (_tmp80_, (gssize) -1);
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp82_ = _tmp81_;
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp83_ = g_str_has_suffix (_tmp82_, ".jpg");
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp74_ = !_tmp83_;
+#line 1778 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_g_free0 (_tmp82_);
+#line 13060 "PiwigoPublishing.c"
+	} else {
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		_tmp74_ = FALSE;
+#line 13064 "PiwigoPublishing.c"
+	}
+#line 1777 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	if (_tmp74_) {
+#line 13068 "PiwigoPublishing.c"
+		const gchar* _tmp84_ = NULL;
+		gchar* _tmp85_ = NULL;
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp77_ = g_strdup ("name");
+		_tmp84_ = basename;
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	_tmp78_ = g_strdup ("image");
+		_tmp85_ = g_strconcat (_tmp84_, ".jpg", NULL);
 #line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	g_hash_table_insert (disposition_table, _tmp77_, _tmp78_);
+		_g_free0 (basename);
+#line 1779 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+		basename = _tmp85_;
+#line 13079 "PiwigoPublishing.c"
+	}
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp86_ = disposition_table;
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp87_ = g_strdup ("filename");
 #line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
-	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), disposition_table);
+	_tmp88_ = basename;
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp89_ = soup_uri_encode (_tmp88_, NULL);
+#line 1781 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_hash_table_insert (_tmp86_, _tmp87_, _tmp89_);
+#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp90_ = disposition_table;
+#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp91_ = g_strdup ("name");
+#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp92_ = g_strdup ("image");
+#line 1782 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	g_hash_table_insert (_tmp90_, _tmp91_, _tmp92_);
+#line 1784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_tmp93_ = disposition_table;
+#line 1784 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	publishing_rest_support_upload_transaction_set_binary_disposition_table (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_UPLOAD_TRANSACTION, PublishingRESTSupportUploadTransaction), _tmp93_);
+#line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
+	_g_free0 (basename);
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
 	_g_hash_table_unref0 (disposition_table);
 #line 1717 "/home/jens/Source/shotwell/plugins/shotwell-publishing/PiwigoPublishing.vala"
@@ -13059,14 +13129,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 13047 "PiwigoPublishing.c"
+#line 13117 "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 13054 "PiwigoPublishing.c"
+#line 13124 "PiwigoPublishing.c"
 }
 
 
@@ -13077,7 +13147,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 13065 "PiwigoPublishing.c"
+#line 13135 "PiwigoPublishing.c"
 }
 
 
@@ -13086,7 +13156,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 13074 "PiwigoPublishing.c"
+#line 13144 "PiwigoPublishing.c"
 }
 
 
@@ -13098,7 +13168,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 13086 "PiwigoPublishing.c"
+#line 13156 "PiwigoPublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala b/plugins/shotwell-publishing/PiwigoPublishing.vala
index 60219a6..15d118b 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -1773,9 +1773,12 @@ private class ImagesAddTransaction : Publishing.RESTSupport.UploadTransaction {
 
         GLib.HashTable<string, string> disposition_table =
             new GLib.HashTable<string, string>(GLib.str_hash, GLib.str_equal);
-        disposition_table.insert("filename",  Soup.URI.encode(
-            publishable.get_param_string(
-                Spit.Publishing.Publishable.PARAM_STRING_BASENAME), null));
+        var basename = publishable.get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME);
+        if (!basename.down().has_suffix(".jpeg") &&
+            !basename.down().has_suffix(".jpg")) {
+            basename += ".jpg";
+        }
+        disposition_table.insert("filename",  Soup.URI.encode(basename, null));
         disposition_table.insert("name", "image");
 
         set_binary_disposition_table(disposition_table);
diff --git a/plugins/shotwell-publishing/YouTubePublishing.c b/plugins/shotwell-publishing/YouTubePublishing.c
index 21d4ad9..0c3d84e 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.c
+++ b/plugins/shotwell-publishing/YouTubePublishing.c
@@ -16,12 +16,12 @@
 #include <gio/gio.h>
 #include "shotwell-plugin-common.h"
 #include <glib/gi18n-lib.h>
-#include <libxml/tree.h>
+#include "gdata/gdata.h"
+#include <libsoup/soup.h>
 #include <float.h>
 #include <math.h>
 #include <gtk/gtk.h>
-#include <libsoup/soup.h>
-#include <glib/gstdio.h>
+#include "shotwell-authenticator.h"
 #include <gobject/gvaluecollector.h>
 
 
@@ -60,23 +60,22 @@ typedef struct _PublishingYouTubePublishingParameters PublishingYouTubePublishin
 typedef struct _PublishingYouTubePublishingParametersClass PublishingYouTubePublishingParametersClass;
 typedef struct _PublishingYouTubePublishingParametersPrivate PublishingYouTubePublishingParametersPrivate;
 typedef struct _PublishingYouTubeParamSpecPublishingParameters PublishingYouTubeParamSpecPublishingParameters;
-typedef struct _PublishingYouTubeYouTubePublisherPrivate PublishingYouTubeYouTubePublisherPrivate;
-#define _publishing_you_tube_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_you_tube_publishing_parameters_unref (var), NULL)))
-#define _publishing_rest_support_session_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_session_unref (var), NULL)))
 
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION (publishing_you_tube_you_tube_publisher_channel_directory_transaction_get_type ())
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, PublishingYouTubeYouTubePublisherChannelDirectoryTransaction))
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass))
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_IS_CHANNEL_DIRECTORY_TRANSACTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION))
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_IS_CHANNEL_DIRECTORY_TRANSACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION))
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass))
+#define PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER (publishing_you_tube_you_tube_authorizer_get_type ())
+#define PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer))
+#define PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizerClass))
+#define PUBLISHING_YOU_TUBE_IS_YOU_TUBE_AUTHORIZER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER))
+#define PUBLISHING_YOU_TUBE_IS_YOU_TUBE_AUTHORIZER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER))
+#define PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizerClass))
 
-typedef struct _PublishingYouTubeYouTubePublisherChannelDirectoryTransaction PublishingYouTubeYouTubePublisherChannelDirectoryTransaction;
-typedef struct _PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass;
-#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_rest_support_xml_document_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_xml_document_unref (var), NULL)))
+typedef struct _PublishingYouTubeYouTubeAuthorizer PublishingYouTubeYouTubeAuthorizer;
+typedef struct _PublishingYouTubeYouTubeAuthorizerClass PublishingYouTubeYouTubeAuthorizerClass;
+typedef struct _PublishingYouTubeYouTubeAuthorizerPrivate PublishingYouTubeYouTubeAuthorizerPrivate;
+#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)))
+typedef struct _PublishingYouTubeYouTubePublisherPrivate PublishingYouTubeYouTubePublisherPrivate;
+#define _publishing_you_tube_publishing_parameters_unref0(var) ((var == NULL) ? NULL : (var = (publishing_you_tube_publishing_parameters_unref (var), NULL)))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE (publishing_you_tube_publishing_options_pane_get_type ())
 #define PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane))
@@ -98,7 +97,6 @@ typedef struct _PublishingYouTubePublishingOptionsPaneClass PublishingYouTubePub
 typedef struct _PublishingYouTubeUploader PublishingYouTubeUploader;
 typedef struct _PublishingYouTubeUploaderClass PublishingYouTubeUploaderClass;
 #define _publishing_rest_support_batch_uploader_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_batch_uploader_unref (var), NULL)))
-typedef struct _PublishingYouTubeYouTubePublisherChannelDirectoryTransactionPrivate PublishingYouTubeYouTubePublisherChannelDirectoryTransactionPrivate;
 typedef struct _PublishingYouTubePublishingOptionsPanePrivate PublishingYouTubePublishingOptionsPanePrivate;
 
 #define PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION (publishing_you_tube_publishing_options_pane_privacy_description_get_type ())
@@ -125,8 +123,10 @@ typedef struct _PublishingYouTubePublishingOptionsPaneParamSpecPrivacyDescriptio
 typedef struct _PublishingYouTubeUploadTransaction PublishingYouTubeUploadTransaction;
 typedef struct _PublishingYouTubeUploadTransactionClass PublishingYouTubeUploadTransactionClass;
 typedef struct _PublishingYouTubeUploadTransactionPrivate PublishingYouTubeUploadTransactionPrivate;
-#define __vala_SoupBuffer_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupBuffer_free (var), NULL)))
-#define __vala_SoupMultipart_free0(var) ((var == NULL) ? NULL : (var = (_vala_SoupMultipart_free (var), NULL)))
+typedef struct _Block1Data Block1Data;
+#define _g_main_loop_unref0(var) ((var == NULL) ? NULL : (var = (g_main_loop_unref (var), NULL)))
+#define _publishing_rest_support_transaction_unref0(var) ((var == NULL) ? NULL : (var = (publishing_rest_support_transaction_unref (var), NULL)))
+typedef struct _PublishingYouTubeUploadTransactionSpliceWithProgressData PublishingYouTubeUploadTransactionSpliceWithProgressData;
 typedef struct _PublishingYouTubeUploaderPrivate PublishingYouTubeUploaderPrivate;
 #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; }
@@ -161,7 +161,6 @@ struct _PublishingYouTubePublishingParametersClass {
 
 struct _PublishingYouTubePublishingParametersPrivate {
 	PublishingYouTubePrivacySetting privacy;
-	gchar* channel_name;
 	gchar* user_name;
 };
 
@@ -169,6 +168,20 @@ struct _PublishingYouTubeParamSpecPublishingParameters {
 	GParamSpec parent_instance;
 };
 
+struct _PublishingYouTubeYouTubeAuthorizer {
+	GObject parent_instance;
+	PublishingYouTubeYouTubeAuthorizerPrivate * priv;
+};
+
+struct _PublishingYouTubeYouTubeAuthorizerClass {
+	GObjectClass parent_class;
+};
+
+struct _PublishingYouTubeYouTubeAuthorizerPrivate {
+	PublishingRESTSupportGoogleSession* session;
+	SpitPublishingAuthenticator* authenticator;
+};
+
 struct _PublishingYouTubeYouTubePublisher {
 	PublishingRESTSupportGooglePublisher parent_instance;
 	PublishingYouTubeYouTubePublisherPrivate * priv;
@@ -180,20 +193,12 @@ struct _PublishingYouTubeYouTubePublisherClass {
 
 struct _PublishingYouTubeYouTubePublisherPrivate {
 	gboolean running;
-	gchar* refresh_token;
 	PublishingYouTubePublishingParameters* publishing_parameters;
 	SpitPublishingProgressCallback progress_reporter;
 	gpointer progress_reporter_target;
 	GDestroyNotify progress_reporter_target_destroy_notify;
-};
-
-struct _PublishingYouTubeYouTubePublisherChannelDirectoryTransaction {
-	PublishingRESTSupportGooglePublisherAuthenticatedTransaction parent_instance;
-	PublishingYouTubeYouTubePublisherChannelDirectoryTransactionPrivate * priv;
-};
-
-struct _PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass {
-	PublishingRESTSupportGooglePublisherAuthenticatedTransactionClass parent_class;
+	SpitPublishingAuthenticator* authenticator;
+	GDataYouTubeService* youtube_service;
 };
 
 struct _PublishingYouTubePublishingOptionsPane {
@@ -208,7 +213,6 @@ struct _PublishingYouTubePublishingOptionsPaneClass {
 struct _PublishingYouTubePublishingOptionsPanePrivate {
 	GtkBox* pane_widget;
 	GtkComboBoxText* privacy_combo;
-	GtkLabel* publish_to_label;
 	GtkLabel* login_identity_label;
 	GtkButton* publish_button;
 	GtkButton* logout_button;
@@ -250,6 +254,47 @@ struct _PublishingYouTubeUploadTransactionPrivate {
 	PublishingYouTubePublishingParameters* parameters;
 	PublishingRESTSupportGoogleSession* session;
 	SpitPublishingPublishable* publishable;
+	GDataYouTubeService* youtube_service;
+};
+
+struct _Block1Data {
+	int _ref_count_;
+	PublishingYouTubeUploadTransaction* self;
+	GMainLoop* loop;
+};
+
+struct _PublishingYouTubeUploadTransactionSpliceWithProgressData {
+	int _state_;
+	GObject* _source_object_;
+	GAsyncResult* _res_;
+	GSimpleAsyncResult* _async_result;
+	PublishingYouTubeUploadTransaction* self;
+	GFileInfo* info;
+	GInputStream* input;
+	GOutputStream* output;
+	gint64 total_bytes;
+	GFileInfo* _tmp0_;
+	gint64 _tmp1_;
+	gint64 bytes_to_write;
+	gint64 _tmp2_;
+	guint8 buffer[8192];
+	gint64 _tmp3_;
+	gssize bytes_read;
+	GInputStream* _tmp4_;
+	gssize _tmp5_;
+	gssize _tmp6_;
+	gssize bytes_written;
+	GOutputStream* _tmp7_;
+	gssize _tmp8_;
+	gssize _tmp9_;
+	gint64 _tmp10_;
+	gssize _tmp11_;
+	gint64 _tmp12_;
+	gint64 _tmp13_;
+	gint64 _tmp14_;
+	GOutputStream* _tmp15_;
+	GInputStream* _tmp16_;
+	GError * _inner_error_;
 };
 
 struct _PublishingYouTubeUploader {
@@ -263,6 +308,7 @@ struct _PublishingYouTubeUploaderClass {
 
 struct _PublishingYouTubeUploaderPrivate {
 	PublishingYouTubePublishingParameters* parameters;
+	GDataYouTubeService* youtube_service;
 };
 
 
@@ -275,8 +321,9 @@ static gint _you_tube_service_icon_pixbuf_set_size_ = 0;
 static SpitPluggableIface* you_tube_service_spit_pluggable_parent_iface = NULL;
 static SpitPublishingServiceIface* you_tube_service_spit_publishing_service_parent_iface = NULL;
 static gpointer publishing_you_tube_publishing_parameters_parent_class = NULL;
+static gpointer publishing_you_tube_you_tube_authorizer_parent_class = NULL;
+static GDataAuthorizerInterface* publishing_you_tube_you_tube_authorizer_gdata_authorizer_parent_iface = NULL;
 static gpointer publishing_you_tube_you_tube_publisher_parent_class = NULL;
-static gpointer publishing_you_tube_you_tube_publisher_channel_directory_transaction_parent_class = NULL;
 static gpointer publishing_you_tube_publishing_options_pane_parent_class = NULL;
 static gpointer publishing_you_tube_publishing_options_pane_privacy_description_parent_class = NULL;
 static SpitPublishingDialogPaneIface* publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = NULL;
@@ -302,13 +349,7 @@ GType publishing_you_tube_you_tube_publisher_get_type (void) G_GNUC_CONST;
 static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_media (SpitPublishingService* base);
 static void you_tube_service_real_activation (SpitPluggable* base, gboolean enabled);
 static void you_tube_service_finalize (GObject* obj);
-#define PUBLISHING_YOU_TUBE_SERVICE_WELCOME_MESSAGE _ ("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.")
-#define PUBLISHING_YOU_TUBE_DEVELOPER_KEY "AI39si5VEpzWK0z-pzo4fonEj9E4driCpEs9lK8y3HJsbbebIIRWqW3bIyGr42bjQv-N3s" \
-"iAfqVoM8XNmtbbp5x2gpbjiSAMTQ"
+#define PUBLISHING_YOU_TUBE_DEVELOPER_KEY "AIzaSyB6hLnm0n5j8Y6Bkvh9bz3i8ADM2bJdYeY"
 GType publishing_you_tube_privacy_setting_get_type (void) G_GNUC_CONST;
 gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance);
 void publishing_you_tube_publishing_parameters_unref (gpointer instance);
@@ -325,29 +366,29 @@ PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters
 PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_construct (GType object_type);
 PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_privacy (PublishingYouTubePublishingParameters* self);
 void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self, PublishingYouTubePrivacySetting privacy);
-gchar* publishing_you_tube_publishing_parameters_get_channel_name (PublishingYouTubePublishingParameters* self);
-void publishing_you_tube_publishing_parameters_set_channel_name (PublishingYouTubePublishingParameters* self, const gchar* channel_name);
 gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTubePublishingParameters* self);
 void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self, const gchar* user_name);
 static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters* obj);
+GType publishing_you_tube_you_tube_authorizer_get_type (void) G_GNUC_CONST;
+#define PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizerPrivate))
+enum  {
+	PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_DUMMY_PROPERTY
+};
+PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_new (PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator);
+PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator);
+static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain (GDataAuthorizer* base, GDataAuthorizationDomain* domain);
+static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base, GDataAuthorizationDomain* domain, SoupMessage* message);
+static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base, GCancellable* cancellable, GError** error);
+static void publishing_you_tube_you_tube_authorizer_finalize (GObject* obj);
 #define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisherPrivate))
 enum  {
 	PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_DUMMY_PROPERTY
 };
 static gboolean publishing_you_tube_you_tube_publisher_real_is_running (PublishingRESTSupportGooglePublisher* base);
 static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSupportGooglePublisher* base);
-static void publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (PublishingYouTubeYouTubePublisher* self);
 static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupportGooglePublisher* base);
-static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper (PublishingYouTubeYouTubePublisher* self, xmlNode* document_root, GError** error);
-static void publishing_you_tube_you_tube_publisher_on_service_welcome_login (PublishingYouTubeYouTubePublisher* self);
 static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base);
-static void publishing_you_tube_you_tube_publisher_do_fetch_account_information (PublishingYouTubeYouTubePublisher* self);
-static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportTransaction* txn);
-static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self);
-static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err);
-static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self);
-static GType publishing_you_tube_you_tube_publisher_channel_directory_transaction_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_information (PublishingYouTubeYouTubePublisher* self, PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* transaction);
+static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (PublishingYouTubeYouTubePublisher* self);
 static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout (PublishingYouTubeYouTubePublisher* self);
 static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish (PublishingYouTubeYouTubePublisher* self);
 static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeYouTubePublisher* self);
@@ -357,26 +398,17 @@ static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishin
 static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportBatchUploader* uploader, GError* err);
 static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self);
 static void publishing_you_tube_you_tube_publisher_do_show_success_pane (PublishingYouTubeYouTubePublisher* self);
-static void _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self);
-static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_you_tube_you_tube_publisher_channel_directory_transaction_new (PublishingRESTSupportGoogleSession* session);
-static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_you_tube_you_tube_publisher_channel_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session);
-static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc);
-static gchar* _publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self);
-static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (PublishingYouTubeYouTubePublisher* self);
 GType publishing_you_tube_publishing_options_pane_get_type (void) G_GNUC_CONST;
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters);
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters);
+PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters);
+PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters);
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender, gpointer self);
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender, gpointer self);
 GType publishing_you_tube_uploader_get_type (void) G_GNUC_CONST;
-PublishingYouTubeUploader* publishing_you_tube_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters);
-PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters);
+PublishingYouTubeUploader* publishing_you_tube_uploader_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters);
+PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters);
 static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self);
 static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base);
-enum  {
-	PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_DUMMY_PROPERTY
-};
-#define PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_ENDPOINT_URL "https://gdata.youtube.com/feeds/users/default"
+static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base);
 static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj);
 static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance);
 static void publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance);
@@ -397,9 +429,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_add31 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value);
 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 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);
@@ -415,31 +447,18 @@ enum  {
 	PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_DUMMY_PROPERTY
 };
 #define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_ENDPOINT_URL "https://uploads.gdata.youtube.com/feeds/api/users/default/uploads"
-#define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_UNLISTED_XML "<yt:accessControl action='list' permission='denied'/>"
-#define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_PRIVATE_XML "<yt:private/>"
-#define PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_METADATA_TEMPLATE "<?xml version='1.0'?>\n" \
-"                                                <entry xmlns='http://w" \
-"ww.w3.org/2005/Atom'\n" \
-"                                                xmlns:media='http://se" \
-"arch.yahoo.com/mrss/'\n" \
-"                                                xmlns:yt='http://gdata" \
-".youtube.com/schemas/2007'>\n" \
-"                                                <media:group>\n" \
-"                                                    <media:title type=" \
-"'plain'>%s</media:title>\n" \
-"                                                    <media:category\n" \
-"                                                    scheme='http://gda" \
-"ta.youtube.com/schemas/2007/categories.cat'>People\n" \
-"                                                    </media:category>\n" \
-"                                                    %s\n" \
-"                                                </media:group>\n" \
-"                                                    %s\n" \
-"                                                </entry>"
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
+PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
+PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable);
 static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error);
-static void _vala_SoupBuffer_free (SoupBuffer* self);
-static void _vala_SoupMultipart_free (SoupMultipart* self);
+static Block1Data* block1_data_ref (Block1Data* _data1_);
+static void block1_data_unref (void * _userdata_);
+static void publishing_you_tube_upload_transaction_splice_with_progress (PublishingYouTubeUploadTransaction* self, GFileInfo* info, GInputStream* input, GOutputStream* output, GAsyncReadyCallback _callback_, gpointer _user_data_);
+static void publishing_you_tube_upload_transaction_splice_with_progress_finish (PublishingYouTubeUploadTransaction* self, GAsyncResult* _res_, GError** error);
+static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res);
+static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self);
+static void publishing_you_tube_upload_transaction_splice_with_progress_data_free (gpointer _data);
+static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_);
+static void publishing_you_tube_upload_transaction_splice_with_progress_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_);
 static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction* obj);
 #define PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploaderPrivate))
 enum  {
@@ -465,7 +484,7 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
 	_tmp0__length1 = you_tube_service_icon_pixbuf_set_length1;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (_tmp0_ == NULL) {
-#line 447 "YouTubePublishing.c"
+#line 488 "YouTubePublishing.c"
 		gint _tmp1_ = 0;
 		GdkPixbuf** _tmp2_ = NULL;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -478,18 +497,18 @@ YouTubeService* you_tube_service_construct (GType object_type, GFile* resource_d
 		you_tube_service_icon_pixbuf_set_length1 = _tmp1_;
 #line 14 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_you_tube_service_icon_pixbuf_set_size_ = you_tube_service_icon_pixbuf_set_length1;
-#line 460 "YouTubePublishing.c"
+#line 501 "YouTubePublishing.c"
 	}
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 464 "YouTubePublishing.c"
+#line 505 "YouTubePublishing.c"
 }
 
 
 YouTubeService* you_tube_service_new (GFile* resource_directory) {
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return you_tube_service_construct (TYPE_YOU_TUBE_SERVICE, resource_directory);
-#line 471 "YouTubePublishing.c"
+#line 512 "YouTubePublishing.c"
 }
 
 
@@ -511,7 +530,7 @@ static gint you_tube_service_real_get_pluggable_interface (SpitPluggable* base,
 	result = _tmp2_;
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 493 "YouTubePublishing.c"
+#line 534 "YouTubePublishing.c"
 }
 
 
@@ -524,7 +543,7 @@ static const gchar* you_tube_service_real_get_id (SpitPluggable* base) {
 	result = "org.yorba.shotwell.publishing.youtube";
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 506 "YouTubePublishing.c"
+#line 547 "YouTubePublishing.c"
 }
 
 
@@ -537,14 +556,14 @@ static const gchar* you_tube_service_real_get_pluggable_name (SpitPluggable* bas
 	result = "YouTube";
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 519 "YouTubePublishing.c"
+#line 560 "YouTubePublishing.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 526 "YouTubePublishing.c"
+#line 567 "YouTubePublishing.c"
 }
 
 
@@ -555,17 +574,17 @@ static GdkPixbuf** _vala_array_dup9 (GdkPixbuf** self, int length) {
 	result = g_new0 (GdkPixbuf*, length + 1);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	for (i = 0; i < length; i++) {
-#line 537 "YouTubePublishing.c"
+#line 578 "YouTubePublishing.c"
 		GdkPixbuf* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		result[i] = _tmp0_;
-#line 543 "YouTubePublishing.c"
+#line 584 "YouTubePublishing.c"
 	}
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 547 "YouTubePublishing.c"
+#line 588 "YouTubePublishing.c"
 }
 
 
@@ -647,7 +666,7 @@ static void you_tube_service_real_get_info (SpitPluggable* base, SpitPluggableIn
 	(*info).icons = _tmp9_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*info).icons_length1 = _tmp9__length1;
-#line 629 "YouTubePublishing.c"
+#line 670 "YouTubePublishing.c"
 }
 
 
@@ -668,7 +687,7 @@ static SpitPublishingPublisher* you_tube_service_real_create_publisher (SpitPubl
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_PUBLISHING_TYPE_PUBLISHER, SpitPublishingPublisher);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 650 "YouTubePublishing.c"
+#line 691 "YouTubePublishing.c"
 }
 
 
@@ -681,7 +700,7 @@ static SpitPublishingPublisherMediaType you_tube_service_real_get_supported_medi
 	result = SPIT_PUBLISHING_PUBLISHER_MEDIA_TYPE_VIDEO;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 663 "YouTubePublishing.c"
+#line 704 "YouTubePublishing.c"
 }
 
 
@@ -689,7 +708,7 @@ static void you_tube_service_real_activation (SpitPluggable* base, gboolean enab
 	YouTubeService * self;
 #line 51 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_YOU_TUBE_SERVICE, YouTubeService);
-#line 671 "YouTubePublishing.c"
+#line 712 "YouTubePublishing.c"
 }
 
 
@@ -698,7 +717,7 @@ static void you_tube_service_class_init (YouTubeServiceClass * klass) {
 	you_tube_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = you_tube_service_finalize;
-#line 680 "YouTubePublishing.c"
+#line 721 "YouTubePublishing.c"
 }
 
 
@@ -715,7 +734,7 @@ static void you_tube_service_spit_pluggable_interface_init (SpitPluggableIface *
 	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) you_tube_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->activation = (void (*)(SpitPluggable*, gboolean)) you_tube_service_real_activation;
-#line 697 "YouTubePublishing.c"
+#line 738 "YouTubePublishing.c"
 }
 
 
@@ -726,7 +745,7 @@ static void you_tube_service_spit_publishing_service_interface_init (SpitPublish
 	iface->create_publisher = (SpitPublishingPublisher* (*)(SpitPublishingService*, SpitPublishingPluginHost*)) you_tube_service_real_create_publisher;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->get_supported_media = (SpitPublishingPublisherMediaType (*)(SpitPublishingService*)) you_tube_service_real_get_supported_media;
-#line 708 "YouTubePublishing.c"
+#line 749 "YouTubePublishing.c"
 }
 
 
@@ -740,7 +759,7 @@ static void you_tube_service_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_YOU_TUBE_SERVICE, YouTubeService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (you_tube_service_parent_class)->finalize (obj);
-#line 722 "YouTubePublishing.c"
+#line 763 "YouTubePublishing.c"
 }
 
 
@@ -774,90 +793,51 @@ GType publishing_you_tube_privacy_setting_get_type (void) {
 
 PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_construct (GType object_type) {
 	PublishingYouTubePublishingParameters* self = NULL;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubePublishingParameters*) g_type_create_instance (object_type);
-#line 74 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy = PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE;
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->channel_name);
-#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->channel_name = NULL;
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 72 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->user_name = NULL;
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 770 "YouTubePublishing.c"
+#line 807 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubePublishingParameters* publishing_you_tube_publishing_parameters_new (void) {
-#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_publishing_parameters_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS);
-#line 777 "YouTubePublishing.c"
+#line 814 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubePrivacySetting publishing_you_tube_publishing_parameters_get_privacy (PublishingYouTubePublishingParameters* self) {
 	PublishingYouTubePrivacySetting result = 0;
 	PublishingYouTubePrivacySetting _tmp0_ = 0;
-#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 75 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self), 0);
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = self->priv->privacy;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp0_;
-#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 792 "YouTubePublishing.c"
+#line 829 "YouTubePublishing.c"
 }
 
 
 void publishing_you_tube_publishing_parameters_set_privacy (PublishingYouTubePublishingParameters* self, PublishingYouTubePrivacySetting privacy) {
 	PublishingYouTubePrivacySetting _tmp0_ = 0;
-#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 79 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = privacy;
-#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 80 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy = _tmp0_;
-#line 804 "YouTubePublishing.c"
-}
-
-
-gchar* publishing_you_tube_publishing_parameters_get_channel_name (PublishingYouTubePublishingParameters* self) {
-	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = self->priv->channel_name;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	result = _tmp1_;
-#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return result;
-#line 822 "YouTubePublishing.c"
-}
-
-
-void publishing_you_tube_publishing_parameters_set_channel_name (PublishingYouTubePublishingParameters* self, const gchar* channel_name) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-#line 91 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = channel_name;
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = g_strdup (_tmp0_);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->channel_name);
-#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->channel_name = _tmp1_;
-#line 839 "YouTubePublishing.c"
+#line 841 "YouTubePublishing.c"
 }
 
 
@@ -865,246 +845,244 @@ gchar* publishing_you_tube_publishing_parameters_get_user_name (PublishingYouTub
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 95 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 83 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self), NULL);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = self->priv->user_name;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp1_;
-#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 84 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 857 "YouTubePublishing.c"
+#line 859 "YouTubePublishing.c"
 }
 
 
 void publishing_you_tube_publishing_parameters_set_user_name (PublishingYouTubePublishingParameters* self, const gchar* user_name) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 99 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 87 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (self));
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = user_name;
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->priv->user_name);
-#line 100 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 88 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->user_name = _tmp1_;
-#line 874 "YouTubePublishing.c"
+#line 876 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_value_publishing_parameters_init (GValue* value) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 881 "YouTubePublishing.c"
+#line 883 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_value_publishing_parameters_free_value (GValue* value) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (value->data[0].v_pointer);
-#line 890 "YouTubePublishing.c"
+#line 892 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_value_publishing_parameters_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (src_value->data[0].v_pointer);
-#line 900 "YouTubePublishing.c"
+#line 902 "YouTubePublishing.c"
 	} else {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 904 "YouTubePublishing.c"
+#line 906 "YouTubePublishing.c"
 	}
 }
 
 
 static gpointer publishing_you_tube_value_publishing_parameters_peek_pointer (const GValue* value) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 912 "YouTubePublishing.c"
+#line 914 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_value_publishing_parameters_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 919 "YouTubePublishing.c"
+#line 921 "YouTubePublishing.c"
 		PublishingYouTubePublishingParameters* object;
 		object = collect_values[0].v_pointer;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 926 "YouTubePublishing.c"
+#line 928 "YouTubePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 930 "YouTubePublishing.c"
+#line 932 "YouTubePublishing.c"
 		}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = publishing_you_tube_publishing_parameters_ref (object);
-#line 934 "YouTubePublishing.c"
+#line 936 "YouTubePublishing.c"
 	} else {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 938 "YouTubePublishing.c"
+#line 940 "YouTubePublishing.c"
 	}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 942 "YouTubePublishing.c"
+#line 944 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_value_publishing_parameters_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingYouTubePublishingParameters** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!object_p) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 953 "YouTubePublishing.c"
+#line 955 "YouTubePublishing.c"
 	}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = NULL;
-#line 959 "YouTubePublishing.c"
+#line 961 "YouTubePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 963 "YouTubePublishing.c"
+#line 965 "YouTubePublishing.c"
 	} else {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 967 "YouTubePublishing.c"
+#line 969 "YouTubePublishing.c"
 	}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 971 "YouTubePublishing.c"
+#line 973 "YouTubePublishing.c"
 }
 
 
 GParamSpec* publishing_you_tube_param_spec_publishing_parameters (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingYouTubeParamSpecPublishingParameters* spec;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 985 "YouTubePublishing.c"
+#line 987 "YouTubePublishing.c"
 }
 
 
 gpointer publishing_you_tube_value_get_publishing_parameters (const GValue* value) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS), NULL);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 994 "YouTubePublishing.c"
+#line 996 "YouTubePublishing.c"
 }
 
 
 void publishing_you_tube_value_set_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingYouTubePublishingParameters* old;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (v_object) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_ref (value->data[0].v_pointer);
-#line 1014 "YouTubePublishing.c"
+#line 1016 "YouTubePublishing.c"
 	} else {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1018 "YouTubePublishing.c"
+#line 1020 "YouTubePublishing.c"
 	}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (old);
-#line 1024 "YouTubePublishing.c"
+#line 1026 "YouTubePublishing.c"
 	}
 }
 
 
 void publishing_you_tube_value_take_publishing_parameters (GValue* value, gpointer v_object) {
 	PublishingYouTubePublishingParameters* old;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (v_object) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1043 "YouTubePublishing.c"
+#line 1045 "YouTubePublishing.c"
 	} else {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1047 "YouTubePublishing.c"
+#line 1049 "YouTubePublishing.c"
 	}
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_parameters_unref (old);
-#line 1053 "YouTubePublishing.c"
+#line 1055 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_publishing_parameters_class_init (PublishingYouTubePublishingParametersClass * klass) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_parameters_parent_class = g_type_class_peek_parent (klass);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingYouTubePublishingParametersClass *) klass)->finalize = publishing_you_tube_publishing_parameters_finalize;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubePublishingParametersPrivate));
-#line 1065 "YouTubePublishing.c"
+#line 1067 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_parameters_instance_init (PublishingYouTubePublishingParameters * self) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_PRIVATE (self);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->ref_count = 1;
-#line 1074 "YouTubePublishing.c"
+#line 1076 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_parameters_finalize (PublishingYouTubePublishingParameters* obj) {
 	PublishingYouTubePublishingParameters * self;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_PARAMETERS, PublishingYouTubePublishingParameters);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 70 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->channel_name);
-#line 71 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->priv->user_name);
 #line 1088 "YouTubePublishing.c"
 }
@@ -1127,9 +1105,9 @@ GType publishing_you_tube_publishing_parameters_get_type (void) {
 gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance) {
 	PublishingYouTubePublishingParameters* self;
 	self = instance;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return instance;
 #line 1113 "YouTubePublishing.c"
 }
@@ -1138,50 +1116,236 @@ gpointer publishing_you_tube_publishing_parameters_ref (gpointer instance) {
 void publishing_you_tube_publishing_parameters_unref (gpointer instance) {
 	PublishingYouTubePublishingParameters* self;
 	self = instance;
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		PUBLISHING_YOU_TUBE_PUBLISHING_PARAMETERS_GET_CLASS (self)->finalize (self);
-#line 68 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 66 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
 #line 1126 "YouTubePublishing.c"
 	}
 }
 
 
+static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return self ? publishing_rest_support_session_ref (self) : NULL;
+#line 1134 "YouTubePublishing.c"
+}
+
+
+PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) {
+	PublishingYouTubeYouTubeAuthorizer * self = NULL;
+	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
+	SpitPublishingAuthenticator* _tmp2_ = NULL;
+	SpitPublishingAuthenticator* _tmp3_ = NULL;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (authenticator), NULL);
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = (PublishingYouTubeYouTubeAuthorizer*) g_object_new (object_type, NULL);
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = session;
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = _publishing_rest_support_session_ref0 (_tmp0_);
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 97 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->session = _tmp1_;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp2_ = authenticator;
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = _g_object_ref0 (_tmp2_);
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 98 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->authenticator = _tmp3_;
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return self;
+#line 1168 "YouTubePublishing.c"
+}
+
+
+PublishingYouTubeYouTubeAuthorizer* publishing_you_tube_you_tube_authorizer_new (PublishingRESTSupportGoogleSession* session, SpitPublishingAuthenticator* authenticator) {
+#line 96 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return publishing_you_tube_you_tube_authorizer_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, session, authenticator);
+#line 1175 "YouTubePublishing.c"
+}
+
+
+static gboolean publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain (GDataAuthorizer* base, GDataAuthorizationDomain* domain) {
+	PublishingYouTubeYouTubeAuthorizer * self;
+	gboolean result = FALSE;
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
+#line 101 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (GDATA_IS_AUTHORIZATION_DOMAIN (domain), FALSE);
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	result = TRUE;
+#line 102 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return result;
+#line 1190 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_you_tube_authorizer_real_process_request (GDataAuthorizer* base, GDataAuthorizationDomain* domain, SoupMessage* message) {
+	PublishingYouTubeYouTubeAuthorizer * self;
+	GDataAuthorizationDomain* _tmp0_ = NULL;
+	gchar* header = NULL;
+	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	gchar* _tmp4_ = NULL;
+	gchar* _tmp5_ = NULL;
+	SoupMessage* _tmp6_ = NULL;
+	SoupMessageHeaders* _tmp7_ = NULL;
+	const gchar* _tmp8_ = NULL;
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_if_fail ((domain == NULL) || GDATA_IS_AUTHORIZATION_DOMAIN (domain));
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_if_fail (SOUP_IS_MESSAGE (message));
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = domain;
+#line 107 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_tmp0_ == NULL) {
+#line 108 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return;
+#line 1218 "YouTubePublishing.c"
+	}
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = self->priv->session;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp2_ = publishing_rest_support_google_session_get_access_token (_tmp1_);
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = _tmp2_;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp4_ = g_strdup_printf ("Bearer %s", _tmp3_);
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = _tmp4_;
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp3_);
+#line 111 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	header = _tmp5_;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp6_ = message;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp7_ = _tmp6_->request_headers;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp8_ = header;
+#line 112 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	soup_message_headers_replace (_tmp7_, "Authorization", _tmp8_);
+#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (header);
+#line 1244 "YouTubePublishing.c"
+}
+
+
+static gboolean publishing_you_tube_you_tube_authorizer_real_refresh_authorization (GDataAuthorizer* base, GCancellable* cancellable, GError** error) {
+	PublishingYouTubeYouTubeAuthorizer * self;
+	gboolean result = FALSE;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
+#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), FALSE);
+#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	spit_publishing_authenticator_refresh (_tmp0_);
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	result = TRUE;
+#line 117 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return result;
+#line 1264 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_you_tube_authorizer_class_init (PublishingYouTubeYouTubeAuthorizerClass * klass) {
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_you_tube_authorizer_parent_class = g_type_class_peek_parent (klass);
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_type_class_add_private (klass, sizeof (PublishingYouTubeYouTubeAuthorizerPrivate));
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_authorizer_finalize;
+#line 1275 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_you_tube_authorizer_gdata_authorizer_interface_init (GDataAuthorizerInterface * iface) {
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_you_tube_authorizer_gdata_authorizer_parent_iface = g_type_interface_peek_parent (iface);
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	iface->is_authorized_for_domain = (gboolean (*)(GDataAuthorizer*, GDataAuthorizationDomain*)) publishing_you_tube_you_tube_authorizer_real_is_authorized_for_domain;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	iface->process_request = (void (*)(GDataAuthorizer*, GDataAuthorizationDomain*, SoupMessage*)) publishing_you_tube_you_tube_authorizer_real_process_request;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	iface->refresh_authorization = (gboolean (*)(GDataAuthorizer*, GCancellable*, GError**)) publishing_you_tube_you_tube_authorizer_real_refresh_authorization;
+#line 1288 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_you_tube_authorizer_instance_init (PublishingYouTubeYouTubeAuthorizer * self) {
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_AUTHORIZER_GET_PRIVATE (self);
+#line 1295 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_you_tube_authorizer_finalize (GObject* obj) {
+	PublishingYouTubeYouTubeAuthorizer * self;
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_AUTHORIZER, PublishingYouTubeYouTubeAuthorizer);
+#line 93 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_session_unref0 (self->priv->session);
+#line 94 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 92 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	G_OBJECT_CLASS (publishing_you_tube_you_tube_authorizer_parent_class)->finalize (obj);
+#line 1309 "YouTubePublishing.c"
+}
+
+
+GType publishing_you_tube_you_tube_authorizer_get_type (void) {
+	static volatile gsize publishing_you_tube_you_tube_authorizer_type_id__volatile = 0;
+	if (g_once_init_enter (&publishing_you_tube_you_tube_authorizer_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubeYouTubeAuthorizerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_you_tube_authorizer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubeYouTubeAuthorizer), 0, (GInstanceInitFunc) publishing_you_tube_you_tube_authorizer_instance_init, NULL };
+		static const GInterfaceInfo gdata_authorizer_info = { (GInterfaceInitFunc) publishing_you_tube_you_tube_authorizer_gdata_authorizer_interface_init, (GInterfaceFinalizeFunc) NULL, NULL};
+		GType publishing_you_tube_you_tube_authorizer_type_id;
+		publishing_you_tube_you_tube_authorizer_type_id = g_type_register_static (G_TYPE_OBJECT, "PublishingYouTubeYouTubeAuthorizer", &g_define_type_info, 0);
+		g_type_add_interface_static (publishing_you_tube_you_tube_authorizer_type_id, gdata_authorizer_get_type (), &gdata_authorizer_info);
+		g_once_init_leave (&publishing_you_tube_you_tube_authorizer_type_id__volatile, publishing_you_tube_you_tube_authorizer_type_id);
+	}
+	return publishing_you_tube_you_tube_authorizer_type_id__volatile;
+}
+
+
 PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_construct (GType object_type, SpitPublishingService* service, SpitPublishingPluginHost* host) {
 	PublishingYouTubeYouTubePublisher * self = NULL;
 	SpitPublishingService* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp4_ = NULL;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (service), NULL);
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = service;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = host;
-#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 129 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubeYouTubePublisher*) publishing_rest_support_google_publisher_construct (object_type, _tmp0_, _tmp1_, "https://gdata.youtube.com/");
-#line 130 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->running = FALSE;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = host;
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = spit_host_interface_get_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", NULL);
-#line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->refresh_token);
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->refresh_token = _tmp3_;
+	self->priv->running = FALSE;
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = publishing_you_tube_publishing_parameters_new ();
+	_tmp2_ = publishing_you_tube_publishing_parameters_new ();
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
 #line 132 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->publishing_parameters = _tmp4_;
+	self->priv->publishing_parameters = _tmp2_;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1196,16 +1360,16 @@ PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_constr
 	self->priv->progress_reporter_target = NULL;
 #line 133 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 1180 "YouTubePublishing.c"
+#line 1366 "YouTubePublishing.c"
 }
 
 
 PublishingYouTubeYouTubePublisher* publishing_you_tube_you_tube_publisher_new (SpitPublishingService* service, SpitPublishingPluginHost* host) {
-#line 127 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 128 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_you_tube_publisher_construct (PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, service, host);
-#line 1187 "YouTubePublishing.c"
+#line 1373 "YouTubePublishing.c"
 }
 
 
@@ -1221,14 +1385,14 @@ static gboolean publishing_you_tube_you_tube_publisher_real_is_running (Publishi
 	result = _tmp0_;
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 1203 "YouTubePublishing.c"
+#line 1389 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
+	SpitPublishingAuthenticator* _tmp1_ = NULL;
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
@@ -1239,25 +1403,15 @@ static void publishing_you_tube_you_tube_publisher_real_start (PublishingRESTSup
 	if (_tmp0_) {
 #line 144 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1221 "YouTubePublishing.c"
+#line 1407 "YouTubePublishing.c"
 	}
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->running = TRUE;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = self->priv->refresh_token;
+	_tmp1_ = self->priv->authenticator;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (_tmp1_ == NULL) {
-#line 149 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (self);
-#line 1231 "YouTubePublishing.c"
-	} else {
-		const gchar* _tmp2_ = NULL;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp2_ = self->priv->refresh_token;
-#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp2_);
-#line 1238 "YouTubePublishing.c"
-	}
+	spit_publishing_authenticator_authenticate (_tmp1_);
+#line 1415 "YouTubePublishing.c"
 }
 
 
@@ -1265,512 +1419,122 @@ static void publishing_you_tube_you_tube_publisher_real_stop (PublishingRESTSupp
 	PublishingYouTubeYouTubePublisher * self;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 151 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
-#line 155 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:155: YouTubePublisher: stopped.");
-#line 157 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 152 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:152: YouTubePublisher: stopped.");
+#line 154 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->running = FALSE;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = _tmp0_;
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_rest_support_session_stop_transactions (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 156 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 1261 "YouTubePublishing.c"
-}
-
-
-static gchar* publishing_you_tube_you_tube_publisher_extract_channel_name_helper (PublishingYouTubeYouTubePublisher* self, xmlNode* document_root, GError** error) {
-	gchar* result = NULL;
-	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	xmlNode* doc_node_iter = NULL;
-	xmlNode* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self), NULL);
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = g_strdup ("");
-#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_result_ = _tmp0_;
-#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	doc_node_iter = NULL;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = document_root;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = _tmp1_->name;
-#line 167 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (g_strcmp0 (_tmp2_, "feed") == 0) {
-#line 1288 "YouTubePublishing.c"
-		xmlNode* _tmp3_ = NULL;
-		xmlNode* _tmp4_ = NULL;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp3_ = document_root;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp4_ = _tmp3_->children;
-#line 168 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		doc_node_iter = _tmp4_;
-#line 1297 "YouTubePublishing.c"
-	} else {
-		xmlNode* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = document_root;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp6_ = _tmp5_->name;
-#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (g_strcmp0 (_tmp6_, "entry") == 0) {
-#line 1307 "YouTubePublishing.c"
-			xmlNode* _tmp7_ = NULL;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp7_ = document_root;
-#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			doc_node_iter = _tmp7_;
-#line 1313 "YouTubePublishing.c"
-		} else {
-			GError* _tmp8_ = NULL;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp8_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_MALFORMED_RESPONSE, "response root node isn't a <feed> or <entry>");
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_inner_error_ = _tmp8_;
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				g_propagate_error (error, _inner_error_);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_g_free0 (_result_);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				return NULL;
-#line 1328 "YouTubePublishing.c"
-			} else {
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_g_free0 (_result_);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				g_clear_error (&_inner_error_);
-#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				return NULL;
-#line 1338 "YouTubePublishing.c"
-			}
-		}
-	}
-	{
-		gboolean _tmp9_ = FALSE;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp9_ = TRUE;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		while (TRUE) {
-#line 1348 "YouTubePublishing.c"
-			xmlNode* _tmp12_ = NULL;
-			xmlNode* _tmp13_ = NULL;
-			const gchar* _tmp14_ = NULL;
-			gchar* name_val = NULL;
-			gchar* url_val = NULL;
-			xmlNode* channel_node_iter = NULL;
-			xmlNode* _tmp15_ = NULL;
-			xmlNode* _tmp16_ = NULL;
-			const gchar* _tmp32_ = NULL;
-			gchar* _tmp33_ = NULL;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (!_tmp9_) {
-#line 1361 "YouTubePublishing.c"
-				xmlNode* _tmp10_ = NULL;
-				xmlNode* _tmp11_ = NULL;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp10_ = doc_node_iter;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp11_ = _tmp10_->next;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				doc_node_iter = _tmp11_;
-#line 1370 "YouTubePublishing.c"
-			}
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp9_ = FALSE;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp12_ = doc_node_iter;
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (!(_tmp12_ != NULL)) {
-#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				break;
-#line 1380 "YouTubePublishing.c"
-			}
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp13_ = doc_node_iter;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp14_ = _tmp13_->name;
-#line 176 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (g_strcmp0 (_tmp14_, "entry") != 0) {
-#line 177 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				continue;
-#line 1390 "YouTubePublishing.c"
-			}
-#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			name_val = NULL;
-#line 180 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			url_val = NULL;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp15_ = doc_node_iter;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp16_ = _tmp15_->children;
-#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			channel_node_iter = _tmp16_;
-#line 1402 "YouTubePublishing.c"
-			{
-				gboolean _tmp17_ = FALSE;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp17_ = TRUE;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				while (TRUE) {
-#line 1409 "YouTubePublishing.c"
-					xmlNode* _tmp20_ = NULL;
-					xmlNode* _tmp21_ = NULL;
-					const gchar* _tmp22_ = NULL;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					if (!_tmp17_) {
-#line 1415 "YouTubePublishing.c"
-						xmlNode* _tmp18_ = NULL;
-						xmlNode* _tmp19_ = NULL;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp18_ = channel_node_iter;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp19_ = _tmp18_->next;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						channel_node_iter = _tmp19_;
-#line 1424 "YouTubePublishing.c"
-					}
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					_tmp17_ = FALSE;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					_tmp20_ = channel_node_iter;
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					if (!(_tmp20_ != NULL)) {
-#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						break;
-#line 1434 "YouTubePublishing.c"
-					}
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					_tmp21_ = channel_node_iter;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					_tmp22_ = _tmp21_->name;
-#line 183 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-					if (g_strcmp0 (_tmp22_, "title") == 0) {
-#line 1442 "YouTubePublishing.c"
-						xmlNode* _tmp23_ = NULL;
-						gchar* _tmp24_ = NULL;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp23_ = channel_node_iter;
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp24_ = (gchar*) xmlNodeGetContent (_tmp23_);
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_g_free0 (name_val);
-#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						name_val = _tmp24_;
-#line 1453 "YouTubePublishing.c"
-					} else {
-						xmlNode* _tmp25_ = NULL;
-						const gchar* _tmp26_ = NULL;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp25_ = channel_node_iter;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						_tmp26_ = _tmp25_->name;
-#line 185 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-						if (g_strcmp0 (_tmp26_, "id") == 0) {
-#line 1463 "YouTubePublishing.c"
-							xmlNode* _tmp27_ = NULL;
-							xmlNs* _tmp28_ = NULL;
-							const gchar* _tmp29_ = NULL;
-							xmlNode* _tmp30_ = NULL;
-							gchar* _tmp31_ = NULL;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_tmp27_ = channel_node_iter;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_tmp28_ = _tmp27_->ns;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_tmp29_ = _tmp28_->prefix;
-#line 189 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							if (_tmp29_ != NULL) {
-#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-								continue;
-#line 1479 "YouTubePublishing.c"
-							}
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_tmp30_ = channel_node_iter;
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_tmp31_ = (gchar*) xmlNodeGetContent (_tmp30_);
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							_g_free0 (url_val);
-#line 191 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-							url_val = _tmp31_;
-#line 1489 "YouTubePublishing.c"
-						}
-					}
-				}
-			}
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp32_ = name_val;
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp33_ = g_strdup (_tmp32_);
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (_result_);
-#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_result_ = _tmp33_;
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (url_val);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (name_val);
-#line 196 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			break;
-#line 1508 "YouTubePublishing.c"
-		}
-	}
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp34_ = _result_;
-#line 199 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:199: YouTubePublisher: extracted channel name '" \
-"%s' from response XML.", _tmp34_);
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	result = _result_;
-#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return result;
-#line 1519 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_on_service_welcome_login (PublishingYouTubeYouTubePublisher* self) {
-	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-#line 204 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:205: EVENT: user clicked 'Login' in welcome pan" \
-"e.");
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 207 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp0_) {
-#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 1536 "YouTubePublishing.c"
-	}
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = self->priv->refresh_token;
-#line 210 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_google_publisher_start_oauth_flow (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher), _tmp1_);
-#line 1542 "YouTubePublishing.c"
+#line 1437 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_real_on_login_flow_complete (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
-	SpitPublishingPluginHost* _tmp0_ = NULL;
+	PublishingYouTubePublishingParameters* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp5_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp5_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp6_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	SpitPublishingAuthenticator* _tmp7_ = NULL;
+	PublishingYouTubeYouTubeAuthorizer* _tmp8_ = NULL;
+	PublishingYouTubeYouTubeAuthorizer* _tmp9_ = NULL;
+	GDataYouTubeService* _tmp10_ = NULL;
+#line 159 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
-#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:214: EVENT: OAuth login flow complete.");
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 160 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:160: EVENT: OAuth login flow complete.");
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = self->priv->publishing_parameters;
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = _tmp1_;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = publishing_rest_support_google_session_get_refresh_token (_tmp2_);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = publishing_rest_support_google_session_get_user_name (_tmp2_);
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = _tmp3_;
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_host_interface_set_config_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token", _tmp4_);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_publishing_parameters_set_user_name (_tmp0_, _tmp4_);
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (_tmp4_);
-#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 162 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (_tmp2_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = self->priv->publishing_parameters;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7_ = _tmp6_;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = publishing_rest_support_google_session_get_user_name (_tmp7_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = _tmp8_;
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_publishing_parameters_set_user_name (_tmp5_, _tmp9_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp9_);
-#line 218 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp7_);
-#line 220 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_do_fetch_account_information (self);
-#line 1596 "YouTubePublishing.c"
-}
-
-
-static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed (PublishingRESTSupportTransaction* _sender, gpointer self) {
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete ((PublishingYouTubeYouTubePublisher*) self, _sender);
-#line 1603 "YouTubePublishing.c"
-}
-
-
-static void _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error (PublishingRESTSupportTransaction* _sender, GError* err, gpointer self) {
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err);
-#line 1610 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportTransaction* txn) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	gboolean _tmp4_ = FALSE;
-	PublishingRESTSupportTransaction* _tmp5_ = NULL;
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 223 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (txn));
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = txn;
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = txn;
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:227: EVENT: finished fetching account and chann" \
-"el information.");
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp4_) {
-#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 1645 "YouTubePublishing.c"
-	}
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = txn;
-#line 232 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_do_parse_and_display_account_information (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, PublishingYouTubeYouTubePublisherChannelDirectoryTransaction));
-#line 1651 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error (PublishingYouTubeYouTubePublisher* self, PublishingRESTSupportTransaction* bad_txn, GError* err) {
-	PublishingRESTSupportTransaction* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
-	PublishingRESTSupportTransaction* _tmp2_ = NULL;
-	guint _tmp3_ = 0U;
-	PublishingRESTSupportTransaction* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gboolean _tmp7_ = FALSE;
-	SpitPublishingPluginHost* _tmp8_ = NULL;
-	GError* _tmp9_ = NULL;
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 235 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_TRANSACTION (bad_txn));
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = bad_txn;
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_parse_name ("completed", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp1_, NULL, FALSE);
-#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed, self);
-#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = bad_txn;
-#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_parse_name ("network-error", PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, &_tmp3_, NULL, FALSE);
-#line 238 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error, self);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = bad_txn;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = publishing_rest_support_transaction_get_response (_tmp4_);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = _tmp5_;
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:240: EVENT: fetching account and channel inform" \
-"ation failed; response = '%s'.", _tmp6_);
-#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp6_);
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (!_tmp7_) {
-#line 244 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 1698 "YouTubePublishing.c"
-	}
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = err;
-#line 246 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_post_error (_tmp8_, _tmp9_);
-#line 1706 "YouTubePublishing.c"
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp7_ = self->priv->authenticator;
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp8_ = publishing_you_tube_you_tube_authorizer_new (_tmp6_, _tmp7_);
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp9_ = _tmp8_;
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp10_ = gdata_youtube_service_new (PUBLISHING_YOU_TUBE_DEVELOPER_KEY, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gdata_authorizer_get_type (), GDataAuthorizer));
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->youtube_service = _tmp10_;
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_tmp9_);
+#line 164 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_session_unref0 (_tmp6_);
+#line 166 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (self);
+#line 1496 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_on_publishing_options_logout (PublishingYouTubeYouTubePublisher* self) {
 	gboolean _tmp0_ = FALSE;
-#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 169 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 250 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:250: EVENT: user clicked 'Logout' in the publis" \
+#line 170 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:170: EVENT: user clicked 'Logout' in the publis" \
 "hing options pane.");
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 172 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp0_) {
-#line 253 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 173 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1722 "YouTubePublishing.c"
+#line 1512 "YouTubePublishing.c"
 	}
-#line 255 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 175 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_rest_support_google_publisher_do_logout (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 1726 "YouTubePublishing.c"
+#line 1516 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_on_publishing_options_publish (PublishingYouTubeYouTubePublisher* self) {
 	gboolean _tmp0_ = FALSE;
-#line 258 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 178 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 259 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:259: EVENT: user clicked 'Publish' in the publi" \
+#line 179 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:179: EVENT: user clicked 'Publish' in the publi" \
 "shing options pane.");
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 181 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp0_) {
-#line 262 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 182 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1742 "YouTubePublishing.c"
+#line 1532 "YouTubePublishing.c"
 	}
-#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 184 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_upload (self);
-#line 1746 "YouTubePublishing.c"
+#line 1536 "YouTubePublishing.c"
 }
 
 
@@ -1783,52 +1547,52 @@ static void publishing_you_tube_you_tube_publisher_on_upload_status_updated (Pub
 	void* _tmp3__target = NULL;
 	gint _tmp4_ = 0;
 	gdouble _tmp5_ = 0.0;
-#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 187 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = completed_fraction;
-#line 268 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:268: EVENT: uploader reports upload %.2f percen" \
+#line 188 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:188: EVENT: uploader reports upload %.2f percen" \
 "t complete.", 100.0 * _tmp0_);
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = self->priv->progress_reporter;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1__target = self->priv->progress_reporter_target;
-#line 270 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 190 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_vala_assert (_tmp1_ != NULL, "progress_reporter != null");
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 192 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp2_) {
-#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 193 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1777 "YouTubePublishing.c"
+#line 1567 "YouTubePublishing.c"
 	}
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = self->priv->progress_reporter;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3__target = self->priv->progress_reporter_target;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = file_number;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = completed_fraction;
-#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 195 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ (_tmp4_, _tmp5_, _tmp3__target);
-#line 1789 "YouTubePublishing.c"
+#line 1579 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete (PublishingRESTSupportBatchUploader* _sender, gint num_photos_published, gpointer self) {
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_complete ((PublishingYouTubeYouTubePublisher*) self, _sender, num_photos_published);
-#line 1796 "YouTubePublishing.c"
+#line 1586 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error (PublishingRESTSupportBatchUploader* _sender, GError* err, gpointer self) {
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_error ((PublishingYouTubeYouTubePublisher*) self, _sender, err);
-#line 1803 "YouTubePublishing.c"
+#line 1593 "YouTubePublishing.c"
 }
 
 
@@ -1839,38 +1603,38 @@ static void publishing_you_tube_you_tube_publisher_on_upload_complete (Publishin
 	guint _tmp3_ = 0U;
 	gint _tmp4_ = 0;
 	gboolean _tmp5_ = FALSE;
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 278 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 198 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = uploader;
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 200 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = uploader;
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 281 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 201 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = num_published;
-#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:283: EVENT: uploader reports upload complete; %" \
+#line 203 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:203: EVENT: uploader reports upload complete; %" \
 "d items published.", _tmp4_);
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 285 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 205 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp5_) {
-#line 286 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 206 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1840 "YouTubePublishing.c"
+#line 1630 "YouTubePublishing.c"
 	}
-#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 208 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_do_show_success_pane (self);
-#line 1844 "YouTubePublishing.c"
+#line 1634 "YouTubePublishing.c"
 }
 
 
@@ -1884,366 +1648,58 @@ static void publishing_you_tube_you_tube_publisher_on_upload_error (PublishingYo
 	const gchar* _tmp6_ = NULL;
 	SpitPublishingPluginHost* _tmp7_ = NULL;
 	GError* _tmp8_ = NULL;
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 291 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 211 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_REST_SUPPORT_IS_BATCH_UPLOADER (uploader));
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = uploader;
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_parse_name ("upload-complete", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp1_, NULL, FALSE);
-#line 293 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 213 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = uploader;
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_parse_name ("upload-error", PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, &_tmp3_, NULL, FALSE);
-#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 214 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self);
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 296 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 216 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp4_) {
-#line 297 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 217 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 1880 "YouTubePublishing.c"
+#line 1670 "YouTubePublishing.c"
 	}
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = err;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = _tmp5_->message;
-#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:299: EVENT: uploader reports upload error = '%s" \
+#line 219 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:219: EVENT: uploader reports upload error = '%s" \
 "'.", _tmp6_);
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = err;
-#line 301 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 221 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 1894 "YouTubePublishing.c"
-}
-
-
-static void _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback (gpointer self) {
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_on_service_welcome_login ((PublishingYouTubeYouTubePublisher*) self);
-#line 1901 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (PublishingYouTubeYouTubePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:305: ACTION: showing service welcome pane.");
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 307 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_install_welcome_pane (_tmp0_, PUBLISHING_YOU_TUBE_SERVICE_WELCOME_MESSAGE, _publishing_you_tube_you_tube_publisher_on_service_welcome_login_spit_publishing_login_callback, self);
-#line 1915 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_do_fetch_account_information (PublishingYouTubeYouTubePublisher* self) {
-	SpitPublishingPluginHost* _tmp0_ = NULL;
-	SpitPublishingPluginHost* _tmp1_ = NULL;
-	PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* directory_trans = NULL;
-	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp3_ = NULL;
-	PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* _tmp4_ = NULL;
-	PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* _tmp5_ = NULL;
-	GError * _inner_error_ = NULL;
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 311 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:311: ACTION: fetching channel information.");
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp0_);
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp1_, TRUE);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = _tmp2_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = publishing_you_tube_you_tube_publisher_channel_directory_transaction_new (_tmp3_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = _tmp4_;
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp3_);
-#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	directory_trans = _tmp5_;
-#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "network-error", (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error_publishing_rest_support_transaction_network_error, self, 0);
-#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "completed", (GCallback) _publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_complete_publishing_rest_support_transaction_completed, self, 0);
-#line 1956 "YouTubePublishing.c"
-	{
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		publishing_rest_support_transaction_execute (G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 1964 "YouTubePublishing.c"
-				goto __catch27_spit_publishing_publishing_error;
-			}
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_critical ("file %s: line %d: unexpected 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/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 1975 "YouTubePublishing.c"
-		}
-	}
-	goto __finally27;
-	__catch27_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		GError* _tmp6_ = NULL;
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		err = _inner_error_;
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_inner_error_ = NULL;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp6_ = err;
-#line 324 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		publishing_you_tube_you_tube_publisher_on_initial_channel_fetch_error (self, G_TYPE_CHECK_INSTANCE_CAST (directory_trans, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), _tmp6_);
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_error_free0 (err);
-#line 1993 "YouTubePublishing.c"
-	}
-	__finally27:
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 321 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 2006 "YouTubePublishing.c"
-	}
-#line 310 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_transaction_unref0 (directory_trans);
-#line 2010 "YouTubePublishing.c"
-}
-
-
-static gchar* _publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response (PublishingRESTSupportXmlDocument* doc, gpointer self) {
-	gchar* result;
-	result = publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml (doc);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return result;
-#line 2019 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_do_parse_and_display_account_information (PublishingYouTubeYouTubePublisher* self, PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* transaction) {
-	PublishingRESTSupportXmlDocument* response_doc = NULL;
-	GError * _inner_error_ = NULL;
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_if_fail (PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_IS_CHANNEL_DIRECTORY_TRANSACTION (transaction));
-#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:329: ACTION: extracting account and channel inf" \
-"ormation from body of server response");
-#line 2032 "YouTubePublishing.c"
-	{
-		PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-		PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* _tmp1_ = NULL;
-		gchar* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp4_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp5_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp6_ = NULL;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp1_ = transaction;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp2_ = publishing_rest_support_transaction_get_response (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp3_ = _tmp2_;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp4_ = publishing_rest_support_xml_document_parse_string (_tmp3_, _publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml_publishing_rest_support_xml_document_check_for_error_response, NULL, &_inner_error_);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = _tmp4_;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp3_);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp0_ = _tmp5_;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2059 "YouTubePublishing.c"
-				goto __catch28_spit_publishing_publishing_error;
-			}
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 2070 "YouTubePublishing.c"
-		}
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp6_ = _tmp0_;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp0_ = NULL;
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		response_doc = _tmp6_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (_tmp0_);
-#line 2082 "YouTubePublishing.c"
-	}
-	goto __finally28;
-	__catch28_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp7_ = NULL;
-		GError* _tmp8_ = NULL;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		err = _inner_error_;
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_inner_error_ = NULL;
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp8_ = err;
-#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp7_, _tmp8_);
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_error_free0 (err);
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 2106 "YouTubePublishing.c"
-	}
-	__finally28:
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 332 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 2119 "YouTubePublishing.c"
-	}
-	{
-		gchar* _tmp9_ = NULL;
-		PublishingRESTSupportXmlDocument* _tmp10_ = NULL;
-		xmlNode* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		PublishingYouTubePublishingParameters* _tmp13_ = NULL;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp10_ = response_doc;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp11_ = publishing_rest_support_xml_document_get_root_node (_tmp10_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp12_ = publishing_you_tube_you_tube_publisher_extract_channel_name_helper (self, _tmp11_, &_inner_error_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp9_ = _tmp12_;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 2139 "YouTubePublishing.c"
-				goto __catch29_spit_publishing_publishing_error;
-			}
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_critical ("file %s: line %d: unexpected 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/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 2150 "YouTubePublishing.c"
-		}
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp13_ = self->priv->publishing_parameters;
-#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		publishing_you_tube_publishing_parameters_set_channel_name (_tmp13_, _tmp9_);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp9_);
-#line 2158 "YouTubePublishing.c"
-	}
-	goto __finally29;
-	__catch29_spit_publishing_publishing_error:
-	{
-		GError* err = NULL;
-		SpitPublishingPluginHost* _tmp14_ = NULL;
-		GError* _tmp15_ = NULL;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		err = _inner_error_;
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_inner_error_ = NULL;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp15_ = err;
-#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		spit_publishing_plugin_host_post_error (_tmp14_, _tmp15_);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_error_free0 (err);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 345 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 2182 "YouTubePublishing.c"
-	}
-	__finally29:
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_clear_error (&_inner_error_);
-#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return;
-#line 2195 "YouTubePublishing.c"
-	}
-#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_do_show_publishing_options_pane (self);
-#line 328 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_xml_document_unref0 (response_doc);
-#line 2201 "YouTubePublishing.c"
+#line 1684 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_publishing_options_publish ((PublishingYouTubeYouTubePublisher*) self);
-#line 2208 "YouTubePublishing.c"
+#line 1691 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout (PublishingYouTubePublishingOptionsPane* _sender, gpointer self) {
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_publishing_options_logout ((PublishingYouTubeYouTubePublisher*) self);
-#line 2215 "YouTubePublishing.c"
+#line 1698 "YouTubePublishing.c"
 }
 
 
@@ -2251,39 +1707,40 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp0_ = NULL;
 	PublishingYouTubePublishingOptionsPane* opts_pane = NULL;
-	SpitPublishingPluginHost* _tmp8_ = NULL;
-	GtkBuilder* _tmp9_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp10_ = NULL;
-	PublishingYouTubePublishingOptionsPane* _tmp11_ = NULL;
+	SpitPublishingAuthenticator* _tmp8_ = NULL;
+	SpitPublishingPluginHost* _tmp9_ = NULL;
+	GtkBuilder* _tmp10_ = NULL;
+	PublishingYouTubePublishingParameters* _tmp11_ = NULL;
 	PublishingYouTubePublishingOptionsPane* _tmp12_ = NULL;
 	PublishingYouTubePublishingOptionsPane* _tmp13_ = NULL;
-	SpitPublishingPluginHost* _tmp14_ = NULL;
-	PublishingYouTubePublishingOptionsPane* _tmp15_ = NULL;
-	SpitPublishingPluginHost* _tmp16_ = NULL;
+	PublishingYouTubePublishingOptionsPane* _tmp14_ = NULL;
+	SpitPublishingPluginHost* _tmp15_ = NULL;
+	PublishingYouTubePublishingOptionsPane* _tmp16_ = NULL;
+	SpitPublishingPluginHost* _tmp17_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:352: ACTION: showing publishing options pane.");
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 225 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:225: ACTION: showing publishing options pane.");
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = gtk_builder_new ();
-#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 227 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	builder = _tmp0_;
-#line 2241 "YouTubePublishing.c"
+#line 1725 "YouTubePublishing.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp1_ = builder;
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		gtk_builder_add_from_resource (_tmp1_, PLUGIN_RESOURCE_PATH "/youtube_publishing_options_pane.ui", &_inner_error_);
-#line 357 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 230 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2250 "YouTubePublishing.c"
-			goto __catch30_g_error;
+#line 1734 "YouTubePublishing.c"
+			goto __catch20_g_error;
 		}
 	}
-	goto __finally30;
-	__catch30_g_error:
+	goto __finally20;
+	__catch20_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp2_ = NULL;
@@ -2292,90 +1749,92 @@ static void publishing_you_tube_you_tube_publisher_do_show_publishing_options_pa
 		const gchar* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		e = _inner_error_;
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_inner_error_ = NULL;
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp2_ = e;
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp3_ = _tmp2_->message;
-#line 360 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_warning ("YouTubePublishing.vala:360: Could not parse UI file! Error: %s.", _tmp3_);
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 233 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_warning ("YouTubePublishing.vala:233: Could not parse UI file! Error: %s.", _tmp3_);
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp4_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp5_ = _ ("A file required for publishing is unavailable. Publishing to YouTube c" \
 "an’t continue.");
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp6_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp5_);
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_tmp7_ = _tmp6_;
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		spit_publishing_plugin_host_post_error (_tmp4_, _tmp7_);
-#line 361 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 234 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_error_free0 (_tmp7_);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_error_free0 (e);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_object_unref0 (builder);
-#line 364 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 237 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2292 "YouTubePublishing.c"
+#line 1776 "YouTubePublishing.c"
 	}
-	__finally30:
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	__finally20:
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_g_object_unref0 (builder);
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_clear_error (&_inner_error_);
-#line 356 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 229 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2305 "YouTubePublishing.c"
+#line 1789 "YouTubePublishing.c"
 	}
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = builder;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10_ = self->priv->publishing_parameters;
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp11_ = publishing_you_tube_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp10_);
-#line 367 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	opts_pane = _tmp11_;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp12_ = opts_pane;
-#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp12_, "publish", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish, self, 0);
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp8_ = self->priv->authenticator;
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp9_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp10_ = builder;
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp11_ = self->priv->publishing_parameters;
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp12_ = publishing_you_tube_publishing_options_pane_new (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
+#line 240 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	opts_pane = _tmp12_;
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp13_ = opts_pane;
-#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp13_, "logout", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout, self, 0);
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp14_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp15_ = opts_pane;
-#line 371 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_install_dialog_pane (_tmp14_, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp16_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_publishing_plugin_host_set_service_locked (_tmp16_, FALSE);
-#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 241 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (_tmp13_, "publish", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_publish_publishing_you_tube_publishing_options_pane_publish, self, 0);
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp14_ = opts_pane;
+#line 242 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (_tmp14_, "logout", (GCallback) _publishing_you_tube_you_tube_publisher_on_publishing_options_logout_publishing_you_tube_publishing_options_pane_logout, self, 0);
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp15_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp16_ = opts_pane;
+#line 243 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	spit_publishing_plugin_host_install_dialog_pane (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, SPIT_PUBLISHING_TYPE_DIALOG_PANE, SpitPublishingDialogPane), SPIT_PUBLISHING_PLUGIN_HOST_BUTTON_MODE_CANCEL);
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp17_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 245 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	spit_publishing_plugin_host_set_service_locked (_tmp17_, FALSE);
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (opts_pane);
-#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 224 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (builder);
-#line 2339 "YouTubePublishing.c"
+#line 1825 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback (gint file_number, gdouble fraction_complete, gpointer self) {
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_on_upload_status_updated ((PublishingYouTubeYouTubePublisher*) self, file_number, fraction_complete);
-#line 2346 "YouTubePublishing.c"
+#line 1832 "YouTubePublishing.c"
 }
 
 
@@ -2394,301 +1853,251 @@ static void publishing_you_tube_you_tube_publisher_do_upload (PublishingYouTubeY
 	gint publishables_length1 = 0;
 	gint _publishables_size_ = 0;
 	PublishingYouTubeUploader* uploader = NULL;
-	PublishingRESTSupportGoogleSession* _tmp10_ = NULL;
+	GDataYouTubeService* _tmp10_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp11_ = NULL;
-	SpitPublishingPublishable** _tmp12_ = NULL;
-	gint _tmp12__length1 = 0;
-	PublishingYouTubePublishingParameters* _tmp13_ = NULL;
-	PublishingYouTubeUploader* _tmp14_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp12_ = NULL;
+	SpitPublishingPublishable** _tmp13_ = NULL;
+	gint _tmp13__length1 = 0;
+	PublishingYouTubePublishingParameters* _tmp14_ = NULL;
 	PublishingYouTubeUploader* _tmp15_ = NULL;
 	PublishingYouTubeUploader* _tmp16_ = NULL;
 	PublishingYouTubeUploader* _tmp17_ = NULL;
 	PublishingYouTubeUploader* _tmp18_ = NULL;
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	PublishingYouTubeUploader* _tmp19_ = NULL;
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:377: ACTION: uploading media items to remote se" \
+#line 249 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:249: ACTION: uploading media items to remote se" \
 "rver.");
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 379 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 251 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, TRUE);
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 252 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_install_account_fetch_wait_pane (_tmp1_);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = spit_publishing_plugin_host_serialize_publishables (_tmp2_, -1, FALSE, &_tmp3_, &_tmp4_);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter = _tmp5_;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target = _tmp3_;
-#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 254 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = _tmp4_;
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = publishing_rest_support_google_publisher_is_running (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 260 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!_tmp6_) {
-#line 390 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 261 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return;
-#line 2411 "YouTubePublishing.c"
+#line 1898 "YouTubePublishing.c"
 	}
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp9_ = spit_publishing_plugin_host_get_publishables (_tmp7_, &_tmp8_);
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishables = _tmp9_;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishables_length1 = _tmp8_;
-#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 263 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishables_size_ = publishables_length1;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp11_ = _tmp10_;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp12_ = publishables;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp12__length1 = publishables_length1;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp13_ = self->priv->publishing_parameters;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp14_ = publishing_you_tube_uploader_new (_tmp11_, _tmp12_, _tmp12__length1, _tmp13_);
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp15_ = _tmp14_;
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp11_);
-#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	uploader = _tmp15_;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp16_ = uploader;
-#line 395 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp10_ = self->priv->youtube_service;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp11_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp12_ = _tmp11_;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp13_ = publishables;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp13__length1 = publishables_length1;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp14_ = self->priv->publishing_parameters;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp15_ = publishing_you_tube_uploader_new (_tmp10_, _tmp12_, _tmp13_, _tmp13__length1, _tmp14_);
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp16_ = _tmp15_;
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_session_unref0 (_tmp12_);
+#line 264 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	uploader = _tmp16_;
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp17_ = uploader;
-#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 266 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-complete", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_complete_publishing_rest_support_batch_uploader_upload_complete, self, 0);
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp18_ = uploader;
-#line 398 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 267 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), "upload-error", (GCallback) _publishing_you_tube_you_tube_publisher_on_upload_error_publishing_rest_support_batch_uploader_upload_error, self, 0);
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp19_ = uploader;
+#line 269 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_rest_support_batch_uploader_upload (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader), _publishing_you_tube_you_tube_publisher_on_upload_status_updated_spit_publishing_progress_callback, self);
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_batch_uploader_unref0 (uploader);
-#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 248 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishables = (_vala_array_free (publishables, publishables_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 2457 "YouTubePublishing.c"
+#line 1946 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_do_show_success_pane (PublishingYouTubeYouTubePublisher* self) {
 	SpitPublishingPluginHost* _tmp0_ = NULL;
 	SpitPublishingPluginHost* _tmp1_ = NULL;
-#line 401 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 272 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_YOU_TUBE_PUBLISHER (self));
-#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:402: ACTION: showing success pane.");
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 273 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:273: ACTION: showing success pane.");
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 275 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_set_service_locked (_tmp0_, FALSE);
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 276 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spit_publishing_plugin_host_install_success_pane (_tmp1_);
-#line 2476 "YouTubePublishing.c"
+#line 1965 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_real_do_logout (PublishingRESTSupportGooglePublisher* base) {
 	PublishingYouTubeYouTubePublisher * self;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	SpitPublishingPluginHost* _tmp2_ = NULL;
-#line 408 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	gboolean _tmp1_ = FALSE;
+#line 279 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
-#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_debug ("YouTubePublishing.vala:409: ACTION: logging out user.");
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_google_publisher_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = _tmp0_;
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_google_session_deauthenticate (_tmp1_);
-#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->refresh_token);
-#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->refresh_token = NULL;
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
-#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	spit_host_interface_unset_config_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_TYPE_HOST_INTERFACE, SpitHostInterface), "refresh_token");
-#line 416 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_do_show_service_welcome_pane (self);
-#line 2507 "YouTubePublishing.c"
-}
-
-
-static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_you_tube_you_tube_publisher_channel_directory_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session) {
-	PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* self = NULL;
-	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = session;
-#line 110 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self = (PublishingYouTubeYouTubePublisherChannelDirectoryTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_CHANNEL_DIRECTORY_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_GET);
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return self;
-#line 2522 "YouTubePublishing.c"
-}
-
-
-static PublishingYouTubeYouTubePublisherChannelDirectoryTransaction* publishing_you_tube_you_tube_publisher_channel_directory_transaction_new (PublishingRESTSupportGoogleSession* session) {
-#line 109 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return publishing_you_tube_you_tube_publisher_channel_directory_transaction_construct (PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_TYPE_CHANNEL_DIRECTORY_TRANSACTION, session);
-#line 2529 "YouTubePublishing.c"
-}
-
-
-static gchar* publishing_you_tube_you_tube_publisher_channel_directory_transaction_validate_xml (PublishingRESTSupportXmlDocument* doc) {
-	gchar* result = NULL;
-	xmlNode* document_root = NULL;
-	PublishingRESTSupportXmlDocument* _tmp0_ = NULL;
-	xmlNode* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
-	xmlNode* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-#line 113 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_XML_DOCUMENT (doc), NULL);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = doc;
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = publishing_rest_support_xml_document_get_root_node (_tmp0_);
-#line 114 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	document_root = _tmp1_;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = document_root;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = _tmp3_->name;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (g_strcmp0 (_tmp4_, "feed") == 0) {
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp2_ = TRUE;
-#line 2557 "YouTubePublishing.c"
-	} else {
-		xmlNode* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = document_root;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp6_ = _tmp5_->name;
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp2_ = g_strcmp0 (_tmp6_, "entry") == 0;
-#line 2567 "YouTubePublishing.c"
-	}
-#line 115 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (_tmp2_) {
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		result = NULL;
-#line 116 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return result;
-#line 2575 "YouTubePublishing.c"
-	} else {
-		gchar* _tmp7_ = NULL;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp7_ = g_strdup ("response root node isn't a <feed> or <entry>");
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		result = _tmp7_;
-#line 118 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		return result;
-#line 2584 "YouTubePublishing.c"
+#line 280 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_debug ("YouTubePublishing.vala:280: ACTION: logging out user.");
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = spit_publishing_authenticator_can_logout (_tmp0_);
+#line 282 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_tmp1_) {
+#line 1983 "YouTubePublishing.c"
+		SpitPublishingAuthenticator* _tmp2_ = NULL;
+		SpitPublishingAuthenticator* _tmp3_ = NULL;
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp2_ = self->priv->authenticator;
+#line 283 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		spit_publishing_authenticator_logout (_tmp2_);
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp3_ = self->priv->authenticator;
+#line 284 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		spit_publishing_authenticator_authenticate (_tmp3_);
+#line 1994 "YouTubePublishing.c"
 	}
 }
 
 
-static void publishing_you_tube_you_tube_publisher_channel_directory_transaction_class_init (PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass * klass) {
-#line 105 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_you_tube_you_tube_publisher_channel_directory_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 2592 "YouTubePublishing.c"
-}
-
-
-static void publishing_you_tube_you_tube_publisher_channel_directory_transaction_instance_init (PublishingYouTubeYouTubePublisherChannelDirectoryTransaction * self) {
-}
-
-
-static GType publishing_you_tube_you_tube_publisher_channel_directory_transaction_get_type (void) {
-	static volatile gsize publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id__volatile = 0;
-	if (g_once_init_enter (&publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id__volatile)) {
-		static const GTypeInfo g_define_type_info = { sizeof (PublishingYouTubeYouTubePublisherChannelDirectoryTransactionClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) publishing_you_tube_you_tube_publisher_channel_directory_transaction_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PublishingYouTubeYouTubePublisherChannelDirectoryTransaction), 0, (GInstanceInitFunc) publishing_you_tube_you_tube_publisher_channel_directory_transaction_instance_init, NULL };
-		GType publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id;
-		publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id = g_type_register_static (PUBLISHING_REST_SUPPORT_GOOGLE_PUBLISHER_TYPE_AUTHENTICATED_TRANSACTION, "PublishingYouTubeYouTubePublisherChannelDirectoryTransaction", &g_define_type_info, 0);
-		g_once_init_leave (&publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id__volatile, publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id);
+static SpitPublishingAuthenticator* publishing_you_tube_you_tube_publisher_real_get_authenticator (PublishingRESTSupportGooglePublisher* base) {
+	PublishingYouTubeYouTubePublisher * self;
+	SpitPublishingAuthenticator* result = NULL;
+	SpitPublishingAuthenticator* _tmp0_ = NULL;
+	SpitPublishingAuthenticator* _tmp5_ = NULL;
+	SpitPublishingAuthenticator* _tmp6_ = NULL;
+#line 288 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = self->priv->authenticator;
+#line 289 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_tmp0_ == NULL) {
+#line 2011 "YouTubePublishing.c"
+		PublishingAuthenticatorFactory* _tmp1_ = NULL;
+		PublishingAuthenticatorFactory* _tmp2_ = NULL;
+		SpitPublishingPluginHost* _tmp3_ = NULL;
+		SpitPublishingAuthenticator* _tmp4_ = NULL;
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp1_ = publishing_authenticator_factory_get_instance ();
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp2_ = _tmp1_;
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp3_ = publishing_rest_support_google_publisher_get_host (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_PUBLISHER, PublishingRESTSupportGooglePublisher));
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp4_ = spit_publishing_authenticator_factory_create (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory), "youtube", _tmp3_);
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (self->priv->authenticator);
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		self->priv->authenticator = _tmp4_;
+#line 290 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (_tmp2_);
+#line 2030 "YouTubePublishing.c"
 	}
-	return publishing_you_tube_you_tube_publisher_channel_directory_transaction_type_id__volatile;
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = self->priv->authenticator;
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp6_ = _g_object_ref0 (_tmp5_);
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	result = _tmp6_;
+#line 294 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return result;
+#line 2040 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_class_init (PublishingYouTubeYouTubePublisherClass * klass) {
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_you_tube_publisher_parent_class = g_type_class_peek_parent (klass);
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeYouTubePublisherPrivate));
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->is_running = publishing_you_tube_you_tube_publisher_real_is_running;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->start = publishing_you_tube_you_tube_publisher_real_start;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->stop = publishing_you_tube_you_tube_publisher_real_stop;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->on_login_flow_complete = publishing_you_tube_you_tube_publisher_real_on_login_flow_complete;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportGooglePublisherClass *) klass)->do_logout = publishing_you_tube_you_tube_publisher_real_do_logout;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	((PublishingRESTSupportGooglePublisherClass *) klass)->get_authenticator = publishing_you_tube_you_tube_publisher_real_get_authenticator;
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_you_tube_publisher_finalize;
-#line 2629 "YouTubePublishing.c"
+#line 2063 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_instance_init (PublishingYouTubeYouTubePublisher * self) {
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_YOU_TUBE_PUBLISHER_GET_PRIVATE (self);
-#line 2636 "YouTubePublishing.c"
+#line 2070 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_you_tube_publisher_finalize (GObject* obj) {
 	PublishingYouTubeYouTubePublisher * self;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_YOU_TUBE_PUBLISHER, PublishingYouTubeYouTubePublisher);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (self->priv->refresh_token);
-#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(self->priv->progress_reporter_target_destroy_notify == NULL) ? NULL : (self->priv->progress_reporter_target_destroy_notify (self->priv->progress_reporter_target), NULL);
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter = NULL;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target = NULL;
-#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 124 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->progress_reporter_target_destroy_notify = NULL;
-#line 104 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 125 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->authenticator);
+#line 126 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 121 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (publishing_you_tube_you_tube_publisher_parent_class)->finalize (obj);
-#line 2658 "YouTubePublishing.c"
+#line 2094 "YouTubePublishing.c"
 }
 
 
@@ -2705,34 +2114,34 @@ GType publishing_you_tube_you_tube_publisher_get_type (void) {
 
 
 static gpointer _publishing_you_tube_publishing_parameters_ref0 (gpointer self) {
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_you_tube_publishing_parameters_ref (self) : NULL;
-#line 2677 "YouTubePublishing.c"
+#line 2113 "YouTubePublishing.c"
 }
 
 
 static gpointer _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (gpointer self) {
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self ? publishing_you_tube_publishing_options_pane_privacy_description_ref (self) : NULL;
-#line 2684 "YouTubePublishing.c"
+#line 2120 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_on_logout_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2691 "YouTubePublishing.c"
+#line 2127 "YouTubePublishing.c"
 }
 
 
 static void _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_on_publish_clicked ((PublishingYouTubePublishingOptionsPane*) self);
-#line 2698 "YouTubePublishing.c"
+#line 2134 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
+PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_construct (GType object_type, SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
 	PublishingYouTubePublishingOptionsPane * self = NULL;
 	gint _tmp0_ = 0;
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp1_ = NULL;
@@ -2753,270 +2162,257 @@ PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_p
 	GtkComboBoxText* _tmp16_ = NULL;
 	GtkBuilder* _tmp17_ = NULL;
 	GObject* _tmp18_ = NULL;
-	GtkLabel* _tmp19_ = NULL;
+	GtkButton* _tmp19_ = NULL;
 	GtkBuilder* _tmp20_ = NULL;
 	GObject* _tmp21_ = NULL;
 	GtkButton* _tmp22_ = NULL;
 	GtkBuilder* _tmp23_ = NULL;
 	GObject* _tmp24_ = NULL;
-	GtkButton* _tmp25_ = NULL;
+	GtkBox* _tmp25_ = NULL;
 	GtkBuilder* _tmp26_ = NULL;
 	GObject* _tmp27_ = NULL;
-	GtkBox* _tmp28_ = NULL;
-	GtkBuilder* _tmp29_ = NULL;
-	GObject* _tmp30_ = NULL;
-	GtkLabel* _tmp31_ = NULL;
-	GtkLabel* _tmp32_ = NULL;
-	const gchar* _tmp33_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
+	GtkLabel* _tmp28_ = NULL;
+	SpitPublishingAuthenticator* _tmp29_ = NULL;
+	gboolean _tmp30_ = FALSE;
+	GtkLabel* _tmp35_ = NULL;
+	const gchar* _tmp36_ = NULL;
+	PublishingYouTubePublishingParameters* _tmp37_ = NULL;
 	gchar* _tmp38_ = NULL;
-	GtkLabel* _tmp39_ = NULL;
-	const gchar* _tmp40_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp41_ = NULL;
-	gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
-	gchar* _tmp45_ = NULL;
-	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp46_ = NULL;
-	gint _tmp46__length1 = 0;
-	GtkComboBoxText* _tmp51_ = NULL;
-	GtkLabel* _tmp52_ = NULL;
-	GtkComboBoxText* _tmp53_ = NULL;
-	GtkButton* _tmp54_ = NULL;
-	GtkButton* _tmp55_ = NULL;
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	gchar* _tmp39_ = NULL;
+	gchar* _tmp40_ = NULL;
+	gchar* _tmp41_ = NULL;
+	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp42_ = NULL;
+	gint _tmp42__length1 = 0;
+	GtkComboBoxText* _tmp47_ = NULL;
+	GtkLabel* _tmp48_ = NULL;
+	GtkComboBoxText* _tmp49_ = NULL;
+	GtkButton* _tmp50_ = NULL;
+	GtkButton* _tmp51_ = NULL;
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (authenticator), NULL);
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (host), NULL);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (GTK_IS_BUILDER (builder), NULL);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (publishing_parameters), NULL);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubePublishingOptionsPane*) g_object_new (object_type, NULL);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishing_you_tube_publishing_options_pane_create_privacy_descriptions (self, &_tmp0_);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_descriptions = (_vala_array_free (self->priv->privacy_descriptions, self->priv->privacy_descriptions_length1, (GDestroyNotify) publishing_you_tube_publishing_options_pane_privacy_description_unref), NULL);
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_descriptions = _tmp1_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_descriptions_length1 = _tmp0_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 326 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->_privacy_descriptions_size_ = self->priv->privacy_descriptions_length1;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = publishing_parameters;
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
-#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 327 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->publishing_parameters = _tmp3_;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = builder;
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 450 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 329 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->builder = _tmp5_;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = builder;
-#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 330 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_vala_assert (_tmp6_ != NULL, "builder != null");
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = builder;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = gtk_builder_get_objects (_tmp7_);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp9_ = _tmp8_;
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp10_ = g_slist_length (_tmp9_);
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_vala_assert (_tmp10_ > ((guint) 0), "builder.get_objects().length() > 0");
-#line 452 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 331 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_slist_free0 (_tmp9_);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp11_ = self->priv->builder;
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp12_ = gtk_builder_get_object (_tmp11_, "login_identity_label");
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp12_) : NULL);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->login_identity_label);
-#line 454 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 333 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->login_identity_label = _tmp13_;
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp14_ = self->priv->builder;
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp15_ = gtk_builder_get_object (_tmp14_, "privacy_combo");
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp15_) : NULL);
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->privacy_combo);
-#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 334 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_combo = _tmp16_;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp17_ = self->priv->builder;
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp18_ = gtk_builder_get_object (_tmp17_, "publish_to_label");
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp18_) : NULL);
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (self->priv->publish_to_label);
-#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->publish_to_label = _tmp19_;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp18_ = gtk_builder_get_object (_tmp17_, "publish_button");
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp18_, gtk_button_get_type ()) ? ((GtkButton*) _tmp18_) : NULL);
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->publish_button);
+#line 335 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->publish_button = _tmp19_;
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp20_ = self->priv->builder;
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp21_ = gtk_builder_get_object (_tmp20_, "publish_button");
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp21_ = gtk_builder_get_object (_tmp20_, "logout_button");
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_button_get_type ()) ? ((GtkButton*) _tmp21_) : NULL);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (self->priv->publish_button);
-#line 457 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->publish_button = _tmp22_;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp23_ = self->priv->builder;
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp24_ = gtk_builder_get_object (_tmp23_, "logout_button");
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_button_get_type ()) ? ((GtkButton*) _tmp24_) : NULL);
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->logout_button = _tmp25_;
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp26_ = self->priv->builder;
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp27_ = gtk_builder_get_object (_tmp26_, "youtube_pane_widget");
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_box_get_type ()) ? ((GtkBox*) _tmp27_) : NULL);
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 336 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->logout_button = _tmp22_;
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp23_ = self->priv->builder;
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp24_ = gtk_builder_get_object (_tmp23_, "youtube_pane_widget");
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp25_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp24_, gtk_box_get_type ()) ? ((GtkBox*) _tmp24_) : NULL);
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 459 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->pane_widget = _tmp28_;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp29_ = self->priv->builder;
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp30_ = gtk_builder_get_object (_tmp29_, "privacy_label");
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp31_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp30_) : NULL);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 337 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->pane_widget = _tmp25_;
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp26_ = self->priv->builder;
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp27_ = gtk_builder_get_object (_tmp26_, "privacy_label");
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp28_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp27_, gtk_label_get_type ()) ? ((GtkLabel*) _tmp27_) : NULL);
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->privacy_label);
-#line 460 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->privacy_label = _tmp31_;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp32_ = self->priv->login_identity_label;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp33_ = _ ("You are logged into YouTube as %s.");
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp34_ = publishing_parameters;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp35_ = publishing_you_tube_publishing_parameters_get_user_name (_tmp34_);
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp36_ = _tmp35_;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp37_ = g_strdup_printf (_tmp33_, _tmp36_);
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp38_ = _tmp37_;
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_label_set_label (_tmp32_, _tmp38_);
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp38_);
-#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp36_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp39_ = self->priv->publish_to_label;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp40_ = _ ("Videos will appear in “%s”");
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp41_ = publishing_parameters;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp42_ = publishing_you_tube_publishing_parameters_get_channel_name (_tmp41_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp43_ = _tmp42_;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp44_ = g_strdup_printf (_tmp40_, _tmp43_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp45_ = _tmp44_;
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_label_set_label (_tmp39_, _tmp45_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp45_);
-#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp43_);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp46_ = self->priv->privacy_descriptions;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp46__length1 = self->priv->privacy_descriptions_length1;
-#line 2921 "YouTubePublishing.c"
+#line 338 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->privacy_label = _tmp28_;
+#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp29_ = authenticator;
+#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp30_ = spit_publishing_authenticator_can_logout (_tmp29_);
+#line 340 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (!_tmp30_) {
+#line 2303 "YouTubePublishing.c"
+		GtkButton* _tmp31_ = NULL;
+		GtkContainer* _tmp32_ = NULL;
+		GtkContainer* _tmp33_ = NULL;
+		GtkButton* _tmp34_ = NULL;
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp31_ = self->priv->logout_button;
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp32_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp33_ = _tmp32_;
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp34_ = self->priv->logout_button;
+#line 341 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		gtk_container_remove (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget));
+#line 2318 "YouTubePublishing.c"
+	}
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp35_ = self->priv->login_identity_label;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp36_ = _ ("You are logged into YouTube as %s.");
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp37_ = publishing_parameters;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp38_ = publishing_you_tube_publishing_parameters_get_user_name (_tmp37_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp39_ = _tmp38_;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp40_ = g_strdup_printf (_tmp36_, _tmp39_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp41_ = _tmp40_;
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	gtk_label_set_label (_tmp35_, _tmp41_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp41_);
+#line 344 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (_tmp39_);
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp42_ = self->priv->privacy_descriptions;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp42__length1 = self->priv->privacy_descriptions_length1;
+#line 2344 "YouTubePublishing.c"
 	{
 		PublishingYouTubePublishingOptionsPanePrivacyDescription** desc_collection = NULL;
 		gint desc_collection_length1 = 0;
 		gint _desc_collection_size_ = 0;
 		gint desc_it = 0;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		desc_collection = _tmp46_;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		desc_collection_length1 = _tmp46__length1;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		for (desc_it = 0; desc_it < _tmp46__length1; desc_it = desc_it + 1) {
-#line 2933 "YouTubePublishing.c"
-			PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp47_ = NULL;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		desc_collection = _tmp42_;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		desc_collection_length1 = _tmp42__length1;
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		for (desc_it = 0; desc_it < _tmp42__length1; desc_it = desc_it + 1) {
+#line 2356 "YouTubePublishing.c"
+			PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp43_ = NULL;
 			PublishingYouTubePublishingOptionsPanePrivacyDescription* desc = NULL;
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_tmp47_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			desc = _tmp47_;
-#line 2940 "YouTubePublishing.c"
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_tmp43_ = _publishing_you_tube_publishing_options_pane_privacy_description_ref0 (desc_collection[desc_it]);
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			desc = _tmp43_;
+#line 2363 "YouTubePublishing.c"
 			{
-				GtkComboBoxText* _tmp48_ = NULL;
-				PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp49_ = NULL;
-				const gchar* _tmp50_ = NULL;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp48_ = self->priv->privacy_combo;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp49_ = desc;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				_tmp50_ = _tmp49_->description;
-#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-				gtk_combo_box_text_append_text (_tmp48_, _tmp50_);
-#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				GtkComboBoxText* _tmp44_ = NULL;
+				PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp45_ = NULL;
+				const gchar* _tmp46_ = NULL;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				_tmp44_ = self->priv->privacy_combo;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				_tmp45_ = desc;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				_tmp46_ = _tmp45_->description;
+#line 348 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				gtk_combo_box_text_append_text (_tmp44_, _tmp46_);
+#line 347 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 				_publishing_you_tube_publishing_options_pane_privacy_description_unref0 (desc);
-#line 2955 "YouTubePublishing.c"
+#line 2378 "YouTubePublishing.c"
 			}
 		}
 	}
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp51_ = self->priv->privacy_combo;
-#line 471 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp52_ = self->priv->privacy_label;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp53_ = self->priv->privacy_combo;
-#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	gtk_label_set_mnemonic_widget (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_widget_get_type (), GtkWidget));
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp54_ = self->priv->logout_button;
-#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp54_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp55_ = self->priv->publish_button;
-#line 475 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_signal_connect_object (_tmp55_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp47_ = self->priv->privacy_combo;
+#line 351 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_combo_box_get_type (), GtkComboBox), (gint) PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp48_ = self->priv->privacy_label;
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp49_ = self->priv->privacy_combo;
+#line 352 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	gtk_label_set_mnemonic_widget (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_widget_get_type (), GtkWidget));
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp50_ = self->priv->logout_button;
+#line 354 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (_tmp50_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_logout_clicked_gtk_button_clicked, self, 0);
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp51_ = self->priv->publish_button;
+#line 355 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_signal_connect_object (_tmp51_, "clicked", (GCallback) _publishing_you_tube_publishing_options_pane_on_publish_clicked_gtk_button_clicked, self, 0);
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 2979 "YouTubePublishing.c"
+#line 2402 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
-#line 445 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return publishing_you_tube_publishing_options_pane_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, host, builder, publishing_parameters);
-#line 2986 "YouTubePublishing.c"
+PublishingYouTubePublishingOptionsPane* publishing_you_tube_publishing_options_pane_new (SpitPublishingAuthenticator* authenticator, SpitPublishingPluginHost* host, GtkBuilder* builder, PublishingYouTubePublishingParameters* publishing_parameters) {
+#line 322 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return publishing_you_tube_publishing_options_pane_construct (PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, authenticator, host, builder, publishing_parameters);
+#line 2409 "YouTubePublishing.c"
 }
 
 
@@ -3028,99 +2424,99 @@ static void publishing_you_tube_publishing_options_pane_on_publish_clicked (Publ
 	gint _tmp3_ = 0;
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp4_ = NULL;
 	PublishingYouTubePrivacySetting _tmp5_ = 0;
-#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 358 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = self->priv->publishing_parameters;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = self->priv->privacy_descriptions;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1__length1 = self->priv->privacy_descriptions_length1;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = self->priv->privacy_combo;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = _tmp1_[_tmp3_];
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = _tmp4_->privacy_setting;
-#line 479 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 359 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_parameters_set_privacy (_tmp0_, _tmp5_);
-#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 362 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_emit_by_name (self, "publish");
-#line 3018 "YouTubePublishing.c"
+#line 2441 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_on_logout_clicked (PublishingYouTubePublishingOptionsPane* self) {
-#line 485 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 365 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 366 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_emit_by_name (self, "logout");
-#line 3027 "YouTubePublishing.c"
+#line 2450 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (PublishingYouTubePublishingOptionsPane* self) {
 	GtkButton* _tmp0_ = NULL;
-#line 489 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 369 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self));
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = self->priv->publish_button;
-#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 370 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 3039 "YouTubePublishing.c"
+#line 2462 "YouTubePublishing.c"
 }
 
 
-static void _vala_array_add31 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3050 "YouTubePublishing.c"
+#line 2473 "YouTubePublishing.c"
 	}
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 3056 "YouTubePublishing.c"
+#line 2479 "YouTubePublishing.c"
 }
 
 
-static void _vala_array_add32 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3067 "YouTubePublishing.c"
+#line 2490 "YouTubePublishing.c"
 	}
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 3073 "YouTubePublishing.c"
+#line 2496 "YouTubePublishing.c"
 }
 
 
-static void _vala_array_add33 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+static void _vala_array_add34 (PublishingYouTubePublishingOptionsPanePrivacyDescription*** array, int* length, int* size, PublishingYouTubePublishingOptionsPanePrivacyDescription* value) {
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if ((*length) == (*size)) {
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*array = g_renew (PublishingYouTubePublishingOptionsPanePrivacyDescription*, *array, (*size) + 1);
-#line 3084 "YouTubePublishing.c"
+#line 2507 "YouTubePublishing.c"
 	}
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[(*length)++] = value;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	(*array)[*length] = NULL;
-#line 3090 "YouTubePublishing.c"
+#line 2513 "YouTubePublishing.c"
 }
 
 
@@ -3144,61 +2540,61 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription** publishing_you
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* _tmp9_ = NULL;
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
-#line 493 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 373 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_OPTIONS_PANE (self), NULL);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = g_new0 (PublishingYouTubePublishingOptionsPanePrivacyDescription*, 0 + 1);
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_result_ = _tmp0_;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_result__length1 = 0;
-#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 374 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	__result__size_ = _result__length1;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = _result_;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1__length1 = _result__length1;
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = _ ("Public listed");
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp2_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PUBLIC);
-#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add31 (&_result_, &_result__length1, &__result__size_, _tmp3_);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 376 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp3_);
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = _result_;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4__length1 = _result__length1;
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = _ ("Public unlisted");
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp5_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED);
-#line 497 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add32 (&_result_, &_result__length1, &__result__size_, _tmp6_);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 377 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp6_);
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = _result_;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7__length1 = _result__length1;
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = _ ("Private");
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp9_ = publishing_you_tube_publishing_options_pane_privacy_description_new (_tmp8_, PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE);
-#line 498 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_vala_array_add33 (&_result_, &_result__length1, &__result__size_, _tmp9_);
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 378 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_vala_array_add34 (&_result_, &_result__length1, &__result__size_, _tmp9_);
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp10_ = _result_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp10__length1 = _result__length1;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (result_length1) {
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*result_length1 = _tmp10__length1;
-#line 3162 "YouTubePublishing.c"
+#line 2585 "YouTubePublishing.c"
 	}
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp10_;
-#line 500 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 380 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 3168 "YouTubePublishing.c"
+#line 2591 "YouTubePublishing.c"
 }
 
 
@@ -3208,52 +2604,52 @@ static GtkWidget* publishing_you_tube_publishing_options_pane_real_get_widget (S
 	GtkBox* _tmp0_ = NULL;
 	GtkBox* _tmp1_ = NULL;
 	GtkWidget* _tmp2_ = NULL;
-#line 503 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 383 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = self->priv->pane_widget;
-#line 504 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 384 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_vala_assert (_tmp0_ != NULL, "pane_widget != null");
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = self->priv->pane_widget;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = _tmp2_;
-#line 505 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 385 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 3192 "YouTubePublishing.c"
+#line 2615 "YouTubePublishing.c"
 }
 
 
 static SpitPublishingDialogPaneGeometryOptions publishing_you_tube_publishing_options_pane_real_get_preferred_geometry (SpitPublishingDialogPane* base) {
 	PublishingYouTubePublishingOptionsPane * self;
 	SpitPublishingDialogPaneGeometryOptions result = 0;
-#line 508 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 388 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	result = SPIT_PUBLISHING_DIALOG_PANE_GEOMETRY_OPTIONS_NONE;
-#line 509 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 389 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 3205 "YouTubePublishing.c"
+#line 2628 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_real_on_pane_installed (SpitPublishingDialogPane* base) {
 	PublishingYouTubePublishingOptionsPane * self;
-#line 512 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 392 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 513 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 393 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_update_publish_button_sensitivity (self);
-#line 3215 "YouTubePublishing.c"
+#line 2638 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled (SpitPublishingDialogPane* base) {
 	PublishingYouTubePublishingOptionsPane * self;
-#line 516 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 396 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 3223 "YouTubePublishing.c"
+#line 2646 "YouTubePublishing.c"
 }
 
 
@@ -3262,240 +2658,240 @@ static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	PublishingYouTubePrivacySetting _tmp2_ = 0;
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (description != NULL, NULL);
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubePublishingOptionsPanePrivacyDescription*) g_type_create_instance (object_type);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = description;
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->description);
-#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 304 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->description = _tmp1_;
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = privacy_setting;
-#line 427 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 305 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->privacy_setting = _tmp2_;
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 3250 "YouTubePublishing.c"
+#line 2673 "YouTubePublishing.c"
 }
 
 
 static PublishingYouTubePublishingOptionsPanePrivacyDescription* publishing_you_tube_publishing_options_pane_privacy_description_new (const gchar* description, PublishingYouTubePrivacySetting privacy_setting) {
-#line 425 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 303 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return publishing_you_tube_publishing_options_pane_privacy_description_construct (PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, description, privacy_setting);
-#line 3257 "YouTubePublishing.c"
+#line 2680 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_privacy_description_init (GValue* value) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	value->data[0].v_pointer = NULL;
-#line 3264 "YouTubePublishing.c"
+#line 2687 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_privacy_description_free_value (GValue* value) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (value->data[0].v_pointer) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (value->data[0].v_pointer);
-#line 3273 "YouTubePublishing.c"
+#line 2696 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_privacy_description_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (src_value->data[0].v_pointer);
-#line 3283 "YouTubePublishing.c"
+#line 2706 "YouTubePublishing.c"
 	} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3287 "YouTubePublishing.c"
+#line 2710 "YouTubePublishing.c"
 	}
 }
 
 
 static gpointer publishing_you_tube_publishing_options_pane_value_privacy_description_peek_pointer (const GValue* value) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 3295 "YouTubePublishing.c"
+#line 2718 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (collect_values[0].v_pointer) {
-#line 3302 "YouTubePublishing.c"
+#line 2725 "YouTubePublishing.c"
 		PublishingYouTubePublishingOptionsPanePrivacyDescription* object;
 		object = collect_values[0].v_pointer;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3309 "YouTubePublishing.c"
+#line 2732 "YouTubePublishing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3313 "YouTubePublishing.c"
+#line 2736 "YouTubePublishing.c"
 		}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = publishing_you_tube_publishing_options_pane_privacy_description_ref (object);
-#line 3317 "YouTubePublishing.c"
+#line 2740 "YouTubePublishing.c"
 	} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3321 "YouTubePublishing.c"
+#line 2744 "YouTubePublishing.c"
 	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 3325 "YouTubePublishing.c"
+#line 2748 "YouTubePublishing.c"
 }
 
 
 static gchar* publishing_you_tube_publishing_options_pane_value_privacy_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!object_p) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3336 "YouTubePublishing.c"
+#line 2759 "YouTubePublishing.c"
 	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (!value->data[0].v_pointer) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = NULL;
-#line 3342 "YouTubePublishing.c"
+#line 2765 "YouTubePublishing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3346 "YouTubePublishing.c"
+#line 2769 "YouTubePublishing.c"
 	} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		*object_p = publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 3350 "YouTubePublishing.c"
+#line 2773 "YouTubePublishing.c"
 	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return NULL;
-#line 3354 "YouTubePublishing.c"
+#line 2777 "YouTubePublishing.c"
 }
 
 
 static GParamSpec* publishing_you_tube_publishing_options_pane_param_spec_privacy_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	PublishingYouTubePublishingOptionsPaneParamSpecPrivacyDescription* spec;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return G_PARAM_SPEC (spec);
-#line 3368 "YouTubePublishing.c"
+#line 2791 "YouTubePublishing.c"
 }
 
 
 static gpointer publishing_you_tube_publishing_options_pane_value_get_privacy_description (const GValue* value) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION), NULL);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return value->data[0].v_pointer;
-#line 3377 "YouTubePublishing.c"
+#line 2800 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_set_privacy_description (GValue* value, gpointer v_object) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* old;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (v_object) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_ref (value->data[0].v_pointer);
-#line 3397 "YouTubePublishing.c"
+#line 2820 "YouTubePublishing.c"
 	} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3401 "YouTubePublishing.c"
+#line 2824 "YouTubePublishing.c"
 	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 3407 "YouTubePublishing.c"
+#line 2830 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_publishing_options_pane_value_take_privacy_description (GValue* value, gpointer v_object) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* old;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	old = value->data[0].v_pointer;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (v_object) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = v_object;
-#line 3426 "YouTubePublishing.c"
+#line 2849 "YouTubePublishing.c"
 	} else {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		value->data[0].v_pointer = NULL;
-#line 3430 "YouTubePublishing.c"
+#line 2853 "YouTubePublishing.c"
 	}
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (old) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		publishing_you_tube_publishing_options_pane_privacy_description_unref (old);
-#line 3436 "YouTubePublishing.c"
+#line 2859 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_publishing_options_pane_privacy_description_class_init (PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass * klass) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_privacy_description_parent_class = g_type_class_peek_parent (klass);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingYouTubePublishingOptionsPanePrivacyDescriptionClass *) klass)->finalize = publishing_you_tube_publishing_options_pane_privacy_description_finalize;
-#line 3446 "YouTubePublishing.c"
+#line 2869 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_privacy_description_instance_init (PublishingYouTubePublishingOptionsPanePrivacyDescription * self) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->ref_count = 1;
-#line 3453 "YouTubePublishing.c"
+#line 2876 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_privacy_description_finalize (PublishingYouTubePublishingOptionsPanePrivacyDescription* obj) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription * self;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_TYPE_PRIVACY_DESCRIPTION, PublishingYouTubePublishingOptionsPanePrivacyDescription);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_handlers_destroy (self);
-#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 300 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_free0 (self->description);
-#line 3465 "YouTubePublishing.c"
+#line 2888 "YouTubePublishing.c"
 }
 
 
@@ -3516,108 +2912,104 @@ static GType publishing_you_tube_publishing_options_pane_privacy_description_get
 static gpointer publishing_you_tube_publishing_options_pane_privacy_description_ref (gpointer instance) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* self;
 	self = instance;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return instance;
-#line 3490 "YouTubePublishing.c"
+#line 2913 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_privacy_description_unref (gpointer instance) {
 	PublishingYouTubePublishingOptionsPanePrivacyDescription* self;
 	self = instance;
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_PRIVACY_DESCRIPTION_GET_CLASS (self)->finalize (self);
-#line 421 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 299 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3503 "YouTubePublishing.c"
+#line 2926 "YouTubePublishing.c"
 	}
 }
 
 
 static void publishing_you_tube_publishing_options_pane_class_init (PublishingYouTubePublishingOptionsPaneClass * klass) {
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_parent_class = g_type_class_peek_parent (klass);
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubePublishingOptionsPanePrivate));
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (klass)->finalize = publishing_you_tube_publishing_options_pane_finalize;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_new ("publish", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_signal_new ("logout", PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 3519 "YouTubePublishing.c"
+#line 2942 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_interface_init (SpitPublishingDialogPaneIface * iface) {
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_publishing_options_pane_spit_publishing_dialog_pane_parent_iface = g_type_interface_peek_parent (iface);
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->get_widget = (GtkWidget* (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_get_widget;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->get_preferred_geometry = (SpitPublishingDialogPaneGeometryOptions (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_get_preferred_geometry;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->on_pane_installed = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_installed;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	iface->on_pane_uninstalled = (void (*)(SpitPublishingDialogPane*)) publishing_you_tube_publishing_options_pane_real_on_pane_uninstalled;
-#line 3534 "YouTubePublishing.c"
+#line 2957 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_instance_init (PublishingYouTubePublishingOptionsPane * self) {
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_PUBLISHING_OPTIONS_PANE_GET_PRIVATE (self);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->pane_widget = NULL;
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_combo = NULL;
-#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	self->priv->publish_to_label = NULL;
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->login_identity_label = NULL;
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->publish_button = NULL;
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->logout_button = NULL;
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->builder = NULL;
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_label = NULL;
-#line 3557 "YouTubePublishing.c"
+#line 2978 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_publishing_options_pane_finalize (GObject* obj) {
 	PublishingYouTubePublishingOptionsPane * self;
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_PUBLISHING_OPTIONS_PANE, PublishingYouTubePublishingOptionsPane);
-#line 434 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 312 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->pane_widget);
-#line 435 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 313 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->privacy_combo);
-#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (self->priv->publish_to_label);
-#line 437 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 314 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->login_identity_label);
-#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 315 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->publish_button);
-#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 316 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->logout_button);
-#line 440 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 317 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->builder);
-#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 318 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->privacy_label);
-#line 442 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 319 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->privacy_descriptions = (_vala_array_free (self->priv->privacy_descriptions, self->priv->privacy_descriptions_length1, (GDestroyNotify) publishing_you_tube_publishing_options_pane_privacy_description_unref), NULL);
-#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 320 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->publishing_parameters);
-#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 298 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	G_OBJECT_CLASS (publishing_you_tube_publishing_options_pane_parent_class)->finalize (obj);
-#line 3587 "YouTubePublishing.c"
+#line 3006 "YouTubePublishing.c"
 }
 
 
@@ -3635,14 +3027,7 @@ GType publishing_you_tube_publishing_options_pane_get_type (void) {
 }
 
 
-static gpointer _publishing_rest_support_session_ref0 (gpointer self) {
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return self ? publishing_rest_support_session_ref (self) : NULL;
-#line 3608 "YouTubePublishing.c"
-}
-
-
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
 	PublishingYouTubeUploadTransaction* self = NULL;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
@@ -3653,668 +3038,905 @@ PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_const
 	PublishingYouTubePublishingParameters* _tmp6_ = NULL;
 	SpitPublishingPublishable* _tmp7_ = NULL;
 	SpitPublishingPublishable* _tmp8_ = NULL;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	GDataYouTubeService* _tmp9_ = NULL;
+	GDataYouTubeService* _tmp10_ = NULL;
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (youtube_service), NULL);
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = session;
-#line 543 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 409 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubeUploadTransaction*) publishing_rest_support_google_publisher_authenticated_transaction_construct (object_type, _tmp0_, PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_ENDPOINT_URL, PUBLISHING_REST_SUPPORT_HTTP_METHOD_POST);
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = session;
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = publishing_rest_support_session_is_authenticated (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession));
-#line 544 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 410 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_vala_assert (_tmp2_, "session.is_authenticated()");
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = session;
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp4_ = _publishing_rest_support_session_ref0 (_tmp3_);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 545 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 411 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->session = _tmp4_;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp5_ = parameters;
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp6_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp5_);
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
-#line 546 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 412 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->parameters = _tmp6_;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp7_ = publishable;
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 547 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 413 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->publishable = _tmp8_;
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp9_ = youtube_service;
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp10_ = _g_object_ref0 (_tmp9_);
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 414 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->youtube_service = _tmp10_;
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 3665 "YouTubePublishing.c"
+#line 3089 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
-#line 541 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return publishing_you_tube_upload_transaction_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, session, parameters, publishable);
-#line 3672 "YouTubePublishing.c"
+PublishingYouTubeUploadTransaction* publishing_you_tube_upload_transaction_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, PublishingYouTubePublishingParameters* parameters, SpitPublishingPublishable* publishable) {
+#line 407 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return publishing_you_tube_upload_transaction_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, youtube_service, session, parameters, publishable);
+#line 3096 "YouTubePublishing.c"
 }
 
 
-static guint8* string_get_data (const gchar* self, int* result_length1) {
-	guint8* result;
-	guint8* res = NULL;
-	gint res_length1 = 0;
-	gint _res_size_ = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	guint8* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	guint8* _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-#line 1398 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	g_return_val_if_fail (self != NULL, NULL);
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	res = (guint8*) self;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	res_length1 = -1;
-#line 1399 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_res_size_ = res_length1;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp0_ = strlen (self);
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp1_ = _tmp0_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	res_length1 = (gint) _tmp1_;
-#line 1400 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp2_ = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3_ = res;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp3__length1 = res_length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp4_ = _tmp3_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	_tmp4__length1 = _tmp3__length1;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	if (result_length1) {
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-		*result_length1 = _tmp4__length1;
-#line 3716 "YouTubePublishing.c"
+static Block1Data* block1_data_ref (Block1Data* _data1_) {
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_atomic_int_inc (&_data1_->_ref_count_);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return _data1_;
+#line 3105 "YouTubePublishing.c"
+}
+
+
+static void block1_data_unref (void * _userdata_) {
+	Block1Data* _data1_;
+	_data1_ = (Block1Data*) _userdata_;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
+#line 3114 "YouTubePublishing.c"
+		PublishingYouTubeUploadTransaction* self;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		self = _data1_->self;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_main_loop_unref0 (_data1_->loop);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_publishing_rest_support_transaction_unref0 (self);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_slice_free (Block1Data, _data1_);
+#line 3124 "YouTubePublishing.c"
 	}
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	result = _tmp4_;
-#line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
-	return result;
-#line 3722 "YouTubePublishing.c"
 }
 
 
-static void _vala_SoupBuffer_free (SoupBuffer* self) {
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_boxed_free (soup_buffer_get_type (), self);
-#line 3729 "YouTubePublishing.c"
+static void ___lambda4_ (Block1Data* _data1_, GObject* obj, GAsyncResult* res) {
+	PublishingYouTubeUploadTransaction* self;
+	GMainLoop* _tmp3_ = NULL;
+	GError * _inner_error_ = NULL;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self = _data1_->self;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_if_fail ((obj == NULL) || G_IS_OBJECT (obj));
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_if_fail (G_IS_ASYNC_RESULT (res));
+#line 3139 "YouTubePublishing.c"
+	{
+		GAsyncResult* _tmp0_ = NULL;
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp0_ = res;
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		publishing_you_tube_upload_transaction_splice_with_progress_finish (self, _tmp0_, &_inner_error_);
+#line 449 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 3148 "YouTubePublishing.c"
+			goto __catch22_g_error;
+		}
+	}
+	goto __finally22;
+	__catch22_g_error:
+	{
+		GError* _error_ = NULL;
+		GError* _tmp1_ = NULL;
+		const gchar* _tmp2_ = NULL;
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_error_ = _inner_error_;
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_inner_error_ = NULL;
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp1_ = _error_;
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp2_ = _tmp1_->message;
+#line 451 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_critical ("YouTubePublishing.vala:451: Failed to upload: %s", _tmp2_);
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_error_free0 (_error_);
+#line 3170 "YouTubePublishing.c"
+	}
+	__finally22:
+#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"
+		g_critical ("file %s: line %d: uncaught 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/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_clear_error (&_inner_error_);
+#line 448 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return;
+#line 3181 "YouTubePublishing.c"
+	}
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = _data1_->loop;
+#line 453 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_main_loop_quit (_tmp3_);
+#line 3187 "YouTubePublishing.c"
 }
 
 
-static void _vala_SoupMultipart_free (SoupMultipart* self) {
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	g_boxed_free (soup_multipart_get_type (), self);
-#line 3736 "YouTubePublishing.c"
+static void ____lambda4__gasync_ready_callback (GObject* source_object, GAsyncResult* res, gpointer self) {
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	___lambda4_ (self, source_object, res);
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	block1_data_unref (self);
+#line 3196 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_real_execute (PublishingRESTSupportTransaction* base, GError** error) {
 	PublishingYouTubeUploadTransaction * self;
-	SoupMultipart* message_parts = NULL;
-	SoupMultipart* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
-	PublishingYouTubePrivacySetting _tmp3_ = 0;
-	gchar* unlisted_video = NULL;
+	GDataYouTubeVideo* video = NULL;
+	GDataYouTubeVideo* _tmp0_ = NULL;
+	gchar* slug = NULL;
+	SpitPublishingPublishable* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gchar* title = NULL;
+	SpitPublishingPublishable* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp6_ = NULL;
-	PublishingYouTubePrivacySetting _tmp7_ = 0;
-	gchar* private_video = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar* title = NULL;
-	SpitPublishingPublishable* _tmp9_ = NULL;
-	gchar* _tmp10_ = NULL;
-	const gchar* _tmp11_ = NULL;
-	gchar* metadata = NULL;
-	const gchar* _tmp14_ = NULL;
-	gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	gchar* _tmp20_ = NULL;
-	SoupBuffer* metadata_buffer = NULL;
-	const gchar* _tmp21_ = NULL;
-	guint8* _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	guint8* _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
-	SoupBuffer* _tmp24_ = NULL;
-	SoupMultipart* _tmp25_ = NULL;
-	SoupBuffer* _tmp26_ = NULL;
-	gchar* video_data = NULL;
-	gsize data_length = 0UL;
-	SoupBuffer* bindable_data = NULL;
-	const gchar* _tmp46_ = NULL;
-	guint8* _tmp47_ = NULL;
-	gint _tmp47__length1 = 0;
-	guint8* _tmp48_ = NULL;
-	gint _tmp48__length1 = 0;
-	gsize _tmp49_ = 0UL;
-	SoupBuffer* _tmp50_ = NULL;
-	SoupMultipart* _tmp51_ = NULL;
-	SpitPublishingPublishable* _tmp52_ = NULL;
-	GFile* _tmp53_ = NULL;
-	GFile* _tmp54_ = NULL;
-	gchar* _tmp55_ = NULL;
-	gchar* _tmp56_ = NULL;
-	SoupMessage* outbound_message = NULL;
-	gchar* _tmp57_ = NULL;
-	gchar* _tmp58_ = NULL;
-	SoupMultipart* _tmp59_ = NULL;
-	SoupMessage* _tmp60_ = NULL;
-	SoupMessage* _tmp61_ = NULL;
-	SoupMessageHeaders* _tmp62_ = NULL;
-	gchar* _tmp63_ = NULL;
-	gchar* _tmp64_ = NULL;
-	SoupMessageHeaders* _tmp65_ = NULL;
-	SpitPublishingPublishable* _tmp66_ = NULL;
-	gchar* _tmp67_ = NULL;
-	gchar* _tmp68_ = NULL;
-	SoupMessageHeaders* _tmp69_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp70_ = NULL;
-	gchar* _tmp71_ = NULL;
-	gchar* _tmp72_ = NULL;
-	gchar* _tmp73_ = NULL;
-	gchar* _tmp74_ = NULL;
+	GDataYouTubeVideo* _tmp8_ = NULL;
+	const gchar* _tmp9_ = NULL;
+	GDataYouTubeVideo* _tmp10_ = NULL;
+	PublishingYouTubePublishingParameters* _tmp11_ = NULL;
+	PublishingYouTubePrivacySetting _tmp12_ = 0;
+	PublishingYouTubePublishingParameters* _tmp13_ = NULL;
+	PublishingYouTubePrivacySetting _tmp14_ = 0;
+	GFile* file = NULL;
+	SpitPublishingPublishable* _tmp20_ = NULL;
+	GFile* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction);
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = soup_multipart_new ("multipart/related");
-#line 552 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	message_parts = _tmp0_;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = self->priv->parameters;
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp2_);
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (_tmp3_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) {
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp1_ = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_UNLISTED_XML;
-#line 3825 "YouTubePublishing.c"
-	} else {
-#line 555 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp1_ = "";
-#line 3829 "YouTubePublishing.c"
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = gdata_youtube_video_new (NULL);
+#line 418 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	video = _tmp0_;
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = self->priv->publishable;
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp2_ = spit_publishing_publishable_get_param_string (_tmp1_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+#line 420 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	slug = _tmp2_;
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = self->priv->publishable;
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp4_ = spit_publishing_publishable_get_publishing_name (_tmp3_);
+#line 422 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	title = _tmp4_;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = title;
+#line 423 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (g_strcmp0 (_tmp5_, "") == 0) {
+#line 3244 "YouTubePublishing.c"
+		SpitPublishingPublishable* _tmp6_ = NULL;
+		gchar* _tmp7_ = NULL;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp6_ = self->priv->publishable;
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp7_ = spit_publishing_publishable_get_param_string (_tmp6_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_free0 (title);
+#line 424 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		title = _tmp7_;
+#line 3255 "YouTubePublishing.c"
 	}
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = g_strdup (_tmp1_);
-#line 554 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	unlisted_video = _tmp4_;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = self->priv->parameters;
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp7_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp6_);
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (_tmp7_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE) {
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_PRIVATE_XML;
-#line 3843 "YouTubePublishing.c"
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp8_ = video;
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp9_ = title;
+#line 426 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	gdata_entry_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gdata_entry_get_type (), GDataEntry), _tmp9_);
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp10_ = video;
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp11_ = self->priv->parameters;
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp12_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp11_);
+#line 428 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_object_set (_tmp10_, "is-private", _tmp12_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_PRIVATE, NULL);
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp13_ = self->priv->parameters;
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp14_ = publishing_you_tube_publishing_parameters_get_privacy (_tmp13_);
+#line 430 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_tmp14_ == PUBLISHING_YOU_TUBE_PRIVACY_SETTING_UNLISTED) {
+#line 3277 "YouTubePublishing.c"
+		GDataYouTubeVideo* _tmp15_ = NULL;
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp15_ = video;
+#line 431 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		gdata_youtube_video_set_access_control (_tmp15_, "list", GDATA_YOUTUBE_PERMISSION_DENIED);
+#line 3283 "YouTubePublishing.c"
 	} else {
-#line 558 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp5_ = "";
-#line 3847 "YouTubePublishing.c"
-	}
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp8_ = g_strdup (_tmp5_);
-#line 557 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	private_video = _tmp8_;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp9_ = self->priv->publishable;
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp10_ = spit_publishing_publishable_get_publishing_name (_tmp9_);
-#line 561 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	title = _tmp10_;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp11_ = title;
-#line 562 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (g_strcmp0 (_tmp11_, "") == 0) {
-#line 3863 "YouTubePublishing.c"
-		SpitPublishingPublishable* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp12_ = self->priv->publishable;
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp13_ = spit_publishing_publishable_get_param_string (_tmp12_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (title);
-#line 563 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		title = _tmp13_;
-#line 3874 "YouTubePublishing.c"
+		GDataYouTubeVideo* _tmp16_ = NULL;
+		gboolean _tmp17_ = FALSE;
+		gboolean _tmp18_ = FALSE;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp16_ = video;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_object_get (_tmp16_, "is-private", &_tmp17_, NULL);
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp18_ = _tmp17_;
+#line 432 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (!_tmp18_) {
+#line 3296 "YouTubePublishing.c"
+			GDataYouTubeVideo* _tmp19_ = NULL;
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_tmp19_ = video;
+#line 433 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			gdata_youtube_video_set_access_control (_tmp19_, "list", GDATA_YOUTUBE_PERMISSION_ALLOWED);
+#line 3302 "YouTubePublishing.c"
+		}
 	}
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp14_ = title;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp15_ = publishing_rest_support_decimal_entity_encode (_tmp14_);
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp16_ = _tmp15_;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp17_ = private_video;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp18_ = unlisted_video;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp19_ = g_strdup_printf (PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_METADATA_TEMPLATE, _tmp16_, _tmp17_, _tmp18_);
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp20_ = _tmp19_;
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp16_);
-#line 566 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	metadata = _tmp20_;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp21_ = metadata;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp22_ = string_get_data (_tmp21_, &_tmp22__length1);
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp23_ = _tmp22_;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp23__length1 = _tmp22__length1;
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp24_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp23_, _tmp23__length1);
-#line 568 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	metadata_buffer = _tmp24_;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp25_ = message_parts;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp26_ = metadata_buffer;
-#line 569 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_multipart_append_form_file (_tmp25_, "", "", "application/atom+xml", _tmp26_);
-#line 3912 "YouTubePublishing.c"
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp20_ = self->priv->publishable;
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp21_ = spit_publishing_publishable_get_serialized_file (_tmp20_);
+#line 436 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	file = _tmp21_;
+#line 3311 "YouTubePublishing.c"
 	{
-		SpitPublishingPublishable* _tmp27_ = NULL;
-		GFile* _tmp28_ = NULL;
-		GFile* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
-		gsize _tmp33_ = 0UL;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp27_ = self->priv->publishable;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp28_ = spit_publishing_publishable_get_serialized_file (_tmp27_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp29_ = _tmp28_;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp30_ = g_file_get_path (_tmp29_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp31_ = _tmp30_;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_file_get_contents (_tmp31_, &_tmp32_, &_tmp33_, &_inner_error_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (video_data);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		video_data = _tmp32_;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		data_length = _tmp33_;
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp31_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_object_unref0 (_tmp29_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		Block1Data* _data1_;
+		GFileInfo* info = NULL;
+		GFile* _tmp22_ = NULL;
+		GFileInfo* _tmp23_ = NULL;
+		GDataUploadStream* upload_stream = NULL;
+		GDataYouTubeService* _tmp24_ = NULL;
+		GDataYouTubeVideo* _tmp25_ = NULL;
+		const gchar* _tmp26_ = NULL;
+		GFileInfo* _tmp27_ = NULL;
+		const gchar* _tmp28_ = NULL;
+		GDataUploadStream* _tmp29_ = NULL;
+		GFileInputStream* input_stream = NULL;
+		GFile* _tmp30_ = NULL;
+		GFileInputStream* _tmp31_ = NULL;
+		GMainLoop* _tmp32_ = NULL;
+		GFileInfo* _tmp33_ = NULL;
+		GFileInputStream* _tmp34_ = NULL;
+		GDataUploadStream* _tmp35_ = NULL;
+		GMainLoop* _tmp36_ = NULL;
+		GDataYouTubeVideo* _tmp37_ = NULL;
+		GDataYouTubeService* _tmp38_ = NULL;
+		GDataUploadStream* _tmp39_ = NULL;
+		GDataYouTubeVideo* _tmp40_ = NULL;
+		GDataYouTubeVideo* _tmp41_ = NULL;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data1_ = g_slice_new0 (Block1Data);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data1_->_ref_count_ = 1;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data1_->self = publishing_rest_support_transaction_ref (self);
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp22_ = file;
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp23_ = g_file_query_info (_tmp22_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," G_FILE_ATTRIBUTE_STANDARD_SIZE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		info = _tmp23_;
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			if (_inner_error_->domain == G_FILE_ERROR) {
-#line 3947 "YouTubePublishing.c"
-				goto __catch31_g_file_error;
-			}
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (video_data);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (metadata);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (title);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (private_video);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (unlisted_video);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupMultipart_free0 (message_parts);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 575 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 3970 "YouTubePublishing.c"
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			block1_data_unref (_data1_);
+#line 439 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_data1_ = NULL;
+#line 3355 "YouTubePublishing.c"
+			goto __catch21_g_error;
+		}
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp24_ = self->priv->youtube_service;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp25_ = video;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp26_ = slug;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp27_ = info;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp28_ = g_file_info_get_content_type (_tmp27_);
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp29_ = gdata_youtube_service_upload_video (_tmp24_, _tmp25_, _tmp26_, _tmp28_, NULL, &_inner_error_);
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		upload_stream = _tmp29_;
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (info);
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			block1_data_unref (_data1_);
+#line 441 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_data1_ = NULL;
+#line 3380 "YouTubePublishing.c"
+			goto __catch21_g_error;
+		}
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp30_ = file;
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp31_ = g_file_read (_tmp30_, NULL, &_inner_error_);
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		input_stream = _tmp31_;
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (upload_stream);
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (info);
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			block1_data_unref (_data1_);
+#line 443 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_data1_ = NULL;
+#line 3399 "YouTubePublishing.c"
+			goto __catch21_g_error;
+		}
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp32_ = g_main_loop_new (NULL, FALSE);
+#line 446 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data1_->loop = _tmp32_;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp33_ = info;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp34_ = input_stream;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp35_ = upload_stream;
+#line 447 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		publishing_you_tube_upload_transaction_splice_with_progress (self, _tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, g_input_stream_get_type (), GInputStream), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, g_output_stream_get_type (), GOutputStream), ____lambda4__gasync_ready_callback, block1_data_ref (_data1_));
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp36_ = _data1_->loop;
+#line 455 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_main_loop_run (_tmp36_);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp38_ = self->priv->youtube_service;
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp39_ = upload_stream;
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp40_ = gdata_youtube_service_finish_video_upload (_tmp38_, _tmp39_, &_inner_error_);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp37_ = _tmp40_;
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (input_stream);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (upload_stream);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (info);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			block1_data_unref (_data1_);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_data1_ = NULL;
+#line 3438 "YouTubePublishing.c"
+			goto __catch21_g_error;
 		}
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp41_ = _tmp37_;
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp37_ = NULL;
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (video);
+#line 456 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		video = _tmp41_;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (_tmp37_);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (input_stream);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (upload_stream);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_object_unref0 (info);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		block1_data_unref (_data1_);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data1_ = NULL;
+#line 3461 "YouTubePublishing.c"
 	}
-	goto __finally31;
-	__catch31_g_file_error:
+	goto __finally21;
+	__catch21_g_error:
 	{
-		GError* e = NULL;
-		gchar* msg = NULL;
-		SpitPublishingPublishable* _tmp34_ = NULL;
-		GFile* _tmp35_ = NULL;
-		GFile* _tmp36_ = NULL;
-		gchar* _tmp37_ = NULL;
-		gchar* _tmp38_ = NULL;
-		GError* _tmp39_ = NULL;
-		const gchar* _tmp40_ = NULL;
-		gchar* _tmp41_ = NULL;
-		gchar* _tmp42_ = NULL;
+		GError* _error_ = NULL;
+		GError* _tmp42_ = NULL;
 		const gchar* _tmp43_ = NULL;
-		const gchar* _tmp44_ = NULL;
-		GError* _tmp45_ = NULL;
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		e = _inner_error_;
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_error_ = _inner_error_;
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		_inner_error_ = NULL;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp34_ = self->priv->publishable;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp35_ = spit_publishing_publishable_get_serialized_file (_tmp34_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp36_ = _tmp35_;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp37_ = g_file_get_path (_tmp36_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp38_ = _tmp37_;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp39_ = e;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp40_ = _tmp39_->message;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp41_ = g_strdup_printf ("YouTube: couldn't read data from %s: %s", _tmp38_, _tmp40_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp42_ = _tmp41_;
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (_tmp38_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_object_unref0 (_tmp36_);
-#line 578 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		msg = _tmp42_;
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp43_ = msg;
-#line 580 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		g_warning ("YouTubePublishing.vala:580: %s", _tmp43_);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp44_ = msg;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_tmp45_ = g_error_new_literal (SPIT_PUBLISHING_PUBLISHING_ERROR, SPIT_PUBLISHING_PUBLISHING_ERROR_LOCAL_FILE_ERROR, _tmp44_);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_inner_error_ = _tmp45_;
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_free0 (msg);
-#line 582 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		_g_error_free0 (e);
-#line 4032 "YouTubePublishing.c"
-		goto __finally31;
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp42_ = _error_;
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_tmp43_ = _tmp42_->message;
+#line 458 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_critical ("YouTubePublishing.vala:458: Upload failed: %s", _tmp43_);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_g_error_free0 (_error_);
+#line 3481 "YouTubePublishing.c"
 	}
-	__finally31:
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	__finally21:
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_propagate_error (error, _inner_error_);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (video_data);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (metadata);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (file);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (title);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (private_video);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (unlisted_video);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupMultipart_free0 (message_parts);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_free0 (slug);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (video);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 4058 "YouTubePublishing.c"
+#line 3500 "YouTubePublishing.c"
 		} else {
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (video_data);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (metadata);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (file);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			_g_free0 (title);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (private_video);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (unlisted_video);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupMultipart_free0 (message_parts);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_free0 (slug);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			_g_object_unref0 (video);
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			g_clear_error (&_inner_error_);
-#line 574 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 438 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 			return;
-#line 4080 "YouTubePublishing.c"
+#line 3516 "YouTubePublishing.c"
 		}
 	}
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp46_ = video_data;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp47_ = string_get_data (_tmp46_, &_tmp47__length1);
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp48_ = _tmp47_;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp48__length1 = _tmp47__length1;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp49_ = data_length;
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp50_ = soup_buffer_new (SOUP_MEMORY_COPY, _tmp48_ + 0, ((gint) _tmp49_) - 0);
-#line 588 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	bindable_data = _tmp50_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp51_ = message_parts;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp52_ = self->priv->publishable;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp53_ = spit_publishing_publishable_get_serialized_file (_tmp52_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp54_ = _tmp53_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp55_ = g_file_get_path (_tmp54_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp56_ = _tmp55_;
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_multipart_append_form_file (_tmp51_, "", _tmp56_, "video/mpeg", bindable_data);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp56_);
-#line 591 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (_tmp54_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp57_ = publishing_rest_support_transaction_get_endpoint_url (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction));
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp58_ = _tmp57_;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp59_ = message_parts;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp60_ = soup_form_request_new_from_multipart (_tmp58_, _tmp59_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp61_ = _tmp60_;
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp58_);
-#line 595 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	outbound_message = _tmp61_;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp62_ = outbound_message->request_headers;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp63_ = g_strdup_printf ("key=%s", PUBLISHING_YOU_TUBE_DEVELOPER_KEY);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp64_ = _tmp63_;
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_message_headers_append (_tmp62_, "X-GData-Key", _tmp64_);
-#line 597 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp64_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp65_ = outbound_message->request_headers;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp66_ = self->priv->publishable;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp67_ = spit_publishing_publishable_get_param_string (_tmp66_, SPIT_PUBLISHING_PUBLISHABLE_PARAM_STRING_BASENAME);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp68_ = _tmp67_;
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_message_headers_append (_tmp65_, "Slug", _tmp68_);
-#line 598 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp68_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp69_ = outbound_message->request_headers;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp70_ = self->priv->session;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp71_ = publishing_rest_support_google_session_get_access_token (_tmp70_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp72_ = _tmp71_;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp73_ = g_strconcat ("Bearer ", _tmp72_, NULL);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp74_ = _tmp73_;
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	soup_message_headers_append (_tmp69_, "Authorization", _tmp74_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp74_);
-#line 600 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (_tmp72_);
-#line 602 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_transaction_set_message (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), outbound_message);
-#line 605 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_transaction_set_is_executed (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), TRUE);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	publishing_rest_support_transaction_send (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), &_inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-		if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_propagate_error (error, _inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_object_unref0 (outbound_message);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (bindable_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (video_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (metadata);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (title);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (private_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (unlisted_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupMultipart_free0 (message_parts);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 4201 "YouTubePublishing.c"
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (file);
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (title);
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_free0 (slug);
+#line 417 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (video);
+#line 3527 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_upload_transaction_splice_with_progress_data_free (gpointer _data) {
+	PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
+	_data_ = _data;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->info);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->input);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->output);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_transaction_unref0 (_data_->self);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_slice_free (PublishingYouTubeUploadTransactionSpliceWithProgressData, _data_);
+#line 3544 "YouTubePublishing.c"
+}
+
+
+static gpointer _publishing_rest_support_transaction_ref0 (gpointer self) {
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return self ? publishing_rest_support_transaction_ref (self) : NULL;
+#line 3551 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_upload_transaction_splice_with_progress (PublishingYouTubeUploadTransaction* self, GFileInfo* info, GInputStream* input, GOutputStream* output, GAsyncReadyCallback _callback_, gpointer _user_data_) {
+	PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
+	PublishingYouTubeUploadTransaction* _tmp0_ = NULL;
+	GFileInfo* _tmp1_ = NULL;
+	GFileInfo* _tmp2_ = NULL;
+	GInputStream* _tmp3_ = NULL;
+	GInputStream* _tmp4_ = NULL;
+	GOutputStream* _tmp5_ = NULL;
+	GOutputStream* _tmp6_ = NULL;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_ = g_slice_new0 (PublishingYouTubeUploadTransactionSpliceWithProgressData);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_async_result = g_simple_async_result_new (NULL, _callback_, _user_data_, publishing_you_tube_upload_transaction_splice_with_progress);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_simple_async_result_set_op_res_gpointer (_data_->_async_result, _data_, publishing_you_tube_upload_transaction_splice_with_progress_data_free);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = _publishing_rest_support_transaction_ref0 (self);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->self = _tmp0_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = info;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp2_ = _g_object_ref0 (_tmp1_);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->info);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->info = _tmp2_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = input;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp4_ = _g_object_ref0 (_tmp3_);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->input);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->input = _tmp4_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = output;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp6_ = _g_object_ref0 (_tmp5_);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_data_->output);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->output = _tmp6_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_upload_transaction_splice_with_progress_co (_data_);
+#line 3600 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_upload_transaction_splice_with_progress_finish (PublishingYouTubeUploadTransaction* self, GAsyncResult* _res_, GError** error) {
+	PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (_res_), error)) {
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return;
+#line 3610 "YouTubePublishing.c"
+	}
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_ = g_simple_async_result_get_op_res_gpointer (G_SIMPLE_ASYNC_RESULT (_res_));
+#line 3614 "YouTubePublishing.c"
+}
+
+
+static void publishing_you_tube_upload_transaction_splice_with_progress_ready (GObject* source_object, GAsyncResult* _res_, gpointer _user_data_) {
+	PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_ = _user_data_;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_source_object_ = source_object;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_res_ = _res_;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	publishing_you_tube_upload_transaction_splice_with_progress_co (_data_);
+#line 3628 "YouTubePublishing.c"
+}
+
+
+static gboolean publishing_you_tube_upload_transaction_splice_with_progress_co (PublishingYouTubeUploadTransactionSpliceWithProgressData* _data_) {
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	switch (_data_->_state_) {
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		case 0:
+#line 3637 "YouTubePublishing.c"
+		goto _state_0;
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		case 1:
+#line 3641 "YouTubePublishing.c"
+		goto _state_1;
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		case 2:
+#line 3645 "YouTubePublishing.c"
+		goto _state_2;
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		case 3:
+#line 3649 "YouTubePublishing.c"
+		goto _state_3;
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		case 4:
+#line 3653 "YouTubePublishing.c"
+		goto _state_4;
+		default:
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_assert_not_reached ();
+#line 3658 "YouTubePublishing.c"
+	}
+	_state_0:
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp0_ = NULL;
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp0_ = _data_->info;
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp1_ = 0LL;
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp1_ = g_file_info_get_size (_data_->_tmp0_);
+#line 463 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->total_bytes = _data_->_tmp1_;
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp2_ = 0LL;
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp2_ = _data_->total_bytes;
+#line 464 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->bytes_to_write = _data_->_tmp2_;
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	while (TRUE) {
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp3_ = 0LL;
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp3_ = _data_->bytes_to_write;
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (!(_data_->_tmp3_ > ((gint64) 0))) {
+#line 467 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			break;
+#line 3687 "YouTubePublishing.c"
+		}
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp4_ = NULL;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp4_ = _data_->input;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_state_ = 1;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_input_stream_read_async (_data_->_tmp4_, _data_->buffer, (gsize) 8192, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return FALSE;
+#line 3699 "YouTubePublishing.c"
+		_state_1:
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp5_ = 0L;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp5_ = g_input_stream_read_finish (_data_->_tmp4_, _data_->_res_, &_data_->_inner_error_);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->bytes_read = _data_->_tmp5_;
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_error_free (_data_->_inner_error_);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			if (_data_->_state_ == 0) {
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 3717 "YouTubePublishing.c"
+			} else {
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				g_simple_async_result_complete (_data_->_async_result);
+#line 3721 "YouTubePublishing.c"
+			}
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_object_unref (_data_->_async_result);
+#line 468 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			return FALSE;
+#line 3727 "YouTubePublishing.c"
+		}
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp6_ = 0L;
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp6_ = _data_->bytes_read;
+#line 469 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (_data_->_tmp6_ == ((gssize) 0)) {
+#line 470 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			break;
+#line 3737 "YouTubePublishing.c"
+		}
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp7_ = NULL;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp7_ = _data_->output;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp8_ = 0L;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp8_ = _data_->bytes_read;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_state_ = 2;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_output_stream_write_async (_data_->_tmp7_, _data_->buffer + 0, (gsize) (((gint) _data_->_tmp8_) - 0), G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return FALSE;
+#line 3753 "YouTubePublishing.c"
+		_state_2:
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp9_ = 0L;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp9_ = g_output_stream_write_finish (_data_->_tmp7_, _data_->_res_, &_data_->_inner_error_);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->bytes_written = _data_->_tmp9_;
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_error_free (_data_->_inner_error_);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			if (_data_->_state_ == 0) {
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 3771 "YouTubePublishing.c"
+			} else {
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+				g_simple_async_result_complete (_data_->_async_result);
+#line 3775 "YouTubePublishing.c"
+			}
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_object_unref (_data_->_async_result);
+#line 472 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			return FALSE;
+#line 3781 "YouTubePublishing.c"
+		}
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp10_ = 0LL;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp10_ = _data_->bytes_to_write;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp11_ = 0L;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp11_ = _data_->bytes_written;
+#line 473 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->bytes_to_write = _data_->_tmp10_ - _data_->_tmp11_;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp12_ = 0LL;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp12_ = _data_->total_bytes;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp13_ = 0LL;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp13_ = _data_->bytes_to_write;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp14_ = 0LL;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		_data_->_tmp14_ = _data_->total_bytes;
+#line 474 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_data_->self, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction), "chunk-transmitted", (gint) (_data_->_tmp12_ - _data_->_tmp13_), (gint) _data_->_tmp14_);
+#line 3807 "YouTubePublishing.c"
+	}
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp15_ = NULL;
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp15_ = _data_->output;
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_state_ = 3;
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_output_stream_close_async (_data_->_tmp15_, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return FALSE;
+#line 3819 "YouTubePublishing.c"
+	_state_3:
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_output_stream_close_finish (_data_->_tmp15_, _data_->_res_, &_data_->_inner_error_);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_error_free (_data_->_inner_error_);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (_data_->_state_ == 0) {
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 3833 "YouTubePublishing.c"
 		} else {
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_object_unref0 (outbound_message);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (bindable_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (video_data);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupBuffer_free0 (metadata_buffer);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (metadata);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (title);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (private_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			_g_free0 (unlisted_video);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			__vala_SoupMultipart_free0 (message_parts);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			g_clear_error (&_inner_error_);
-#line 606 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-			return;
-#line 4227 "YouTubePublishing.c"
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_complete (_data_->_async_result);
+#line 3837 "YouTubePublishing.c"
+		}
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_object_unref (_data_->_async_result);
+#line 477 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return FALSE;
+#line 3843 "YouTubePublishing.c"
+	}
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp16_ = NULL;
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_tmp16_ = _data_->input;
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_data_->_state_ = 4;
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_input_stream_close_async (_data_->_tmp16_, G_PRIORITY_DEFAULT, NULL, publishing_you_tube_upload_transaction_splice_with_progress_ready, _data_);
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return FALSE;
+#line 3855 "YouTubePublishing.c"
+	_state_4:
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_input_stream_close_finish (_data_->_tmp16_, _data_->_res_, &_data_->_inner_error_);
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_simple_async_result_set_from_error (_data_->_async_result, _data_->_inner_error_);
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_error_free (_data_->_inner_error_);
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		if (_data_->_state_ == 0) {
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 3869 "YouTubePublishing.c"
+		} else {
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+			g_simple_async_result_complete (_data_->_async_result);
+#line 3873 "YouTubePublishing.c"
 		}
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_object_unref (_data_->_async_result);
+#line 478 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		return FALSE;
+#line 3879 "YouTubePublishing.c"
 	}
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (outbound_message);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	__vala_SoupBuffer_free0 (bindable_data);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (video_data);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	__vala_SoupBuffer_free0 (metadata_buffer);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (metadata);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (title);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (private_video);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_free0 (unlisted_video);
-#line 550 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	__vala_SoupMultipart_free0 (message_parts);
-#line 4248 "YouTubePublishing.c"
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	if (_data_->_state_ == 0) {
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_simple_async_result_complete_in_idle (_data_->_async_result);
+#line 3885 "YouTubePublishing.c"
+	} else {
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+		g_simple_async_result_complete (_data_->_async_result);
+#line 3889 "YouTubePublishing.c"
+	}
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_object_unref (_data_->_async_result);
+#line 462 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return FALSE;
+#line 3895 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_class_init (PublishingYouTubeUploadTransactionClass * klass) {
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_upload_transaction_parent_class = g_type_class_peek_parent (klass);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->finalize = publishing_you_tube_upload_transaction_finalize;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeUploadTransactionPrivate));
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportTransactionClass *) klass)->execute = publishing_you_tube_upload_transaction_real_execute;
-#line 4261 "YouTubePublishing.c"
+#line 3908 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_instance_init (PublishingYouTubeUploadTransaction * self) {
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_UPLOAD_TRANSACTION_GET_PRIVATE (self);
-#line 4268 "YouTubePublishing.c"
+#line 3915 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_upload_transaction_finalize (PublishingRESTSupportTransaction* obj) {
 	PublishingYouTubeUploadTransaction * self;
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOAD_TRANSACTION, PublishingYouTubeUploadTransaction);
-#line 537 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 402 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
-#line 538 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 403 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_rest_support_session_unref0 (self->priv->session);
-#line 539 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 404 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_g_object_unref0 (self->priv->publishable);
-#line 520 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 405 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 400 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	PUBLISHING_REST_SUPPORT_TRANSACTION_CLASS (publishing_you_tube_upload_transaction_parent_class)->finalize (obj);
-#line 4284 "YouTubePublishing.c"
+#line 3933 "YouTubePublishing.c"
 }
 
 
@@ -4330,115 +3952,132 @@ GType publishing_you_tube_upload_transaction_get_type (void) {
 }
 
 
-PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
+PublishingYouTubeUploader* publishing_you_tube_uploader_construct (GType object_type, GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
 	PublishingYouTubeUploader* self = NULL;
 	PublishingRESTSupportGoogleSession* _tmp0_ = NULL;
 	SpitPublishingPublishable** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
 	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
 	PublishingYouTubePublishingParameters* _tmp3_ = NULL;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	GDataYouTubeService* _tmp4_ = NULL;
+	GDataYouTubeService* _tmp5_ = NULL;
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	g_return_val_if_fail (GDATA_IS_YOUTUBE_SERVICE (youtube_service), NULL);
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_REST_SUPPORT_IS_GOOGLE_SESSION (session), NULL);
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (PUBLISHING_YOU_TUBE_IS_PUBLISHING_PARAMETERS (parameters), NULL);
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp0_ = session;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1_ = publishables;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp1__length1 = publishables_length1;
-#line 615 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 488 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = (PublishingYouTubeUploader*) publishing_rest_support_batch_uploader_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_SESSION, PublishingRESTSupportSession), _tmp1_, _tmp1__length1);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp2_ = parameters;
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_tmp3_ = _publishing_you_tube_publishing_parameters_ref0 (_tmp2_);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
-#line 617 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 490 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv->parameters = _tmp3_;
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp4_ = youtube_service;
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = _g_object_ref0 (_tmp4_);
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 491 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	self->priv->youtube_service = _tmp5_;
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return self;
-#line 4329 "YouTubePublishing.c"
+#line 3990 "YouTubePublishing.c"
 }
 
 
-PublishingYouTubeUploader* publishing_you_tube_uploader_new (PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
-#line 613 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	return publishing_you_tube_uploader_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOADER, session, publishables, publishables_length1, parameters);
-#line 4336 "YouTubePublishing.c"
+PublishingYouTubeUploader* publishing_you_tube_uploader_new (GDataYouTubeService* youtube_service, PublishingRESTSupportGoogleSession* session, SpitPublishingPublishable** publishables, int publishables_length1, PublishingYouTubePublishingParameters* parameters) {
+#line 486 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	return publishing_you_tube_uploader_construct (PUBLISHING_YOU_TUBE_TYPE_UPLOADER, youtube_service, session, publishables, publishables_length1, parameters);
+#line 3997 "YouTubePublishing.c"
 }
 
 
 static PublishingRESTSupportTransaction* publishing_you_tube_uploader_real_create_transaction (PublishingRESTSupportBatchUploader* base, SpitPublishingPublishable* publishable) {
 	PublishingYouTubeUploader * self;
 	PublishingRESTSupportTransaction* result = NULL;
-	PublishingRESTSupportSession* _tmp0_ = NULL;
-	PublishingRESTSupportGoogleSession* _tmp1_ = NULL;
-	PublishingYouTubePublishingParameters* _tmp2_ = NULL;
-	SpitPublishingPublishable* _tmp3_ = NULL;
+	GDataYouTubeService* _tmp0_ = NULL;
+	PublishingRESTSupportSession* _tmp1_ = NULL;
+	PublishingRESTSupportGoogleSession* _tmp2_ = NULL;
+	PublishingYouTubePublishingParameters* _tmp3_ = NULL;
 	SpitPublishingPublishable* _tmp4_ = NULL;
-	PublishingYouTubeUploadTransaction* _tmp5_ = NULL;
-	PublishingRESTSupportTransaction* _tmp6_ = NULL;
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	SpitPublishingPublishable* _tmp5_ = NULL;
+	PublishingYouTubeUploadTransaction* _tmp6_ = NULL;
+	PublishingRESTSupportTransaction* _tmp7_ = NULL;
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
-#line 620 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 494 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (publishable), NULL);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp0_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp2_ = self->priv->parameters;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp3_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp4_ = _tmp3_;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp5_ = publishing_you_tube_upload_transaction_new (_tmp1_, _tmp2_, _tmp4_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_g_object_unref0 (_tmp4_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	_publishing_rest_support_session_unref0 (_tmp1_);
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
-	result = _tmp6_;
-#line 622 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp0_ = self->priv->youtube_service;
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp1_ = publishing_rest_support_batch_uploader_get_session (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, PUBLISHING_REST_SUPPORT_TYPE_GOOGLE_SESSION, PublishingRESTSupportGoogleSession);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp3_ = self->priv->parameters;
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp4_ = publishing_rest_support_batch_uploader_get_current_publishable (G_TYPE_CHECK_INSTANCE_CAST (self, PUBLISHING_REST_SUPPORT_TYPE_BATCH_UPLOADER, PublishingRESTSupportBatchUploader));
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp5_ = _tmp4_;
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp6_ = publishing_you_tube_upload_transaction_new (_tmp0_, _tmp2_, _tmp3_, _tmp5_);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, PUBLISHING_REST_SUPPORT_TYPE_TRANSACTION, PublishingRESTSupportTransaction);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (_tmp5_);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_publishing_rest_support_session_unref0 (_tmp2_);
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	result = _tmp7_;
+#line 496 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	return result;
-#line 4376 "YouTubePublishing.c"
+#line 4040 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_class_init (PublishingYouTubeUploaderClass * klass) {
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	publishing_you_tube_uploader_parent_class = g_type_class_peek_parent (klass);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->finalize = publishing_you_tube_uploader_finalize;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	g_type_class_add_private (klass, sizeof (PublishingYouTubeUploaderPrivate));
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	((PublishingRESTSupportBatchUploaderClass *) klass)->create_transaction = publishing_you_tube_uploader_real_create_transaction;
-#line 4389 "YouTubePublishing.c"
+#line 4053 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_instance_init (PublishingYouTubeUploader * self) {
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self->priv = PUBLISHING_YOU_TUBE_UPLOADER_GET_PRIVATE (self);
-#line 4396 "YouTubePublishing.c"
+#line 4060 "YouTubePublishing.c"
 }
 
 
 static void publishing_you_tube_uploader_finalize (PublishingRESTSupportBatchUploader* obj) {
 	PublishingYouTubeUploader * self;
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PUBLISHING_YOU_TUBE_TYPE_UPLOADER, PublishingYouTubeUploader);
-#line 611 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 483 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	_publishing_you_tube_publishing_parameters_unref0 (self->priv->parameters);
-#line 610 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+#line 484 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
+	_g_object_unref0 (self->priv->youtube_service);
+#line 482 "/home/jens/Source/shotwell/plugins/shotwell-publishing/YouTubePublishing.vala"
 	PUBLISHING_REST_SUPPORT_BATCH_UPLOADER_CLASS (publishing_you_tube_uploader_parent_class)->finalize (obj);
-#line 4408 "YouTubePublishing.c"
+#line 4074 "YouTubePublishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala b/plugins/shotwell-publishing/YouTubePublishing.vala
index bf2399a..87f1959 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.vala
+++ b/plugins/shotwell-publishing/YouTubePublishing.vala
@@ -54,10 +54,8 @@ public class YouTubeService : Object, Spit.Pluggable, Spit.Publishing.Service {
 
 namespace Publishing.YouTube {
 
-private const string SERVICE_WELCOME_MESSAGE =
-    _("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.");
 private const string DEVELOPER_KEY =
-    "AI39si5VEpzWK0z-pzo4fonEj9E4driCpEs9lK8y3HJsbbebIIRWqW3bIyGr42bjQv-N3siAfqVoM8XNmtbbp5x2gpbjiSAMTQ";
+    "AIzaSyB6hLnm0n5j8Y6Bkvh9bz3i8ADM2bJdYeY";
     
 private enum PrivacySetting {
     PUBLIC,
@@ -67,12 +65,10 @@ private enum PrivacySetting {
 
 private class PublishingParameters {
     private PrivacySetting privacy;
-    private string? channel_name;
     private string? user_name;
 
     public PublishingParameters() {
         this.privacy = PrivacySetting.PRIVATE;
-        this.channel_name = null;
         this.user_name = null;
     }
 
@@ -84,14 +80,6 @@ private class PublishingParameters {
         this.privacy = privacy;
     }
     
-    public string? get_channel_name() {
-        return channel_name;
-    }
-    
-    public void set_channel_name(string? channel_name) {
-        this.channel_name = channel_name;
-    }
-    
     public string? get_user_name() {
         return user_name;
     }
@@ -101,34 +89,46 @@ private class PublishingParameters {
     }
 }
 
-public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
-    private class ChannelDirectoryTransaction :
-        Publishing.RESTSupport.GooglePublisher.AuthenticatedTransaction {
-        private const string ENDPOINT_URL = "https://gdata.youtube.com/feeds/users/default";
+internal class YouTubeAuthorizer : GData.Authorizer, Object {
+    private RESTSupport.GoogleSession session;
+    private Spit.Publishing.Authenticator authenticator;
 
-        public ChannelDirectoryTransaction(Publishing.RESTSupport.GoogleSession session) {
-            base(session, ENDPOINT_URL, Publishing.RESTSupport.HttpMethod.GET);
-        }
+    public YouTubeAuthorizer(RESTSupport.GoogleSession session, Spit.Publishing.Authenticator authenticator) {
+        this.session = session;
+        this.authenticator = authenticator;
+    }
+
+    public bool is_authorized_for_domain(GData.AuthorizationDomain domain) {
+        return true;
+    }
 
-        public static string? validate_xml(Publishing.RESTSupport.XmlDocument doc) {
-            Xml.Node* document_root = doc.get_root_node();
-            if ((document_root->name == "feed") || (document_root->name == "entry"))
-                return null;
-            else
-                return "response root node isn't a <feed> or <entry>";
+    public void process_request(GData.AuthorizationDomain? domain,
+                                Soup.Message message) {
+        if (domain == null) {
+            return;
         }
+
+        var header = "Bearer %s".printf(session.get_access_token());
+        message.request_headers.replace("Authorization", header);
     }
-    
+
+    public bool refresh_authorization (GLib.Cancellable? cancellable = null) throws GLib.Error {
+        this.authenticator.refresh();
+        return true;
+    }
+}
+
+public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
     private bool running;
-    private string? refresh_token;
     private PublishingParameters publishing_parameters;
     private Spit.Publishing.ProgressCallback? progress_reporter;
+    private Spit.Publishing.Authenticator authenticator;
+    private GData.YouTubeService youtube_service;
 
     public YouTubePublisher(Spit.Publishing.Service service, Spit.Publishing.PluginHost host) {
         base(service, host, "https://gdata.youtube.com/");
-        
+
         this.running = false;
-        this.refresh_token = host.get_config_string("refresh_token", null);
         this.publishing_parameters = new PublishingParameters();
         this.progress_reporter = null;
     }
@@ -144,13 +144,10 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
             return;
 
         running = true;
-        
-        if (refresh_token == null)
-            do_show_service_welcome_pane();
-        else
-            start_oauth_flow(refresh_token);
+
+        this.authenticator.authenticate();
     }
-    
+
     public override void stop() {
         debug("YouTubePublisher: stopped.");
 
@@ -158,92 +155,15 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
 
         get_session().stop_transactions();
     }
-    
-    private string extract_channel_name_helper(Xml.Node* document_root) throws
-        Spit.Publishing.PublishingError {
-        string result = "";
-
-        Xml.Node* doc_node_iter = null;
-        if (document_root->name == "feed")
-            doc_node_iter = document_root->children;
-        else if (document_root->name == "entry")
-            doc_node_iter = document_root;
-        else
-            throw new Spit.Publishing.PublishingError.MALFORMED_RESPONSE(
-                "response root node isn't a <feed> or <entry>");
-
-        for ( ; doc_node_iter != null; doc_node_iter = doc_node_iter->next) {
-            if (doc_node_iter->name != "entry")
-                continue;
-
-            string name_val = null;
-            string url_val = null;
-            Xml.Node* channel_node_iter = doc_node_iter->children;
-            for ( ; channel_node_iter != null; channel_node_iter = channel_node_iter->next) {
-                if (channel_node_iter->name == "title") {
-                    name_val = channel_node_iter->get_content();
-                } else if (channel_node_iter->name == "id") {
-                    // we only want nodes in the default namespace -- the feed that we get back
-                    // from Google also defines <entry> child nodes named <id> in the media
-                    // namespace
-                    if (channel_node_iter->ns->prefix != null)
-                        continue;
-                    url_val = channel_node_iter->get_content();
-                }
-            }
-
-            result = name_val;
-            break;
-        }
-
-        debug("YouTubePublisher: extracted channel name '%s' from response XML.", result);
-
-        return result;
-    }
-    
-    private void on_service_welcome_login() {
-        debug("EVENT: user clicked 'Login' in welcome pane.");
 
-        if (!is_running())
-            return;
-        
-        start_oauth_flow(refresh_token);
-    }
-    
     protected override void on_login_flow_complete() {
         debug("EVENT: OAuth login flow complete.");
         
-        get_host().set_config_string("refresh_token", get_session().get_refresh_token());
-
         publishing_parameters.set_user_name(get_session().get_user_name());
         
-        do_fetch_account_information();
-    }
-
-    private void on_initial_channel_fetch_complete(Publishing.RESTSupport.Transaction txn) {
-        txn.completed.disconnect(on_initial_channel_fetch_complete);
-        txn.network_error.disconnect(on_initial_channel_fetch_error);
-
-        debug("EVENT: finished fetching account and channel information.");
-
-        if (!is_running())
-            return;
-
-        do_parse_and_display_account_information((ChannelDirectoryTransaction) txn);
-    }
-
-    private void on_initial_channel_fetch_error(Publishing.RESTSupport.Transaction bad_txn,
-        Spit.Publishing.PublishingError err) {
-        bad_txn.completed.disconnect(on_initial_channel_fetch_complete);
-        bad_txn.network_error.disconnect(on_initial_channel_fetch_error);
-
-        debug("EVENT: fetching account and channel information failed; response = '%s'.",
-            bad_txn.get_response());
-
-        if (!is_running())
-            return;
-
-        get_host().post_error(err);
+        this.youtube_service = new GData.YouTubeService(DEVELOPER_KEY,
+                new YouTubeAuthorizer(get_session(), this.authenticator));
+        do_show_publishing_options_pane();
     }
 
     private void on_publishing_options_logout() {
@@ -301,53 +221,6 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
         get_host().post_error(err);
     }
 
-    private void do_show_service_welcome_pane() {
-        debug("ACTION: showing service welcome pane.");
-
-        get_host().install_welcome_pane(SERVICE_WELCOME_MESSAGE, on_service_welcome_login);
-    }
-    
-    private void do_fetch_account_information() {
-        debug("ACTION: fetching channel information.");
-
-        get_host().install_account_fetch_wait_pane();
-        get_host().set_service_locked(true);
-
-        ChannelDirectoryTransaction directory_trans =
-            new ChannelDirectoryTransaction(get_session());
-        directory_trans.network_error.connect(on_initial_channel_fetch_error);
-        directory_trans.completed.connect(on_initial_channel_fetch_complete);
-
-        try {
-            directory_trans.execute();
-        } catch (Spit.Publishing.PublishingError err) {
-            on_initial_channel_fetch_error(directory_trans, err);
-        }
-    }
-
-    private void do_parse_and_display_account_information(ChannelDirectoryTransaction transaction) {
-        debug("ACTION: extracting account and channel information from body of server response");
-
-        Publishing.RESTSupport.XmlDocument response_doc;
-        try {
-            response_doc = Publishing.RESTSupport.XmlDocument.parse_string(
-                transaction.get_response(), ChannelDirectoryTransaction.validate_xml);
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host().post_error(err);
-            return;
-        }
-
-        try {
-            publishing_parameters.set_channel_name(extract_channel_name_helper(
-                response_doc.get_root_node()));
-        } catch (Spit.Publishing.PublishingError err) {
-            get_host().post_error(err);
-            return;
-        }
-
-        do_show_publishing_options_pane();
-    }
-
     private void do_show_publishing_options_pane() {
         debug("ACTION: showing publishing options pane.");
 
@@ -364,8 +237,7 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
             return;
         }
 
-        PublishingOptionsPane opts_pane = new PublishingOptionsPane(get_host(), builder,
-            publishing_parameters);
+        PublishingOptionsPane opts_pane = new PublishingOptionsPane(authenticator, get_host(), builder, publishing_parameters);
         opts_pane.publish.connect(on_publishing_options_publish);
         opts_pane.logout.connect(on_publishing_options_logout);
         get_host().install_dialog_pane(opts_pane);
@@ -378,7 +250,6 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
 
         get_host().set_service_locked(true);
         get_host().install_account_fetch_wait_pane();
-        
 
         progress_reporter = get_host().serialize_publishables(-1);
 
@@ -390,7 +261,7 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
             return;
 
         Spit.Publishing.Publishable[] publishables = get_host().get_publishables();
-        Uploader uploader = new Uploader(get_session(), publishables, publishing_parameters);
+        Uploader uploader = new Uploader(this.youtube_service, get_session(), publishables, publishing_parameters);
 
         uploader.upload_complete.connect(on_upload_complete);
         uploader.upload_error.connect(on_upload_error);
@@ -407,13 +278,20 @@ public class YouTubePublisher : Publishing.RESTSupport.GooglePublisher {
 
     protected override void do_logout() {
         debug("ACTION: logging out user.");
-        
-        get_session().deauthenticate();
-        refresh_token = null;
-        get_host().unset_config_key("refresh_token");
-          
 
-        do_show_service_welcome_pane();
+        if (this.authenticator.can_logout()) {
+            this.authenticator.logout();
+            this.authenticator.authenticate();
+        }
+    }
+
+    protected override Spit.Publishing.Authenticator get_authenticator() {
+        if (this.authenticator == null) {
+            this.authenticator =
+                Publishing.Authenticator.Factory.get_instance().create("youtube", get_host());
+        }
+
+        return this.authenticator;
     }
 }
 
@@ -433,7 +311,6 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
 
     private Gtk.Box pane_widget = null;
     private Gtk.ComboBoxText privacy_combo = null;
-    private Gtk.Label publish_to_label = null;
     private Gtk.Label login_identity_label = null;
     private Gtk.Button publish_button = null;
     private Gtk.Button logout_button = null;
@@ -442,8 +319,10 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
     private PrivacyDescription[] privacy_descriptions;
     private PublishingParameters publishing_parameters;
 
-    public PublishingOptionsPane(Spit.Publishing.PluginHost host, Gtk.Builder builder,
-        PublishingParameters publishing_parameters) {
+    public PublishingOptionsPane(Spit.Publishing.Authenticator authenticator,
+                                 Spit.Publishing.PluginHost host,
+                                 Gtk.Builder builder,
+                                 PublishingParameters publishing_parameters) {
         this.privacy_descriptions = create_privacy_descriptions();
         this.publishing_parameters = publishing_parameters;
 
@@ -453,16 +332,17 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
 
         login_identity_label = this.builder.get_object("login_identity_label") as Gtk.Label;
         privacy_combo = this.builder.get_object("privacy_combo") as Gtk.ComboBoxText;
-        publish_to_label = this.builder.get_object("publish_to_label") as Gtk.Label;
         publish_button = this.builder.get_object("publish_button") as Gtk.Button;
         logout_button = this.builder.get_object("logout_button") as Gtk.Button;
         pane_widget = this.builder.get_object("youtube_pane_widget") as Gtk.Box;
         privacy_label = this.builder.get_object("privacy_label") as Gtk.Label;
 
+        if (!authenticator.can_logout()) {
+            logout_button.parent.remove(logout_button);
+        }
+
         login_identity_label.set_label(_("You are logged into YouTube as %s.").printf(
             publishing_parameters.get_user_name()));
-        publish_to_label.set_label(_("Videos will appear in “%s”").printf(
-            publishing_parameters.get_channel_name()));
 
         foreach(PrivacyDescription desc in privacy_descriptions) {
             privacy_combo.append_text(desc.description);
@@ -519,107 +399,101 @@ internal class PublishingOptionsPane : Spit.Publishing.DialogPane, GLib.Object {
 
 internal class UploadTransaction : Publishing.RESTSupport.GooglePublisher.AuthenticatedTransaction {
     private const string ENDPOINT_URL = "https://uploads.gdata.youtube.com/feeds/api/users/default/uploads";
-    private const string UNLISTED_XML = "<yt:accessControl action='list' permission='denied'/>";
-    private const string PRIVATE_XML = "<yt:private/>";
-    private const string METADATA_TEMPLATE ="""<?xml version='1.0'?>
-                                                <entry xmlns='http://www.w3.org/2005/Atom'
-                                                xmlns:media='http://search.yahoo.com/mrss/'
-                                                xmlns:yt='http://gdata.youtube.com/schemas/2007'>
-                                                <media:group>
-                                                    <media:title type='plain'>%s</media:title>
-                                                    <media:category
-                                                    scheme='http://gdata.youtube.com/schemas/2007/categories.cat'>People
-                                                    </media:category>
-                                                    %s
-                                                </media:group>
-                                                    %s
-                                                </entry>""";
     private PublishingParameters parameters;
     private Publishing.RESTSupport.GoogleSession session;
     private Spit.Publishing.Publishable publishable;
+    private GData.YouTubeService youtube_service;
 
-    public UploadTransaction(Publishing.RESTSupport.GoogleSession session,
+    public UploadTransaction(GData.YouTubeService youtube_service, Publishing.RESTSupport.GoogleSession session,
         PublishingParameters parameters, Spit.Publishing.Publishable publishable) {
         base(session, ENDPOINT_URL, Publishing.RESTSupport.HttpMethod.POST);
         assert(session.is_authenticated());
         this.session = session;
         this.parameters = parameters;
         this.publishable = publishable;
+        this.youtube_service = youtube_service;
     }
 
     public override void execute() throws Spit.Publishing.PublishingError {
-        // create the multipart request container
-        Soup.Multipart message_parts = new Soup.Multipart("multipart/related");
-
-        string unlisted_video =
-            (parameters.get_privacy() == PrivacySetting.UNLISTED) ? UNLISTED_XML : "";
-
-        string private_video =
-            (parameters.get_privacy() == PrivacySetting.PRIVATE) ? PRIVATE_XML : "";
+        var video = new GData.YouTubeVideo(null);
 
+        var slug = publishable.get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME);
         // Set title to publishing name, but if that's empty default to filename.
         string title = publishable.get_publishing_name();
         if (title == "") {
             title = publishable.get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME);
         }
+        video.title = title;
+
+        video.is_private = (parameters.get_privacy() == PrivacySetting.PRIVATE);
+
+        if (parameters.get_privacy() == PrivacySetting.UNLISTED) {
+            video.set_access_control("list", GData.YouTubePermission.DENIED);
+        } else if (!video.is_private) {
+            video.set_access_control("list", GData.YouTubePermission.ALLOWED);
+        }
 
-        string metadata = METADATA_TEMPLATE.printf(Publishing.RESTSupport.decimal_entity_encode(title),
-            private_video, unlisted_video);
-        Soup.Buffer metadata_buffer = new Soup.Buffer(Soup.MemoryUse.COPY, metadata.data);
-        message_parts.append_form_file("", "", "application/atom+xml", metadata_buffer);
+        var file = publishable.get_serialized_file();
 
-        // attempt to read the binary video data from disk
-        string video_data;
-        size_t data_length;
         try {
-            FileUtils.get_contents(publishable.get_serialized_file().get_path(), out video_data,
-                out data_length);
-        } catch (FileError e) {
-            string msg = "YouTube: couldn't read data from %s: %s".printf(
-                publishable.get_serialized_file().get_path(), e.message);
-            warning("%s", msg);
-
-            throw new Spit.Publishing.PublishingError.LOCAL_FILE_ERROR(msg);
+            var info = file.query_info(FileAttribute.STANDARD_CONTENT_TYPE + "," +
+                                       FileAttribute.STANDARD_SIZE, FileQueryInfoFlags.NONE);
+            var upload_stream = this.youtube_service.upload_video(video, slug,
+                    info.get_content_type());
+            var input_stream = file.read();
+
+            // Yuck...
+            var loop = new MainLoop(null, false);
+            this.splice_with_progress.begin(info, input_stream, upload_stream, (obj, res) => {
+                try {
+                    this.splice_with_progress.end(res);
+                } catch (Error error) {
+                    critical("Failed to upload: %s", error.message);
+                }
+                loop.quit();
+            });
+            loop.run();
+            video = this.youtube_service.finish_video_upload(upload_stream);
+        } catch (Error error) {
+            critical("Upload failed: %s", error.message);
+        }
+    }
+
+    private async void splice_with_progress(GLib.FileInfo info, GLib.InputStream input, GLib.OutputStream output) throws Error {
+        var total_bytes = info.get_size();
+        var bytes_to_write = total_bytes;
+        uint8 buffer[8192];
+
+        while (bytes_to_write > 0) {
+            var bytes_read = yield input.read_async(buffer);
+            if (bytes_read == 0)
+                break;
+
+            var bytes_written = yield output.write_async(buffer[0:bytes_read]);
+            bytes_to_write -= bytes_written;
+            chunk_transmitted((int)(total_bytes - bytes_to_write), (int) total_bytes);
         }
 
-        // bind the binary video data read from disk into a Soup.Buffer object so that we
-        // can attach it to the multipart request, then actaully append the buffer
-        // to the multipart request. Then, set the MIME type for this part.
-        Soup.Buffer bindable_data = new Soup.Buffer(Soup.MemoryUse.COPY,
-            video_data.data[0:data_length]);
-
-        message_parts.append_form_file("", publishable.get_serialized_file().get_path(),
-            "video/mpeg", bindable_data);
-        // create a message that can be sent over the wire whose payload is the multipart container
-        // that we've been building up
-        Soup.Message outbound_message =
-            Soup.Form.request_new_from_multipart(get_endpoint_url(), message_parts);
-        outbound_message.request_headers.append("X-GData-Key", "key=%s".printf(DEVELOPER_KEY));
-        outbound_message.request_headers.append("Slug",
-            publishable.get_param_string(Spit.Publishing.Publishable.PARAM_STRING_BASENAME));
-        outbound_message.request_headers.append("Authorization", "Bearer " +
-            session.get_access_token());
-        set_message(outbound_message);
-
-        // send the message and get its response
-        set_is_executed(true);
-        send();
+        yield output.close_async();
+        yield input.close_async();
     }
 }
 
 internal class Uploader : Publishing.RESTSupport.BatchUploader {
     private PublishingParameters parameters;
+    private GData.YouTubeService youtube_service;
 
-    public Uploader(Publishing.RESTSupport.GoogleSession session,
+    public Uploader(GData.YouTubeService youtube_service, Publishing.RESTSupport.GoogleSession session,
         Spit.Publishing.Publishable[] publishables, PublishingParameters parameters) {
         base(session, publishables);
 
         this.parameters = parameters;
+        this.youtube_service = youtube_service;
     }
 
     protected override Publishing.RESTSupport.Transaction create_transaction(
         Spit.Publishing.Publishable publishable) {
-        return new UploadTransaction((Publishing.RESTSupport.GoogleSession) get_session(),
+        return new UploadTransaction(this.youtube_service, (Publishing.RESTSupport.GoogleSession) get_session(),
             parameters, get_current_publishable());
     }
 }
diff --git a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
index af3baad..b09902e 100644
--- a/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
+++ b/plugins/shotwell-publishing/org.gnome.Shotwell.Publishing.gresource.xml
@@ -7,7 +7,6 @@
       <file>piwigo.png</file>
       <file>youtube.png</file>
       <file>facebook_publishing_options_pane.ui</file>
-      <file>flickr_pin_entry_pane.ui</file>
       <file>flickr_publishing_options_pane.ui</file>
       <file>picasa_publishing_options_pane.ui</file>
       <file>piwigo_authentication_pane.ui</file>
diff --git a/plugins/shotwell-publishing/picasa_publishing_options_pane.ui b/plugins/shotwell-publishing/picasa_publishing_options_pane.ui
index 04d3948..11e79af 100644
--- a/plugins/shotwell-publishing/picasa_publishing_options_pane.ui
+++ b/plugins/shotwell-publishing/picasa_publishing_options_pane.ui
@@ -16,7 +16,7 @@
         <property name="can_focus">False</property>
         <property name="margin_top">12</property>
         <property name="margin_bottom">32</property>
-        <property name="label">'you are logged in as $name'
+        <property name="label" translatable="no">'you are logged in as $name'
 (populated in the application code)</property>
       </object>
       <packing>
@@ -51,66 +51,25 @@
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="new_album_entry">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="invisible_char">•</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkRadioButton" id="use_existing_radio">
-                <property name="label" translatable="yes">An _existing album:</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="halign">start</property>
-                <property name="use_underline">True</property>
-                <property name="active">True</property>
-                <property name="draw_indicator">True</property>
-                <property name="group">create_new_radio</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkRadioButton" id="create_new_radio">
-                <property name="label" translatable="yes">A _new album named:</property>
+              <object class="GtkCheckButton" id="strip_metadata_check">
+                <property name="label" translatable="yes">_Remove location, camera, and other identifying information before uploading</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
                 <property name="halign">start</property>
+                <property name="margin_top">16</property>
+                <property name="hexpand">True</property>
                 <property name="use_underline">True</property>
-                <property name="active">True</property>
                 <property name="draw_indicator">True</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="public_check">
-                <property name="label" translatable="yes">L_ist album in public gallery</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">3</property>
+                <property name="width">2</property>
               </packing>
             </child>
             <child>
@@ -118,14 +77,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="margin_top">32</property>
-                <property name="label">$mediatype will appear in
+                <property name="label" translatable="no">$mediatype will appear in
 (populated in code)</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
-                <property name="width">2</property>
               </packing>
             </child>
             <child>
@@ -133,48 +90,25 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="margin_top">32</property>
                 <property name="label" translatable="yes">Photo _size preset:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">size_combo</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
-                <property name="top_attach">4</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkComboBoxText" id="size_combo">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_top">32</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
-                <property name="top_attach">4</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="strip_metadata_check">
-                <property name="label" translatable="yes">_Remove location, camera, and other identifying information before uploading</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">False</property>
-                <property name="halign">start</property>
-                <property name="margin_top">16</property>
-                <property name="hexpand">True</property>
-                <property name="use_underline">True</property>
-                <property name="draw_indicator">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">5</property>
-                <property name="width">2</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
-            <child>
-              <placeholder/>
-            </child>
           </object>
           <packing>
             <property name="expand">False</property>
diff --git a/plugins/shotwell-publishing/shotwell-publishing.c b/plugins/shotwell-publishing/shotwell-publishing.c
index 7886a92..98b3abd 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.c
+++ b/plugins/shotwell-publishing/shotwell-publishing.c
@@ -11,6 +11,8 @@
 #include <glib-object.h>
 #include <shotwell-plugin-dev-1.0.h>
 #include <gio/gio.h>
+#include "shotwell-authenticator.h"
+#include <gee.h>
 #include <stdlib.h>
 #include <string.h>
 #include <glib/gi18n-lib.h>
@@ -26,6 +28,7 @@
 typedef struct _ShotwellPublishingCoreServices ShotwellPublishingCoreServices;
 typedef struct _ShotwellPublishingCoreServicesClass ShotwellPublishingCoreServicesClass;
 typedef struct _ShotwellPublishingCoreServicesPrivate ShotwellPublishingCoreServicesPrivate;
+#define _g_free0(var) (var = (g_free (var), NULL))
 
 #define TYPE_FACEBOOK_SERVICE (facebook_service_get_type ())
 #define FACEBOOK_SERVICE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_FACEBOOK_SERVICE, FacebookService))
@@ -135,87 +138,87 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 
 
 static void _vala_array_add1 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 145 "shotwell-publishing.c"
+#line 148 "shotwell-publishing.c"
 	}
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 151 "shotwell-publishing.c"
+#line 154 "shotwell-publishing.c"
 }
 
 
 static void _vala_array_add2 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 162 "shotwell-publishing.c"
+#line 165 "shotwell-publishing.c"
 	}
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 168 "shotwell-publishing.c"
+#line 171 "shotwell-publishing.c"
 }
 
 
 static void _vala_array_add3 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 179 "shotwell-publishing.c"
+#line 182 "shotwell-publishing.c"
 	}
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 185 "shotwell-publishing.c"
+#line 188 "shotwell-publishing.c"
 }
 
 
 static void _vala_array_add4 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 196 "shotwell-publishing.c"
+#line 199 "shotwell-publishing.c"
 	}
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 202 "shotwell-publishing.c"
+#line 205 "shotwell-publishing.c"
 }
 
 
 static void _vala_array_add5 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if ((*length) == (*size)) {
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*array = g_renew (SpitPluggable*, *array, (*size) + 1);
-#line 213 "shotwell-publishing.c"
+#line 216 "shotwell-publishing.c"
 	}
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[(*length)++] = value;
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*array)[*length] = NULL;
-#line 219 "shotwell-publishing.c"
+#line 222 "shotwell-publishing.c"
 }
 
 
@@ -224,21 +227,29 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	GFile* resource_directory = NULL;
 	GFile* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
-	SpitPluggable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	FacebookService* _tmp3_ = NULL;
-	SpitPluggable** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	PicasaService* _tmp5_ = NULL;
-	SpitPluggable** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	FlickrService* _tmp7_ = NULL;
-	SpitPluggable** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	YouTubeService* _tmp9_ = NULL;
-	SpitPluggable** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
-	PiwigoService* _tmp11_ = NULL;
+	PublishingAuthenticatorFactory* factory = NULL;
+	PublishingAuthenticatorFactory* _tmp2_ = NULL;
+	GeeList* authenicators = NULL;
+	PublishingAuthenticatorFactory* _tmp3_ = NULL;
+	GeeList* _tmp4_ = NULL;
+	GFile* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	gchar* _tmp7_ = NULL;
+	GeeList* _tmp8_ = NULL;
+	gint _tmp9_ = 0;
+	gint _tmp10_ = 0;
+	GeeList* _tmp11_ = NULL;
+	gboolean _tmp12_ = FALSE;
+	GeeList* _tmp16_ = NULL;
+	gboolean _tmp17_ = FALSE;
+	GeeList* _tmp21_ = NULL;
+	gboolean _tmp22_ = FALSE;
+	GeeList* _tmp26_ = NULL;
+	gboolean _tmp27_ = FALSE;
+	SpitPluggable** _tmp31_ = NULL;
+	gint _tmp31__length1 = 0;
+	GFile* _tmp32_ = NULL;
+	PiwigoService* _tmp33_ = NULL;
 #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"
@@ -249,58 +260,152 @@ ShotwellPublishingCoreServices* shotwell_publishing_core_services_construct (GTy
 	_tmp1_ = g_file_get_parent (_tmp0_);
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	resource_directory = _tmp1_;
+#line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp2_ = publishing_authenticator_factory_get_instance ();
+#line 17 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	factory = _tmp2_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp2_ = self->priv->pluggables;
-#line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp2__length1 = self->priv->pluggables_length1;
+	_tmp3_ = factory;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp3_ = facebook_service_new (resource_directory);
+	_tmp4_ = spit_publishing_authenticator_factory_get_available_authenticators (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory));
 #line 18 "/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 (_tmp3_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp4_ = self->priv->pluggables;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp4__length1 = self->priv->pluggables_length1;
-#line 19 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp5_ = picasa_service_new (resource_directory);
-#line 19 "/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 (_tmp5_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp6_ = self->priv->pluggables;
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp6__length1 = self->priv->pluggables_length1;
-#line 20 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp7_ = flickr_service_new (resource_directory);
-#line 20 "/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 (_tmp7_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp8_ = self->priv->pluggables;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp8__length1 = self->priv->pluggables_length1;
-#line 21 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp9_ = you_tube_service_new (resource_directory);
-#line 21 "/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 (_tmp9_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	authenicators = _tmp4_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp10_ = self->priv->pluggables;
+	_tmp5_ = resource_directory;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp10__length1 = self->priv->pluggables_length1;
+	_tmp6_ = g_file_get_path (_tmp5_);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
-	_tmp11_ = piwigo_service_new (resource_directory);
+	_tmp7_ = _tmp6_;
 #line 22 "/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 (_tmp11_, SPIT_TYPE_PLUGGABLE, SpitPluggable));
+	g_debug ("shotwell-publishing.vala:22: Looking for resources in %s", _tmp7_);
+#line 22 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_g_free0 (_tmp7_);
+#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp8_ = authenicators;
+#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp10_ = _tmp9_;
+#line 23 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	g_debug ("shotwell-publishing.vala:23: Found %d authenicators", _tmp10_);
+#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp11_ = authenicators;
+#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_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"
+		SpitPluggable** _tmp13_ = NULL;
+		gint _tmp13__length1 = 0;
+		GFile* _tmp14_ = NULL;
+		FacebookService* _tmp15_ = NULL;
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp13_ = self->priv->pluggables;
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp13__length1 = self->priv->pluggables_length1;
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp14_ = resource_directory;
+#line 27 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_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 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp16_ = authenicators;
+#line 32 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_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"
+		SpitPluggable** _tmp18_ = NULL;
+		gint _tmp18__length1 = 0;
+		GFile* _tmp19_ = NULL;
+		PicasaService* _tmp20_ = NULL;
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp18_ = self->priv->pluggables;
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp18__length1 = self->priv->pluggables_length1;
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp19_ = resource_directory;
+#line 33 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_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 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp21_ = authenicators;
+#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_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"
+		SpitPluggable** _tmp23_ = NULL;
+		gint _tmp23__length1 = 0;
+		GFile* _tmp24_ = NULL;
+		FlickrService* _tmp25_ = NULL;
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp23_ = self->priv->pluggables;
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp23__length1 = self->priv->pluggables_length1;
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp24_ = resource_directory;
+#line 39 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_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 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp26_ = authenicators;
+#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_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"
+		SpitPluggable** _tmp28_ = NULL;
+		gint _tmp28__length1 = 0;
+		GFile* _tmp29_ = NULL;
+		YouTubeService* _tmp30_ = NULL;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp28_ = self->priv->pluggables;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp28__length1 = self->priv->pluggables_length1;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_tmp29_ = resource_directory;
+#line 45 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+		_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 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp31_ = self->priv->pluggables;
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp31__length1 = self->priv->pluggables_length1;
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_tmp32_ = resource_directory;
+#line 50 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+	_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 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"
+	_g_object_unref0 (factory);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_g_object_unref0 (resource_directory);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return self;
-#line 297 "shotwell-publishing.c"
+#line 402 "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 304 "shotwell-publishing.c"
+#line 409 "shotwell-publishing.c"
 }
 
 
@@ -308,41 +413,41 @@ static const gchar* shotwell_publishing_core_services_real_get_module_name (Spit
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
-#line 25 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 54 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_PUBLISHING_CORE_SERVICES, ShotwellPublishingCoreServices);
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0_ = _ ("Core Publishing Services");
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _tmp0_;
-#line 26 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 55 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 320 "shotwell-publishing.c"
+#line 425 "shotwell-publishing.c"
 }
 
 
 static const gchar* shotwell_publishing_core_services_real_get_version (SpitModule* base) {
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 29 "/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 30 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 59 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _VERSION;
-#line 30 "/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 333 "shotwell-publishing.c"
+#line 438 "shotwell-publishing.c"
 }
 
 
 static const gchar* shotwell_publishing_core_services_real_get_id (SpitModule* base) {
 	ShotwellPublishingCoreServices * self;
 	const gchar* result = NULL;
-#line 33 "/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 34 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 63 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = "org.yorba.shotwell.publishing.core_services";
-#line 34 "/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 346 "shotwell-publishing.c"
+#line 451 "shotwell-publishing.c"
 }
 
 
@@ -353,27 +458,27 @@ static SpitPluggable** shotwell_publishing_core_services_real_get_pluggables (Sp
 	gint _tmp0__length1 = 0;
 	SpitPluggable** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 37 "/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 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0_ = self->priv->pluggables;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0__length1 = self->priv->pluggables_length1;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1_ = _tmp0_;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1__length1 = _tmp0__length1;
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (result_length1) {
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		*result_length1 = _tmp1__length1;
-#line 371 "shotwell-publishing.c"
+#line 476 "shotwell-publishing.c"
 	}
-#line 38 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 67 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = _tmp1_;
-#line 38 "/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 377 "shotwell-publishing.c"
+#line 482 "shotwell-publishing.c"
 }
 
 
@@ -384,7 +489,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 388 "shotwell-publishing.c"
+#line 493 "shotwell-publishing.c"
 }
 
 
@@ -399,7 +504,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 403 "shotwell-publishing.c"
+#line 508 "shotwell-publishing.c"
 }
 
 
@@ -415,7 +520,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 419 "shotwell-publishing.c"
+#line 524 "shotwell-publishing.c"
 }
 
 
@@ -427,7 +532,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 431 "shotwell-publishing.c"
+#line 536 "shotwell-publishing.c"
 }
 
 
@@ -455,51 +560,51 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	ShotwellPublishingCoreServices* _tmp5_ = NULL;
 	SpitEntryPointParams* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp0_ = params;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp1_ = (*_tmp0_).host_min_spit_interface;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp2_ = params;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp3_ = (*_tmp2_).host_max_spit_interface;
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp4_ = spit_negotiate_interfaces (_tmp1_, _tmp3_, SPIT_CURRENT_INTERFACE);
-#line 44 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 73 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	(*params).module_spit_interface = _tmp4_;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp6_ = params;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	_tmp7_ = (*_tmp6_).module_spit_interface;
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 477 "shotwell-publishing.c"
+#line 582 "shotwell-publishing.c"
 		SpitEntryPointParams* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
 		ShotwellPublishingCoreServices* _tmp10_ = NULL;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp8_ = params;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp9_ = (*_tmp8_).module_file;
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp10_ = shotwell_publishing_core_services_new (_tmp9_);
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_g_object_unref0 (_tmp5_);
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp5_ = _tmp10_;
-#line 491 "shotwell-publishing.c"
+#line 596 "shotwell-publishing.c"
 	} else {
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_g_object_unref0 (_tmp5_);
-#line 48 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 77 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 		_tmp5_ = NULL;
-#line 497 "shotwell-publishing.c"
+#line 602 "shotwell-publishing.c"
 	}
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
-#line 47 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
+#line 76 "/home/jens/Source/shotwell/plugins/shotwell-publishing/shotwell-publishing.vala"
 	return result;
-#line 503 "shotwell-publishing.c"
+#line 608 "shotwell-publishing.c"
 }
 
 
diff --git a/plugins/shotwell-publishing/shotwell-publishing.vala b/plugins/shotwell-publishing/shotwell-publishing.vala
index bbd5ddb..dce5954 100644
--- a/plugins/shotwell-publishing/shotwell-publishing.vala
+++ b/plugins/shotwell-publishing/shotwell-publishing.vala
@@ -14,12 +14,41 @@ private class ShotwellPublishingCoreServices : Object, Spit.Module {
     // module file directory
     public ShotwellPublishingCoreServices(GLib.File module_file) {
         GLib.File resource_directory = module_file.get_parent();
-        
-        pluggables += new FacebookService(resource_directory);
-        pluggables += new PicasaService(resource_directory);
-        pluggables += new FlickrService(resource_directory);
-        pluggables += new YouTubeService(resource_directory);
+        var factory = Publishing.Authenticator.Factory.get_instance();
+        var authenicators = factory.get_available_authenticators();
+
+        // Prevent vala complaining when all authenticators from this plugin
+        // are disabled
+        debug("Looking for resources in %s", resource_directory.get_path());
+        debug("Found %d authenicators", authenicators.size);
+
+#if HAVE_FACEBOOK
+        if (authenicators.contains("facebook")) {
+            pluggables += new FacebookService(resource_directory);
+        }
+#endif
+
+#if HAVE_PICASA
+        if (authenicators.contains("picasa")) {
+            pluggables += new PicasaService(resource_directory);
+        }
+#endif
+
+#if HAVE_FLICKR
+        if (authenicators.contains("flickr")) {
+            pluggables += new FlickrService(resource_directory);
+        }
+#endif
+
+#if HAVE_YOUTUBE
+        if (authenicators.contains("youtube")) {
+            pluggables += new YouTubeService(resource_directory);
+        }
+#endif
+
+#if HAVE_PIWIGO
         pluggables += new PiwigoService(resource_directory);
+#endif
     }
     
     public unowned string get_module_name() {
diff --git a/plugins_authenticator_libshotwell_authenticator_la_vala.stamp b/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
new file mode 100644
index 0000000..859afb1
--- /dev/null
+++ b/plugins_authenticator_libshotwell_authenticator_la_vala.stamp
@@ -0,0 +1 @@
+stamp
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4d7e209..7d8d341 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,6 +5,11 @@ misc/shotwell.desktop.in.in
 misc/shotwell-viewer.desktop.in.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/common/Resources.vala
 plugins/common/RESTSupport.vala
 plugins/shotwell-data-imports/FSpotImporter.vala
@@ -23,7 +28,6 @@ plugins/shotwell-publishing-extras/YandexPublishing.vala
 plugins/shotwell-publishing-extras/yandex_publish_model.ui
 plugins/shotwell-publishing/facebook_publishing_options_pane.ui
 plugins/shotwell-publishing/FacebookPublishing.vala
-plugins/shotwell-publishing/flickr_pin_entry_pane.ui
 plugins/shotwell-publishing/flickr_publishing_options_pane.ui
 plugins/shotwell-publishing/FlickrPublishing.vala
 plugins/shotwell-publishing/picasa_publishing_options_pane.ui
@@ -117,6 +121,7 @@ ui/media.ui
 ui/offline.ui
 ui/photo_context.ui
 ui/photo.ui
+ui/printing_widget.ui
 ui/savedsearch.ui
 ui/search_bar.ui
 ui/search_sidebar_context.ui
@@ -126,5 +131,4 @@ ui/shotwell.ui
 ui/sidebar_default_context.ui
 ui/tag_sidebar_context.ui
 ui/tags.ui
-ui/top.ui
 ui/trash.ui
diff --git a/po/ca.gmo b/po/ca.gmo
index 470e9ff..3a44f52 100644
--- a/po/ca.gmo
+++ b/po/ca.gmo
diff --git a/po/ca.po b/po/ca.po
index 2d0b6f7..eaa2bca 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -4733,7 +4733,7 @@ msgstr "Tipus"
 
 #: ../src/SearchFilter.vala:1211
 msgid "Use a saved search to filter items in the current view"
-msgstr "Utilitza un cerca desada per filtrar els elements de la vista actual"
+msgstr "Utilitza una cerca desada per filtrar els elements de la vista actual"
 
 #: ../src/sidebar/Tree.vala:203
 msgid "New _Tag…"
diff --git a/po/cs.gmo b/po/cs.gmo
index f38d5b1..4f268e8 100644
--- a/po/cs.gmo
+++ b/po/cs.gmo
diff --git a/po/cs.po b/po/cs.po
index 3a589d1..c6396f4 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -15,10 +15,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell\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-01-18 22:12+0000\n"
-"PO-Revision-Date: 2017-01-23 00:10+0100\n"
+"POT-Creation-Date: 2017-03-14 12:50+0000\n"
+"PO-Revision-Date: 2017-03-15 00:54+0100\n"
 "Last-Translator: Marek Černocký <marek@manet.cz>\n"
 "Language-Team: čeština <gnome-cs-list@gnome.org>\n"
 "Language: cs\n"
@@ -30,7 +30,7 @@ msgstr ""
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354
+#: 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
 msgid "Shotwell"
@@ -1303,7 +1303,6 @@ msgstr ""
 "Blednutí pro promítání snímků."
 
 #: misc/org.yorba.shotwell.gschema.xml:774
-#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow slide transition"
 msgstr "Povolit postrkávací přechod prezentace"
 
@@ -1326,7 +1325,6 @@ msgstr ""
 "Hodiny pro promítání snímků."
 
 #: misc/org.yorba.shotwell.gschema.xml:786
-#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow circle transition"
 msgstr "Povolit kruhový přechod prezentace"
 
@@ -1337,6 +1335,10 @@ 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
+msgid "enable slideshow circles transition"
+msgstr "Povolit několikakruhový přechod prezentace"
+
 #: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
@@ -1344,6 +1346,10 @@ 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
+msgid "enable slideshow blinds transition"
+msgstr "Povolit roletový přechod prezentace"
+
 #: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
@@ -1385,11 +1391,126 @@ msgstr ""
 "Když je zapnuto, je povolen zásuvný modul poskytující přechodový efekt "
 "Šachovnice pro promítání snímků."
 
+#: 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 ""
+"Momentálně nejste k Facebooku přihlášeni.\n"
+"\n"
+"Jestliže ještě nemáte vytvořen na Facebooku účet, můžete si jej vytvořit "
+"během přihlašování. Během přihlašování se může zobrazit žádost o povolení k "
+"nahrávání fotografií a jejich zveřejnění v kanále. Povolení je pro připojení "
+"aplikace Shotwell nutné."
+
+#: 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 ""
+"V průběhu práce s aplikací Shotwell jste již byli přihlášeni a odhlášeni od "
+"Facebooku.\n"
+"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
+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 ""
+"Momentálně nejste ke službě Flickr přihlášeni.\n"
+"\n"
+"Pro přihlášení ke službě Flickr klikněte na Přihlásit se ve webovém "
+"prohlížeči. Pak musíte ve svém účtu Flickr povolit přístup pro Shotwell "
+"Connect."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+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:481
+msgid "Verifying authorization…"
+msgstr "Ověřuje se autorizace…"
+
+#: 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 ""
+"V průběhu práce s aplikací Shotwell jste již byli přihlášeni a odhlášeni od "
+"služby Google.\n"
+"\n"
+"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
+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 ""
+"Nejste přihlášeni ke službě Picasa Web Albums.\n"
+"\n"
+"Pro přihlášení k webovým albům Picasa klikněte na Přihlásit se ve webovém "
+"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
+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 ""
+"Nejste přihlášeni ke službě YouTube.\n"
+"\n"
+"Aby bylo možné pokračovat, musíte být přihlášeni k účtu Google a mít jej "
+"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/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:603
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:602
 msgid "translator-credits"
 msgstr ""
 "David Štancl <dstancl@dstancl.cz>\n"
@@ -1461,20 +1582,6 @@ msgstr ""
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Dočasný soubor potřebný pro zveřejnění není k dispozici"
 
-#: 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 ""
-"V průběhu práce s aplikací Shotwell jste již byli přihlášeni a odhlášeni od "
-"služby Google.\n"
-"\n"
-"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/shotwell-data-imports/FSpotImporter.vala:36
 #: plugins/shotwell-publishing/FacebookPublishing.vala:33
 #: plugins/shotwell-publishing/FlickrPublishing.vala:33
@@ -1588,7 +1695,7 @@ msgid "Go _Back"
 msgstr "Jít _zpět"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1464
+#: ui/shotwell.ui:1105
 msgid "_Log in"
 msgstr "_Přihlásit se"
 
@@ -1623,7 +1730,7 @@ msgid "pixels"
 msgstr "pixely"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:880
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1641,7 +1748,7 @@ msgstr "Šířka nebo výška"
 #: 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/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Odhlásit"
@@ -1653,9 +1760,9 @@ msgstr "_Odhlásit"
 #: 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/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 "_Zveřejnit"
 
@@ -1778,13 +1885,11 @@ msgstr "Přihlásit se"
 
 #: 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 "_Stávající 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 "_Nové album s názvem:"
 
@@ -1824,12 +1929,12 @@ msgid "You are logged into Rajce as %s."
 msgstr "Jste přihlášeni k Rajčeti jako %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 "Fotky se objeví:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
 msgid "Shotwell Extra Publishing Services"
 msgstr "Doplňkové zveřejňovací služby Shotwell"
 
@@ -1847,13 +1952,13 @@ 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/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:1206
+#: plugins/shotwell-publishing/FlickrPublishing.vala:877
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr "1024 × 768 pixelů"
@@ -1921,12 +2026,12 @@ msgid "Public"
 msgstr "Veřejné"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
 msgid "Friends"
 msgstr "Přátelé"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
 msgid "Private"
 msgstr "Soukromé"
 
@@ -1955,7 +2060,7 @@ msgid "Create a _new album named:"
 msgstr "Vytvořit _nové album s názvem:"
 
 #: 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 "Nahrávaná veliko_st:"
 
@@ -1965,7 +2070,7 @@ msgstr "Videa a nová fotoalba jsou viditelná:"
 
 #: 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"
@@ -1973,58 +2078,25 @@ msgstr ""
 "Před nahráním odstranit identifikační údaje, jako místo, model fotoaparátu "
 "apod."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "Připojení 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 ""
-"Momentálně nejste k Facebooku přihlášeni.\n"
-"\n"
-"Jestliže ještě nemáte vytvořen na Facebooku účet, můžete si jej vytvořit "
-"během přihlašování. Během přihlašování se může zobrazit žádost o povolení k "
-"nahrávání fotografií a jejich zveřejnění v kanále. Povolení je pro připojení "
-"aplikace Shotwell nutné."
-
-#: 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 ""
-"V průběhu práce s aplikací Shotwell jste již byli přihlášeni a odhlášeni od "
-"Facebooku.\n"
-"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/shotwell-publishing/FacebookPublishing.vala:87
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Standardní (720 pixelů)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Velké (2048 pixelů)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook…"
-msgstr "Testuje se připojení k Facebooku…"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
 msgid "Creating album…"
 msgstr "Vytváří se 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."
@@ -2032,7 +2104,7 @@ msgstr ""
 "Soubor potřebný pro zveřejnění není k dispozici. Zveřejnění na Facebook "
 "nemůže pokračovat."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:982
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -2041,77 +2113,22 @@ msgstr ""
 "Jste přihlášeni k Facebooku jako %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 "Kde chcete vybrané fotografie zveřejnit?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1187
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:858
 msgid "Just me"
 msgstr "mě výhradně"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1183
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:854
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "všem"
 
-#: 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 ""
-"Vložte ověřovací kód, který se vám zobrazí po přihlášení ke službě Flickr."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "Ověřovací _kód:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Pokračova_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 ""
-"Momentálně nejste ke službě Flickr přihlášeni.\n"
-"\n"
-"Pro přihlášení ke službě Flickr klikněte na Přihlásit se ve webovém "
-"prohlížeči. Pak musíte ve svém účtu Flickr povolit přístup pro Shotwell "
-"Connect."
-
-#: 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 ""
-"Již jste se přihlásili a odhlásili během tohoto sezení programu Shotwell.\n"
-"Abyste mohli fotky zveřejnit na Flickr, ukončete a znovu spusťte Shotwell a "
-"zkuste zveřejnění znovu."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login…"
-msgstr "Připravuje se přihlášení…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:434
-#: plugins/shotwell-publishing/FlickrPublishing.vala:571
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Soubor potřebný pro zveřejnění není k dispozici. Zveřejnění na Flickr nemůže "
-"pokračovat."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:447
-msgid "Verifying authorization…"
-msgstr "Ověřuje se autorizace…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2120,7 +2137,7 @@ msgstr ""
 "Jste přihlášeni ke službě Flickr jako %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
+#: plugins/shotwell-publishing/FlickrPublishing.vala:802
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -2129,66 +2146,57 @@ 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:1133
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Účet Flickr Pro umožňuje nahrávat neomezeně."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1138
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "Fotky _viditelné pro:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "Videa _viditelná pro:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr "Fotky a videa _viditelná pro:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "přátele a rodinu výhradně"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "rodinu výhradně"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "přátele výhradně"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 pixelů"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 pixelů"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:103
-msgid "L_ist album in public gallery"
-msgstr "_Uvést album ve veřejném seznamu"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:137
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
 msgid "Photo _size preset:"
 msgstr "Předvolená veliko_st fotek:"
 
-#: 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 ""
-"Nejste přihlášeni ke službě Picasa Web Albums.\n"
-"\n"
-"Pro přihlášení k webovým albům Picasa klikněte na Přihlásit se ve webovém "
-"prohlížeči. Pak musíte ve svém účtu Picasa Web Albums povolit přístup pro "
-"Shotwell Connect."
+#. 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 "Výchozí album"
 
-#: 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."
@@ -2197,32 +2205,32 @@ msgstr ""
 "pokračovat."
 
 #. 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 "Jste přihlášeni ke službě Picasa Web Albums jako %s."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Videa se objeví:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
 msgstr "malá (640 × 480 pixelů)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
 msgstr "střední (1024 × 768 pixelů)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr "doporučená (1600 × 1200 pixelů)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
 msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 pixelů)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
 #: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Původní velikost"
@@ -2360,7 +2368,7 @@ msgstr "Zobrazit certifikát…"
 msgid "I understand, please _proceed."
 msgstr "Rozumím, přesto prosím _pokračovat."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/shotwell-publishing.vala:55
 msgid "Core Publishing Services"
 msgstr "Základní zveřejňovací služby"
 
@@ -2368,21 +2376,7 @@ msgstr "Základní zveřejňovací služby"
 msgid "Video privacy _setting:"
 msgstr "Na_stavení soukromí videa:"
 
-#: 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 ""
-"Nejste přihlášeni ke službě YouTube.\n"
-"\n"
-"Aby bylo možné pokračovat, musíte být přihlášeni k účtu Google a mít jej "
-"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/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."
@@ -2390,21 +2384,16 @@ msgstr ""
 "Soubor potřebný pro zveřejnění není k dispozici. Zveřejnění na Youtube "
 "nemůže pokračovat."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Jste přihlášeni ke službě YouTube jako %s."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-msgid "Videos will appear in “%s”"
-msgstr "Videa se objeví v „%s“"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
 msgstr "Veřejné"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
 msgstr "Neveřejné"
 
@@ -2507,7 +2496,7 @@ msgstr "Připíchnout otevřenou nástrojovou lištu"
 msgid "Leave fullscreen"
 msgstr "Opustit režim celé obrazovky"
 
-#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570
+#: 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
@@ -2516,7 +2505,7 @@ msgstr "Opustit režim celé obrazovky"
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/AppWindow.vala:580
+#: src/AppWindow.vala:579
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2529,21 +2518,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:600
+#: src/AppWindow.vala:599
 msgid "Visit the Shotwell web site"
 msgstr "Navštívit web aplikace Shotwell"
 
-#: src/AppWindow.vala:612
+#: src/AppWindow.vala:611
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nelze zobrazit nápovědu: %s"
 
-#: src/AppWindow.vala:620
+#: src/AppWindow.vala:619
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nelze se připojit k databázi chyb: %s"
 
-#: src/AppWindow.vala:628
+#: src/AppWindow.vala:627
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nelze zobrazit časté dotazy a odpovědi: %s"
@@ -2614,7 +2603,7 @@ msgid "Cameras"
 msgstr "Fotoaparáty"
 
 #: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:303
+#: 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
 msgid "Camera"
@@ -2768,127 +2757,127 @@ msgstr[0] "Kvůli chybě nelze smazat fotografii/video z fotoaparátu."
 msgstr[1] "Kvůli chybě nelze smazat %d fotografie/videa z fotoaparátu."
 msgstr[2] "Kvůli chybě nelze smazat %d fotografií/videí z fotoaparátu."
 
-#: src/CollectionPage.vala: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:170
 msgid "_Print"
 msgstr "_Tisk"
 
-#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: 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
 msgid "Send _To…"
 msgstr "Odesla_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:220
 msgid "Set as _Desktop Background"
 msgstr "Nastavit jako poza_dí plochy"
 
-#: src/CollectionPage.vala:86 src/Resources.vala:286
+#: src/CollectionPage.vala:92 src/Resources.vala:286
 msgid "_Duplicate"
 msgstr "_Duplikovat"
 
-#: src/CollectionPage.vala:94
+#: src/CollectionPage.vala:100
 msgid "Fullscreen"
 msgstr "Celá obrazovka"
 
-#: src/CollectionPage.vala:96 ui/photo.ui:180
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "P_romítat"
 
-#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: src/CollectionPage.vala:110 src/Resources.vala:139 ui/direct.ui:111
 #: ui/photo.ui:200
 msgid "Rotate _Right"
 msgstr "Otočit dop_rava"
 
-#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: src/CollectionPage.vala:113 src/Resources.vala:144 ui/direct.ui:116
 #: ui/photo.ui:205
 msgid "Rotate _Left"
 msgstr "Otočit do_leva"
 
-#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: src/CollectionPage.vala:116 src/Resources.vala:149 ui/direct.ui:121
 #: ui/photo.ui:210
 msgid "Flip Hori_zontally"
 msgstr "Překlopit vo_dorovně"
 
-#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: src/CollectionPage.vala:117 src/Resources.vala:152 ui/direct.ui:125
 #: ui/photo.ui:214
 msgid "Flip Verti_cally"
 msgstr "Překlopit s_visle"
 
-#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
+#: 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
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Vylepšit"
 
-#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: 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
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Vrátit zpět na původní"
 
-#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+#: src/CollectionPage.vala:122 src/Resources.vala:190 ui/photo.ui:256
 msgid "_Copy Color Adjustments"
 msgstr "_Kopírovat úpravu barev"
 
-#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+#: src/CollectionPage.vala:125 src/Resources.vala:194 ui/photo.ui:261
 msgid "_Paste Color Adjustments"
 msgstr "Vložit ú_pravu barev"
 
-#: src/CollectionPage.vala:129
+#: src/CollectionPage.vala:135
 msgid "Adjust Date and Time…"
 msgstr "Nastavit datum a čas…"
 
-#: src/CollectionPage.vala:137 src/Resources.vala:319
+#: src/CollectionPage.vala:143 src/Resources.vala:319
 msgid "Open With E_xternal Editor"
 msgstr "Otevřít v e_xterním editoru"
 
-#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: 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
 msgid "Open With RA_W Editor"
 msgstr "Otevřít v editoru RA_W"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:167
+#: src/CollectionPage.vala:149 src/Resources.vala:167
 msgid "_Play"
 msgstr "_Přehrát"
 
-#: src/CollectionPage.vala:409
+#: src/CollectionPage.vala:415
 msgid "Export Photo/Video"
 msgstr "Export fotografie/videa"
 
-#: src/CollectionPage.vala:409
+#: src/CollectionPage.vala:415
 msgid "Export Photos/Videos"
 msgstr "Export fotografií/videí"
 
-#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994
+#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
 msgstr "Export fotografie"
 
-#: src/CollectionPage.vala:411 src/Dialogs.vala:84
+#: src/CollectionPage.vala:417 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Export fotografií"
 
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Rotating"
 msgstr "Otáčí se"
 
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Undoing Rotate"
 msgstr "Vrací se zpět otočení"
 
-#: src/CollectionPage.vala:523
+#: src/CollectionPage.vala:529
 msgid "Flipping Horizontally"
 msgstr "Překlápí se vodorovně"
 
-#: src/CollectionPage.vala:524
+#: src/CollectionPage.vala:530
 msgid "Undoing Flip Horizontally"
 msgstr "Vrací se zpět vodorovné překlopení"
 
-#: src/CollectionPage.vala:533
+#: src/CollectionPage.vala:539
 msgid "Flipping Vertically"
 msgstr "Překlápí se svisle"
 
-#: src/CollectionPage.vala:534
+#: src/CollectionPage.vala:540
 msgid "Undoing Flip Vertically"
 msgstr "Vrací se zpět svislé překlopení"
 
@@ -4016,11 +4005,11 @@ msgstr "_Importovat bez kopírování"
 msgid "Import to Library"
 msgstr "Import do knihovny"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Odstranění z knihovny"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Odstraňuje se fotografie z knihovny"
 
@@ -4163,29 +4152,29 @@ msgstr "%s nepodporuje formát %s."
 msgid "Unable open photo %s. Sorry."
 msgstr "Nelze otevřít fotografii %s."
 
-#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:175 ui/direct.ui:8
 msgid "_Save"
 msgstr "_Uložit"
 
-#: src/direct/DirectPhotoPage.vala:304
+#: src/direct/DirectPhotoPage.vala:316
 msgid "_Save a Copy"
 msgstr "Uložit _kopii"
 
-#: src/direct/DirectPhotoPage.vala:307
+#: src/direct/DirectPhotoPage.vala:319
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Zahodit změny v %s?"
 
-#: src/direct/DirectPhotoPage.vala:308
+#: src/direct/DirectPhotoPage.vala:320
 msgid "Close _without Saving"
 msgstr "Zavřít _bez uložení"
 
-#: src/direct/DirectPhotoPage.vala:341
+#: src/direct/DirectPhotoPage.vala:353
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Chyba při ukládání %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 "Uložení jako"
 
@@ -4234,23 +4223,23 @@ msgstr "SD video (4:3)"
 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:762 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:821
+#: src/editing_tools/EditingTools.vala:763 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:824
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 palců"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 palců"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 palců"
 
@@ -4258,7 +4247,7 @@ msgstr "8 × 10 palců"
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8,5 x 11 palců)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 palců"
 
@@ -4266,23 +4255,23 @@ msgstr "11 × 14 palců"
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 × 17 palců)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 palců"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:772 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:845
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Pohlednice (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:774 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:775 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
@@ -4290,15 +4279,15 @@ msgstr "18 × 24 cm"
 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:777 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:778 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:779 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
@@ -4649,32 +4638,32 @@ msgstr "Neznámá chyba při přístupu k databázi Shotwell: %s"
 msgid "Loading Shotwell"
 msgstr "Načítá se Shotwell"
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "Path to Shotwell’s private data"
 msgstr "Cesta k soukromým datům aplikace Shotwell"
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "DIRECTORY"
 msgstr "SLOŽKA"
 
-#: src/main.vala:298
+#: src/main.vala:297
 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:302
+#: src/main.vala:301
 msgid "Don’t display startup progress meter"
 msgstr "Při spuštění nezobrazovat ukazatel průběhu"
 
-#: src/main.vala:306
+#: src/main.vala:305
 msgid "Show the application’s version"
 msgstr "Zobrazit verzi aplikace"
 
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
+#: src/main.vala:342
 msgid "[FILE]"
 msgstr "[SOUBOR]"
 
-#: 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 ""
@@ -4698,35 +4687,35 @@ msgstr ""
 "Nelze přehrát vybrané video:\n"
 "%s"
 
-#: src/Page.vala:1312
+#: src/Page.vala:1318
 msgid "No photos/videos"
 msgstr "Žádné fotografie/videa"
 
-#: src/Page.vala:1316
+#: src/Page.vala:1322
 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:2622
+#: src/Page.vala:2628
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotografie nelze exportovat do této složky."
 
 #. previous button
-#: src/PhotoPage.vala:535
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Předchozí fotografie"
 
 #. next button
-#: src/PhotoPage.vala:541
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Následující fotografie"
 
-#: src/PhotoPage.vala:1847
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Chybí zdrojový soubor s fotografií: %s"
 
-#: src/PhotoPage.vala:3014
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nelze exportovat %s: %s"
@@ -4771,7 +4760,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3755
 msgid "modified"
 msgstr "změněno"
 
@@ -4803,23 +4792,15 @@ msgstr "16 obrázků na stránku"
 msgid "32 images per page"
 msgstr "32 obrázků na stránku"
 
-#: src/Printing.vala:348
-msgid "in."
-msgstr "palců"
-
-#: src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: src/Printing.vala:876
+#: src/Printing.vala:851
 msgid "Image Settings"
 msgstr "Nastavení obrázku"
 
-#: src/Printing.vala:889
+#: src/Printing.vala:864
 msgid "Printing…"
 msgstr "Tiskne se…"
 
-#: src/Printing.vala:909 src/Printing.vala:1112
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -5085,7 +5066,7 @@ msgstr "_Použít"
 
 #: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
 #: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
-#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
+#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
 msgid "_Edit"
 msgstr "_Upravit"
 
@@ -5103,7 +5084,7 @@ msgstr "_Celá obrazovka"
 #: 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
+#: ui/tags.ui:423 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Nápověda"
 
@@ -5466,7 +5447,8 @@ msgstr "Duplikovat"
 msgid "Make a duplicate of the photo"
 msgstr "Vytvořit kopii této fotografie"
 
-#: src/Resources.vala:290
+#: src/Resources.vala:290 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
 msgid "_Export…"
 msgstr "_Export…"
 
@@ -5784,14 +5766,14 @@ msgstr "Vybrat všechny položky"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:739
+#: src/Resources.vala:738
 msgid "%a %b %d, %Y"
 msgstr "%a, %e. %B %Y"
 
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:744
+#: src/Resources.vala:743
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a, %e."
@@ -5799,7 +5781,7 @@ msgstr "%a, %e."
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:749
+#: src/Resources.vala:748
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%e. %B %Y"
@@ -5807,7 +5789,7 @@ msgstr "%e. %B %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:754
+#: src/Resources.vala:753
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a, %e. %B"
@@ -5815,7 +5797,7 @@ msgstr "%a, %e. %B"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:759
+#: src/Resources.vala:758
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %e. %B %Y"
@@ -6133,7 +6115,7 @@ msgid "untitled"
 msgstr "bez názvu"
 
 #. multiple videos
-#: src/VideoSupport.vala:507
+#: src/VideoSupport.vala:523
 msgid "Export Videos"
 msgstr "Export videí"
 
@@ -6158,17 +6140,17 @@ msgstr "Zobrazit u_dálosti pro fotku"
 
 #: 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 "_Soubor"
 
-#: 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 "Uložit j_ako"
 
 #: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99
 #: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78
-#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87
+#: ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87
 msgid "_View"
 msgstr "_Zobrazit"
 
@@ -6184,7 +6166,7 @@ msgstr "Přiblížení _100%"
 msgid "Zoom _200%"
 msgstr "Přiblížení _200%"
 
-#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+#: ui/direct.ui:98 ui/photo.ui:187
 msgid "_Photo"
 msgstr "_Fotografie"
 
@@ -6289,7 +6271,6 @@ msgid "D_escending"
 msgstr "_Sestupně"
 
 #: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
-#: ui/top.ui:30
 msgid "Even_ts"
 msgstr "Událos_ti"
 
@@ -6303,7 +6284,7 @@ msgid "_Titles"
 msgstr "_Názvy"
 
 #: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385
-#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35
+#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385
 msgid "Ta_gs"
 msgstr "Štít_ky"
 
@@ -6332,7 +6313,7 @@ msgstr "Podle _hodnocení"
 msgid "_Descending"
 msgstr "_Sestupně"
 
-#: 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 "_Fotografie"
 
@@ -6340,6 +6321,56 @@ 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"
@@ -6448,79 +6479,39 @@ msgstr "Externí editory"
 msgid "Plugins"
 msgstr "Zásuvné moduly"
 
-#: ui/shotwell.ui:583
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Velikost tištěného obrázku</b>"
-
-#: ui/shotwell.ui:600
-msgid "Use a _standard size:"
-msgstr "Použít _standardní velikost:"
-
-#: ui/shotwell.ui:643
-msgid "Use a c_ustom size:"
-msgstr "Použít _vlastní velikost:"
-
-#: ui/shotwell.ui:731
-msgid "_Match photo aspect ratio"
-msgstr "Zachovat po_měr stran"
-
-#: ui/shotwell.ui:755
-msgid "_Autosize:"
-msgstr "_Automatická velikost:"
-
-#: ui/shotwell.ui:795
-msgid "<b>Titles</b>"
-msgstr "<b>Názvy</b>"
-
-#: ui/shotwell.ui:812
-msgid "Print image _title"
-msgstr "Tisknout _název obrázku"
-
-#: ui/shotwell.ui:855
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Rozlišení</b>"
-
-#: ui/shotwell.ui:875
-msgid "_Output photo at:"
-msgstr "Vytiskn_out v rozlišení:"
-
-#: ui/shotwell.ui:909
-msgid "pixels per inch"
-msgstr "bodů na palec"
-
-#: ui/shotwell.ui:949
+#: ui/shotwell.ui:590
 msgid "_Name of search:"
 msgstr "_Název hledání:"
 
-#: ui/shotwell.ui:1003
+#: ui/shotwell.ui:644
 msgid "_Match"
 msgstr "_Shoduje se"
 
-#: ui/shotwell.ui:1030
+#: ui/shotwell.ui:671
 msgid "of the following:"
 msgstr "z následujícího:"
 
-#: ui/shotwell.ui:1111
+#: ui/shotwell.ui:752
 msgid "label"
 msgstr "štítek"
 
-#: ui/shotwell.ui:1262
+#: ui/shotwell.ui:903
 msgid "_Delay:"
 msgstr "_Doba zobrazení:"
 
-#: ui/shotwell.ui:1276
+#: ui/shotwell.ui:917
 msgid "_Transition effect:"
 msgstr "Efek_t přechodu:"
 
-#: ui/shotwell.ui:1290
+#: ui/shotwell.ui:931
 msgid "Transition d_elay:"
 msgstr "Trvání př_echodu:"
 
-#: ui/shotwell.ui:1300
+#: ui/shotwell.ui:941
 msgid "Show t_itle"
 msgstr "Zobrazovat n_ázev"
 
-#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
 msgid "seconds"
 msgstr "sekund"
 
@@ -6531,3 +6522,4 @@ msgstr "Nový š_títek…"
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Vymazat všechny fotografie v koši"
+
diff --git a/po/da.gmo b/po/da.gmo
index 715d49c..0018ac4 100644
--- a/po/da.gmo
+++ b/po/da.gmo
diff --git a/po/da.po b/po/da.po
index 2c64e0c..08bb41b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -22,8 +22,8 @@ msgstr ""
 "Project-Id-Version: shotwell-0.15.1\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2017-01-10 17:57+0000\n"
-"PO-Revision-Date: 2017-01-14 12:51+0100\n"
+"POT-Creation-Date: 2017-02-06 12:17+0000\n"
+"PO-Revision-Date: 2017-02-11 15:40+0100\n"
 "Last-Translator: Alan Mortensen <alanmortensen.am@gmail.com>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/shotwell/language/"
 "da/)\n"
@@ -76,6 +76,10 @@ msgstr ""
 msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
 msgstr "Shotwell understøtter JPEG, PNG, TIFF og en række RAW-filformater."
 
+#: misc/shotwell.appdata.xml.in:52
+msgid "The Shotwell developers"
+msgstr "Udviklerne af Shotwell"
+
 #: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Billedhåndtering"
diff --git a/po/de.gmo b/po/de.gmo
index 736aa1b..b07caff 100644
--- a/po/de.gmo
+++ b/po/de.gmo
diff --git a/po/de.po b/po/de.po
index ae56e72..c80f58f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -34,17 +34,17 @@
 # Typhon <raubkatze91@web.de>, 2012.
 # Thomas Zach <sabaot.f@gmail.com>, 2012.
 # Wolfgang Stöggl <c72578@yahoo.de>, 2014.
-# Mario Blättermann <mario.blaettermann@gmail.com>, 2016.
+# Mario Blättermann <mario.blaettermann@gmail.com>, 2016-2017.
 # Bernd Homuth <dev@hmt.im>, 2016.
 # Benedikt M. Thoma <gnome@thomba.net>, 2016.
 # Paul Seyfert <pseyfert@mathphys.fsk.uni-heidelberg.de>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=shotwell"
-"&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-11-20 22:54+0000\n"
-"PO-Revision-Date: 2016-11-22 12:15+0100\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-15 21:35+0000\n"
+"PO-Revision-Date: 2017-03-16 11:19+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "Language: de\n"
@@ -52,11 +52,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 2.0\n"
+"X-Generator: Poedit 1.8.12\n"
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354
+#: 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
 msgid "Shotwell"
@@ -98,6 +98,10 @@ msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
 msgstr ""
 "Shotwell unterstützt JPEG, PNG, TIFF und eine Reihe von RAW-Dateiformaten."
 
+#: misc/shotwell.appdata.xml.in:52
+msgid "The Shotwell developers"
+msgstr "Die Shotwell-Entwickler"
+
 #: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Fotoverwaltung"
@@ -1343,7 +1347,6 @@ msgid ""
 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:798
 msgid "enable slideshow slide transition"
 msgstr "Gleiten-Übergang für Diaschauen aktivieren"
 
@@ -1363,7 +1366,6 @@ msgid ""
 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:792
 msgid "enable slideshow circle transition"
 msgstr "Kreis-Übergang für Diaschauen aktivieren"
 
@@ -1373,12 +1375,20 @@ msgid ""
 msgstr ""
 "Legt fest, ob der Kreis-Übergang für Diaschauen aktiviert ist oder nicht"
 
+#: misc/org.yorba.shotwell.gschema.xml:792
+msgid "enable slideshow circles transition"
+msgstr "Kreis-Übergang für Diaschauen aktivieren"
+
 #: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Legt fest, ob der Kreis-Übergang für Diaschauen aktiviert ist oder nicht"
 
+#: misc/org.yorba.shotwell.gschema.xml:798
+msgid "enable slideshow blinds transition"
+msgstr "Vorhang-Übergang für Diaschauen aktivieren"
+
 #: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
@@ -1417,6 +1427,123 @@ msgstr ""
 "Legt fest, ob der Schachbrettmuster-Übergang für Diaschauen aktiviert ist "
 "oder nicht"
 
+#: 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 ""
+"Sie sind zur Zeit nicht bei Facebook angemeldet.\n"
+"\n"
+"Falls Sie noch kein Facebook-Konto haben, können Sie während des "
+"Anmeldevorgangs eines erstellen. Während der Anmeldung wird Shotwell "
+"möglicherweise nach Berechtigungen zum Hochladen von Fotos und zum Freigeben "
+"der Fotos in Ihrem Feed fragen. Diese Berechtigungen sind notwendig, damit "
+"die Kopplung von Shotwell und Facebook funktionieren kann."
+
+#: 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 ""
+"Sie haben sich in dieser Shotwell-Sitzung bereits bei Facebook an- und "
+"wieder abgemeldet.\n"
+"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
+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 ""
+"Sie sind zurzeit nicht bei Flickr angemeldet.\n"
+"\n"
+"Klicken Sie auf »Anmelden«, um sich über Ihren Webbrowser bei Flickr "
+"anzumelden. Sie müssen »Shotwell Connect« autorisieren, um sich mit Flickr "
+"zu verbinden."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+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:481
+msgid "Verifying authorization…"
+msgstr "Legitimierung wird bestätigt …"
+
+#: 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 ""
+"Sie haben sich während dieser Shotwell-Sitzung bereits bei einem Google-"
+"Dienst an- und abgemeldet.\n"
+"\n"
+"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
+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 ""
+"Sie sind zur Zeit nicht bei Picasa Webalben angemeldet.\n"
+"\n"
+"Klicken Sie auf »Anmelden«, um sich in Ihrem Webbrowser bei Picasa Webalben "
+"anzumelden. Sie müssen Shotwell Connect gestatten, sich mit Ihrem Konto bei "
+"Picasa Webalben zu verbinden."
+
+#: 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 ""
+"Sie sind gerade nicht bei YouTube angemeldet.\n"
+"\n"
+"Sie müssen bereits ein Google-Konto besitzen und es für YouTube eingerichtet "
+"haben, um fortzufahren. Sie können die meisten Konten anlegen, indem Sie "
+"sich mindestens einmal auf der YouTube-Seite anmelden."
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Die Shotwell-Webseite besuchen"
@@ -1497,20 +1624,6 @@ msgstr ""
 "Eine temporäre Datei, die für das Veröffentlichen benötigt wird, ist nicht "
 "verfügbar"
 
-#: 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 ""
-"Sie haben sich während dieser Shotwell-Sitzung bereits bei einem Google-"
-"Dienst an- und abgemeldet.\n"
-"\n"
-"Um weitere Veröffentlichungen durchführen zu können, müssen Sie Shotwell "
-"schließen und erneut starten. Versuchen Sie es danach erneut."
-
 # Ich würde lieber bei »Copyright« bleiben.
 #: plugins/shotwell-data-imports/FSpotImporter.vala:36
 #: plugins/shotwell-publishing/FacebookPublishing.vala:33
@@ -1608,96 +1721,94 @@ msgstr "Import wird vorbereitet"
 msgid "Core Data Import Services"
 msgstr "Kerndaten-Importdienst"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "_Zurück gehen"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1464
-msgid "_Log in"
-msgstr "_Anmelden"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "_Gallery3-Adresse:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
 msgid "_User name:"
 msgstr "Ben_utzername:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "_Zurück gehen"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1105
+msgid "_Log in"
+msgstr "_Anmelden"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "API-_Schlüssel:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 msgstr "oder"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:142
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
-msgstr "A_bmelden"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:156
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-#: src/CollectionPage.vala:76 src/PhotoPage.vala:2456
-msgid "_Publish"
-msgstr "_Veröffentlichen"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "Ein _vorhandenes Album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
 msgid "A _new album"
 msgstr "Ein _neues Album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "Ein _vorhandenes Album"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 "Ort, Kamera und andere identifizierende Informationen vor dem Hochladen "
 "_entfernen"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr "Skalierungsbeschränkung:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr "Pixel"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:880
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Ursprüngliche Größe"
 
-#: 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 "Breite oder Höhe"
 
+#: 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 "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/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
+msgid "_Publish"
+msgstr "_Veröffentlichen"
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Gallery3-Veröffentlichungsmodul"
@@ -1793,49 +1904,47 @@ msgstr "Unbekannter Benutzer"
 msgid " Site Not Found"
 msgstr " Seite nicht gefunden"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr "_E-Mail-Adresse"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr "_Passwort"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:97
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "Dauerhaft _merken"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:118
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:101
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
 msgid "Log in"
 msgstr "Anmelden in"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
 msgid "An _existing album:"
 msgstr "_einem vorhandenem Album:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
 msgid "A _new album named:"
 msgstr "einem _neuen Album:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
 msgid "_Hide album"
 msgstr "Album _verbergen"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "Ziel-_Album im Browser öffnen"
@@ -1868,20 +1977,20 @@ msgid "You are logged into Rajce as %s."
 msgstr "Sie sind bei Rajce als %s angemeldet."
 
 #: 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 "Fotos werden erscheinen in:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
 msgid "Shotwell Extra Publishing Services"
 msgstr "Zusätzliche Shotwell-Veröffentlichungsdienste"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr "Blogs:"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
 msgid "Photo _size:"
 msgstr "Bild_größe:"
@@ -1891,13 +2000,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: plugins/shotwell-publishing/FlickrPublishing.vala: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:1232
+#: plugins/shotwell-publishing/FlickrPublishing.vala:877
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr "1024 × 768 Pixel"
@@ -1970,51 +2079,51 @@ msgid "Public"
 msgstr "Öffentlich"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
 msgid "Friends"
 msgstr "Freunde"
 
 #: 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"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:44
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Alben (oder neues erstellen):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:59
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "Zugriffs_typ:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:103
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "_Kommentare deaktivieren"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:120
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "Herunterladen des Originalfotos _verbieten"
 
-#: 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 "In einem e_xistierenden Album veröffentlichen:"
 
-#: 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 "Ein _neues Album mit folgendem Namen erstellen:"
 
-#: 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 "_Größe zum Hochladen:"
 
-#: 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 "Fotos und Videos _sichtbar für:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:155
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
@@ -2022,59 +2131,25 @@ msgstr ""
 "Ort, Kame_ra, und andere identifizierende Informationen vor dem Hochladen "
 "entfernen"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
+#: 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 ""
-"Sie sind zur Zeit nicht bei Facebook angemeldet.\n"
-"\n"
-"Falls Sie noch kein Facebook-Konto haben, können Sie während des "
-"Anmeldevorgangs eines erstellen. Während der Anmeldung wird Shotwell "
-"möglicherweise nach Berechtigungen zum Hochladen von Fotos und zum Freigeben "
-"der Fotos in Ihrem Feed fragen. Diese Berechtigungen sind notwendig, damit "
-"die Kopplung von Shotwell und Facebook funktionieren kann."
-
-#: 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 ""
-"Sie haben sich in dieser Shotwell-Sitzung bereits bei Facebook an- und "
-"wieder abgemeldet.\n"
-"Um weiterhin auf Facebook zu veröffentlichen, beenden Sie Shotwell, starten "
-"es neu und versuchen es dann erneut."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:87
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Standard (720 Pixel)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Groß (2048 Pixel)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook…"
-msgstr "Verbindung zu Facebook wird geprüft …"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
 msgid "Creating album…"
 msgstr "Album wird erstellt …"
 
-#: 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."
@@ -2082,7 +2157,7 @@ msgstr ""
 "Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
 "Veröffentlichung auf Facebook ist nicht möglich."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:982
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -2091,79 +2166,22 @@ msgstr ""
 "Sie sind bei Facebook als %s angemeldet.\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 "Wo möchten Sie die ausgewählten Fotos veröffentlichen?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:858
 msgid "Just me"
 msgstr "Nur mich"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:854
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Alle"
 
-#: 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 ""
-"Geben Sie zur Bestätigung die Zahl ein, die nach der Anmeldung bei Flickr in "
-"Ihrem Webbrowser angezeigt wird."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "Autorisierungsnummer:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "For_tsetzen"
-
-#: 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 ""
-"Sie sind zurzeit nicht bei Flickr angemeldet.\n"
-"\n"
-"Klicken Sie auf »Anmelden«, um sich über Ihren Webbrowser bei Flickr "
-"anzumelden. Sie müssen »Shotwell Connect« autorisieren, um sich mit Flickr "
-"zu verbinden."
-
-#: 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 ""
-"Sie haben sich in dieser Shotwell-Sitzung bereits bei Flickr an- und "
-"abgemeldet.\n"
-"Um weiterhin auf Flickr zu veröffentlichen zu können, beenden Sie Shotwell, "
-"starten Sie es nochmals und versuchen es dann erneut."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login…"
-msgstr "Anmeldung wird vorbereitet …"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:594
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
-"Veröffentlichung auf Flickr ist nicht möglich."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization…"
-msgstr "Legitimierung wird bestätigt …"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2172,83 +2190,67 @@ msgstr ""
 "Sie sind bei Flickr als %s angemeldet.\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 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] ""
-"Ihr kostenloses Flickr-Konto ist auf ein monatliches Upload-Volumen "
-"limitiert.\n"
-"Diesen Monat können Sie noch %d Megabyte hochladen."
-msgstr[1] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Ihr kostenloses Flickr-Konto ist auf ein monatliches Upload-Volumen "
 "limitiert.\n"
-"Diesen Monat können Sie noch %d Megabyte hochladen."
+"Diesen Monat können Sie noch %s hochladen."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Ihr Flickr-Pro-Konto erlaubt unbeschränkte Uploads."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "Fotos _sichtbar für:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "Videos _sichtbar für:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr "Fotos und Videos _sichtbar für:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "Nur Freunde und Familie"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "Nur Familie"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "Nur Freunde"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 Pixel"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 Pixel"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
-msgid "L_ist album in public gallery"
-msgstr "A_lbum in öffentlicher Galerie aufführen"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
 msgid "Photo _size preset:"
 msgstr "Voreingestellte Foto_größe:"
 
-#: 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 ""
-"Sie sind zur Zeit nicht bei Picasa Webalben angemeldet.\n"
-"\n"
-"Klicken Sie auf »Anmelden«, um sich in Ihrem Webbrowser bei Picasa Webalben "
-"anzumelden. Sie müssen Shotwell Connect gestatten, sich mit Ihrem Konto bei "
-"Picasa Webalben zu verbinden."
+#. 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 "Voreingestelltes Album"
 
-#: 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."
@@ -2257,33 +2259,33 @@ msgstr ""
 "Veröffentlichung auf Picasa ist nicht möglich."
 
 #. 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 "Sie sind bei Picasa Webalben als %s angemeldet."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Videos werden folgendermaßen dargestellt:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
 msgstr "Klein (640 × 480 Pixel)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
 msgstr "Mittel (1024 × 768 Pixel)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr "Empfohlen (1600 × 1200 Pixel)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
 msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 Pixel)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:752
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Ursprungsgröße"
 
@@ -2424,7 +2426,7 @@ msgstr "Zertifikat anzeigen …"
 msgid "I understand, please _proceed."
 msgstr "Verstanden, bitte _fortfahren."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/shotwell-publishing.vala:55
 msgid "Core Publishing Services"
 msgstr "Standard-Veröffentlichungsdienste"
 
@@ -2432,21 +2434,7 @@ msgstr "Standard-Veröffentlichungsdienste"
 msgid "Video privacy _setting:"
 msgstr "Privatsphärenein_stellungen für Videos:"
 
-#: 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 ""
-"Sie sind gerade nicht bei YouTube angemeldet.\n"
-"\n"
-"Sie müssen bereits ein Google-Konto besitzen und es für YouTube eingerichtet "
-"haben, um fortzufahren. Sie können die meisten Konten anlegen, indem Sie "
-"sich mindestens einmal auf der YouTube-Seite anmelden."
-
-#: 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."
@@ -2454,21 +2442,16 @@ msgstr ""
 "Eine Datei, die veröffentlicht werden soll, ist nicht verfügbar. Die "
 "Veröffentlichung auf Youtube ist nicht möglich."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Sie sind bei YouTube als %s angemeldet."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-msgid "Videos will appear in “%s”"
-msgstr "Videos werden in »%s« erscheinen"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
 msgstr "Öffentlich aufgeführt"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
 msgstr "Nicht öffentlich aufgeführt"
 
@@ -2575,7 +2558,7 @@ 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:1430 src/Dialogs.vala:1453
+#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
 #: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
 #: src/Resources.vala:157
 msgid "_Cancel"
@@ -2678,8 +2661,8 @@ msgstr "Import fehlgeschlagen (%d)"
 msgid "Cameras"
 msgstr "Kameras"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/photos/RawSupport.vala:303
+#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
+#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala: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
 msgid "Camera"
@@ -2689,7 +2672,7 @@ msgstr "Kamera"
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: src/camera/ImportPage.vala:458
+#: src/camera/ImportPage.vala:466
 msgid ""
 "Unable to unmount camera. Try unmounting the camera from the file manager."
 msgstr ""
@@ -2697,26 +2680,34 @@ msgstr ""
 "die Dateiverwaltung."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:775
+#: src/camera/ImportPage.vala:783
 msgid "Hide photos already imported"
 msgstr "Bereits importierte Fotos verbergen"
 
-#: src/camera/ImportPage.vala:776
+#: src/camera/ImportPage.vala:784
 msgid "Only display photos that have not been imported"
 msgstr "Nur Fotos zeigen, die noch nicht importiert wurden"
 
-#: src/camera/ImportPage.vala:842
+#: src/camera/ImportPage.vala:823 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
+msgid "Import _All"
+msgstr "_Alle importieren"
+
+#: src/camera/ImportPage.vala:857
 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."
 
-#: src/camera/ImportPage.vala:846
+#: src/camera/ImportPage.vala:861
 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:999
+#: src/camera/ImportPage.vala:1021
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2724,15 +2715,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:1005
+#: src/camera/ImportPage.vala:1027
 msgid "_Unmount"
 msgstr "_Aushängen"
 
-#: src/camera/ImportPage.vala:1010
+#: src/camera/ImportPage.vala:1032
 msgid "Please unmount the camera."
 msgstr "Bitte hängen Sie die Kamera aus."
 
-#: src/camera/ImportPage.vala:1015
+#: src/camera/ImportPage.vala:1037
 msgid ""
 "The camera is locked by another application. Shotwell can only access the "
 "camera when it’s unlocked. Please close any other application using the "
@@ -2742,12 +2733,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:1025
+#: src/camera/ImportPage.vala:1047
 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:1030
+#: src/camera/ImportPage.vala:1052
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2756,65 +2747,65 @@ msgstr ""
 "Es können keine Vorschaubilder von der Kamera abgerufen werden:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1069
 msgid "Unmounting…"
 msgstr "Aushängen läuft …"
 
-#: src/camera/ImportPage.vala:1138
+#: src/camera/ImportPage.vala:1160
 msgid "Starting import, please wait…"
 msgstr "Import wird gestartet, bitte warten …"
 
-#: src/camera/ImportPage.vala:1155
+#: src/camera/ImportPage.vala:1177
 msgid "Fetching photo information"
 msgstr "Foto-Informationen werden abgerufen"
 
-#: src/camera/ImportPage.vala:1513
+#: src/camera/ImportPage.vala:1535
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Vorschaubild für %s wird abgerufen"
 
-#: src/camera/ImportPage.vala:1629
+#: src/camera/ImportPage.vala:1651
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Kamera kann nicht reserviert werden: %s"
 
-#: src/camera/ImportPage.vala:1714
+#: src/camera/ImportPage.vala:1736
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "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:1717
+#: src/camera/ImportPage.vala:1739
 #, 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:1720
+#: src/camera/ImportPage.vala:1742
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "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:1723
+#: src/camera/ImportPage.vala:1745
 #, 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:1731 src/Dialogs.vala:1397
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Behalten"
 
-#: src/camera/ImportPage.vala:1750
+#: src/camera/ImportPage.vala:1772
 msgid "Removing photos/videos from camera"
 msgstr "Fotos/Videos werden von der Kamera entfernt"
 
-#: src/camera/ImportPage.vala:1754
+#: src/camera/ImportPage.vala:1776
 #, c-format
 msgid "Unable to delete %d photo/video from the camera due to errors."
 msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
@@ -2823,127 +2814,127 @@ msgstr[0] ""
 msgstr[1] ""
 "%d Fotos/Videos können wegen Fehlern nicht von der Kamera gelöscht werden."
 
-#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:78
-#: src/PhotoPage.vala:2451 src/Resources.vala:170
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:170
 msgid "_Print"
 msgstr "_Drucken"
 
-#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: 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
 msgid "Send _To…"
 msgstr "Senden _an …"
 
-#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:83
-#: src/PhotoPage.vala:2461 src/Resources.vala:220
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:220
 msgid "Set as _Desktop Background"
 msgstr "Als Hintergrund_bild festlegen"
 
-#: src/CollectionPage.vala:86 src/Resources.vala:286
+#: src/CollectionPage.vala:92 src/Resources.vala:286
 msgid "_Duplicate"
 msgstr "_Duplizieren"
 
-#: src/CollectionPage.vala:94
+#: src/CollectionPage.vala:100
 msgid "Fullscreen"
 msgstr "Vollbild"
 
-#: src/CollectionPage.vala:96 ui/photo.ui:180
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "_Diaschau"
 
-#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: src/CollectionPage.vala:110 src/Resources.vala:139 ui/direct.ui:111
 #: ui/photo.ui:200
 msgid "Rotate _Right"
 msgstr "Nach _rechts drehen"
 
-#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: src/CollectionPage.vala:113 src/Resources.vala:144 ui/direct.ui:116
 #: ui/photo.ui:205
 msgid "Rotate _Left"
 msgstr "Nach _links drehen"
 
-#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: src/CollectionPage.vala:116 src/Resources.vala:149 ui/direct.ui:121
 #: ui/photo.ui:210
 msgid "Flip Hori_zontally"
 msgstr "Hori_zontal spiegeln"
 
-#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: src/CollectionPage.vala:117 src/Resources.vala:152 ui/direct.ui:125
 #: ui/photo.ui:214
 msgid "Flip Verti_cally"
 msgstr "Verti_kal spiegeln"
 
-#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
+#: 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
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Verbessern"
 
-#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: 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
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Zurück zum Original"
 
-#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+#: src/CollectionPage.vala:122 src/Resources.vala:190 ui/photo.ui:256
 msgid "_Copy Color Adjustments"
 msgstr "Farbanpassungen _kopieren"
 
-#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+#: src/CollectionPage.vala:125 src/Resources.vala:194 ui/photo.ui:261
 msgid "_Paste Color Adjustments"
 msgstr "Farbanpassungen _einfügen"
 
-#: src/CollectionPage.vala:129
+#: src/CollectionPage.vala:135
 msgid "Adjust Date and Time…"
 msgstr "Datum und Zeit anpassen …"
 
-#: src/CollectionPage.vala:137 src/Resources.vala:319
+#: src/CollectionPage.vala:143 src/Resources.vala:319
 msgid "Open With E_xternal Editor"
 msgstr "Mit e_xternem Editor öffnen"
 
-#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: 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
 msgid "Open With RA_W Editor"
 msgstr "Mit RA_W-Editor öffnen"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:167
+#: src/CollectionPage.vala:149 src/Resources.vala:167
 msgid "_Play"
 msgstr "_Wiedergabe"
 
-#: src/CollectionPage.vala:404
+#: src/CollectionPage.vala:415
 msgid "Export Photo/Video"
 msgstr "Foto/Video exportieren"
 
-#: src/CollectionPage.vala:404
+#: src/CollectionPage.vala:415
 msgid "Export Photos/Videos"
 msgstr "Fotos/Videos exportieren"
 
-#: src/CollectionPage.vala:406 src/Dialogs.vala:59 src/PhotoPage.vala:2988
+#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
 msgstr "Foto exportieren"
 
-#: src/CollectionPage.vala:406 src/Dialogs.vala:84
+#: src/CollectionPage.vala:417 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Fotos exportieren"
 
-#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Rotating"
 msgstr "Drehen läuft"
 
-#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Undoing Rotate"
 msgstr "Drehen wird zurück genommen"
 
-#: src/CollectionPage.vala:518
+#: src/CollectionPage.vala:529
 msgid "Flipping Horizontally"
 msgstr "Horizontal spiegeln"
 
-#: src/CollectionPage.vala:519
+#: src/CollectionPage.vala:530
 msgid "Undoing Flip Horizontally"
 msgstr "»Horizontal spiegeln« wird zurück genommen"
 
-#: src/CollectionPage.vala:528
+#: src/CollectionPage.vala:539
 msgid "Flipping Vertically"
 msgstr "Vertikal spiegeln"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:540
 msgid "Undoing Flip Vertically"
 msgstr "»Vertikal spiegeln« wird zurück genommen"
 
@@ -3159,7 +3150,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Datenbank"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:766
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
 msgid "_Import"
 msgstr "_Import"
 
@@ -3241,10 +3232,10 @@ 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:1398
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
 #: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
-#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/trash.ui:63 ui/trash.ui:216
-#: ui/trash.ui:258
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Löschen"
 
@@ -3726,81 +3717,81 @@ msgstr "Es wurden keine Fotos oder Videos importiert.\n"
 msgid "Import Complete"
 msgstr "Import abgeschlossen"
 
-#: src/Dialogs.vala:1174
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: src/Dialogs.vala:1177
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: src/Dialogs.vala:1181
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: src/Dialogs.vala:1184
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 Tag"
 
-#: src/Dialogs.vala:1327 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Ereignis umbenennen"
 
-#: src/Dialogs.vala:1327
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Name:"
 
 #. Dialog title
-#: src/Dialogs.vala:1338
+#: src/Dialogs.vala:1328
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Titel bearbeiten"
 
-#: src/Dialogs.vala:1339 src/Properties.vala:343
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Titel:"
 
 #. Dialog title
-#: src/Dialogs.vala:1355 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Kommentar des Ereignisses bearbeiten"
 
-#: src/Dialogs.vala:1356
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Foto-/Video-Kommentar bearbeiten"
 
-#: src/Dialogs.vala:1357 src/Properties.vala:631
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: src/Dialogs.vala:1373
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Datei entfernen und _löschen"
 msgstr[1] "Dateien entfernen und _löschen"
 
-#: src/Dialogs.vala:1377
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "Aus der Bibliothek _entfernen"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Externe Veränderung zurücknehmen?"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Externe Veränderungen zurücknehmen?"
 
-#: src/Dialogs.vala:1422
+#: src/Dialogs.vala:1412
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3810,85 +3801,83 @@ msgstr[0] ""
 msgstr[1] ""
 "Dies wird alle Veränderungen der %d externen Dateien zerstören. Fortfahren?"
 
-#: src/Dialogs.vala:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "Externe _Veränderung zurücknehmen"
 
-#: src/Dialogs.vala:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "Externe _Veränderungen zurücknehmen"
 
-#: src/Dialogs.vala:1447
+#: src/Dialogs.vala:1437
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
 msgstr[0] "Dies wird das Foto aus der Bibliothek entfernen. Fortsetzen?"
 msgstr[1] "Dies wird %d Fotos aus der Bibliothek entfernen. Fortsetzen?"
 
-#: src/Dialogs.vala:1454 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "Entfe_rnen"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Foto aus der Bibliothek entfernen"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Fotos aus der Bibliothek entfernen"
 
-#: src/Dialogs.vala:1553
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1707
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "Vormittag"
 
-#: src/Dialogs.vala:1708
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "Nachmittag"
 
-#: src/Dialogs.vala:1709
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "24 Stunden"
 
-#: src/Dialogs.vala:1724
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "Fotos/Videos um den gleichen Betrag _versetzen"
 
-#: src/Dialogs.vala:1729
+#: src/Dialogs.vala:1719
 msgid "Set _all photos/videos to this time"
 msgstr "Zeit für _alle Fotos/Videos setzen"
 
-#: src/Dialogs.vala:1735
-#| msgid "_Modify original photo file"
+#: 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:1739
-#| msgid "_Modify original file"
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
 msgid_plural "_Modify original files"
 msgstr[0] "Originaldatei _bearbeiten"
 msgstr[1] "Originaldateien _bearbeiten"
 
-#: src/Dialogs.vala:1827
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Ursprüngliche Größe:"
 
-#: src/Dialogs.vala:1828
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d.%m.%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1829
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d.%m.%Y, %I:%M:%S %p"
 
-#: src/Dialogs.vala:1918
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3897,7 +3886,7 @@ msgstr ""
 "Aufnahmezeit wird um \n"
 "%d %s, %d %s, %d %s, und %d %s nach vorne verlegt."
 
-#: src/Dialogs.vala:1919
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3906,31 +3895,31 @@ msgstr ""
 "Aufnahmezeit wird um \n"
 "%d %s, %d %s, %d %s, und %d %s nach hinten verlegt."
 
-#: src/Dialogs.vala:1921
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "Tag"
 msgstr[1] "Tage"
 
-#: src/Dialogs.vala:1922
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "Stunde"
 msgstr[1] "Stunden"
 
-#: src/Dialogs.vala:1923
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "Minute"
 msgstr[1] "Minuten"
 
-#: src/Dialogs.vala:1924
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "Sekunde"
 msgstr[1] "Sekunden"
 
-#: src/Dialogs.vala:1968
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -3949,50 +3938,50 @@ msgstr[1] ""
 "\n"
 "und %d andere."
 
-#: src/Dialogs.vala:1992 src/Dialogs.vala:2019
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Stichworte (getrennt durch Kommata):"
 
-#: src/Dialogs.vala:2099
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Willkommen!"
 
-#: src/Dialogs.vala:2106
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Willkommen zu Shotwell!"
 
-#: src/Dialogs.vala:2111
+#: 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:2131
+#: 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:2132
+#: 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:2133
+#: 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:2144
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "Fotos aus dem Ordner »%s« _importieren"
 
-#: src/Dialogs.vala:2151
+#: 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:2162
+#: src/Dialogs.vala:2152
 msgid "_Don’t show this message again"
 msgstr "Diese Meldung nicht noch einmal _zeigen"
 
-#: src/Dialogs.vala:2199
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Bilder aus der %s-Bibliothek importieren"
@@ -4000,41 +3989,41 @@ msgstr "Bilder aus der %s-Bibliothek importieren"
 #. We're installed system-wide, so use the system help.
 #. We're being run from the build directory; we'll have to handle clicks to this
 #. link manually ourselves, due to a limitation of help: URIs.
-#: src/Dialogs.vala:2345 src/Dialogs.vala:2349
+#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
 msgid "(Help)"
 msgstr "(Hilfe)"
 
-#: src/Dialogs.vala:2356
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Jahr%sMonat%sTag"
 
-#: src/Dialogs.vala:2358
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "Jahr%sMonat"
 
-#: src/Dialogs.vala:2360
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Jahr%sMonat-Tag"
 
-#: src/Dialogs.vala:2362
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "Jahr-Monat-Tag"
 
-#: src/Dialogs.vala:2363 src/editing_tools/EditingTools.vala:777
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2600
+#: 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:2702
+#: src/Dialogs.vala:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -4042,31 +4031,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:2707
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "Fotos ko_pieren"
 
-#: src/Dialogs.vala:2708
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "_Import durch Verknüpfen"
 
-#: src/Dialogs.vala:2709
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "In Bibliothek importieren"
 
-#: src/Dialogs.vala:2719 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Aus Bibliothek entfernen"
 
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Foto wird aus Bibliothek entfernt"
 
-#: src/Dialogs.vala:2720
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Fotos werden aus Bibliothek entfernt"
 
-#: src/Dialogs.vala:2734
+#: src/Dialogs.vala:2724
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -4089,7 +4078,7 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: src/Dialogs.vala:2738
+#: src/Dialogs.vala:2728
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4112,7 +4101,7 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: src/Dialogs.vala:2742
+#: src/Dialogs.vala:2732
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4135,7 +4124,7 @@ msgstr[1] ""
 "\n"
 "Diese Aktion kann nicht rückgängig gemacht werden!"
 
-#: src/Dialogs.vala:2774
+#: src/Dialogs.vala:2764
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4149,7 +4138,7 @@ msgstr[1] ""
 "löschen?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2791
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4164,17 +4153,17 @@ msgstr "Breite"
 msgid "Height"
 msgstr "Höhe"
 
-#: src/direct/DirectPhotoPage.vala:92
+#: src/direct/DirectPhotoPage.vala:99
 #, c-format
 msgid "%s does not exist."
 msgstr "%s existiert nicht."
 
-#: src/direct/DirectPhotoPage.vala:94
+#: src/direct/DirectPhotoPage.vala:101
 #, c-format
 msgid "%s is not a file."
 msgstr "%s ist keine Datei."
 
-#: src/direct/DirectPhotoPage.vala:96
+#: src/direct/DirectPhotoPage.vala:103
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
@@ -4183,34 +4172,34 @@ msgstr ""
 "%s unterstützt das Dateiformat von\n"
 "%s nicht."
 
-#: src/direct/DirectPhotoPage.vala:113
+#: src/direct/DirectPhotoPage.vala:120
 #, c-format
 msgid "Unable open photo %s. Sorry."
 msgstr "Das Foto %s kann nicht geöffnet werden. Entschuldigung."
 
-#: src/direct/DirectPhotoPage.vala:297 src/Resources.vala:175 ui/direct.ui:8
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:175 ui/direct.ui:8
 msgid "_Save"
 msgstr "_Speichern"
 
-#: src/direct/DirectPhotoPage.vala:297
+#: src/direct/DirectPhotoPage.vala:316
 msgid "_Save a Copy"
 msgstr "Eine Kopie _speichern"
 
-#: src/direct/DirectPhotoPage.vala:300
+#: src/direct/DirectPhotoPage.vala:319
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Änderungen an %s verwerfen?"
 
-#: src/direct/DirectPhotoPage.vala:301
+#: src/direct/DirectPhotoPage.vala:320
 msgid "Close _without Saving"
 msgstr "Schließen _ohne zu speichern"
 
-#: src/direct/DirectPhotoPage.vala:334
+#: src/direct/DirectPhotoPage.vala:353
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Fehler beim Speichern als %s: %s"
 
-#: src/direct/DirectPhotoPage.vala:362 src/direct/DirectPhotoPage.vala:383
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
 msgid "Save As"
 msgstr "Speichern unter"
 
@@ -4220,201 +4209,201 @@ msgstr "Speichern unter"
 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:661
+#: src/editing_tools/EditingTools.vala:666
 msgid "Return to current photo dimensions"
 msgstr "Zurück zu den aktuellen Fotoabmessungen"
 
-#: src/editing_tools/EditingTools.vala:664
+#: src/editing_tools/EditingTools.vala:669
 msgid "Set the crop for this photo"
 msgstr "Foto zuschneiden"
 
-#: src/editing_tools/EditingTools.vala:676
+#: src/editing_tools/EditingTools.vala:681
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Ausschnittsformat zwischen Hoch- und Querformat wechseln"
 
-#: src/editing_tools/EditingTools.vala:749
+#: src/editing_tools/EditingTools.vala:754
 msgid "Unconstrained"
 msgstr "Unbeschränkt"
 
-#: src/editing_tools/EditingTools.vala:750
+#: src/editing_tools/EditingTools.vala:755
 msgid "Square"
 msgstr "Quadrat"
 
-#: src/editing_tools/EditingTools.vala:751
+#: src/editing_tools/EditingTools.vala:756
 msgid "Screen"
 msgstr "Bildschirm"
 
-#: src/editing_tools/EditingTools.vala:753
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:766
-#: src/editing_tools/EditingTools.vala:776
+#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:761
+#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:781
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:759
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD-Video (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:760
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD-Video (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:757 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Brieftasche (2 × 3 Zoll)"
 
-#: src/editing_tools/EditingTools.vala:758 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Notizzettel (3 × 5 Zoll)"
 
-#: src/editing_tools/EditingTools.vala:759 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 Zoll"
 
-#: src/editing_tools/EditingTools.vala:760 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 Zoll"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 Zoll"
 
-#: src/editing_tools/EditingTools.vala:762
+#: src/editing_tools/EditingTools.vala:767
 msgid "Letter (8.5 × 11 in.)"
 msgstr "US-Letter (8.5 × 11 Zoll)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 Zoll"
 
-#: src/editing_tools/EditingTools.vala:764
+#: src/editing_tools/EditingTools.vala:769
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Boulevardblatt (11 × 17 Zoll)"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 Zoll"
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Metrische Brieftasche (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Postkarte (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:776
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:775
+#: src/editing_tools/EditingTools.vala:780
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1875 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
 msgid "Size:"
 msgstr "Größe:"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1895
 msgid "Close the red-eye tool"
 msgstr "Rote-Augen-Entferner schließen"
 
-#: src/editing_tools/EditingTools.vala:1893
+#: src/editing_tools/EditingTools.vala:1898
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Rote-Augen-Effekt im ausgewählten Bereich beseitigen"
 
-#: src/editing_tools/EditingTools.vala:2233
+#: src/editing_tools/EditingTools.vala:2238
 #: 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:2247 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Belichtung:"
 
-#: src/editing_tools/EditingTools.vala:2256
+#: src/editing_tools/EditingTools.vala:2261
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: src/editing_tools/EditingTools.vala:2265
+#: src/editing_tools/EditingTools.vala:2270
 msgid "Saturation:"
 msgstr "Sättigung:"
 
-#: src/editing_tools/EditingTools.vala:2274
+#: src/editing_tools/EditingTools.vala:2279
 msgid "Tint:"
 msgstr "Farbton:"
 
-#: src/editing_tools/EditingTools.vala:2284
+#: src/editing_tools/EditingTools.vala:2289
 msgid "Temperature:"
 msgstr "Temperatur:"
 
-#: src/editing_tools/EditingTools.vala:2293
+#: src/editing_tools/EditingTools.vala:2298
 msgid "Shadows:"
 msgstr "Schatten:"
 
-#: src/editing_tools/EditingTools.vala:2302
+#: src/editing_tools/EditingTools.vala:2307
 msgid "Highlights:"
 msgstr "Spitzlichter:"
 
-#: src/editing_tools/EditingTools.vala:2358
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset Colors"
 msgstr "Farben zurücksetzen"
 
-#: src/editing_tools/EditingTools.vala:2358
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset all color adjustments to original"
 msgstr "Alle Farbanpassungen auf Ursprungswerte zurücksetzen"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: src/editing_tools/EditingTools.vala:2722
 msgid "Temperature"
 msgstr "Temperatur"
 
-#: src/editing_tools/EditingTools.vala:2729
+#: src/editing_tools/EditingTools.vala:2734
 msgid "Tint"
 msgstr "Farbton"
 
-#: src/editing_tools/EditingTools.vala:2741
+#: src/editing_tools/EditingTools.vala:2746
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: src/editing_tools/EditingTools.vala:2755
+#: src/editing_tools/EditingTools.vala:2760
 msgid "Saturation"
 msgstr "Sättigung"
 
-#: src/editing_tools/EditingTools.vala:2768
+#: src/editing_tools/EditingTools.vala:2773
 msgid "Exposure"
 msgstr "Belichtung"
 
-#: src/editing_tools/EditingTools.vala:2781
+#: src/editing_tools/EditingTools.vala:2786
 msgid "Shadows"
 msgstr "Schatten"
 
-#: src/editing_tools/EditingTools.vala:2794
+#: src/editing_tools/EditingTools.vala:2799
 msgid "Highlights"
 msgstr "Spitzlichter"
 
-#: src/editing_tools/EditingTools.vala:2804
+#: src/editing_tools/EditingTools.vala:2809
 msgid "Contrast Expansion"
 msgstr "Kontrastanhebung"
 
@@ -4452,31 +4441,31 @@ msgid_plural "%d Photos"
 msgstr[0] "%d Foto"
 msgstr[1] "%d Fotos"
 
-#: src/events/EventPage.vala:121
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr "Ereignislos"
 
-#: src/events/EventsDirectoryPage.vala:143
+#: src/events/EventsDirectoryPage.vala:150
 msgid "No events"
 msgstr "Keine Ereignisse"
 
-#: src/events/EventsDirectoryPage.vala:147
+#: src/events/EventsDirectoryPage.vala:154
 msgid "No events found"
 msgstr "Keine Ereignisse gefunden"
 
-#: src/events/EventsDirectoryPage.vala:220
+#: src/events/EventsDirectoryPage.vala:227
 msgid "All Events"
 msgstr "Alle Ereignisse"
 
-#: src/events/EventsDirectoryPage.vala:234
+#: src/events/EventsDirectoryPage.vala:241
 msgid "Undated"
 msgstr "Nicht datiert"
 
-#: src/events/EventsDirectoryPage.vala:235
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:236
+#: src/events/EventsDirectoryPage.vala:243
 msgid "%B"
 msgstr "%B"
 
@@ -4524,12 +4513,12 @@ msgstr "Ordner"
 msgid "Library"
 msgstr "Bibliothek"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1084
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
 msgid "Photos"
 msgstr "Fotos"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1103
-#: src/SearchFilter.vala:1104
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
 msgid "Flagged"
 msgstr "Markiert"
 
@@ -4537,11 +4526,11 @@ msgstr "Markiert"
 msgid "Importing…"
 msgstr "Importieren …"
 
-#: src/library/ImportQueuePage.vala:122
+#: src/library/ImportQueuePage.vala:129
 msgid "Preparing to import…"
 msgstr "Import wird vorbereitet …"
 
-#: src/library/ImportQueuePage.vala:149
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr "%s importiert"
@@ -4550,19 +4539,19 @@ msgstr "%s importiert"
 msgid "Last Import"
 msgstr "Letzter Import"
 
-#: src/library/LibraryWindow.vala:501
+#: src/library/LibraryWindow.vala:507
 msgid "Import From Folder"
 msgstr "Aus Ordner importieren"
 
-#: src/library/LibraryWindow.vala:570 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Papierkorb leeren"
 
-#: src/library/LibraryWindow.vala:570
+#: src/library/LibraryWindow.vala:576
 msgid "Emptying Trash…"
 msgstr "Papierkorb wird geleert …"
 
-#: src/library/LibraryWindow.vala:763
+#: src/library/LibraryWindow.vala:772
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4576,33 +4565,33 @@ msgstr ""
 "bearbeiten</span> zu ändern.\n"
 "Möchten Sie mit dem Importieren der Fotos fortfahren?"
 
-#: src/library/LibraryWindow.vala:766 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Speicherort der Bibliothek"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:779
+#: src/library/LibraryWindow.vala:788
 msgid "Photos cannot be imported from this directory."
 msgstr "Aus diesem Ordner können keine Fotos importiert werden."
 
-#: src/library/LibraryWindow.vala:1059
+#: src/library/LibraryWindow.vala:1068
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1103 src/library/LibraryWindow.vala:1114
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
 msgid "Updating library…"
 msgstr "Bibliothek wird aktualisiert …"
 
-#: src/library/LibraryWindow.vala:1120
+#: src/library/LibraryWindow.vala:1129
 msgid "Preparing to auto-import photos…"
 msgstr "Preparing to auto-import photos…"
 
-#: src/library/LibraryWindow.vala:1125
+#: src/library/LibraryWindow.vala:1134
 msgid "Auto-importing photos…"
 msgstr "Fotos werden automatisch importiert …"
 
-#: src/library/LibraryWindow.vala:1133
+#: src/library/LibraryWindow.vala:1142
 msgid "Writing metadata to files…"
 msgstr "Metadaten werden in die Dateien geschrieben …"
 
@@ -4610,7 +4599,7 @@ msgstr "Metadaten werden in die Dateien geschrieben …"
 msgid "Missing Files"
 msgstr "Fehlende Dateien"
 
-#: src/library/OfflinePage.vala:103
+#: src/library/OfflinePage.vala:110
 msgid "Deleting…"
 msgstr "Löschen läuft …"
 
@@ -4618,15 +4607,15 @@ msgstr "Löschen läuft …"
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/library/TrashPage.vala:101
+#: src/library/TrashPage.vala:108
 msgid "Trash is empty"
 msgstr "Der Papierkorb ist leer"
 
-#: src/library/TrashPage.vala:105
+#: src/library/TrashPage.vala:112
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/library/TrashPage.vala:106
+#: src/library/TrashPage.vala:113
 msgid "Deleting Photos"
 msgstr "Fotos werden gelöscht"
 
@@ -4675,32 +4664,32 @@ msgstr "Unbekannter Fehler bei der Überprüfung von Shotwells Datenbank: %s"
 msgid "Loading Shotwell"
 msgstr "Shotwell wird geladen"
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "Path to Shotwell’s private data"
 msgstr "Pfad zu Shotwells Verwaltungsinformation"
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "DIRECTORY"
 msgstr "ORDNER"
 
-#: src/main.vala:298
+#: src/main.vala:297
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Bibliotheksordner nicht laufend auf Veränderungen prüfen"
 
-#: src/main.vala:302
+#: src/main.vala:301
 msgid "Don’t display startup progress meter"
 msgstr "Fortschrittsbalken beim Start nicht anzeigen"
 
-#: src/main.vala:306
+#: src/main.vala:305
 msgid "Show the application’s version"
 msgstr "Versionsnummer anzeigen"
 
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
+#: src/main.vala:342
 msgid "[FILE]"
 msgstr "[DATEI]"
 
-#: 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 ""
@@ -4716,7 +4705,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:493
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4725,34 +4714,34 @@ msgstr ""
 "Shotwell konnte das ausgewählte Video nicht abspielen:\n"
 "%s"
 
-#: src/Page.vala:1338
+#: src/Page.vala:1318
 msgid "No photos/videos"
 msgstr "Keine Fotos/Videos"
 
-#: src/Page.vala:1342
+#: src/Page.vala:1322
 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:2648
+#: src/Page.vala:2628
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotos können nicht in diesen Ordner exportiert werden."
 
 #. previous button
-#: src/PhotoPage.vala:535
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Voriges Foto"
 
 #. next button
-#: src/PhotoPage.vala:541
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Nächstes Foto"
 
-#: src/PhotoPage.vala:1847
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Foto-Quelldatei fehlt: %s"
 
-#: src/PhotoPage.vala:3008
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "%s kann nicht exportiert werden: %s"
@@ -4797,7 +4786,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3755
 msgid "modified"
 msgstr "verändert"
 
@@ -4829,23 +4818,15 @@ msgstr "16 Bilder pro Seite"
 msgid "32 images per page"
 msgstr "32 Bilder pro Seite"
 
-#: src/Printing.vala:348
-msgid "in."
-msgstr "Zoll"
-
-#: src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: src/Printing.vala:876
+#: src/Printing.vala:851
 msgid "Image Settings"
 msgstr "Bildeinstellungen"
 
-#: src/Printing.vala:889
+#: src/Printing.vala:864
 msgid "Printing…"
 msgstr "Drucken …"
 
-#: src/Printing.vala:909 src/Printing.vala:1112
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -5001,13 +4982,18 @@ msgstr ""
 
 #. Here, we check whether more than one item is being uploaded, and if so, display
 #. an alternate message.
-#: src/publishing/PublishingUI.vala:104 src/publishing/PublishingUI.vala:109
-#| msgid "The selected video was successfully published."
+#: src/publishing/PublishingUI.vala:104
 msgid "The selected video was successfully published."
 msgid_plural "The selected videos were successfully published."
 msgstr[0] "Das ausgewählte Video wurde erfolgreich veröffentlicht."
 msgstr[1] "Das ausgewählte Video wurde erfolgreich veröffentlicht."
 
+#: src/publishing/PublishingUI.vala:109
+msgid "The selected photo was successfully published."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "Das ausgewählte Foto wurde erfolgreich veröffentlicht."
+msgstr[1] "Die ausgewählten Fotos wurden erfolgreich veröffentlicht."
+
 #: src/publishing/PublishingUI.vala:115
 msgid "The selected photos/videos were successfully published."
 msgstr "Die ausgewählten Fotos/Videos wurden erfolgreich veröffentlicht."
@@ -5108,7 +5094,7 @@ msgstr "_Anwenden"
 
 #: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
 #: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
-#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
+#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
@@ -5126,7 +5112,7 @@ msgstr "Bilds_chirmfüllend"
 #: 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
+#: ui/tags.ui:423 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Hilfe"
 
@@ -5134,7 +5120,7 @@ msgstr "_Hilfe"
 msgid "Leave _Fullscreen"
 msgstr "_Vollbild verlassen"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "_Neu"
 
@@ -5489,7 +5475,8 @@ msgstr "Duplizieren"
 msgid "Make a duplicate of the photo"
 msgstr "Duplikat dieses Fotos erstellen"
 
-#: src/Resources.vala:290
+#: src/Resources.vala:290 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
 msgid "_Export…"
 msgstr "_Exportieren …"
 
@@ -5628,7 +5615,7 @@ msgstr "Stichwort »%s« _umbenennen …"
 msgid "Rename Tag “%s” to “%s”"
 msgstr "Stichwort »%s« zu »%s« umbenennen"
 
-#: src/Resources.vala:373
+#: src/Resources.vala:373 ui/tags.ui:454
 msgid "_Rename…"
 msgstr "_Umbenennen …"
 
@@ -5684,7 +5671,7 @@ msgstr ""
 "vorhanden ist."
 
 #. Saved search button
-#: src/Resources.vala:410 src/SearchFilter.vala:1125
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Gespeicherte Suche"
 
@@ -5810,14 +5797,14 @@ msgstr "Alle auswählen"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:766
+#: src/Resources.vala:738
 msgid "%a %b %d, %Y"
 msgstr "%a %d. %b, %Y"
 
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:771
+#: src/Resources.vala:743
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a %b %d"
@@ -5825,7 +5812,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:776
+#: src/Resources.vala:748
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
@@ -5833,7 +5820,7 @@ msgstr "%d, %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:781
+#: src/Resources.vala:753
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a %d %b"
@@ -5841,7 +5828,7 @@ msgstr "%a %d %b"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:786
+#: src/Resources.vala:758
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %d. %b, %Y"
@@ -6028,7 +6015,7 @@ msgid "Photo state"
 msgstr "Status des Fotos"
 
 #: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1115
+#: src/SearchFilter.vala:1114
 msgid "Rating"
 msgstr "Bewertung"
 
@@ -6037,12 +6024,10 @@ msgid "Date"
 msgstr "Datum"
 
 #: src/SearchFilter.vala:815
-#| msgid "Rating"
 msgid "★+ Rating"
 msgstr "★+ Bewertung"
 
 #: src/SearchFilter.vala:818
-#| msgid "Rating"
 msgid "★★+ Rating"
 msgstr "★★+ Bewertung"
 
@@ -6058,7 +6043,7 @@ msgstr "★★★★+ Bewertung"
 msgid "★★★★★+ Rating"
 msgstr "★★★★★+ Bewertung"
 
-#: src/SearchFilter.vala:1065
+#: src/SearchFilter.vala:1064
 #, c-format
 msgid "Error loading search bar UI: %s"
 msgstr "Fehler beim Laden der UI-Datei der Suchzeile: %s"
@@ -6068,24 +6053,24 @@ 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:1074
+#: src/SearchFilter.vala:1073
 msgid "Close"
 msgstr "Schließen"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1080
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr "Typ"
 
-#: src/SearchFilter.vala:1087
+#: src/SearchFilter.vala:1086
 msgid "Videos"
 msgstr "Videos"
 
-#: src/SearchFilter.vala:1090
+#: src/SearchFilter.vala:1089
 msgid "RAW Photos"
 msgstr "RAW-Fotos"
 
-#: src/SearchFilter.vala:1126
+#: src/SearchFilter.vala:1125
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 "Eine gespeicherte Suche verwenden, um Objekte in der aktuellen Ansicht zu "
@@ -6163,7 +6148,7 @@ msgid "untitled"
 msgstr "unbenannt"
 
 #. multiple videos
-#: src/VideoSupport.vala:507
+#: src/VideoSupport.vala:523
 msgid "Export Videos"
 msgstr "Videos exportieren"
 
@@ -6178,7 +6163,6 @@ msgid "_Developer"
 msgstr "_Entwickler"
 
 #: 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 "Mit e_xternem Editor öffnen"
 
@@ -6189,17 +6173,17 @@ msgstr "Ereig_nis zum Foto anzeigen"
 
 #: 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 "_Datei"
 
-#: 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 "Speichern _unter …"
 
 #: 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 "_Ansicht"
 
@@ -6215,7 +6199,7 @@ msgstr "_100 % Vergrößerung"
 msgid "Zoom _200%"
 msgstr "_200 % Vergrößerung"
 
-#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+#: ui/direct.ui:98 ui/photo.ui:187
 msgid "_Photo"
 msgstr "_Foto"
 
@@ -6245,7 +6229,6 @@ 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 …"
 
@@ -6321,13 +6304,11 @@ msgid "D_escending"
 msgstr "A_bsteigend"
 
 #: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
-#: ui/top.ui:30
 msgid "Even_ts"
 msgstr "_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"
 msgid "R_emove from Library"
 msgstr "Aus Bibliothek _entfernen"
 
@@ -6336,7 +6317,7 @@ msgid "_Titles"
 msgstr "_Titel"
 
 #: 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/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385
 msgid "Ta_gs"
 msgstr "S_tichworte"
 
@@ -6362,11 +6343,10 @@ msgstr "Nach _Bewertung"
 
 #: 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_bsteigend"
 
-#: 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 "_Fotos"
 
@@ -6374,43 +6354,85 @@ msgstr "_Fotos"
 msgid "_Stop Import"
 msgstr "Import _abbrechen"
 
-#: ui/import.ui:13 ui/import.ui:210
-msgid "Import _Selected"
-msgstr "A_usgewählte importieren"
+#: ui/printing_widget.ui:19
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Auflösung für Druck</b>"
 
-#: ui/import.ui:17 ui/import.ui:214
-msgid "Import _All"
-msgstr "_Alle importieren"
+#: 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"
 
-#: ui/set_background_dialog.ui:15
+#. 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:77 ui/set_background_slideshow_dialog.ui:132
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
 msgid "Use for Desktop"
 msgstr "Als Schreibtisch verwenden"
 
-#: ui/set_background_dialog.ui:92 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
 msgid "Use for Lock Screen"
 msgstr "Auf dem Sperrbildschirm verwenden"
 
-#: ui/set_background_slideshow_dialog.ui:15
+#: ui/set_background_slideshow_dialog.ui:16
 msgid "Set as Desktop Slideshow"
 msgstr "Als Hintergrund-Bildvorführung setzen"
 
-#: ui/set_background_slideshow_dialog.ui:33
+#: 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:45
+#: ui/set_background_slideshow_dialog.ui:94
 msgid "period of time"
 msgstr "Zeitintervall"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Hintergrund-Bildvorführung erstellen"
-
-#: ui/set_background_slideshow_dialog.ui:115
+#: ui/set_background_slideshow_dialog.ui:116
 msgid "How long each photo is shown on the desktop background"
 msgstr "Wie lange soll jedes Foto als Hintergrundbild gezeigt werden?"
 
@@ -6490,79 +6512,39 @@ msgstr "Externe Editoren"
 msgid "Plugins"
 msgstr "Erweiterungen"
 
-#: ui/shotwell.ui:583
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Auflösung für Druck</b>"
-
-#: ui/shotwell.ui:600
-msgid "Use a _standard size:"
-msgstr "_Standardgröße verwenden:"
-
-#: ui/shotwell.ui:643
-msgid "Use a c_ustom size:"
-msgstr "_Angepasste Größe verwenden:"
-
-#: ui/shotwell.ui:731
-msgid "_Match photo aspect ratio"
-msgstr "_Seitenverhältnis beibehalten"
-
-#: ui/shotwell.ui:755
-msgid "_Autosize:"
-msgstr "_Automatische Größe:"
-
-#: ui/shotwell.ui:795
-msgid "<b>Titles</b>"
-msgstr "<b>Titel</b>"
-
-#: ui/shotwell.ui:812
-msgid "Print image _title"
-msgstr "Bild_titel drucken"
-
-#: ui/shotwell.ui:855
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Auflösung</b>"
-
-#: ui/shotwell.ui:875
-msgid "_Output photo at:"
-msgstr "_Foto ausgeben auf:"
-
-#: ui/shotwell.ui:909
-msgid "pixels per inch"
-msgstr "Pixel pro Zoll"
-
-#: ui/shotwell.ui:949
+#: ui/shotwell.ui:590
 msgid "_Name of search:"
 msgstr "_Name der Suche:"
 
-#: ui/shotwell.ui:1003
+#: ui/shotwell.ui:644
 msgid "_Match"
 msgstr "_Treffer finden"
 
-#: ui/shotwell.ui:1030
+#: ui/shotwell.ui:671
 msgid "of the following:"
 msgstr "von den folgenden:"
 
-#: ui/shotwell.ui:1111
+#: ui/shotwell.ui:752
 msgid "label"
 msgstr "Beschriftung"
 
-#: ui/shotwell.ui:1262
+#: ui/shotwell.ui:903
 msgid "_Delay:"
 msgstr "_Verzögerung:"
 
-#: ui/shotwell.ui:1276
+#: ui/shotwell.ui:917
 msgid "_Transition effect:"
 msgstr "_Übergangseffekt:"
 
-#: ui/shotwell.ui:1290
+#: ui/shotwell.ui:931
 msgid "Transition d_elay:"
 msgstr "Übergangsv_erzögerung:"
 
-#: ui/shotwell.ui:1300
+#: ui/shotwell.ui:941
 msgid "Show t_itle"
 msgstr "T_itel anzeigen"
 
-#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -6573,242 +6555,3 @@ msgstr "Neues S_tichwort …"
 #: ui/trash.ui:285
 msgid "Delete all photos in the trash"
 msgstr "Alle Fotos im Papierkorb löschen"
-
-#~ msgid "_Modify original photo files"
-#~ msgstr "Originale Bilddateien _verändern"
-
-#~ msgid "_Modify original files"
-#~ msgstr "Originaldateien _verändern"
-
-#~ msgid "The selected videos were successfully published."
-#~ msgstr "Die ausgewählten Videos wurden erfolgreich veröffentlicht."
-
-#~ msgid "The selected photos were successfully published."
-#~ msgstr "Die ausgewählten Fotos wurden erfolgreich veröffentlicht."
-
-#~ msgid "The selected photo was successfully published."
-#~ msgstr "Das ausgewählte Foto wurde erfolgreich veröffentlicht."
-
-#~ msgid "Shotwell Preferences"
-#~ msgstr "Shotwell-Einstellungen"
-
-#~ msgid "_Contents"
-#~ msgstr "_Inhalt"
-
-#~ msgid "Display the title of each photo"
-#~ msgstr "Titel jedes Fotos anzeigen"
-
-#~ msgid "Import the selected photos into your library"
-#~ msgstr "Die ausgewählten Bilder in die Bibliothek importieren"
-
-#~ msgid "Import all the photos into your library"
-#~ msgstr "Alle Fotos in die Bibliothek importieren"
-
-#~ msgid "Play a slideshow"
-#~ msgstr "Eine Diaschau anzeigen"
-
-#~ msgid "Save photo"
-#~ msgstr "Foto speichern"
-
-#~ msgid "Save photo with a different name"
-#~ msgstr "Foto unter einem anderen Namen speichern"
-
-#~ msgid "Print the photo to a printer connected to your computer"
-#~ msgstr "Foto auf einem Drucker ausgeben, der mit dem Rechner verbunden ist"
-
-#~ msgid "Previous Photo"
-#~ msgstr "Voriges Foto"
-
-#~ msgid "Next Photo"
-#~ msgstr "Nächstes Foto"
-
-#~ msgid "Increase the magnification of the photo"
-#~ msgstr "Die Ansicht vergrößern"
-
-#~ msgid "Decrease the magnification of the photo"
-#~ msgstr "Die Ansicht verkleinern"
-
-#~ msgid "Zoom the photo to fit on the screen"
-#~ msgstr "Foto auf Bildschirmgröße anpassen"
-
-#~ msgid "Zoom the photo to 100% magnification"
-#~ msgstr "Bild in normaler Größe anzeigen"
-
-#~ msgid "Zoom the photo to 200% magnification"
-#~ msgstr "Bild in doppelter Größe anzeigen"
-
-#~ msgid "Display the comment of each event"
-#~ msgstr "Kommentare zu jedem Ereignis anzeigen"
-
-#~ msgid "Stop importing photos"
-#~ msgstr "Foto-Import abbrechen"
-
-#~ msgid "Import photos from disk to library"
-#~ msgstr "Fotos von der Festplatte in die Bibliothek importieren"
-
-#~ msgid "Find photos and videos by search criteria"
-#~ msgstr "Fotos und Videos anhand von Suchkriterien finden"
-
-#~ msgid "Display basic information for the selection"
-#~ msgstr "Grundlegende Informationen über die Auswahl anzeigen"
-
-#~ msgid "Display extended information for the selection"
-#~ msgstr "Erweiterte Informationen über die Auswahl anzeigen"
-
-#~ msgid "Display the search bar"
-#~ msgstr "Suchleiste anzeigen"
-
-#~ msgid "Display the sidebar"
-#~ msgstr "Seitenleiste anzeigen"
-
-#~ msgid "Display the tool bar"
-#~ msgstr "Die Werkzeugleiste anzeigen"
-
-#~ msgid "Sort photos in an ascending order"
-#~ msgstr "Fotos in aufsteigender Reihenfolge sortieren"
-
-#~ msgid "Sort photos in a descending order"
-#~ msgstr "Fotos in absteigender Reihenfolge sortieren"
-
-#~ msgid "Increase the magnification of the thumbnails"
-#~ msgstr "Vorschaubilder vergrößern"
-
-#~ msgid "Decrease the magnification of the thumbnails"
-#~ msgstr "Vorschaubilder verkleinern"
-
-#~ msgid "_Play Video"
-#~ msgstr "Video _abspielen"
-
-#~ msgid "Open the selected videos in the system video player"
-#~ msgstr ""
-#~ "Die ausgewählten Videos mit der voreingestellten Video-Wiedergabe öffnen"
-
-#~ msgid "Display the comment of each photo"
-#~ msgstr "Die Kommentare zu jedem Bild anzeigen"
-
-#~ msgid "Display each photo’s tags"
-#~ msgstr "Stichworte jedes Fotos anzeigen"
-
-#~ msgid "Sort photos by title"
-#~ msgstr "Fotos nach Titel sortieren"
-
-#~ msgid "Sort photos by exposure date"
-#~ msgstr "Fotos nach Aufnahmedatum sortieren"
-
-#~ msgid "Sort photos by rating"
-#~ msgstr "Fotos nach Bewertung sortieren"
-
-#~ msgid "Sort photos by filename"
-#~ msgstr "Fotos nach Dateinamen sortieren"
-
-#~ msgid "RAW photos"
-#~ msgstr "RAW-Fotos"
-
-#~ msgid "Tag Photos as “%s”"
-#~ msgstr "Fotos mit Stichwort »%s« versehen"
-
-#~ msgid "Tag the selected photos as “%s”"
-#~ msgstr "Ausgewählte Fotos mit Stichwort »%s« versehen"
-
-#~ msgid "Remove Tag “%s” From _Photos"
-#~ msgstr "Stichwort »%s« von _Fotos entfernen"
-
-#~ msgid "Remove Tag “%s” From Photos"
-#~ msgstr "Stichwort »%s« von Fotos entfernen"
-
-#~ msgid "Login"
-#~ msgstr "Anmelden"
-
-#~ msgid "Save Details..."
-#~ msgstr "Details speichern …"
-
-#~ msgid "Save _As..."
-#~ msgstr "Speichern _unter …"
-
-#~ msgid "Importing..."
-#~ msgstr "Import läuft …"
-
-#~ msgid "Preparing to import..."
-#~ msgstr "Import wird vorbereitet …"
-
-#~ msgid "_Import From Folder..."
-#~ msgstr "Aus Ordner _importieren …"
-
-#~ msgid "Import From _Application..."
-#~ msgstr "Importieren von _Anwendung …"
-
-#~ msgid "Set as _Desktop Slideshow..."
-#~ msgstr "Als Hintergrundbild-_Vorführung festlegen …"
-
-#~ msgid "Re_name Event..."
-#~ msgstr "Ereignis _umbenennen …"
-
-#~ msgid "_Export..."
-#~ msgstr "_Exportieren …"
-
-#~ msgid "_Print..."
-#~ msgstr "_Drucken …"
-
-#~ msgid "Pu_blish..."
-#~ msgstr "_Veröffentlichen …"
-
-#~ msgid "Edit _Title..."
-#~ msgstr "_Titel bearbeiten …"
-
-#~ msgid "Edit _Comment..."
-#~ msgstr "_Kommentar bearbeiten …"
-
-#~ msgid "Edit Event _Comment..."
-#~ msgstr "_Kommentar des Ereignisses bearbeiten"
-
-#~ msgid "_Adjust Date and Time..."
-#~ msgstr "Datum und Zeit _anpassen …"
-
-#~ msgid "Add _Tags..."
-#~ msgstr "_Stichworte hinzufügen …"
-
-#~ msgid "_Add Tags..."
-#~ msgstr "S_tichworte hinzufügen …"
-
-#~ msgid "Send _To..."
-#~ msgstr "_Senden an …"
-
-#~ msgid "Send T_o..."
-#~ msgstr "Senden a_n …"
-
-#~ msgid "_Find..."
-#~ msgstr "_Suchen …"
-
-#~ msgid "Modif_y Tags..."
-#~ msgstr "Stichworte _ändern …"
-
-#~ msgid "_Edit..."
-#~ msgstr "_Bearbeiten …"
-
-#~ msgid "%-I:%M %p"
-#~ msgstr "%-I:%M %p"
-
-#~ msgid "%-I:%M:%S %p"
-#~ msgstr "%-I:%M:%S %p"
-
-#~ msgid "Copyright 2009-2015 Yorba Foundation"
-#~ msgstr "Copyright 2009-2015 Yorba Foundation"
-
-#~ msgid "Intro message replaced at runtime"
-#~ msgstr "Eingangsnachricht, die zur Laufzeit ersetzt werden soll"
-
-#~ msgid "'Publishing to $url as $username' (populated in application code)"
-#~ msgstr "Unter $url als $username veröffentlichen"
-
-#~ msgid "you are logged in rajce as $name"
-#~ msgstr "Sie sind bei Rajce als $name angemeldet"
-
-#~ msgid "$mediatype will appear in"
-#~ msgstr "$mediatype erscheint in"
-
-#~ msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
-#~ msgstr ""
-#~ "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
-
-#~ msgid "Visit the Yorba web site"
-#~ msgstr "Besuchen Sie die Yorba-Webseite"
diff --git a/po/fi.gmo b/po/fi.gmo
index 08ce7b1..66c19c0 100644
--- a/po/fi.gmo
+++ b/po/fi.gmo
diff --git a/po/fi.po b/po/fi.po
index bc3fa37..4a10d7f 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,17 +13,17 @@
 # ZupaDupa <kallerainio@gmail.com>, 2011
 # lsbeeler <lucas@yorba.org>, 2011
 # Timo Jyrinki <timo.jyrinki@gmail.com>, 2015.
-# Jiri Grönroos <jiri.gronroos+l10n@iki.fi>, 2011-2013, 2014, 2015.
+# Jiri Grönroos <jiri.gronroos+l10n@iki.fi>, 2011-2013, 2014, 2015, 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-10-18 00:30+0000\n"
-"PO-Revision-Date: 2015-10-18 12:38+0300\n"
+"POT-Creation-Date: 2017-02-21 22:03+0000\n"
+"PO-Revision-Date: 2017-02-22 20:49+0200\n"
 "Last-Translator: Jiri Grönroos <jiri.gronroos+l10n@iki.fi>\n"
-"Language-Team: suomi <gnome-fi-laatu@lists.sourceforge.net>\n"
+"Language-Team: suomi <lokalisointi-lista@googlegroups.com>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,12 +31,1386 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: ../plugins/common/RESTSupport.vala:424
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "Julkaisemisessa tarvittava väliaikainen tiedosto ei ole saatavilla"
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354
+#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344
+#: ui/tags.ui:354
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: misc/shotwell.appdata.xml.in:9
+#| msgid "Photo Manager"
+msgid "Popular photo manager"
+msgstr "Suosittu sovellus valokuvien hallintaan"
+
+#: misc/shotwell.appdata.xml.in:11
+msgid ""
+"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
+"desktop. It allows you to import photos from your camera or disk, organize "
+"them by date and subject matter, even ratings. It also offers basic photo "
+"editing, like crop, red-eye correction, color adjustments, and straighten. "
+"Shotwell’s non-destructive photo editor does not alter your master photos, "
+"making it easy to experiment and correct errors."
+msgstr ""
+
+#: misc/shotwell.appdata.xml.in:18
+msgid ""
+"When ready, Shotwell can upload your photos to various web sites, such as "
+"Facebook, Flickr, Picasa (Google Plus), and more."
+msgstr ""
+
+#: misc/shotwell.appdata.xml.in:22
+msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
+msgstr ""
+
+#: 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
+msgid "Photo Manager"
+msgstr "Valokuvien hallinta"
+
+#: misc/shotwell.desktop.in.in:6
+#| msgid "any photo"
+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
+msgid ""
+"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
+"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
+"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
+msgstr ""
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#| msgid "Shotwell"
+msgid "shotwell"
+msgstr "shotwell"
+
+#: misc/shotwell-viewer.desktop.in.in:4
+#| msgid "Photo Viewer"
+msgid "Shotwell Viewer"
+msgstr "Shotwell-katselin"
+
+#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "Valokuvien katselin"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:6
+msgid "authentication token"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:7
+msgid "Yandex-Fotki authentication token, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:14
+msgid "Token"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:15
+msgid "The token to access tumblr"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:20
+msgid "Secret token"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:21
+msgid "The secret token to sign oauth requests"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:26
+#: misc/org.yorba.shotwell.gschema.xml:486
+msgid "default size"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:27
+msgid ""
+"A numeric code representing the default size for photos uploaded to Tumblr"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:32
+msgid "default blog"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:33
+msgid "The name of the default blog of the user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:40
+msgid "Rajce URL"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:41
+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
+#| msgid "User _name"
+msgid "username"
+msgstr "käyttäjätunnus"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:47
+msgid "Rajce username, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:52
+msgid "token"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:53
+msgid "user token, if remembered."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:58
+#: misc/org.yorba.shotwell.gschema.xml:530
+#, fuzzy
+#| msgid "An _existing category:"
+msgid "last category"
+msgstr "_Olemassa oleva kategoria:"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:59
+msgid "The last selected Rajce category."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:64
+#: misc/org.yorba.shotwell.gschema.xml:542
+#, fuzzy
+#| msgid "Photo size:"
+msgid "last photo size"
+msgstr "Kuvan koko:"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:65
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Rajce."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:70
+#| msgid "_Remember"
+msgid "remember"
+msgstr "muista"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:71
+msgid "If true, remember last login."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:76
+#| msgid "_Hide album"
+msgid "hide album"
+msgstr "piilota albumi"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:77
+msgid "If true, hide the newly created Rajce album."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:82
+#, fuzzy
+#| msgid "Open target _album in browser"
+msgid "open album in web browser"
+msgstr "A_vaa kohdealbumi selaimessa"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:83
+msgid ""
+"If true, open target album in the web browser just after uploading photos"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:88
+#: misc/org.yorba.shotwell.gschema.xml:434
+#: misc/org.yorba.shotwell.gschema.xml:472
+#: misc/org.yorba.shotwell.gschema.xml:498
+#: misc/org.yorba.shotwell.gschema.xml:548
+#: misc/org.yorba.shotwell.gschema.xml:592
+msgid "remove sensitive info from uploads"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:89
+msgid ""
+"Whether images being uploaded to Rajce should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:23
+msgid "display basic properties"
+msgstr "näytä perusominaisuudet"
+
+#: misc/org.yorba.shotwell.gschema.xml:24
+msgid "True if the basic properties pane is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:29
+#, fuzzy
+#| msgid "Display extended information for the selection"
+msgid "display extended properties"
+msgstr "Näytä lisätiedot valinnasta"
+
+#: misc/org.yorba.shotwell.gschema.xml:30
+msgid ""
+"True if the extended properties window is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:35
+#| msgid "Display the sidebar"
+msgid "display sidebar"
+msgstr "näytä sivupalkki"
+
+#: misc/org.yorba.shotwell.gschema.xml:36
+msgid "True if the sidebar is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:41
+#| msgid "Display the sidebar"
+msgid "display toolbar"
+msgstr "näytä työkalupalkki"
+
+#: misc/org.yorba.shotwell.gschema.xml:42
+msgid "True if the bottom toolbar is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:47
+#| msgid "Display the search bar"
+msgid "display search bar"
+msgstr "näytä hakupalkki"
+
+#: misc/org.yorba.shotwell.gschema.xml:48
+msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:53
+#| msgid "Display each photo's tags"
+msgid "display photo titles"
+msgstr "näytä kuvien nimet"
+
+#: misc/org.yorba.shotwell.gschema.xml:54
+msgid ""
+"True if photo titles are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:59
+#| msgid "Display each photo's tags"
+msgid "display photo comments"
+msgstr "näytä kuvan tunnisteet"
+
+#: misc/org.yorba.shotwell.gschema.xml:60
+msgid ""
+"True if photo comments are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:65
+#| msgid "Edit Event Comment"
+msgid "display event comments"
+msgstr "näytä tapahtuman kommentit"
+
+#: misc/org.yorba.shotwell.gschema.xml:66
+msgid ""
+"True if event comments are to be displayed beneath thumbnails in event "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:71
+#| msgid "Display each photo's tags"
+msgid "display photo tags"
+msgstr "näytä kuvien tunnisteet"
+
+#: misc/org.yorba.shotwell.gschema.xml:72
+msgid ""
+"True if photo tags are to be listed beneath thumbnails in collection views, "
+"false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:77
+#| msgid "Display each photo's rating"
+msgid "display photo ratings"
+msgstr "näytä kuvien arvostelut"
+
+#: misc/org.yorba.shotwell.gschema.xml:78
+msgid ""
+"True if a photo’s rating should be displayed as overlaid trinket, false "
+"otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:83
+msgid "rating filter level"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:84
+msgid ""
+"Determines how to filter photos based on their ratings. 1: Rejected or "
+"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
+"or better, 6: Four or better, 7: Five or better."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:89
+#, fuzzy
+#| msgid "Sort _Descending"
+msgid "sort events ascending"
+msgstr "Järjestä _laskevasti"
+
+#: misc/org.yorba.shotwell.gschema.xml:90
+msgid "True if events should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:95
+#, fuzzy
+#| msgid "Sort photos in an ascending order"
+msgid "sort library photos ascending"
+msgstr "Järjestä kuvat nousevaan järjestykseen"
+
+#: misc/org.yorba.shotwell.gschema.xml:96
+msgid "True if library photos should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:101
+msgid "sort library photos criteria"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:102
+msgid ""
+"A numeric code that specifies the sort criteria for photos in library views."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:107
+#, fuzzy
+#| msgid "Sort photos in an ascending order"
+msgid "sort event photos ascending"
+msgstr "Järjestä kuvat nousevaan järjestykseen"
+
+#: misc/org.yorba.shotwell.gschema.xml:108
+msgid "True if event photos should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:113
+#, fuzzy
+#| msgid "Sort photos by title"
+msgid "sort event photos criteria"
+msgstr "Järjestä kuvat nimen mukaan"
+
+#: misc/org.yorba.shotwell.gschema.xml:114
+msgid "Specifies the sort criteria for event photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:119
+msgid "use 24 hour time"
+msgstr "käytä 24 tunnin aikamuotoa"
+
+#: misc/org.yorba.shotwell.gschema.xml:120
+msgid ""
+"True if should display times with a 24 hour clock, false if times should use "
+"AM/PM notation."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:125
+msgid "keep relative time between photos"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:126
+msgid ""
+"True if when adjusting time/date of photos, relative time should be "
+"maintained. False if all photos should be set to the same time."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:131
+#, fuzzy
+#| msgid "_Modify original photo files"
+msgid "modify original photo files"
+msgstr "M_uokkaa alkuperäisiä kuvatiedostoja"
+
+#: misc/org.yorba.shotwell.gschema.xml:132
+msgid ""
+"True if when adjusting time/date of photos, the original files should be "
+"modified as well. False if changes are made only in the database."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:137
+msgid "show welcome dialog on startup"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:138
+msgid ""
+"True if, when on startup, a welcome dialog should be shown. False if it "
+"should not be shown."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:143
+#| 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 ""
+
+#: misc/org.yorba.shotwell.gschema.xml:149
+msgid "photo thumbnail scale"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:150
+msgid "The scale of photo thumbnails, ranging from 72 to 360."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:155
+#, fuzzy
+#| msgid "Pin the toolbar open"
+msgid "pin toolbar state"
+msgstr "Kiinnitä työkalurivi auki"
+
+#: misc/org.yorba.shotwell.gschema.xml:156
+msgid "Pin toolbar in fullscreen, or not."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:161
+#| msgid "_Background:"
+msgid "background color"
+msgstr "taustaväri"
+
+#: misc/org.yorba.shotwell.gschema.xml:162
+msgid "A grayscale color for use as the background color."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:167
+msgid "Selection state of “hide photos” option"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid ""
+"Last used selection state of the “hide photos already imported” option in "
+"the import page."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:175
+#| msgid "_Delay:"
+msgid "delay"
+msgstr "viive"
+
+#: misc/org.yorba.shotwell.gschema.xml:176
+msgid "Delay (in seconds) between photos in the slideshow."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:181
+#| msgid "Transition d_elay:"
+msgid "transition delay"
+msgstr "siirtymän viive"
+
+#: misc/org.yorba.shotwell.gschema.xml:182
+msgid ""
+"The time (in seconds) that a transition runs between photos in a slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:187
+#, fuzzy
+#| msgid "_Transition effect:"
+msgid "transition effect id"
+msgstr "_Siirtymän tehoste:"
+
+#: misc/org.yorba.shotwell.gschema.xml:188
+msgid ""
+"The name of the transition effect that will be used between photos when "
+"running a slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:193
+#| msgid "Show t_itle"
+msgid "Show title"
+msgstr "Näytä nimi"
+
+#: misc/org.yorba.shotwell.gschema.xml:194
+msgid "Whether to show the title of a photo during the slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:201
+msgid "maximize library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:202
+msgid "True if library application is maximized, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:207
+msgid "width of library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:208
+msgid "The last recorded width of the library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:213
+msgid "height of library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:214
+msgid "The last recorded height of the library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:219
+msgid "maximize direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:220
+msgid "True if direct-edit application is maximized, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:225
+msgid "width of direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:226
+msgid "The last recorded width of the direct-edit application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:231
+msgid "height of direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:232
+msgid "The last recorded height of the direct-edit application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:237
+msgid "sidebar divider position"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:238
+msgid ""
+"The last recorded position of the divider between the sidebar and view in "
+"library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:245
+#, fuzzy
+#| msgid "Import to Library"
+msgid "import directory"
+msgstr "Tuo kirjastoon"
+
+#: misc/org.yorba.shotwell.gschema.xml:246
+msgid "Directory in which imported photo files are placed."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:251
+#, fuzzy
+#| msgid "_Watch library directory for new files"
+msgid "watch library directory for new files"
+msgstr "_Tarkkaile kirjastoa uusien tiedostojen varalta"
+
+#: misc/org.yorba.shotwell.gschema.xml:252
+msgid ""
+"If true, files added to the library directory are automatically imported."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:257
+#, fuzzy
+#| msgid "Writing metadata to files..."
+msgid "write metadata to master files"
+msgstr "Kirjoitetaan metadataa tiedostoihin..."
+
+#: misc/org.yorba.shotwell.gschema.xml:258
+msgid ""
+"If true, changes to metadata (tags, titles, etc.) are written to the master "
+"photo file."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:263
+msgid "use lowercase filenames"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:264
+msgid ""
+"If true, Shotwell will convert all filenames to lowercase when importing "
+"photo files"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:269
+#, fuzzy
+#| msgid "_Directory structure:"
+msgid "directory pattern"
+msgstr "_Kansiorakenne:"
+
+#: 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 ""
 
-#: ../plugins/common/RESTSupport.vala:1138
+#: misc/org.yorba.shotwell.gschema.xml:275
+msgid "directory pattern custom"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:276
+msgid ""
+"A string encoding a custom naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:281
+#, fuzzy
+#| msgid "RAW Developer"
+msgid "RAW developer default"
+msgstr "RAW-kehitin"
+
+#: misc/org.yorba.shotwell.gschema.xml:282
+msgid "Default option for which RAW developer Shotwell will use."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:289
+msgid "Most-recently-used crop aspect ratio menu choice."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:290
+msgid "A numeric code representing the last crop menu choice the user made."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:294
+msgid "Most-recently-used crop custom aspect ratio’s numerator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:295
+msgid ""
+"A nonzero, positive integer representing the width part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:299
+msgid "Most-recently-used crop custom aspect ratio’s denominator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:300
+msgid ""
+"A nonzero, positive integer representing the height part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:307
+#| msgid "E_xternal photo editor:"
+msgid "external photo editor"
+msgstr "ulkoinen kuvamuokkain"
+
+#: misc/org.yorba.shotwell.gschema.xml:308
+msgid "External application used to edit photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:313
+#| msgid "External _RAW editor:"
+msgid "external raw editor"
+msgstr "ulkoinen raw-muokkain"
+
+#: misc/org.yorba.shotwell.gschema.xml:314
+msgid "External application used to edit RAW photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:352
+#: misc/org.yorba.shotwell.gschema.xml:353
+msgid "Setting in export dialog: how to trim images"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:358
+#, fuzzy
+#| msgid "Export metadata"
+msgid "export metadata"
+msgstr "Vie metatiedot"
+
+#: misc/org.yorba.shotwell.gschema.xml:359
+msgid "Setting in export dialog: option to export metadata"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:364
+msgid "format setting, special value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:365
+msgid "Setting in export dialog: format setting, special value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:370
+msgid "format setting, type value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+msgid "Setting in export dialog: format setting, type value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:376
+msgid "JPEG quality option"
+msgstr "JPEG-laatuvalinta"
+
+#: 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 "Core Publishing Services"
+msgid "last used publishing service"
+msgstr "viimeksi käytetty julkaisupalvelu"
+
+#: misc/org.yorba.shotwell.gschema.xml:391
+#: misc/org.yorba.shotwell.gschema.xml:397
+msgid ""
+"A numeric code representing the last service to which photos were published"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:396
+#| msgid "Core Publishing Services"
+msgid "default publishing service"
+msgstr "oletusarvoinen julkaisupalvelu"
+
+#: misc/org.yorba.shotwell.gschema.xml:410
+#, fuzzy
+#| msgid "Access _type:"
+msgid "access token"
+msgstr "Pääsy_tyyppi:"
+
+#: misc/org.yorba.shotwell.gschema.xml:411
+msgid "Facebook OAuth token for the currently logged in session, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:416
+msgid "user i.d."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:417
+msgid "Facebook user i.d. for the currently logged in user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:422
+#| msgid "User _name"
+msgid "user name"
+msgstr "käyttäjätunnus"
+
+#: misc/org.yorba.shotwell.gschema.xml:423
+#, fuzzy
+#| msgid "You are not currently logged into Yandex.Fotki."
+msgid "The name of the currently logged in Facebook user, if any"
+msgstr "Et ole kirjautuneena palveluun Yandex.Fotki."
+
+#: misc/org.yorba.shotwell.gschema.xml:428
+#: misc/org.yorba.shotwell.gschema.xml:460
+msgid "default size code"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:429
+msgid ""
+"A numeric code representing the default size for photos published to Facebook"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:435
+msgid ""
+"Whether images being uploaded to Facebook should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:442
+msgid "OAuth Access Phase Token"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:443
+msgid "The authorization token for the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:448
+msgid "OAuth Access Phase Token Secret"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:449
+msgid ""
+"The cryptographic secret used to sign requests against the authorization "
+"token for the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:455
+msgid "The user name of the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:461
+msgid ""
+"A numeric code representing the default size for photos published to Flickr"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:466
+msgid "default visibility"
+msgstr "oletusnäkyvyys"
+
+#: misc/org.yorba.shotwell.gschema.xml:467
+msgid ""
+"A numeric code representing the default visibility for photos published to "
+"Flickr"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:473
+msgid ""
+"Whether images being uploaded to Flickr should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:480
+#: misc/org.yorba.shotwell.gschema.xml:612
+msgid "refresh token"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:481
+msgid ""
+"The OAuth token used to refresh the Picasa Web Albums session for the "
+"currently logged in user, if any."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:487
+msgid ""
+"A numeric code representing the default size for photos uploaded to Picasa "
+"Web Albums"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:586
+msgid "last album"
+msgstr "viimeisin albumi"
+
+#: misc/org.yorba.shotwell.gschema.xml:493
+#: misc/org.yorba.shotwell.gschema.xml:587
+msgid "The name of the last album the user published photos to, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:499
+msgid ""
+"Whether images being uploaded to Picasa should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:506
+msgid "Piwigo URL"
+msgstr "Piwigo-osoite"
+
+#: misc/org.yorba.shotwell.gschema.xml:507
+msgid "URL of the Piwigo server."
+msgstr "Piwigo-palvelimen osoite."
+
+#: misc/org.yorba.shotwell.gschema.xml:513
+msgid "Piwigo username, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:518
+#| msgid "_Password"
+msgid "password"
+msgstr "salasana"
+
+#: misc/org.yorba.shotwell.gschema.xml:519
+msgid "Piwigo password, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:524
+#| msgid "_Remember Password"
+msgid "remember password"
+msgstr "muista salasana"
+
+#: misc/org.yorba.shotwell.gschema.xml:525
+msgid "If true, remember the Piwigo password."
+msgstr "Jos tosi, muista Piwigo-salasana."
+
+#: misc/org.yorba.shotwell.gschema.xml:531
+msgid "The last selected Piwigo category."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:536
+msgid "last permission level"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:537
+msgid "The last chosen Piwigo permission level."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:543
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Piwigo."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:549
+msgid ""
+"Whether images being uploaded to Piwigo should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:554
+#, fuzzy
+#| msgid "_If a title is set and comment unset, use title as comment"
+msgid ""
+"if title is set and comment unset, use title as comment for uploads to Piwigo"
+msgstr ""
+"_Jos nimi on asetettu ja kommentti asettamatta, käytä nimeä kommenttina"
+
+#: misc/org.yorba.shotwell.gschema.xml:555
+msgid ""
+"Whether images being uploaded to Piwigo should have their comment set from "
+"the title if title is set and comment unset"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:560
+msgid "do not upload tags when uploading to Piwigo"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:561
+msgid ""
+"Whether images being uploaded to Piwigo should have their tags removed on "
+"upload, such that these tags will not appear on the remote Piwigo server."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:569
+#| msgid "Gallery3 publishing module"
+msgid "Gallery3 username"
+msgstr "Gallery3-käyttäjätunnus"
+
+#: misc/org.yorba.shotwell.gschema.xml:574
+#| msgid "API _Key:"
+msgid "API key"
+msgstr "API-avain"
+
+#: misc/org.yorba.shotwell.gschema.xml:575
+#| msgid "_Gallery3 URL:"
+msgid "Gallery3 API key"
+msgstr "Gallery3:n API-avain"
+
+#: misc/org.yorba.shotwell.gschema.xml:580
+msgid "URL"
+msgstr "Osoite"
+
+#: misc/org.yorba.shotwell.gschema.xml:581
+#| msgid "_Gallery3 URL:"
+msgid "Gallery3 site URL"
+msgstr "Gallery3-sivun osoite"
+
+#: misc/org.yorba.shotwell.gschema.xml:593
+msgid ""
+"Indicates whether images being uploaded to Gallery3 should have their "
+"metadata removed first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:598
+msgid "scaling constraint of uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:599
+msgid "The scaling constraint ID of the picture to be uploaded"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:604
+msgid "pixels of the major axis uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:605
+msgid ""
+"The pixels of the major axis of the picture to be uploaded; used only if "
+"scaling-constraint-id is an appropriate value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:613
+msgid ""
+"The OAuth token used to refresh the YouTube session for the currently logged "
+"in user, if any."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:620
+msgid "last used import service"
+msgstr "viimeisin tuontipalvelu"
+
+#: misc/org.yorba.shotwell.gschema.xml:621
+msgid ""
+"A numeric code representing the last service from which photos were imported"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:628
+msgid "interpreter state cookie"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:629
+msgid ""
+"A numeric code that captures the state of the GStreamer plug-in environment"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:636
+msgid "content layout mode"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:637
+msgid ""
+"A numeric code that describes how photos are laid out on the page during "
+"printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:642
+#, fuzzy
+#| msgid "_Contents"
+msgid "content ppi"
+msgstr "_Sisältö"
+
+#: misc/org.yorba.shotwell.gschema.xml:643
+msgid "The number of pixels per inch (ppi) sent to the printer during printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:648
+msgid "content width"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:649
+msgid "The width of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:654
+#, fuzzy
+#| msgid "Rotate Right"
+msgid "content height"
+msgstr "Kierrä oikealle"
+
+#: misc/org.yorba.shotwell.gschema.xml:655
+msgid "The height of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:660
+#| msgid "_Contents"
+msgid "content units"
+msgstr "sisältöyksiköt"
+
+#: misc/org.yorba.shotwell.gschema.xml:661
+msgid ""
+"A numeric code representing unit of measure (inches or centimeters) used "
+"when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:666
+#, fuzzy
+#| msgid "2 images per page"
+msgid "images per page code"
+msgstr "2 kuvaa sivulla"
+
+#: misc/org.yorba.shotwell.gschema.xml:667
+msgid ""
+"A numeric code representing the currently selected images per page mode used "
+"when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:672
+msgid "size selection"
+msgstr "koon valinta"
+
+#: misc/org.yorba.shotwell.gschema.xml:673
+msgid ""
+"The index of the current print size in a pre-defined list of standard sizes"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:678
+#| msgid "_Match photo aspect ratio"
+msgid "match aspect ratio"
+msgstr "vastaa kuvasuhdetta"
+
+#: misc/org.yorba.shotwell.gschema.xml:679
+msgid ""
+"Determines whether custom print sizes must match the aspect ratio of the "
+"original photo"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:684
+#| msgid "Print image _title"
+msgid "print titles"
+msgstr "tulosta nimet"
+
+#: misc/org.yorba.shotwell.gschema.xml:685
+msgid ""
+"True if the title of a photo should be printed when the photo is printed, "
+"false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:690
+msgid "titles font"
+msgstr "nimissä käytettävä fontti"
+
+#: misc/org.yorba.shotwell.gschema.xml:691
+msgid "The name of the font to use for photo titles when they are printed."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:702
+#| msgid "Unable to publish"
+msgid "enable facebook publishing plugin"
+msgstr "käytä facebook-julkaisulaajennusta"
+
+#: misc/org.yorba.shotwell.gschema.xml:703
+msgid "True if the Facebook publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:708
+msgid "enable flickr publishing plugin"
+msgstr "käytä flickr-julkaisulaajennusta"
+
+#: misc/org.yorba.shotwell.gschema.xml:709
+msgid "True if the Flickr publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:714
+msgid "enable picasa publishing plugin"
+msgstr "käytä picassa-julkaisulaajennusta"
+
+#: misc/org.yorba.shotwell.gschema.xml:715
+msgid ""
+"True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:720
+#| msgid "Unable to publish"
+msgid "enable youtube publishing plugin"
+msgstr "käytä youtube-julkaisulaajennusta"
+
+#: misc/org.yorba.shotwell.gschema.xml:721
+msgid "True if the YouTube publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:726
+#| msgid "Unable to publish"
+msgid "enable piwigo publishing plugin"
+msgstr "käytä piwigo-julkaisulaajennusta"
+
+#: misc/org.yorba.shotwell.gschema.xml:727
+msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:732
+msgid "enable yandex publishing plugin"
+msgstr "käytä yandex-julkaisulaajennusta"
+
+#: misc/org.yorba.shotwell.gschema.xml:733
+msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:738
+#| msgid "Unable to publish"
+msgid "enable tumblr publishing plugin"
+msgstr "käytä tumblr-julkaisulaajennusta"
+
+#: misc/org.yorba.shotwell.gschema.xml:739
+msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:744
+#| msgid "Gallery3 publishing module"
+msgid "enable rajce publishing plugin"
+msgstr "käytä rajce-julkaisulaajennusta"
+
+#: misc/org.yorba.shotwell.gschema.xml:745
+msgid "True if the Rajce publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:750
+#| msgid "Gallery3 publishing module"
+msgid "enable gallery3 publishing plugin"
+msgstr "käytä gallery3-julkaisulaajennusta"
+
+#: misc/org.yorba.shotwell.gschema.xml:751
+msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:756
+msgid "enable F-Spot import plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:757
+msgid "True if the F-Spot import plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:762
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow crumble transition"
+msgstr "Keskeiset diaesityssiirtymät"
+
+#: misc/org.yorba.shotwell.gschema.xml:763
+msgid ""
+"True if the Crumble slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:768
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow fade transition"
+msgstr "Keskeiset diaesityssiirtymät"
+
+#: misc/org.yorba.shotwell.gschema.xml:769
+msgid ""
+"True if the Fade slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:798
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow slide transition"
+msgstr "Keskeiset diaesityssiirtymät"
+
+#: misc/org.yorba.shotwell.gschema.xml:775
+msgid ""
+"True if the Slide slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:780
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow clock transition"
+msgstr "Keskeiset diaesityssiirtymät"
+
+#: misc/org.yorba.shotwell.gschema.xml:781
+msgid ""
+"True if the Clock slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:792
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow circle transition"
+msgstr "Keskeiset diaesityssiirtymät"
+
+#: misc/org.yorba.shotwell.gschema.xml:787
+msgid ""
+"True if the Circle slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:793
+msgid ""
+"True if the Circles slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:799
+msgid ""
+"True if the Blinds slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:804
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow squares transition"
+msgstr "Keskeiset diaesityssiirtymät"
+
+#: misc/org.yorba.shotwell.gschema.xml:805
+msgid ""
+"True if the Squares slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:810
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow stripes transition"
+msgstr "Keskeiset diaesityssiirtymät"
+
+#: misc/org.yorba.shotwell.gschema.xml:811
+msgid ""
+"True if the Stripes slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:816
+#, fuzzy
+#| msgid "Core Slideshow Transitions"
+msgid "enable slideshow chess transition"
+msgstr "Keskeiset diaesityssiirtymät"
+
+#: misc/org.yorba.shotwell.gschema.xml:817
+msgid ""
+"True if the Chess-Board slideshow transition plugin is enabled, false "
+"otherwise"
+msgstr ""
+
+#: plugins/authenticator/shotwell/FacebookPublishingAuthenticator.vala:166
+#, fuzzy
+#| msgid ""
+#| "You are not currently logged into Facebook.\n"
+#| "\n"
+#| "If you don't yet have a Facebook account, you can create one during the "
+#| "login process. During login, Shotwell Connect may ask you for permission "
+#| "to upload photos and publish to your feed. These permissions are required "
+#| "for Shotwell Connect to function."
+msgid ""
+"You are not currently logged into Facebook.\n"
+"\n"
+"If you don’t yet have a Facebook account, you can create one during the "
+"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 ""
+"Et ole kirjautuneena Facebookiin.\n"
+"\n"
+"Jos sinulla ei ole Facebook-tiliä, voit luoda sellaisen ennen kirjautumista. "
+"Kirjautumisen aikana Shotwellin yhdistäjä saattaa kysyä lupaa kuvien "
+"lataamiseen ja Facebook-syötteessä julkaisemiseen. Nämä luvat on annettava, "
+"jotta yhdistäjä toimii."
+
+#: 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 ""
+"Olet jo kirjautunut Facebookiin ja sieltä ulos tämän Shotwell-käyttökerran "
+"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
+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 ""
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+#| msgid "Preparing for login..."
+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:481
+#| msgid "Verifying authorization..."
+msgid "Verifying authorization…"
+msgstr "Vahvistetaan valtuutusta…"
+
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:116
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -49,25 +1423,97 @@ msgstr ""
 "\n"
 "Jatka julkaisua Google-palveluihin käynnistämällä Shotwell uudelleen."
 
-#: ../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 ""
+
+#: 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 ""
+"Et ole kirjautuneena YouTubeen.\n"
+"\n"
+"Jotta yhdistämistä voidaan jatkaa, sinulla täytyy olla Google-tili, joka on "
+"asetettu toimimaan YouTuben kanssa. Useimpien tilien asetukset voi tehdä "
+"kirjautumalla selaimella YouTube-sivustolle ainakin kerran."
+
+#: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Vieraile Shotwellin verkkosivustolla"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:705
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:603
 msgid "translator-credits"
 msgstr "Jiri Grönroos"
 
-#: ../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 "Tekijänoikeus 2009-2015 Yorba Foundation"
+#. Possible error message when a site presents a bad certificate.
+#: plugins/common/RESTSupport.vala:202
+msgid ""
+"⚫ This website presented identification that belongs to a different website."
+msgstr "⚫ Tämä sivusto esitti identiteetin, joka kuuluu toiselle sivustolle."
+
+#. 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 "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:56
+#: plugins/shotwell-data-imports/FSpotImporter.vala:58
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
@@ -76,7 +1522,7 @@ msgid ""
 "file."
 msgstr ""
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
+#: plugins/shotwell-data-imports/FSpotImporter.vala:60
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
@@ -86,11 +1532,11 @@ msgstr ""
 "\n"
 "Valitse F-Spot-tietokantatiedosto."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+#: plugins/shotwell-data-imports/FSpotImporter.vala:62
 msgid "Manually select an F-Spot database file to import:"
 msgstr "Valitse itse tuotava F-Spot-tietokantatiedosto:"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:62
+#: plugins/shotwell-data-imports/FSpotImporter.vala:64
 msgid ""
 "Cannot open the selected F-Spot database file: the file does not exist or is "
 "not an F-Spot database"
@@ -98,7 +1544,7 @@ 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:64
+#: plugins/shotwell-data-imports/FSpotImporter.vala:66
 msgid ""
 "Cannot open the selected F-Spot database file: this version of the F-Spot "
 "database is not supported by Shotwell"
@@ -106,14 +1552,14 @@ msgstr ""
 "Valitun F-Spot-tietokantatiedoston avaus epäonnistui: Shotwell ei tue F-Spot-"
 "tietokannan versiota"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+#: plugins/shotwell-data-imports/FSpotImporter.vala:68
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading tags table"
 msgstr ""
 "Valitun F-Spot-tietokantatiedoston luku ei onnistu: virhe luettaessa "
 "tunnistetaulua"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+#: plugins/shotwell-data-imports/FSpotImporter.vala:70
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading photos "
 "table"
@@ -121,7 +1567,7 @@ msgstr ""
 "Valitun F-Spot-tietokantatiedoston luku ei onnistu: virhe luettaessa "
 "kuvataulua"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:70
+#: plugins/shotwell-data-imports/FSpotImporter.vala:72
 #, c-format
 msgid ""
 "Shotwell has found %d photos in the F-Spot library and is currently "
@@ -131,24 +1577,112 @@ msgid ""
 "taking place in the background."
 msgstr ""
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#: 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:422
+#: plugins/shotwell-data-imports/FSpotImporter.vala:424
 msgid "Preparing to import"
 msgstr "Valmistaudutaan tuontiin"
 
-#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
 msgid "Core Data Import Services"
 msgstr ""
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
+msgid "_Gallery3 URL:"
+msgstr "_Gallery3-osoite:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
+msgid "_User name:"
+msgstr "_Käyttäjätunnus:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
+msgid "_Password:"
+msgstr "_Salasana:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "Takais_in"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1464
+#| msgid "_Login"
+msgid "_Log in"
+msgstr "_Kirjaudu"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
+msgid "API _Key:"
+msgstr "API-_avain:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
+msgid "or"
+msgstr "tai"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "_Olemassa oleva albumi"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
+msgid "A _new album"
+msgstr "_Uusi albumi"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr ""
+"_Poista sijainti-ja kameratiedot sekä muut yksilöivät tiedot ennen lähetystä"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
+msgid "Scaling constraint:"
+msgstr "\tSkaalausrajoite:"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
+msgid "pixels"
+msgstr "pikseliä"
+
+#: 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 "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"
+
+#: 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 "_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/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2465
+msgid "_Publish"
+msgstr "_Julkaise"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Gallery3-julkaisumoduuli"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:114
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:114
 #, fuzzy
 #| msgid ""
 #| "You are not currently logged into YouTube.\n"
@@ -168,35 +1702,33 @@ msgstr ""
 "asetettu toimimaan YouTuben kanssa. Useimpien tilien asetukset voi tehdä "
 "kirjautumalla selaimella YouTube-sivustolle ainakin kerran."
 
-#: ../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 "Shotwellin oletuskansio"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
+#| "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 ""
 "Julkaisuun vaadittava tiedosto ei ole saatavilla. Julkaisua palveluun %s ei "
@@ -204,13 +1736,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 "Publish Photos and Videos"
 msgid "Publishing to %s as %s."
 msgstr "Julkaistaan palveluun %s käyttäjänä %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1819
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
 #, fuzzy
 #| msgid ""
 #| "Enter the URL of your Piwigo photo library as well as the username and "
@@ -221,184 +1752,179 @@ msgid ""
 msgstr ""
 "Määritä Piwigo-kuvakirjastosi verkko-osoite, käyttäjätunnus ja salasana."
 
-#: ../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."
 msgstr ""
 
-#: ../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 "
 "trailing components (e.g., index.php)."
 msgstr ""
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
 msgstr "Tunnistamaton käyttäjä"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
 msgstr " Sivustoa ei löytynyt"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
-msgid "Copyright (C) 2013 rajce.net"
-msgstr "Tekijänoikeus 2013 rajce.net"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
-msgid "An error message occurred when publishing to Rajce. Please try again."
-msgstr "Rajceen julkaistaessa ilmeni virheviesti. Yritä uudelleen."
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
-msgid "Enter email and password associated with your Rajce account."
-msgstr "Anna Rajce-tiliisi sidottu sähköpostiosoite ja salasana."
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
-msgid "Invalid email and/or password. Please try again"
-msgstr "Sähköpostiosoite ja/tai salasana on virheellinen. Yritä uudelleen"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
-msgid "Invalid User Email or Password"
-msgstr "Virheellinen sähköpostiosoite tai salasana"
-
-#: ../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-extras/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr "_Sähköpostiosoite"
 
-#: ../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-extras/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr "_Salasana"
 
-#: ../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 "_Muista"
 
-#: ../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"
+#: 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/RajcePublishing.vala:1006
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
-msgid "_Hide album"
-msgstr "_Piilota albumi"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
-#, c-format
-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:670
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
-msgid "Photos will appear in:"
-msgstr "Kuvat menevät:"
-
-#: ../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 "_Olemassa olevaan albumiin:"
 
-#: ../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 "_Uuteen albumiin nimeltä:"
 
-#: ../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 "_Piilota albumi"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "A_vaa kohdealbumi selaimessa"
 
-#: ../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 "_Julkaise"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
+#| msgid "Copyright (C) 2013 rajce.net"
+msgid "Copyright © 2013 rajce.net"
+msgstr "Tekijänoikeus © 2013 rajce.net"
 
-#: ../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 "_Kirjaudu ulos"
-
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
-msgid "Copyright 2012 BJA Electronics"
-msgstr "Tekijänoikeus 2012 BJA Electronics"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr "Rajceen julkaistaessa ilmeni virheviesti. Yritä uudelleen."
 
-#: ../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 pikseliä"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
+msgid "Enter email and password associated with your Rajce account."
+msgstr "Anna Rajce-tiliisi sidottu sähköpostiosoite ja salasana."
 
-#: ../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 pikseliä"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
+msgid "Invalid email and/or password. Please try again"
+msgstr "Sähköpostiosoite ja/tai salasana on virheellinen. Yritä uudelleen"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 pikseliä"
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
+msgid "Invalid User Email or Password"
+msgstr "Virheellinen sähköpostiosoite tai salasana"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
-msgid "'%s' isn't a valid response to an OAuth authentication request"
-msgstr "'%s' ei ole kelvollinen vastaus OAuth-tunnistautumispyyntöön"
+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/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"
+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:558
+#: 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."
+"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:586
+#: 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:587
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+#: 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:617
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+#: 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:636
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#: 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:739
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
 #, c-format
 msgid ""
 "You are logged into Tumblr as %s.\n"
@@ -407,215 +1933,105 @@ msgstr ""
 "Olet kirjautuneena Tumblriin käyttäjänä %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Tekijänoikeus 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 "Vieraile palvelun Yandex.Fotki verkkosivustolla"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:609
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Et ole kirjautuneena palveluun Yandex.Fotki."
 
-#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
-#, fuzzy
-#| msgid "Core Publishing Services"
-msgid "Shotwell Extra Publishing Services"
-msgstr "Keskeiset julkaisupalvelut"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
-msgid "Go _Back"
-msgstr "Takais_in"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:42
-msgid "_Login"
-msgstr "_Kirjaudu"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
-msgid "Intro message replaced at runtime"
-msgstr ""
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
-msgid "_Gallery3 URL:"
-msgstr "_Gallery3-osoite:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
-msgid "_User name:"
-msgstr "_Käyttäjätunnus:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
-msgid "_Password:"
-msgstr "_Salasana:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
-msgid "API _Key:"
-msgstr "API-_avain:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
-msgid "or"
-msgstr "tai"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
-msgid "A _new album"
-msgstr "_Uusi albumi"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
-msgid "An _existing album"
-msgstr "_Olemassa oleva albumi"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
-msgid "_Remove location, tag and camera-identifying data before uploading"
-msgstr ""
-"_Poista sijainti-ja kameratiedot sekä muut yksilöivät tiedot ennen lähetystä"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
-#, fuzzy
-#| msgid ""
-#| "'you are logged in as $name'\n"
-#| "(populated in the application code)"
-msgid "'Publishing to $url as $username' (populated in application code)"
-msgstr ""
-"'olet kirjautunut tunnuksella $name'\n"
-"(populated in the application code)"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
-msgid "Scaling constraint:"
-msgstr "\tSkaalausrajoite:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
-msgid "pixels"
-msgstr "pikseliä"
-
-#: ../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 "Alkuperäinen koko"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
-#: ../src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Leveys tai korkeus"
-
-#: ../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 "nimike"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
-msgid "Blogs:"
-msgstr "Blogit:"
-
-#: ../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 "Kuvan kok_o:"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Julkinen"
 
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
-msgid "you are logged in rajce as $name"
-msgstr "Olet kirjautunut Rajceen käyttäjänä %s."
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+msgid "Friends"
+msgstr "Kaverit"
 
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
-#, fuzzy
-#| msgid "Videos will appear in:"
-msgid "$mediatype will appear in"
-msgstr "Videot ilmestyvät sijaintiin:"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:486
+msgid "Private"
+msgstr "Yksityinen"
 
-#: ../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 "_Albumit (tai kirjoita uusi):"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "Pääsy_tyyppi:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "_Poista kommentit käytöstä"
 
-#: ../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 "Kiellä _alkuperäisen kuvan lataus"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
-msgid "Public"
-msgstr "Julkinen"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
+msgid "Publish to an e_xisting album:"
+msgstr "Julkaise _olemassa olevassa albumissa:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1181
-msgid "Friends"
-msgstr "Kaverit"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
+msgid "Create a _new album named:"
+msgstr "Luo _uusi albumi nimeltä:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "Yksityinen"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
+#: plugins/shotwell-publishing/FacebookPublishing.vala:725
+msgid "Upload _size:"
+msgstr "_Lähetyksen koko:"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-msgid "Shotwell Connect"
-msgstr "Shotwell-yhdistäjä"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
+msgid "Videos and new photo albums _visible to:"
+msgstr "Videot ja uudet kuva-albumit _näkyvät:"
 
-#: ../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 ""
-"Et ole kirjautuneena Facebookiin.\n"
-"\n"
-"Jos sinulla ei ole Facebook-tiliä, voit luoda sellaisen ennen kirjautumista. "
-"Kirjautumisen aikana Shotwellin yhdistäjä saattaa kysyä lupaa kuvien "
-"lataamiseen ja Facebook-syötteessä julkaisemiseen. Nämä luvat on annettava, "
-"jotta yhdistäjä toimii."
+"_Poista sijainti- ja kameratiedot sekä muut yksilöivät tiedot ennen lähetystä"
 
-#: ../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 ""
-"Olet jo kirjautunut Facebookiin ja sieltä ulos tämän Shotwell-käyttökerran "
-"aikana.\n"
-"Käynnistä Shotwell uudelleen ja yritä sitten kuvien lähettämistä uudelleen."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
+msgid "Shotwell Connect"
+msgstr "Shotwell-yhdistäjä"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:86
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Standardi (720 pikseliä)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Suuri (2048 pikseliä)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr "Kokeillaan Facebook-yhteyttä..."
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
-msgstr "Luodaan albumia..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
+#| msgid "Creating album..."
+msgid "Creating album…"
+msgstr "Luodaan albumia…"
 
-#: ../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 ""
 "Julkaisuun vaadittava tiedosto ei ole käytettävissä. Julkaisua Facebookiin "
 "ei voi jatkaa."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1019
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -624,62 +2040,22 @@ msgstr ""
 "Olet kirjautunut Facebookiin käyttäjänä %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1020
+#: plugins/shotwell-publishing/FacebookPublishing.vala:724
 msgid "Where would you like to publish the selected photos?"
 msgstr "Minne haluat julkaista valitut kuvat?"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1021
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
-msgid "Upload _size:"
-msgstr "_Lähetyksen koko:"
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1214
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:858
 msgid "Just me"
 msgstr "Vain minulle"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../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 "Kaikille"
 
-#: ../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 ""
-
-#: ../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 ""
-"Olet jo kirjautunut Flickriin ja sieltä ulos tämän Shotwell-käyttökerran "
-"aikana.\n"
-"Käynnistä Shotwell uudelleen ja yritä sitten kuvien lähettämistä uudelleen."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr "Valmistaudutaan kirjautumiseen..."
-
-#: ../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 ""
-"Julkaisuun vaadittava tiedosto ei ole käytettävissä. Julkaisua Flickriin ei "
-"voi jatkaa."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Vahvistetaan valtuutusta..."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -688,126 +2064,220 @@ msgstr ""
 "Olet kirjautunut Flickriin käyttäjänä %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 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] ""
-"Ilmaisessa Flickr-tilissä on kuukausittainen rajoitus datan lähetykselle.\n"
-"Tässä kuussa voit vielä lähettää %d megatavun."
-msgstr[1] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Ilmaisessa Flickr-tilissä on kuukausittainen rajoitus datan lähetykselle.\n"
-"Tässä kuussa voit vielä lähettää %d megatavua."
+"Tässä kuussa voit vielä lähettää %s."
 
-#: ../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 -tili sallii kuvien lähettämisen ilman rajoituksia."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1165
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "Kuvat _näkyvät:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "Videot _näkyvät:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr "Kuvat ja videot _näkyvät:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "Vain kavereille ja perheelle"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "Vain perhe"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "Vain kaverit"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 pikseliä"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
+#| msgid "2048 x 1536 pixels"
+msgid "2048 × 1536 pixels"
+msgstr "2048 × 1536 pikseliä"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 pikseliä"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
+#| msgid "4096 x 3072 pixels"
+msgid "4096 × 3072 pixels"
+msgstr "4096 × 3072 pikseliä"
 
-#: ../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 ""
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
+msgid "Photo _size preset:"
+msgstr "Kuvan _koon esiasetus:"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+#. 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:625
+#| msgid "De_fault:"
+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."
 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 ""
 "Julkaisuun vaadittava tiedosto ei ole käytettävissä. Julkaisua Picasaan ei "
 "voi jatkaa."
 
 #. populate any widgets whose contents are programmatically-generated.
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#: plugins/shotwell-publishing/PicasaPublishing.vala:555
 #, c-format
 msgid "You are logged into Picasa Web Albums as %s."
 msgstr "Olet kirjautuneena Picasa-verkkoalbumeihin nimellä %s."
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:561
 msgid "Videos will appear in:"
 msgstr "Videot ilmestyvät sijaintiin:"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Pieni (640 x 480 pikseliä)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:605
+#| msgid "Small (640 x 480 pixels)"
+msgid "Small (640 × 480 pixels)"
+msgstr "Pieni (640 × 480 pikseliä)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Keskikoko (1024 x 768 pikseliä)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:606
+#| msgid "Medium (1024 x 768 pixels)"
+msgid "Medium (1024 × 768 pixels)"
+msgstr "Keskikoko (1024 × 768 pikseliä)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Suositeltu (1600 x 1200 pikseliä)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:607
+#| msgid "Recommended (1600 x 1200 pixels)"
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr "Suositeltu (1600 × 1200 pikseliä)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 pikseliä)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:608
+#| msgid "Google+ (2048 x 1536 pixels)"
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr "Google+ (2048 × 1536 pikseliä)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: ../src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:609
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Alkuperäinen koko"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
+msgid "_URL of your Piwigo photo library"
+msgstr "Piwigo-kuvakirjastosi _verkko-osoite"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
+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ä"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+#, fuzzy
+#| msgid "An _existing category:"
+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"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+#, fuzzy
+#| msgid "Photos will be _visible by:"
+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"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr ""
+"_Jos nimi on asetettu ja kommentti asettamatta, käytä nimeä kommenttina"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
+msgid "_Do no upload tags"
+msgstr "_Älä lähetä tunnisteita"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
+msgid "Logout"
+msgstr "Kirjaudu ulos"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:295 ui/collection.ui:190
+msgid "Publish"
+msgstr "Julkaise"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-msgid "Creating album %s..."
-msgstr "Luodaan albumia %s..."
+#| msgid "Creating album %s..."
+msgid "Creating album %s…"
+msgstr "Luodaan albumia %s…"
 
-#: ../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 "Piwigoon julkaistaessa ilmeni virheviesti. Yritä uudelleen."
 
-#: ../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 ""
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "Palvelun %s varmenne"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:166
+msgid "_OK"
+msgstr "_OK"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
 msgstr ""
 "Määritä Piwigo-kuvakirjastosi verkko-osoite, käyttäjätunnus ja salasana."
 
-#: ../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"
@@ -815,289 +2285,194 @@ msgstr ""
 "Shotwell ei voi yhdistää Piwigo-kuvakirjastoosi. Varmista, että "
 "kirjoittamasi verkko-osoite on oikein"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "Virheellinen verkko-osoite"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Ylläpitäjät, perhe, kaverit, yhteystiedot"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Ylläpitäjät, perhe, kaverit"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Ylläpitäjät, perhe"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Ylläpitäjät"
 
-#: ../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 ""
-"Et ole kirjautuneena YouTubeen.\n"
-"\n"
-"Jotta yhdistämistä voidaan jatkaa, sinulla täytyy olla Google-tili, joka on "
-"asetettu toimimaan YouTuben kanssa. Useimpien tilien asetukset voi tehdä "
-"kirjautumalla selaimella YouTube-sivustolle ainakin kerran."
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr "Tämä yhteys ei ole turvallinen"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr "Näytä varmenne…"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr "Ymmärrän, _jatketaan."
+
+#: plugins/shotwell-publishing/shotwell-publishing.vala:40
+msgid "Core Publishing Services"
+msgstr "Keskeiset julkaisupalvelut"
+
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+msgid "Video privacy _setting:"
+msgstr "Videoiden _yksityisyysasetukset:"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+#: plugins/shotwell-publishing/YouTubePublishing.vala:340
+#| 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 ""
 "Julkaisuun vaadittava tiedosto ei ole käytettävissä. Julkaisua Youtubeen ei "
 "voi jatkaa."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
+#: plugins/shotwell-publishing/YouTubePublishing.vala:450
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Olet kirjautunut YouTubeen käyttäjänä %s."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
+#: plugins/shotwell-publishing/YouTubePublishing.vala:452
 #, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Videot ilmestyvät sijaintiin '%s'"
+#| msgid "Videos will appear in '%s'"
+msgid "Videos will appear in “%s”"
+msgstr "Videot ilmestyvät sijaintiin “%s”"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+#: plugins/shotwell-publishing/YouTubePublishing.vala:484
 msgid "Public listed"
 msgstr "Julkinen, luetteloitu"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:485
 msgid "Public unlisted"
 msgstr "Julkinen, luettelematon"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
-msgid "Publish to an e_xisting album:"
-msgstr "Julkaise _olemassa olevassa albumissa:"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
-msgid "Create a _new album named:"
-msgstr "Luo _uusi albumi nimeltä:"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
-msgid "Videos and new photo albums _visible to:"
-msgstr "Videot ja uudet kuva-albumit _näkyvät:"
-
-#: ../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 ""
-"_Poista sijainti- ja kameratiedot sekä muut yksilöivät tiedot ennen lähetystä"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Anna Flickriin kirjauduttasi verkkoselaimessasi näkyvä valtuutusnumero."
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
-msgid "Authorization _Number:"
-msgstr "Valtuutus_numero:"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
-#: ../src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "_Jatka"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
-msgid "L_ist album in public gallery"
-msgstr "_Näytä albumi julkisessa galleriassa"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
-msgid "Photo _size preset:"
-msgstr "Kuvan _koon esiasetus:"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
-msgid "_URL of your Piwigo photo library"
-msgstr "Piwigo-kuvakirjastosi _verkko-osoite"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
-msgid "User _name"
-msgstr "_Käyttäjätunnus"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
-msgid "_Remember Password"
-msgstr "_Muista salasana"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
-msgid "An _existing category:"
-msgstr "_Olemassa oleva kategoria:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
-msgid "Photos will be _visible by:"
-msgstr "_Valokuvat näkyvät:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
-msgid "Photo size:"
-msgstr "Kuvan koko:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
-msgid "within category:"
-msgstr ""
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
-msgid "Album comment:"
-msgstr "Albumin kommentti:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-"_Jos nimi on asetettu ja kommentti asettamatta, käytä nimeä kommenttina"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
-msgid "_Do no upload tags"
-msgstr "_Älä lähetä tunnisteita"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
-msgid "Logout"
-msgstr "Kirjaudu ulos"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:303
-msgid "Publish"
-msgstr "Julkaise"
-
-#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Keskeiset julkaisupalvelut"
-
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
-msgid "Video privacy _setting:"
-msgstr "Videoiden _yksityisyysasetukset:"
-
-#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+#: plugins/shotwell-transitions/BlindsEffect.vala:20
 msgid "Blinds"
-msgstr ""
+msgstr "Kaihtimet"
 
-#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+#: plugins/shotwell-transitions/ChessEffect.vala:20
 msgid "Chess"
 msgstr "Shakki"
 
-#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+#: plugins/shotwell-transitions/CircleEffect.vala:20
 msgid "Circle"
 msgstr "Ympyrä"
 
-#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+#: plugins/shotwell-transitions/CirclesEffect.vala:20
 msgid "Circles"
 msgstr "Ympyrät"
 
-#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+#: plugins/shotwell-transitions/ClockEffect.vala:20
 msgid "Clock"
 msgstr "Kello"
 
-#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+#: plugins/shotwell-transitions/CrumbleEffect.vala:20
 msgid "Crumble"
 msgstr "Mureneminen"
 
-#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+#: plugins/shotwell-transitions/FadeEffect.vala:20
 msgid "Fade"
 msgstr "Häivytys"
 
-#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+#: plugins/shotwell-transitions/shotwell-transitions.vala:28
+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."
+msgstr ""
+"Tekijänoikeus 2010 Maxim Kartashev, Tekijänoikeus 2016 Software Freedom "
+"Conservancy Inc."
+
+#: plugins/shotwell-transitions/SlideEffect.vala:20
 msgid "Slide"
 msgstr "Liu'utus"
 
-#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+#: plugins/shotwell-transitions/SquaresEffect.vala:20
 msgid "Squares"
 msgstr "Neliöt"
 
-#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+#: plugins/shotwell-transitions/StripesEffect.vala:20
 msgid "Stripes"
 msgstr "Viivat"
 
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "Keskeiset diaesityssiirtymät"
-
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2015 Yorba Foundation"
-msgstr ""
-"Tekijänoikeus 2010 Maxim Kartashev, tekijänoikeus 2011-2015 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 ""
 
-#: ../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 "Tietohakemiston %s luominen epäonnistui: %s"
 
 #. If XDG yarfed, use ~/Pictures
-#: ../src/AppDirs.vala:152
+#: src/AppDirs.vala:168
 msgid "Pictures"
 msgstr "Kuvat"
 
-#: ../src/AppDirs.vala:190
+#: src/AppDirs.vala:206
 #, c-format
 msgid "Unable to create temporary directory %s: %s"
 msgstr "Tilapäishakemiston %s luominen epäonnistui: %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 "Tietoalihakemiston %s luominen epäonnistui: %s"
 
-#: ../src/AppDirs.vala:220
+#: src/AppDirs.vala:236
 #, c-format
 msgid "Could not make directory %s writable"
 msgstr ""
 
-#: ../src/AppDirs.vala:223
+#: src/AppDirs.vala:239
 #, c-format
 msgid "Could not make directory %s writable: %s"
 msgstr ""
 
-#: ../src/AppWindow.vala:53
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "Kiinnitä työkalurivi"
 
-#: ../src/AppWindow.vala:54
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "Kiinnitä työkalurivi auki"
 
-#: ../src/AppWindow.vala:59
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Poistu koko näytön tilasta"
 
-#: ../src/AppWindow.vala:525
-msgid "_Contents"
-msgstr "_Sisältö"
-
-#: ../src/AppWindow.vala:530
-msgid "_Frequently Asked Questions"
-msgstr "_Usein kysytyt kysymykset"
-
-#: ../src/AppWindow.vala:535
-msgid "_Report a Problem..."
-msgstr "_Ilmoita ongelmasta..."
-
-#: ../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:532 src/AppWindow.vala:553 src/AppWindow.vala:570
+#: src/data_imports/DataImportsUI.vala:301
+#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
+#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
+#: src/Resources.vala:157
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: ../src/AppWindow.vala:682
-#, c-format
+#: src/AppWindow.vala:580
+#, fuzzy, c-format
+#| msgid ""
+#| "A fatal error occurred when accessing Shotwell's library.  Shotwell "
+#| "cannot continue.\n"
+#| "\n"
+#| "%s"
 msgid ""
-"A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
+"A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
 "continue.\n"
 "\n"
 "%s"
@@ -1107,346 +2482,688 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:702
-msgid "Visit the Yorba web site"
-msgstr "Vieraile Yorban verkkosivuilla"
+#: src/AppWindow.vala:600
+#| msgid "Visit the Shotwell home page"
+msgid "Visit the Shotwell web site"
+msgstr "Vieraile Shotwellin verkkosivustolla"
 
-#: ../src/AppWindow.vala:714
+#: src/AppWindow.vala:612
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Ohjeiden näyttäminen ei onnistu: %s"
 
-#: ../src/AppWindow.vala:722
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr ""
 
-#: ../src/AppWindow.vala:730
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Usein kysyttyjen kysymysten näyttäminen epäonnistui: %s"
 
-#: ../src/BatchImport.vala:26
+#: src/BatchImport.vala:26
 msgid "Success"
 msgstr "Onnistui"
 
-#: ../src/BatchImport.vala:29
+#: src/BatchImport.vala:29
 msgid "File error"
 msgstr "Tiedostovirhe"
 
-#: ../src/BatchImport.vala:32
+#: src/BatchImport.vala:32
 msgid "Unable to decode file"
 msgstr "Tiedostoa ei voida purkaa"
 
-#: ../src/BatchImport.vala:35
+#: src/BatchImport.vala:35
 msgid "Database error"
 msgstr "Tietokantavirhe"
 
-#: ../src/BatchImport.vala:38
+#: src/BatchImport.vala:38
 msgid "User aborted import"
 msgstr "Käyttäjä keskeytti tuonnin"
 
-#: ../src/BatchImport.vala:41
+#: src/BatchImport.vala:41
 msgid "Not a file"
 msgstr "Ei ole tiedosto"
 
-#: ../src/BatchImport.vala:44
+#: src/BatchImport.vala:44
 msgid "File already exists in database"
 msgstr "Tämä tiedosto on jo tietokannassa"
 
-#: ../src/BatchImport.vala:47
+#: src/BatchImport.vala:47
 msgid "Unsupported file format"
 msgstr "Tiedostomuotoa ei tueta"
 
-#: ../src/BatchImport.vala:50
+#: src/BatchImport.vala:50
 msgid "Not an image file"
 msgstr "Tiedosto ei ole kuvatiedosto"
 
-#: ../src/BatchImport.vala:53
+#: src/BatchImport.vala:53
 msgid "Disk failure"
 msgstr "Levyongelma"
 
-#: ../src/BatchImport.vala:56
+#: src/BatchImport.vala:56
 msgid "Disk full"
 msgstr "Levy on täynnä"
 
-#: ../src/BatchImport.vala:59
+#: src/BatchImport.vala:59
 msgid "Camera error"
 msgstr "Kameravirhe"
 
-#: ../src/BatchImport.vala:62
+#: src/BatchImport.vala:62
 msgid "File write error"
 msgstr "Tiedoston kirjoitusvirhe"
 
-#: ../src/BatchImport.vala:65
+#: src/BatchImport.vala:65
 msgid "Corrupt image file"
 msgstr "Rikkinäinen kuvatiedosto"
 
-#: ../src/BatchImport.vala:68
+#: src/BatchImport.vala:68
 #, c-format
 msgid "Imported failed (%d)"
 msgstr "Tuonti epäonnistui (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2637
+#: src/camera/Branch.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
+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."
+msgid ""
+"Unable to unmount camera. Try unmounting the camera from the file manager."
+msgstr ""
+"Kameran irrottaminen ei onnistu. Yritä irrottaa kamera "
+"tiedostonhallintaohjelman kautta."
+
+#. hide duplicates checkbox
+#: src/camera/ImportPage.vala:783
+msgid "Hide photos already imported"
+msgstr "Piilota jo tuodut kuvat"
+
+#: src/camera/ImportPage.vala:784
+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
+msgid "Import _Selected"
+msgstr "Tuo _valitut"
+
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "Tuo _kaikki"
+
+#: src/camera/ImportPage.vala:857
+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"
+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?"
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it. Continue?"
+msgstr ""
+"Shotwellin on irrotettava kamera tiedostojärjestelmästä, jotta kameraa "
+"voidaan käyttää. Jatketaanko?"
+
+#: src/camera/ImportPage.vala:1027
+msgid "_Unmount"
+msgstr "_Irrota"
+
+#: src/camera/ImportPage.vala:1032
+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."
+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 ""
+"Toinen ohjelma on lukinnut kameran. Shotwell voi käyttää kameraa vain, jos "
+"sitä ei ole lukittu. Sulje muut kameraa käyttävät ohjelmat ja yritä "
+"uudelleen."
+
+#: src/camera/ImportPage.vala:1047
+msgid "Please close any other application using the camera."
+msgstr "Sulje muut kameraa käyttävät ohjelmat."
+
+#: src/camera/ImportPage.vala:1052
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"Esikatselukuvien noutaminen kamerasta ei onnistu:\n"
+"%s"
+
+#: src/camera/ImportPage.vala:1069
+#| msgid "Unmounting..."
+msgid "Unmounting…"
+msgstr "Irrotetaan…"
+
+#: src/camera/ImportPage.vala:1160
+#| msgid "Starting import, please wait..."
+msgid "Starting import, please wait…"
+msgstr "Käynnistetään tuonti, odota…"
+
+#: src/camera/ImportPage.vala:1177
+msgid "Fetching photo information"
+msgstr "Noudetaan kuvan tietoja"
+
+#: src/camera/ImportPage.vala:1535
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "Noudetaan esikatseluversiota kuvasta %s"
+
+#: src/camera/ImportPage.vala:1651
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Kameraa ei voitu lukita: %s"
+
+#: src/camera/ImportPage.vala:1736
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "_Keep"
+msgstr "_Säilytä"
+
+#: src/camera/ImportPage.vala:1772
+msgid "Removing photos/videos from camera"
+msgstr "Poistetaan kuvia ja videoita kamerasta"
+
+#: 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] "%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
+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"
+msgid "Send _To…"
+msgstr "Lähe_tä…"
+
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2470 src/Resources.vala:220
+msgid "Set as _Desktop Background"
+msgstr "Aseta _työpöydän taustakuvaksi"
+
+#: src/CollectionPage.vala:86 src/Resources.vala:286
+msgid "_Duplicate"
+msgstr "_Kopioi"
+
+#: src/CollectionPage.vala:94
+#| msgid "Fulls_creen"
+msgid "Fullscreen"
+msgstr "Koko näyttö"
+
+#: src/CollectionPage.vala:96 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "_Diaesitys"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2638
-msgid "Play a slideshow"
-msgstr "Aloita diaesitys"
+#: src/CollectionPage.vala:104 src/Resources.vala:139 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
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Kierrä _vasemmalle"
+
+#: src/CollectionPage.vala:110 src/Resources.vala:149 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
+#: 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
+#: 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
+#: 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
+msgid "_Copy Color Adjustments"
+msgstr "_Kopioi värisäädöt"
+
+#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "_Liitä värisäädöt"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:129
+#| msgid "Adjust Date and Time"
+msgid "Adjust Date and Time…"
+msgstr "Muuta päiväystä ja kellonaikaa…"
+
+#: src/CollectionPage.vala:137 src/Resources.vala:319
+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
+msgid "Open With RA_W Editor"
+msgstr "Avaa _RAW-muokkaimessa"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:167
+msgid "_Play"
+msgstr "T_oista"
+
+#: src/CollectionPage.vala:409
 msgid "Export Photo/Video"
 msgstr "Vie kuvia tai videoita"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:409
 msgid "Export Photos/Videos"
 msgstr "Vie kuvia/videoita"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3211
+#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994
 msgid "Export Photo"
 msgstr "Vie kuvat"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+#: src/CollectionPage.vala:411 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Vie kuvia"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Rotating"
 msgstr "Kierretään"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Undoing Rotate"
 msgstr "Kumotaan kierto"
 
-#: ../src/CollectionPage.vala:570
+#: src/CollectionPage.vala:523
 msgid "Flipping Horizontally"
 msgstr "Kääntö vaakasuunnassa"
 
-#: ../src/CollectionPage.vala:571
+#: src/CollectionPage.vala:524
 msgid "Undoing Flip Horizontally"
 msgstr "Kumotaan vaakasuuntainen kääntö"
 
-#: ../src/CollectionPage.vala:580
+#: src/CollectionPage.vala:533
 msgid "Flipping Vertically"
 msgstr "Kääntö pystysuunnassa"
 
-#: ../src/CollectionPage.vala:581
+#: src/CollectionPage.vala:534
 msgid "Undoing Flip Vertically"
 msgstr "Kumotaan pystysuuntainen kääntö"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Reverting"
 msgstr "Palautetaan"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Undoing Revert"
 msgstr "Kumotaan palautus"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Enhancing"
 msgstr "Parannetaan"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Undoing Enhance"
 msgstr "Kumotaan parannus"
 
-#: ../src/Commands.vala:853
+#: src/Commands.vala:857
 msgid "Applying Color Transformations"
 msgstr "Toteutetaan värimuutoksia"
 
-#: ../src/Commands.vala:853
+#: src/Commands.vala:857
 msgid "Undoing Color Transformations"
 msgstr "Kumotaan värimuutoksia"
 
-#: ../src/Commands.vala:1003
+#: src/Commands.vala:1007
 msgid "Creating New Event"
 msgstr "Luodaan uusi tapahtuma"
 
-#: ../src/Commands.vala:1004
+#: src/Commands.vala:1008
 msgid "Removing Event"
 msgstr "Poistetaan tapahtuma"
 
-#: ../src/Commands.vala:1013
+#: src/Commands.vala:1017
 msgid "Moving Photos to New Event"
 msgstr "Siirretään kuvia uuteen tapahtumaan"
 
-#: ../src/Commands.vala:1014
+#: src/Commands.vala:1018
 msgid "Setting Photos to Previous Event"
 msgstr "Asetetaan kuvia edelliseen tapahtumaan"
 
-#: ../src/Commands.vala:1071
+#: src/Commands.vala:1075
 msgid "Merging"
 msgstr "Yhdistetään"
 
-#: ../src/Commands.vala:1072
+#: src/Commands.vala:1076
 msgid "Unmerging"
 msgstr "Kumotaan yhdistäminen"
 
-#: ../src/Commands.vala:1081
+#: src/Commands.vala:1085
 msgid "Duplicating photos"
 msgstr "Tehdään kuvista kopioita"
 
-#: ../src/Commands.vala:1081
+#: src/Commands.vala:1085
 msgid "Removing duplicated photos"
 msgstr "Poistetaan kuvien kopiot"
 
-#: ../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] "Yhdestä kuvasta ei voitu tehdä kopiota tiedostovirheen vuoksi"
 msgstr[1] "%d kuvasta ei voitu tehdä kopiota tiedostovirheen vuoksi"
 
-#: ../src/Commands.vala:1191
+#: src/Commands.vala:1195
 msgid "Restoring previous rating"
 msgstr "Palautetaan edellinen arvostelu"
 
-#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Increasing ratings"
 msgstr "Korotetaan arvostelua"
 
-#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Decreasing ratings"
 msgstr "Lasketaan arvostelua"
 
-#: ../src/Commands.vala:1252
+#: src/Commands.vala:1256
 msgid "Setting RAW developer"
 msgstr "Asetetaan RAW-kehitin"
 
-#: ../src/Commands.vala:1252
+#: src/Commands.vala:1256
 msgid "Restoring previous RAW developer"
 msgstr "Palautetaan edellinen RAW-kehitin"
 
-#: ../src/Commands.vala:1253
+#: src/Commands.vala:1257
 msgid "Set Developer"
 msgstr "Aseta kehitin"
 
-#: ../src/Commands.vala:1343
+#: src/Commands.vala:1347
 msgid "Original photo could not be adjusted."
 msgstr "Alkuperäistä kuvaa ei voitu säätää."
 
-#: ../src/Commands.vala:1364
+#: src/Commands.vala:1368
 msgid "Adjusting Date and Time"
 msgstr "Muutetaan päiväys ja kellonaika"
 
-#: ../src/Commands.vala:1364
+#: src/Commands.vala:1368
 msgid "Undoing Date and Time Adjustment"
 msgstr "Kumotaan päiväyksen ja kellonajan muutokset"
 
-#: ../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] "Yhtä alkuperäistä kuvaa ei voitu säätää."
 msgstr[1] "Seuraavia alkuperäisiä kuvia ei voitu säätää."
 
-#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+#: src/Commands.vala:1401 src/Commands.vala:1425
 msgid "Time Adjustment Error"
 msgstr "Virhe muutettaessa aikaa"
 
-#: ../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] "Seuraavan tiedoston aikamuutoksia ei voitu kumota."
 msgstr[1] "Seuraavien tiedostojen aikamuutoksia ei voitu kumota."
 
-#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+#: src/Commands.vala:1637 src/Commands.vala:1660
 msgid "Create Tag"
 msgstr "Luo tunniste"
 
-#: ../src/Commands.vala:1691
+#: src/Commands.vala:1695
 #, c-format
-msgid "Move Tag \"%s\""
-msgstr "Siirrä tunniste \"%s\""
+#| msgid "Move Tag \"%s\""
+msgid "Move Tag “%s”"
+msgstr "Siirrä tunniste “%s”"
 
-#: ../src/Commands.vala:2343
+#: src/Commands.vala:2347
 msgid "Move Photos to Trash"
 msgstr "Siirrä kuvat roskakoriin"
 
-#: ../src/Commands.vala:2343
+#: src/Commands.vala:2347
 msgid "Restore Photos from Trash"
 msgstr "Palauta kuvat roskakorista"
 
-#: ../src/Commands.vala:2344
+#: src/Commands.vala:2348
 msgid "Move the photos to the Shotwell trash"
 msgstr "Siirrä kuvat Shotwellin roskakoriin"
 
-#: ../src/Commands.vala:2344
+#: src/Commands.vala:2348
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Palauta kuvat takaisin Shotwellin kirjastoon"
 
-#: ../src/Commands.vala:2363
+#: src/Commands.vala:2367
 msgid "Moving Photos to Trash"
 msgstr "Siirretään kuvia roskakoriin"
 
-#: ../src/Commands.vala:2363
+#: src/Commands.vala:2367
 msgid "Restoring Photos From Trash"
 msgstr "Palautetaan kuvia roskakorista"
 
-#: ../src/Commands.vala:2449
+#: src/Commands.vala:2453
 msgid "Flag selected photos"
 msgstr "Merkitse valitut kuvat"
 
-#: ../src/Commands.vala:2450
+#: src/Commands.vala:2454
 msgid "Unflag selected photos"
 msgstr "Poista merkintä valituista kuvista"
 
-#: ../src/Commands.vala:2451
+#: src/Commands.vala:2455
 msgid "Flagging selected photos"
-msgstr ""
+msgstr "Asetetaan liput valituille kuville"
 
-#: ../src/Commands.vala:2452
+#: src/Commands.vala:2456
 msgid "Unflagging selected photos"
-msgstr ""
+msgstr "Poistetan liput valituilta kuvilta"
 
-#: ../src/Commands.vala:2459
+#: src/Commands.vala:2463
 msgid "Flag"
 msgstr "Merkitse"
 
-#: ../src/Commands.vala:2459
+#: src/Commands.vala:2463
 msgid "Unflag"
 msgstr "Poista merkintä"
 
-#: ../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-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:"
+
+#: src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr ""
+"Yritä tuoda jostain toisesta palvelusta. Valitse jokin yllä olevasta "
+"valikosta."
+
+#: 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 ""
+
+#: src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "Tietokantatiedosto:"
+
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+msgid "_Import"
+msgstr "_Tuo"
+
+#: src/data_imports/DataImportsUI.vala:220
+msgid "Import From Application"
+msgstr "Tuo sovelluksesta"
+
+#: src/data_imports/DataImportsUI.vala:221
+msgid "Import media _from:"
+msgstr "Tuo media _kohteesta:"
+
+#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+msgid "_Close"
+msgstr "_Sulje"
+
+#: src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr ""
+
+#: src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "Kuvatietokantaa %s ei voida avata tai luoda: virhekoodi %d"
+
+#: src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"Kuvatietokantatiedostoon kirjoitus epäonnistui:\n"
+" %s"
+
+#: src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"Virhe yrittäessä käyttää tietokantatiedostoa:\n"
+" %s\n"
+"\n"
+"Virhe: \n"
+"%s"
+
+#: src/db/DatabaseTable.vala:92
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to write to photo database file:\n"
+#| " %s"
+msgid "Unable to restore photo database %s"
+msgstr ""
+"Kuvatietokantatiedostoon kirjoitus epäonnistui:\n"
+" %s"
+
+#: src/DesktopIntegration.vala:121
 #, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
 msgstr "Nautiluksen Lähetä kohteeseen -laajennosta ei voida käynnistää: %s"
 
-#: ../src/DesktopIntegration.vala:129
+#: src/DesktopIntegration.vala:129
 msgid "Send To"
 msgstr "Lähetä"
 
-#: ../src/DesktopIntegration.vala:174
+#: src/DesktopIntegration.vala:174
 #, c-format
 msgid "Unable to export background to %s: %s"
 msgstr "Taustakuvaa ei voitu viedä kohteeseen %s: %s"
 
-#: ../src/DesktopIntegration.vala:311
+#: src/DesktopIntegration.vala:311
 #, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Työpöydän diaesitystä ei voida valmistella: %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] "Tämä poistaa tunnisteen ”%s” yhdestä kuvasta. Jatketaanko?"
-msgstr[1] "Tämä poistaa tunnisteen ”%s” %d kuvasta. Jatketaanko?"
+#| 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: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:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Poista"
 
-#: ../src/Dialogs.vala:25
+#: src/Dialogs.vala:25
 #, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
-msgstr "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 "Tämä poistaa tallennetun haun “%s”. Jatketaanko?"
 
-#: ../src/Dialogs.vala:35
+#: src/Dialogs.vala:36
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -1456,11 +3173,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/Dialogs.vala:39
+#: src/Dialogs.vala:40
 msgid "_Switch Developer"
 msgstr "_Vaihda kehitintä"
 
-#: ../src/Dialogs.vala:58
+#: src/Dialogs.vala:59
 msgid "Export Video"
 msgstr "Vie video"
 
@@ -1469,14 +3186,14 @@ msgstr "Vie video"
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: ../src/Dialogs.vala: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 ""
 
-#: ../src/Dialogs.vala:124
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -1484,7 +3201,7 @@ msgstr ""
 "Seuraavaa kuvaa ei voitu viedä tiedostovirheen vuoksi.\n"
 "\n"
 
-#: ../src/Dialogs.vala:130
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -1497,60 +3214,62 @@ 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 "Muokkaamaton"
 
-#: ../src/Dialogs.vala:148
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "Nykyinen"
 
 #. layout controls
-#: ../src/Dialogs.vala:213
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "_Muoto:"
 
-#: ../src/Dialogs.vala:216
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Laatu:"
 
-#: ../src/Dialogs.vala:219
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "_Skaalausrajoite:"
 
-#: ../src/Dialogs.vala:222
+#: src/Dialogs.vala:230
 msgid "_Pixels:"
 msgstr "_Pikselit:"
 
-#: ../src/Dialogs.vala:225
-msgid "Export metadata"
-msgstr "Vie metatiedot"
+#: src/Dialogs.vala:234
+#| msgid "Export metadata"
+msgid "Export _metadata:"
+msgstr "Vie _metatiedot:"
 
-#: ../src/Dialogs.vala:459
-msgid "Save Details..."
-msgstr "Tallenna tiedot..."
+#: src/Dialogs.vala:478
+#| msgid "Save Details"
+msgid "Save Details…"
+msgstr "Tallenna tiedot…"
 
-#: ../src/Dialogs.vala:460
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Tallenna tiedot"
 
-#: ../src/Dialogs.vala:475
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(ja %d muuta)\n"
 
-#: ../src/Dialogs.vala:528
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "Tuontitulosten raportti"
 
-#: ../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] "Yritettiin tuoda %d tiedosto."
 msgstr[1] "Yritettiin tuoda %d tiedostoa."
 
-#: ../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."
@@ -1560,40 +3279,45 @@ msgstr[1] "Niistä %d tiedostoa tuotiin onnistuneesti."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:547
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Kuvien/videoiden tuomatta jätetyt kaksoiskappaleet:"
 
-#: ../src/Dialogs.vala:551
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr ""
 
 #.
 #. 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 "Kameravirheiden vuoksi tuomatta jääneet kuvat/videot:"
 
-#: ../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 "virheviesti:"
 
 #.
 #. 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:"
+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:"
 
 #.
 #. 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 "
+#| "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 ""
 "Tuomatta jääneet kuvat ja videot, koska ne eivät ole Shotwellin "
@@ -1602,64 +3326,67 @@ 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 "
+#| "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 ""
-"Tuomatta jätetyt kuvat/videot, koska Shotwell ei voinut kopioida niitä "
+"Tuomatta jääneet kuvat ja videot, koska Shotwell ei voinut kopioida niitä "
 "kirjastoonsa:"
 
-#: ../src/Dialogs.vala:610
+#: src/Dialogs.vala:629
 #, c-format
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 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 "Kuvat ja videoita, joita ei tuotu, koska ne ovat rikki:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:637
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Muiden syiden vuoksi tuomatta jääneet kuvat ja videot:"
 
-#: ../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] "Yhtä kuvan kaksoiskappaletta ei tuotu:\n"
 msgstr[1] "%d kuvan kaksoiskappaletta ei tuotu:\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] "Yhtä videon kaksoiskappaletta ei tuotu:\n"
 msgstr[1] "%d videon kaksoiskappaletta ei tuotu:\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] "Yhtä kuvan tai videon kaksoiskappaletta ei tuotu:\n"
 msgstr[1] "%d kuvan tai videon kaksoiskappaletta ei tuotu:\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] "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: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"
@@ -1667,7 +3394,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:683
+#: src/Dialogs.vala:702
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1678,7 +3405,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d kuvan tai videon tuonti epäonnistui tiedosto- tai laitevirheen vuoksi:\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"
@@ -1687,7 +3414,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d tiedoston tuonti epäonnistui tiedosto- tai laitteistovirheen takia:\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"
@@ -1701,7 +3428,7 @@ msgstr[1] ""
 "%d:n kuvan tuominen epäonnistui, koska kuvakirjaston kansioon ei ollut "
 "kirjoitusoikeutta:\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"
@@ -1715,7 +3442,7 @@ msgstr[1] ""
 "%d:n videon tuominen epäonnistui, koska kuvakirjaston kansioon ei ollut "
 "kirjoitusoikeutta:\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 "
@@ -1730,7 +3457,7 @@ msgstr[1] ""
 "%d:n kuvan/videon tuominen epäonnistui, koska kuvakirjaston kansioon ei "
 "ollut kirjoitusoikeutta:\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"
@@ -1744,56 +3471,56 @@ msgstr[1] ""
 "%d:n tiedoston tuominen epäonnistui, koska kuvakirjaston kansioon ei ollut "
 "kirjoitusoikeutta:\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] "Yhden kuvan tuonti epäonnistui kameravirheen vuoksi:\n"
 msgstr[1] "%d kuvan tuonti epäonnistui kameravirheen vuoksi:\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] "Yhden videon tuonti epäonnistui kameravirheen vuoksi:\n"
 msgstr[1] "%d videon tuonti epäonnistui kameravirheen vuoksi:\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] "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: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] "1 tiedoston tuonti epäonnistui kameravirheen takia:\n"
 msgstr[1] "%d tiedoston tuonti epäonnistui kameravirheen takia:\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] "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: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] "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: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] "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: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"
@@ -1804,7 +3531,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:772
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1813,56 +3540,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:787
+#: src/Dialogs.vala:806
 #, 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: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] "Ohitettiin yksi kuva, koska käyttäjä perui:\n"
 msgstr[1] "Ohitettiin %d kuvaa, koska käyttäjä perui:\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] "Ohitettiin yksi video, koska käyttäjä perui:\n"
 msgstr[1] "Ohitettiin %d videota, koska käyttäjä perui:\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] "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: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 tiedosto ohitettu käyttäjän peruttua:\n"
 msgstr[1] "%d tiedostoa ohitettu käyttäjän peruttua:\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] "Yhden kuvan tuonti onnistui.\n"
 msgstr[1] "%d kuvan tuonti onnistui.\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] "Yhden videon tuonti onnistui.\n"
 msgstr[1] "%d videon tuonti onnistui.\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"
@@ -1871,183 +3598,183 @@ 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:843
+#: src/Dialogs.vala:862
 msgid "No photos or videos imported.\n"
 msgstr "Yhtään kuvaa tai videota ei tuotu.\n"
 
-#: ../src/Dialogs.vala:850 ../src/Dialogs.vala:869
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "Tuonti on valmis"
 
-#: ../src/Dialogs.vala:1155
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../src/Dialogs.vala:1158
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: ../src/Dialogs.vala:1162
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../src/Dialogs.vala:1165
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 päivä"
 
-#: ../src/Dialogs.vala:1315 ../src/Resources.vala:236
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Nimeä tapahtuma uudelleen"
 
-#: ../src/Dialogs.vala:1315
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Nimi:"
 
 #. Dialog title
-#. Button label
-#: ../src/Dialogs.vala:1326 ../src/Resources.vala:308
+#: src/Dialogs.vala:1328
+#| msgid "Edit Title"
+msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Muokkaa nimeä"
 
-#: ../src/Dialogs.vala:1327 ../src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Nimi:"
 
 #. Dialog title
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:315
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Muokkaa tapahtuman kommenttia"
 
-#: ../src/Dialogs.vala:1344
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Muokkaa kuvan tai videon kommenttia"
 
-#: ../src/Dialogs.vala:1345 ../src/Properties.vala:628
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Kommentti:"
 
-#: ../src/Dialogs.vala:1361
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Siirrä tiedosto roskakoriin"
 msgstr[1] "_Siirtä tiedostot roskakoriin"
 
-#: ../src/Dialogs.vala:1365
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "Poista k_irjastosta"
 
-#: ../src/Dialogs.vala:1385 ../src/camera/ImportPage.vala:1741
-msgid "_Keep"
-msgstr "_Säilytä"
-
-#: ../src/Dialogs.vala:1408
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Kumotaanko ulkoinen muokkaus?"
 
-#: ../src/Dialogs.vala:1408
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Kumotaanko ulkoiset muokkaukset?"
 
-#: ../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?"
+msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
-"This will destroy all changes made to %d external files.  Continue?"
+"This will destroy all changes made to %d external files. Continue?"
 msgstr[0] ""
 "Tämä tuhoaa kaikki ulkoiseen tiedostoon tehdyt muutokset. Haluatko jatkaa?"
 msgstr[1] ""
 "Tämä tuhoaa kaikki %d ulkoiseen tiedostoon tehdyt muutokset. Haluatko jatkaa?"
 
-#: ../src/Dialogs.vala:1414
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "_Kumoa ulkoiset muokkaukset"
 
-#: ../src/Dialogs.vala:1414
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "_Kumoa ulkoiset muokkaukset"
 
-#: ../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?"
+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:1442 ../src/Resources.vala:178
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../src/Dialogs.vala:1443
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Poista kuvia kirjastosta"
 
-#: ../src/Dialogs.vala:1443
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Poista kuvat kirjastosta"
 
-#: ../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 "AM"
 
-#: ../src/Dialogs.vala:1689
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "PM"
 
-#: ../src/Dialogs.vala:1690
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "24 h"
 
-#: ../src/Dialogs.vala:1705
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Siirrä kuvia ja videoita saman verran"
 
-#: ../src/Dialogs.vala:1710
+#: src/Dialogs.vala:1719
 msgid "Set _all photos/videos to this time"
 msgstr "_Aseta kaikki kuvat ja videot valittuun aikaan"
 
-#: ../src/Dialogs.vala:1717
+#: src/Dialogs.vala:1725
+#| msgid "_Modify original photo file"
 msgid "_Modify original photo file"
-msgstr "M_uokkaa alkuperäistä kuvatiedostoa"
-
-#: ../src/Dialogs.vala:1717
-msgid "_Modify original photo files"
-msgstr "M_uokkaa alkuperäisiä kuvatiedostoja"
+msgid_plural "_Modify original photo files"
+msgstr[0] "M_uokkaa alkuperäistä kuvatiedostoa"
+msgstr[1] "M_uokkaa alkuperäisiä kuvatiedostoja"
 
-#: ../src/Dialogs.vala:1720
+#: src/Dialogs.vala:1729
+#| msgid "_Modify original file"
 msgid "_Modify original file"
-msgstr "_Muokkaa alkuperäisiä tiedostoja"
-
-#: ../src/Dialogs.vala:1720
-msgid "_Modify original files"
-msgstr "_Muokkaa alkuperäisiä tiedostoja"
+msgid_plural "_Modify original files"
+msgstr[0] "_Muokkaa alkuperäistä tiedostoa"
+msgstr[1] "_Muokkaa alkuperäisiä tiedostoja"
 
-#: ../src/Dialogs.vala:1806
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Alkuperäinen: "
 
-#: ../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, %H.%M.%S"
 
-#: ../src/Dialogs.vala:1897
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2056,7 +3783,7 @@ msgstr ""
 "Kuvausaikaa siirretään eteenpäin\n"
 "%d %s, %d %s, %d %s, ja %d %s."
 
-#: ../src/Dialogs.vala:1898
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2065,31 +3792,31 @@ msgstr ""
 "Kuvausaikaa siirretään taaksepäin\n"
 "%d %s, %d %s, %d %s, ja %d %s."
 
-#: ../src/Dialogs.vala:1900
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "päivä"
 msgstr[1] "päivää"
 
-#: ../src/Dialogs.vala:1901
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "tunti"
 msgstr[1] "tuntia"
 
-#: ../src/Dialogs.vala:1902
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuutti"
 msgstr[1] "minuuttia"
 
-#: ../src/Dialogs.vala:1903
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekunti"
 msgstr[1] "sekuntia"
 
-#: ../src/Dialogs.vala:1947
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -2108,131 +3835,142 @@ msgstr[1] ""
 "\n"
 "ja %d muuta."
 
-#: ../src/Dialogs.vala:1969 ../src/Dialogs.vala:1996
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Tunnisteet (pilkulla erotettuna):"
 
-#: ../src/Dialogs.vala:2076
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Tervetuloa!"
 
-#: ../src/Dialogs.vala:2083
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Tervetuloa Shotwelliin!"
 
-#: ../src/Dialogs.vala:2087
+#: 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:2106
+#: 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:2107
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Vedä ja pudota kuvia Shotwellin ikkunaan"
 
-#: ../src/Dialogs.vala:2108
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "Tuo kuvia tietokoneeseen liitetystä kamerasta"
 
-#: ../src/Dialogs.vala:2118
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Tuo kuvia %s-hakemistosta"
 
-#: ../src/Dialogs.vala:2125
+#: 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:2135
-msgid "_Don't show this message again"
+#: 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:2170
+#: 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 ghelp: URIs.
-#: ../src/Dialogs.vala:2311 ../src/Dialogs.vala:2315
+#. 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:2324
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Vuosi%sKuukausi%sPäivä"
 
-#: ../src/Dialogs.vala:2326
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "Vuosi%sKuukausi"
 
-#: ../src/Dialogs.vala:2328
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Vuosi%sKuukausi-Päivä"
 
-#: ../src/Dialogs.vala:2330
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "Vuosi-Kuukausi-Päivä"
 
-#: ../src/Dialogs.vala:2331 ../src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Oma koko"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2568
+#: 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:2670
+#: src/Dialogs.vala:2692
 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:2675
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "_Kopioi kuvat"
 
-#: ../src/Dialogs.vala:2676
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "_Tuo vanhasta sijainnista"
 
-#: ../src/Dialogs.vala:2677
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Tuo kirjastoon"
 
-#: ../src/Dialogs.vala:2687 ../src/PhotoPage.vala:3087
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870
 msgid "Remove From Library"
 msgstr "Poista kirjastosta"
 
-#: ../src/Dialogs.vala:2688 ../src/PhotoPage.vala:3087
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870
 msgid "Removing Photo From Library"
 msgstr "Poistetaan kuvia kirjastosta"
 
-#: ../src/Dialogs.vala:2688
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Poistetaan kuvia kirjastosta"
 
-#: ../src/Dialogs.vala:2702
-#, c-format
+#: src/Dialogs.vala:2724
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the photo/video from your Shotwell library.  Would you "
+#| "also like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d photos/videos from your Shotwell library.  Would you "
+#| "also like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the photo/video from your Shotwell library.  Would you also "
+"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] ""
@@ -2246,15 +3984,25 @@ msgstr[1] ""
 "\n"
 "Tätä toimintoa ei voi perua."
 
-#: ../src/Dialogs.vala:2706
-#, c-format
+#: src/Dialogs.vala:2728
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the video from your Shotwell library.  Would you also "
+#| "like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d videos from your Shotwell library.  Would you also "
+#| "like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the video from your Shotwell library.  Would you also like "
+"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."
@@ -2269,15 +4017,25 @@ msgstr[1] ""
 "\n"
 "Tätä toimintoa ei voi perua."
 
-#: ../src/Dialogs.vala:2710
-#, c-format
+#: src/Dialogs.vala:2732
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the photo from your Shotwell library.  Would you also "
+#| "like to move the file to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
+#| msgid_plural ""
+#| "This will remove %d photos from your Shotwell library.  Would you also "
+#| "like to move the files to your desktop trash?\n"
+#| "\n"
+#| "This action cannot be undone."
 msgid ""
-"This will remove the photo from your Shotwell library.  Would you also like "
+"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."
@@ -2292,12 +4050,18 @@ msgstr[1] ""
 "\n"
 "Tätä toimintoa ei voi perua."
 
-#: ../src/Dialogs.vala:2742
+#: 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] ""
 "Kuvaa tai videota ei voi siirtää työpöydän roskakoriin. Poistetaanko tämä "
 "tiedosto?"
@@ -2306,185 +4070,619 @@ msgstr[1] ""
 "tiedostot?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2759
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "Kuvaa tai videota ei voi poistaa."
 msgstr[1] "%d kuvaa tai videota ei voi poistaa."
 
-#: ../src/Dimensions.vala:23
+#: src/Dimensions.vala:23
 msgid "Width"
 msgstr "Leveys"
 
-#: ../src/Dimensions.vala:26
+#: src/Dimensions.vala:26
 msgid "Height"
 msgstr "Korkeus"
 
+#: src/direct/DirectPhotoPage.vala:99
+#, c-format
+msgid "%s does not exist."
+msgstr "%s ei ole olemassa."
+
+#: src/direct/DirectPhotoPage.vala:101
+#, c-format
+msgid "%s is not a file."
+msgstr "%s ei ole tiedosto."
+
+#: src/direct/DirectPhotoPage.vala:103
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+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
+msgid "_Save"
+msgstr "_Tallenna"
+
+#: src/direct/DirectPhotoPage.vala:304
+msgid "_Save a Copy"
+msgstr "_Tallenna kopio"
+
+#: src/direct/DirectPhotoPage.vala:307
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "Hävitetäänkö tiedostoon %s tehdyt muutokset?"
+
+#: src/direct/DirectPhotoPage.vala:308
+msgid "Close _without Saving"
+msgstr "Sulje _tallentamatta"
+
+#: src/direct/DirectPhotoPage.vala:341
+#, 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
+msgid "Save As"
+msgstr "Tallenna nimellä"
+
 #. verify this is a directory
-#: ../src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:889
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Kohdetta %s ei voida seurata, koska se ei ole hakemisto (%s)"
 
+#: src/editing_tools/EditingTools.vala:666
+msgid "Return to current photo dimensions"
+msgstr "Palaa kuvan nykyisiin mittoihin"
+
+#: src/editing_tools/EditingTools.vala:669
+msgid "Set the crop for this photo"
+msgstr "Aseta kuvan rajaus"
+
+#: src/editing_tools/EditingTools.vala:681
+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
+msgid "Unconstrained"
+msgstr "Rajoittamaton"
+
+#: src/editing_tools/EditingTools.vala:755
+msgid "Square"
+msgstr "Neliö"
+
+#: src/editing_tools/EditingTools.vala:756
+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
+msgid "-"
+msgstr "-"
+
+#: src/editing_tools/EditingTools.vala:759
+#| msgid "SD Video (4 : 3)"
+msgid "SD Video (4 ∶ 3)"
+msgstr "Standardipiirto (4 ∶ 3)"
+
+#: src/editing_tools/EditingTools.vala:760
+#| msgid "HD Video (16 : 9)"
+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.)"
+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.)"
+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."
+msgid "4 × 6 in."
+msgstr "4 × 6 tuumaa"
+
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
+#| msgid "5 x 7 in."
+msgid "5 × 7 in."
+msgstr "5 × 7 tuumaa"
+
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
+#| msgid "8 x 10 in."
+msgid "8 × 10 in."
+msgstr "8 × 10 tuumaa"
+
+#: src/editing_tools/EditingTools.vala:767
+#| msgid "Letter (8.5 x 11 in.)"
+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."
+msgid "11 × 14 in."
+msgstr "11 × 14 tuumaa"
+
+#: src/editing_tools/EditingTools.vala:769
+#| msgid "Tabloid (11 x 17 in.)"
+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."
+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)"
+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)"
+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"
+msgid "13 × 18 cm"
+msgstr "13 × 18 cm"
+
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
+#| msgid "18 x 24 cm"
+msgid "18 × 24 cm"
+msgstr "18 × 24 cm"
+
+#: src/editing_tools/EditingTools.vala:776
+#| msgid "A4 (210 x 297 mm)"
+msgid "A4 (210 × 297 mm)"
+msgstr "A4 (210 × 297 mm)"
+
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
+#| msgid "20 x 30 cm"
+msgid "20 × 30 cm"
+msgstr "20 × 30 cm"
+
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
+#| msgid "24 x 40 cm"
+msgid "24 × 40 cm"
+msgstr "24 × 40 cm"
+
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
+#| msgid "30 x 40 cm"
+msgid "30 × 40 cm"
+msgstr "30 × 40 cm"
+
+#: src/editing_tools/EditingTools.vala:780
+#| msgid "A3 (297 x 420 mm)"
+msgid "A3 (297 × 420 mm)"
+msgstr "A3 (297 × 420 mm)"
+
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+msgid "Size:"
+msgstr "Koko:"
+
+#: src/editing_tools/EditingTools.vala:1895
+msgid "Close the red-eye tool"
+msgstr "Sulje punasilmäisyyden korjaustyökalu"
+
+#: src/editing_tools/EditingTools.vala:1898
+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/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/Properties.vala:443 src/Properties.vala:450
+msgid "Exposure:"
+msgstr "Valotus:"
+
+#: src/editing_tools/EditingTools.vala:2261
+msgid "Contrast:"
+msgstr "Kontrasti:"
+
+#: src/editing_tools/EditingTools.vala:2270
+msgid "Saturation:"
+msgstr "Värikylläisyys:"
+
+#: src/editing_tools/EditingTools.vala:2279
+msgid "Tint:"
+msgstr "Värisävy:"
+
+#: src/editing_tools/EditingTools.vala:2289
+msgid "Temperature:"
+msgstr "Lämpötila:"
+
+#: src/editing_tools/EditingTools.vala:2298
+msgid "Shadows:"
+msgstr "Varjot:"
+
+#: src/editing_tools/EditingTools.vala:2307
+msgid "Highlights:"
+msgstr "Korostukset:"
+
+#: src/editing_tools/EditingTools.vala:2363
+msgid "Reset Colors"
+msgstr "Palauta alkuperäiset värit "
+
+#: src/editing_tools/EditingTools.vala:2363
+msgid "Reset all color adjustments to original"
+msgstr "Palauta kaikkien värisäätöjen alkuperäiset arvot"
+
+#: src/editing_tools/EditingTools.vala:2722
+msgid "Temperature"
+msgstr "Lämpötila"
+
+#: src/editing_tools/EditingTools.vala:2734
+msgid "Tint"
+msgstr "Värisävy"
+
+#: src/editing_tools/EditingTools.vala:2746
+#| msgid "Contrast Expansion"
+msgid "Contrast"
+msgstr "Kontrasti"
+
+#: src/editing_tools/EditingTools.vala:2760
+msgid "Saturation"
+msgstr "Värikylläisyys"
+
+#: src/editing_tools/EditingTools.vala:2773
+msgid "Exposure"
+msgstr "Valotus"
+
+#: src/editing_tools/EditingTools.vala:2786
+msgid "Shadows"
+msgstr "Varjot"
+
+#: src/editing_tools/EditingTools.vala:2799
+msgid "Highlights"
+msgstr "Korostukset"
+
+#: src/editing_tools/EditingTools.vala:2809
+msgid "Contrast Expansion"
+msgstr "Kontrastin laajennus"
+
+#: src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Kulma:"
+
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: 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
+#, 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
+#, 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
+#, c-format
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d valokuva"
+msgstr[1] "%d valokuvaa"
+
+#: src/events/EventPage.vala:128
+msgid "No Event"
+msgstr "Ei tapahtumaa"
+
+#: src/events/EventsDirectoryPage.vala:150
+msgid "No events"
+msgstr "Ei tapahtumia"
+
+#: src/events/EventsDirectoryPage.vala:154
+msgid "No events found"
+msgstr "Tapahtumia ei löytynyt"
+
+#: src/events/EventsDirectoryPage.vala:227
+msgid "All Events"
+msgstr "Kaikki tapahtumat"
+
+#: src/events/EventsDirectoryPage.vala:241
+msgid "Undated"
+msgstr "Ei päiväystä"
+
+#: src/events/EventsDirectoryPage.vala:242
+msgid "%Y"
+msgstr "%Y"
+
+#: src/events/EventsDirectoryPage.vala:243
+msgid "%B"
+msgstr "%B"
+
 #. if no name, pretty up the start time
-#: ../src/Event.vala:751
+#: src/Event.vala:753
 #, c-format
 msgid "Event %s"
 msgstr "Tapahtuma %s"
 
-#: ../src/Exporter.vala:232
+#: src/Exporter.vala:232
 #, c-format
 msgid "Unable to generate a temporary file for %s: %s"
 msgstr "Tilapäistiedoston luominen kohteelle %s epäonnistui: %s"
 
-#: ../src/Exporter.vala:299
+#: src/Exporter.vala:299
 msgid "Exporting"
 msgstr "Viedään"
 
-#: ../src/Exporter.vala:317
+#: 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 "Tiedosto %s on jo olemassa. Korvataanko?"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Skip"
 msgstr "_Ohita"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Replace"
 msgstr "_Korvaa"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Replace _All"
 msgstr "Korvaa k_aikki"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Export"
 msgstr "Vie"
 
-#: ../src/MediaMonitor.vala:400
+#: src/folders/Branch.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/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
+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…"
+
+#: src/library/ImportQueuePage.vala:156
 #, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr ""
+msgid "Imported %s"
+msgstr "Tuotiin %s"
 
-#: ../src/MediaPage.vala:158
-msgid "Adjust the size of the thumbnails"
-msgstr "Säädä pienoiskuvien kokoa"
+#: src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "Edellinen tuonti"
 
-#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2593
-#: ../src/Resources.vala:188 ../src/direct/DirectPhotoPage.vala:174
-msgid "Zoom _In"
-msgstr "_Lähennä"
+#: src/library/LibraryWindow.vala:507
+msgid "Import From Folder"
+msgstr "Tuo kansiosta"
 
-#: ../src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Kasvata pienoiskuvien suurennusta"
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+msgid "Empty Trash"
+msgstr "Tyhjennä roskakori"
 
-#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2599
-#: ../src/Resources.vala:189 ../src/direct/DirectPhotoPage.vala:180
-msgid "Zoom _Out"
-msgstr "_Loitonna"
+#: src/library/LibraryWindow.vala:576
+#| msgid "Emptying Trash..."
+msgid "Emptying Trash…"
+msgstr "Tyhjennetään roskakori…"
 
-#: ../src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Vähennä pienoiskuvien suurennusta"
+#: 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 on asetettu tuomaan kuvat suoraan kotihakemistoosi.\n"
+"Suosittelemme tämän asetuksen muuttamista menemällä <span weight=\"bold"
+"\">Muokkaa %s Asetukset</span>.\n"
+"Haluatko jatkaa kuvien tuomista?"
 
-#: ../src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Järjestä _kuvat"
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+msgid "Library Location"
+msgstr "Kirjaston sijainti"
 
-#: ../src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "Toi_sta video"
+#. TODO: Specify which directory/file.
+#: src/library/LibraryWindow.vala:788
+msgid "Photos cannot be imported from this directory."
+msgstr "Tästä hakemistosta ei voi tuoda kuvia."
 
-#: ../src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Avaa valitut videot järjestelmän videosoittimessa"
+#: src/library/LibraryWindow.vala:1068
+#, c-format
+msgid "%s (%d%%)"
+msgstr "%s (%d %%)"
 
-#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2642
-msgid "_Developer"
-msgstr "_Kehitin"
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+#| msgid "Updating library..."
+msgid "Updating library…"
+msgstr "Päivitetään kirjastoa…"
 
-#: ../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:1129
+#| msgid "Preparing to auto-import photos..."
+msgid "Preparing to auto-import photos…"
+msgstr "Valmistellaan kuvien automaattista tuontia…"
 
-#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:874
-msgid "_Titles"
-msgstr "_Nimet"
+#: src/library/LibraryWindow.vala:1134
+#| msgid "Auto-importing photos..."
+msgid "Auto-importing photos…"
+msgstr "Tuodaan kuvia automaattisesti…"
 
-#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:875
-msgid "Display the title of each photo"
-msgstr "Näytä kuvien nimet"
+#: src/library/LibraryWindow.vala:1142
+#| msgid "Writing metadata to files..."
+msgid "Writing metadata to files…"
+msgstr "Kirjoitetaan metadataa tiedostoihin…"
 
-#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "_Kommentit"
+#: src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "Puutuvia tiedostoja"
 
-#: ../src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Näytä kommentit joka kuvassa"
+#: src/library/OfflinePage.vala:110
+#| msgid "Deleting..."
+msgid "Deleting…"
+msgstr "Poistetaan…"
 
-#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:359
-msgid "Ta_gs"
-msgstr "_Tunnisteet"
+#: src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "Roskakori"
 
-#: ../src/MediaPage.vala:470
-msgid "Display each photo's tags"
-msgstr "Näytä kuvien tunnisteet"
+#: src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "Roskakori on tyhjä"
 
-#: ../src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "_Nimen mukaan"
+#: src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "Poista"
 
-#: ../src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Järjestä kuvat nimen mukaan"
+#: src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+msgstr "poistetaan kuvia"
 
-#: ../src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "_Kuvauspäivän mukaan"
+#: src/main.vala:54
+#, fuzzy, c-format
+#| msgid ""
+#| "Your photo library is not compatible with this version of Shotwell.  It "
+#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
+#| "(schema %d).  Please use the latest version of Shotwell."
+msgid ""
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please use the latest version of Shotwell."
+msgstr ""
+"Kuvakirjasto ei ole yhteensopiva tämän Shotwell-version kanssa. Kirjasto "
+"luotiin ilmeisesti Shotwellin versiolla %s (skeema %d). Tämä versio on %s "
+"(skeema %d). Käytä Shotwellin uusinta versiota."
 
-#: ../src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Järjestä kuvat kuvauspäivän mukaan"
+#: src/main.vala:59
+#, fuzzy, c-format
+#| msgid ""
+#| "Shotwell was unable to upgrade your photo library from version %s (schema "
+#| "%d) to %s (schema %d).  For more information please check the Shotwell "
+#| "Wiki at %s"
+msgid ""
+"Shotwell was unable to upgrade your photo library from version %s (schema "
+"%d) to %s (schema %d). For more information please check the Shotwell Wiki "
+"at %s"
+msgstr ""
+"Shotwell ei pystynyt päivittämään kuvakirjastoa versiosta %s (skeema %d) "
+"versioon %s (skeema %d). Lisätietoja on Shotwellin wikissä: %s"
 
-#: ../src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "_Arvostelun mukaan"
+#: src/main.vala:65
+#, fuzzy, c-format
+#| msgid ""
+#| "Your photo library is not compatible with this version of Shotwell.  It "
+#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
+#| "(schema %d).  Please clear your library by deleting %s and re-import your "
+#| "photos."
+msgid ""
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please clear your library by deleting %s and re-import your "
+"photos."
+msgstr ""
+"Kuvakirjasto ei ole yhteensopiva tämän Shotwell-version kanssa. Kirjasto "
+"luotiin ilmeisesti Shotwellin versiolla %s (skeema %d). Tämä versio on %s "
+"(skeema %d). Tyhjennä kirjasto poistamalla hakemisto %s ja tuo kuvat "
+"uudelleen."
 
-#: ../src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Järjestä kuvat arvostelun mukaan"
+#: src/main.vala:71
+#, fuzzy, c-format
+#| msgid "Unknown error attempting to verify Shotwell's database: %s"
+msgid "Unknown error attempting to verify Shotwell’s database: %s"
+msgstr "Tuntematon virhe varmistettaessa Shotwellin tietokantaa: %s"
 
-#: ../src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Tie_dostonimen mukaan"
+#: src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "Ladataan Shotwelliä"
 
-#: ../src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Järjestä kuvat tiedostonimen mukaan"
+#: src/main.vala:294
+msgid "Path to Shotwell’s private data"
+msgstr ""
 
-#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:405
-msgid "_Ascending"
-msgstr "_Nousevasti"
+#: src/main.vala:294
+msgid "DIRECTORY"
+msgstr ""
 
-#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:406
-msgid "Sort photos in an ascending order"
-msgstr "Järjestä kuvat nousevaan järjestykseen"
+#: src/main.vala:298
+msgid "Do not monitor library directory at runtime for changes"
+msgstr ""
 
-#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:412
-msgid "D_escending"
-msgstr "_Laskevasti"
+#: src/main.vala:302
+msgid "Don’t display startup progress meter"
+msgstr ""
 
-#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:413
-msgid "Sort photos in a descending order"
-msgstr "Järjestä kuvat laskevaan järjestykseen"
+#: src/main.vala:306
+#| msgid "Show the application's version"
+msgid "Show the application’s version"
+msgstr "Näytä sovelluksen versio"
 
-#: ../src/MediaPage.vala:723
+#. init GTK (valac has already called g_threads_init())
+#: src/main.vala:338
+msgid "[FILE]"
+msgstr "[TIEDOSTO]"
+
+#: src/main.vala:342
+#, c-format
+#| msgid ""
+#| "Run '%s --help' to see a full list of available command line options.\n"
+msgid "Run “%s --help” to see a full list of available command line options.\n"
+msgstr ""
+"Komento “%s --help” näyttää luettelon kaikista komentorivivalitsimista.\n"
+
+#: src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr ""
+
+#: src/MediaPage.vala:158
+msgid "Adjust the size of the thumbnails"
+msgstr "Säädä pienoiskuvien kokoa"
+
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2493,204 +4691,128 @@ msgstr ""
 "Shotwell ei voinut soittaa valittua videota:\n"
 "%s"
 
-#: ../src/Page.vala:1263
+#: src/Page.vala:1312
 msgid "No photos/videos"
 msgstr "Ei kuvia/videoita"
 
-#: ../src/Page.vala:1267
-msgid "No photos/videos found"
-msgstr "Kuvia tai videoita ei löytynyt"
+#: src/Page.vala:1316
+msgid "No photos/videos found which match the current filter"
+msgstr "Nykyistä suodatint vstaavia kuvia tai videoita ei löytynyt"
 
-#: ../src/Page.vala:2565
+#: src/Page.vala:2622
 msgid "Photos cannot be exported to this directory."
 msgstr "Tähän hakemistoon ei voi viedä kuvia."
 
-#: ../src/Photo.vala:3753
-msgid "modified"
-msgstr "muokattu"
-
 #. previous button
-#: ../src/PhotoPage.vala:533
+#: src/PhotoPage.vala:535
 msgid "Previous photo"
 msgstr "Edellinen kuva"
 
 #. next button
-#: ../src/PhotoPage.vala:539
+#: src/PhotoPage.vala:541
 msgid "Next photo"
 msgstr "Seuraava kuva"
 
-#: ../src/PhotoPage.vala:1847
+#: src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Kuvan lähdetiedosto puuttuu: %s"
 
-#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:343
-msgid "_View"
-msgstr "_Näytä"
-
-#: ../src/PhotoPage.vala:2418 ../src/direct/DirectPhotoPage.vala:81
-msgid "T_ools"
-msgstr "T_yökalut"
-
-#: ../src/PhotoPage.vala:2423 ../src/direct/DirectPhotoPage.vala:86
-msgid "_Previous Photo"
-msgstr "_Edellinen kuva"
-
-#: ../src/PhotoPage.vala:2424 ../src/direct/DirectPhotoPage.vala:87
-msgid "Previous Photo"
-msgstr "Edellinen kuva"
-
-#: ../src/PhotoPage.vala:2429 ../src/direct/DirectPhotoPage.vala:92
-msgid "_Next Photo"
-msgstr "_Seuraava kuva"
+#: src/PhotoPage.vala:3014
+#, c-format
+msgid "Unable to export %s: %s"
+msgstr "Tiedostoa %s ei voitu viedä: %s"
 
-#: ../src/PhotoPage.vala:2430 ../src/direct/DirectPhotoPage.vala:93
-msgid "Next Photo"
-msgstr "Seuraava kuva"
+#: 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 "Kasvata kuvan suurennusta"
+#: 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 "Vähennä kuvan suurennusta"
+#: src/photos/JfifSupport.vala:185
+#, c-format
+msgid "Low (%d%%)"
+msgstr "Matala (%d%%)"
 
-#: ../src/PhotoPage.vala:2605 ../src/direct/DirectPhotoPage.vala:186
-msgid "Fit to _Page"
-msgstr "Sovita _sivulle"
+#: src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Keskitasoinen (%d%%)"
 
-#: ../src/PhotoPage.vala:2606 ../src/direct/DirectPhotoPage.vala:187
-msgid "Zoom the photo to fit on the screen"
-msgstr "Zoomaa kuvaa niin, että se mahtuu sivulle"
+#: src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Korkea (%d%%)"
 
-#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:193
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Zoomaus _100%"
+#: src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "Suurin (%d%%)"
 
-#: ../src/PhotoPage.vala:2614 ../src/direct/DirectPhotoPage.vala:195
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Käytä 100 %% zoomausta"
+#: 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 "Zoomaus _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 "Käytä 200 %% zoomausta"
+#: src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: ../src/PhotoPage.vala:3231
-#, c-format
-msgid "Unable to export %s: %s"
-msgstr "Tiedostoa %s ei voitu viedä: %s"
+#: src/Photo.vala:3753
+msgid "modified"
+msgstr "muokattu"
 
-#: ../src/Printing.vala:255
+#: src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "Täytä koko sivu"
 
-#: ../src/Printing.vala:256
+#: src/Printing.vala:256
 msgid "2 images per page"
 msgstr "2 kuvaa sivulla"
 
-#: ../src/Printing.vala:257
+#: src/Printing.vala:257
 msgid "4 images per page"
 msgstr "4 kuvaa sivulla"
 
-#: ../src/Printing.vala:258
+#: src/Printing.vala:258
 msgid "6 images per page"
 msgstr "6 kuvaa sivulla"
 
-#: ../src/Printing.vala:259
+#: src/Printing.vala:259
 msgid "8 images per page"
 msgstr "8 kuvaa sivulla"
 
-#: ../src/Printing.vala:260
+#: src/Printing.vala:260
 msgid "16 images per page"
 msgstr "16 kuvaa sivulla"
 
-#: ../src/Printing.vala:261
+#: src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 kuvaa sivulla"
 
-#: ../src/Printing.vala:348
+#: src/Printing.vala:348
 msgid "in."
 msgstr "tuumaa"
 
-#: ../src/Printing.vala:349
+#: 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 "Lompakkokoko (2 x 3 tuumaa)"
-
-#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
-msgid "Notecard (3 x 5 in.)"
-msgstr "Muistivihkokoko (3 x 5 tuumaa)"
-
-#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
-msgid "4 x 6 in."
-msgstr "4 x 6 tuumaa"
-
-#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
-msgid "5 x 7 in."
-msgstr "5 x 7 tuumaa"
-
-#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
-msgid "8 x 10 in."
-msgstr "8 x 10 tuumaa"
-
-#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
-msgid "11 x 14 in."
-msgstr "11 x 14 tuumaa"
-
-#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
-msgid "16 x 20 in."
-msgstr "16 x 20 tuumaa"
-
-#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Metrinen lompakkokoko (9 x 13 cm)"
-
-#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
-msgid "Postcard (10 x 15 cm)"
-msgstr "Postikortti (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:876
 msgid "Image Settings"
 msgstr "Kuvan asetukset"
 
-#: ../src/Printing.vala:888
-msgid "Printing..."
-msgstr "Tulostetaan..."
+#: src/Printing.vala:889
+#| msgid "Printing..."
+msgid "Printing…"
+msgstr "Tulostetaan…"
 
-#: ../src/Printing.vala:908 ../src/Printing.vala:1111
+#: src/Printing.vala:909 src/Printing.vala:1112
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -2701,914 +4823,989 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "Tänään"
 
-#: ../src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "Eilen"
 
-#: ../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 "Kohteita:"
 
-#: ../src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
 msgstr[0] "%d tapahtuma"
 msgstr[1] "%d tapahtumaa"
 
-#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
-#, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d valokuva"
-msgstr[1] "%d valokuvaa"
-
-#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
-#, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d video"
-msgstr[1] "%d videota"
-
 #. display only one date if start and end are the same
-#: ../src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "Päiväys:"
 
 #. display only one time if start and end are the same
-#: ../src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "Aika:"
 
 #. 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 "Alkaa:"
 
-#: ../src/Properties.vala:385 ../src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "Päättyy:"
 
-#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1872
-msgid "Size:"
-msgstr "Koko:"
-
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Kesto:"
 
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekuntia"
 
-#: ../src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Kehitin:"
 
-#. 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 "Valotus:"
-
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Sijainti:"
 
-#: ../src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Tiedoston koko:"
 
-#: ../src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Nykyinen kehitin:"
 
-#: ../src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Alkuperäiset mitat:"
 
-#: ../src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "Kameran merkki:"
 
-#: ../src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "Kameran malli:"
 
-#: ../src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Salama:"
 
-#: ../src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Polttoväli:"
 
-#: ../src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Kuvauspäivä:"
 
-#: ../src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Kuvausaika:"
 
-#: ../src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Valotuksen korjaus:"
 
-#: ../src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "GPS:n leveysaste:"
 
-#: ../src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "GPS:n pituusaste:"
 
-#: ../src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "Tekijä:"
 
-#: ../src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "Tekijänoikeus:"
 
-#: ../src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "Ohjelmisto:"
 
-#: ../src/Properties.vala:639
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr "Lisätiedot"
 
-#: ../src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Valokuvien hallinta"
+#: src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "Valmistellaan lähettämistä"
 
-#: ../src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Valokuvien katselin"
+#: src/publishing/PublishingPluginHost.vala:12
+#, c-format
+msgid "Uploading %d of %d"
+msgstr "Lähetetään %d/%d"
 
-#: ../src/Resources.vala:144
-msgid "Rotate _Right"
-msgstr "Kierrä _oikealle"
+#: 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:"
+
+#: src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr ""
+"Kokeile julkaisemista toiseen palveluun, jonka voi valita yllä olevasta "
+"valikosta."
 
-#: ../src/Resources.vala:145 ../src/Resources.vala:150
+#. 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."
+msgstr[1] "Valitut kuvat julkaistiin onnistuneesti."
+
+#: src/publishing/PublishingUI.vala:115
+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
+msgid "Publish Photos"
+msgstr "Julkaise valokuvia"
+
+#: src/publishing/PublishingUI.vala:194
+msgid "Publish photos _to:"
+msgstr "Julkaise valokuvia _palveluun:"
+
+#: src/publishing/PublishingUI.vala:196
+msgid "Publish Videos"
+msgstr "Julkaise videoita"
+
+#: src/publishing/PublishingUI.vala:197
+msgid "Publish videos _to"
+msgstr "Julkaise videoita _palveluun"
+
+#: src/publishing/PublishingUI.vala:199
+msgid "Publish Photos and Videos"
+msgstr "Julkaise kuvia ja videoita"
+
+#: src/publishing/PublishingUI.vala:200
+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
+msgid "Unable to publish"
+msgstr "Julkaisu ei onnistunut"
+
+#: src/publishing/PublishingUI.vala:411
+#, 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 ""
+
+#: src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "Julkaisu"
+
+#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
 msgid "Rotate"
 msgstr "Kierrä"
 
-#: ../src/Resources.vala:146
+#: src/Resources.vala:141
 msgid "Rotate Right"
 msgstr "Kierrä oikealle"
 
-#: ../src/Resources.vala:147
+#: src/Resources.vala:142 ui/collection.ui:146
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Kierrä kuvia oikealle (paina Ctrl kuvien kiertämiseksi vasemmalle)"
 
-#: ../src/Resources.vala:149
-msgid "Rotate _Left"
-msgstr "Kierrä _vasemmalle"
-
-#: ../src/Resources.vala:151
+#: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "Kierrä vasemmalle"
 
-#: ../src/Resources.vala:152
+#: src/Resources.vala:147
 msgid "Rotate the photos left"
 msgstr "Kierrä kuvia vasemmalle"
 
-#: ../src/Resources.vala:154
-msgid "Flip Hori_zontally"
-msgstr "Kääntö _vaakasuunnassa"
-
-#: ../src/Resources.vala:155
+#: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "Kääntö vaakasuunnassa"
 
-#: ../src/Resources.vala:157
-msgid "Flip Verti_cally"
-msgstr "Kääntö _pystysuunnassa"
-
-#: ../src/Resources.vala:158
+#: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "Kääntö pystysuunnassa"
 
-#: ../src/Resources.vala:160
+#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419
+#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207
 msgid "_About"
 msgstr "_Tietoja"
 
-#: ../src/Resources.vala:161
+#: src/Resources.vala:156
 msgid "_Apply"
 msgstr "_Toteuta"
 
-#: ../src/Resources.vala:164 ../src/direct/DirectPhotoPage.vala:73
-#: ../src/library/LibraryWindow.vala:339
+#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
+#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: ../src/Resources.vala:165
+#: src/Resources.vala:160
 msgid "_Forward"
 msgstr "_Eteenpäin"
 
-#: ../src/Resources.vala:166
+#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "_Koko näyttö"
 
-#: ../src/Resources.vala:167 ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:363
+#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418
+#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420
+#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Ohje"
 
-#: ../src/Resources.vala:168
+#: src/Resources.vala:163
 msgid "Leave _Fullscreen"
 msgstr "Poistu _koko näytön tilasta"
 
-#: ../src/Resources.vala:169 ../src/Resources.vala:371
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "_Uusi"
 
-#: ../src/Resources.vala:170
+#: src/Resources.vala:165
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: ../src/Resources.vala:171
-msgid "_OK"
-msgstr "_OK"
-
-#: ../src/Resources.vala:172
-msgid "_Play"
-msgstr "T_oista"
-
-#: ../src/Resources.vala:173 ../src/Resources.vala:325
+#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
 msgid "_Preferences"
 msgstr "_Asetukset"
 
-#: ../src/Resources.vala:174
+#: src/Resources.vala:169
 msgid "_Previous"
 msgstr "_Edellinen"
 
-#: ../src/Resources.vala:175
-msgid "_Print"
-msgstr "_Tulosta"
-
-#: ../src/Resources.vala:176
+#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
+#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
 msgid "_Quit"
 msgstr "_Lopeta"
 
-#: ../src/Resources.vala:177
+#: src/Resources.vala:172
 msgid "_Refresh"
 msgstr "_Päivitä"
 
-#: ../src/Resources.vala:179
+#: src/Resources.vala:174
 msgid "_Revert"
 msgstr "Pa_lauta"
 
-#: ../src/Resources.vala:180 ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:422
-msgid "_Save"
-msgstr "_Tallenna"
-
-#: ../src/Resources.vala:181
+#: src/Resources.vala:176
 msgid "Save _As"
 msgstr "Tallenna nim_ellä"
 
-#: ../src/Resources.vala:182
+#: src/Resources.vala:177
 msgid "Sort _Ascending"
 msgstr "Järjestä _nousevasti"
 
-#: ../src/Resources.vala:183
+#: src/Resources.vala:178
 msgid "Sort _Descending"
 msgstr "Järjestä _laskevasti"
 
-#: ../src/Resources.vala:184
+#: src/Resources.vala:179
 msgid "_Stop"
 msgstr "_Pysäytä"
 
-#: ../src/Resources.vala:185
+#: src/Resources.vala:180
 msgid "_Undelete"
 msgstr "_Peru poistaminen"
 
-#: ../src/Resources.vala:186
+#: src/Resources.vala:181
 msgid "_Normal Size"
 msgstr "_Normaali koko"
 
-#: ../src/Resources.vala:187
+#: src/Resources.vala:182
 msgid "Best _Fit"
 msgstr "Paras so_vitus"
 
-#: ../src/Resources.vala:191
-msgid "_Enhance"
-msgstr "_Paranna"
+#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "_Lähennä"
 
-#: ../src/Resources.vala:192
+#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "_Loitonna"
+
+#: src/Resources.vala:187 ui/collection.ui:165
 msgid "Enhance"
 msgstr "Paranna"
 
-#: ../src/Resources.vala:193
-msgid "Automatically improve the photo's appearance"
-msgstr "Paranna kuvaa automaattisesti"
+#: src/Resources.vala:188 ui/collection.ui:162
+#| msgid "Automatically improve the photo's appearance"
+msgid "Automatically improve the photo’s appearance"
+msgstr "Paranna kuvan ulkoasua automaattisesti"
 
-#: ../src/Resources.vala:195
-msgid "_Copy Color Adjustments"
-msgstr "_Kopioi värisäädöt"
-
-#: ../src/Resources.vala:196
+#: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "Kopioi värisäädöt"
 
-#: ../src/Resources.vala:197
+#: src/Resources.vala:192
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Kopioi kuvaan toteutetut värisäädöt"
 
-#: ../src/Resources.vala:199
-msgid "_Paste Color Adjustments"
-msgstr "_Liitä värisäädöt"
-
-#: ../src/Resources.vala:200
+#: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "Liitä värisäädöt"
 
-#: ../src/Resources.vala:201
+#: src/Resources.vala:196
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Toteuta kopioidut värisäädöt valittuun kuvaan"
 
-#: ../src/Resources.vala:203
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Rajaa"
 
-#: ../src/Resources.vala:204
+#: src/Resources.vala:199
 msgid "Crop"
 msgstr "Rajaa"
 
-#: ../src/Resources.vala:205
-msgid "Crop the photo's size"
+#: src/Resources.vala:200
+#| msgid "Crop the photo's size"
+msgid "Crop the photo’s size"
 msgstr "Rajaa kuvan kokoa"
 
-#: ../src/Resources.vala:207 ../src/editing_tools/StraightenTool.vala:100
-msgid "_Straighten"
-msgstr "_Suorista"
-
-#: ../src/Resources.vala:208
+#: src/Resources.vala:203
 msgid "Straighten"
 msgstr "Suorista"
 
-#: ../src/Resources.vala:209
+#: src/Resources.vala:204
 msgid "Straighten the photo"
 msgstr "Suorista kuva"
 
-#: ../src/Resources.vala:211
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Punasilmäisyys"
 
-#: ../src/Resources.vala:212
+#: src/Resources.vala:207
 msgid "Red-eye"
 msgstr "Punasilmäisyys"
 
-#: ../src/Resources.vala:213
+#: src/Resources.vala:208
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Vähennä tai poista punasilmäisyyttä kuvasta"
 
-#: ../src/Resources.vala:215
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Säädä"
 
-#: ../src/Resources.vala:216
+#: src/Resources.vala:211
 msgid "Adjust"
 msgstr "Säädä"
 
-#: ../src/Resources.vala:217
-msgid "Adjust the photo's color and tone"
-msgstr "Säädä kuvan värejä ja kirkkautta"
-
-#: ../src/Resources.vala:219
-msgid "Re_vert to Original"
-msgstr "_Palauta alkuperäinen"
+#: src/Resources.vala:212
+#| msgid "Adjust the photo's color and tone"
+msgid "Adjust the photo’s color and tone"
+msgstr "Säädä kuvan värejä ja sävyä"
 
-#: ../src/Resources.vala:220
+#: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr "Palauta alkuperäinen"
 
-#: ../src/Resources.vala:222
+#: src/Resources.vala:217
 msgid "Revert External E_dits"
 msgstr "Kumoa ulkoiset _muokkaukset"
 
-#: ../src/Resources.vala:223
+#: src/Resources.vala:218
 msgid "Revert to the master photo"
 msgstr "Palauta pääkuva"
 
-#: ../src/Resources.vala:225
-msgid "Set as _Desktop Background"
-msgstr "Aseta _työpöydän taustakuvaksi"
-
-#: ../src/Resources.vala:226
+#: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr "Aseta valittu kuva uudeksi työpöydän taustakuvaksi"
 
-#: ../src/Resources.vala:227
-msgid "Set as _Desktop Slideshow..."
-msgstr "Aseta _työpöydän diaesitykseksi..."
+#: src/Resources.vala:222
+#| msgid "Set as Desktop Slideshow"
+msgid "Set as _Desktop Slideshow…"
+msgstr "Aseta työpöydän _diaesitykseksi…"
 
-#: ../src/Resources.vala:229
+#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
+#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
 msgid "_Undo"
 msgstr "_Kumoa"
 
-#: ../src/Resources.vala:230
+#: src/Resources.vala:225
 msgid "Undo"
 msgstr "Kumoa"
 
-#: ../src/Resources.vala:232
+#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
+#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
 msgid "_Redo"
 msgstr "_Tee uudelleen"
 
-#: ../src/Resources.vala:233
+#: src/Resources.vala:228
 msgid "Redo"
 msgstr "Tee uudelleen"
 
-#: ../src/Resources.vala:235
-msgid "Re_name Event..."
-msgstr "_Nimeä tapahtuma 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"
+msgid "Re_name Event…"
+msgstr "Nimeä tapa_htuma uudelleen…"
 
-#: ../src/Resources.vala:238
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr "Aseta tapahtuman _pienoiskuvaksi"
 
-#: ../src/Resources.vala:239
+#: src/Resources.vala:234
 msgid "Make Key Photo for Event"
 msgstr "Aseta tapahtuman pienoiskuvaksi"
 
-#: ../src/Resources.vala:241
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
 msgid "_New Event"
 msgstr "_Uusi tapahtuma"
 
-#: ../src/Resources.vala:242
+#: src/Resources.vala:237
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../src/Resources.vala:244
+#: src/Resources.vala:239
 msgid "Move Photos"
 msgstr "Siirrä kuvia"
 
-#: ../src/Resources.vala:245
+#: src/Resources.vala:240
 msgid "Move photos to an event"
 msgstr "Siirrä kuvia tapahtumaan"
 
-#: ../src/Resources.vala:247
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Yhdistä tapahtumat"
 
-#: ../src/Resources.vala:248
+#: src/Resources.vala:243
 msgid "Merge"
 msgstr "Yhdistä"
 
-#: ../src/Resources.vala:249
+#: src/Resources.vala:244
 msgid "Combine events into a single event"
 msgstr "Yhdistä tapahtumat yhdeksi tapahtumaksi"
 
-#: ../src/Resources.vala:251
+#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Aseta arvostelu"
 
-#: ../src/Resources.vala:252
+#: src/Resources.vala:247
 msgid "Set Rating"
 msgstr "Aseta arvostelu"
 
-#: ../src/Resources.vala:253
+#: src/Resources.vala:248
 msgid "Change the rating of your photo"
 msgstr "Muuta kuvan arvostelua"
 
-#: ../src/Resources.vala:255
+#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Korota"
 
-#: ../src/Resources.vala:256
+#: src/Resources.vala:251
 msgid "Increase Rating"
 msgstr "Korota arvostelua"
 
-#: ../src/Resources.vala:258
+#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Laske"
 
-#: ../src/Resources.vala:259
+#: src/Resources.vala:254
 msgid "Decrease Rating"
 msgstr "Laske arvostelua"
 
-#: ../src/Resources.vala:261
+#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Ei arvostelua"
 
-#: ../src/Resources.vala:262
+#: src/Resources.vala:257
 msgid "Unrated"
 msgstr "Ei arvostelua"
 
-#: ../src/Resources.vala:263
+#: src/Resources.vala:258
 msgid "Rate Unrated"
 msgstr "Jätä arvostelematta"
 
-#: ../src/Resources.vala:264
+#: src/Resources.vala:259
 msgid "Setting as unrated"
 msgstr "Asetetaan arvostelemattomaksi"
 
-#: ../src/Resources.vala:265
+#: src/Resources.vala:260
 msgid "Remove any ratings"
 msgstr "Poista kaikki arvostelut"
 
-#: ../src/Resources.vala:267
+#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "_Hylätty"
 
-#: ../src/Resources.vala:268
+#: src/Resources.vala:263
 msgid "Rejected"
 msgstr "Hylätty"
 
-#: ../src/Resources.vala:269
+#: src/Resources.vala:264
 msgid "Rate Rejected"
 msgstr "Arvostele hylätyksi"
 
-#: ../src/Resources.vala:270
+#: src/Resources.vala:265
 msgid "Setting as rejected"
 msgstr "Asetetaan hylätyksi"
 
-#: ../src/Resources.vala:271
+#: src/Resources.vala:266
 msgid "Set rating to rejected"
 msgstr "Aseta arvostelu hylätyksi"
 
-#: ../src/Resources.vala:273
+#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
 msgid "Rejected _Only"
 msgstr "_Vain hylätyt"
 
-#: ../src/Resources.vala:274
+#: src/Resources.vala:269
 msgid "Rejected Only"
 msgstr "Vain hylätyt"
 
-#: ../src/Resources.vala:275
+#: src/Resources.vala:270
 msgid "Show only rejected photos"
 msgstr "Näytä vain hylätyt kuvat"
 
-#: ../src/Resources.vala:277
+#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
 msgid "All + _Rejected"
 msgstr "Kaikki + _Hylätyt"
 
-#: ../src/Resources.vala:278 ../src/Resources.vala:279
+#: src/Resources.vala:273
+#| msgid "Show all photos, including rejected"
+msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Näytä kaikki kuvat, myös hylätyt"
 
-#: ../src/Resources.vala:281
+#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
 msgid "_All Photos"
 msgstr "_Kaikki kuvat"
 
-#. Button label
 #. Button tooltip
-#: ../src/Resources.vala:283 ../src/Resources.vala:285
+#: src/Resources.vala:277
 msgid "Show all photos"
 msgstr "Näytä kaikki kuvat"
 
-#: ../src/Resources.vala:287
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Arvostelut"
 
-#: ../src/Resources.vala:288
-msgid "Display each photo's rating"
-msgstr "Näytä kuvien arvostelut"
+#: src/Resources.vala:280
+#| msgid "Display each photo's rating"
+msgid "Display each photo’s rating"
+msgstr "Näytä jokaisen kuvan arvostelu"
 
-#: ../src/Resources.vala:290
+#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
 msgid "_Filter Photos"
 msgstr "_Suodata kuvia"
 
-#: ../src/Resources.vala:291
+#: src/Resources.vala:283
 msgid "Filter Photos"
 msgstr "Suodata kuvia"
 
-#: ../src/Resources.vala:292
+#: src/Resources.vala:284
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Rajaa näytettävien kuvien määriä suodattimella"
 
-#: ../src/Resources.vala:294
-msgid "_Duplicate"
-msgstr "_Kopioi"
-
-#: ../src/Resources.vala:295
+#: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "Kopioi"
 
-#: ../src/Resources.vala:296
+#: src/Resources.vala:288
 msgid "Make a duplicate of the photo"
 msgstr "Tee tästä valokuvasta kopio"
 
-#: ../src/Resources.vala:298
-msgid "_Export..."
-msgstr "_Vie..."
+#: src/Resources.vala:290
+#| msgid "Export"
+msgid "_Export…"
+msgstr "_Vie…"
 
-#: ../src/Resources.vala:300
-msgid "_Print..."
-msgstr "_Tulosta..."
+#: src/Resources.vala:292
+#| msgid "_Print"
+msgid "_Print…"
+msgstr "_Tulosta…"
 
-#: ../src/Resources.vala:302
-msgid "Pu_blish..."
-msgstr "_Julkaise..."
+#: src/Resources.vala:294
+#| msgid "Publish"
+msgid "Pu_blish…"
+msgstr "Julkai_se…"
 
-#: ../src/Resources.vala:304
+#: src/Resources.vala:296 ui/collection.ui:187
 msgid "Publish to various websites"
 msgstr "Julkaise eri verkkosivuille"
 
-#: ../src/Resources.vala:306
-msgid "Edit _Title..."
-msgstr "Muokkaa _nimeä..."
+#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
+#| msgid "Edit Title"
+msgid "Edit _Title…"
+msgstr "Muokkaa ni_meä…"
+
+#. Button label
+#: src/Resources.vala:300
+#| msgid "Edit Title"
+msgctxt "Button Label"
+msgid "Edit Title"
+msgstr "Muokkaa nimeä"
 
-#: ../src/Resources.vala:310
-msgid "Edit _Comment..."
-msgstr "Muokkaa ko_mmenttia..."
+#: 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"
+msgid "Edit _Comment…"
+msgstr "Muokkaa _kommenttia…"
 
 #. Button label
-#: ../src/Resources.vala:312
+#: src/Resources.vala:304
 msgid "Edit Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../src/Resources.vala:314
-msgid "Edit Event _Comment..."
-msgstr "Muokkaa tapahtuman _kommenttia..."
+#: src/Resources.vala:306 ui/event.ui:588
+#| msgid "Edit Event Comment"
+msgid "Edit Event _Comment…"
+msgstr "Muokkaa ta_pahtuman kommenttia…"
 
-#: ../src/Resources.vala:317
-msgid "_Adjust Date and Time..."
-msgstr "_Muuta päiväystä ja kellonaikaa..."
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
+#| msgid "Adjust Date and Time"
+msgid "_Adjust Date and Time…"
+msgstr "Muut_a päiväystä ja kellonaikaa…"
 
-#: ../src/Resources.vala:318
+#: src/Resources.vala:310
 msgid "Adjust Date and Time"
 msgstr "Muuta päiväystä ja kellonaikaa..."
 
-#: ../src/Resources.vala:320
-msgid "Add _Tags..."
-msgstr "Lisää _tunnisteita..."
+#: 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"
+msgid "Add _Tags…"
+msgstr "Lisää tunn_isteita…"
 
-#: ../src/Resources.vala:321
-msgid "_Add Tags..."
-msgstr "_Lisää tunnisteita..."
+#: src/Resources.vala:313 ui/photo_context.ui:17
+#| msgid "Add Tags"
+msgid "_Add Tags…"
+msgstr "Li_sää tunnisteita…"
 
 #. Dialog title
-#. Undo/Redo command name (in Edit menu)
-#: ../src/Resources.vala:323 ../src/Resources.vala:356
+#: src/Resources.vala:315
+#| msgid "Add Tags"
+msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Lisää tunnisteita"
 
-#: ../src/Resources.vala:327
-msgid "Open With E_xternal Editor"
-msgstr "Avaa ulkoisella _muokkaimella"
-
-#: ../src/Resources.vala:329
-msgid "Open With RA_W Editor"
-msgstr "Avaa _RAW-muokkaimessa"
+#: src/Resources.vala:324 ui/photo_context.ui:133
+#| msgid "Send To"
+msgid "Send T_o…"
+msgstr "L_ähetä…"
 
-#: ../src/Resources.vala:331
-msgid "Send _To..."
-msgstr "Lähetä _kohteeseen..."
+#: src/Resources.vala:326
+#| msgid "_Find"
+msgid "_Find…"
+msgstr "_Etsi…"
 
-#: ../src/Resources.vala:332
-msgid "Send T_o..."
-msgstr "L_ähetä..."
-
-#: ../src/Resources.vala:334
-msgid "_Find..."
-msgstr "_Etsi..."
-
-#: ../src/Resources.vala:335
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Etsi"
 
-#: ../src/Resources.vala:336
+#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Etsi kuva kirjoittamalla sen nimessä tai tunnisteissa esiintyvää tekstiä"
 
-#: ../src/Resources.vala:338
+#: src/Resources.vala:330
 msgid "_Flag"
 msgstr "_Merkitse"
 
-#: ../src/Resources.vala:340
+#: src/Resources.vala:332
 msgid "Un_flag"
 msgstr "Poista _merkintä"
 
-#: ../src/Resources.vala:343
+#: src/Resources.vala:335
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Muokkaimen käynnistäminen ei onnistu: %s"
 
-#: ../src/Resources.vala:348
+#: src/Resources.vala:340
 #, c-format
-msgid "Add Tag \"%s\""
-msgstr "Lisää tunniste ”%s”"
+#| msgid "Add Tag \"%s\""
+msgid "Add Tag “%s”"
+msgstr "Lisää tunniste “%s”"
 
 #. Used when adding two tags to photo(s)
-#: ../src/Resources.vala:351
+#: src/Resources.vala:343
 #, c-format
-msgid "Add Tags \"%s\" and \"%s\""
-msgstr "Lisää tunnisteet ”%s” ja ”%s”"
+#| 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"
+msgctxt "UndoRedo menu entry"
+msgid "Add Tags"
+msgstr "Lisää tunnisteita"
 
-#: ../src/Resources.vala:361
+#: src/Resources.vala:353
 #, c-format
-msgid "_Delete Tag \"%s\""
-msgstr "_Poista tunniste ”%s”"
+#| msgid "_Delete Tag \"%s\""
+msgid "_Delete Tag “%s”"
+msgstr "_Poista tunniste “%s”"
 
-#: ../src/Resources.vala:365
+#: src/Resources.vala:357
 #, c-format
-msgid "Delete Tag \"%s\""
-msgstr "Poista tunniste ”%s”"
+#| msgid "Delete Tag \"%s\""
+msgid "Delete Tag “%s”"
+msgstr "Poista tunniste “%s”"
 
-#: ../src/Resources.vala:368
+#: src/Resources.vala:360
 msgid "Delete Tag"
 msgstr "Poista tunniste"
 
-#: ../src/Resources.vala:374
+#: src/Resources.vala:366
 #, c-format
-msgid "Re_name Tag \"%s\"..."
-msgstr "_Nimeä tunniste ”%s” uudelleen..."
+#| msgid "Re_name Tag \"%s\"..."
+msgid "Re_name Tag “%s”…"
+msgstr "_Nimeä tunniste “%s” uudelleen..."
 
-#: ../src/Resources.vala:378
+#: src/Resources.vala:370
 #, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
-msgstr "Nimeä tunniste ”%s” uudelleen nimelle ”%s”"
+#| msgid "Rename Tag \"%s\" to \"%s\""
+msgid "Rename Tag “%s” to “%s”"
+msgstr "Nimeä tunniste “%s” muotoon “%s”"
 
-#: ../src/Resources.vala:381
-msgid "_Rename..."
-msgstr "Ni_meä uudelleen..."
+#: src/Resources.vala:373 ui/tags.ui:454
+#| msgid "_Rename..."
+msgid "_Rename…"
+msgstr "Ni_meä uudelleen…"
 
-#: ../src/Resources.vala:383
-msgid "Modif_y Tags..."
-msgstr "_Muokkaa tunnisteita..."
+#: 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"
+msgid "Modif_y Tags…"
+msgstr "Muokkaa tu_nnisteita…"
 
-#: ../src/Resources.vala:384
+#: src/Resources.vala:376
 msgid "Modify Tags"
 msgstr "Muokkaa tunnisteita"
 
-#: ../src/Resources.vala:387
-#, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "Aseta kuville tunniste ”%s”"
-
-#: ../src/Resources.vala:387
+#: src/Resources.vala:379
 #, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "Merkitse kuva tunnisteella \"%s\""
+#| 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:391
+#: src/Resources.vala:385
 #, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "Aseta valituille kuville tunniste ”%s”"
+#| 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:392
+#: src/Resources.vala:391
 #, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr "Lisää valittuihin kuviin tunniste \"%s\""
+#| 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:396
+#: src/Resources.vala:397
 #, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "Poista _kuvista tunniste ”%s”"
+#| 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:403
 #, c-format
-msgid "Remove Tag \"%s\" From _Photos"
-msgstr "Poista tunniste \"%s\" k_uvista"
-
-#: ../src/Resources.vala:401
-#, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "Poista kuvista tunniste ”%s”"
-
-#: ../src/Resources.vala:402
-#, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr "Poista tunniste \"%s\" kuvista"
-
-#: ../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."
+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 "
+"Tunnisteelle ei voida antaa nimeä “%s”, koska sillä nimellä on jo olemassa "
 "tunniste."
 
-#: ../src/Resources.vala:410
+#: src/Resources.vala:407
 #, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
+#| msgid "Unable to rename search to \"%s\" because the search already exists."
+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."
+"Haun nimen muuttaminen muotoon “%s” epäonnistui, koska saman niminen haku on "
+"jo olemassa."
 
-#: ../src/Resources.vala:413
+#. Saved search button
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Tallennettu haku"
 
-#: ../src/Resources.vala:415
+#: src/Resources.vala:412
 msgid "Delete Search"
 msgstr "Poista haku"
 
-#: ../src/Resources.vala:418
-msgid "_Edit..."
-msgstr "_Muokkaa..."
+#: src/Resources.vala:415 ui/savedsearch.ui:11
+#| msgid "_Edit"
+msgid "_Edit…"
+msgstr "_Muokkaa…"
 
-#: ../src/Resources.vala:419
-msgid "Re_name..."
-msgstr "_Nimeä uudelleen..."
+#: src/Resources.vala:416 ui/savedsearch.ui:7
+#| msgid "Re_name..."
+msgid "Re_name…"
+msgstr "_Nimeä uudelleen…"
 
-#: ../src/Resources.vala:422
+#: src/Resources.vala:419
 #, c-format
-msgid "Rename Search \"%s\" to \"%s\""
-msgstr "Muuta haun \"%s\" nimi muotoon \"%s\""
+#| msgid "Rename Search \"%s\" to \"%s\""
+msgid "Rename Search “%s” to “%s”"
+msgstr "Muuta haun “%s” nimi muotoon “%s”"
 
-#: ../src/Resources.vala:426
+#: src/Resources.vala:423
 #, c-format
-msgid "Delete Search \"%s\""
-msgstr "Poista haku \"%s\""
+#| msgid "Delete Search \"%s\""
+msgid "Delete Search “%s”"
+msgstr "Poista haku “%s”"
 
-#: ../src/Resources.vala:584
+#: src/Resources.vala:560
 #, c-format
 msgid "Rate %s"
 msgstr "Arvostele %s"
 
-#: ../src/Resources.vala:585
+#: src/Resources.vala:561
 #, c-format
 msgid "Set rating to %s"
 msgstr "Aseta arvostelu %s"
 
-#: ../src/Resources.vala:586
+#: src/Resources.vala:562
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Asetetaan arvostelu %s"
 
-#: ../src/Resources.vala:588
+#: src/Resources.vala:564
 #, c-format
 msgid "Display %s"
 msgstr "Näytä %s"
 
-#: ../src/Resources.vala:589
+#: src/Resources.vala:565
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Näytä vain kuvat, joilla on arvostelu %s"
 
-#: ../src/Resources.vala:590
+#: src/Resources.vala:566
 #, c-format
 msgid "%s or Better"
 msgstr "%s tai parempi"
 
-#: ../src/Resources.vala:591
+#: src/Resources.vala:567
 #, c-format
 msgid "Display %s or Better"
 msgstr "Näytä %s tai parempi"
 
-#: ../src/Resources.vala:592
+#: src/Resources.vala:568
 #, 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:683
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Poista valitut kuvat roskakorista"
 
-#: ../src/Resources.vala:684
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Poista valitut kuvat kirjastosta"
 
-#: ../src/Resources.vala:686
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Palauta"
 
-#: ../src/Resources.vala:687
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Siirrä valitut kuvat takaisin kirjastoon"
 
-#: ../src/Resources.vala:689
+#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
+#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Avaa _tiedostonhallintaohjelmalla"
 
-#: ../src/Resources.vala:690
-msgid "Open the selected photo's directory in the file manager"
-msgstr "Avaa valitun valokuvan sisältävä hakemisto tiedostonhallinnassa"
+#: src/Resources.vala:666
+#| msgid "Open the selected photo's directory in the file manager"
+msgid "Open the selected photo’s directory in the file manager"
+msgstr "Avaa valitun valokuvan sisältävä kansio tiedostonhallinnassa"
 
-#: ../src/Resources.vala:693
+#: src/Resources.vala:669
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Tiedostonhallinnan avaaminen ei onnistu: %s"
 
-#: ../src/Resources.vala:696
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "_Poista kirjastosta"
 
-#: ../src/Resources.vala:698
+#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
+#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Siirrä roskakoriin"
 
-#: ../src/Resources.vala:700
+#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: ../src/Resources.vala:701
+#: src/Resources.vala:677
 msgid "Select all items"
 msgstr "Valitse kaikki"
 
@@ -3616,1392 +5813,1001 @@ msgstr "Valitse kaikki"
 #. / 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 "%H:%M"
-
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:785
-msgid "%-I:%M:%S %p"
-msgstr "%H:%M"
-
 #. / 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
+#| msgid "%a %b %d"
+msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a, %e. %b"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:799
+#: src/Resources.vala:749
+#| msgid "%d, %Y"
+msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%e., %Y"
 
-#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
-msgid "Slideshow"
-msgstr "Diaesitys"
-
-#. Flagged label and toggle
-#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
-msgid "Flagged"
-msgstr "Merkitty"
-
-#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
-#: ../src/library/Branch.vala:97
-msgid "Photos"
-msgstr "Kuvat"
-
-#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Videot"
-
-#: ../src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "RAW-kuvat"
-
-#: ../src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "RAW-kuvat"
-
-#: ../src/SearchFilter.vala:934
-#, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Virhe ladatessa käyttöliittymätiedostoa %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 "Sulje"
-
-#. Type label and toggles
-#: ../src/SearchFilter.vala:951
-msgid "Type"
-msgstr "Tyyppi"
-
-#. Rating label and button
-#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
-msgid "Rating"
-msgstr "Arvostelu"
-
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Asetukset"
-
-#. Set up toolbar
-#. add toolbar buttons
-#: ../src/SlideshowPage.vala:160
-msgid "Back"
-msgstr "Takaisin"
-
-#: ../src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Siirry edelliseen kuvaan"
-
-#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
-msgid "Pause"
-msgstr "Tauko"
-
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
-msgid "Pause the slideshow"
-msgstr "Laita diaesitys tauolle"
-
-#: ../src/SlideshowPage.vala:174
-msgid "Next"
-msgstr "Seuraava"
-
-#: ../src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Siirry seuraavaan kuvaan"
-
-#: ../src/SlideshowPage.vala:184
-msgid "Change slideshow settings"
-msgstr "Muuta diaesityksen asetuksia"
-
-#. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:238
-msgid "All photo source files are missing."
-msgstr "Kaikki kuvien lähdetiedostot puuttuvat."
-
-#: ../src/SlideshowPage.vala:270
-msgid "Play"
-msgstr "Toista"
-
-#: ../src/SlideshowPage.vala:271
-msgid "Continue the slideshow"
-msgstr "Jatka diaesitystä"
+#. / 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
+#| msgid "%a %b %d"
+msgctxt "MultimonthFormat"
+msgid "%a %b %d"
+msgstr "%a, %e. %b"
 
-#: ../src/Tag.vala:817
-msgid "untitled"
-msgstr "nimetön"
+#. / 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
+#| msgid "%a %b %d, %Y"
+msgctxt "MultimonthFormat"
+msgid "%a %b %d, %Y"
+msgstr "%a %d. %b %Y"
 
-#. multiple videos
-#: ../src/VideoSupport.vala:489
-msgid "Export Videos"
-msgstr "Vie videoita"
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "Diaesitys"
 
-#: ../src/camera/Branch.vala:85
-msgid "Cameras"
-msgstr "Kamerat"
+#: src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr "Tallennetut haut"
 
-#: ../src/camera/ImportPage.vala:459
-msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
-msgstr ""
-"Kameran irrottaminen ei onnistu. Yritä irrottaa kamera "
-"tiedostonhallintaohjelman kautta."
+#. Ordering must correspond with SearchConditionText.Context
+#: src/searches/SavedSearchDialog.vala:162
+msgid "contains"
+msgstr "sisältää"
 
-#. hide duplicates checkbox
-#: ../src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "Piilota jo tuodut kuvat"
+#. Ordering must correspond with Context
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
+msgid "is exactly"
+msgstr "on tarkalleen"
 
-#: ../src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "Näytä vai kuvat joita ei ole tuotu"
+#: src/searches/SavedSearchDialog.vala:164
+msgid "starts with"
+msgstr "alkaa"
 
-#. 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 "Käynnistetään tuonti, odota..."
+#: src/searches/SavedSearchDialog.vala:165
+msgid "ends with"
+msgstr "päättyy"
 
-#: ../src/camera/ImportPage.vala:886
-msgid "Import _Selected"
-msgstr "Tuo _valitut"
+#: src/searches/SavedSearchDialog.vala:166
+msgid "does not contain"
+msgstr "ei sisällä"
 
-#: ../src/camera/ImportPage.vala:887
-msgid "Import the selected photos into your library"
-msgstr "Tuo valitut kuvat kirjastoon"
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
+msgid "is not set"
+msgstr "ei ole asetettu"
 
-#: ../src/camera/ImportPage.vala:892
-msgid "Import _All"
-msgstr "Tuo _kaikki"
+#: src/searches/SavedSearchDialog.vala:168
+msgid "is set"
+msgstr "on asetettu"
 
-#: ../src/camera/ImportPage.vala:893
-msgid "Import all the photos into your library"
-msgstr "Tuo kaikki kuvat kirjastoon"
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: src/searches/SavedSearchDialog.vala:242
+#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:438
+msgid "is"
+msgstr "on"
 
-#. 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 ""
-"Shotwellin on irrotettava kamera tiedostojärjestelmästä, jotta sitä voidaan "
-"käyttää. Jatketaanko?"
+#: src/searches/SavedSearchDialog.vala:243
+msgid "is not"
+msgstr "ei ole"
 
-#: ../src/camera/ImportPage.vala:1020
-msgid "_Unmount"
-msgstr "_Irrota"
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: src/searches/SavedSearchDialog.vala:249
+msgid "any photo"
+msgstr "mikä tahansa kuva"
 
-#: ../src/camera/ImportPage.vala:1025
-msgid "Please unmount the camera."
-msgstr "Irrota kamera."
+#: src/searches/SavedSearchDialog.vala:250
+msgid "a raw photo"
+msgstr "raakavalokuva"
 
-#: ../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 ""
-"Toinen ohjelma on lukinnut kameran. Shotwell voi käyttää kameraa vain, jos "
-"sitä ei ole lukittu. Sulje muut kameraa käyttävät ohjelmat ja yritä "
-"uudelleen."
+#: src/searches/SavedSearchDialog.vala:251
+msgid "a video"
+msgstr "video"
 
-#: ../src/camera/ImportPage.vala:1040
-msgid "Please close any other application using the camera."
-msgstr "Sulje muut kameraa käyttävät ohjelmat."
+#: src/searches/SavedSearchDialog.vala:305
+msgid "has"
+msgstr "sisältää"
 
-#: ../src/camera/ImportPage.vala:1045
-#, c-format
-msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
-msgstr ""
-"Esikatselukuvien noutaminen kamerasta ei onnistu:\n"
-"%s"
+#: src/searches/SavedSearchDialog.vala:306
+msgid "has no"
+msgstr "ei sisällä"
 
-#: ../src/camera/ImportPage.vala:1062
-msgid "Unmounting..."
-msgstr "Irrotetaan..."
+#: src/searches/SavedSearchDialog.vala:311
+msgid "modifications"
+msgstr "muokkauksia"
 
-#: ../src/camera/ImportPage.vala:1168
-msgid "Fetching photo information"
-msgstr "Noudetaan kuvan tietoja"
+#: src/searches/SavedSearchDialog.vala:312
+msgid "internal modifications"
+msgstr "sisäisiä muokkauksia"
 
-#: ../src/camera/ImportPage.vala:1523
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "Noudetaan esikatseluversiota kuvasta %s"
+#: src/searches/SavedSearchDialog.vala:313
+msgid "external modifications"
+msgstr "ulkoisia muokkauksia"
 
-#: ../src/camera/ImportPage.vala:1639
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "Kameraa ei voitu lukita: %s"
+#. Ordering must correspond with SearchConditionFlagged.State
+#: src/searches/SavedSearchDialog.vala:367
+msgid "flagged"
+msgstr "merkitty"
 
-#: ../src/camera/ImportPage.vala:1724
-#, 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/searches/SavedSearchDialog.vala:368
+msgid "not flagged"
+msgstr "ei merkitty"
 
-#: ../src/camera/ImportPage.vala:1727
-#, 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/searches/SavedSearchDialog.vala:431
+msgid "and higher"
+msgstr "ja ylempi"
 
-#: ../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] "Poistetaanko tämä kuva tai video kamerasta?"
-msgstr[1] "Poistetaanko nämä %d kuvaa tai videota kamerasta?"
+#: src/searches/SavedSearchDialog.vala:432
+msgid "only"
+msgstr "vain"
 
-#: ../src/camera/ImportPage.vala:1733
-#, 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/searches/SavedSearchDialog.vala:433
+msgid "and lower"
+msgstr "ja alempi"
 
-#: ../src/camera/ImportPage.vala:1760
-msgid "Removing photos/videos from camera"
-msgstr "Poistetaan kuvia ja videoita kamerasta"
+#: src/searches/SavedSearchDialog.vala:495
+msgid "is after"
+msgstr "jälkeen"
 
-#: ../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 kuvaa tai videota ei voida poistaa kamerasta virheiden vuoksi."
-msgstr[1] "%d kuvaa tai videota ei voida poistaa kamerasta virheiden vuoksi."
+#: src/searches/SavedSearchDialog.vala:496
+msgid "is before"
+msgstr "ennen"
 
-#: ../src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr ""
+#: src/searches/SavedSearchDialog.vala:497
+msgid "is between"
+msgstr "on välillä"
 
-#. 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-tietokanta"
+#: src/searches/SavedSearchDialog.vala:510
+msgid "and"
+msgstr "ja"
 
-#: ../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 "Tuontia kohteesta %s ei voi jatkaa virheen vuoksi:"
+#: src/searches/SavedSearchDialog.vala:691
+msgid "Search"
+msgstr "Etsi"
 
-#: ../src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"Yritä tuoda jostain toisesta palvelusta. Valitse jokin yllä olevasta "
-"valikosta."
+#: src/searches/SavedSearchDialog.vala:696
+msgid "Cancel"
+msgstr "Peru"
 
-#: ../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 ""
+#: src/searches/SavedSearchDialog.vala:697
+msgid "OK"
+msgstr "OK"
 
-#: ../src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Tietokantatiedosto:"
+#: src/searches/SavedSearchDialog.vala:716
+msgid "any"
+msgstr "mikä tahansa"
 
-#: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:882
-msgid "_Import"
-msgstr "_Tuo"
+#: src/searches/SavedSearchDialog.vala:717
+msgid "all"
+msgstr "kaikki"
 
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import From Application"
-msgstr "Tuo sovelluksesta"
+#: src/searches/SavedSearchDialog.vala:718
+msgid "none"
+msgstr "ei mikään"
 
-#: ../src/data_imports/DataImportsUI.vala:369
-#: ../src/publishing/PublishingUI.vala:470
-msgid "_Close"
-msgstr "_Sulje"
+#: src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr "Mikä tahansa teksti"
 
-#: ../src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "Kuvatietokantaa %s ei voida avata tai luoda: virhekoodi %d"
+#: src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "Nimi"
 
-#: ../src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"Kuvatietokantatiedostoon kirjoitus epäonnistui:\n"
-" %s"
+#: src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "Tunniste"
 
-#: ../src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Virhe yrittäessä käyttää tietokantatiedostoa:\n"
-" %s\n"
-"\n"
-"Virhe: \n"
-"%s"
+#: src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "Kommentti"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Tiedosto"
+#: src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "Tapahtuman nimi"
 
-#: ../src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Tallenna kuva"
+#: src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "Tiedostonimi"
 
-#: ../src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Tallenna _nimellä..."
+#: src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "Mediatyyppi"
 
-#: ../src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Tallenna kuva toisella nimellä"
+#: src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "Merkinnän tila"
 
-#: ../src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Tulosta kuva tietokoneeseen liitetyllä tulostimella"
+#: src/searches/SearchBoolean.vala:181
+msgid "Photo state"
+msgstr "Kuvan tila"
 
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Kuva"
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
+msgid "Rating"
+msgstr "Arvostelu"
 
-#: ../src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid "%s does not exist."
-msgstr "%s ei ole olemassa."
+#: src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "Päivämäärä"
 
-#: ../src/direct/DirectPhotoPage.vala:229
-#, c-format
-msgid "%s is not a file."
-msgstr "%s ei ole tiedosto."
+#: src/SearchFilter.vala:815
+#| msgid "Rating"
+msgid "★+ Rating"
+msgstr "★+ -arvostelu"
 
-#: ../src/direct/DirectPhotoPage.vala:231
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr "%s ei tue tiedoston %s tiedostomuotoa."
+#: src/SearchFilter.vala:818
+#| msgid "Rating"
+msgid "★★+ Rating"
+msgstr "★★+ -arvostelu"
 
-#: ../src/direct/DirectPhotoPage.vala:422
-msgid "_Save a Copy"
-msgstr "_Tallenna kopio"
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr "★★★+ -arvostelu"
 
-#: ../src/direct/DirectPhotoPage.vala:425
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "Hävitetäänkö tiedostoon %s tehdyt muutokset?"
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr "★★★★+ -arvostelu"
 
-#: ../src/direct/DirectPhotoPage.vala:426
-msgid "Close _without Saving"
-msgstr "Sulje _tallentamatta"
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr "★★★★★+ -arvostelu"
 
-#: ../src/direct/DirectPhotoPage.vala:459
+#: src/SearchFilter.vala:1064
 #, c-format
-msgid "Error while saving to %s: %s"
-msgstr "Virhe tallennettaessa tiedostoon %s: %s"
+#| msgid "Error loading UI file %s: %s"
+msgid "Error loading search bar UI: %s"
+msgstr "Virhe ladatessa hakupalkin käyttöliittymää: %s"
 
-#: ../src/direct/DirectPhotoPage.vala:487
-#: ../src/direct/DirectPhotoPage.vala:508
-msgid "Save As"
-msgstr "Tallenna nimellä"
-
-#: ../src/editing_tools/EditingTools.vala:665
-msgid "Return to current photo dimensions"
-msgstr "Palaa kuvan nykyisiin mittoihin"
-
-#: ../src/editing_tools/EditingTools.vala:668
-msgid "Set the crop for this photo"
-msgstr "Aseta kuvan rajaus"
-
-#: ../src/editing_tools/EditingTools.vala:680
-msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr "Käännä rajauskulmiota pysty- ja vaakasuunnan välillä"
-
-#: ../src/editing_tools/EditingTools.vala:753
-msgid "Unconstrained"
-msgstr "Rajoittamaton"
-
-#: ../src/editing_tools/EditingTools.vala:754
-msgid "Square"
-msgstr "Neliö"
-
-#: ../src/editing_tools/EditingTools.vala:755
-msgid "Screen"
-msgstr "Näyttö"
-
-#: ../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 "Standardipiirto (4 : 3)"
-
-#: ../src/editing_tools/EditingTools.vala:759
-msgid "HD Video (16 : 9)"
-msgstr "Teräväpiirto (16 : 9)"
-
-#: ../src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
-msgstr "Kirje (8.5 x 11 in.)"
-
-#: ../src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Tabloidi (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 "Sulje punasilmäisyyden korjaustyökalu"
-
-#: ../src/editing_tools/EditingTools.vala:1890
-msgid "Remove any red-eye effects in the selected region"
-msgstr "Poista punasilmäisyyttä valitulta alueelta"
+#. 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 "Sulje"
 
-#: ../src/editing_tools/EditingTools.vala:2226
-#: ../src/editing_tools/StraightenTool.vala:102
-msgid "_Reset"
-msgstr "_Palauta alkuperäiset arvot"
+#. Type label and toggles
+#: src/SearchFilter.vala:1079
+msgid "Type"
+msgstr "Tyyppi"
 
-#: ../src/editing_tools/EditingTools.vala:2248
-msgid "Saturation:"
-msgstr "Värikylläisyys:"
+#: src/SearchFilter.vala:1086
+msgid "Videos"
+msgstr "Videot"
 
-#: ../src/editing_tools/EditingTools.vala:2256
-msgid "Tint:"
-msgstr "Värisävy:"
+#: src/SearchFilter.vala:1089
+msgid "RAW Photos"
+msgstr "RAW-kuvat"
 
-#: ../src/editing_tools/EditingTools.vala:2265
-msgid "Temperature:"
-msgstr "Lämpötila:"
+#: src/SearchFilter.vala:1125
+msgid "Use a saved search to filter items in the current view"
+msgstr "Käytä tallennettua hkua suodattaaksesi kohteita nykyisessä näkymässä"
 
-#: ../src/editing_tools/EditingTools.vala:2273
-msgid "Shadows:"
-msgstr "Varjot:"
+#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "Asetukset"
 
-#: ../src/editing_tools/EditingTools.vala:2281
-msgid "Highlights:"
-msgstr "Korostukset:"
+#. Set up toolbar
+#. add toolbar buttons
+#: src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "Takaisin"
 
-#: ../src/editing_tools/EditingTools.vala:2335
-msgid "Reset Colors"
-msgstr "Palauta alkuperäiset värit "
+#: src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "Siirry edelliseen kuvaan"
 
-#: ../src/editing_tools/EditingTools.vala:2335
-msgid "Reset all color adjustments to original"
-msgstr "Palauta kaikkien värisäätöjen alkuperäiset arvot"
+#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "Tauko"
 
-#: ../src/editing_tools/EditingTools.vala:2687
-msgid "Temperature"
-msgstr "Lämpötila"
+#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "Laita diaesitys tauolle"
 
-#: ../src/editing_tools/EditingTools.vala:2700
-msgid "Tint"
-msgstr "Värisävy"
+#: src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "Seuraava"
 
-#: ../src/editing_tools/EditingTools.vala:2713
-msgid "Saturation"
-msgstr "Värikylläisyys"
+#: src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "Siirry seuraavaan kuvaan"
 
-#: ../src/editing_tools/EditingTools.vala:2726
-msgid "Exposure"
-msgstr "Valotus"
+#: src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "Muuta diaesityksen asetuksia"
 
-#: ../src/editing_tools/EditingTools.vala:2739
-msgid "Shadows"
-msgstr "Varjot"
+#. An entire slideshow set might be missing, so check for a loop.
+#: src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "Kaikki kuvien lähdetiedostot puuttuvat."
 
-#: ../src/editing_tools/EditingTools.vala:2752
-msgid "Highlights"
-msgstr "Korostukset"
+#: src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "Toista"
 
-#: ../src/editing_tools/EditingTools.vala:2762
-msgid "Contrast Expansion"
-msgstr "Kontrastin laajennus"
+#: src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "Jatka diaesitystä"
 
-#: ../src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Kulma:"
+#: src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "Diaesityksen siirtymät"
 
-#: ../src/events/Branch.vala:25
-msgid "Events"
-msgstr "Tapahtumat"
+#: src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(Ei mitään)"
 
-#: ../src/events/EventDirectoryItem.vala:83
-#, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d kuvaa/videota"
-msgstr[1] "%d kuva/video"
+#: src/slideshow/TransitionEffects.vala:287
+msgid "None"
+msgstr "Ei mitään"
 
-#: ../src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "Ei tapahtumaa"
+#: src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "Satunnainen"
 
-#: ../src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Näytä jokaisen tapahtuman kommentti"
+#: src/tags/Branch.vala:131
+msgid "Tags"
+msgstr "Tunnisteet"
 
-#: ../src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "Ei tapahtumia"
+#: src/Tag.vala:830
+msgid "untitled"
+msgstr "nimetön"
 
-#: ../src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "Tapahtumia ei löytynyt"
+#. multiple videos
+#: src/VideoSupport.vala:507
+msgid "Export Videos"
+msgstr "Vie videoita"
 
-#: ../src/events/EventsDirectoryPage.vala:230
-msgid "All Events"
-msgstr "Kaikki tapahtumat"
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr "Li_ppu päälle/pois"
 
-#: ../src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Ei päiväystä"
-
-#: ../src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
+#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
+#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+msgid "_Developer"
+msgstr "_Kehitin"
 
-#: ../src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
+#: 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"
 
-#: ../src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "Kansiot"
+#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
+#: ui/photo_context.ui:124 ui/tags.ui:379
+msgid "View Eve_nt for Photo"
+msgstr "Näytä kuvan _tapahtuma"
 
-#: ../src/library/Branch.vala:30 ../src/library/Branch.vala:130
-#: ../ui/shotwell.glade.h:32
-msgid "Library"
-msgstr "Kirjasto"
+#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5
+#: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5
+#: ui/top.ui:5 ui/trash.ui:5
+msgid "_File"
+msgstr "_Tiedosto"
 
-#: ../src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Tuodaan..."
+#: ui/direct.ui:13 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17 ui/tags.ui:17
+#| msgid "Save _As"
+msgid "Save _As…"
+msgstr "Tallenna nim_ellä…"
 
-#: ../src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Keskeytä tuonti"
+#: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99
+#: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78
+#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87
+msgid "_View"
+msgstr "_Näytä"
 
-#: ../src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Keskeytä kuvien tuonti"
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Sovita _sivulle"
 
-#: ../src/library/ImportQueuePage.vala:124
-msgid "Preparing to import..."
-msgstr "Valmistellaan tuontia..."
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "Zoomaus _100 %"
 
-#: ../src/library/ImportQueuePage.vala:151
-#, c-format
-msgid "Imported %s"
-msgstr "Tuotiin %s"
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "Zoomaus _200 %"
 
-#: ../src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Edellinen tuonti"
+#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+msgid "_Photo"
+msgstr "_Kuva"
 
-#: ../src/library/LibraryWindow.vala:285
-msgid "_Import From Folder..."
-msgstr "_Tuo kansiosta..."
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "_Edellinen kuva"
 
-#: ../src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Tuo kuvia levyltä kirjastoon"
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "_Seuraava kuva"
 
-#: ../src/library/LibraryWindow.vala:293
-msgid "Import From _Application..."
-msgstr "Tuo so_velluksesta..."
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "T_yökalut"
 
-#: ../src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Järjestä _tapahtumat"
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188
+#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "_Usein kysytyt kysymykset"
 
-#: ../src/library/LibraryWindow.vala:307
+#: 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..."
+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…"
+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…"
+
+#: 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 "Tyhjennä _roskakori"
 
-#: ../src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Poista kaikki kuvat roskakorista"
-
-#: ../src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Näytä kuvan _tapahtuma"
-
-#: ../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 "_Etsi"
 
-#: ../src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Löydä kuvia ja videoita hakuehdoilla"
-
-#: ../src/library/LibraryWindow.vala:329 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search..."
-msgstr "Uu_si tallennettu haku..."
-
-#: ../src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Kuvat"
+#: 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…"
 
-#: ../src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "_Tapahtumat"
-
-#: ../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 "_Perustiedot"
 
-#: ../src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Näytä perustiedot valinnasta"
-
-#: ../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 "_Lisätiedot"
 
-#: ../src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Näytä lisätiedot valinnasta"
-
-#: ../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 "_Hakupalkki"
 
-#: ../src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Näytä hakupalkki"
-
-#: ../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 "S_ivupalkki"
 
-#: ../src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Näytä sivupalkki"
-
-#: ../src/library/LibraryWindow.vala:651
-msgid "Import From Folder"
-msgstr "Tuo kansiosta"
-
-#: ../src/library/LibraryWindow.vala:720
-msgid "Empty Trash"
-msgstr "Tyhjennä roskakori"
-
-#: ../src/library/LibraryWindow.vala:720
-msgid "Emptying Trash..."
-msgstr "Tyhjennetään roskakori..."
-
-#: ../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 on asetettu tuomaan kuvat suoraan kotihakemistoosi.\n"
-"Suosittelemme tämän asetuksen muuttamista menemällä <span weight=\"bold"
-"\">Muokkaa %s Asetukset</span>.\n"
-"Haluatko jatkaa kuvien tuomista?"
-
-#: ../src/library/LibraryWindow.vala:882 ../ui/shotwell.glade.h:18
-msgid "Library Location"
-msgstr "Kirjaston sijainti"
-
-#. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:895
-msgid "Photos cannot be imported from this directory."
-msgstr "Tästä hakemistosta ei voi tuoda kuvia."
-
-#: ../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 "Päivitetään kirjastoa..."
+#: 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"
 
-#: ../src/library/LibraryWindow.vala:1244
-msgid "Preparing to auto-import photos..."
-msgstr "Valmistellaan kuvien automaattista tuontia..."
-
-#: ../src/library/LibraryWindow.vala:1249
-msgid "Auto-importing photos..."
-msgstr "Tuodaan kuvia automaattisesti..."
-
-#: ../src/library/LibraryWindow.vala:1257
-msgid "Writing metadata to files..."
-msgstr "Kirjoitetaan metadataa tiedostoihin..."
-
-#: ../src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Puutuvia tiedostoja"
-
-#: ../src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Poistetaan..."
-
-#: ../src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Roskakori"
-
-#: ../src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "Roskakori on tyhjä"
-
-#: ../src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Poista"
-
-#: ../src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "poistetaan kuvia"
-
-#: ../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 ""
-"Kuvakirjasto ei ole yhteensopiva tämän Shotwell-version kanssa. Kirjasto "
-"luotiin ilmeisesti Shotwellin versiolla %s (skeema %d). Tämä versio on %s "
-"(skeema %d). Käytä Shotwellin uusinta versiota."
-
-#: ../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 ei pystynyt päivittämään kuvakirjastoa versiosta %s (skeema %d) "
-"versioon %s (skeema %d). Lisätietoja on Shotwellin wikissä: %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 ""
-"Kuvakirjasto ei ole yhteensopiva tämän Shotwell-version kanssa. Kirjasto "
-"luotiin ilmeisesti Shotwellin versiolla %s (skeema %d). Tämä versio on %s "
-"(skeema %d). Tyhjennä kirjasto poistamalla hakemisto %s ja tuo kuvat "
-"uudelleen."
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Kommentit"
 
-#: ../src/main.vala:71
-#, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr "Tuntematon virhe varmistettaessa Shotwellin tietokantaa: %s"
+#: 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 "Järjestä _tapahtumat"
 
-#: ../src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Ladataan Shotwelliä"
+#: 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 "_Nousevasti"
 
-#: ../src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr ""
+#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56
+#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180
+msgid "D_escending"
+msgstr "_Laskevasti"
 
-#: ../src/main.vala:294
-msgid "DIRECTORY"
-msgstr ""
+#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
+#: ui/top.ui:30
+msgid "Even_ts"
+msgstr "_Tapahtumat"
 
-#: ../src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-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 "_Poista kirjastosta"
 
-#: ../src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr ""
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Nimet"
 
-#: ../src/main.vala:306
-msgid "Show the application's version"
-msgstr "Näytä sovelluksen versio"
+#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385
+#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35
+msgid "Ta_gs"
+msgstr "_Tunnisteet"
 
-#. init GTK (valac has already called g_threads_init())
-#: ../src/main.vala:338
-msgid "[FILE]"
-msgstr "[TIEDOSTO]"
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Järjestä _kuvat"
 
-#: ../src/main.vala:342
-#, c-format
-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"
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "_Nimen mukaan"
 
-#: ../src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr ""
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "Tie_dostonimen mukaan"
 
-#: ../src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "_Kuvauspäivän mukaan"
 
-#: ../src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Matala (%d%%)"
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "_Arvostelun mukaan"
 
-#: ../src/photos/JfifSupport.vala:188
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Keskitasoinen (%d%%)"
+#: 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"
 
-#: ../src/photos/JfifSupport.vala:191
-#, c-format
-msgid "High (%d%%)"
-msgstr "Korkea (%d%%)"
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
+msgid "_Photos"
+msgstr "_Kuvat"
 
-#: ../src/photos/JfifSupport.vala:194
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Suurin (%d%%)"
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "_Keskeytä tuonti"
 
-#: ../src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Aseta työpöydän taustakuvaksi"
 
-#: ../src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
+msgid "Use for Desktop"
+msgstr "Käytä työpöydällä"
 
-#: ../src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+msgid "Use for Lock Screen"
+msgstr "Käytä lukitusnäytössä"
 
-#: ../src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "Julkaisu"
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Aseta työpöydän diaesitykseksi"
 
-#: ../src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Valmistellaan lähettämistä"
+#: ui/set_background_slideshow_dialog.ui:56
+msgid "Generate desktop background slideshow"
+msgstr "Luo työpöydän taustakuvan diaesitys"
 
-#: ../src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "Lähetetään %d/%d"
+#: ui/set_background_slideshow_dialog.ui:82
+msgid "Show each photo for"
+msgstr "Näytä jokaista kuvaa"
 
-#: ../src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr "Julkaisemista palveluun %s ei voida jatkaa virheen vuoksi:"
+#: ui/set_background_slideshow_dialog.ui:94
+msgid "period of time"
+msgstr "ajan"
 
-#: ../src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr ""
-"Kokeile julkaisemista toiseen palveluun, jonka voi valita yllä olevasta "
-"valikosta."
+#: 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"
 
-#: ../src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Valittujen kuvien tai videoiden julkaisu onnistui."
+#: ui/shotwell.ui:65
+msgid "white"
+msgstr "valkoinen"
 
-#: ../src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Valittujen videoiden julkaisu onnistui."
+#: ui/shotwell.ui:92
+msgid "black"
+msgstr "musta"
 
-#: ../src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Valittujen kuvien julkaisu onnistui."
+#: ui/shotwell.ui:123
+msgid "Display"
+msgstr "Näyttö"
 
-#: ../src/publishing/PublishingUI.vala:112
-msgid "The selected video was successfully published."
-msgstr "Valittu video julkaistiin onnistuneesti."
+#: ui/shotwell.ui:160
+msgid "_Background:"
+msgstr "_Taustakuva:"
 
-#: ../src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "Valittu kuva julkaistiin onnistuneesti."
+#: ui/shotwell.ui:175
+msgid "_Import photos to:"
+msgstr "_Tuo kuvia:"
 
-#: ../src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr "Noudetaan tilin tietoja..."
+#: ui/shotwell.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Tarkkaile kirjastoa uusien tiedostojen varalta"
 
-#: ../src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "Kirjaudutaan..."
+#: ui/shotwell.ui:209
+msgid "Importing"
+msgstr "Tuonti"
 
-#: ../src/publishing/PublishingUI.vala:185
-msgid "Publish Photos"
-msgstr "Julkaise valokuvia"
+#: ui/shotwell.ui:226
+msgid "_Directory structure:"
+msgstr "_Kansiorakenne:"
 
-#: ../src/publishing/PublishingUI.vala:186
-msgid "Publish photos _to:"
-msgstr "Julkaise valokuvia _palveluun:"
+#: ui/shotwell.ui:240
+msgid "Example:"
+msgstr "Esimerkki:"
 
-#: ../src/publishing/PublishingUI.vala:188
-msgid "Publish Videos"
-msgstr "Julkaise videoita"
+#: ui/shotwell.ui:249
+msgid "R_ename imported files to lowercase"
+msgstr "Ni_meä tuodut tiedostot uudelleen käyttäen pieniä kirjaimia"
 
-#: ../src/publishing/PublishingUI.vala:189
-msgid "Publish videos _to"
-msgstr "Julkaise videoita _palveluun"
+#: ui/shotwell.ui:271
+msgid "Metadata"
+msgstr "Metatiedot"
 
-#: ../src/publishing/PublishingUI.vala:191
-msgid "Publish Photos and Videos"
-msgstr "Julkaise kuvia ja videoita"
+#: ui/shotwell.ui:284
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Kirjoita tunnisteet, nimet ja muut _metatiedot kuvatiedostoihin"
 
-#: ../src/publishing/PublishingUI.vala:192
-msgid "Publish photos and videos _to"
-msgstr "Julkaise kuvia ja videoita _palveluun"
+#: ui/shotwell.ui:306
+msgid "RAW Developer"
+msgstr "RAW-kehitin"
 
-#. There are no enabled publishing services that accept this media type,
-#. warn the user.
-#: ../src/publishing/PublishingUI.vala:360
-msgid "Unable to publish"
-msgstr "Julkaisu ei onnistunut"
+#: ui/shotwell.ui:323
+msgid "De_fault:"
+msgstr "_Oletus:"
 
-#: ../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 ""
+#: ui/shotwell.ui:377
+msgid "_Pattern:"
+msgstr "Kaa_va:"
 
-#: ../src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Tallennetut haut"
+#: ui/shotwell.ui:439
+msgid "E_xternal photo editor:"
+msgstr "_Ulkoinen kuvamuokkain:"
 
-#. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:168
-msgid "contains"
-msgstr "sisältää"
+#: ui/shotwell.ui:456
+msgid "External _RAW editor:"
+msgstr "Ulkoinen _RAW-muokkain:"
 
-#. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:169
-#: ../src/searches/SavedSearchDialog.vala:500
-msgid "is exactly"
-msgstr "on tarkalleen"
+#: ui/shotwell.ui:517
+msgid "External Editors"
+msgstr "Ulkoiset muokkaimet"
 
-#: ../src/searches/SavedSearchDialog.vala:170
-msgid "starts with"
-msgstr "alkaa"
+#: ui/shotwell.ui:542
+msgid "Plugins"
+msgstr "Liitännäiset"
 
-#: ../src/searches/SavedSearchDialog.vala:171
-msgid "ends with"
-msgstr "päättyy"
+#: ui/shotwell.ui:583
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Tulostetun kuvan koko</b>"
 
-#: ../src/searches/SavedSearchDialog.vala:172
-msgid "does not contain"
-msgstr "ei sisällä"
+#: ui/shotwell.ui:600
+msgid "Use a _standard size:"
+msgstr "Käytä _standardikokoa:"
 
-#: ../src/searches/SavedSearchDialog.vala:173
-#: ../src/searches/SavedSearchDialog.vala:504
-msgid "is not set"
-msgstr "ei ole asetettu"
+#: ui/shotwell.ui:643
+msgid "Use a c_ustom size:"
+msgstr "Käytä _omaa kokoa:"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-msgid "is set"
-msgstr "on asetettu"
+#: ui/shotwell.ui:731
+msgid "_Match photo aspect ratio"
+msgstr "_Vastaa kuvan kuvasuhdetta"
 
-#. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:248
-#: ../src/searches/SavedSearchDialog.vala:379
-#: ../src/searches/SavedSearchDialog.vala:444
-msgid "is"
-msgstr "on"
+#: ui/shotwell.ui:755
+msgid "_Autosize:"
+msgstr "_Automaattinen koko:"
 
-#: ../src/searches/SavedSearchDialog.vala:249
-msgid "is not"
-msgstr "ei ole"
+#: ui/shotwell.ui:795
+msgid "<b>Titles</b>"
+msgstr "<b>Nimet</b>"
 
-#. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:255
-msgid "any photo"
-msgstr "mikä tahansa kuva"
+#: ui/shotwell.ui:812
+msgid "Print image _title"
+msgstr "Tulosta kuvan _nimi"
 
-#: ../src/searches/SavedSearchDialog.vala:256
-msgid "a raw photo"
-msgstr "raakavalokuva"
+#: ui/shotwell.ui:855
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Pikselitarkkuus</b>"
 
-#: ../src/searches/SavedSearchDialog.vala:257
-msgid "a video"
-msgstr "video"
+#: ui/shotwell.ui:875
+msgid "_Output photo at:"
+msgstr "_Tulosta kuva muodossa:"
 
-#: ../src/searches/SavedSearchDialog.vala:311
-msgid "has"
-msgstr "sisältää"
+#: ui/shotwell.ui:909
+msgid "pixels per inch"
+msgstr "pikseliä tuumalla"
 
-#: ../src/searches/SavedSearchDialog.vala:312
-msgid "has no"
-msgstr "ei sisällä"
+#: ui/shotwell.ui:949
+msgid "_Name of search:"
+msgstr "_Haun nimi"
 
-#: ../src/searches/SavedSearchDialog.vala:317
-msgid "modifications"
-msgstr "muokkauksia"
+#: ui/shotwell.ui:1003
+msgid "_Match"
+msgstr "_Vastaavuus"
 
-#: ../src/searches/SavedSearchDialog.vala:318
-msgid "internal modifications"
-msgstr "sisäisiä muokkauksia"
+#: ui/shotwell.ui:1030
+msgid "of the following:"
+msgstr "seuraavista:"
 
-#: ../src/searches/SavedSearchDialog.vala:319
-msgid "external modifications"
-msgstr "ulkoisia muokkauksia"
+#: ui/shotwell.ui:1111
+msgid "label"
+msgstr "nimike"
 
-#. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:373
-msgid "flagged"
-msgstr "merkitty"
+#: ui/shotwell.ui:1262
+msgid "_Delay:"
+msgstr "_Viive"
 
-#: ../src/searches/SavedSearchDialog.vala:374
-msgid "not flagged"
-msgstr "ei merkitty"
+#: ui/shotwell.ui:1276
+msgid "_Transition effect:"
+msgstr "_Siirtymän tehoste:"
 
-#: ../src/searches/SavedSearchDialog.vala:437
-msgid "and higher"
-msgstr "ja ylempi"
+#: ui/shotwell.ui:1290
+msgid "Transition d_elay:"
+msgstr "Siirt_ymän viive:"
 
-#: ../src/searches/SavedSearchDialog.vala:438
-msgid "only"
-msgstr "vain"
+#: ui/shotwell.ui:1300
+msgid "Show t_itle"
+msgstr "N_äytä nimi"
 
-#: ../src/searches/SavedSearchDialog.vala:439
-msgid "and lower"
-msgstr "ja alempi"
+#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+msgid "seconds"
+msgstr "sekuntia"
 
-#: ../src/searches/SavedSearchDialog.vala:501
-msgid "is after"
-msgstr "jälkeen"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+#| msgid "New _Tag..."
+msgid "New _Tag…"
+msgstr "Uusi _tunniste…"
 
-#: ../src/searches/SavedSearchDialog.vala:502
-msgid "is before"
-msgstr "ennen"
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Poista kaikki kuvat roskakorista"
 
-#: ../src/searches/SavedSearchDialog.vala:503
-msgid "is between"
-msgstr "on välillä"
+#~ msgid "Copyright 2009-2015 Yorba Foundation"
+#~ msgstr "Tekijänoikeus 2009-2015 Yorba Foundation"
 
-#: ../src/searches/SavedSearchDialog.vala:516
-msgid "and"
-msgstr "ja"
+#~ msgid "Login"
+#~ msgstr "Kirjaudu sisään"
 
-#: ../src/searches/SavedSearchDialog.vala:697
-msgid "Search"
-msgstr "Etsi"
+#, fuzzy
+#~| msgid ""
+#~| "'you are logged in as $name'\n"
+#~| "(populated in the application code)"
+#~ msgid "'Publishing to $url as $username' (populated in application code)"
+#~ msgstr ""
+#~ "'olet kirjautunut tunnuksella $name'\n"
+#~ "(populated in the application code)"
 
-#: ../src/searches/SavedSearchDialog.vala:702
-msgid "Cancel"
-msgstr "Peru"
+#~ msgid "you are logged in rajce as $name"
+#~ msgstr "Olet kirjautunut Rajceen käyttäjänä %s."
 
-#: ../src/searches/SavedSearchDialog.vala:703
-msgid "OK"
-msgstr "OK"
+#, fuzzy
+#~| msgid "Videos will appear in:"
+#~ msgid "$mediatype will appear in"
+#~ msgstr "Videot ilmestyvät sijaintiin:"
 
-#: ../src/searches/SavedSearchDialog.vala:721
-msgid "any"
-msgstr "mikä tahansa"
+#~ msgid "Testing connection to Facebook..."
+#~ msgstr "Kokeillaan Facebook-yhteyttä..."
 
-#: ../src/searches/SavedSearchDialog.vala:722
-msgid "all"
-msgstr "kaikki"
+#~ 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 ""
+#~ "Olet jo kirjautunut Flickriin ja sieltä ulos tämän Shotwell-käyttökerran "
+#~ "aikana.\n"
+#~ "Käynnistä Shotwell uudelleen ja yritä sitten kuvien lähettämistä "
+#~ "uudelleen."
 
-#: ../src/searches/SavedSearchDialog.vala:723
-msgid "none"
-msgstr "ei mikään"
+#~ msgid "L_ist album in public gallery"
+#~ msgstr "_Näytä albumi julkisessa galleriassa"
 
-#: ../src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr "Mikä tahansa teksti"
+#~ msgid "Visit the Yorba web site"
+#~ msgstr "Vieraile Yorban verkkosivuilla"
 
-#: ../src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "Nimi"
+#~ msgid "Play a slideshow"
+#~ msgstr "Aloita diaesitys"
 
-#: ../src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "Tunniste"
+#~ msgid "Save Details..."
+#~ msgstr "Tallenna tiedot..."
 
-#: ../src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr "Kommentti"
+#~ msgid "_Modify original files"
+#~ msgstr "_Muokkaa alkuperäisiä tiedostoja"
 
-#: ../src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "Tapahtuman nimi"
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "Kasvata pienoiskuvien suurennusta"
 
-#: ../src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "Tiedostonimi"
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "Vähennä pienoiskuvien suurennusta"
 
-#: ../src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "Mediatyyppi"
+#~ msgid "_Play Video"
+#~ msgstr "Toi_sta video"
 
-#: ../src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "Merkinnän tila"
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr "Avaa valitut videot järjestelmän videosoittimessa"
 
-#: ../src/searches/SearchBoolean.vala:181
-msgid "Photo state"
-msgstr "Kuvan tila"
+#~ msgid "Display the title of each photo"
+#~ msgstr "Näytä kuvien nimet"
 
-#: ../src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "Päivämäärä"
+#~ msgid "Display the comment of each photo"
+#~ msgstr "Näytä kommentit joka kuvassa"
 
-#: ../src/sidebar/Tree.vala:203
-msgid "New _Tag..."
-msgstr "Uusi _tunniste..."
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "Järjestä kuvat kuvauspäivän mukaan"
 
-#: ../src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "Diaesityksen siirtymät"
+#~ msgid "Sort photos by rating"
+#~ msgstr "Järjestä kuvat arvostelun mukaan"
 
-#: ../src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(Ei mitään)"
+#~ msgid "Sort photos by filename"
+#~ msgstr "Järjestä kuvat tiedostonimen mukaan"
 
-#: ../src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "Ei mitään"
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "Järjestä kuvat laskevaan järjestykseen"
 
-#: ../src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr "Satunnainen"
+#~ msgid "Previous Photo"
+#~ msgstr "Edellinen kuva"
 
-#: ../src/tags/Branch.vala:131
-msgid "Tags"
-msgstr "Tunnisteet"
+#~ msgid "Next Photo"
+#~ msgstr "Seuraava kuva"
 
-#: ../ui/set_background_dialog.glade.h:1
-msgid "Set as Desktop Background"
-msgstr "Aseta työpöydän taustakuvaksi"
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "Kasvata kuvan suurennusta"
 
-#: ../ui/set_background_dialog.glade.h:2
-#: ../ui/set_background_slideshow_dialog.glade.h:6
-msgid "Use for Desktop"
-msgstr "Käytä työpöydällä"
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "Vähennä kuvan suurennusta"
 
-#: ../ui/set_background_dialog.glade.h:3
-#: ../ui/set_background_slideshow_dialog.glade.h:7
-msgid "Use for Lock Screen"
-msgstr "Käytä lukitusnäytössä"
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "Zoomaa kuvaa niin, että se mahtuu sivulle"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:1
-msgid "Set as Desktop Slideshow"
-msgstr "Aseta työpöydän diaesitykseksi"
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "Käytä 100 %% zoomausta"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:2
-msgid "Show each photo for"
-msgstr "Näytä jokaista kuvaa"
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "Käytä 200 %% zoomausta"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:3
-msgid "period of time"
-msgstr "ajan"
+#~ msgid "Set as _Desktop Slideshow..."
+#~ msgstr "Aseta _työpöydän diaesitykseksi..."
 
-#: ../ui/set_background_slideshow_dialog.glade.h:4
-msgid "Generate desktop background slideshow"
-msgstr "Luo työpöydän taustakuvan diaesitys"
+#~ msgid "Re_name Event..."
+#~ msgstr "_Nimeä tapahtuma uudelleen..."
 
-#: ../ui/set_background_slideshow_dialog.glade.h:5
-msgid "How long each photo is shown on the desktop background"
-msgstr "Kuinka kauan tiettyä kuvaa näytetään työpöydän taustakuvana"
+#~ msgid "_Export..."
+#~ msgstr "_Vie..."
 
-#: ../ui/shotwell.glade.h:1
-msgid "_Name of search:"
-msgstr "_Haun nimi"
+#~ msgid "_Print..."
+#~ msgstr "_Tulosta..."
 
-#: ../ui/shotwell.glade.h:2
-msgid "_Match"
-msgstr "_Vastaavuus"
+#~ msgid "Pu_blish..."
+#~ msgstr "_Julkaise..."
 
-#: ../ui/shotwell.glade.h:3
-msgid "of the following:"
-msgstr "seuraavista:"
+#~ msgid "Edit _Title..."
+#~ msgstr "Muokkaa _nimeä..."
 
-#: ../ui/shotwell.glade.h:4
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Tulostetun kuvan koko</b>"
+#~ msgid "Edit _Comment..."
+#~ msgstr "Muokkaa ko_mmenttia..."
 
-#: ../ui/shotwell.glade.h:5
-msgid "Use a _standard size:"
-msgstr "Käytä _standardikokoa:"
+#~ msgid "Edit Event _Comment..."
+#~ msgstr "Muokkaa tapahtuman _kommenttia..."
 
-#: ../ui/shotwell.glade.h:6
-msgid "Use a c_ustom size:"
-msgstr "Käytä _omaa kokoa:"
+#~ msgid "_Adjust Date and Time..."
+#~ msgstr "_Muuta päiväystä ja kellonaikaa..."
 
-#: ../ui/shotwell.glade.h:7
-msgid "_Match photo aspect ratio"
-msgstr "_Vastaa kuvan kuvasuhdetta"
+#~ msgid "Add _Tags..."
+#~ msgstr "Lisää _tunnisteita..."
 
-#: ../ui/shotwell.glade.h:8
-msgid "_Autosize:"
-msgstr "_Automaattinen koko:"
+#~ msgid "_Add Tags..."
+#~ msgstr "_Lisää tunnisteita..."
 
-#: ../ui/shotwell.glade.h:9
-msgid "<b>Titles</b>"
-msgstr "<b>Nimet</b>"
+#~ msgid "Send _To..."
+#~ msgstr "Lähetä _kohteeseen..."
 
-#: ../ui/shotwell.glade.h:10
-msgid "Print image _title"
-msgstr "Tulosta kuvan _nimi"
+#~ msgid "Send T_o..."
+#~ msgstr "L_ähetä..."
 
-#: ../ui/shotwell.glade.h:11
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Pikselitarkkuus</b>"
+#~ msgid "_Find..."
+#~ msgstr "_Etsi..."
 
-#: ../ui/shotwell.glade.h:12
-msgid "_Output photo at:"
-msgstr "_Tulosta kuva muodossa:"
+#~ msgid "Modif_y Tags..."
+#~ msgstr "_Muokkaa tunnisteita..."
 
-#: ../ui/shotwell.glade.h:13
-msgid "pixels per inch"
-msgstr "pikseliä tuumalla"
+#~ msgid "Tag Photos as \"%s\""
+#~ msgstr "Merkitse kuva tunnisteella \"%s\""
 
-#: ../ui/shotwell.glade.h:15
-msgid "Shotwell Preferences"
-msgstr "Shotwellin asetukset"
+#~ msgid "Tag the selected photos as \"%s\""
+#~ msgstr "Lisää valittuihin kuviin tunniste \"%s\""
 
-#: ../ui/shotwell.glade.h:16
-msgid "white"
-msgstr "valkoinen"
+#~ msgid "Remove Tag \"%s\" From _Photos"
+#~ msgstr "Poista tunniste \"%s\" k_uvista"
 
-#: ../ui/shotwell.glade.h:17
-msgid "black"
-msgstr "musta"
+#~ msgid "Remove Tag \"%s\" From Photos"
+#~ msgstr "Poista tunniste \"%s\" kuvista"
 
-#: ../ui/shotwell.glade.h:19
-msgid "_Watch library directory for new files"
-msgstr "_Tarkkaile kirjastoa uusien tiedostojen varalta"
+#~ msgid "_Edit..."
+#~ msgstr "_Muokkaa..."
 
-#: ../ui/shotwell.glade.h:20
-msgid "Metadata"
-msgstr "Metatiedot"
+#~ msgid "%-I:%M %p"
+#~ msgstr "%H:%M"
 
-#: ../ui/shotwell.glade.h:21
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Kirjoita tunnisteet, nimet ja muut _metatiedot kuvatiedostoihin"
+#~ msgid "%-I:%M:%S %p"
+#~ msgstr "%H:%M"
 
-#: ../ui/shotwell.glade.h:22
-msgid "Display"
-msgstr "Näyttö"
+#~ msgid "RAW photos"
+#~ msgstr "RAW-kuvat"
 
-#: ../ui/shotwell.glade.h:23
-msgid "_Import photos to:"
-msgstr "_Tuo kuvia:"
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "Tuo valitut kuvat kirjastoon"
 
-#: ../ui/shotwell.glade.h:24
-msgid "_Background:"
-msgstr "_Taustakuva:"
+#~ msgid "Import all the photos into your library"
+#~ msgstr "Tuo kaikki kuvat kirjastoon"
 
-#: ../ui/shotwell.glade.h:25
-msgid "Importing"
-msgstr "Tuonti"
+#~ msgid "Save photo"
+#~ msgstr "Tallenna kuva"
 
-#: ../ui/shotwell.glade.h:26
-msgid "_Directory structure:"
-msgstr "_Kansiorakenne:"
+#~ msgid "Save _As..."
+#~ msgstr "Tallenna _nimellä..."
 
-#: ../ui/shotwell.glade.h:27
-msgid "_Pattern:"
-msgstr "Kaa_va:"
+#~ msgid "Save photo with a different name"
+#~ msgstr "Tallenna kuva toisella nimellä"
 
-#: ../ui/shotwell.glade.h:28
-msgid "Example:"
-msgstr "Esimerkki:"
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr "Tulosta kuva tietokoneeseen liitetyllä tulostimella"
 
-#: ../ui/shotwell.glade.h:29
-msgid "R_ename imported files to lowercase"
-msgstr "Ni_meä tuodut tiedostot uudelleen käyttäen pieniä kirjaimia"
+#~ msgid "Display the comment of each event"
+#~ msgstr "Näytä jokaisen tapahtuman kommentti"
 
-#: ../ui/shotwell.glade.h:30
-msgid "RAW Developer"
-msgstr "RAW-kehitin"
+#~ msgid "Importing..."
+#~ msgstr "Tuodaan..."
 
-#: ../ui/shotwell.glade.h:31
-msgid "De_fault:"
-msgstr "_Oletus:"
+#~ msgid "Stop importing photos"
+#~ msgstr "Keskeytä kuvien tuonti"
 
-#: ../ui/shotwell.glade.h:33
-msgid "E_xternal photo editor:"
-msgstr "_Ulkoinen kuvamuokkain:"
+#~ msgid "Preparing to import..."
+#~ msgstr "Valmistellaan tuontia..."
 
-#: ../ui/shotwell.glade.h:34
-msgid "External _RAW editor:"
-msgstr "Ulkoinen _RAW-muokkain:"
+#~ msgid "_Import From Folder..."
+#~ msgstr "_Tuo kansiosta..."
 
-#: ../ui/shotwell.glade.h:35
-msgid "External Editors"
-msgstr "Ulkoiset muokkaimet"
+#~ msgid "Import photos from disk to library"
+#~ msgstr "Tuo kuvia levyltä kirjastoon"
 
-#: ../ui/shotwell.glade.h:36
-msgid "Plugins"
-msgstr "Liitännäiset"
+#~ msgid "Import From _Application..."
+#~ msgstr "Tuo so_velluksesta..."
 
-#: ../ui/shotwell.glade.h:37
-msgid "_Delay:"
-msgstr "_Viive"
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "Löydä kuvia ja videoita hakuehdoilla"
 
-#: ../ui/shotwell.glade.h:38
-msgid "_Transition effect:"
-msgstr "_Siirtymän tehoste:"
+#~ msgid "Display basic information for the selection"
+#~ msgstr "Näytä perustiedot valinnasta"
 
-#: ../ui/shotwell.glade.h:39
-msgid "Transition d_elay:"
-msgstr "Siirt_ymän viive:"
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "Valittujen videoiden julkaisu onnistui."
 
-#: ../ui/shotwell.glade.h:40
-msgid "Show t_itle"
-msgstr "N_äytä nimi"
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "Valittujen kuvien julkaisu onnistui."
 
-#: ../ui/shotwell.glade.h:41
-msgid "seconds"
-msgstr "sekuntia"
+#~ msgid "Shotwell Preferences"
+#~ msgstr "Shotwellin asetukset"
 
 #, fuzzy
 #~| msgid ""
@@ -5012,9 +6818,6 @@ msgstr "sekuntia"
 #~ "Julkaisuun vaadittava tiedosto ei ole käytettävissä. Julkaisua Flickriin "
 #~ "ei voi jatkaa."
 
-#~ msgid "Import media _from:"
-#~ msgstr "Tuo media _kohteesta:"
-
 #~ msgid "Only _Remove"
 #~ msgstr "_Poista pelkästään kirjastosta"
 
diff --git a/po/gd.gmo b/po/gd.gmo
index 7046926..9f6cf65 100644
--- a/po/gd.gmo
+++ b/po/gd.gmo
diff --git a/po/gd.po b/po/gd.po
index 2871113..a7d7e74 100644
--- a/po/gd.po
+++ b/po/gd.po
@@ -2,16 +2,16 @@
 # 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.
+# GunChleoc <fios@foramnagaidhlig.net>, 2014, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=shotwe"
-"ll&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2014-07-10 22:25+0000\n"
-"PO-Revision-Date: 2014-07-11 10:58+0100\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"
 "Last-Translator: GunChleoc <fios@foramnagaidhlig.net>\n"
-"Language-Team: Fòram na Gàidhlig http://www.foramnagaidhlig.net\n"
+"Language-Team: Fòram na Gàidhlig\n"
 "Language: gd\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,14 +22,1255 @@ msgstr ""
 "X-Launchpad-Export-Date: 2014-04-10 15:01+0000\n"
 "X-Project-Style: gnome\n"
 
-#: ../plugins/common/RESTSupport.vala:424
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
+#: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
+#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: misc/shotwell.appdata.xml.in:9
+#| msgid "Photo Manager"
+msgid "Popular photo manager"
+msgstr "Manaidsear dhealbhan mòr-chòrdte"
+
+#: misc/shotwell.appdata.xml.in:11
+msgid ""
+"Shotwell is an easy-to-use, fast photo organizer designed for the GNOME "
+"desktop. It allows you to import photos from your camera or disk, organize "
+"them by date and subject matter, even ratings. It also offers basic photo "
+"editing, like crop, red-eye correction, color adjustments, and straighten. "
+"Shotwell's non-destructive photo editor does not alter your master photos, "
+"making it easy to experiment and correct errors."
+msgstr ""
+
+#: misc/shotwell.appdata.xml.in:18
+msgid ""
+"When ready, Shotwell can upload your photos to various web sites, such as "
+"Facebook, Flickr, Picasa (Google Plus), and more."
+msgstr ""
+
+#: misc/shotwell.appdata.xml.in:22
+msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
+msgstr ""
+
+#: misc/shotwell.appdata.xml.in:52
+#| msgid "Set Developer"
+msgid "The Shotwell developers"
+msgstr "Luchd-leasachaidh Shotwell"
+
+#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+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"
+
+#. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+#: misc/shotwell.desktop.in.in:8
+msgid ""
+"album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;"
+"organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
+"rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
+msgstr ""
+
+#. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+#: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
+#| msgid "Shotwell"
+msgid "shotwell"
+msgstr "shotwell"
+
+#: misc/shotwell-viewer.desktop.in.in:4
+#| msgid "Photo Viewer"
+msgid "Shotwell Viewer"
+msgstr "Sealladair Shotwell"
+
+#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "Sealladair dhealbhan"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:6
+msgid "authentication token"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:7
+msgid "Yandex-Fotki authentication token, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:14
+msgid "Token"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:15
+msgid "The token to access tumblr"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:20
+msgid "Secret token"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:21
+msgid "The secret token to sign oauth requests"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:26
+#: misc/org.yorba.shotwell.gschema.xml:416
+msgid "default size"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:27
+msgid ""
+"A numeric code representing the default size for photos uploaded to Tumblr"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:32
+msgid "default blog"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:33
+msgid "The name of the default blog of the user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:40
+msgid "Rajce URL"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:41
+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"
+msgid "username"
+msgstr "ainm-cleachdaiche"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:47
+msgid "Rajce username, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:52
+msgid "token"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:53
+msgid "user token, if remembered."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:58
+#: misc/org.yorba.shotwell.gschema.xml:460
+#| msgid "within category:"
+msgid "last category"
+msgstr "an roinn-seòrsa mu dheireadh"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:59
+msgid "The last selected Rajce category."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:64
+#: misc/org.yorba.shotwell.gschema.xml:472
+#| msgid "Photo size:"
+msgid "last photo size"
+msgstr "meud an deilbh mu dheireadh"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:65
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Rajce."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:70
+#| msgid "_Remember"
+msgid "remember"
+msgstr "cuimhnich"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:71
+msgid "If true, remember last login."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:76
+#| msgid "_Hide album"
+msgid "hide album"
+msgstr "falaich an t-albam"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:77
+msgid "If true, hide the newly created Rajce album."
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:82
+#| msgid "Open target _album in browser"
+msgid "open album in web browser"
+msgstr "fosgal an t-albam ann am brabhsair-lìn"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:83
+msgid ""
+"If true, open target album in the web browser just after uploading photos"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:88
+#: misc/org.yorba.shotwell.gschema.xml:364
+#: misc/org.yorba.shotwell.gschema.xml:402
+#: misc/org.yorba.shotwell.gschema.xml:428
+#: misc/org.yorba.shotwell.gschema.xml:478
+#: misc/org.yorba.shotwell.gschema.xml:522
+msgid "remove sensitive info from uploads"
+msgstr ""
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:89
+msgid ""
+"Whether images being uploaded to Rajce should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:22
+msgid "display basic properties"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:23
+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"
+msgid "display extended properties"
+msgstr "seall buadhan leudaichte"
+
+#: misc/org.yorba.shotwell.gschema.xml:29
+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"
+msgid "display sidebar"
+msgstr "seall am bàr-taoibh"
+
+#: misc/org.yorba.shotwell.gschema.xml:35
+msgid "True if the sidebar is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:40
+#| msgid "Display the sidebar"
+msgid "display toolbar"
+msgstr "seall am bàr-inneal"
+
+#: misc/org.yorba.shotwell.gschema.xml:41
+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"
+msgid "display search bar"
+msgstr "seall am bàr-luirg"
+
+#: misc/org.yorba.shotwell.gschema.xml:47
+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"
+msgid "display photo titles"
+msgstr "seall tiotalan nan dealbhan"
+
+#: misc/org.yorba.shotwell.gschema.xml:53
+msgid ""
+"True if photo titles are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:58
+#| msgid "Display each photo's tags"
+msgid "display photo comments"
+msgstr "seall beachdan air dealbhan"
+
+#: misc/org.yorba.shotwell.gschema.xml:59
+msgid ""
+"True if photo comments are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:64
+#| msgid "Edit Event Comment"
+msgid "display event comments"
+msgstr "seall beachdan air tachartasan"
+
+#: misc/org.yorba.shotwell.gschema.xml:65
+msgid ""
+"True if event comments are to be displayed beneath thumbnails in event "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:70
+#| msgid "Display each photo's tags"
+msgid "display photo tags"
+msgstr "seall tagaichean nan dealbhan"
+
+#: misc/org.yorba.shotwell.gschema.xml:71
+msgid ""
+"True if photo tags are to be listed beneath thumbnails in collection views, "
+"false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:76
+#| msgid "Display each photo's rating"
+msgid "display photo ratings"
+msgstr "seall rangachaidhean nan dealbhan"
+
+#: misc/org.yorba.shotwell.gschema.xml:77
+msgid ""
+"True if a photo's rating should be displayed as overlaid trinket, false "
+"otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:82
+msgid "rating filter level"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:83
+msgid ""
+"Determines how to filter photos based on their ratings. 1: Rejected or "
+"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
+"or better, 6: Four or better, 7: Five or better."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:88
+#| msgid "No events found"
+msgid "sort events ascending"
+msgstr "seòrsaich na tachartasan a' dìreadh"
+
+#: misc/org.yorba.shotwell.gschema.xml:89
+msgid "True if events should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:94
+#| msgid "Sort photos in an ascending order"
+msgid "sort library photos ascending"
+msgstr "seòrsaich dealbhan na tasglainn a' dìreadh"
+
+#: misc/org.yorba.shotwell.gschema.xml:95
+msgid "True if library photos should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:100
+msgid "sort library photos criteria"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:101
+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"
+msgid "sort event photos ascending"
+msgstr "seòrsaich dealbhan nan tachartasan a' dìreadh"
+
+#: misc/org.yorba.shotwell.gschema.xml:107
+msgid "True if event photos should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:112
+#| msgid "Sort photos by title"
+msgid "sort event photos criteria"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:113
+msgid "Specifies the sort criteria for event photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:118
+msgid "use 24 hour time"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:119
+msgid ""
+"True if should display times with a 24 hour clock, false if times should use "
+"AM/PM notation."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:124
+msgid "keep relative time between photos"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:125
+msgid ""
+"True if when adjusting time/date of photos, relative time should be "
+"maintained. False if all photos should be set to the same time."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:130
+#| msgid "_Modify original photo files"
+msgid "modify original photo files"
+msgstr "atharraich faidhlichean tùsail nan dealbhan"
+
+#: misc/org.yorba.shotwell.gschema.xml:131
+msgid ""
+"True if when adjusting time/date of photos, the original files should be "
+"modified as well. False if changes are made only in the database."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:136
+msgid "show welcome dialog on startup"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:137
+msgid ""
+"True if, when on startup, a welcome dialog should be shown. False if it "
+"should not be shown."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:142
+#| msgid "Library Location"
+msgid "sidebar position"
+msgstr "ionad a' bhàir-thaoibh"
+
+#: misc/org.yorba.shotwell.gschema.xml:143
+msgid "The width, in pixels, of the sidebar"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:148
+msgid "photo thumbnail scale"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:149
+msgid "The scale of photo thumbnails, ranging from 72 to 360."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:154
+#| msgid "Pin the toolbar open"
+msgid "pin toolbar state"
+msgstr "prìnich staid a' bhàir-inneal"
+
+#: misc/org.yorba.shotwell.gschema.xml:155
+msgid "Pin toolbar in fullscreen, or not."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:160
+#| msgid "_Background:"
+msgid "background color"
+msgstr "dath a' chùlaibh"
+
+#: misc/org.yorba.shotwell.gschema.xml:161
+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"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:167
+msgid ""
+"Last used selection state of the \"hide photos already imported\" option in "
+"the import page."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:174
+#| msgid "_Delay:"
+msgid "delay"
+msgstr "dàil"
+
+#: misc/org.yorba.shotwell.gschema.xml:175
+msgid "Delay (in seconds) between photos in the slideshow."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:180
+#| msgid "Transition d_elay:"
+msgid "transition delay"
+msgstr "dàil an tar-mhùthaidh"
+
+#: misc/org.yorba.shotwell.gschema.xml:181
+msgid ""
+"The time (in seconds) that a transition runs between photos in a slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:186
+#| msgid "_Transition effect:"
+msgid "transition effect id"
+msgstr "id èifeachd an tar-mhùthaidh"
+
+#: misc/org.yorba.shotwell.gschema.xml:187
+msgid ""
+"The name of the transition effect that will be used between photos when "
+"running a slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:192
+#| msgid "Show t_itle"
+msgid "Show title"
+msgstr "Seall an tiotal"
+
+#: misc/org.yorba.shotwell.gschema.xml:193
+msgid "Whether to show the title of a photo during the slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:200
+msgid "maximize library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:201
+msgid "True if library application is maximized, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:206
+msgid "width of library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:207
+msgid "The last recorded width of the library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:212
+msgid "height of library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:213
+msgid "The last recorded height of the library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:218
+msgid "maximize direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:219
+msgid "True if direct-edit application is maximized, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:224
+msgid "width of direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:225
+msgid "The last recorded width of the direct-edit application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:230
+msgid "height of direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:231
+msgid "The last recorded height of the direct-edit application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:236
+msgid "sidebar divider position"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:237
+msgid ""
+"The last recorded position of the divider between the sidebar and view in "
+"library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:244
+#| msgid "Import to Library"
+msgid "import directory"
+msgstr "ion-phortaich pasgan"
+
+#: misc/org.yorba.shotwell.gschema.xml:245
+msgid "Directory in which imported photo files are placed."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:250
+#| msgid "_Watch library directory for new files"
+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
+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..."
+msgid "write metadata to master files"
+msgstr "sgrìobh am meata-dàta dha na faidhlichean-maighstir"
+
+#: misc/org.yorba.shotwell.gschema.xml:257
+msgid ""
+"If true, changes to metadata (tags, titles, etc.) are written to the master "
+"photo file."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:262
+msgid "use lowercase filenames"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:263
+msgid ""
+"If true, Shotwell will convert all filenames to lowercase when importing "
+"photo files"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:268
+#| msgid "_Directory structure:"
+msgid "directory pattern"
+msgstr "pàtran nam pasgan"
+
+#: misc/org.yorba.shotwell.gschema.xml:269
+msgid ""
+"A string encoding a naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:274
+msgid "directory pattern custom"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:275
+msgid ""
+"A string encoding a custom naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:280
+#| msgid "RAW Developer"
+msgid "RAW developer default"
+msgstr "Bun-roghainn an leasaicheir RAW"
+
+#: misc/org.yorba.shotwell.gschema.xml:281
+msgid "Default option for which RAW developer Shotwell will use."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:288
+msgid "Most-recently-used crop aspect ratio menu choice."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:289
+msgid "A numeric code representing the last crop menu choice the user made."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:293
+msgid "Most-recently-used crop custom aspect ratio's numerator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:294
+msgid ""
+"A nonzero, positive integer representing the width part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:298
+msgid "Most-recently-used crop custom aspect ratio's denominator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:299
+msgid ""
+"A nonzero, positive integer representing the height part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:306
+#| msgid "E_xternal photo editor:"
+msgid "external photo editor"
+msgstr "deasaiche dhealbhan air an taobh a-muigh"
+
+#: misc/org.yorba.shotwell.gschema.xml:307
+msgid "External application used to edit photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:312
+#| msgid "External _RAW editor:"
+msgid "external raw editor"
+msgstr "deasaiche raw air an taobh a-muigh"
+
+#: misc/org.yorba.shotwell.gschema.xml:313
+msgid "External application used to edit RAW photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:320
+#| msgid "Core Publishing Services"
+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
+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"
+msgid "default publishing service"
+msgstr "an t-seirbheis foillseachaidh thùsail"
+
+#: misc/org.yorba.shotwell.gschema.xml:340
+#| msgid "Access _type:"
+msgid "access token"
+msgstr "tòcan inntrigidh"
+
+#: misc/org.yorba.shotwell.gschema.xml:341
+msgid "Facebook OAuth token for the currently logged in session, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:346
+msgid "user i.d."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:347
+msgid "Facebook user i.d. for the currently logged in user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:352
+#| msgid "User _name"
+msgid "user name"
+msgstr "ainm-cleachdaiche"
+
+#: misc/org.yorba.shotwell.gschema.xml:353
+#| msgid "You are not currently logged into Yandex.Fotki."
+msgid "The name of the currently logged in Facebook user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:358
+#: misc/org.yorba.shotwell.gschema.xml:390
+msgid "default size code"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:359
+msgid ""
+"A numeric code representing the default size for photos published to Facebook"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:365
+msgid ""
+"Whether images being uploaded to Facebook should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:372
+msgid "OAuth Access Phase Token"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:373
+msgid "The authorization token for the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:378
+msgid "OAuth Access Phase Token Secret"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:379
+msgid ""
+"The cryptographic secret used to sign requests against the authorization "
+"token for the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:385
+msgid "The user name of the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:391
+msgid ""
+"A numeric code representing the default size for photos published to Flickr"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:396
+msgid "default visibility"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:397
+msgid ""
+"A numeric code representing the default visibility for photos published to "
+"Flickr"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:403
+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
+msgid "refresh token"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:411
+msgid ""
+"The OAuth token used to refresh the Picasa Web Albums session for the "
+"currently logged in user, if any."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:417
+msgid ""
+"A numeric code representing the default size for photos uploaded to Picasa "
+"Web Albums"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:422
+#: misc/org.yorba.shotwell.gschema.xml:516
+msgid "last album"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:423
+#: misc/org.yorba.shotwell.gschema.xml:517
+msgid "The name of the last album the user published photos to, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:429
+msgid ""
+"Whether images being uploaded to Picasa should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:436
+msgid "Piwigo URL"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:437
+msgid "URL of the Piwigo server."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:443
+msgid "Piwigo username, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:448
+#| msgid "_Password"
+msgid "password"
+msgstr "facal-faire"
+
+#: misc/org.yorba.shotwell.gschema.xml:449
+msgid "Piwigo password, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:454
+#| msgid "_Remember Password"
+msgid "remember password"
+msgstr "cuimhnich am facal-faire"
+
+#: misc/org.yorba.shotwell.gschema.xml:455
+msgid "If true, remember the Piwigo password."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:461
+msgid "The last selected Piwigo category."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:466
+msgid "last permission level"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:467
+msgid "The last chosen Piwigo permission level."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:473
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Piwigo."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:479
+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"
+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
+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
+msgid "do not upload tags when uploading to Piwigo"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:491
+msgid ""
+"Whether images being uploaded to Piwigo should have their tags removed on "
+"upload, such that these tags will not appear on the remote Piwigo server."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:499
+#| msgid "Gallery3 publishing module"
+msgid "Gallery3 username"
+msgstr "Ainm-cleachdaiche Gallery3"
+
+#: misc/org.yorba.shotwell.gschema.xml:504
+#| msgid "API _Key:"
+msgid "API key"
+msgstr "Iuchair API"
+
+#: misc/org.yorba.shotwell.gschema.xml:505
+#| msgid "_Gallery3 URL:"
+msgid "Gallery3 API key"
+msgstr "Iuchair API Gallery3"
+
+#: misc/org.yorba.shotwell.gschema.xml:510
+msgid "URL"
+msgstr "URL"
+
+#: misc/org.yorba.shotwell.gschema.xml:511
+#| msgid "_Gallery3 URL:"
+msgid "Gallery3 site URL"
+msgstr "URL làrach Gallery3"
+
+#: misc/org.yorba.shotwell.gschema.xml:523
+msgid ""
+"Indicates whether images being uploaded to Gallery3 should have their "
+"metadata removed first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:528
+msgid "scaling constraint of uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:529
+msgid "The scaling constraint ID of the picture to be uploaded"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:534
+msgid "pixels of the major axis uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:535
+msgid ""
+"The pixels of the major axis of the picture to be uploaded; used only if "
+"scaling-constraint-id is an appropriate value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:543
+msgid ""
+"The OAuth token used to refresh the YouTube session for the currently logged "
+"in user, if any."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:550
+#| msgid "Core Data Import Services"
+msgid "last used import service"
+msgstr "an t-seirbheis ion-phortaidh mu dheireadh"
+
+#: misc/org.yorba.shotwell.gschema.xml:551
+msgid ""
+"A numeric code representing the last service from which photos were imported"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:558
+msgid "interpreter state cookie"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:559
+msgid ""
+"A numeric code that captures the state of the GStreamer plug-in environment"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:566
+msgid "content layout mode"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:567
+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"
+msgid "content ppi"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:573
+msgid "The number of pixels per inch (ppi) sent to the printer during printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:578
+msgid "content width"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:579
+msgid "The width of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:584
+#| msgid "Rotate Right"
+msgid "content height"
+msgstr "àirde na susbainte"
+
+#: misc/org.yorba.shotwell.gschema.xml:585
+msgid "The height of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:590
+#| msgid "_Contents"
+msgid "content units"
+msgstr "aonad na susbainte"
+
+#: misc/org.yorba.shotwell.gschema.xml:591
+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"
+msgid "images per page code"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:597
+msgid ""
+"A numeric code representing the currently selected images per page mode used "
+"when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:602
+msgid "size selection"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:603
+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"
+msgid "match aspect ratio"
+msgstr "maidsich co-mheas an deilbh"
+
+#: misc/org.yorba.shotwell.gschema.xml:609
+msgid ""
+"Determines whether custom print sizes must match the aspect ratio of the "
+"original photo"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:614
+#| msgid "Print image _title"
+msgid "print titles"
+msgstr "clò-bhuail tiotalan"
+
+#: misc/org.yorba.shotwell.gschema.xml:615
+msgid ""
+"True if the title of a photo should be printed when the photo is printed, "
+"false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:620
+msgid "titles font"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:621
+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"
+msgid "enable facebook publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:633
+msgid "True if the Facebook publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:638
+msgid "enable flickr publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:639
+msgid "True if the Flickr publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:644
+msgid "enable picasa publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:645
+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"
+msgid "enable youtube publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:651
+msgid "True if the YouTube publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:656
+#| msgid "Unable to publish"
+msgid "enable piwigo publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:657
+msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:662
+msgid "enable yandex publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:663
+msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:668
+#| msgid "Unable to publish"
+msgid "enable tumblr publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:669
+msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:674
+#| msgid "Gallery3 publishing module"
+msgid "enable rajce publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:675
+msgid "True if the Rajce publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:680
+#| msgid "Gallery3 publishing module"
+msgid "enable gallery3 publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:681
+msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:686
+msgid "enable F-Spot import plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:687
+msgid "True if the F-Spot import plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:692
+#, 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
+msgid ""
+"True if the Crumble slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:698
+#, 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
+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
+#, 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
+msgid ""
+"True if the Slide slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:710
+#, 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
+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
+#, 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
+msgid ""
+"True if the Circle slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:723
+msgid ""
+"True if the Circles slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:729
+msgid ""
+"True if the Blinds slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:734
+#, 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
+msgid ""
+"True if the Squares slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:740
+#, 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
+msgid ""
+"True if the Stripes slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:746
+#, 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
+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/common/Resources.vala:31 src/AppWindow.vala:679
+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"
+
+#: plugins/common/RESTSupport.vala:451
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
 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/common/RESTSupport.vala:1138
+#: plugins/common/RESTSupport.vala:1157
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -43,29 +1284,16 @@ 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/common/Resources.vala:9
-msgid "Visit the Shotwell home page"
-msgstr "Tadhail air an duilleag-dhachaigh aig Shotwell"
-
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:688
-msgid "translator-credits"
+#: 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 ""
-"Launchpad Contributions:\n"
-"  Akerbeltz https://launchpad.net/~fios\n"
-"  GunChleoc https://launchpad.net/~gunchleoc\n"
-"  alasdair caimbeul https://launchpad.net/~alexd-deactivatedaccount"
 
-#: ../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"
-msgstr "Còir-lethbhreac 2009-2014 Yorba Foundation"
-
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
+#: plugins/shotwell-data-imports/FSpotImporter.vala:58
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
@@ -73,57 +1301,57 @@ msgid ""
 "libraries found by Shotwell or by selecting an alternative F-Spot database "
 "file."
 msgstr ""
-"Fàilte do sheirbheis ion-phortadh leabhar-lannan F-Spot .\n"
+"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."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:58
+#: plugins/shotwell-data-imports/FSpotImporter.vala:60
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
 "Please select an F-Spot database file."
 msgstr ""
-"Fàilte do sheirbheis ion-phortadh leabhar-lannan F-Spot .\n"
+"Fàilte do sheirbheis ion-phortadh leabhar-lannan F-Spot.\n"
 "\n"
 "Tagh faidhle stòr-dàta F-Spot."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+#: plugins/shotwell-data-imports/FSpotImporter.vala:62
 msgid "Manually select an F-Spot database file to import:"
 msgstr "Tagh faidhle stòr-dàta F-Spot de làimh gus ion-phortadh:"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:62
+#: plugins/shotwell-data-imports/FSpotImporter.vala:64
 msgid ""
 "Cannot open the selected F-Spot database file: the file does not exist or is "
 "not an F-Spot database"
 msgstr ""
-"Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu fhosgladh; chan eil am "
-"faidhle ann no chan e stòr-dàta F-Spot tha ann."
+"Cha ghabh am faidhle stòr-dàta F-Spot a thagh thu fhosgladh: chan eil am "
+"faidhle ann no chan e stòr-dàta F-Spot tha ann"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:64
+#: plugins/shotwell-data-imports/FSpotImporter.vala:66
 msgid ""
 "Cannot open the selected F-Spot database file: this version of the F-Spot "
 "database is not supported by Shotwell"
 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."
+"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"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:66
+#: plugins/shotwell-data-imports/FSpotImporter.vala:68
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading tags table"
 msgstr ""
-"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."
+"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"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:68
+#: plugins/shotwell-data-imports/FSpotImporter.vala:70
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading photos "
 "table"
 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."
+"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"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:70
+#: plugins/shotwell-data-imports/FSpotImporter.vala:72
 #, c-format
 msgid ""
 "Shotwell has found %d photos in the F-Spot library and is currently "
@@ -132,31 +1360,120 @@ msgid ""
 "You can close this dialog and start using Shotwell while the import is "
 "taking place in the background."
 msgstr ""
-"Lorg Shotwell %d dealbhan 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."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#: plugins/shotwell-data-imports/FSpotImporter.vala:86
 #, c-format
 msgid "F-Spot library: %s"
 msgstr "Leabhar-lann F-Spot: %s"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:416
+#: plugins/shotwell-data-imports/FSpotImporter.vala:424
 msgid "Preparing to import"
 msgstr "Ag ullachadh airson ion-phortadh"
 
-#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
 msgid "Core Data Import Services"
 msgstr "Seirbheisean ion-phortadh prìomh-dhàta"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+msgid "Go _Back"
+msgstr "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
+msgid "_Gallery3 URL:"
+msgstr "URL _Gallery3:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+msgid "_User name:"
+msgstr "_Ainm-cleachdaiche:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+msgid "_Password:"
+msgstr "_Facal-faire:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+msgid "API _Key:"
+msgstr "_Iuchair API:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+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:11
+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
+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 "
+"camara mus luchdaich thu seo suas"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+msgid "Scaling constraint:"
+msgstr "Bacadh sgèilidh:"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+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
+#: src/Dimensions.vala:17
+msgid "Original size"
+msgstr "Meud tùsail"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
+#: src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Leud no àirde"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Mòideal foillseachaidh 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"
@@ -166,18 +1483,13 @@ msgstr ""
 "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 "
-"logadh a-steach a choileanadh."
-
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:297
-msgid "Shotwell"
-msgstr "Shotwell"
+"clàradh a-steach a choileanadh."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
 msgid "Shotwell default directory"
-msgstr "Pasgan bunaiteach Shotwell"
+msgstr "Pasgan tùsail Shotwell"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
 #, c-format
 msgid ""
 "\n"
@@ -190,7 +1502,7 @@ msgstr ""
 "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
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
 msgid ""
 "\n"
 "Note that Gallery3 only supports the video types that Flowplayer does."
@@ -199,21 +1511,27 @@ msgstr ""
 "Thoir an aire nach cuir Gallery3 taic ach ris na seòrsaichean video ris a "
 "chuireas Flowplayer taic."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1022
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1774
-msgid "A file required for publishing is unavailable. Publishing to "
+#: 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 ""
-"Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. A' "
-"foillseachadh gu "
+"Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
+"Chan urrainn dhuinn foillseachadh air %s dhut."
 
 #. 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 "'Ga fhoillseachadh gu %s mar %s."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1816
+#: 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."
@@ -222,16 +1540,16 @@ msgstr ""
 "cleachdaiche 's am facal-faire (no iuchair API) airson a' chunntais Gallery3 "
 "agad."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1817
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1818
 msgid ""
 "The username and password or API key were incorrect. To try again, re-enter "
 "your username and password below."
 msgstr ""
 "Cha robh an t-ainm-cleachdaiche 's facal-faire no an iuchair API mar bu "
-"chòir. Chuir a-steach d' ainm-cleachdaiche 's facal-faire gu h-ìosal gus "
+"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:1818
+#: 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 "
@@ -241,181 +1559,168 @@ msgstr ""
 "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)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1871
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
-msgstr "Cleachdaiche neo-aithnichte"
+msgstr "Cleachdaiche nach aithne dhuinn"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1876
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
 msgstr " Cha deach an làrach a lorg"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:38
+#: 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 "Seòladh _puist-d"
+
+#: 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 "_Facal-faire"
+
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:103
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
+msgid "_Remember"
+msgstr "_Cuimhnich"
+
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:125
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:107
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:151
+msgid "Login"
+msgstr "Clàraich a-steach"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+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
+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
+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
+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"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:742
+#: 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 "
 "thu ris a-rithist?"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
 msgid "Enter email and password associated with your Rajce account."
 msgstr ""
 "Cuir a-steach an t-ainm-cleachdaiche agus am facal-faire a tha co-"
 "cheangailte ris a' chunntas Rajce agad."
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
 msgid "Invalid email and/or password. Please try again"
 msgstr ""
 "Tha am post-d agus/no am facal-faire cearr. Nach fheuch thu ris a-rithist?"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
 msgid "Invalid User Email or Password"
 msgstr "Post-d a' chleachdaiche no facal-faire cearr"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:890
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:2
-msgid "_Email address"
-msgstr "Seòladh _puist-d"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:891
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
-msgid "_Password"
-msgstr "_Facal-faire"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: ../plugins/shotwell-publishing-extras/rajce_authentication_pane.glade.h:4
-msgid "_Remember"
-msgstr "_Cuimhnich"
-
-#: ../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 "Clàraich a-steach"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
-msgid "_Hide album"
-msgstr "Falaic_h an t-albam"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012
 #, c-format
 msgid "You are logged into Rajce as %s."
 msgstr "Chlàraich thu a-steach air Rajce mar %s."
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#: plugins/shotwell-publishing/PicasaPublishing.vala:577
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:24
 msgid "Photos will appear in:"
 msgstr "Nochdaidh na dealbhan ann an:"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
-msgid "An _existing album:"
-msgstr "Albam _maireannach:"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
-msgid "A _new album named:"
-msgstr "Albam _ùr ainmichte:"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
-msgid "Open target _album in browser"
-msgstr "Fosgal an t-_albam-uidhe sa bhrabhsair"
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+msgid "Shotwell Extra Publishing Services"
+msgstr "Seirbheisean foillseachaidh Shotwell a bharrachd"
 
-#: ../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 "_Foillsich"
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+msgid "Blogs:"
+msgstr "Blogaichean:"
 
-#: ../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 "_Log a-mach"
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
+msgid "Photo _size:"
+msgstr "_Meud an deilbh:"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:35
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
 msgid "Copyright 2012 BJA Electronics"
 msgstr "Còir-lethbhreac 2012 BJA Electronics"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1229
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
+#: 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-extras/TumblrPublishing.vala:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1230
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
+#: 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-extras/TumblrPublishing.vala:106
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
 msgid "1280 x 853 pixels"
 msgstr "1280 x 853 piogsail"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
+#: 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 ""
-"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:558
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
 msgid ""
 "TumblrPublisher: start( ): can't start; this publisher is not restartable."
 msgstr ""
-"TumblrPublisher: Chan urrainn dha start( ): tòiseachadh, cha ghabh am "
+"TumblrPublisher: start( ): Chan urrainn dha tòiseachadh; cha ghabh am "
 "foillsichear seo a thòiseachadh às ùr."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
 msgid "Enter the username and password associated with your Tumblr account."
 msgstr ""
 "Cuir a-steach an t-ainm-cleachdaiche agus am facal-faire a tha co-"
 "cheangailte ris a' chunntas Tumblr agad."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:992
 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:617
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1026
 msgid "Invalid User Name or Password"
 msgstr "Ainm-cleachdaiche no facal-faire cearr"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:636
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
 #, c-format
 msgid "Could not load UI: %s"
-msgstr "Cha b' urrainn dhuinn an UI a luchdadh: %s"
+msgstr "Cha b' urrainn dhuinn an eadar-aghaidh a luchdadh: %s"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:739
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:734
 #, c-format
 msgid ""
 "You are logged into Tumblr as %s.\n"
@@ -424,156 +1729,82 @@ msgstr ""
 "Chlàraich thu a-steach air Tumblr mar %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Còir-lethbhreac 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 "Tadhail air làrach-lìn Yandex.Fotki"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:632
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:658
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Cha do chlàraich thu a-steach air Yandex.Fotki."
 
-#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
-msgid "Shotwell Extra Publishing Services"
-msgstr "Seirbheisean foillsicheachadh a bharrachd Shotwell"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
-msgid "Go _Back"
-msgstr "Ai_r ais"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:43
-msgid "_Login"
-msgstr "_Clàraich a-steach"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
-msgid "Intro message replaced at runtime"
-msgstr "Teachdaireachd tòiseachaidh 'ga chur an àite nuair a bhios e a' ruith"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
-msgid "_Gallery3 URL:"
-msgstr "URL _Gallery3:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
-msgid "_User name:"
-msgstr "_Ainm-cleachdaiche:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
-msgid "_Password:"
-msgstr "_Facal-faire:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
-msgid "API _Key:"
-msgstr "_Iuchair API:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
-msgid "or"
-msgstr "no"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
-msgid "A _new album"
-msgstr "Albam ùr"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
-msgid "An _existing album"
-msgstr "Albam a tha _ann"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
-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 "
-"camara mus dèanar luchdadh suas"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
-msgid "'Publishing to $url as $username' (populated in application code)"
-msgstr ""
-"\"'Ga fhoillseachadh gu $url mar $username\" ('ga lìonadh ann an còd na h-"
-"aplacaid)"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
-msgid "Scaling constraint:"
-msgstr "Bacadh sgèilidh:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
-msgid "pixels"
-msgstr "piogsailean"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:9
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-#: ../src/Dimensions.vala:17
-msgid "Original size"
-msgstr "Meud tùsail"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
-#: ../src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Leud no àirde"
-
-#: ../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:15
-msgid "label"
-msgstr "leubail"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
-msgid "Blogs:"
-msgstr "Blogaichean:"
-
-#: ../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 "_Meud dealbh:"
-
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
-msgid "you are logged in rajce as $name"
-msgstr "Chlàraich thu a-steach air rajce mar $name"
-
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
-msgid "$mediatype will appear in"
-msgstr "Nochdaidh $mediatype an-seo:"
-
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:1
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
 msgid "_Albums (or write new):"
-msgstr "_Albaman (no sgrìobh fear ùr)"
+msgstr "_Albaman (no sgrìobh fear ùr):"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
 msgid "Access _type:"
 msgstr "Seòrsa an _inntrigidh:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
 msgid "Disable _comments"
 msgstr "C_uir beachdan à comas"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
 msgid "_Forbid downloading original photo"
-msgstr "_Toirmisg luchdadh a-nuas dhe na dealbhan tùsail"
+msgstr "_Toirmisg luchdadh a-nuas deilbh thùsail"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
 msgid "Public"
 msgstr "Poblach"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1181
+#: 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.glade.h:9
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
+#: plugins/shotwell-publishing/YouTubePublishing.vala:498
 msgid "Private"
 msgstr "Prìobhaideach"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:61
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:59
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
+msgid "Publish to an e_xisting album:"
+msgstr "Foillsich gu albam a tha _ann:"
+
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
+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
+msgid "Upload _size:"
+msgstr "_Meud an luchdaidh suas:"
+
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
+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/picasa_publishing_options_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:226
+msgid ""
+"_Remove location, camera, and other identifying information before uploading"
+msgstr ""
+"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
 msgid "Shotwell Connect"
-msgstr "Shotwell Connect"
+msgstr "Ceangal Shotwell"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:63
+#: plugins/shotwell-publishing/FacebookPublishing.vala:64
 msgid ""
 "You are not currently logged into Facebook.\n"
 "\n"
@@ -585,11 +1816,11 @@ 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 Shotwell Connect cead ort dealbhan "
+"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 "
-"Shotwell Connect an cead seo mus obraich e."
+"Ceangal Shotwell an cead seo mus obraich e."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:65
+#: plugins/shotwell-publishing/FacebookPublishing.vala:66
 msgid ""
 "You have already logged in and out of Facebook during this Shotwell "
 "session.\n"
@@ -601,24 +1832,23 @@ msgstr ""
 "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:86
+#: plugins/shotwell-publishing/FacebookPublishing.vala:87
 msgid "Standard (720 pixels)"
 msgstr "Stannardach (720 piogsail)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+#: plugins/shotwell-publishing/FacebookPublishing.vala:90
 msgid "Large (2048 pixels)"
 msgstr "Mòr (2048 piogsail)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
+#: 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:347
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
+#: plugins/shotwell-publishing/FacebookPublishing.vala:348
 msgid "Creating album..."
 msgstr "A' cruthachadh an albaim..."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:374
+#: plugins/shotwell-publishing/FacebookPublishing.vala:374
 msgid ""
 "A file required for publishing is unavailable. Publishing to Facebook can't "
 "continue."
@@ -626,7 +1856,7 @@ 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:1019
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1032
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -635,27 +1865,38 @@ msgstr ""
 "Chlàraich thu a-steach air Facebook mar %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1020
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1033
 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:1021
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
-msgid "Upload _size:"
-msgstr "_Meud an luchdaidh suas:"
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1180
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1193
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
 msgid "Just me"
-msgstr "Dìreach mi fhìn"
+msgstr "Mi fhìn a-mhàin"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1182
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1207
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+#: plugins/shotwell-publishing/FacebookPublishing.vala:1195
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1218
 msgid "Everyone"
 msgstr "A h-uile duine"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:61
+#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
+msgid ""
+"Enter the confirmation number which appears after you log into Flickr in "
+"your Web browser."
+msgstr ""
+"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"
@@ -665,25 +1906,26 @@ 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 Shotwell Connect ceangal a dhèanamh ris a' chunntas Flickr agad."
+"thoirt dha Ceangal Shotwell gus ceangal a dhèanamh ris a' chunntas Flickr "
+"agad."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:63
+#: plugins/shotwell-publishing/FlickrPublishing.vala:62
 msgid ""
 "You have already logged in and out of Flickr during this Shotwell session.\n"
 "To continue publishing to Flickr, quit and restart Shotwell, then try "
 "publishing again."
 msgstr ""
-"Rinn thu clàradh a-steach is a-mach air fLICKR san t-seisean Shotwell seo mu "
+"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:375
+#: 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:595
+#: 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."
@@ -691,11 +1933,11 @@ 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
+#: plugins/shotwell-publishing/FlickrPublishing.vala:457
 msgid "Verifying authorization..."
-msgstr "A' dearbhadh a' chead..."
+msgstr "A' dearbhadh an ùghdarrais..."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -704,57 +1946,79 @@ msgstr ""
 "Chlàraich thu a-steach air Flickr mar %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1155
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1155
 #, c-format
+#| msgid ""
+#| "Your free Flickr account limits how much data you can upload per month.\n"
+#| "This month, you have %d 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 megabytes remaining in your upload quota."
-msgstr ""
+"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 megabyte dheth air fhàgail agad am mìos-sa."
+"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 "
+"as urrainn dhut luchdadh suas gach mìos.\n"
+"Tha %d meaga-baidht dheth air fhàgail agad am mìos-sa."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1157
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
 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:1162
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
 msgid "Photos _visible to:"
 msgstr "Chì na _daoine a leanas na dealbhan:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
 msgid "Videos _visible to:"
 msgstr "Chì na _daoine a leanas na videothan:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
 msgid "Photos and videos _visible to:"
 msgstr "Chì na _daoine a leanas na dealbhan 's na videothan:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
 msgid "Friends & family only"
 msgstr "Mo theaghlach ⁊ mo charaidean a-mhàin"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
 msgid "Family only"
 msgstr "Mo theaghlach a-mhàin"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
 msgid "Friends only"
 msgstr "Mo charaidean a-mhàin"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
+#: 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:1232
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
+#: 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/PicasaPublishing.vala:58
+#: 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"
@@ -764,10 +2028,19 @@ 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 Shotwell Connect ceangal a dhèanamh ris a' "
-"chunntas agad air Picasa Web Albums."
-
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:361
+"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:"
+msgid "Default album"
+msgstr "An t-albam tùsail"
+
+#: plugins/shotwell-publishing/PicasaPublishing.vala:305
 msgid ""
 "A file required for publishing is unavailable. Publishing to Picasa can't "
 "continue."
@@ -776,85 +2049,144 @@ msgstr ""
 "Chan urrainn dhuinn foillseachadh air Picasa dhut."
 
 #. populate any widgets whose contents are programmatically-generated.
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:659
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 #, 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:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:572
 msgid "Videos will appear in:"
 msgstr "Nochdaidh na videothan ann an:"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
+#: plugins/shotwell-publishing/PicasaPublishing.vala:616
 msgid "Small (640 x 480 pixels)"
 msgstr "Beag (640 x 480 piogsail)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
+#: plugins/shotwell-publishing/PicasaPublishing.vala:617
 msgid "Medium (1024 x 768 pixels)"
 msgstr "Meadhanach (1024 x 768 piogsail)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
+#: plugins/shotwell-publishing/PicasaPublishing.vala:618
 msgid "Recommended (1600 x 1200 pixels)"
 msgstr "Na mholamaid (1600 x 1200 piogsail)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
+#: plugins/shotwell-publishing/PicasaPublishing.vala:619
 msgid "Google+ (2048 x 1536 pixels)"
 msgstr "Google+ (2048 x 1536 piogsail)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: ../src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:620
+#: src/editing_tools/EditingTools.vala:756
 msgid "Original Size"
 msgstr "Am meud tùsail"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+msgid "_URL of your Piwigo photo library"
+msgstr "_URL na leabhar-lainn dealbhan Piwigo agad"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+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_publishing_options_pane.ui:40
+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:149
+msgid "Photo size:"
+msgstr "Meud an deilbh:"
+
+#: 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:210
+msgid "Album comment:"
+msgstr "Beachd mun albam:"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+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
+msgid "_Do no upload tags"
+msgstr "Na luch_daich suas na tagaichean"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+msgid "Logout"
+msgstr "Clàraich a-mach"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291
+#: src/Resources.vala:295
+msgid "Publish"
+msgstr "Foillsich"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:747
 #, c-format
 msgid "Creating album %s..."
 msgstr "A' cruthachadh an albaim %s..."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:920
 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 "
 "thu ris a-rithist?"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:998
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:990
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
 msgstr ""
 "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-"
-"cheangailte ris  an leabharlann sin."
+"cheangailte ris an leabharlann sin."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:991
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
 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."
+"agad air Piwigo. Thoir sùil air an URL a chuir thu a-steach"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1021
 msgid "Invalid URL"
 msgstr "URL mì-dhligheach"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1219
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Rianairean, mo theaghlach, mo charaidean is an luchd-aithne agam"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1220
 msgid "Admins, Family, Friends"
 msgstr "Rianairean, mo theaghlach is mo charaidean"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1221
 msgid "Admins, Family"
 msgstr "Rianairean 's mo theaghlach"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1222
 msgid "Admins"
 msgstr "Rianairean"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:57
+#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+msgid "Core Publishing Services"
+msgstr "Prìomh-sheirbheisean foillseachaidh"
+
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+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"
@@ -870,7 +2202,7 @@ msgstr ""
 "chlàraicheas tu a-steach air YouTube sa bhrabhsair-lìn agad co-dhiù aon "
 "turas."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+#: plugins/shotwell-publishing/YouTubePublishing.vala:363
 msgid ""
 "A file required for publishing is unavailable. Publishing to Youtube can't "
 "continue."
@@ -878,255 +2210,145 @@ 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:461
+#: plugins/shotwell-publishing/YouTubePublishing.vala:462
 #, 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:463
+#: 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:495
+#: plugins/shotwell-publishing/YouTubePublishing.vala:496
 msgid "Public listed"
 msgstr "Air a liostadh gu poblach"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:497
 msgid "Public unlisted"
 msgstr "Chan eil e air a liostadh gu poblach"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
-msgid "Publish to an e_xisting album:"
-msgstr "Foillsich gu albam m_airneach:"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
-msgid "Create a _new album named:"
-msgstr "Cruthaich albam _ùr ainmichte:"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
-msgid "Videos and new photo albums _visible to:"
-msgstr "Albaman bhidiothan agus dealbhan ùr _soilleir gu:"
-
-#: ../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 ""
-"Thoi_r air falbh fiosrachadh mar fiosrachadh aithneachaidh, an t-ionad agus "
-"an camara mus dèanar luchdadh suas"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Cuir a-steach an àireamh-dhearbhadh tha a nochdadh an dèidh dhut logadh a-"
-"steach dhan Flickr nad bhrabhsair lìon."
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
-msgid "Authorization _Number:"
-msgstr "_Àireamh Ùghdarras:"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
-#: ../src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "Lean air adhar_t"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
-msgid "L_ist album in public gallery"
-msgstr "L_iosta albam anns gailearaidh poblach"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
-msgid "Photo _size preset:"
-msgstr "Ro-shocraich _meud dealbh:"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
-msgid "_URL of your Piwigo photo library"
-msgstr "_URL na leabhar-lainn dealbhan Piwigo agad"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
-msgid "User _name"
-msgstr "_Ainm-cleachdaiche"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
-msgid "_Remember Password"
-msgstr "_Cuimhnich am facal-faire"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
-msgid "An _existing category:"
-msgstr "Roinn-seòrsa _maireann:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
-msgid "Photos will be _visible by:"
-msgstr "Chì na daoine a leanas na _dealbhan:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
-msgid "Photo size:"
-msgstr "Meud an deilbh:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
-msgid "within category:"
-msgstr "san roinn-seòrsa:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
-msgid "Album comment:"
-msgstr "Beachd mun albam:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
-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.glade.h:10
-msgid "_Do no upload tags"
-msgstr "Na luch_daich suas na tagaichean"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
-msgid "Logout"
-msgstr "Clàraich a-mach"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:268
-msgid "Publish"
-msgstr "Foillsich"
-
-#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Prìomh-sheirbheisean foillseachaidh"
-
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
-msgid "Video privacy _setting:"
-msgstr "_Suidheachadh prìobhaid bhideo:"
-
-#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+#: plugins/shotwell-transitions/BlindsEffect.vala:20
 msgid "Blinds"
 msgstr "Sgàilean-uinneige"
 
-#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+#: plugins/shotwell-transitions/ChessEffect.vala:20
 msgid "Chess"
 msgstr "Tàileasg"
 
-#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+#: plugins/shotwell-transitions/CircleEffect.vala:20
 msgid "Circle"
 msgstr "Cearcall"
 
-#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+#: plugins/shotwell-transitions/CirclesEffect.vala:20
 msgid "Circles"
 msgstr "Cearcallan"
 
-#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+#: plugins/shotwell-transitions/ClockEffect.vala:20
 msgid "Clock"
 msgstr "Cleoc"
 
-#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+#: plugins/shotwell-transitions/CrumbleEffect.vala:20
 msgid "Crumble"
 msgstr "Criomagaich"
 
-#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+#: plugins/shotwell-transitions/FadeEffect.vala:20
 msgid "Fade"
 msgstr "Crìon"
 
-#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+#: plugins/shotwell-transitions/shotwell-transitions.vala:28
+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."
+msgstr ""
+"Còir-lethbhreac 2010 Maxim Kartashev, Còir-lethbhreac 2016 Software Freedom "
+"Conservancy Inc."
+
+#: plugins/shotwell-transitions/SlideEffect.vala:20
 msgid "Slide"
 msgstr "Sleamhnag"
 
-#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+#: plugins/shotwell-transitions/SquaresEffect.vala:20
 msgid "Squares"
 msgstr "Ceàrnagan"
 
-#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+#: plugins/shotwell-transitions/StripesEffect.vala:20
 msgid "Stripes"
 msgstr "Stiallan"
 
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "Prìomh tar-mhùthaidhean airson taisbeanaidhean-shleamhnagan"
-
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
-msgstr ""
-"Còir-lethbhreac 2010 Maxim Kartashev, Còir-lethbhreac 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 "Cha ghabh pasgan an tasgadain %s a chruthachadh: %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 "Cha ghabh pasgan an dàta %s a chruthachadh: %s"
 
 #. If XDG yarfed, use ~/Pictures
-#: ../src/AppDirs.vala:152
+#: src/AppDirs.vala:168
 msgid "Pictures"
 msgstr "Dealbhan"
 
-#: ../src/AppDirs.vala:190
+#: src/AppDirs.vala:206
 #, c-format
 msgid "Unable to create temporary directory %s: %s"
 msgstr "Cha ghabh am pasgan sealach %s a chruthachadh: %s"
 
-#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:223
+#: src/AppDirs.vala:223 src/AppDirs.vala:254
 #, c-format
 msgid "Unable to create data subdirectory %s: %s"
 msgstr "Cha ghabh fo-phasgan an dàta %s a chruthachadh: %s"
 
-#. restore pin state
-#: ../src/AppWindow.vala:52
+#: src/AppDirs.vala:236
+#, c-format
+msgid "Could not make directory %s writable"
+msgstr ""
+
+#: src/AppDirs.vala:239
+#, fuzzy, c-format
+#| msgid "Unable to create cache directory %s: %s"
+msgid "Could not make directory %s writable: %s"
+msgstr "Cha ghabh pasgan an tasgadain %s a chruthachadh: %s"
+
+#: src/AppWindow.vala:54
 msgid "Pin Toolbar"
 msgstr "Prìnich am bàr-inneal"
 
-#: ../src/AppWindow.vala:53
+#: src/AppWindow.vala:55
 msgid "Pin the toolbar open"
 msgstr "Prìnich am bàr-inneal fosgailte"
 
-#: ../src/AppWindow.vala:57 ../src/AppWindow.vala:135
+#: src/AppWindow.vala:60
 msgid "Leave fullscreen"
 msgstr "Fàg an làn-sgrìn"
 
-#: ../src/AppWindow.vala:134
-msgid "Leave _Fullscreen"
-msgstr "_Fàg an làn-sgrìn"
-
-#: ../src/AppWindow.vala:493
-msgid "_Quit"
-msgstr "_Fàg an-seo"
-
-#: ../src/AppWindow.vala:498
-msgid "_About"
-msgstr "_Mu dhèidhinn"
-
-#: ../src/AppWindow.vala:503
-msgid "Fulls_creen"
-msgstr "_Làn-sgrìn"
-
-#: ../src/AppWindow.vala:508
+#: src/AppWindow.vala:499
 msgid "_Contents"
 msgstr "_Susbaint"
 
-#: ../src/AppWindow.vala:513
+#: src/AppWindow.vala:504
 msgid "_Frequently Asked Questions"
 msgstr "_Ceistean àbhaisteach"
 
-#: ../src/AppWindow.vala:518
+#: src/AppWindow.vala:509
 msgid "_Report a Problem..."
 msgstr "Dèan aith_ris air duilgheadas..."
 
-#: ../src/AppWindow.vala:617 ../src/AppWindow.vala:638
-#: ../src/AppWindow.vala:655 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1417 ../src/Dialogs.vala:1440
-#: ../src/data_imports/DataImportsUI.vala:399
-#: ../src/publishing/PublishingUI.vala:498
+#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
+#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1425 src/Dialogs.vala:1448
+#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
 msgid "_Cancel"
 msgstr "_Sguir dheth"
 
-#: ../src/AppWindow.vala:665
+#: src/AppWindow.vala:656
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell's library.  Shotwell cannot "
@@ -1139,247 +2361,435 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:685
-msgid "Visit the Yorba web site"
-msgstr "Tadhail air làrach-lìn Yorba"
+#: src/AppWindow.vala:676
+#| msgid "Visit the Shotwell home page"
+msgid "Visit the Shotwell web site"
+msgstr "Tadhail air làrach-lìn Shotwell"
 
-#: ../src/AppWindow.vala:697
+#: src/AppWindow.vala:688
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Chan urrainn dhuinn a' chobhair a shealltainn: %s"
 
-#: ../src/AppWindow.vala:705
+#: src/AppWindow.vala:696
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Cha ruig sinn stòr-dàta nam bugaichean: %s"
 
-#: ../src/AppWindow.vala:713
+#: src/AppWindow.vala:704
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Chan urrainn dhuinn na CÀBHA a shealltainn: %s"
 
-#: ../src/BatchImport.vala:26
+#: src/BatchImport.vala:26
 msgid "Success"
 msgstr "Soirbheas"
 
-#: ../src/BatchImport.vala:29
+#: src/BatchImport.vala:29
 msgid "File error"
 msgstr "Mearachd faidhle"
 
-#: ../src/BatchImport.vala:32
+#: src/BatchImport.vala:32
 msgid "Unable to decode file"
 msgstr "Cha ghabh am faidhle a dhì-chòdachadh"
 
-#: ../src/BatchImport.vala:35
+#: src/BatchImport.vala:35
 msgid "Database error"
 msgstr "Mearachd an stòir-dhàta"
 
-#: ../src/BatchImport.vala:38
+#: src/BatchImport.vala:38
 msgid "User aborted import"
 msgstr "Sguireadh an cleachdaiche dhen ion-phortadh"
 
-#: ../src/BatchImport.vala:41
+#: src/BatchImport.vala:41
 msgid "Not a file"
 msgstr "Chan e faidhle a tha ann"
 
-#: ../src/BatchImport.vala:44
+#: src/BatchImport.vala:44
 msgid "File already exists in database"
 msgstr "Tha faidhle san stòr-dàta mu thràth"
 
-#: ../src/BatchImport.vala:47
+#: src/BatchImport.vala:47
 msgid "Unsupported file format"
 msgstr "Fòrmat faidhle ris nach eil taic"
 
-#: ../src/BatchImport.vala:50
+#: src/BatchImport.vala:50
 msgid "Not an image file"
 msgstr "Chan e faidhle deilbh a tha ann"
 
-#: ../src/BatchImport.vala:53
+#: src/BatchImport.vala:53
 msgid "Disk failure"
 msgstr "Dh'fhàillig an diosg"
 
-#: ../src/BatchImport.vala:56
+#: src/BatchImport.vala:56
 msgid "Disk full"
 msgstr "Tha an diosg làn"
 
-#: ../src/BatchImport.vala:59
+#: src/BatchImport.vala:59
 msgid "Camera error"
 msgstr "Mearachd a' chamara"
 
-#: ../src/BatchImport.vala:62
+#: src/BatchImport.vala:62
 msgid "File write error"
 msgstr "Mearachd le sgrìobhadh an fhaidhle"
 
-#: ../src/BatchImport.vala:65
+#: src/BatchImport.vala:65
 msgid "Corrupt image file"
 msgstr "Tha faidhle an deilbh coirbte"
 
-#: ../src/BatchImport.vala:68
+#: src/BatchImport.vala:68
 #, c-format
 msgid "Imported failed (%d)"
 msgstr "Dh'fhàillig ion-phortadh (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2634
+#: 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
+msgid "Camera"
+msgstr "Camara"
+
+#: src/camera/ImportPage.vala:311 src/Properties.vala:227
+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 ""
+"Cha ghabh an camara a dhì-mhunntachadh. Feuch is dì-mhunntaich an camara o "
+"mhanaidsear nam faidhlichean."
+
+#. hide duplicates checkbox
+#: src/camera/ImportPage.vala:783
+msgid "Hide photos already imported"
+msgstr "Falaich dealbhan a chaidh ion-phortadh mar-thà"
+
+#: src/camera/ImportPage.vala:784
+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
+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
+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"
+
+#. 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 ""
+"Feumaidh Shotwell an camara a dhì-mhunntachadh o shiostam nam faidhlichean "
+"mus gabh e cothrom air.  A bheil thu airson leantainn air adhart?"
+
+#: src/camera/ImportPage.vala:1027
+msgid "_Unmount"
+msgstr "_Dì-mhunntaich"
+
+#: src/camera/ImportPage.vala:1032
+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."
+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."
+
+#: 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."
+
+#: src/camera/ImportPage.vala:1052
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"Cha b' urrainn dhuinn ro-shealladh fhaighinn on chamara:\n"
+"%s"
+
+#: src/camera/ImportPage.vala:1069
+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..."
+
+#: src/camera/ImportPage.vala:1177
+msgid "Fetching photo information"
+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"
+
+#: src/camera/ImportPage.vala:1651
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Chan urrainn dhuinn an camara a ghlasadh: %s"
+
+#: src/camera/ImportPage.vala:1736
+#, 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?"
+
+#: 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?"
+
+#: 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[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?"
+
+#: 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?"
+
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1392
+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"
+
+#: 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 "
+"mhearachdan."
+msgstr[1] ""
+"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 "
+"linn mhearachdan."
+msgstr[3] ""
+"Tha %d dealbh/video air a' chamara nach urrainn dhuinn sguabadh às ri linn "
+"mhearachdan."
+
+#: src/CollectionPage.vala:230 src/PhotoPage.vala:2636
 msgid "S_lideshow"
 msgstr "T_aisbeanadh-shleamhnagan"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2635
+#: src/CollectionPage.vala:231 src/PhotoPage.vala:2637
 msgid "Play a slideshow"
-msgstr "Cluich an taisbeanadh-shleamhnagan"
+msgstr "Cluich taisbeanadh-shleamhnagan"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:456
 msgid "Export Photo/Video"
 msgstr "Às-phortaich an dealbh/video"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:456
 msgid "Export Photos/Videos"
 msgstr "Às-phortaich dealbhan/videothan"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3207
+#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3210
 msgid "Export Photo"
 msgstr "Às-phortaich an dealbh"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+#: src/CollectionPage.vala:458 src/Dialogs.vala:88
 msgid "Export Photos"
 msgstr "Às-phortaich dealbhan"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
 msgid "Rotating"
-msgstr "Cuairteachadh"
+msgstr "'Ga cuairteachadh"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
 msgid "Undoing Rotate"
 msgstr "A' neo-dhèanamh a' chuairteachaidh"
 
-#: ../src/CollectionPage.vala:570
+#: src/CollectionPage.vala:570
 msgid "Flipping Horizontally"
-msgstr "A' flipeadh air a' chòmhnard"
+msgstr "'Ga fhlipeadh air a' chòmhnard"
 
-#: ../src/CollectionPage.vala:571
+#: src/CollectionPage.vala:571
 msgid "Undoing Flip Horizontally"
 msgstr "A' neo-dhèanamh flipeadh air a' chòmhnard"
 
-#: ../src/CollectionPage.vala:580
+#: src/CollectionPage.vala:580
 msgid "Flipping Vertically"
-msgstr "A' flipeadh gu h-inghearach"
+msgstr "'Ga fhlipeadh gu h-inghearach"
 
-#: ../src/CollectionPage.vala:581
+#: src/CollectionPage.vala:581
 msgid "Undoing Flip Vertically"
 msgstr "A' neo-dhèanamh flipeadh inghearach"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Reverting"
 msgstr "'Ga thilleadh"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Undoing Revert"
 msgstr "A' neo-dhèanamh a thillidh"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Enhancing"
 msgstr "'Ga leasachadh"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Undoing Enhance"
 msgstr "A' neo-dhèanamh a leasachaidh"
 
-#: ../src/Commands.vala:845
+#: src/Commands.vala:857
 msgid "Applying Color Transformations"
 msgstr "A' cur an sàs atharraichean nan dathan"
 
-#: ../src/Commands.vala:845
+#: src/Commands.vala:857
 msgid "Undoing Color Transformations"
 msgstr "A' neo-dhèanamh atharraichean nan dathan"
 
-#: ../src/Commands.vala:995
+#: src/Commands.vala:1007
 msgid "Creating New Event"
 msgstr "A' cruthachadh tachartas ùr"
 
-#: ../src/Commands.vala:996
+#: src/Commands.vala:1008
 msgid "Removing Event"
 msgstr "A' toirt air falbh an tachartais"
 
-#: ../src/Commands.vala:1005
+#: src/Commands.vala:1017
 msgid "Moving Photos to New Event"
 msgstr "A' gluasad nan dealbhan gun tachartas ùr"
 
-#: ../src/Commands.vala:1006
+#: src/Commands.vala:1018
 msgid "Setting Photos to Previous Event"
 msgstr "A' suidheachadh nan dealbhan gun tachartas roimhe"
 
-#: ../src/Commands.vala:1063
+#: src/Commands.vala:1075
 msgid "Merging"
 msgstr "'Gan co-aonadh"
 
-#: ../src/Commands.vala:1064
+#: src/Commands.vala:1076
 msgid "Unmerging"
 msgstr "A' neo-dhèanamh an co-aonadh"
 
-#: ../src/Commands.vala:1073
+#: src/Commands.vala:1085
 msgid "Duplicating photos"
 msgstr "A' dùblachadh nan dealbhan"
 
-#: ../src/Commands.vala:1073
+#: src/Commands.vala:1085
 msgid "Removing duplicated photos"
 msgstr "A' toirt air falbh nan dealbhan dùblaichte"
 
-#: ../src/Commands.vala:1096
+#: 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] ""
 "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"
 msgstr[3] ""
 "Tha %d dealbh ann nach urrainn dhuinn dùblachadh ri linn mhearachdan faidhle"
 
-#: ../src/Commands.vala:1183
+#: src/Commands.vala:1195
 msgid "Restoring previous rating"
 msgstr "Ag aiseag an rangachadh roimhe"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Increasing ratings"
-msgstr "A' cur an àirde nan rangachaidhean"
+msgstr "A' meudachadh nan rangachaidhean"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Decreasing ratings"
 msgstr "A' lùghdachadh nan rangachaidhean"
 
-#: ../src/Commands.vala:1244
+#: src/Commands.vala:1256
 msgid "Setting RAW developer"
 msgstr "A' suidheachadh an leasaicheir RAW"
 
-#: ../src/Commands.vala:1244
+#: src/Commands.vala:1256
 msgid "Restoring previous RAW developer"
 msgstr "Ag aiseag an leasaicheir RAW a bha agad roimhe"
 
-#: ../src/Commands.vala:1245
+#: src/Commands.vala:1257
 msgid "Set Developer"
 msgstr "Suidhich an leasaichear"
 
-#: ../src/Commands.vala:1335
+#: src/Commands.vala:1347
 msgid "Original photo could not be adjusted."
 msgstr "Cha b' urrainn dhuinn an dealbh tùsail a chur air gleus."
 
-#: ../src/Commands.vala:1356
+#: src/Commands.vala:1368
 msgid "Adjusting Date and Time"
 msgstr "A' cur air gleus a' chinn-là agus an ama"
 
-#: ../src/Commands.vala:1356
+#: src/Commands.vala:1368
 msgid "Undoing Date and Time Adjustment"
 msgstr "A' neo-dhèanamh gleusadh a' chinn-là agus an ama"
 
-#: ../src/Commands.vala:1387
+#: 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/aca a chur "
-"air gleus"
+"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 "
 "gleus"
@@ -1390,100 +2800,195 @@ msgstr[3] ""
 "Bha %d dealbh ann nach b' urrainn dhuinn an tionndadh tùsail aca a chur air "
 "gleus"
 
-#: ../src/Commands.vala:1389 ../src/Commands.vala:1413
+#: src/Commands.vala:1401 src/Commands.vala:1425
 msgid "Time Adjustment Error"
 msgstr "Mearachd a' cur air gleus an ama"
 
-#: ../src/Commands.vala:1411
+#: 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/aca 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."
+msgstr[3] "Bha %d dealbh ann nach b' urrainn dhuinn an t-àm aca a chur air gleus."
 
-#: ../src/Commands.vala:1625 ../src/Commands.vala:1648
+#: src/Commands.vala:1637 src/Commands.vala:1660
 msgid "Create Tag"
-msgstr "Cruthaich an taga"
+msgstr "Cruthaich taga"
 
-#: ../src/Commands.vala:1683
+#: src/Commands.vala:1695
 #, c-format
 msgid "Move Tag \"%s\""
 msgstr "Gluais an taga \"%s\""
 
-#: ../src/Commands.vala:2335
+#: src/Commands.vala:2347
 msgid "Move Photos to Trash"
 msgstr "Gluais na dealbhan dhan sgudal"
 
-#: ../src/Commands.vala:2335
+#: src/Commands.vala:2347
 msgid "Restore Photos from Trash"
 msgstr "Aisig na dealbhan on sgudal"
 
-#: ../src/Commands.vala:2336
+#: src/Commands.vala:2348
 msgid "Move the photos to the Shotwell trash"
 msgstr "Gluais na dealbhan do sgudal Shotwell"
 
-#: ../src/Commands.vala:2336
+#: src/Commands.vala:2348
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Aisig na dealbhan do leabhar-lann Shotwell"
 
-#: ../src/Commands.vala:2355
+#: src/Commands.vala:2367
 msgid "Moving Photos to Trash"
 msgstr "A' gluasad nan dealbhan dhan sgudal"
 
-#: ../src/Commands.vala:2355
+#: src/Commands.vala:2367
 msgid "Restoring Photos From Trash"
 msgstr "Ag aiseag nan dealbhan on sgudal"
 
-#: ../src/Commands.vala:2441
+#: src/Commands.vala:2453
 msgid "Flag selected photos"
 msgstr "Cuir bratach ris na dealbhan a thagh thu"
 
-#: ../src/Commands.vala:2442
+#: src/Commands.vala:2454
 msgid "Unflag selected photos"
 msgstr "Thoir air falbh na brataichean o na dealbhan a thagh thu"
 
-#: ../src/Commands.vala:2443
+#: src/Commands.vala:2455
 msgid "Flagging selected photos"
 msgstr "A' cur bratach ris na dealbhan a thagh thu"
 
-#: ../src/Commands.vala:2444
+#: src/Commands.vala:2456
 msgid "Unflagging selected photos"
 msgstr "A' toirt air falbh nam brataichean o na dealbhan a thagh thu"
 
-#: ../src/Commands.vala:2451
+#: src/Commands.vala:2463
 msgid "Flag"
 msgstr "Cuir bratach ris"
 
-#: ../src/Commands.vala:2451
+#: src/Commands.vala:2463
 msgid "Unflag"
 msgstr "Thoir a' bhratach air falbh"
 
-#: ../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 "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:"
+msgstr ""
+"Chan urrainn dhuinn leantainn air an ion-phortadh o %s oir thachair "
+"mearachd:"
+
+#: src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr ""
+"Ma tha thu airson feuchainn ri ion-phortadh a dhèanamh o sheirbheis eile, "
+"tagh tè sa chlàr-taice gu h-àrd."
+
+#: 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 ""
+"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."
+
+#: 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
+msgid "_Import"
+msgstr "_Ion-phortaich"
+
+#: src/data_imports/DataImportsUI.vala:220
+msgid "Import From Application"
+msgstr "Ion-phortaich o aplacaid"
+
+#: src/data_imports/DataImportsUI.vala:221
+msgid "Import media _from:"
+msgstr "Ion-phortaich meadhan _o:"
+
+#: src/data_imports/DataImportsUI.vala:408 src/publishing/PublishingUI.vala:507
+msgid "_Close"
+msgstr "_Dùin"
+
+#: src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "Ion-phortadh dàta"
+
+#: src/db/DatabaseTable.vala:37
+#, 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: "
+"còd mearachd %d"
+
+#: src/db/DatabaseTable.vala:46
+#, c-format
+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"
+" %s"
+
+#: src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"Mearachd faighinn cothrom air faidhle stòr-dàta:\n"
+" %s\n"
+"\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"
+
+#: src/DesktopIntegration.vala:121
 #, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
 msgstr "Chan urrainn dhuinn Nautilus Send-To a chur gu dol: %s"
 
-#: ../src/DesktopIntegration.vala:129
+#: src/DesktopIntegration.vala:129
 msgid "Send To"
 msgstr "Cuir gu"
 
-#: ../src/DesktopIntegration.vala:174
+#: src/DesktopIntegration.vala:174
 #, c-format
 msgid "Unable to export background to %s: %s"
 msgstr "Chan urrainn dhuinn an cùlaibh às-phortadh gu %s: %s"
 
-#: ../src/DesktopIntegration.vala:311
+#: src/DesktopIntegration.vala:311
 #, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Chan urrainn dhuinn taisbeanadh-shleamhnagan an deasga ullachadh: %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?"
@@ -1500,20 +3005,20 @@ msgstr[3] ""
 "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:1385
-#: ../src/Resources.vala:328 ../src/Resources.vala:376
-#: ../src/Resources.vala:641
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1393
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
+#: src/Resources.vala:674
 msgid "_Delete"
 msgstr "_Sguab às"
 
-#: ../src/Dialogs.vala:25
+#: src/Dialogs.vala:25
 #, c-format
 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 "
 "leantainn air adhart?"
 
-#: ../src/Dialogs.vala:35
+#: src/Dialogs.vala:36
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -1533,11 +3038,11 @@ msgstr[3] ""
 "Ma thaghas tu leasaichear eile, thèid gach atharrachadh a rinn thu air na "
 "dealbhan seo ann an Shotwell a chur gu neoini."
 
-#: ../src/Dialogs.vala:39
+#: src/Dialogs.vala:40
 msgid "_Switch Developer"
 msgstr "_Cleachd an leasaichear eile"
 
-#: ../src/Dialogs.vala:58
+#: src/Dialogs.vala:59
 msgid "Export Video"
 msgstr "Às-phortaich a' video"
 
@@ -1546,7 +3051,7 @@ msgstr "Às-phortaich a' video"
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: ../src/Dialogs.vala:115
+#: src/Dialogs.vala:116
 #, c-format
 msgid ""
 "Shotwell couldn't create a file for editing this photo because you do not "
@@ -1555,7 +3060,7 @@ 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."
 
-#: ../src/Dialogs.vala:124
+#: src/Dialogs.vala:125
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -1564,7 +3069,7 @@ msgstr ""
 "faidhle.\n"
 "\n"
 
-#: ../src/Dialogs.vala:130
+#: src/Dialogs.vala:131
 msgid ""
 "\n"
 "\n"
@@ -1577,53 +3082,55 @@ msgstr ""
 #. "Unmodified" and "Current," though they appear in the "Format:" popup menu, really
 #. aren't formats so much as they are operating modes that determine specific formats.
 #. Hereafter we'll refer to these as "special formats."
-#: ../src/Dialogs.vala:147
+#: src/Dialogs.vala:148
 msgid "Unmodified"
 msgstr "Gun atharrachadh"
 
-#: ../src/Dialogs.vala:148
+#: src/Dialogs.vala:149
 msgid "Current"
 msgstr "Làithreach"
 
 #. layout controls
-#: ../src/Dialogs.vala:212
+#: src/Dialogs.vala:216
 msgid "_Format:"
 msgstr "_Fòrmat:"
 
-#: ../src/Dialogs.vala:215
+#: src/Dialogs.vala:219
 msgid "_Quality:"
 msgstr "_Càileachd:"
 
-#: ../src/Dialogs.vala:218
+#: src/Dialogs.vala:222
 msgid "_Scaling constraint:"
 msgstr "_Bacadh sgèilidh:"
 
-#: ../src/Dialogs.vala:221
-msgid " _pixels"
+#: src/Dialogs.vala:225
+#, fuzzy
+#| msgid " _pixels"
+msgid "_Pixels:"
 msgstr " _piogsailean"
 
-#: ../src/Dialogs.vala:229
+#: src/Dialogs.vala:228
 msgid "Export metadata"
 msgstr "Às-phortaich am metadata"
 
-#: ../src/Dialogs.vala:465
+#: src/Dialogs.vala:462
 msgid "Save Details..."
 msgstr "Sàbhail am mion-fhiosrachadh..."
 
-#: ../src/Dialogs.vala:466
+#: src/Dialogs.vala:463
 msgid "Save Details"
 msgstr "Sàbhail am mion-fhiosrachadh"
 
-#: ../src/Dialogs.vala:481
+#: src/Dialogs.vala:478
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(agus %d a bharrachd)\n"
 
-#: ../src/Dialogs.vala:534
+#: src/Dialogs.vala:531
 msgid "Import Results Report"
 msgstr "An aithris air coileanas an ion-phortaidh"
 
-#: ../src/Dialogs.vala:538
+#: src/Dialogs.vala:535
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -1632,7 +3139,7 @@ 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:541
+#: src/Dialogs.vala:538
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1644,33 +3151,33 @@ msgstr[3] "Chaidh %d dhiubh seo ion-phortadh gu soirbheachail."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:553
+#: src/Dialogs.vala:550
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr ""
 "Dealbhan/videothan a bha ann iomadh turas is nach deach an ion-phortadh:"
 
-#: ../src/Dialogs.vala:557
+#: src/Dialogs.vala:554
 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:568
+#: src/Dialogs.vala:565
 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:"
 
-#: ../src/Dialogs.vala:571 ../src/Dialogs.vala:586 ../src/Dialogs.vala:601
-#: ../src/Dialogs.vala:617 ../src/Dialogs.vala:632 ../src/Dialogs.vala:646
+#: src/Dialogs.vala:568 src/Dialogs.vala:583 src/Dialogs.vala:598
+#: src/Dialogs.vala:614 src/Dialogs.vala:629 src/Dialogs.vala:643
 msgid "error message:"
 msgstr "teachdaireachd na mearachd:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:582
+#: src/Dialogs.vala:579
 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 "
@@ -1679,7 +3186,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:597
+#: src/Dialogs.vala:594
 msgid ""
 "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
 "Understands:"
@@ -1690,7 +3197,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:612
+#: src/Dialogs.vala:609
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
 "Library:"
@@ -1698,7 +3205,7 @@ msgstr ""
 "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:616
+#: src/Dialogs.vala:613
 #, c-format
 msgid ""
 "couldn't copy %s\n"
@@ -1710,7 +3217,7 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:628
+#: src/Dialogs.vala:625
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr ""
 "Cha deach na dealbhan/videothan ion-phortadh a chionn 's gu bheil na "
@@ -1719,12 +3226,12 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:643
+#: src/Dialogs.vala:640
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr ""
 "Dealbhan/videothan nach deach an ion-phortadh air sgàth adhbharan eile:"
 
-#: ../src/Dialogs.vala:663
+#: src/Dialogs.vala:660
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
@@ -1733,7 +3240,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:666
+#: src/Dialogs.vala:663
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
@@ -1742,7 +3249,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:669
+#: src/Dialogs.vala:666
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
@@ -1751,7 +3258,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:683
+#: src/Dialogs.vala:680
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
@@ -1768,7 +3275,7 @@ msgstr[3] ""
 "Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd faidhle no "
 "mearachd bathair-chruaidh:\n"
 
-#: ../src/Dialogs.vala:686
+#: src/Dialogs.vala:683
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
@@ -1785,7 +3292,7 @@ msgstr[3] ""
 "Bha %d video ann nach deach ion-phortadh ri linn mearachd faidhle no "
 "mearachd bathair-chruaidh:\n"
 
-#: ../src/Dialogs.vala:689
+#: src/Dialogs.vala:686
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1803,7 +3310,7 @@ msgstr[3] ""
 "Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd faidhle no "
 "mearachd bathair-chruaidh:\n"
 
-#: ../src/Dialogs.vala:692
+#: src/Dialogs.vala:689
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
@@ -1820,7 +3327,7 @@ msgstr[3] ""
 "Bha %d faidhle ann nach deach ion-phortadh ri linn mearachd faidhle no "
 "mearachd bathair-chruaidh:\n"
 
-#: ../src/Dialogs.vala:706
+#: src/Dialogs.vala:703
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1840,7 +3347,7 @@ 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:709
+#: src/Dialogs.vala:706
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1860,7 +3367,7 @@ 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:712
+#: src/Dialogs.vala:709
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1881,7 +3388,7 @@ 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:715
+#: src/Dialogs.vala:712
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1901,7 +3408,7 @@ 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:729
+#: src/Dialogs.vala:726
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
@@ -1914,7 +3421,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Bha %d dealbh ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
 
-#: ../src/Dialogs.vala:732
+#: src/Dialogs.vala:729
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
@@ -1927,7 +3434,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Bha %d video ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
 
-#: ../src/Dialogs.vala:735
+#: src/Dialogs.vala:732
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
@@ -1944,7 +3451,7 @@ msgstr[3] ""
 "Bha %d dealbh/video ann nach deach ion-phortadh ri linn mearachd a' "
 "chamara:\n"
 
-#: ../src/Dialogs.vala:738
+#: src/Dialogs.vala:735
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
@@ -1958,7 +3465,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Bha %d fhaidhle ann nach deach ion-phortadh ri linn mearachd a' chamara:\n"
 
-#: ../src/Dialogs.vala:752
+#: src/Dialogs.vala:749
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
@@ -1970,7 +3477,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Cha deach %d dealbh ion-phortadh a chionn 's gu bheil iad coirbte:\n"
 
-#: ../src/Dialogs.vala:755
+#: src/Dialogs.vala:752
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
@@ -1980,7 +3487,7 @@ msgstr[1] ""
 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:758
+#: src/Dialogs.vala:755
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
@@ -1994,7 +3501,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Cha deach %d dealbh/video ion-phortadh a chionn 's gu bheil iad coirbte:\n"
 
-#: ../src/Dialogs.vala:761
+#: src/Dialogs.vala:758
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -2011,7 +3518,7 @@ msgstr[3] ""
 #. 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:778
+#: src/Dialogs.vala:775
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -2023,7 +3530,7 @@ 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:793
+#: src/Dialogs.vala:790
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -2036,7 +3543,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Chaidh leum a ghearradh thairis air %d faidhle nach eil 'nan dealbhan:\n"
 
-#: ../src/Dialogs.vala:804
+#: src/Dialogs.vala:801
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
@@ -2053,7 +3560,7 @@ msgstr[3] ""
 "Chaidh leum a ghearradh thairis air %d dealbh oir sguir an cleachdaiche "
 "dhiubh:\n"
 
-#: ../src/Dialogs.vala:807
+#: src/Dialogs.vala:804
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
@@ -2070,7 +3577,7 @@ msgstr[3] ""
 "Chaidh leum a ghearradh thairis air %d video oir sguir an cleachdaiche "
 "dhiubh:\n"
 
-#: ../src/Dialogs.vala:810
+#: src/Dialogs.vala:807
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
@@ -2087,7 +3594,7 @@ msgstr[3] ""
 "Chaidh leum a ghearradh thairis air %d dealbh/video oir sguir an "
 "cleachdaiche dhiubh:\n"
 
-#: ../src/Dialogs.vala:813
+#: src/Dialogs.vala:810
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
@@ -2104,7 +3611,7 @@ msgstr[3] ""
 "Chaidh leum a ghearradh thairis air %d faidhle oir sguir an cleachdaiche "
 "dhiubh:\n"
 
-#: ../src/Dialogs.vala:827
+#: src/Dialogs.vala:824
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -2113,7 +3620,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:830
+#: src/Dialogs.vala:827
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -2122,7 +3629,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:833
+#: src/Dialogs.vala:830
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -2133,15 +3640,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:849
+#: src/Dialogs.vala:846
 msgid "No photos or videos imported.\n"
 msgstr "Cha deach dealbh no video sam bith ion-phortadh.\n"
 
-#: ../src/Dialogs.vala:856 ../src/Dialogs.vala:875
+#: src/Dialogs.vala:853 src/Dialogs.vala:872
 msgid "Import Complete"
 msgstr "Deiseil leis an ion-phortadh"
 
-#: ../src/Dialogs.vala:1161
+#: src/Dialogs.vala:1158
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -2150,7 +3657,7 @@ msgstr[1] "%d dhiog"
 msgstr[2] "%d diogan"
 msgstr[3] "%d diog"
 
-#: ../src/Dialogs.vala:1164
+#: src/Dialogs.vala:1161
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -2159,7 +3666,7 @@ msgstr[1] "%d mhionaid"
 msgstr[2] "%d mionaidean"
 msgstr[3] "%d mionaid"
 
-#: ../src/Dialogs.vala:1168
+#: src/Dialogs.vala:1165
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -2168,39 +3675,44 @@ msgstr[1] "%d uair a thìde"
 msgstr[2] "%d uairean a thìde"
 msgstr[3] "%d uair a thìde"
 
-#: ../src/Dialogs.vala:1171
+#: src/Dialogs.vala:1168
 msgid "1 day"
 msgstr "1 latha"
 
-#: ../src/Dialogs.vala:1319 ../src/Resources.vala:203
+#: src/Dialogs.vala:1322 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Thoir ainm ùr air an tachartas"
 
-#: ../src/Dialogs.vala:1319
+#: src/Dialogs.vala:1322
 msgid "Name:"
 msgstr "Aimn:"
 
-#: ../src/Dialogs.vala:1329 ../src/Resources.vala:272
+#. Dialog title
+#: src/Dialogs.vala:1333
+#, fuzzy
+#| msgid "Edit Title"
+msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Deasaich an tiotal"
 
-#: ../src/Dialogs.vala:1329 ../src/Properties.vala:340
+#: src/Dialogs.vala:1334 src/Properties.vala:340
 msgid "Title:"
 msgstr "Tiotal:"
 
-#: ../src/Dialogs.vala:1343 ../src/Resources.vala:278
+#. Dialog title
+#: src/Dialogs.vala:1350 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Deasaich beachd an tachartais"
 
-#: ../src/Dialogs.vala:1343
+#: src/Dialogs.vala:1351
 msgid "Edit Photo/Video Comment"
 msgstr "Deasaich beachd an deilbh/video"
 
-#: ../src/Dialogs.vala:1344 ../src/Properties.vala:630
+#: src/Dialogs.vala:1352 src/Properties.vala:628
 msgid "Comment:"
 msgstr "Beachd:"
 
-#: ../src/Dialogs.vala:1360
+#: src/Dialogs.vala:1368
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Thoir am _faidhle air falbh 's cur san sgudal e"
@@ -2208,26 +3720,22 @@ 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:1364
+#: src/Dialogs.vala:1372
 msgid "_Remove From Library"
 msgstr "Thoi_r air falbh on leabhar-lann"
 
-#: ../src/Dialogs.vala:1384 ../src/camera/ImportPage.vala:1739
-msgid "_Keep"
-msgstr "_Cum iad"
-
-#: ../src/Dialogs.vala:1407
+#: src/Dialogs.vala:1415
 msgid "Revert External Edit?"
 msgstr ""
 "A bheil thu airson an deasachadh a rinneadh air taobh a-muigh a thilleadh?"
 
-#: ../src/Dialogs.vala:1407
+#: src/Dialogs.vala:1415
 msgid "Revert External Edits?"
 msgstr ""
 "A bheil thu airson na deasachaidhean a rinneadh air an taobh a-muigh a "
 "thilleadh?"
 
-#: ../src/Dialogs.vala:1409
+#: src/Dialogs.vala:1417
 #, c-format
 msgid "This will destroy all changes made to the external file.  Continue?"
 msgid_plural ""
@@ -2245,15 +3753,15 @@ 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:1413
+#: src/Dialogs.vala:1421
 msgid "Re_vert External Edit"
 msgstr "Till an deasachadh a rinneadh air an taobh a-_muigh"
 
-#: ../src/Dialogs.vala:1413
+#: src/Dialogs.vala:1421
 msgid "Re_vert External Edits"
 msgstr "Till na deasachaidhean a rinneadh air an taobh a-_muigh"
 
-#: ../src/Dialogs.vala:1434
+#: src/Dialogs.vala:1442
 #, c-format
 msgid "This will remove the photo from the library.  Continue?"
 msgid_plural "This will remove %d photos from the library.  Continue?"
@@ -2270,72 +3778,72 @@ msgstr[3] ""
 "Bheir seo air falbh %d dealbh on leabhar-lann. A bheil thu airson leantainn "
 "air adhart?"
 
-#: ../src/Dialogs.vala:1441
+#: src/Dialogs.vala:1449 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Thoir air falbh"
 
-#: ../src/Dialogs.vala:1442
+#: src/Dialogs.vala:1450
 msgid "Remove Photo From Library"
 msgstr "Thoir air falbh an dealbh on leabhar-lann"
 
-#: ../src/Dialogs.vala:1442
+#: src/Dialogs.vala:1450
 msgid "Remove Photos From Library"
 msgstr "Thoir air falbh na dealbhan on leabhar-lann"
 
-#: ../src/Dialogs.vala:1535
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1682
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "m"
 
-#: ../src/Dialogs.vala:1683
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "f"
 
-#: ../src/Dialogs.vala:1684
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "Cleoc nan 24 uairean"
 
-#: ../src/Dialogs.vala:1699
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Gluais na dealbhan/videothan an aon astar"
 
-#: ../src/Dialogs.vala:1704
+#: src/Dialogs.vala:1719
 msgid "Set _all photos/videos to this time"
 msgstr "Cleachd _an t-àm seo airson gach dealbh/video"
 
-#: ../src/Dialogs.vala:1711
+#: src/Dialogs.vala:1726
 msgid "_Modify original photo file"
 msgstr "_Atharraich faidhle tùsail an deilbh"
 
-#: ../src/Dialogs.vala:1711
+#: src/Dialogs.vala:1726
 msgid "_Modify original photo files"
 msgstr "_Atharraich faidhlichean tùsail an deilbh"
 
-#: ../src/Dialogs.vala:1714
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
 msgstr "_Atharraich am faidhle tùsail"
 
-#: ../src/Dialogs.vala:1714
+#: src/Dialogs.vala:1729
 msgid "_Modify original files"
 msgstr "_Atharraich na faidhlichean tùsail"
 
-#: ../src/Dialogs.vala:1800
+#: src/Dialogs.vala:1815
 msgid "Original: "
 msgstr "Am feat tùsail: "
 
-#: ../src/Dialogs.vala:1801
+#: src/Dialogs.vala:1816
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%d/%m/%Y, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1802
+#: src/Dialogs.vala:1817
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d/%m/%Y, %I:%M:%S %p"
 
-#: ../src/Dialogs.vala:1891
+#: src/Dialogs.vala:1906
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2344,7 +3852,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:1892
+#: src/Dialogs.vala:1907
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2353,7 +3861,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:1894
+#: src/Dialogs.vala:1909
 msgid "day"
 msgid_plural "days"
 msgstr[0] "latha"
@@ -2361,7 +3869,7 @@ msgstr[1] "latha"
 msgstr[2] "làithean"
 msgstr[3] "latha"
 
-#: ../src/Dialogs.vala:1895
+#: src/Dialogs.vala:1910
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "uair"
@@ -2369,7 +3877,7 @@ msgstr[1] "uairean"
 msgstr[2] "uairean a thìde"
 msgstr[3] "uair a thìde"
 
-#: ../src/Dialogs.vala:1896
+#: src/Dialogs.vala:1911
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "mhionaid"
@@ -2377,7 +3885,7 @@ msgstr[1] "mhionaid"
 msgstr[2] "mionaidean"
 msgstr[3] "mionaid"
 
-#: ../src/Dialogs.vala:1897
+#: src/Dialogs.vala:1912
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "diog"
@@ -2385,7 +3893,7 @@ msgstr[1] "dhiog"
 msgstr[2] "diogan"
 msgstr[3] "diog"
 
-#: ../src/Dialogs.vala:1941
+#: src/Dialogs.vala:1956
 #, c-format
 msgid ""
 "\n"
@@ -2412,95 +3920,95 @@ msgstr[3] ""
 "\n"
 "Agus %d eile."
 
-#: ../src/Dialogs.vala:1963 ../src/Dialogs.vala:1990
+#: src/Dialogs.vala:1980 src/Dialogs.vala:2007
 msgid "Tags (separated by commas):"
 msgstr "Tagaichean (air an sgaradh le cromagan):"
 
-#: ../src/Dialogs.vala:2070
+#: src/Dialogs.vala:2087
 msgid "Welcome!"
 msgstr "Fàilte!"
 
-#: ../src/Dialogs.vala:2077
+#: src/Dialogs.vala:2094
 msgid "Welcome to Shotwell!"
 msgstr "Fàilte gu Shotwell!"
 
-#: ../src/Dialogs.vala:2081
+#: src/Dialogs.vala:2098
 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:2100
+#: src/Dialogs.vala:2117
 #, 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:2101
+#: src/Dialogs.vala:2118
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Slaod is leig às dealbhan air uinneag Shotwell"
 
-#: ../src/Dialogs.vala:2102
+#: src/Dialogs.vala:2119
 msgid "Connect a camera to your computer and import"
 msgstr "Ceangail camara ris a' choimpiutair agad agus dèan ion-phortadh"
 
-#: ../src/Dialogs.vala:2112
+#: src/Dialogs.vala:2129
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Ion-phortaich dealbhan on phasgan %s agad"
 
-#: ../src/Dialogs.vala:2119
+#: src/Dialogs.vala:2136
 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 "
 "cuideachd:"
 
-#: ../src/Dialogs.vala:2129
+#: src/Dialogs.vala:2146
 msgid "_Don't show this message again"
 msgstr "_ Na seall an teachdaireachd seo a-rithist"
 
-#: ../src/Dialogs.vala:2164
+#: src/Dialogs.vala:2181
 #, c-format
 msgid "Import photos from your %s library"
 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 ghelp: URIs.
-#: ../src/Dialogs.vala:2308 ../src/Dialogs.vala:2312
+#. link manually ourselves, due to a limitation of help: URIs.
+#: src/Dialogs.vala:2328 src/Dialogs.vala:2332
 msgid "(Help)"
 msgstr "(Cobhair)"
 
-#: ../src/Dialogs.vala:2321
+#: src/Dialogs.vala:2341
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Bliadhna%sMìos%sLatha"
 
-#: ../src/Dialogs.vala:2323
+#: src/Dialogs.vala:2343
 #, c-format
 msgid "Year%sMonth"
 msgstr "Bliadhna%sMìos"
 
-#: ../src/Dialogs.vala:2325
+#: src/Dialogs.vala:2345
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Bliadhna%sMìos-Latha"
 
-#: ../src/Dialogs.vala:2327
+#: src/Dialogs.vala:2347
 msgid "Year-Month-Day"
 msgstr "Bliadhna-Mìos-Latha"
 
-#: ../src/Dialogs.vala:2328 ../src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2348 src/editing_tools/EditingTools.vala:781
 msgid "Custom"
 msgstr "Gnàthaichte"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2565
+#: src/Dialogs.vala:2585
 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:2668
+#: src/Dialogs.vala:2687
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2509,31 +4017,31 @@ msgstr ""
 "leabhar-lainn agad no an ion-phortadh gun a bhith a' dèanamh lethbhreacan "
 "dhiubh."
 
-#: ../src/Dialogs.vala:2673
+#: src/Dialogs.vala:2692
 msgid "Co_py Photos"
 msgstr "Dèan le_thbhreacan dhe na dealbhan"
 
-#: ../src/Dialogs.vala:2674
+#: src/Dialogs.vala:2693
 msgid "_Import in Place"
 msgstr "_Ion-phortaich 'na àite"
 
-#: ../src/Dialogs.vala:2675
+#: src/Dialogs.vala:2694
 msgid "Import to Library"
 msgstr "Ion-phortaich dhan leabhar-lann"
 
-#: ../src/Dialogs.vala:2685 ../src/PhotoPage.vala:3086
+#: src/Dialogs.vala:2704 src/PhotoPage.vala:3086
 msgid "Remove From Library"
 msgstr "Thoir air falbh on leabhar-lann"
 
-#: ../src/Dialogs.vala:2686 ../src/PhotoPage.vala:3086
+#: src/Dialogs.vala:2705 src/PhotoPage.vala:3086
 msgid "Removing Photo From Library"
 msgstr "A' toirt air falbh an deilbh on leabhar-lann"
 
-#: ../src/Dialogs.vala:2686
+#: src/Dialogs.vala:2705
 msgid "Removing Photos From Library"
 msgstr "A' toirt air falbh dealbhan on leabhar-lann"
 
-#: ../src/Dialogs.vala:2700
+#: src/Dialogs.vala:2719
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library.  Would you also "
@@ -2566,7 +4074,7 @@ msgstr[3] ""
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 
-#: ../src/Dialogs.vala:2704
+#: src/Dialogs.vala:2723
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library.  Would you also like "
@@ -2599,7 +4107,7 @@ msgstr[3] ""
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 
-#: ../src/Dialogs.vala:2708
+#: src/Dialogs.vala:2727
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library.  Would you also like "
@@ -2632,7 +4140,7 @@ msgstr[3] ""
 "\n"
 "Cha ghabh seo a neo-dhèanamh."
 
-#: ../src/Dialogs.vala:2740
+#: src/Dialogs.vala:2759
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash.  Delete this file?"
@@ -2652,7 +4160,7 @@ msgstr[3] ""
 "bheil thu airson an sguabadh às?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2757
+#: src/Dialogs.vala:2776
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -2661,173 +4169,885 @@ msgstr[1] "Cha ghabh an %d dhealbh no video seo a sguabadh às."
 msgstr[2] "Cha ghabh na %d dealbhan no videothan seo a sguabadh às."
 msgstr[3] "Cha ghabh na %d dealbh no video seo a sguabadh às."
 
-#: ../src/Dimensions.vala:23
+#: src/Dimensions.vala:23
 msgid "Width"
 msgstr "Leud"
 
-#: ../src/Dimensions.vala:26
+#: src/Dimensions.vala:26
 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
+#, c-format
+msgid "%s does not exist."
+msgstr "Chan eill %s ann."
+
+#: src/direct/DirectPhotoPage.vala:229
+#, c-format
+msgid "%s is not a file."
+msgstr "Chan e faidhle a tha ann an \"%s\"."
+
+#: src/direct/DirectPhotoPage.vala:231
+#, 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"
+"%s."
+
+#: src/direct/DirectPhotoPage.vala:248
+#, fuzzy, c-format
+#| msgid ""
+#| "Unable to print photo:\n"
+#| "\n"
+#| "%s"
+msgid "Unable open photo %s. Sorry."
+msgstr ""
+"Chan urrainn dhuinn an dealbh a chlò-bhualadh\n"
+"%s"
+
+#: src/direct/DirectPhotoPage.vala:432
+msgid "_Save a Copy"
+msgstr "_Sàbhail lethbhreac dheth"
+
+#: src/direct/DirectPhotoPage.vala:435
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "A bheil thu airson na dh'atharraich thu air %s a chall?"
+
+#: src/direct/DirectPhotoPage.vala:436
+msgid "Close _without Saving"
+msgstr "Dùin _gun a shàbhaladh"
+
+#: src/direct/DirectPhotoPage.vala:469
+#, c-format
+msgid "Error while saving to %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
+msgid "Save As"
+msgstr "Sàbhail mar"
+
 #. verify this is a directory
-#: ../src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:889
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Chan urrainn dhuinn sùil a chumail air %s: Chan e pasgan a tha ann(%s)"
 
+#: src/editing_tools/EditingTools.vala:665
+msgid "Return to current photo dimensions"
+msgstr "Till do mheudachd an deilbh làithrich"
+
+#: src/editing_tools/EditingTools.vala:668
+msgid "Set the crop for this photo"
+msgstr "Suidhich bearradh an deilbh seo"
+
+#: src/editing_tools/EditingTools.vala:680
+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
+msgid "Unconstrained"
+msgstr "Gun chuingeachadh"
+
+#: src/editing_tools/EditingTools.vala:754
+msgid "Square"
+msgstr "Ceàrnagach"
+
+#: src/editing_tools/EditingTools.vala:755
+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
+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"
+
+#: 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:779
+msgid "A3 (297 x 420 mm)"
+msgstr "A3 (297 x 420 mm)"
+
+#: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395
+msgid "Size:"
+msgstr "Meud:"
+
+#: src/editing_tools/EditingTools.vala:1887
+msgid "Close the red-eye tool"
+msgstr "Dùin inneal nan sùilean dearga"
+
+#: src/editing_tools/EditingTools.vala:1890
+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/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
+msgid "Exposure:"
+msgstr "Deisearas:"
+
+#: src/editing_tools/EditingTools.vala:2248
+msgid "Saturation:"
+msgstr "Sàthachd:"
+
+#: src/editing_tools/EditingTools.vala:2256
+msgid "Tint:"
+msgstr "Tuar:"
+
+#: src/editing_tools/EditingTools.vala:2265
+msgid "Temperature:"
+msgstr "Teothachd:"
+
+#: src/editing_tools/EditingTools.vala:2273
+msgid "Shadows:"
+msgstr "Sgàilean:"
+
+#: src/editing_tools/EditingTools.vala:2281
+msgid "Highlights:"
+msgstr "Soillseachadh:"
+
+#: src/editing_tools/EditingTools.vala:2335
+msgid "Reset Colors"
+msgstr "Ath-shuidhich na dathan"
+
+#: src/editing_tools/EditingTools.vala:2335
+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
+msgid "Temperature"
+msgstr "Teothachd"
+
+#: src/editing_tools/EditingTools.vala:2700
+msgid "Tint"
+msgstr "Tuar"
+
+#: src/editing_tools/EditingTools.vala:2713
+msgid "Saturation"
+msgstr "Sàthachd"
+
+#: src/editing_tools/EditingTools.vala:2726
+msgid "Exposure"
+msgstr "Deisearas"
+
+#: src/editing_tools/EditingTools.vala:2739
+msgid "Shadows"
+msgstr "Sgàilean"
+
+#: src/editing_tools/EditingTools.vala:2752
+msgid "Highlights"
+msgstr "Soillseachadh"
+
+#: src/editing_tools/EditingTools.vala:2762
+msgid "Contrast Expansion"
+msgstr "Leudachadh an iomsgaraidh"
+
+#: src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Ceàrn:"
+
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+msgid "_Straighten"
+msgstr "_Dèan dìreach"
+
+#: src/events/Branch.vala:25
+msgid "Events"
+msgstr "Tachartasan"
+
+#: src/events/EventDirectoryItem.vala:83
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] "%d dealbh/video"
+msgstr[1] "%d dhealbh/video"
+msgstr[2] "%d dealbhan/videothan"
+msgstr[3] "%d dealbh/video"
+
+#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:355
+#, c-format
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] "%d video"
+msgstr[1] "%d video"
+msgstr[2] "%d videothan"
+msgstr[3] "%d video"
+
+#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:353
+#, c-format
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d dealbh"
+msgstr[1] "%d dhealbh"
+msgstr[2] "%d dealbhan"
+msgstr[3] "%d dealbh"
+
+#: src/events/EventPage.vala:129
+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
+msgid "No events"
+msgstr "Chan eil tachartas sam bith ann"
+
+#: src/events/EventsDirectoryPage.vala:159
+msgid "No events found"
+msgstr "Cha deach tachartas sam bith a lorg"
+
+#: src/events/EventsDirectoryPage.vala:230
+#, fuzzy
+#| msgid "Events"
+msgid "All Events"
+msgstr "Tachartasan"
+
+#: src/events/EventsDirectoryPage.vala:244
+msgid "Undated"
+msgstr "Gun cheann-là"
+
+#: src/events/EventsDirectoryPage.vala:245
+msgid "%Y"
+msgstr "%Y"
+
+#: src/events/EventsDirectoryPage.vala:246
+msgid "%B"
+msgstr "%B"
+
 #. if no name, pretty up the start time
-#: ../src/Event.vala:751
+#: src/Event.vala:753
 #, c-format
 msgid "Event %s"
 msgstr "Tachartas %s"
 
-#: ../src/Exporter.vala:232
+#: 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"
 
-#: ../src/Exporter.vala:299
+#: src/Exporter.vala:299
 msgid "Exporting"
 msgstr "Ag às-phortadh"
 
-#: ../src/Exporter.vala:317
+#: src/Exporter.vala:317
 #, c-format
 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 "
 "àite?"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Skip"
 msgstr "Gearr leum thairi_s air"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Replace"
 msgstr "_Cuir 'na àite"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Replace _All"
 msgstr "Cuir an àite n_a h-uile"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Export"
 msgstr "Às-phortaich"
 
-#: ../src/MediaMonitor.vala:400
+#: src/folders/Branch.vala:141
+msgid "Folders"
+msgstr "Pasganan"
+
+#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191
+msgid "Library"
+msgstr "Leabhar-lann"
+
+#: src/library/Branch.vala:97 src/SearchFilter.vala:608
+#: src/SearchFilter.vala:609
+msgid "Photos"
+msgstr "Dealbhan"
+
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
+#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
+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"
+
+#: src/library/ImportQueuePage.vala:68
+msgid "Stop importing photos"
+msgstr "Thoir stad air ion-phortadh na dealbhan"
+
+#: src/library/ImportQueuePage.vala:124
+msgid "Preparing to import..."
+msgstr "Ag ullachadh an ion-phortadh..."
+
+#: src/library/ImportQueuePage.vala:151
+#, c-format
+msgid "Imported %s"
+msgstr "Chaidh %s ion-phortadh"
+
+#: src/library/LastImportPage.vala:8
+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
+msgid "Import From Folder"
+msgstr "Ion-phortaich o phasgan"
+
+#: src/library/LibraryWindow.vala:726
+msgid "Empty Trash"
+msgstr "Falamhaich an sgudal"
+
+#: src/library/LibraryWindow.vala:726
+msgid "Emptying Trash..."
+msgstr "A' falamhadh an sgudail..."
+
+#: src/library/LibraryWindow.vala:901
+#, c-format
+msgid ""
+"Shotwell is configured to import photos to your home directory.\n"
+"We recommend changing this in <span weight=\"bold\">Edit %s Preferences</"
+"span>.\n"
+"Do you want to continue importing photos?"
+msgstr ""
+"Chaidh Shotwell a rèiteachadh ach an dèan a ion-phortadh nan dealbhan dhan "
+"phasgan dhachaigh agad.\n"
+"Mholamaid gun atharraich thu seo ann an <span weight=\"bold\">Deasaich "
+"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
+msgid "Library Location"
+msgstr "Ionad na leabhar-lainn"
+
+#. TODO: Specify which directory/file.
+#: src/library/LibraryWindow.vala:917
+msgid "Photos cannot be imported from this directory."
+msgstr "Cha ghabh dealbhan ion-phortadh on phasgan seo."
+
+#: src/library/LibraryWindow.vala:1203
+#, c-format
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
+
+#: src/library/LibraryWindow.vala:1247 src/library/LibraryWindow.vala:1258
+msgid "Updating library..."
+msgstr "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:1269
+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/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/TrashPage.vala:8
+msgid "Trash"
+msgstr "An sgudal"
+
+#: src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "Tha an sgudal falamh"
+
+#: src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "Sguab às"
+
+#: src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+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."
+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). "
+"Seo tionndadh %s (sgeama %d). Nach cleachd thu an tionndadh às ùire 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 ""
+"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 "
+"photos."
+msgstr ""
+"Chan eil leabhar-lann nan dealbh agad co-chòrdail leis an tionndadh seo de "
+"Shotwell. Tha coltas gun deach a chruthachadh le Shotwell %s (sgeama %d). "
+"Seo tionndadh %s (sgeama %d). Glan an leabhar-lann agad - sguab às %s agus "
+"ion-phortaich na dealbhan agad às ùr an uairsin."
+
+#: src/main.vala:71
+#, c-format
+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 "
+"Shotwell a dhearbhadh: %s"
+
+#: src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "A' luchdadh Shotwell"
+
+#: src/main.vala:294
+msgid "Path to Shotwell's private data"
+msgstr "An t-slighe dhan dàta phrìobhaideach aig Shotwell"
+
+#: src/main.vala:294
+msgid "DIRECTORY"
+msgstr "PASGAN"
+
+#: src/main.vala:298
+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"
+msgstr "Na seall an t-adhartas tòiseachaidh nuair a thòisicheas e"
+
+#: src/main.vala:306
+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
+msgid "[FILE]"
+msgstr "[FAIDHLE]"
+
+#: src/main.vala:342
+#, 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 "
+"fhaicinn a tha ri làimh.\n"
+
+#: src/MediaMonitor.vala:400
 #, c-format
 msgid "Unable to process monitoring updates: %s"
 msgstr "Chan urrainn dhuinn na h-ùrachaidhean marasglaidh a làimhseachadh: %s"
 
-#: ../src/MediaPage.vala:143
+#: src/MediaPage.vala:158
 msgid "Adjust the size of the thumbnails"
 msgstr "Cuir air gleus meud nan dealbhagan"
 
-#: ../src/MediaPage.vala:325 ../src/PhotoPage.vala:2590
-#: ../src/direct/DirectPhotoPage.vala:174
-msgid "Zoom _In"
-msgstr "Sù_m a-steach"
-
-#: ../src/MediaPage.vala:326
+#: src/MediaPage.vala:341
 msgid "Increase the magnification of the thumbnails"
 msgstr "Cuir an àirde meudachadh nan dealbhagan"
 
-#: ../src/MediaPage.vala:331 ../src/PhotoPage.vala:2596
-#: ../src/direct/DirectPhotoPage.vala:180
-msgid "Zoom _Out"
-msgstr "Sùm _a-mach"
-
-#: ../src/MediaPage.vala:332
+#: src/MediaPage.vala:347
 msgid "Decrease the magnification of the thumbnails"
 msgstr "Lùghdaich meudachadh nan dealbhagan"
 
-#: ../src/MediaPage.vala:399
+#: src/MediaPage.vala:414
 msgid "Sort _Photos"
 msgstr "Seòrsaich na _dealbhan"
 
-#: ../src/MediaPage.vala:408
+#: src/MediaPage.vala:423
 msgid "_Play Video"
 msgstr "_Cluich a' video"
 
-#: ../src/MediaPage.vala:409
+#: 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:413 ../src/PhotoPage.vala:2639
+#: src/MediaPage.vala:428 src/PhotoPage.vala:2641
 msgid "_Developer"
 msgstr "_Leasaichear"
 
-#: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
-#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:300
-msgid "Camera"
-msgstr "Camara"
-
-#: ../src/MediaPage.vala:436 ../src/camera/ImportPage.vala:872
-msgid "_Titles"
-msgstr "_Tiotalan"
-
-#: ../src/MediaPage.vala:437 ../src/camera/ImportPage.vala:873
-msgid "Display the title of each photo"
-msgstr "Seall an tiotal aig gach dealbh"
-
-#: ../src/MediaPage.vala:442 ../src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "_Beachdan"
-
-#: ../src/MediaPage.vala:443
+#: src/MediaPage.vala:458
 msgid "Display the comment of each photo"
 msgstr "Seall na beachdan aig gach dealbh"
 
-#: ../src/MediaPage.vala:454 ../src/library/LibraryWindow.vala:376
-msgid "Ta_gs"
-msgstr "Ta_gaichean"
-
-#: ../src/MediaPage.vala:455
+#: src/MediaPage.vala:470
 msgid "Display each photo's tags"
 msgstr "Seall na tagaichean aig gach dealbh"
 
-#: ../src/MediaPage.vala:471
+#: src/MediaPage.vala:486
 msgid "By _Title"
 msgstr "A-rèir _tiotail"
 
-#: ../src/MediaPage.vala:472
+#: src/MediaPage.vala:487
 msgid "Sort photos by title"
 msgstr "Seòrsaich na dealbhan a-rèir tiotail"
 
-#: ../src/MediaPage.vala:477
+#: src/MediaPage.vala:492
 msgid "By Exposure _Date"
 msgstr "A-rèir _ceann-là an deisearais"
 
-#: ../src/MediaPage.vala:478
+#: 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:483
+#: src/MediaPage.vala:498
 msgid "By _Rating"
 msgstr "A-rèir _rangachaidh"
 
-#: ../src/MediaPage.vala:484
+#: src/MediaPage.vala:499
 msgid "Sort photos by rating"
 msgstr "Seòrsaich na dealbhan a-rèir rangachaidh"
 
-#: ../src/MediaPage.vala:494 ../src/library/LibraryWindow.vala:422
-msgid "_Ascending"
-msgstr "A' _dìreadh"
-
-#: ../src/MediaPage.vala:495 ../src/library/LibraryWindow.vala:423
-msgid "Sort photos in an ascending order"
-msgstr "Seòrsaich na dealbhan a' dìreadh"
-
-#: ../src/MediaPage.vala:500 ../src/library/LibraryWindow.vala:429
-msgid "D_escending"
-msgstr "A' teàrna_dh"
+#: src/MediaPage.vala:504
+#, fuzzy
+#| msgid "File name"
+msgid "By _Filename"
+msgstr "Ainm an fhaidhle"
 
-#: ../src/MediaPage.vala:501 ../src/library/LibraryWindow.vala:430
-msgid "Sort photos in a descending order"
-msgstr "Seòrsaich na dealbhan a' teàrnadh"
+#: 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:702
+#: src/MediaPage.vala:723
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2836,204 +5056,127 @@ msgstr ""
 "Cha b' urrainn dha Shotwell a' video a thagh thu a chluich:\n"
 "%s"
 
-#: ../src/Page.vala:1268
+#: src/Page.vala:1266
 msgid "No photos/videos"
 msgstr "Chan eil dealbhan/videothan ann"
 
-#: ../src/Page.vala:1272
-msgid "No photos/videos found"
-msgstr "Cha deach dealbhan/videothan a lorg"
+#: src/Page.vala:1270
+msgid "No photos/videos found which match the current filter"
+msgstr ""
 
-#: ../src/Page.vala:2573
+#: src/Page.vala:2576
 msgid "Photos cannot be exported to this directory."
 msgstr "Cha ghabh dealbhan às-phortadh dhan phasgan seo."
 
-#: ../src/Photo.vala:3656
-msgid "modified"
-msgstr "air atharrachadh"
-
 #. previous button
-#: ../src/PhotoPage.vala:532
+#: src/PhotoPage.vala:533
 msgid "Previous photo"
 msgstr "An dealbh roimhe"
 
 #. next button
-#: ../src/PhotoPage.vala:537
+#: src/PhotoPage.vala:539
 msgid "Next photo"
 msgstr "An ath-dhealbh"
 
-#: ../src/PhotoPage.vala:1844
+#: src/PhotoPage.vala:1845
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Tha faidhle bun-tùs an deilbh a dhìth: %s"
 
-#: ../src/PhotoPage.vala:2411 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:360
-msgid "_View"
-msgstr "_Sealladh"
-
-#: ../src/PhotoPage.vala:2415 ../src/direct/DirectPhotoPage.vala:81
-msgid "T_ools"
-msgstr "I_nnealan"
-
-#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:86
-msgid "_Previous Photo"
-msgstr "An dealbh _roimhe"
-
-#: ../src/PhotoPage.vala:2421 ../src/direct/DirectPhotoPage.vala:87
-msgid "Previous Photo"
-msgstr "An dealbh roimhe"
-
-#: ../src/PhotoPage.vala:2426 ../src/direct/DirectPhotoPage.vala:92
-msgid "_Next Photo"
-msgstr "_An ath-dhealbh"
+#: src/PhotoPage.vala:3230
+#, c-format
+msgid "Unable to export %s: %s"
+msgstr "Cha ghabh %s às-phortadh: %s"
 
-#: ../src/PhotoPage.vala:2427 ../src/direct/DirectPhotoPage.vala:93
-msgid "Next Photo"
-msgstr "An ath-dhealbh"
+#: src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
 
-#: ../src/PhotoPage.vala:2591 ../src/direct/DirectPhotoPage.vala:175
-msgid "Increase the magnification of the photo"
-msgstr "Iomadaich meudachadh an deilbh"
+#: src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
 
-#: ../src/PhotoPage.vala:2597 ../src/direct/DirectPhotoPage.vala:181
-msgid "Decrease the magnification of the photo"
-msgstr "Lùghdaich meudachadh an deilbh"
+#: src/photos/JfifSupport.vala:185
+#, c-format
+msgid "Low (%d%%)"
+msgstr "Ìseal (%d%%)"
 
-#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:186
-msgid "Fit to _Page"
-msgstr "Co-fhreagair ris an _duilleag"
+#: src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Meadhanach (%d%%)"
 
-#: ../src/PhotoPage.vala:2603 ../src/direct/DirectPhotoPage.vala:187
-msgid "Zoom the photo to fit on the screen"
-msgstr "Sùm an dealbh ach am freagair e ris an sgrìn"
+#: src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Àrd (%d%%)"
 
-#: ../src/PhotoPage.vala:2609 ../src/direct/DirectPhotoPage.vala:193
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "_100% de shùm"
+#: src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "As motha (%d%%)"
 
-#: ../src/PhotoPage.vala:2611 ../src/direct/DirectPhotoPage.vala:195
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Cuir sùm an deilbh gu 100%"
+#: src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: ../src/PhotoPage.vala:2617 ../src/direct/DirectPhotoPage.vala:201
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "_200% de shùm"
+#: src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: ../src/PhotoPage.vala:2619 ../src/direct/DirectPhotoPage.vala:203
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Sùm an dealbh/foto a mheudachadh 200%"
+#: src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: ../src/PhotoPage.vala:3227
-#, c-format
-msgid "Unable to export %s: %s"
-msgstr "Cha ghabh %s às-phortadh: %s"
+#: src/Photo.vala:3753
+msgid "modified"
+msgstr "air atharrachadh"
 
-#: ../src/Printing.vala:255
+#: src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "Lìon an duilleag gu lèir"
 
-#: ../src/Printing.vala:256
+#: src/Printing.vala:256
 msgid "2 images per page"
 msgstr "2 ìomhaigh air gach duilleag"
 
-#: ../src/Printing.vala:257
+#: src/Printing.vala:257
 msgid "4 images per page"
 msgstr "4 ìomhaighean air gach duilleag"
 
-#: ../src/Printing.vala:258
+#: src/Printing.vala:258
 msgid "6 images per page"
 msgstr "6 ìomhaighean air gach duilleag"
 
-#: ../src/Printing.vala:259
+#: src/Printing.vala:259
 msgid "8 images per page"
 msgstr "8 ìomhaighean air gach duilleag"
 
-#: ../src/Printing.vala:260
+#: src/Printing.vala:260
 msgid "16 images per page"
 msgstr "16 ìomhaighean air gach duilleag"
 
-#: ../src/Printing.vala:261
+#: src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 ìomhaigh air gach duilleag"
 
-#: ../src/Printing.vala:348
+#: src/Printing.vala:348
 msgid "in."
 msgstr "òir."
 
-#: ../src/Printing.vala:349
+#: 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 "Meud sporain (2 x 3 òirlich)"
-
-#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
-msgid "Notecard (3 x 5 in.)"
-msgstr "Cairt-nòta (3 x 5 òirlich)"
-
-#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
-msgid "4 x 6 in."
-msgstr "4 x 6 òirlich"
-
-#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
-msgid "5 x 7 in."
-msgstr "5 x 7 òirlich"
-
-#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
-msgid "8 x 10 in."
-msgstr "8 x 10 òirlich"
-
-#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
-msgid "11 x 14 in."
-msgstr "11 x 14 òirlich"
-
-#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
-msgid "16 x 20 in."
-msgstr "16 x 20 òirlich"
-
-#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Meud sporain (meatrach, 9 x 13 cm)"
-
-#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
-msgid "Postcard (10 x 15 cm)"
-msgstr "Cairt-phuist (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:876
 msgid "Image Settings"
 msgstr "Roghainnean an deilbh"
 
-#: ../src/Printing.vala:888
+#: src/Printing.vala:889
 msgid "Printing..."
 msgstr "'Ga chlò-bhualadh..."
 
-#: ../src/Printing.vala:908 ../src/Printing.vala:1111
+#: src/Printing.vala:909 src/Printing.vala:1112
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -3043,23 +5186,19 @@ msgstr ""
 "Chan urrainn dhuinn an dealbh a chlò-bhualadh\n"
 "%s"
 
-#: ../src/Properties.vala:84
+#: src/Properties.vala:84
 msgid "Today"
 msgstr "An-diugh"
 
-#: ../src/Properties.vala:86
+#: src/Properties.vala:86
 msgid "Yesterday"
 msgstr "An-dè"
 
-#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
-
-#: ../src/Properties.vala:343
+#: src/Properties.vala:343
 msgid "Items:"
 msgstr "Nithean"
 
-#: ../src/Properties.vala:346
+#: src/Properties.vala:346
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
@@ -3068,801 +5207,987 @@ msgstr[1] "%d thachartas"
 msgstr[2] "%d tachartasan"
 msgstr[3] "%d tachartas"
 
-#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
-#, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d dealbh"
-msgstr[1] "%d dhealbh"
-msgstr[2] "%d dealbhan"
-msgstr[3] "%d dealbh"
-
-#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
-#, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d video"
-msgstr[1] "%d video"
-msgstr[2] "%d videothan"
-msgstr[3] "%d video"
-
 #. display only one date if start and end are the same
-#: ../src/Properties.vala:377
+#: src/Properties.vala:377
 msgid "Date:"
 msgstr "Ceann-là:"
 
 #. display only one time if start and end are the same
-#: ../src/Properties.vala:381
+#: src/Properties.vala:381
 msgid "Time:"
 msgstr "Àm:"
 
 #. display time range
 #. display date range
-#: ../src/Properties.vala:384 ../src/Properties.vala:389
+#: src/Properties.vala:384 src/Properties.vala:389
 msgid "From:"
 msgstr "O:"
 
-#: ../src/Properties.vala:385 ../src/Properties.vala:390
+#: src/Properties.vala:385 src/Properties.vala:390
 msgid "To:"
 msgstr "Gu:"
 
-#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1890
-msgid "Size:"
-msgstr "Meud:"
-
-#: ../src/Properties.vala:404
+#: src/Properties.vala:404
 msgid "Duration:"
 msgstr "Faid:"
 
-#: ../src/Properties.vala:404
+#: src/Properties.vala:404
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f diogan"
 
-#: ../src/Properties.vala:408
+#: src/Properties.vala:408
 msgid "Developer:"
 msgstr "Leasaichear:"
 
-#. 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:2258
-msgid "Exposure:"
-msgstr "Deisearas:"
-
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:585
+#: src/Properties.vala:583
 msgid "Location:"
 msgstr "Ionad:"
 
-#: ../src/Properties.vala:588
+#: src/Properties.vala:586
 msgid "File size:"
 msgstr "Meud an fhaidhle:"
 
-#: ../src/Properties.vala:592
+#: src/Properties.vala:590
 msgid "Current Development:"
 msgstr "Obair-leasachaidh làithreach:"
 
-#: ../src/Properties.vala:594
+#: src/Properties.vala:592
 msgid "Original dimensions:"
 msgstr "Am meud tùsail:"
 
-#: ../src/Properties.vala:597
+#: src/Properties.vala:595
 msgid "Camera make:"
 msgstr "Brannd a' chamara:"
 
-#: ../src/Properties.vala:600
+#: src/Properties.vala:598
 msgid "Camera model:"
 msgstr "Modail a' chamara:"
 
-#: ../src/Properties.vala:603
+#: src/Properties.vala:601
 msgid "Flash:"
 msgstr "Solas-boillsgidh:"
 
-#: ../src/Properties.vala:605
+#: src/Properties.vala:603
 msgid "Focal length:"
 msgstr "Faid an fhòcais:"
 
-#: ../src/Properties.vala:608
+#: src/Properties.vala:606
 msgid "Exposure date:"
 msgstr "Ceann-là deisearais:"
 
-#: ../src/Properties.vala:611
+#: src/Properties.vala:609
 msgid "Exposure time:"
 msgstr "Faid an deisearais"
 
-#: ../src/Properties.vala:614
+#: src/Properties.vala:612
 msgid "Exposure bias:"
 msgstr "Bias an deisearais:"
 
-#: ../src/Properties.vala:616
+#: src/Properties.vala:614
 msgid "GPS latitude:"
 msgstr "Domhan-leud GPS:"
 
-#: ../src/Properties.vala:619
+#: src/Properties.vala:617
 msgid "GPS longitude:"
 msgstr "Domhan-fhad GPS:"
 
-#: ../src/Properties.vala:622
+#: src/Properties.vala:620
 msgid "Artist:"
 msgstr "Neach-ealain:"
 
-#: ../src/Properties.vala:624
+#: src/Properties.vala:622
 msgid "Copyright:"
 msgstr "Còir-lethbhreac:"
 
-#: ../src/Properties.vala:626
+#: src/Properties.vala:624
 msgid "Software:"
 msgstr "Bathar-bog:"
 
-#: ../src/Properties.vala:639
+#: src/Properties.vala:641
 msgid "Extended Information"
 msgstr "Fiosrachadh leudaichte"
 
-#: ../src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Manaidsear dealbh/foto"
+#: src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "Ag ullachadh airson luchdadh suas"
 
-#: ../src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Sealladair dealbh/foto"
+#: src/publishing/PublishingPluginHost.vala:12
+#, c-format
+msgid "Uploading %d of %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:"
+msgstr ""
+"Chan urrainn leantainn air adhart leis an fhoillseachadh air %s oir thachair "
+"mearachd:"
+
+#: 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 "
+"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
+msgid "The selected video was successfully published."
+msgstr "Chaidh a' video a thagh thu fhoillseachadh."
+
+#: src/publishing/PublishingUI.vala:114
+msgid "The selected photo was successfully published."
+msgstr "Chaidh an dealbh a thagh thu fhoillseachadh."
+
+#: src/publishing/PublishingUI.vala:122
+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:188
+msgid "Publish Photos"
+msgstr "Foillsich na dealbhan"
+
+#: src/publishing/PublishingUI.vala:189
+msgid "Publish photos _to:"
+msgstr "Foillsich na d_ealbhan air:"
+
+#: src/publishing/PublishingUI.vala:191
+msgid "Publish Videos"
+msgstr "Foillsich na videothan"
+
+#: src/publishing/PublishingUI.vala:192
+msgid "Publish videos _to"
+msgstr "Foillsich na videothan _air"
+
+#: src/publishing/PublishingUI.vala:194
+msgid "Publish Photos and Videos"
+msgstr "Foillsich na dealbhan agus videothan"
+
+#: src/publishing/PublishingUI.vala:195
+msgid "Publish photos and videos _to"
+msgstr "Foillsich na dealbhan agus _videothan air"
 
-#: ../src/Resources.vala:142
+#. There are no enabled publishing services that accept this media type,
+#. warn the user.
+#: src/publishing/PublishingUI.vala:397
+msgid "Unable to publish"
+msgstr "Chan urrainn dhuinn foillseachadh"
+
+#: src/publishing/PublishingUI.vala:398
+#, c-format
+msgid ""
+"Shotwell cannot publish the selected items because you do not have a "
+"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
+"Preferences</b> and enable one or more of the publishing plugins on the "
+"<b>Plugins</b> tab."
+msgstr ""
+"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"
 
-#: ../src/Resources.vala:143 ../src/Resources.vala:148
+#: src/Resources.vala:140 src/Resources.vala:145
 msgid "Rotate"
 msgstr "Cuairtich"
 
-#: ../src/Resources.vala:144
+#: src/Resources.vala:141
 msgid "Rotate Right"
 msgstr "Cuairtich gu deiseil"
 
-#: ../src/Resources.vala:145
+#: src/Resources.vala:142
 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:147
+#: src/Resources.vala:144
 msgid "Rotate _Left"
 msgstr "Cuairtich gu _tuathail"
 
-#: ../src/Resources.vala:149
+#: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "Cuairtich gu tuathail"
 
-#: ../src/Resources.vala:150
+#: src/Resources.vala:147
 msgid "Rotate the photos left"
 msgstr "Cuairtich na dealbhan gu tuathail"
 
-#: ../src/Resources.vala:152
+#: src/Resources.vala:149
 msgid "Flip Hori_zontally"
 msgstr "Thoir flip air a' chòmh_nard"
 
-#: ../src/Resources.vala:153
+#: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "Thoir flip air a' chòmhnard"
 
-#: ../src/Resources.vala:155
+#: src/Resources.vala:152
 msgid "Flip Verti_cally"
 msgstr "Thoir flip gu _h-inghearach"
 
-#: ../src/Resources.vala:156
+#: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "Thoir flip gu h-inghearach"
 
-#: ../src/Resources.vala:158
+#: src/Resources.vala:155
+msgid "_About"
+msgstr "_Mu dhèidhinn"
+
+#: src/Resources.vala:156
+msgid "_Apply"
+msgstr ""
+
+#: src/Resources.vala:160
+#, fuzzy
+#| msgid "_Format:"
+msgid "_Forward"
+msgstr "_Fòrmat:"
+
+#: src/Resources.vala:161
+msgid "Fulls_creen"
+msgstr "_Làn-sgrìn"
+
+#: src/Resources.vala:163
+msgid "Leave _Fullscreen"
+msgstr "_Fàg an làn-sgrìn"
+
+#: src/Resources.vala:164 src/Resources.vala:363
+msgid "_New"
+msgstr "Ù_r"
+
+#: src/Resources.vala:165
+#, fuzzy
+#| msgid "Next"
+msgid "_Next"
+msgstr "Air 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
+msgid "_Preferences"
+msgstr "_Roghainnean"
+
+#: src/Resources.vala:169
+#, fuzzy
+#| msgid "_Previous Photo"
+msgid "_Previous"
+msgstr "An dealbh _roimhe"
+
+#: src/Resources.vala:170
+#, fuzzy
+#| msgid "_Print..."
+msgid "_Print"
+msgstr "Clò-_bhuail..."
+
+#: src/Resources.vala:171
+msgid "_Quit"
+msgstr "_Fàg an-seo"
+
+#: src/Resources.vala:172
+msgid "_Refresh"
+msgstr ""
+
+#: src/Resources.vala:174
+#, fuzzy
+#| msgid "Reverting"
+msgid "_Revert"
+msgstr "'Ga thilleadh"
+
+#: src/Resources.vala:176
+#, fuzzy
+#| msgid "Save As"
+msgid "Save _As"
+msgstr "Sàbhail mar"
+
+#: src/Resources.vala:177
+#, fuzzy
+#| msgid "_Ascending"
+msgid "Sort _Ascending"
+msgstr "A' _dìreadh"
+
+#: src/Resources.vala:178
+#, fuzzy
+#| msgid "D_escending"
+msgid "Sort _Descending"
+msgstr "A' teàrna_dh"
+
+#: src/Resources.vala:179
+msgid "_Stop"
+msgstr ""
+
+#: src/Resources.vala:180
+#, fuzzy
+#| msgid "_Delete"
+msgid "_Undelete"
+msgstr "_Sguab às"
+
+#: src/Resources.vala:181
+#, fuzzy
+#| msgid "Original Size"
+msgid "_Normal Size"
+msgstr "Am meud tùsail"
+
+#: src/Resources.vala:182
+msgid "Best _Fit"
+msgstr ""
+
+#: src/Resources.vala:186
 msgid "_Enhance"
 msgstr "_Leasaich"
 
-#: ../src/Resources.vala:159
+#: src/Resources.vala:187
 msgid "Enhance"
 msgstr "Leasaich"
 
-#: ../src/Resources.vala:160
+#: src/Resources.vala:188
 msgid "Automatically improve the photo's appearance"
 msgstr "Leasaich dreach an deilbh gu fèin-obrachail"
 
-#: ../src/Resources.vala:162
+#: src/Resources.vala:190
 msgid "_Copy Color Adjustments"
 msgstr "Dèan lethbhrea_c de dh'atharraichean nan dathan"
 
-#: ../src/Resources.vala:163
+#: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "Dèan lethbhreac de dh'atharraichean nan dathan"
 
-#: ../src/Resources.vala:164
+#: src/Resources.vala:192
 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"
 
-#: ../src/Resources.vala:166
+#: src/Resources.vala:194
 msgid "_Paste Color Adjustments"
 msgstr "Cuir ann atharraichean nan _dathan"
 
-#: ../src/Resources.vala:167
+#: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "Cuir ann atharraichean nan dathan"
 
-#: ../src/Resources.vala:168
+#: src/Resources.vala:196
 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:170
+#: src/Resources.vala:198
 msgid "_Crop"
 msgstr "_Bearr"
 
-#: ../src/Resources.vala:171
+#: src/Resources.vala:199
 msgid "Crop"
 msgstr "Bearr"
 
-#: ../src/Resources.vala:172
+#: src/Resources.vala:200
 msgid "Crop the photo's size"
 msgstr "Bearr meud an deilbh"
 
-#: ../src/Resources.vala:174 ../src/editing_tools/StraightenTool.vala:100
-msgid "_Straighten"
-msgstr "_Dèan dìreach"
-
-#: ../src/Resources.vala:175
+#: src/Resources.vala:203
 msgid "Straighten"
 msgstr "Dèan dìreach"
 
-#: ../src/Resources.vala:176
+#: src/Resources.vala:204
 msgid "Straighten the photo"
 msgstr "Dèan dìreach an dealbh"
 
-#: ../src/Resources.vala:178
+#: src/Resources.vala:206
 msgid "_Red-eye"
 msgstr "_Sùil dhearg"
 
-#: ../src/Resources.vala:179
+#: src/Resources.vala:207
 msgid "Red-eye"
 msgstr "Sùil dhearg"
 
-#: ../src/Resources.vala:180
+#: src/Resources.vala:208
 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:182
+#: src/Resources.vala:210
 msgid "_Adjust"
 msgstr "C_uir air gleus"
 
-#: ../src/Resources.vala:183
+#: src/Resources.vala:211
 msgid "Adjust"
 msgstr "Cuir air gleus"
 
-#: ../src/Resources.vala:184
+#: src/Resources.vala:212
 msgid "Adjust the photo's color and tone"
 msgstr "Cuir air gleus dath agus tòna an deilbh"
 
-#: ../src/Resources.vala:186
+#: src/Resources.vala:214
 msgid "Re_vert to Original"
 msgstr "Ti_ll an tionndadh tùsail"
 
-#: ../src/Resources.vala:187
+#: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr "Till an tionndadh tùsail"
 
-#: ../src/Resources.vala:189
+#: src/Resources.vala:217
 msgid "Revert External E_dits"
 msgstr "Neo-dhèan d_easachadh a-muigh sam bith"
 
-#: ../src/Resources.vala:190
+#: src/Resources.vala:218
 msgid "Revert to the master photo"
 msgstr "Till maighstir an deilbh"
 
-#: ../src/Resources.vala:192
+#: src/Resources.vala:220
 msgid "Set as _Desktop Background"
 msgstr "Suidhich mar chùlaibh an _deasga"
 
-#: ../src/Resources.vala:193
+#: src/Resources.vala:221
 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:194
+#: src/Resources.vala:222
 msgid "Set as _Desktop Slideshow..."
 msgstr "Suidhich mar thaisbeanadh-shleamhnagan an _deasga..."
 
-#: ../src/Resources.vala:196
+#: src/Resources.vala:224
 msgid "_Undo"
 msgstr "_Neo-dhèan"
 
-#: ../src/Resources.vala:197
+#: src/Resources.vala:225
 msgid "Undo"
 msgstr "Neo-dhèan"
 
-#: ../src/Resources.vala:199
+#: src/Resources.vala:227
 msgid "_Redo"
 msgstr "_Ath-dhèan"
 
-#: ../src/Resources.vala:200
+#: src/Resources.vala:228
 msgid "Redo"
 msgstr "Ath-dhèan"
 
-#: ../src/Resources.vala:202
+#: src/Resources.vala:230
 msgid "Re_name Event..."
 msgstr "Thoir ai_nm ùr air an tachartas..."
 
-#: ../src/Resources.vala:205
+#: src/Resources.vala:233
 msgid "Make _Key Photo for Event"
 msgstr "Cleachd _seo mar phrìomh-dhealbh an tachartais"
 
-#: ../src/Resources.vala:206
+#: src/Resources.vala:234
 msgid "Make Key Photo for Event"
 msgstr "Cleachd seo mar phrìomh-dhealbh an tachartais"
 
-#: ../src/Resources.vala:208
+#: src/Resources.vala:236
 msgid "_New Event"
 msgstr "Tachartas ù_r"
 
-#: ../src/Resources.vala:209
+#: src/Resources.vala:237
 msgid "New Event"
 msgstr "Tachartas ùr"
 
-#: ../src/Resources.vala:211
+#: src/Resources.vala:239
 msgid "Move Photos"
 msgstr "Gluais na dealbhan"
 
-#: ../src/Resources.vala:212
+#: src/Resources.vala:240
 msgid "Move photos to an event"
 msgstr "Gluais na dealbhan gu tachartas"
 
-#: ../src/Resources.vala:214
+#: src/Resources.vala:242
 msgid "_Merge Events"
 msgstr "_Co-aonaich na tachartasan"
 
-#: ../src/Resources.vala:215
+#: src/Resources.vala:243
 msgid "Merge"
 msgstr "Co-aonaich"
 
-#: ../src/Resources.vala:216
+#: src/Resources.vala:244
 msgid "Combine events into a single event"
 msgstr "Cuir còmhla na tachartasan san aon tachartas"
 
-#: ../src/Resources.vala:218
+#: src/Resources.vala:246
 msgid "_Set Rating"
 msgstr "_Suidhich rangachadh"
 
-#: ../src/Resources.vala:219
+#: src/Resources.vala:247
 msgid "Set Rating"
 msgstr "Suidhich rangachadh"
 
-#: ../src/Resources.vala:220
+#: src/Resources.vala:248
 msgid "Change the rating of your photo"
 msgstr "Atharraich rangachadh an deilbh agad"
 
-#: ../src/Resources.vala:222
+#: src/Resources.vala:250
 msgid "_Increase"
 msgstr "_Cuir am meud"
 
-#: ../src/Resources.vala:223
+#: src/Resources.vala:251
 msgid "Increase Rating"
 msgstr "Cuir am meud an rangachadh"
 
-#: ../src/Resources.vala:225
+#: src/Resources.vala:253
 msgid "_Decrease"
 msgstr "_Lùghdaich"
 
-#: ../src/Resources.vala:226
+#: src/Resources.vala:254
 msgid "Decrease Rating"
 msgstr "Lùghdaich an rangachadh"
 
-#: ../src/Resources.vala:228
+#: src/Resources.vala:256
 msgid "_Unrated"
 msgstr "_Gun rangachadh"
 
-#: ../src/Resources.vala:229
+#: src/Resources.vala:257
 msgid "Unrated"
 msgstr "Gun rangachadh"
 
-#: ../src/Resources.vala:230
+#: src/Resources.vala:258
 msgid "Rate Unrated"
 msgstr "Thoir air falbh rangachadh sam bith"
 
-#: ../src/Resources.vala:231
+#: src/Resources.vala:259
 msgid "Setting as unrated"
 msgstr "A' toirt air falbh rangachadh sam bith"
 
-#: ../src/Resources.vala:232
+#: src/Resources.vala:260
 msgid "Remove any ratings"
 msgstr "Thoir air falbh rangachadh sam bith"
 
-#: ../src/Resources.vala:234
+#: src/Resources.vala:262
 msgid "_Rejected"
 msgstr "Air a _dhiùltadh"
 
-#: ../src/Resources.vala:235
+#: src/Resources.vala:263
 msgid "Rejected"
 msgstr "Air a dhiùltadh"
 
-#: ../src/Resources.vala:236
+#: src/Resources.vala:264
 msgid "Rate Rejected"
 msgstr "Thoir rangachadh \"Air a dhiùltadh\" dha"
 
-#: ../src/Resources.vala:237
+#: src/Resources.vala:265
 msgid "Setting as rejected"
 msgstr "A' toirt rangachadh \"Air a dhiùltadh\" dha"
 
-#: ../src/Resources.vala:238
+#: src/Resources.vala:266
 msgid "Set rating to rejected"
 msgstr "Thoir rangachadh \"Air a dhiùltadh\" dha"
 
-#: ../src/Resources.vala:240
+#: src/Resources.vala:268
 msgid "Rejected _Only"
 msgstr "Na chaidh a dhiùltadh a-_mhàin"
 
-#: ../src/Resources.vala:241
+#: src/Resources.vala:269
 msgid "Rejected Only"
 msgstr "Na chaidh a dhiùltadh a-mhàin"
 
-#: ../src/Resources.vala:242
+#: src/Resources.vala:270
 msgid "Show only rejected photos"
 msgstr "Na seall ach dealbhan a chaidh a dhiùltadh"
 
-#: ../src/Resources.vala:244
+#: src/Resources.vala:272
 msgid "All + _Rejected"
 msgstr "Na h-uile ⁊ feadhainn air _dhiùltadh"
 
-#: ../src/Resources.vala:245 ../src/Resources.vala:246
+#: src/Resources.vala:273
+#, fuzzy
+#| 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"
 
-#: ../src/Resources.vala:248
+#: src/Resources.vala:275
 msgid "_All Photos"
 msgstr "_Na h-uile dealbh"
 
-#: ../src/Resources.vala:249 ../src/Resources.vala:250
+#. Button tooltip
+#: src/Resources.vala:277
 msgid "Show all photos"
 msgstr "Seall a h-uile dealbh"
 
-#: ../src/Resources.vala:252
+#: src/Resources.vala:279
 msgid "_Ratings"
 msgstr "_Rangachaidhean"
 
-#: ../src/Resources.vala:253
+#: src/Resources.vala:280
 msgid "Display each photo's rating"
 msgstr "Seall an rangachadh aig gach dealbh"
 
-#: ../src/Resources.vala:255
+#: src/Resources.vala:282
 msgid "_Filter Photos"
 msgstr "_Criathraich na dealbhan"
 
-#: ../src/Resources.vala:256
+#: src/Resources.vala:283
 msgid "Filter Photos"
 msgstr "Criathraich na dealbhan"
 
-#: ../src/Resources.vala:257
+#: src/Resources.vala:284
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Cuingich àireamh nan dealbhan a chithear le criathrag"
 
-#: ../src/Resources.vala:259
+#: src/Resources.vala:286
 msgid "_Duplicate"
 msgstr "_Dùblaich"
 
-#: ../src/Resources.vala:260
+#: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "Dùblaich"
 
-#: ../src/Resources.vala:261
+#: src/Resources.vala:288
 msgid "Make a duplicate of the photo"
 msgstr "Dùblaich an dealbh"
 
-#: ../src/Resources.vala:263
+#: src/Resources.vala:290
 msgid "_Export..."
 msgstr "Às-p_hortaich"
 
-#: ../src/Resources.vala:265
+#: src/Resources.vala:292
 msgid "_Print..."
 msgstr "Clò-_bhuail..."
 
-#: ../src/Resources.vala:267
+#: src/Resources.vala:294
 msgid "Pu_blish..."
 msgstr "_Foillsich..."
 
-#: ../src/Resources.vala:269
+#: src/Resources.vala:296
 msgid "Publish to various websites"
 msgstr "Foillsich air iomadh làrach-lìn"
 
-#: ../src/Resources.vala:271
+#: src/Resources.vala:298
 msgid "Edit _Title..."
 msgstr "Deasaich an _tiotal..."
 
-#: ../src/Resources.vala:274
+#. Button label
+#: src/Resources.vala:300
+#, fuzzy
+#| 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:275
+#. Button label
+#: src/Resources.vala:304
 msgid "Edit Comment"
 msgstr "Deasaich am beachd"
 
-#: ../src/Resources.vala:277
+#: src/Resources.vala:306
 msgid "Edit Event _Comment..."
 msgstr "Deasaich beachd an _tachartais..."
 
-#: ../src/Resources.vala:280
+#: src/Resources.vala:309
 msgid "_Adjust Date and Time..."
 msgstr "Cu_ir air gleus an ceann-là agus an t-àm..."
 
-#: ../src/Resources.vala:281
+#: src/Resources.vala:310
 msgid "Adjust Date and Time"
 msgstr "Cuir air gleus an ceann-là agus an t-àm"
 
-#: ../src/Resources.vala:283
+#: src/Resources.vala:312
 msgid "Add _Tags..."
 msgstr "Cuir _tagaichean ris..."
 
-#: ../src/Resources.vala:284
+#: src/Resources.vala:313
 msgid "_Add Tags..."
 msgstr "Cuir t_agaichean ris..."
 
-#: ../src/Resources.vala:285 ../src/Resources.vala:316
+#. Dialog title
+#: src/Resources.vala:315
+#, fuzzy
+#| msgid "Add Tags"
+msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Cuir tagaichean ris"
 
-#: ../src/Resources.vala:287
-msgid "_Preferences"
-msgstr "_Roghainnean"
-
-#: ../src/Resources.vala:289
+#: src/Resources.vala:319
 msgid "Open With E_xternal Editor"
 msgstr "Fosgail le deasaiche air an ta_obh a-muigh"
 
-#: ../src/Resources.vala:291
+#: src/Resources.vala:321
 msgid "Open With RA_W Editor"
 msgstr "Fosgail le deasaiche RA_W"
 
-#: ../src/Resources.vala:293
+#: src/Resources.vala:323
 msgid "Send _To..."
 msgstr "C_uir gu..."
 
-#: ../src/Resources.vala:294
+#: src/Resources.vala:324
 msgid "Send T_o..."
 msgstr "Cui_r gu..."
 
-#: ../src/Resources.vala:296
+#: src/Resources.vala:326
 msgid "_Find..."
 msgstr "_Lorg..."
 
-#: ../src/Resources.vala:297
+#: src/Resources.vala:327
 msgid "Find"
 msgstr "Lorg"
 
-#: ../src/Resources.vala:298
+#: src/Resources.vala:328
 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 "
 "tagaichean aige."
 
-#: ../src/Resources.vala:300
+#: src/Resources.vala:330
 msgid "_Flag"
 msgstr "Cuir _bratach ris"
 
-#: ../src/Resources.vala:302
+#: src/Resources.vala:332
 msgid "Un_flag"
 msgstr "Thoir a' bhratach air _falbh"
 
-#: ../src/Resources.vala:305
+#: src/Resources.vala:335
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Chan urrainn dhuinn an deasaiche a chur gu dol: %s"
 
-#: ../src/Resources.vala:310
+#: src/Resources.vala:340
 #, c-format
 msgid "Add Tag \"%s\""
 msgstr "Cuir an taga \"%s\" ris"
 
-#: ../src/Resources.vala:312
+#. Used when adding two tags to photo(s)
+#: src/Resources.vala:343
 #, c-format
 msgid "Add Tags \"%s\" and \"%s\""
 msgstr "Cuir na tagaichean \"%s\" agus \"%s\" ris"
 
-#: ../src/Resources.vala:320
+#. Undo/Redo command name (in Edit menu)
+#: src/Resources.vala:348
+#, fuzzy
+#| msgid "Add Tags"
+msgctxt "UndoRedo menu entry"
+msgid "Add Tags"
+msgstr "Cuir tagaichean ris"
+
+#: src/Resources.vala:353
 #, c-format
 msgid "_Delete Tag \"%s\""
 msgstr "_Sguab às an taga \"%s\""
 
-#: ../src/Resources.vala:324
+#: src/Resources.vala:357
 #, c-format
 msgid "Delete Tag \"%s\""
 msgstr "Sguab às an taga \"%s\""
 
-#: ../src/Resources.vala:327
+#: src/Resources.vala:360
 msgid "Delete Tag"
 msgstr "Sguab às an taga"
 
-#: ../src/Resources.vala:330
-msgid "_New"
-msgstr "Ù_r"
-
-#: ../src/Resources.vala:333
+#: src/Resources.vala:366
 #, c-format
 msgid "Re_name Tag \"%s\"..."
 msgstr "Thoir ai_nm eile air an taga \"%s\"..."
 
-#: ../src/Resources.vala:337
+#: src/Resources.vala:370
 #, c-format
 msgid "Rename Tag \"%s\" to \"%s\""
 msgstr "Thoir \"%2s\" air \"%1s\""
 
-#: ../src/Resources.vala:340
+#: src/Resources.vala:373
 msgid "_Rename..."
 msgstr "_Thoir ainm ùr air..."
 
-#: ../src/Resources.vala:342
+#: src/Resources.vala:375
 msgid "Modif_y Tags..."
 msgstr "Athar_raich na tagaichean..."
 
-#: ../src/Resources.vala:343
+#: src/Resources.vala:376
 msgid "Modify Tags"
 msgstr "Atharraich na tagaichean"
 
-#: ../src/Resources.vala:346
+#: src/Resources.vala:379
 #, c-format
 msgid "Tag Photo as \"%s\""
 msgstr "Cuir an taga \"%s\" ris an dealbh"
 
-#: ../src/Resources.vala:346
+#: src/Resources.vala:379
 #, c-format
 msgid "Tag Photos as \"%s\""
 msgstr "Cuir an taga \"%s\" ris na dealbhan"
 
-#: ../src/Resources.vala:350
+#: 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:351
+#: 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:355
+#: src/Resources.vala:388
 #, c-format
 msgid "Remove Tag \"%s\" From _Photo"
 msgstr "Thoir air falbh an taga \"%s\" on _dealbh"
 
-#: ../src/Resources.vala:356
+#: src/Resources.vala:389
 #, c-format
 msgid "Remove Tag \"%s\" From _Photos"
 msgstr "Thoir air falbh an taga \"%s\" on na _dealbhan"
 
-#: ../src/Resources.vala:360
+#: src/Resources.vala:393
 #, c-format
 msgid "Remove Tag \"%s\" From Photo"
 msgstr "Thoir air falbh an taga \"%s\" on dealbh"
 
-#: ../src/Resources.vala:361
+#: src/Resources.vala:394
 #, c-format
 msgid "Remove Tag \"%s\" From Photos"
 msgstr "Thoir air falbh an taga \"%s\" on na dealbhan"
 
-#: ../src/Resources.vala:365
+#: src/Resources.vala:398
 #, c-format
 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 "
 "sin ann mu thràth."
 
-#: ../src/Resources.vala:369
+#: src/Resources.vala:402
 #, c-format
 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 "
 "leithid ann mar-thà."
 
-#: ../src/Resources.vala:372
+#. Saved search button
+#: src/Resources.vala:405 src/SearchFilter.vala:1210
 msgid "Saved Search"
 msgstr "Lorg a chaidh a shàbhaladh"
 
-#: ../src/Resources.vala:374
+#: src/Resources.vala:407
 msgid "Delete Search"
 msgstr "Sguab às an lorg"
 
-#: ../src/Resources.vala:377
+#: src/Resources.vala:410
 msgid "_Edit..."
 msgstr "D_easaich..."
 
-#: ../src/Resources.vala:378
+#: src/Resources.vala:411
 msgid "Re_name..."
 msgstr "Thoir ain_m ùr air..."
 
-#: ../src/Resources.vala:381
+#: src/Resources.vala:414
 #, c-format
 msgid "Rename Search \"%s\" to \"%s\""
 msgstr "Thoir \"%2s\" air an lorg \"%1s\""
 
-#: ../src/Resources.vala:385
+#: src/Resources.vala:418
 #, c-format
 msgid "Delete Search \"%s\""
 msgstr "Sguab às an lorg \"%s\""
 
-#: ../src/Resources.vala:543
+#: src/Resources.vala:576
 #, c-format
 msgid "Rate %s"
 msgstr "Thoir an rangachadh %s dha"
 
-#: ../src/Resources.vala:544
+#: src/Resources.vala:577
 #, c-format
 msgid "Set rating to %s"
 msgstr "Thoir an rangachadh %s dha"
 
-#: ../src/Resources.vala:545
+#: src/Resources.vala:578
 #, c-format
 msgid "Setting rating to %s"
 msgstr "A' toirt an rangachadh %s dha"
 
-#: ../src/Resources.vala:547
+#: src/Resources.vala:580
 #, c-format
 msgid "Display %s"
 msgstr "Seall %s"
 
-#: ../src/Resources.vala:548
+#: src/Resources.vala:581
 #, 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:549
+#: src/Resources.vala:582
 #, c-format
 msgid "%s or Better"
 msgstr "%s no nas fhearr"
 
-#: ../src/Resources.vala:550
+#: src/Resources.vala:583
 #, c-format
 msgid "Display %s or Better"
 msgstr "Seall %s no feadhainn nas fhearr"
 
-#: ../src/Resources.vala:551
+#: src/Resources.vala:584
 #, 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:642
+#: src/Resources.vala:675
 msgid "Remove the selected photos from the trash"
 msgstr "Thoir na dealbhan a thagh thu air falbh on sgudal"
 
-#: ../src/Resources.vala:643
+#: src/Resources.vala:676
 msgid "Remove the selected photos from the library"
 msgstr "Thoir na dealbhan a thagh thu air falbh on leabhar-lann"
 
-#: ../src/Resources.vala:645
+#: src/Resources.vala:678
 msgid "_Restore"
 msgstr "_Aisig"
 
-#: ../src/Resources.vala:646
+#: src/Resources.vala:679
 msgid "Move the selected photos back into the library"
 msgstr "Gluais na dealbhan a thagh thu air ais dhan leabhar-lann"
 
-#: ../src/Resources.vala:648
+#: src/Resources.vala:681
 msgid "Show in File Mana_ger"
 msgstr "Seall ann am manai_dsear nam faidhlichean"
 
-#: ../src/Resources.vala:649
+#: 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:652
+#: src/Resources.vala:685
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Cha ghabh fhosgladh manaidsear nam faidhlichean: %s"
 
-#: ../src/Resources.vala:655
+#: src/Resources.vala:688
 msgid "R_emove From Library"
 msgstr "T_hoir air falbh on leabhar-lann"
 
-#: ../src/Resources.vala:657
+#: src/Resources.vala:690
 msgid "_Move to Trash"
 msgstr "_Gluais dhan sgudal"
 
-#: ../src/Resources.vala:659
+#: src/Resources.vala:692
 msgid "Select _All"
 msgstr "Tagh n_a h-uile"
 
-#: ../src/Resources.vala:660
+#: src/Resources.vala:693
 msgid "Select all items"
 msgstr "Tagh a h-uile nì"
 
@@ -3870,1433 +6195,590 @@ msgstr "Tagh a h-uile nì"
 #. / 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:741
-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:746
-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:750
+#: src/Resources.vala:782
 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:755 ../src/Resources.vala:765
+#: src/Resources.vala:787
+#, fuzzy
+#| msgid "%a %b %d"
+msgctxt "MultidayFormat"
 msgid "%a %b %d"
 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:760
+#: src/Resources.vala:792
+#, fuzzy
+#| msgid "%d, %Y"
+msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
-#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
-msgid "Slideshow"
-msgstr "Taisbeanadh-shleamhnagan"
-
-#. Flagged label and toggle
-#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:990 ../src/library/FlaggedPage.vala:8
-msgid "Flagged"
-msgstr "Le bratach"
-
-#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
-msgid "Photos"
-msgstr "Dealbhan"
-
-#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Videothan"
-
-#: ../src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "Dealbhan RAW"
-
-#: ../src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "Dealbhan RAW"
-
-#: ../src/SearchFilter.vala:952
-#, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Mearachd a' luchdadh faidhle an UI %s: %s"
-
-#. Type label and toggles
-#: ../src/SearchFilter.vala:969
-msgid "Type"
-msgstr "Seòrsa"
-
-#. Rating label and button
-#: ../src/SearchFilter.vala:1003 ../src/searches/SearchBoolean.vala:184
-msgid "Rating"
-msgstr "Rangachadh"
-
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:182
-msgid "Settings"
-msgstr "Roghainnean"
-
-#. Set up toolbar
-#. add toolbar buttons
-#: ../src/SlideshowPage.vala:161
-msgid "Back"
-msgstr "Air ais"
-
-#: ../src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Air ais dhan dealbh roimhe"
-
-#: ../src/SlideshowPage.vala:168 ../src/SlideshowPage.vala:273
-msgid "Pause"
-msgstr "Cuir 'na stad"
-
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:274
-msgid "Pause the slideshow"
-msgstr "Cuir an taisbeanadh-shleamhnagan 'na stad"
-
-#: ../src/SlideshowPage.vala:175
-msgid "Next"
-msgstr "Air adhart"
-
-#: ../src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Air adhart dhan ath-dhealbh"
-
-#: ../src/SlideshowPage.vala:183
-msgid "Change slideshow settings"
-msgstr "Atharraich roghainnean an taisbeanaidh-shleamhnagan"
-
-#. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:237
-msgid "All photo source files are missing."
-msgstr "Tha gach tùs-fhaidhl nan dealbhan a dhìth."
-
-#: ../src/SlideshowPage.vala:269
-msgid "Play"
-msgstr "Cluich"
-
-#: ../src/SlideshowPage.vala:270
-msgid "Continue the slideshow"
-msgstr "Lean air an taisbeanadh-shleamhnagan"
-
-#: ../src/Tag.vala:817
-msgid "untitled"
-msgstr "gun tiotal"
-
-#. multiple videos
-#: ../src/VideoSupport.vala:486
-msgid "Export Videos"
-msgstr "Às-phortaich videothan"
-
-#: ../src/camera/Branch.vala:87
-msgid "Cameras"
-msgstr "Camarathan"
-
-#: ../src/camera/ImportPage.vala:459
-msgid ""
-"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."
-
-#. hide duplicates checkbox
-#: ../src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "Falaich dealbhan a chaidh ion-phortadh mar-thà"
-
-#: ../src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "Na seall ach dealbhan nach deach ion-phortadh fhathast"
-
-#. 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:845
-msgid "Starting import, please wait..."
-msgstr "A' tòiseachadh air ion-phortadh, fuirich ort..."
-
-#: ../src/camera/ImportPage.vala:884
-msgid "Import _Selected"
-msgstr "Ion-phortaich na _thagh thu"
-
-#: ../src/camera/ImportPage.vala:885
-msgid "Import the selected photos into your library"
-msgstr "Ion-phortaich na dealbhan a thagh thu dhan leabhar-lann agad"
-
-#: ../src/camera/ImportPage.vala:890
-msgid "Import _All"
-msgstr "Ion-phortaich na _h-uile"
-
-#: ../src/camera/ImportPage.vala:891
-msgid "Import all the photos into your library"
-msgstr "Ion-phortaich na dealbhan uile dhan leabhar-lann agad"
-
-#. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1012
-msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"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?"
-
-#: ../src/camera/ImportPage.vala:1018
-msgid "_Unmount"
-msgstr "_Dì-mhunntaich"
-
-#: ../src/camera/ImportPage.vala:1023
-msgid "Please unmount the camera."
-msgstr "Dì-mhunntaich an camara"
-
-#: ../src/camera/ImportPage.vala:1028
-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 ""
-"Chaidh an camara a ghlasadh le aplacaid eile. Chan fhaigh Shotwell cothrom "
-"air a' chamara ach nuair tha e fosgailte. Dùin aplacaid sam bith eile a tha "
-"a' cleachdadh a' chamara agus feuch ris a-rithist."
-
-#: ../src/camera/ImportPage.vala:1038
-msgid "Please close any other application using the camera."
-msgstr "Dùin aplacaid sam bith eile a tha a' cleachdadh a' chamara."
-
-#: ../src/camera/ImportPage.vala:1043
-#, c-format
-msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
-msgstr ""
-"Chan urrainn dhuinn ro-shealladh sam bith fhaighinn on chamara\n"
-"%s"
-
-#: ../src/camera/ImportPage.vala:1060
-msgid "Unmounting..."
-msgstr "A' dì-mhunntachadh..."
-
-#: ../src/camera/ImportPage.vala:1166
-msgid "Fetching photo information"
-msgstr "A' faighinn fiosrachadh an deilbh"
-
-#: ../src/camera/ImportPage.vala:1521
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "A' faighinn ro-shealladh %s"
-
-#: ../src/camera/ImportPage.vala:1637
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "Chan urrainn dhuinn an camara a ghlasadh: %s"
-
-#: ../src/camera/ImportPage.vala:1722
-#, 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?"
-
-#: ../src/camera/ImportPage.vala:1725
-#, 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?"
-
-#: ../src/camera/ImportPage.vala:1728
-#, 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[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?"
-
-#: ../src/camera/ImportPage.vala:1731
-#, 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?"
-
-#: ../src/camera/ImportPage.vala:1758
-msgid "Removing photos/videos from camera"
-msgstr "A' toirt air falbh nan dealbhan/videothan on chamara"
-
-#: ../src/camera/ImportPage.vala:1762
-#, 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 "
-"mhearachdan."
-msgstr[1] ""
-"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 "
-"linn mhearachdan."
-msgstr[3] ""
-"Tha %d dealbh/video air a' chamara nach urrainn dhuinn sguabadh às ri linn "
-"mhearachdan."
-
-#: ../src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Ion-phortadh dàta"
-
-#. 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 "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:"
-msgstr ""
-"Chan urrainn dhuinn leantainn air an ion-phortadh o %s oir thachair mearachd:"
-
-#: ../src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"Ma tha thu airson feuchainn ri ion-phortadh a dhèanamh o sheirbheis eile, "
-"tagh tè sa chlàr-taice gu h-àrd."
-
-#: ../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 ""
-"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."
-
-#: ../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:899
-msgid "_Import"
-msgstr "_Ion-phortaich"
-
-#: ../src/data_imports/DataImportsUI.vala:216
-msgid "Import From Application"
-msgstr "Ion-phortaich o aplacaid"
-
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Ion-phortaich meadhan _o:"
-
-#: ../src/data_imports/DataImportsUI.vala:394
-#: ../src/publishing/PublishingUI.vala:493
-msgid "_Close"
-msgstr "_Dùin"
-
-#: ../src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr ""
-"Cha b' urrainn fosgail/cruthachadh stòr-dàta dealbh/foto %s: còd mearachd %d"
-
-#: ../src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"Cha b' urrainn sgrìobhadh gu faidhle stòr-dàta dealbh/foto:\n"
-" %s"
-
-#: ../src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Mearachd faighinn cothrom air faidhle stòr-dàta:\n"
-" %s\n"
-"\n"
-"'S e am mearachd: \n"
-"%s"
-
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:352
-msgid "_File"
-msgstr "_Faidhle"
-
-#: ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:417
-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:356
-msgid "_Edit"
-msgstr "D_easaich"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:364
-msgid "_Photo"
-msgstr "_Dealbh"
-
-#: ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:380
-msgid "_Help"
-msgstr "_Cobhair"
-
-#: ../src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid "%s does not exist."
-msgstr "Chan eill %s ann."
-
-#: ../src/direct/DirectPhotoPage.vala:229
-#, c-format
-msgid "%s is not a file."
-msgstr "Chan e faidhle a tha ann an \"%s\"."
-
-#: ../src/direct/DirectPhotoPage.vala:231
-#, 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"
-"%s."
-
-#: ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save a Copy"
-msgstr "_Sàbhail lethbhreac dheth"
-
-#: ../src/direct/DirectPhotoPage.vala:420
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "A bheil thu airson na dh'atharraich thu air %s a chall?"
-
-#: ../src/direct/DirectPhotoPage.vala:421
-msgid "Close _without Saving"
-msgstr "Dùin _gun a shàbhaladh"
-
-#: ../src/direct/DirectPhotoPage.vala:454
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "Thachair mearachd fhad 's a bha sinn a' sàbhaladh ann an %s: %s"
-
-#: ../src/direct/DirectPhotoPage.vala:482
-#: ../src/direct/DirectPhotoPage.vala:503
-msgid "Save As"
-msgstr "Sàbhail mar"
-
-#: ../src/editing_tools/EditingTools.vala:665
-msgid "Return to current photo dimensions"
-msgstr "Till do mheudachd an deilbh làithrich"
-
-#: ../src/editing_tools/EditingTools.vala:668
-msgid "Set the crop for this photo"
-msgstr "Suidhich bearradh an deilbh seo"
-
-#: ../src/editing_tools/EditingTools.vala:680
-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
-msgid "Unconstrained"
-msgstr "Gun chuingeachadh"
-
-#: ../src/editing_tools/EditingTools.vala:754
-msgid "Square"
-msgstr "Ceàrnagach"
-
-#: ../src/editing_tools/EditingTools.vala:755
-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
-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 "Litir (8.5 x 11 òirlich)"
-
-#: ../src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Tabloid (11 x 17 òirlich)"
-
-#: ../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:1905
-msgid "Close the red-eye tool"
-msgstr "Dùin inneal nan sùilean dearga"
-
-#: ../src/editing_tools/EditingTools.vala:1908
-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:2244
-#: ../src/editing_tools/StraightenTool.vala:102
-msgid "_Reset"
-msgstr "_Ath-shuidhich"
-
-#: ../src/editing_tools/EditingTools.vala:2266
-msgid "Saturation:"
-msgstr "Sàthachd:"
-
-#: ../src/editing_tools/EditingTools.vala:2274
-msgid "Tint:"
-msgstr "Tuar:"
-
-#: ../src/editing_tools/EditingTools.vala:2283
-msgid "Temperature:"
-msgstr "Teothachd:"
-
-#: ../src/editing_tools/EditingTools.vala:2291
-msgid "Shadows:"
-msgstr "Sgàilean:"
-
-#: ../src/editing_tools/EditingTools.vala:2299
-msgid "Highlights:"
-msgstr "Soillseachadh:"
-
-#: ../src/editing_tools/EditingTools.vala:2353
-msgid "Reset Colors"
-msgstr "Ath-shuidhich na dathan"
-
-#: ../src/editing_tools/EditingTools.vala:2353
-msgid "Reset all color adjustments to original"
-msgstr "Ath-shuidhich gach rèiteachadh datha gu roghainn thùsail aige"
-
-#: ../src/editing_tools/EditingTools.vala:2705
-msgid "Temperature"
-msgstr "Teothachd"
-
-#: ../src/editing_tools/EditingTools.vala:2718
-msgid "Tint"
-msgstr "Tuar"
-
-#: ../src/editing_tools/EditingTools.vala:2731
-msgid "Saturation"
-msgstr "Sàthachd"
-
-#: ../src/editing_tools/EditingTools.vala:2744
-msgid "Exposure"
-msgstr "Deisearas"
-
-#: ../src/editing_tools/EditingTools.vala:2757
-msgid "Shadows"
-msgstr "Sgàilean"
-
-#: ../src/editing_tools/EditingTools.vala:2770
-msgid "Highlights"
-msgstr "Soillseachadh"
-
-#: ../src/editing_tools/EditingTools.vala:2780
-msgid "Contrast Expansion"
-msgstr "Leudachadh an iomsgaraidh"
-
-#: ../src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Ceàrn:"
-
-#: ../src/events/EventDirectoryItem.vala:83
-#, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d dealbh/video"
-msgstr[1] "%d dhealbh/video"
-msgstr[2] "%d dealbhan/videothan"
-msgstr[3] "%d dealbh/video"
-
-#: ../src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "Chan eil tachartas ann"
-
-#: ../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
-msgid "No events"
-msgstr "Chan eil tachartas sam bith ann"
-
-#: ../src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "Cha deach tachartas sam bith a lorg"
-
-#: ../src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "Tachartasan"
-
-#: ../src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Gun cheann-là"
-
-#: ../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 "Pasganan"
-
-#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:33
-msgid "Library"
-msgstr "Leabhar-lann"
-
-#: ../src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Ag ion-phortadh..."
-
-#: ../src/library/ImportQueuePage.vala:66
-msgid "_Stop Import"
-msgstr "Thoir _stad air an ion-phortadh"
-
-#: ../src/library/ImportQueuePage.vala:67
-msgid "Stop importing photos"
-msgstr "Thoir stad air ion-phortadh na dealbhan"
-
-#: ../src/library/ImportQueuePage.vala:123
-msgid "Preparing to import..."
-msgstr "Ag ullachadh an ion-phortadh..."
-
-#: ../src/library/ImportQueuePage.vala:150
-#, c-format
-msgid "Imported %s"
-msgstr "Chaidh %s ion-phortadh"
-
-#: ../src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "An t-ion-phortadh mu dheireadh"
-
-#: ../src/library/LibraryWindow.vala:301
-msgid "_Import From Folder..."
-msgstr "_Ion-phortaich o phasgan..."
-
-#: ../src/library/LibraryWindow.vala:302
-msgid "Import photos from disk to library"
-msgstr "Ion-phortaich dealbhan o dhiosg dha leabhar-lann"
-
-#: ../src/library/LibraryWindow.vala:309
-msgid "Import From _Application..."
-msgstr "Ion-phortaich o _aplacaid..."
-
-#: ../src/library/LibraryWindow.vala:313
-msgid "Sort _Events"
-msgstr "Seòrsaich na _tachartasan"
-
-#: ../src/library/LibraryWindow.vala:323
-msgid "Empty T_rash"
-msgstr "Falamhaich an s_gudal"
-
-#: ../src/library/LibraryWindow.vala:324
-msgid "Delete all photos in the trash"
-msgstr "Sguab às na dealbhan uile a tha san sgudal"
-
-#: ../src/library/LibraryWindow.vala:329
-msgid "View Eve_nt for Photo"
-msgstr "Seall an tac_hartas aig an dealbh"
-
-#: ../src/library/LibraryWindow.vala:334
-msgid "_Find"
-msgstr "_Lorg"
-
-#: ../src/library/LibraryWindow.vala:335
-msgid "Find photos and videos by search criteria"
-msgstr "Lorg dealbhan agus videothan a-rèir cuspairean-deuchainn"
-
-#: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:194
-msgid "Ne_w Saved Search..."
-msgstr "Lorg ù_r a chaidh a shàbhaladh..."
-
-#: ../src/library/LibraryWindow.vala:368
-msgid "_Photos"
-msgstr "_Dealbhan"
-
-#: ../src/library/LibraryWindow.vala:372
-msgid "Even_ts"
-msgstr "Tach_artasan"
-
-#: ../src/library/LibraryWindow.vala:391
-msgid "_Basic Information"
-msgstr "_Fiosrachadh bunasach"
-
-#: ../src/library/LibraryWindow.vala:392
-msgid "Display basic information for the selection"
-msgstr "Seall fiosrachadh bunasach mun rug a thagh thu"
-
-#: ../src/library/LibraryWindow.vala:397
-msgid "E_xtended Information"
-msgstr "F_iosrachdadh leudaichte"
-
-#: ../src/library/LibraryWindow.vala:398
-msgid "Display extended information for the selection"
-msgstr "Seall fiosrachadh leudaichte mun rug a thagh thu"
-
-#: ../src/library/LibraryWindow.vala:403
-msgid "_Search Bar"
-msgstr "_Bàr nan lorg"
-
-#: ../src/library/LibraryWindow.vala:404
-msgid "Display the search bar"
-msgstr "Seall bàr nan lorg"
-
-#: ../src/library/LibraryWindow.vala:409
-msgid "S_idebar"
-msgstr "Bàr-_taoibh"
-
-#: ../src/library/LibraryWindow.vala:410
-msgid "Display the sidebar"
-msgstr "Seall am bàr-taoibh"
-
-#: ../src/library/LibraryWindow.vala:668
-msgid "Import From Folder"
-msgstr "Ion-phortaich o phasgan"
-
-#: ../src/library/LibraryWindow.vala:737
-msgid "Empty Trash"
-msgstr "Falamhaich an sgudal"
-
-#: ../src/library/LibraryWindow.vala:737
-msgid "Emptying Trash..."
-msgstr "A' falamhadh an sgudail..."
-
-#: ../src/library/LibraryWindow.vala:896
-#, 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 ""
-"Chaidh Shotwell a rèiteachadh ach an dèan a ion-phortadh nan dealbhan dhan "
-"phasgan dhachaigh agad.\n"
-"Mholamaid gun atharraich thu seo ann an <span weight=\"bold\">Deasaich "
-"roghainnean %s</span>.\n"
-"A bheil thu airson leantainn air adhart le ion-phortachadh nan dealbhan?"
-
-#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:19
-msgid "Library Location"
-msgstr "Ionad na leabhar-lainn"
-
-#. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:912
-msgid "Photos cannot be imported from this directory."
-msgstr "Cha ghabh dealbhan ion-phortadh on phasgan seo."
-
-#: ../src/library/LibraryWindow.vala:1200
-#, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: ../src/library/LibraryWindow.vala:1244
-#: ../src/library/LibraryWindow.vala:1255
-msgid "Updating library..."
-msgstr "Ag ùrachadh na leabhar-lainn..."
-
-#: ../src/library/LibraryWindow.vala:1261
-msgid "Preparing to auto-import photos..."
-msgstr "Ag ullachadh airson ion-phortadh gu fèin-obrach de dhealbhan..."
-
-#: ../src/library/LibraryWindow.vala:1266
-msgid "Auto-importing photos..."
-msgstr "Ag ion-phortadh nan dealbhan gu fèin-obrachail..."
-
-#: ../src/library/LibraryWindow.vala:1274
-msgid "Writing metadata to files..."
-msgstr "A' sgrìobhadh a' metadata 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/TrashPage.vala:8
-msgid "Trash"
-msgstr "An sgudal"
-
-#: ../src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "Tha an sgudal falamh"
-
-#: ../src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Sguab às"
-
-#: ../src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-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."
-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). "
-"Seo tionndadh %s (sgeama %d). Nach cleachd thu an tionndadh às ùire 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 ""
-"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 "
-"photos."
-msgstr ""
-"Chan eil leabhar-lann nan dealbh agad co-chòrdail leis an tionndadh seo de "
-"Shotwell. Tha coltas gun deach a chruthachadh le Shotwell %s (sgeama %d). "
-"Seo tionndadh %s (sgeama %d). Glan an leabhar-lann agad - sguab às %s agus "
-"ion-phortaich na dealbhan agad às ùr an uairsin."
-
-#: ../src/main.vala:71
-#, c-format
-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 "
-"Shotwell a dhearbhadh: %s"
-
-#: ../src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "A' luchdadh Shotwell"
-
-#: ../src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "An t-slighe dhan dàta phrìobhaideach aig Shotwell"
-
-#: ../src/main.vala:294
-msgid "DIRECTORY"
-msgstr "PASGAN"
-
-#: ../src/main.vala:298
-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"
-msgstr "Na seall an t-adhartas tòiseachaidh nuair a thòisicheas e"
-
-#: ../src/main.vala:306
-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
-msgid "[FILE]"
-msgstr "[FAIDHLE]"
-
-#: ../src/main.vala:342
-#, 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 "
-"fhaicinn a tha ri làimh.\n"
-
-#: ../src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
-
-#: ../src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: ../src/photos/JfifSupport.vala:182
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Ìseal (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Meadhanach (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:188
-#, c-format
-msgid "High (%d%%)"
-msgstr "Àrd (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:191
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "As motha (%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 "'Ga fhoillseachadh"
-
-#: ../src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Ag ullachadh airson luchdadh suas"
-
-#: ../src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %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:"
-msgstr ""
-"Chan urrainn leantainn air adhart leis an fhoillseachadh air %s oir thachair "
-"mearachd:"
-
-#: ../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 "
-"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
-msgid "The selected video was successfully published."
-msgstr "Chaidh a' video a thagh thu fhoillseachadh."
-
-#: ../src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "Chaidh an dealbh a thagh thu fhoillseachadh."
-
-#: ../src/publishing/PublishingUI.vala:122
-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:183
-msgid "Publish Photos"
-msgstr "Foillsich na dealbhan"
-
-#: ../src/publishing/PublishingUI.vala:184
-msgid "Publish photos _to:"
-msgstr "Foillsich na d_ealbhan air:"
-
-#: ../src/publishing/PublishingUI.vala:186
-msgid "Publish Videos"
-msgstr "Foillsich na videothan"
-
-#: ../src/publishing/PublishingUI.vala:187
-msgid "Publish videos _to"
-msgstr "Foillsich na videothan _air"
-
-#: ../src/publishing/PublishingUI.vala:189
-msgid "Publish Photos and Videos"
-msgstr "Foillsich na dealbhan agus videothan"
-
-#: ../src/publishing/PublishingUI.vala:190
-msgid "Publish photos and videos _to"
-msgstr "Foillsich na dealbhan agus _videothan air"
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/Resources.vala:797
+#, fuzzy
+#| msgid "%a %b %d"
+msgctxt "MultimonthFormat"
+msgid "%a %b %d"
+msgstr "%a %d %b"
 
-#. There are no enabled publishing services that accept this media type,
-#. warn the user.
-#: ../src/publishing/PublishingUI.vala:383
-msgid "Unable to publish"
-msgstr "Chan urrainn dhuinn foillseachadh"
+#. / Locale-specific calendar date format for multi-month strings,
+#. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
+#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
+#: src/Resources.vala:802
+#, fuzzy
+#| msgid "%a %b %d, %Y"
+msgctxt "MultimonthFormat"
+msgid "%a %b %d, %Y"
+msgstr "%a %d %b %Y"
 
-#: ../src/publishing/PublishingUI.vala:384
-#, 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 ""
-"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/Screensaver.vala:18 src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "Taisbeanadh-shleamhnagan"
 
-#: ../src/searches/Branch.vala:68
+#: src/searches/Branch.vala:68
 msgid "Saved Searches"
 msgstr "Luirg a shàbhail thu"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:169
+#: src/searches/SavedSearchDialog.vala:168
 msgid "contains"
 msgstr "is na leanas 'na bhroinn"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:170
-#: ../src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:169
+#: src/searches/SavedSearchDialog.vala:500
 msgid "is exactly"
 msgstr "a tha gu pongail"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:170
 msgid "starts with"
 msgstr "a tha a' tòiseachadh le"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:171
 msgid "ends with"
 msgstr "a tha a' crìochnachadh le"
 
-#: ../src/searches/SavedSearchDialog.vala:173
+#: src/searches/SavedSearchDialog.vala:172
 msgid "does not contain"
 msgstr "anns nach eil"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#: ../src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:173
+#: src/searches/SavedSearchDialog.vala:504
 msgid "is not set"
 msgstr "nach deach a shuidheachadh"
 
+#: src/searches/SavedSearchDialog.vala:174
+#, fuzzy
+#| msgid "is not set"
+msgid "is set"
+msgstr "nach deach a shuidheachadh"
+
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:245
-#: ../src/searches/SavedSearchDialog.vala:376
-#: ../src/searches/SavedSearchDialog.vala:441
+#: src/searches/SavedSearchDialog.vala:248
+#: src/searches/SavedSearchDialog.vala:379
+#: src/searches/SavedSearchDialog.vala:444
 msgid "is"
 msgstr "a tha 'na"
 
-#: ../src/searches/SavedSearchDialog.vala:246
+#: src/searches/SavedSearchDialog.vala:249
 msgid "is not"
 msgstr "nach eil 'na"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:252
+#: src/searches/SavedSearchDialog.vala:255
 msgid "any photo"
 msgstr "dealbh sam bith"
 
-#: ../src/searches/SavedSearchDialog.vala:253
+#: src/searches/SavedSearchDialog.vala:256
 msgid "a raw photo"
 msgstr "dhealbh amh"
 
-#: ../src/searches/SavedSearchDialog.vala:254
+#: src/searches/SavedSearchDialog.vala:257
 msgid "a video"
 msgstr "video"
 
-#: ../src/searches/SavedSearchDialog.vala:308
+#: src/searches/SavedSearchDialog.vala:311
 msgid "has"
 msgstr "Chaidh"
 
-#: ../src/searches/SavedSearchDialog.vala:309
+#: src/searches/SavedSearchDialog.vala:312
 msgid "has no"
 msgstr "Cha deach"
 
-#: ../src/searches/SavedSearchDialog.vala:314
+#: src/searches/SavedSearchDialog.vala:317
 msgid "modifications"
 msgstr "atharrachadh a dhèanamh air"
 
-#: ../src/searches/SavedSearchDialog.vala:315
+#: src/searches/SavedSearchDialog.vala:318
 msgid "internal modifications"
 msgstr "atharrachadh inntearnail a dhèanamh air"
 
-#: ../src/searches/SavedSearchDialog.vala:316
+#: src/searches/SavedSearchDialog.vala:319
 msgid "external modifications"
 msgstr "atharrachadh on taobh a-muigh a dhèanamh air"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:370
+#: src/searches/SavedSearchDialog.vala:373
 msgid "flagged"
 msgstr "a tha bratach ris"
 
-#: ../src/searches/SavedSearchDialog.vala:371
+#: src/searches/SavedSearchDialog.vala:374
 msgid "not flagged"
 msgstr "nach eil bratach ris"
 
-#: ../src/searches/SavedSearchDialog.vala:434
+#: src/searches/SavedSearchDialog.vala:437
 msgid "and higher"
 msgstr "agus nas àirde"
 
-#: ../src/searches/SavedSearchDialog.vala:435
+#: src/searches/SavedSearchDialog.vala:438
 msgid "only"
 msgstr "a-mhàin"
 
-#: ../src/searches/SavedSearchDialog.vala:436
+#: src/searches/SavedSearchDialog.vala:439
 msgid "and lower"
 msgstr "agus nas lugha"
 
-#: ../src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:501
 msgid "is after"
 msgstr "a tha àn dèidh"
 
-#: ../src/searches/SavedSearchDialog.vala:499
+#: src/searches/SavedSearchDialog.vala:502
 msgid "is before"
 msgstr "a tha ro"
 
-#: ../src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:503
 msgid "is between"
 msgstr "a tha eadar"
 
-#: ../src/searches/SavedSearchDialog.vala:513
+#: src/searches/SavedSearchDialog.vala:516
 msgid "and"
 msgstr "agus"
 
-#: ../src/searches/SavedSearchDialog.vala:720
+#: src/searches/SavedSearchDialog.vala:697
+msgid "Search"
+msgstr "Lorg"
+
+#: src/searches/SavedSearchDialog.vala:702
+#, fuzzy
+#| msgid "_Cancel"
+msgid "Cancel"
+msgstr "_Sguir dheth"
+
+#: src/searches/SavedSearchDialog.vala:703
+msgid "OK"
+msgstr ""
+
+#: src/searches/SavedSearchDialog.vala:721
 msgid "any"
 msgstr "gin sam bith"
 
-#: ../src/searches/SavedSearchDialog.vala:721
+#: src/searches/SavedSearchDialog.vala:722
 msgid "all"
 msgstr "na h-uile"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:723
 msgid "none"
 msgstr "chan eil gin"
 
-#: ../src/searches/SearchBoolean.vala:157
+#: src/searches/SearchBoolean.vala:157
 msgid "Any text"
 msgstr "Teacsa sam bith"
 
-#: ../src/searches/SearchBoolean.vala:160
+#: src/searches/SearchBoolean.vala:160
 msgid "Title"
 msgstr "Tiotal"
 
-#: ../src/searches/SearchBoolean.vala:163
+#: src/searches/SearchBoolean.vala:163
 msgid "Tag"
 msgstr "Taga"
 
-#: ../src/searches/SearchBoolean.vala:166
+#: src/searches/SearchBoolean.vala:166
 msgid "Comment"
 msgstr "Beachd"
 
-#: ../src/searches/SearchBoolean.vala:169
+#: src/searches/SearchBoolean.vala:169
 msgid "Event name"
 msgstr "Ainm an tachartais"
 
-#: ../src/searches/SearchBoolean.vala:172
+#: src/searches/SearchBoolean.vala:172
 msgid "File name"
 msgstr "Ainm an fhaidhle"
 
-#: ../src/searches/SearchBoolean.vala:175
+#: src/searches/SearchBoolean.vala:175
 msgid "Media type"
 msgstr "Seòrsa a' mheadhain"
 
-#: ../src/searches/SearchBoolean.vala:178
+#: src/searches/SearchBoolean.vala:178
 msgid "Flag state"
 msgstr "Staid na brataich"
 
-#: ../src/searches/SearchBoolean.vala:181
+#: src/searches/SearchBoolean.vala:181
 msgid "Photo state"
 msgstr "Staid an deilbh:"
 
-#: ../src/searches/SearchBoolean.vala:187
+#. Rating button
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
+msgid "Rating"
+msgstr "Rangachadh"
+
+#: src/searches/SearchBoolean.vala:187
 msgid "Date"
 msgstr "Ceann-là"
 
-#: ../src/sidebar/Tree.vala:198
+#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
+msgid "Videos"
+msgstr "Videothan"
+
+#: src/SearchFilter.vala:620
+msgid "RAW Photos"
+msgstr "Dealbhan RAW"
+
+#: src/SearchFilter.vala:621
+msgid "RAW photos"
+msgstr "Dealbhan RAW"
+
+#: src/SearchFilter.vala:1148
+#, c-format
+msgid "Error loading UI file %s: %s"
+msgstr "Mearachd a' luchdadh faidhle an UI %s: %s"
+
+#. Ticket #3260 - Add a 'close' context menu to
+#. the searchbar.
+#. Prepare the close menu for use, but don't
+#. display it yet; we'll connect it to secondary
+#. click later on.
+#: src/SearchFilter.vala:1159
+#, fuzzy
+#| msgid "_Close"
+msgid "Close"
+msgstr "_Dùin"
+
+#. Type label and toggles
+#: src/SearchFilter.vala:1165
+msgid "Type"
+msgstr "Seòrsa"
+
+#: src/SearchFilter.vala:1211
+msgid "Use a saved search to filter items in the current view"
+msgstr ""
+
+#: src/sidebar/Tree.vala:203
 msgid "New _Tag..."
 msgstr "_Taga ùr..."
 
-#: ../src/slideshow/Slideshow.vala:22
+#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "Roghainnean"
+
+#. Set up toolbar
+#. add toolbar buttons
+#: src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "Air ais"
+
+#: src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "Air ais dhan dealbh roimhe"
+
+#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "Cuir 'na stad"
+
+#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "Cuir an taisbeanadh-shleamhnagan 'na stad"
+
+#: src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "Air adhart"
+
+#: src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "Air adhart dhan ath-dhealbh"
+
+#: src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "Atharraich roghainnean an taisbeanaidh-shleamhnagan"
+
+#. An entire slideshow set might be missing, so check for a loop.
+#: src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "Tha gach tùs-fhaidhl nan dealbhan a dhìth."
+
+#: src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "Cluich"
+
+#: src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "Lean air an taisbeanadh-shleamhnagan"
+
+#: src/slideshow/Slideshow.vala:22
 msgid "Slideshow Transitions"
 msgstr "Tar-mhùthaidhean an taisbeanaidh-shleamhnagan"
 
-#: ../src/slideshow/TransitionEffects.vala:98
+#: src/slideshow/TransitionEffects.vala:98
 msgid "(None)"
 msgstr "(Chan eil gin)"
 
-#: ../src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287
 msgid "None"
 msgstr "Chan eil gin"
 
-#: ../src/slideshow/TransitionEffects.vala:339
+#: src/slideshow/TransitionEffects.vala:339
 msgid "Random"
 msgstr "Air thuaiream"
 
-#: ../src/tags/Branch.vala:127
+#: src/tags/Branch.vala:131
 msgid "Tags"
 msgstr "Tagaichean"
 
-#: ../ui/set_background_dialog.glade.h:1
-#| msgid "Set as _Desktop Background"
+#: src/Tag.vala:830
+msgid "untitled"
+msgstr "gun tiotal"
+
+#. multiple videos
+#: src/VideoSupport.vala:523
+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/set_background_dialog.glade.h:2
-#: ../ui/set_background_slideshow_dialog.glade.h:6
+#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
 msgid "Use for Desktop"
 msgstr "Cleachd airson an deasga"
 
-#: ../ui/set_background_dialog.glade.h:3
-#: ../ui/set_background_slideshow_dialog.glade.h:7
+#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
 msgid "Use for Lock Screen"
 msgstr "Cleachd airson na sgrìn-glasaidh"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:1
+#: ui/set_background_slideshow_dialog.ui:15
 msgid "Set as Desktop Slideshow"
 msgstr "Suidhich mar thaisbeanadh-shleamhnagan an deasga"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:2
+#: ui/set_background_slideshow_dialog.ui:33
 msgid "Show each photo for"
 msgstr "Seall gach dealbh"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:3
+#: ui/set_background_slideshow_dialog.ui:45
 msgid "period of time"
 msgstr "fad greiseig"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:4
+#: ui/set_background_slideshow_dialog.ui:94
 msgid "Generate desktop background slideshow"
 msgstr "Cruthaich taisbeanadh-shleamhnagan a' chùlaibh"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:5
+#: ui/set_background_slideshow_dialog.ui:115
 msgid "How long each photo is shown on the desktop background"
 msgstr "Dè cho fad 's a thèid gach dealbh a shealltainn air cùlaibh an deasga"
 
-#: ../ui/shotwell.glade.h:1
-msgid "Search"
-msgstr "Lorg"
-
-#: ../ui/shotwell.glade.h:2
+#: ui/shotwell.ui:23
 msgid "_Name of search:"
 msgstr "_Ainm an luirg:"
 
-#: ../ui/shotwell.glade.h:3
+#: ui/shotwell.ui:81
 msgid "_Match"
 msgstr "_Maidsich"
 
-#: ../ui/shotwell.glade.h:4
+#: ui/shotwell.ui:108
 msgid "of the following:"
 msgstr "dhe na leanas:"
 
-#: ../ui/shotwell.glade.h:5
+#: ui/shotwell.ui:195
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Meud an deilbh chlò-bhuailte</b>"
 
-#: ../ui/shotwell.glade.h:6
+#: ui/shotwell.ui:212
 msgid "Use a _standard size:"
 msgstr "Cleachd meud _stannardach:"
 
-#: ../ui/shotwell.glade.h:7
+#: ui/shotwell.ui:255
 msgid "Use a c_ustom size:"
 msgstr "Cleachd meud g_nàthaichte:"
 
-#: ../ui/shotwell.glade.h:8
+#: ui/shotwell.ui:345
 msgid "_Match photo aspect ratio"
 msgstr "_Maidsich co-mheas an deilbh"
 
-#: ../ui/shotwell.glade.h:9
+#: ui/shotwell.ui:369
 msgid "_Autosize:"
 msgstr "Meud fèin-_obrachail:"
 
-#: ../ui/shotwell.glade.h:10
+#: ui/shotwell.ui:409
 msgid "<b>Titles</b>"
 msgstr "<b>Tiotalan</b>"
 
-#: ../ui/shotwell.glade.h:11
+#: ui/shotwell.ui:426
 msgid "Print image _title"
 msgstr "Clo-bhuail _tiotal an deilbh"
 
-#: ../ui/shotwell.glade.h:12
+#: ui/shotwell.ui:470
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Dùmhlachd-bhreacaidh nam piogsailean</b>"
 
-#: ../ui/shotwell.glade.h:13
+#: ui/shotwell.ui:490
 msgid "_Output photo at:"
 msgstr "Dèan de_albh aig:"
 
-#: ../ui/shotwell.glade.h:14
+#: ui/shotwell.ui:525
 msgid "pixels per inch"
 msgstr "piogsailean gach òirleach"
 
-#: ../ui/shotwell.glade.h:16
+#: ui/shotwell.ui:559
+msgid "label"
+msgstr "leubail"
+
+#: ui/shotwell.ui:681
 msgid "Shotwell Preferences"
 msgstr "Roghainnean Shotwell"
 
-#: ../ui/shotwell.glade.h:17
+#: ui/shotwell.ui:730
 msgid "white"
 msgstr "geal"
 
-#: ../ui/shotwell.glade.h:18
+#: ui/shotwell.ui:757
 msgid "black"
 msgstr "dubh"
 
-#: ../ui/shotwell.glade.h:20
+#: 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.glade.h:21
+#: ui/shotwell.ui:834
 msgid "Metadata"
 msgstr "Meata-dàta"
 
-#: ../ui/shotwell.glade.h:22
+#: 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.glade.h:23
+#: ui/shotwell.ui:880
 msgid "Display"
 msgstr "Sealladh"
 
-#: ../ui/shotwell.glade.h:24
+#: ui/shotwell.ui:901
 msgid "_Import photos to:"
 msgstr "_Ion-phortaich dealbhan dha:"
 
-#: ../ui/shotwell.glade.h:25
+#: ui/shotwell.ui:924
 msgid "_Background:"
 msgstr "Cùlai_bh:"
 
-#: ../ui/shotwell.glade.h:26
+#: ui/shotwell.ui:947
 msgid "Importing"
 msgstr "Ag ion-phortadh"
 
-#: ../ui/shotwell.glade.h:27
+#: ui/shotwell.ui:970
 msgid "_Directory structure:"
 msgstr "Structar a' p_hasgain:"
 
-#: ../ui/shotwell.glade.h:28
+#: ui/shotwell.ui:1009
 msgid "_Pattern:"
 msgstr "_Pàtran:"
 
-#: ../ui/shotwell.glade.h:29
+#: ui/shotwell.ui:1091
 msgid "Example:"
 msgstr "Ball-eisimpleir:"
 
-#: ../ui/shotwell.glade.h:30
+#: ui/shotwell.ui:1108
 msgid "R_ename imported files to lowercase"
 msgstr "_Sparr litrichean beaga air ainmean fhaidhlichean a thèid ion-phortadh"
 
-#: ../ui/shotwell.glade.h:31
+#: ui/shotwell.ui:1137
 msgid "RAW Developer"
 msgstr "Leasaichear RAW"
 
-#: ../ui/shotwell.glade.h:32
+#: ui/shotwell.ui:1172
 msgid "De_fault:"
 msgstr "B_un-roghainn"
 
-#: ../ui/shotwell.glade.h:34
+#: ui/shotwell.ui:1226
 msgid "E_xternal photo editor:"
 msgstr "Deasaiche dhealbhan air an taobh a-m_uigh:"
 
-#: ../ui/shotwell.glade.h:35
+#: ui/shotwell.ui:1242
 msgid "External _RAW editor:"
 msgstr "Deasaiche _RAW air an taobh a-muigh:"
 
-#: ../ui/shotwell.glade.h:36
+#: ui/shotwell.ui:1307
 msgid "External Editors"
 msgstr "Deasaichean air an taobh a-muigh:"
 
-#: ../ui/shotwell.glade.h:37
+#: ui/shotwell.ui:1334
 msgid "Plugins"
 msgstr "Plugain"
 
-#: ../ui/shotwell.glade.h:38
+#: ui/shotwell.ui:1400
 msgid "_Delay:"
 msgstr "_Dàil:"
 
-#: ../ui/shotwell.glade.h:39
+#: ui/shotwell.ui:1416
 msgid "_Transition effect:"
 msgstr "Èifeachd an _tar-mhùthaidh:"
 
-#: ../ui/shotwell.glade.h:40
+#: ui/shotwell.ui:1432
 msgid "Transition d_elay:"
 msgstr "Dàil an tar-mhùthaidh:"
 
-#: ../ui/shotwell.glade.h:41
+#: ui/shotwell.ui:1444
 msgid "Show t_itle"
 msgstr "Seall an t_iotal"
 
-#: ../ui/shotwell.glade.h:42
+#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
 msgid "seconds"
 msgstr "diogan"
 
+#~ msgid "Copyright 2009-2014 Yorba Foundation"
+#~ msgstr "Còir-lethbhreac 2009-2014 Yorba Foundation"
+
+#~ msgid "A file required for publishing is unavailable. Publishing to "
+#~ msgstr ""
+#~ "Tha feum air faidhle mus gabh foillseachadh a dhèanamh ach tha e a dhìth. "
+#~ "A' foillseachadh gu "
+
+#~ msgid "Intro message replaced at runtime"
+#~ msgstr ""
+#~ "Teachdaireachd tòiseachaidh 'ga chur an àite nuair a bhios e a' ruith"
+
+#~ msgid "'Publishing to $url as $username' (populated in application code)"
+#~ msgstr ""
+#~ "\"'Ga fhoillseachadh gu $url mar $username\" ('ga lìonadh ann an còd na h-"
+#~ "aplacaid)"
+
+#~ msgid "you are logged in rajce as $name"
+#~ msgstr "Chlàraich thu a-steach air rajce mar $name"
+
+#~ msgid "$mediatype will appear in"
+#~ msgstr "Nochdaidh $mediatype an-seo:"
+
+#~ msgid "L_ist album in public gallery"
+#~ msgstr "L_iosta albam anns gailearaidh poblach"
+
+#~ msgid "Visit the Yorba web site"
+#~ msgstr "Tadhail air làrach-lìn Yorba"
+
+#~ msgid "%-I:%M %p"
+#~ msgstr "%-I:%M %p"
+
+#~ msgid "%-I:%M:%S %p"
+#~ msgstr "%-I:%M:%S %p"
+
 #~ msgid "Publish your pictures to Picasa"
 #~ msgstr "Foillsich na dealbhan agad air Picasa"
 
diff --git a/po/hr.gmo b/po/hr.gmo
index e182bf6..a44fcb9 100644
--- a/po/hr.gmo
+++ b/po/hr.gmo
diff --git a/po/hr.po b/po/hr.po
index 7c81233..3075e96 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,39 +1,1306 @@
-# po/shotwell-core/shotwell.pot
-# PO message string template file for Shotwell Core Components
-# Copyright (C) 2009-2013 Yorba Foundation
-# See COPYING for license.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#
-# Translators:
-# deresh <deresh@gmail.com>, 2011
-# deresh <deresh@gmail.com>, 2012
-# Miro <mirozagreb@ubuntu-hr.org>, 2011
-# verayin <vera@yorba.org>, 2011
-# lsbeeler <lucas@yorba.org>, 2011
-msgid ""
-msgstr ""
-"Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: shotwell@yorba.org\n"
-"POT-Creation-Date: 2014-05-15 08:54+0000\n"
-"PO-Revision-Date: 2016-11-25 23:09+0100\n"
-"Last-Translator: gogo <trebelnik2@gmail.com>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/shotwell/"
-"language/hr/)\n"
+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"
+"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-Launchpad-Export-Date: 2016-09-15 13:28+0000\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"
 "Language: hr\n"
 
-#: ../plugins/common/RESTSupport.vala:424
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "Privremena datoteka, potrebna za objavu, nije dostupna."
+#: 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:354
+#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344
+#: ui/tags.ui:354
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: misc/shotwell.appdata.xml.in:9
+msgid "Popular photo manager"
+msgstr "Popularan upravitelj fotografija"
+
+#: 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 je jednostavan za korištenje, brz organizator fotografija "
+"dizajniran za GNOME radno okruženje. Omogućuje vam uvoz fotografija iz vaše "
+"kamere ili diska, organizira ih tematski, prema datumu ili ocjenama. "
+"Omogućuje i osnovno uređivanje fotografija poput obrezivanja, uklanjanja "
+"crvenih očiju, prilagodbu i ispravljanje boja. Shotwellov nedestruktivan "
+"uređivač fotografija ne mijenja vaše glavne fotografije, čineći ih lakšim za "
+"eksperimentiranje i ispravljanje grešaka."
+
+#: 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 ""
+"Kada je spreman, Shotwell može objaviti fotografije na raznim web stranicama "
+"poput Facebooka, Flickra, Picase (Google Plusa), i mnogih drugih."
+
+#: misc/shotwell.appdata.xml.in:22
+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
+msgid "Photo Manager"
+msgstr "Upravitelj fotografija"
+
+#: misc/shotwell.desktop.in.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
+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;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;"
+
+#. 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 "Shotwell preglednik"
+
+#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "Preglednik fotografija"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:6
+msgid "authentication token"
+msgstr "token ovjere"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:7
+msgid "Yandex-Fotki authentication token, if logged in."
+msgstr "Yandex-Fotki token ovjere, ako ste prijavljeni."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:14
+msgid "Token"
+msgstr "Token"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:15
+msgid "The token to access tumblr"
+msgstr "Token za pristup tumblru"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:20
+msgid "Secret token"
+msgstr "Tajni token"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:21
+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
+msgid "default size"
+msgstr "zadana veličina"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:27
+msgid ""
+"A numeric code representing the default size for photos uploaded to Tumblr"
+msgstr ""
+"Brojčani kôd predstavlja zadanu veličinu za fotografije poslane na Tumblr"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:32
+msgid "default blog"
+msgstr "Zadani blog"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:33
+msgid "The name of the default blog of the user, if any"
+msgstr "Naziv zadanog bloga korisnika, ako postoji"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:40
+msgid "Rajce URL"
+msgstr "Rajce URL"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:41
+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
+msgid "username"
+msgstr "korisničko ime"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:47
+msgid "Rajce username, if logged in."
+msgstr "Rajce korisničko ime, ako ste prijavljeni."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:52
+msgid "token"
+msgstr "token"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:53
+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
+msgid "last category"
+msgstr "Posljednja kategorija"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:59
+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
+msgid "last photo size"
+msgstr "posljednja veličina fotografije"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:65
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Rajce."
+msgstr ""
+"Brojčani kôd predstavlja zadani predložak veličine za fotografije pri "
+"objavljivanju na Rajce."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:70
+msgid "remember"
+msgstr "zapamćeno"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:71
+msgid "If true, remember last login."
+msgstr "Ako je odabrano, zapamti posljednju prijavu."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:76
+msgid "hide album"
+msgstr "sakrij album"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:77
+msgid "If true, hide the newly created Rajce album."
+msgstr "Ako je odabrano, sakrij novostvoreni Rajce album."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:82
+msgid "open album in web browser"
+msgstr "otvori album u web pregledniku"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:83
+msgid ""
+"If true, open target album in the web browser just after uploading photos"
+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
+msgid "remove sensitive info from uploads"
+msgstr "ukloni osjetljive informacije iz slanja"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:89
+msgid ""
+"Whether images being uploaded to Rajce should have their metadata removed "
+"first"
+msgstr ""
+"Treba li sa slika koje se šalju na Rajce prvo ukloniti njihove metapodatke"
+
+#: misc/org.yorba.shotwell.gschema.xml:23
+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."
+msgstr "Ako je odabrano, panel osnovnih svojstava će biti prikazan."
+
+#: misc/org.yorba.shotwell.gschema.xml:29
+msgid "display extended properties"
+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."
+
+#: misc/org.yorba.shotwell.gschema.xml:35
+msgid "display sidebar"
+msgstr "prikaži bočnu traku"
+
+#: misc/org.yorba.shotwell.gschema.xml:36
+msgid "True if the sidebar is to be displayed, false otherwise."
+msgstr "Ako je odabrano, bočna traka će biti prikazana."
+
+#: misc/org.yorba.shotwell.gschema.xml:41
+msgid "display toolbar"
+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 ""
+
+#: misc/org.yorba.shotwell.gschema.xml:47
+msgid "display search bar"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:48
+msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:53
+msgid "display photo titles"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:54
+msgid ""
+"True if photo titles are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:59
+msgid "display photo comments"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:60
+msgid ""
+"True if photo comments are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:65
+msgid "display event comments"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:66
+msgid ""
+"True if event comments are to be displayed beneath thumbnails in event "
+"views, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:71
+msgid "display photo tags"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:72
+msgid ""
+"True if photo tags are to be listed beneath thumbnails in collection views, "
+"false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:77
+msgid "display photo ratings"
+msgstr ""
 
-#: ../plugins/common/RESTSupport.vala:1152
+#: misc/org.yorba.shotwell.gschema.xml:78
+msgid ""
+"True if a photo’s rating should be displayed as overlaid trinket, false "
+"otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:83
+msgid "rating filter level"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:84
+msgid ""
+"Determines how to filter photos based on their ratings. 1: Rejected or "
+"better, 2: Unrated or better, 3: One or better, 4: Two or better, 5: Three "
+"or better, 6: Four or better, 7: Five or better."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:89
+msgid "sort events ascending"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:90
+msgid "True if events should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:95
+msgid "sort library photos ascending"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:96
+msgid "True if library photos should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:101
+msgid "sort library photos criteria"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:102
+msgid ""
+"A numeric code that specifies the sort criteria for photos in library views."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:107
+msgid "sort event photos ascending"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:108
+msgid "True if event photos should be sorted ascending, false if descending."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:113
+msgid "sort event photos criteria"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:114
+msgid "Specifies the sort criteria for event photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:119
+msgid "use 24 hour time"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:120
+msgid ""
+"True if should display times with a 24 hour clock, false if times should use "
+"AM/PM notation."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:125
+msgid "keep relative time between photos"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:126
+msgid ""
+"True if when adjusting time/date of photos, relative time should be "
+"maintained. False if all photos should be set to the same time."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:131
+msgid "modify original photo files"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:132
+msgid ""
+"True if when adjusting time/date of photos, the original files should be "
+"modified as well. False if changes are made only in the database."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:137
+msgid "show welcome dialog on startup"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:138
+msgid ""
+"True if, when on startup, a welcome dialog should be shown. False if it "
+"should not be shown."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:143
+msgid "sidebar position"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:144
+msgid "The width, in pixels, of the sidebar"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:149
+msgid "photo thumbnail scale"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:150
+msgid "The scale of photo thumbnails, ranging from 72 to 360."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:155
+msgid "pin toolbar state"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:156
+msgid "Pin toolbar in fullscreen, or not."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:161
+msgid "background color"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:162
+msgid "A grayscale color for use as the background color."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:167
+msgid "Selection state of “hide photos” option"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid ""
+"Last used selection state of the “hide photos already imported” option in "
+"the import page."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:175
+msgid "delay"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:176
+msgid "Delay (in seconds) between photos in the slideshow."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:181
+msgid "transition delay"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:182
+msgid ""
+"The time (in seconds) that a transition runs between photos in a slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:187
+msgid "transition effect id"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:188
+msgid ""
+"The name of the transition effect that will be used between photos when "
+"running a slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:193
+#, fuzzy
+msgid "Show title"
+msgstr "Prikaži naziv"
+
+#: misc/org.yorba.shotwell.gschema.xml:194
+msgid "Whether to show the title of a photo during the slideshow"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:201
+msgid "maximize library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:202
+msgid "True if library application is maximized, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:207
+msgid "width of library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:208
+msgid "The last recorded width of the library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:213
+msgid "height of library window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:214
+msgid "The last recorded height of the library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:219
+msgid "maximize direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:220
+msgid "True if direct-edit application is maximized, false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:225
+msgid "width of direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:226
+msgid "The last recorded width of the direct-edit application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:231
+msgid "height of direct-edit window"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:232
+msgid "The last recorded height of the direct-edit application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:237
+msgid "sidebar divider position"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:238
+msgid ""
+"The last recorded position of the divider between the sidebar and view in "
+"library application window."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:245
+msgid "import directory"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:246
+msgid "Directory in which imported photo files are placed."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:251
+msgid "watch library directory for new files"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:252
+msgid ""
+"If true, files added to the library directory are automatically imported."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:257
+msgid "write metadata to master files"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:258
+msgid ""
+"If true, changes to metadata (tags, titles, etc.) are written to the master "
+"photo file."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:263
+msgid "use lowercase filenames"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:264
+msgid ""
+"If true, Shotwell will convert all filenames to lowercase when importing "
+"photo files"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:269
+msgid "directory pattern"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:270
+msgid ""
+"A string encoding a naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:275
+msgid "directory pattern custom"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:276
+msgid ""
+"A string encoding a custom naming pattern that will be used to name photo "
+"directories on import."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:281
+msgid "RAW developer default"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:282
+msgid "Default option for which RAW developer Shotwell will use."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:289
+msgid "Most-recently-used crop aspect ratio menu choice."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:290
+msgid "A numeric code representing the last crop menu choice the user made."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:294
+msgid "Most-recently-used crop custom aspect ratio’s numerator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:295
+msgid ""
+"A nonzero, positive integer representing the width part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:299
+msgid "Most-recently-used crop custom aspect ratio’s denominator."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:300
+msgid ""
+"A nonzero, positive integer representing the height part of the last custom "
+"crop ratio the user entered."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:307
+msgid "external photo editor"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:308
+msgid "External application used to edit photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:313
+msgid "external raw editor"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:314
+msgid "External application used to edit RAW photos."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:352
+#: misc/org.yorba.shotwell.gschema.xml:353
+msgid "Setting in export dialog: how to trim images"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:358
+msgid "export metadata"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:359
+msgid "Setting in export dialog: option to export metadata"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:364
+msgid "format setting, special value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:365
+msgid "Setting in export dialog: format setting, special value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:370
+msgid "format setting, type value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+msgid "Setting in export dialog: format setting, type value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:376
+msgid "JPEG quality option"
+msgstr ""
+
+#: 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 ""
+
+#: misc/org.yorba.shotwell.gschema.xml:391
+#: misc/org.yorba.shotwell.gschema.xml:397
+msgid ""
+"A numeric code representing the last service to which photos were published"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:396
+msgid "default publishing service"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:410
+msgid "access token"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:411
+msgid "Facebook OAuth token for the currently logged in session, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:416
+msgid "user i.d."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:417
+msgid "Facebook user i.d. for the currently logged in user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:422
+msgid "user name"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:423
+msgid "The name of the currently logged in Facebook user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:428
+#: misc/org.yorba.shotwell.gschema.xml:460
+msgid "default size code"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:429
+msgid ""
+"A numeric code representing the default size for photos published to Facebook"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:435
+msgid ""
+"Whether images being uploaded to Facebook should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:442
+msgid "OAuth Access Phase Token"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:443
+msgid "The authorization token for the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:448
+msgid "OAuth Access Phase Token Secret"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:449
+msgid ""
+"The cryptographic secret used to sign requests against the authorization "
+"token for the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:455
+msgid "The user name of the currently logged in Flickr user, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:461
+msgid ""
+"A numeric code representing the default size for photos published to Flickr"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:466
+msgid "default visibility"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:467
+msgid ""
+"A numeric code representing the default visibility for photos published to "
+"Flickr"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:473
+msgid ""
+"Whether images being uploaded to Flickr should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:480
+#: misc/org.yorba.shotwell.gschema.xml:612
+msgid "refresh token"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:481
+msgid ""
+"The OAuth token used to refresh the Picasa Web Albums session for the "
+"currently logged in user, if any."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:487
+msgid ""
+"A numeric code representing the default size for photos uploaded to Picasa "
+"Web Albums"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:492
+#: misc/org.yorba.shotwell.gschema.xml:586
+msgid "last album"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:493
+#: misc/org.yorba.shotwell.gschema.xml:587
+msgid "The name of the last album the user published photos to, if any"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:499
+msgid ""
+"Whether images being uploaded to Picasa should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:506
+msgid "Piwigo URL"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:507
+msgid "URL of the Piwigo server."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:513
+msgid "Piwigo username, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:518
+msgid "password"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:519
+msgid "Piwigo password, if logged in."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:524
+msgid "remember password"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:525
+msgid "If true, remember the Piwigo password."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:531
+msgid "The last selected Piwigo category."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:536
+msgid "last permission level"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:537
+msgid "The last chosen Piwigo permission level."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:543
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Piwigo."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:549
+msgid ""
+"Whether images being uploaded to Piwigo should have their metadata removed "
+"first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:554
+msgid ""
+"if title is set and comment unset, use title as comment for uploads to Piwigo"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:555
+msgid ""
+"Whether images being uploaded to Piwigo should have their comment set from "
+"the title if title is set and comment unset"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:560
+msgid "do not upload tags when uploading to Piwigo"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:561
+msgid ""
+"Whether images being uploaded to Piwigo should have their tags removed on "
+"upload, such that these tags will not appear on the remote Piwigo server."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:569
+msgid "Gallery3 username"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:574
+msgid "API key"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:575
+msgid "Gallery3 API key"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:580
+msgid "URL"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:581
+msgid "Gallery3 site URL"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:593
+msgid ""
+"Indicates whether images being uploaded to Gallery3 should have their "
+"metadata removed first"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:598
+msgid "scaling constraint of uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:599
+msgid "The scaling constraint ID of the picture to be uploaded"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:604
+msgid "pixels of the major axis uploaded picture"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:605
+msgid ""
+"The pixels of the major axis of the picture to be uploaded; used only if "
+"scaling-constraint-id is an appropriate value"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:613
+msgid ""
+"The OAuth token used to refresh the YouTube session for the currently logged "
+"in user, if any."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:620
+msgid "last used import service"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:621
+msgid ""
+"A numeric code representing the last service from which photos were imported"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:628
+msgid "interpreter state cookie"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:629
+msgid ""
+"A numeric code that captures the state of the GStreamer plug-in environment"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:636
+msgid "content layout mode"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:637
+msgid ""
+"A numeric code that describes how photos are laid out on the page during "
+"printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:642
+msgid "content ppi"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:643
+msgid "The number of pixels per inch (ppi) sent to the printer during printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:648
+msgid "content width"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:649
+msgid "The width of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:654
+msgid "content height"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:655
+msgid "The height of the printed emulsion on the page when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:660
+msgid "content units"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:661
+msgid ""
+"A numeric code representing unit of measure (inches or centimeters) used "
+"when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:666
+msgid "images per page code"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:667
+msgid ""
+"A numeric code representing the currently selected images per page mode used "
+"when printing"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:672
+msgid "size selection"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:673
+msgid ""
+"The index of the current print size in a pre-defined list of standard sizes"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:678
+msgid "match aspect ratio"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:679
+msgid ""
+"Determines whether custom print sizes must match the aspect ratio of the "
+"original photo"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:684
+msgid "print titles"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:685
+msgid ""
+"True if the title of a photo should be printed when the photo is printed, "
+"false otherwise."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:690
+msgid "titles font"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:691
+msgid "The name of the font to use for photo titles when they are printed."
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:702
+msgid "enable facebook publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:703
+msgid "True if the Facebook publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:708
+msgid "enable flickr publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:709
+msgid "True if the Flickr publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:714
+msgid "enable picasa publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:715
+msgid ""
+"True if the Picasa Web Albums publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:720
+msgid "enable youtube publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:721
+msgid "True if the YouTube publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:726
+msgid "enable piwigo publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:727
+msgid "True if the Piwigo publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:732
+msgid "enable yandex publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:733
+msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:738
+msgid "enable tumblr publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:739
+msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:744
+msgid "enable rajce publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:745
+msgid "True if the Rajce publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:750
+msgid "enable gallery3 publishing plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:751
+msgid "True if the Gallery3 publishing plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:756
+msgid "enable F-Spot import plugin"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:757
+msgid "True if the F-Spot import plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:762
+msgid "enable slideshow crumble transition"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:763
+msgid ""
+"True if the Crumble slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:768
+msgid "enable slideshow fade transition"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:769
+msgid ""
+"True if the Fade slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:774
+msgid "enable slideshow slide transition"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:775
+msgid ""
+"True if the Slide slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:780
+msgid "enable slideshow clock transition"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:781
+msgid ""
+"True if the Clock slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:786
+msgid "enable slideshow circle transition"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:787
+msgid ""
+"True if the Circle slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:792
+msgid "enable slideshow circles transition"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:793
+msgid ""
+"True if the Circles slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:798
+msgid "enable slideshow blinds transition"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:799
+msgid ""
+"True if the Blinds slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:804
+msgid "enable slideshow squares transition"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:805
+msgid ""
+"True if the Squares slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:810
+msgid "enable slideshow stripes transition"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:811
+msgid ""
+"True if the Stripes slideshow transition plugin is enabled, false otherwise"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:816
+msgid "enable slideshow chess transition"
+msgstr ""
+
+#: misc/org.yorba.shotwell.gschema.xml:817
+msgid ""
+"True if the Chess-Board slideshow transition plugin is enabled, false "
+"otherwise"
+msgstr ""
+
+#: plugins/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 ""
+
+#: 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 ""
+
+#: 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
+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 ""
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+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:481
+msgid "Verifying authorization…"
+msgstr ""
+
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
+#, fuzzy
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -46,13 +1313,36 @@ msgstr ""
 "Za nastavak objavljivanja u Googlove usluge, ponovno pokrenite Shotwell i "
 "pokušajte ponovno objaviti."
 
-#: ../plugins/common/Resources.vala:9 ../src/AppWindow.vala:688
-msgid "Visit the Yorba web site"
-msgstr "Posjetite web stranice Yorba-e"
+#: 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 ""
 
-# Translator credits string for the about box -- translators, add your name
-# below if it's not already present
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:691
+#: plugins/authenticator/shotwell/ShotwellAuthenticatorFactory.vala:34
+#, fuzzy
+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 ""
+"Trenutno niste prijavljeni na YouTube\n"
+"\n"
+"Za korištenje YouTube usluge morate posjedovati Google korisnički račun koji "
+"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/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
 msgid "translator-credits"
 msgstr ""
 "Krešo Kunjas <deresh@gmail.com>\n"
@@ -66,17 +1356,69 @@ msgstr ""
 "  antisa https://launchpad.net/~antisa\n"
 "  gogo https://launchpad.net/~trebelnik-stefina"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:34
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:30
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:32
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:30
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:32
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:32
-#: ../src/Resources.vala:27
-msgid "Copyright 2009-2014 Yorba Foundation"
-msgstr "Autorko pravo 2009-2014 Yorba Foundation"
+#. 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 ""
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:56
+#. 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
+#, fuzzy
+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"
@@ -89,7 +1431,8 @@ msgstr ""
 "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:58
+#: plugins/shotwell-data-imports/FSpotImporter.vala:60
+#, fuzzy
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
@@ -99,11 +1442,13 @@ msgstr ""
 "\n"
 "Odaberite datoteku F-Spot baze podataka."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+#: 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:62
+#: 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"
@@ -111,7 +1456,8 @@ 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:64
+#: 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"
@@ -119,14 +1465,16 @@ 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:66
+#: 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:68
+#: plugins/shotwell-data-imports/FSpotImporter.vala:70
+#, fuzzy
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading photos "
 "table"
@@ -134,8 +1482,8 @@ msgstr ""
 "Nemoguće pročitati odabranu datoteku F-Spot baze podataka: greška pri "
 "čitanju tablice fotografija"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:70
-#, c-format
+#: 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"
@@ -149,74 +1497,376 @@ msgstr ""
 "Možete zatvoriti ovaj okvir i započeti s korištenjem Shotwell dok se uvoz "
 "obavlja u pozadini."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
-#, c-format
+#: 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:416
+#: 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
+#: 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/TumblrPublishing.vala:35
+#: 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
+msgid "_Log in"
+msgstr ""
+
+#: 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 ""
+
+#: 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"
+
+#: 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/PiwigoPublishing.vala:1306
+#: src/Dimensions.vala:17
+#, fuzzy
+msgid "Original size"
+msgstr "Originalna 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"
+
+#: 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
+#, 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/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"
+"You must have already signed up for a Gallery3 account to complete the login "
+"process."
+msgstr ""
+"Trenutno niste prijavljeni u svoju Galeriju.\n"
+"\n"
+"Morate već biti prijavljeni za Gallery3 račun kako bi završili postupak "
+"prijave."
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:117
+#, fuzzy
+msgid "Shotwell default directory"
+msgstr "Shotwell zadana mapa"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
+#, c-format
+msgid ""
+"\n"
+"\n"
+"The file “%s” may not be supported by or may be too large for this instance "
+"of Gallery3."
+msgstr ""
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:802
+#, fuzzy
+msgid ""
+"\n"
+"Note that Gallery3 only supports the video types that Flowplayer does."
+msgstr ""
+"\n"
+"Zapamtite da Gallery3 samo podržava video snimke koje podržava Flowplayer."
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
+#, c-format
+msgid ""
+"A file required for publishing is unavailable. Publishing to %s can’t "
+"continue."
+msgstr ""
+
+#. populate any widgets whose contents are
+#. programmatically-generated
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1550
+#, fuzzy, 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."
+msgstr ""
+"Upišite URL vaše Gallery3 stranice, korisničko ime i lozinku (ili API ključ) "
+"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."
+msgstr ""
+"Korisničko ime i lozinka ili API ključ su neispravni. Kako bi pokušali "
+"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 "
+"trailing components (e.g., index.php)."
+msgstr ""
+"Izgleda da upisan URL nije glavna mapa Gallery3 primjerka. Pobrinite se da "
+"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 ""
+
+#: 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
+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
+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:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:907
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-msgid "500 x 375 pixels"
-msgstr "500 x 375 piksela"
+#: 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:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:908
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 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 ""
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:106
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 piksela"
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
+msgid "1280 × 853 pixels"
+msgstr ""
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
+#: 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 valjani odgovor na OAuth zahtjev ovjere"
+msgid "“%s” isn’t a valid response to an OAuth authentication request"
+msgstr ""
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:558
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
 msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
 msgstr ""
-"TumblrPublisher: start(): je nemoguće pokrenuti; ovaj izdavač se ne može "
-"ponovno pokrenuti."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+#: 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:587
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+#: 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:617
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+#: 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:636
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
-#, c-format
+#: 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:739
-#, c-format
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
+#, fuzzy, c-format
 msgid ""
 "You are logged into Tumblr as %s.\n"
 "\n"
@@ -224,329 +1874,348 @@ msgstr ""
 "Prijavljeni ste na Tumblr kao %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+#: 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
+#: 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:632
+#: 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/shotwell-publishing-extras.vala:18
-msgid "Shotwell Extra Publishing Services"
-msgstr "Shotwell dodatne usluge objave"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:1
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:1
-#: ../ui/shotwell.glade.h:15
-msgid "label"
-msgstr "label"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:2
-msgid "_Email address"
-msgstr "_Adresa e-pošte"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:3
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:4
-msgid "_Password"
-msgstr "_Lozinka"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade.h:4
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:6
-msgid "Login"
-msgstr "Prijava"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
-msgid "Blogs:"
-msgstr "Blogovi:"
-
-#: ../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 "_Veličina fotografija:"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+#, fuzzy
+msgid "Public"
+msgstr "Javna"
 
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:5
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:2
-msgid "_Logout"
-msgstr "_Odjava"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+#, fuzzy
+msgid "Friends"
+msgstr "Prijatelji"
 
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:6
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/flickr_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:6
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:3
-msgid "_Publish"
-msgstr "O_bjavi"
+#: 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.glade.h:1
+#: 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.glade.h:2
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
+#, fuzzy
 msgid "Access _type:"
-msgstr "Način pristu_pa:"
+msgstr "Način _pristupa:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
+#, fuzzy
 msgid "Disable _comments"
-msgstr "Onemogući komentare"
+msgstr "Onemogući _komentare"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:4
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
+#, fuzzy
 msgid "_Forbid downloading original photo"
-msgstr "Zabrani preuzimanje izvorne fotografije"
+msgstr "_Zabrani preuzimanje izvorne fotografije"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
-msgid "Public"
-msgstr "Javno"
+#: 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-extras/yandex_publish_model.glade.h:8
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:803
-msgid "Friends"
-msgstr "Prijatelji"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
+#, fuzzy
+msgid "Create a _new album named:"
+msgstr "Stvori _novi album naziva:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "Privatno"
+#: 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/FacebookPublishing.vala:56
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:55
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1127
-msgid "Shotwell Connect"
-msgstr "Shotwell Connect"
+#: 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:"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:58
+#: 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
+#, fuzzy
 msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don't yet have a Facebook account, you can create one during the "
-"login process. During login, Shotwell Connect may ask you for permission to "
-"upload photos and publish to your feed. These permissions are required for "
-"Shotwell Connect to function."
+"_Remove location, camera, and other identifying information before uploading"
 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."
+"_Ukloni lokaciju, kameru, i ostale informacije identifikacije prije slanja"
+
+#: 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:79
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
+#, fuzzy
 msgid "Standard (720 pixels)"
 msgstr "Standardno ( 720 piksela )"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:82
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
+#, fuzzy
 msgid "Large (2048 pixels)"
 msgstr "Veliko ( 2048 piksela )"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:299
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:347
-msgid "Creating album..."
-msgstr "Stvaranje albuma..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
+msgid "Creating album…"
+msgstr ""
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:326
+#: 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 ""
-"Datoteka potrebna za objavljivanje je nedostupna. Objava na Facebooku se ne "
-"može nastaviti."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:648
-#, c-format
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
+#, fuzzy, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
 "\n"
 msgstr ""
-"Prijavljeni ste u Facebook kao %s.\n"
+"Prijavljeni ste na Facebook kao %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:649
+#: 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:650
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
-msgid "Upload _size:"
-msgstr "Veličina uploada:"
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:802
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:889
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:858
+#, fuzzy
 msgid "Just me"
 msgstr "Samo meni"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:804
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:885
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1234
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:854
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
+#, fuzzy
 msgid "Everyone"
 msgstr "Svima"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:57
-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 ""
-"Trenutno niste prijavljeni u Flickr.\n"
-"\n"
-"Kliknite na \"Prijava\" kako biste se prijavili u Flickr putem web "
-"preglednika. Morati ćete ovlastiti Shotwell Connect kako biste se povezali "
-"na vaš Flickr račun."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:59
-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 ""
-"Već ste se prijavili i odjavili s Flickr-a tjekom korištenja Shotwella.\n"
-" Za nastavak korištelja Flickr servisa, ponovno pokrenite Shotwell."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:325
-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:836
-#, c-format
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
+#, fuzzy, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
 "\n"
 msgstr ""
-"Prijavljeni ste u Flickr kao %s.\n"
+"Prijavljeni ste na Flickr kao %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:838
+#: 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 %s remaining in your upload quota."
 msgstr ""
-"Vaš Flickr korisnički račun ima mjesečno ograničenje količine fotografija "
-"koje možete poslati.\n"
-" Ovaj mjesec vam je preostalo %d Mb za korištenje."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:840
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
+#, fuzzy
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
-msgstr "Vaš Flickr Pro korisnički račun nema ograničenja."
+msgstr ""
+"Vaš Flickr Pro korisnički račun nema ograničenje mjesečnog slanja podataka."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:845
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
+#, fuzzy
 msgid "Photos _visible to:"
 msgstr "Fotografije _vidljive:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:847
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
+#, fuzzy
 msgid "Videos _visible to:"
 msgstr "Video snimke _vidljive:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:850
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
+#, fuzzy
 msgid "Photos and videos _visible to:"
-msgstr "Fotografije i video snimke _vidljivi:"
+msgstr "Fotografije i video snimke _vidljive:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:886
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
+#, fuzzy
 msgid "Friends & family only"
-msgstr "Samo prijatelji i obitelj."
+msgstr "Samo prijateljima i obitelji"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
+#, fuzzy
 msgid "Family only"
-msgstr "Samo obitelj"
+msgstr "Samo obitelji"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:888
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
+#, fuzzy
 msgid "Friends only"
-msgstr "Samo prijatelji"
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:909
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 piksela"
+msgstr "Samo prijateljima"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:910
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 piksela"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
+msgid "2048 × 1536 pixels"
+msgstr ""
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:911
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1250
-#: ../src/Dimensions.vala:17
-msgid "Original size"
-msgstr "Originalna veličina"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
+msgid "4096 × 3072 pixels"
+msgstr ""
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:54
-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."
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
+#, fuzzy
+msgid "Photo _size preset:"
+msgstr "Predlošci veličina fotografija:"
+
+#. 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 ""
-"Trenutno niste prijavljeni u Picasa web album.\n"
-"\n"
-"Kliknite Prijava kako biste se prijavili u Picasa web albume u vašem web "
-"pregledniku. Morati ćete ovjeriti Shotwell povezivanje na poveznicu u vaš "
-"račun Picasa web albuma."
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:330
+#: 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 ""
-"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:615
-#, c-format
+#: plugins/shotwell-publishing/PicasaPublishing.vala:560
+#, fuzzy, 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:621
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
+#, fuzzy
 msgid "Videos will appear in:"
-msgstr "Video snimke će se vidjeti u:"
-
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:626
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
-msgid "Photos will appear in:"
-msgstr "Fotografije će biti postavljene u:"
+msgstr "Video snimke će se objaviti u:"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:697
-msgid "Small (640 x 480 pixels)"
-msgstr "Mala ( 640 x 480 piksela)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
+msgid "Small (640 × 480 pixels)"
+msgstr ""
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:698
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Srednje (1024 x 768 piksela)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
+msgid "Medium (1024 × 768 pixels)"
+msgstr ""
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:699
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Preporučeno ( 1600 x 1200 piksela )"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr ""
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:700
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 piksela)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr ""
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:701
-#: ../src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:757
+#, fuzzy
 msgid "Original Size"
-msgstr "Orginalna veličina"
+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 ""
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
+msgstr ""
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+msgid "A _new album named"
+msgstr ""
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+msgid "within category"
+msgstr ""
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr ""
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
+msgstr ""
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr ""
+
+#: 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"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
+#, fuzzy
+msgid "_Do no upload tags"
+msgstr "_Ne šalji oznake"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
+#: 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
+msgid "Publish"
+msgstr "Objavi"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-msgid "Creating album %s..."
-msgstr "Stvaranje albuma %s..."
+msgid "Creating album %s…"
+msgstr ""
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:917
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:946
+#, fuzzy
 msgid "An error message occurred when publishing to Piwigo. Please try again."
-msgstr "Nastala je greška prilikom prijave na Piwigo. Pokušajte ponovno.."
+msgstr "Nastala je greška prilikom prijave na Piwigo. Pokušajte ponovno."
 
-#: ../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 ""
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr ""
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:166
+#, fuzzy
+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."
@@ -554,7 +2223,8 @@ msgstr ""
 "Upišite URL vaše Piwigo fototeke kao i korisničko ime i lozinku vašeg Piwigo "
 "računa za tu fototeku."
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:999
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1080
+#, fuzzy
 msgid ""
 "Shotwell cannot contact your Piwigo photo library. Please verify the URL you "
 "entered"
@@ -562,669 +2232,965 @@ msgstr ""
 "Shotwell se ne može povezati na Piwigo fototeku. Provjerite URL koji ste "
 "upisali"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
+#, fuzzy
 msgid "Invalid URL"
 msgstr "Nevažeći URL"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
+#, fuzzy
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Administratori, Obitelj, Prijatelji, Kontakti"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
+#, fuzzy
 msgid "Admins, Family, Friends"
 msgstr "Administratori, prijatelji, obitelj"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
+#, fuzzy
 msgid "Admins, Family"
 msgstr "Administratori, obitelj"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
+#, fuzzy
 msgid "Admins"
 msgstr "Administratori"
 
-#: ../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."
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
 msgstr ""
-"Trenutno niste prijavljeni u YouTube\n"
-"\n"
-"Za korištenje YouTube servisa morate imati Google korisnički račun koji je "
-"podešen za korištenje istog. Za podešavanje računa, prijavite se barem "
-"jednom na YouTube servis sa svojim Google korisničkim računom."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
-"continue."
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
 msgstr ""
-"Datoteka potrebna za objavljivanje je nedostupna. Objava na Youtube se ne "
-"može nastaviti."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
-#, c-format
-msgid "You are logged into YouTube as %s."
-msgstr "Prijavljeni ste u YouTube kao %s."
-
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Video snimke će se prikazati u '%s'"
-
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
-msgid "Public listed"
-msgstr "Javno izlistan"
-
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
-msgid "Public unlisted"
-msgstr "Javno, ali bez izlista"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
-msgid "Publish to an e_xisting album:"
-msgstr "Objavi u _postojeći album:"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
-msgid "Create a _new album named:"
-msgstr "Stvori _novi album"
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr ""
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
-msgid "Videos and new photo albums _visible to:"
-msgstr "Video snimke i novi albumi s fotografijama su vidljivi:"
+#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+#, fuzzy
+msgid "Core Publishing Services"
+msgstr "Jezgra usluge za objavu"
 
-#: ../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 ""
-"_Ukloni lokaciju, kameru, i ostale informacije identifikacije prije slanja"
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+#, fuzzy
+msgid "Video privacy _setting:"
+msgstr "Postavke _privatnosti video snimki:"
 
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
 msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
+"A file required for publishing is unavailable. Publishing to YouTube can’t "
+"continue."
 msgstr ""
-"Unesite potvrdni broj koji se javi nakon što se prijavite u Flickr putem "
-"vašeg web preglednika."
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
-msgid "Authorization _Number:"
-msgstr "_Broj ovlasti:"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
-#: ../src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "_Nastavi"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
-msgid "An _existing album:"
-msgstr "_Postojeći album:"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
-msgid "A _new album named:"
-msgstr "_Novom albumu nazvan:"
 
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
-msgid "L_ist album in public gallery"
-msgstr "Prikaži album u _javnoj galeriji"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
-msgid "Photo _size preset:"
-msgstr "Predodređene veličine fotografija:"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
-msgid "_URL of your Piwigo photo library"
-msgstr "_URL vaše Piwigo fototeke slika"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
-msgid "User _name"
-msgstr "Korisničko _ime"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
-msgid "_Remember Password"
-msgstr "_Zapamti lozinku"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
-msgid "An _existing category:"
-msgstr "_Postojećoj kategoriji:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
-msgid "Photos will be _visible by:"
-msgstr "Fotografije će biti vidljive:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
-msgid "Photo size:"
-msgstr "Veličina fotografije:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
-msgid "within category:"
-msgstr "unutar kategorije:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
-msgid "Album comment:"
-msgstr "Komentar albuma:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
-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"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
-msgid "_Do no upload tags"
-msgstr "_Ne šalji oznake"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
-msgid "Logout"
-msgstr "Odjava"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:270
-msgid "Publish"
-msgstr "Objavi"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
+#, fuzzy, c-format
+msgid "You are logged into YouTube as %s."
+msgstr "Prijavljeni ste u YouTube kao %s."
 
-#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Core servisi za objavu"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
+#, fuzzy
+msgid "Public listed"
+msgstr "Javno dostupan"
 
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
-msgid "Video privacy _setting:"
-msgstr "Postavke _privatnosti video snimki:"
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
+#, fuzzy
+msgid "Public unlisted"
+msgstr "Javno, ali nedostupan"
 
-#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+#: plugins/shotwell-transitions/BlindsEffect.vala:20
+#, fuzzy
 msgid "Blinds"
 msgstr "Zastor"
 
-#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+#: plugins/shotwell-transitions/ChessEffect.vala:20
+#, fuzzy
 msgid "Chess"
 msgstr "Šah"
 
-#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+#: plugins/shotwell-transitions/CircleEffect.vala:20
+#, fuzzy
 msgid "Circle"
 msgstr "Krug"
 
-#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+#: plugins/shotwell-transitions/CirclesEffect.vala:20
+#, fuzzy
 msgid "Circles"
 msgstr "Krugovi"
 
-#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+#: plugins/shotwell-transitions/ClockEffect.vala:20
+#, fuzzy
 msgid "Clock"
 msgstr "Sat"
 
-#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+#: plugins/shotwell-transitions/CrumbleEffect.vala:20
+#, fuzzy
 msgid "Crumble"
 msgstr "Raspadanje"
 
-#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+#: plugins/shotwell-transitions/FadeEffect.vala:20
+#, fuzzy
 msgid "Fade"
 msgstr "Izblijedi"
 
-#: ../plugins/shotwell-transitions/SlideEffect.vala:20
+#: plugins/shotwell-transitions/shotwell-transitions.vala:28
+#, fuzzy
+msgid "Core Slideshow Transitions"
+msgstr "Jezgra prezentacijskog prijelaza"
+
+#: plugins/shotwell-transitions/shotwell-transitions.vala:76
+msgid ""
+"Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
+"Inc."
+msgstr ""
+
+#: plugins/shotwell-transitions/SlideEffect.vala:20
+#, fuzzy
 msgid "Slide"
 msgstr "Prezentacija"
 
-#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
+#: plugins/shotwell-transitions/SquaresEffect.vala:20
+#, fuzzy
 msgid "Squares"
 msgstr "Kvadrati"
 
-#: ../plugins/shotwell-transitions/StripesEffect.vala:20
+#: plugins/shotwell-transitions/StripesEffect.vala:20
+#, fuzzy
 msgid "Stripes"
 msgstr "Trake"
 
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
-msgid "Core Slideshow Transitions"
-msgstr "Jezgra prezentacijskog prijelaza"
-
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
-msgid "Copyright 2010 Maxim Kartashev, Copyright 2011-2014 Yorba Foundation"
-msgstr ""
-"Autorsko pravo 2010 Maxim Kartashev, autorsko pravo 2011-2014 Yorba fondacija"
-
-#: ../misc/shotwell.application.in.h:1
-msgid "Publish your pictures to Picasa"
-msgstr "Objavite svoje slike na Picasi"
-
-#: ../misc/shotwell.application.in.h:2
-msgid "Publish your pictures to Facebook"
-msgstr "Objavite svoje slike na Facebooku"
-
-#: ../misc/shotwell.application.in.h:3
-msgid "Publish your pictures to Flickr"
-msgstr "Objavite svoje slike na Flickru"
-
-#: ../src/AppDirs.vala:48 ../src/AppDirs.vala:99
-#, c-format
+#: src/AppDirs.vala:64 src/AppDirs.vala:115
+#, fuzzy, c-format
 msgid "Unable to create cache directory %s: %s"
-msgstr "Nemoguće čitanje direktorija predmemorije %s: %s"
+msgstr "Nemoguće čitanje mape predmemorije %s: %s"
 
-#: ../src/AppDirs.vala:58 ../src/AppDirs.vala:88
-#, c-format
+#: src/AppDirs.vala:74 src/AppDirs.vala:104
+#, fuzzy, c-format
 msgid "Unable to create data directory %s: %s"
-msgstr "Nije moguće stvoriti direktorij podataka %s: %s"
+msgstr "Nemoguće stvaranje mape podataka %s: %s"
 
 #. If XDG yarfed, use ~/Pictures
-#: ../src/AppDirs.vala:152
+#: src/AppDirs.vala:168
+#, fuzzy
 msgid "Pictures"
 msgstr "Fotografije"
 
-#: ../src/AppDirs.vala:190
-#, c-format
+#: src/AppDirs.vala:206
+#, fuzzy, c-format
 msgid "Unable to create temporary directory %s: %s"
-msgstr "Nije moguće stvoriti privremeni direktorij %s: %s"
+msgstr "Nemoguće stvaranje privremene mape %s: %s"
 
-#: ../src/AppDirs.vala:207 ../src/AppDirs.vala:223
-#, c-format
+#: src/AppDirs.vala:223 src/AppDirs.vala:254
+#, fuzzy, c-format
 msgid "Unable to create data subdirectory %s: %s"
-msgstr "Nije moguće stvoriti poddirektorij podataka %s: %s"
+msgstr "Nemoguće stvaranje podmape podataka %s: %s"
+
+#: src/AppDirs.vala:236
+#, fuzzy, c-format
+msgid "Could not make directory %s writable"
+msgstr "Nemoguće postaviti mapu %s kao zapisivu"
+
+#: src/AppDirs.vala:239
+#, fuzzy, c-format
+msgid "Could not make directory %s writable: %s"
+msgstr "Nemoguće postaviti mapu %s kao zapisivu: %s"
 
-#. restore pin state
-#: ../src/AppWindow.vala:52
+#: src/AppWindow.vala:47
+#, fuzzy
 msgid "Pin Toolbar"
 msgstr "Prikvaći traku sa alatima"
 
-#: ../src/AppWindow.vala:53
+#: src/AppWindow.vala:48
+#, fuzzy
 msgid "Pin the toolbar open"
-msgstr "Otkvaći traku s  alatima"
+msgstr "Otkvaći traku sa alatima"
 
-#: ../src/AppWindow.vala:57 ../src/AppWindow.vala:135
+#: src/AppWindow.vala:53
+#, fuzzy
 msgid "Leave fullscreen"
 msgstr "Napusti cjelozaslonski prikaz"
 
-#: ../src/AppWindow.vala:134
-msgid "Leave _Fullscreen"
-msgstr "Napusti _cjelozaslonski prikaz"
-
-#: ../src/AppWindow.vala:496
-msgid "_Quit"
-msgstr "_Izlaz"
-
-#: ../src/AppWindow.vala:501
-msgid "_About"
-msgstr "_O programu"
-
-#: ../src/AppWindow.vala:506
-msgid "Fulls_creen"
-msgstr "Cjelozaslonski prikaz"
-
-#: ../src/AppWindow.vala:511
-msgid "_Contents"
-msgstr "_Priručnik"
-
-#: ../src/AppWindow.vala:516
-msgid "_Frequently Asked Questions"
-msgstr "_Često postavljana pitanja"
-
-#: ../src/AppWindow.vala:521
-msgid "_Report a Problem..."
-msgstr "_Prijavi problem..."
-
-#: ../src/AppWindow.vala:620 ../src/AppWindow.vala:641
-#: ../src/AppWindow.vala:658 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1361 ../src/Dialogs.vala:1384
-#: ../src/data_imports/DataImportsUI.vala:399
-#: ../src/publishing/PublishingUI.vala:561
+#: 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
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../src/AppWindow.vala:668
+#: 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 ""
-"Greška kod pristupanja Shotwell fototeke. Shotwell ne može nastaviti s "
-"radom.\n"
-"\n"
-"%s"
 
-#: ../src/AppWindow.vala:700
-#, c-format
+#: src/AppWindow.vala:599
+msgid "Visit the Shotwell web site"
+msgstr ""
+
+#: src/AppWindow.vala:611
+#, fuzzy, c-format
 msgid "Unable to display help: %s"
-msgstr "Ne mogu prikazati pomoć: %s"
+msgstr "Nemoguć prikaz pomoći: %s"
 
-#: ../src/AppWindow.vala:708
-#, c-format
+#: src/AppWindow.vala:619
+#, fuzzy, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Nemoguće upravljanje bazom podataka greške: %s"
 
-#: ../src/AppWindow.vala:716
-#, c-format
+#: src/AppWindow.vala:627
+#, fuzzy, c-format
 msgid "Unable to display FAQ: %s"
-msgstr "Ne mogu prikazati često postavljana pitanja: %s"
+msgstr "Nemoguć prikaz često postavljanih pitanja: %s"
 
-#: ../src/BatchImport.vala:26
+#: src/BatchImport.vala:26
+#, fuzzy
 msgid "Success"
 msgstr "Uspješno"
 
-#: ../src/BatchImport.vala:29
+#: src/BatchImport.vala:29
+#, fuzzy
 msgid "File error"
 msgstr "Greška datoteke"
 
-#: ../src/BatchImport.vala:32
+#: src/BatchImport.vala:32
+#, fuzzy
 msgid "Unable to decode file"
-msgstr "Ne mogu prepoznati datoteku"
+msgstr "Nemoguće dekôdiranje datoteke"
 
-#: ../src/BatchImport.vala:35
+#: src/BatchImport.vala:35
+#, fuzzy
 msgid "Database error"
-msgstr "Greška na bazi podataka"
+msgstr "Greška baze podataka"
 
-#: ../src/BatchImport.vala:38
+#: src/BatchImport.vala:38
+#, fuzzy
 msgid "User aborted import"
 msgstr "Prekinut uvoz od strane korisnika"
 
-#: ../src/BatchImport.vala:41
+#: src/BatchImport.vala:41
+#, fuzzy
 msgid "Not a file"
 msgstr "Nije datoteka"
 
-#: ../src/BatchImport.vala:44
+#: src/BatchImport.vala:44
+#, fuzzy
 msgid "File already exists in database"
 msgstr "Datoteka već postoji u bazi podataka"
 
-#: ../src/BatchImport.vala:47
+#: src/BatchImport.vala:47
+#, fuzzy
 msgid "Unsupported file format"
-msgstr "nepodržana vrsta datoteke"
+msgstr "Nepodržani format datoteke"
 
-#: ../src/BatchImport.vala:50
+#: src/BatchImport.vala:50
+#, fuzzy
 msgid "Not an image file"
-msgstr "Nije fotografija"
+msgstr "Nije datoteka fotografije"
 
-#: ../src/BatchImport.vala:53
+#: src/BatchImport.vala:53
+#, fuzzy
 msgid "Disk failure"
-msgstr "Greška na disku"
+msgstr "Greška diska"
 
-#: ../src/BatchImport.vala:56
+#: src/BatchImport.vala:56
+#, fuzzy
 msgid "Disk full"
-msgstr "Disk pun"
+msgstr "Disk je pun"
 
-#: ../src/BatchImport.vala:59
+#: src/BatchImport.vala:59
+#, fuzzy
 msgid "Camera error"
-msgstr "Greška na kameri"
+msgstr "Greška kamere"
 
-#: ../src/BatchImport.vala:62
+#: src/BatchImport.vala:62
+#, fuzzy
 msgid "File write error"
-msgstr "Greška kod zapisivanja"
+msgstr "Greška pri zapisivanju"
 
-#: ../src/BatchImport.vala:65
+#: src/BatchImport.vala:65
+#, fuzzy
 msgid "Corrupt image file"
-msgstr "Oštećena datoteka slika"
+msgstr "Oštećena datoteka slike"
 
-#: ../src/BatchImport.vala:68
-#, c-format
+#: src/BatchImport.vala:68
+#, fuzzy, c-format
 msgid "Imported failed (%d)"
-msgstr "%d neuspijelih uvoza."
+msgstr "Neuspješni uvoz (%d)."
+
+#: src/camera/Branch.vala:85
+#, fuzzy
+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
+msgid "Camera"
+msgstr "Kamera"
+
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
+#, fuzzy
+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 ""
+
+#. hide duplicates checkbox
+#: src/camera/ImportPage.vala:783
+#, fuzzy
+msgid "Hide photos already imported"
+msgstr "Sakrij fotografije koje su već uvezene."
+
+#: src/camera/ImportPage.vala:784
+#, fuzzy
+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
+msgid "Import _Selected"
+msgstr "Uvezi _odabrane"
+
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+#, fuzzy
+msgid "Import _All"
+msgstr "Uvezi _sve"
+
+#: 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 ""
+
+#. 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 ""
+
+#: src/camera/ImportPage.vala:1027
+#, fuzzy
+msgid "_Unmount"
+msgstr "_Odmontiraj"
+
+#: src/camera/ImportPage.vala:1032
+#, fuzzy
+msgid "Please unmount the camera."
+msgstr "Odmontirajte kameru."
+
+#: src/camera/ImportPage.vala:1037
+msgid ""
+"The camera is locked by another application. Shotwell can only access the "
+"camera when it’s unlocked. Please close any other application using the "
+"camera and try again."
+msgstr ""
+
+#: src/camera/ImportPage.vala:1047
+#, fuzzy
+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
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"Nemoguće preuzeti predpregled s kamere: \n"
+" %s"
+
+#: src/camera/ImportPage.vala:1069
+msgid "Unmounting…"
+msgstr ""
+
+#: src/camera/ImportPage.vala:1160
+msgid "Starting import, please wait…"
+msgstr ""
+
+#: src/camera/ImportPage.vala:1177
+#, fuzzy
+msgid "Fetching photo information"
+msgstr "Preuzimanje informacija fotografija"
+
+#: src/camera/ImportPage.vala:1535
+#, fuzzy, c-format
+msgid "Fetching preview for %s"
+msgstr "Preuzimanje predpregleda za %s"
+
+#: src/camera/ImportPage.vala:1651
+#, fuzzy, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Nemoguće zaključavanje kamere: %s"
+
+#: src/camera/ImportPage.vala:1736
+#, c-format
+msgid "Delete this photo from camera?"
+msgid_plural "Delete these %d photos from camera?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/camera/ImportPage.vala:1739
+#, c-format
+msgid "Delete this video from camera?"
+msgid_plural "Delete these %d videos from camera?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2627
+#: src/camera/ImportPage.vala:1742
+#, c-format
+msgid "Delete this photo/video from camera?"
+msgid_plural "Delete these %d photos/videos from camera?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/camera/ImportPage.vala:1745
+#, c-format
+msgid "Delete these files from camera?"
+msgid_plural "Delete these %d files from camera?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
+#, fuzzy
+msgid "_Keep"
+msgstr "_Zadrži"
+
+#: src/camera/ImportPage.vala:1772
+#, fuzzy
+msgid "Removing photos/videos from camera"
+msgstr "Uklanjanje fotografija/video snimaka s kamere"
+
+#: src/camera/ImportPage.vala:1776
+#, c-format
+msgid "Unable to delete %d photo/video from the camera due to errors."
+msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:170
+#, fuzzy
+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
+msgid "Send _To…"
+msgstr ""
+
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:220
+#, fuzzy
+msgid "Set as _Desktop Background"
+msgstr "Postavi kao pozadinu _radne površine"
+
+#: src/CollectionPage.vala:92 src/Resources.vala:286
+#, fuzzy
+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 "Prezentacija"
+msgstr "P_rezentacija"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2628
-msgid "Play a slideshow"
-msgstr "Pokreni prezentaciju"
+#: src/CollectionPage.vala:110 src/Resources.vala:139 ui/direct.ui:111
+#: ui/photo.ui:200
+#, fuzzy
+msgid "Rotate _Right"
+msgstr "Zakreni _desno"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:113 src/Resources.vala:144 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
+#: ui/photo.ui:210
+#, fuzzy
+msgid "Flip Hori_zontally"
+msgstr "Okreni _vodoravno"
+
+#: src/CollectionPage.vala:117 src/Resources.vala:152 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
+#: 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
+#: 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
+msgid "_Copy Color Adjustments"
+msgstr "_Kopiraj prilagodbe boje"
+
+#: src/CollectionPage.vala:125 src/Resources.vala:194 ui/photo.ui:261
+#, fuzzy
+msgid "_Paste Color Adjustments"
+msgstr "_Zalijepi prilagodbe boje"
+
+#: src/CollectionPage.vala:135
+msgid "Adjust Date and Time…"
+msgstr ""
+
+#: src/CollectionPage.vala:143 src/Resources.vala:319
+#, fuzzy
+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
+msgid "Open With RA_W Editor"
+msgstr "Otvori s _RAW uređivačem"
+
+#: src/CollectionPage.vala:149 src/Resources.vala:167
+#, fuzzy
+msgid "_Play"
+msgstr "_Reproduciraj"
+
+#: src/CollectionPage.vala:415
+#, fuzzy
 msgid "Export Photo/Video"
-msgstr "Izvoz fotografije/video snimke"
+msgstr "Izvezi fotografiju/video snimku"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:415
+#, fuzzy
 msgid "Export Photos/Videos"
-msgstr "Izvoz slika/video snimke"
+msgstr "Izvezi fotografije/video snimke"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3200
+#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
+#, fuzzy
 msgid "Export Photo"
-msgstr "Izvoz fotografija"
+msgstr "Izvezi fotografiju"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+#: src/CollectionPage.vala:417 src/Dialogs.vala:84
+#, fuzzy
 msgid "Export Photos"
-msgstr "Izvoz fotografija"
+msgstr "Izvezi fotografije"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#, fuzzy
 msgid "Rotating"
 msgstr "Zakretanje"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
+#, fuzzy
 msgid "Undoing Rotate"
 msgstr "Prekidam zakretanje"
 
-#: ../src/CollectionPage.vala:570
+#: src/CollectionPage.vala:529
+#, fuzzy
 msgid "Flipping Horizontally"
-msgstr "Okreni horizontalno"
+msgstr "Okreni vodoravno"
 
-#: ../src/CollectionPage.vala:571
+#: src/CollectionPage.vala:530
+#, fuzzy
 msgid "Undoing Flip Horizontally"
-msgstr "Prekidam preokretanje"
+msgstr "Poništi vodoravno okretanje"
 
-#: ../src/CollectionPage.vala:580
+#: src/CollectionPage.vala:539
+#, fuzzy
 msgid "Flipping Vertically"
-msgstr "Okreni vertikalno"
+msgstr "Okreni okomito"
 
-#: ../src/CollectionPage.vala:581
+#: src/CollectionPage.vala:540
+#, fuzzy
 msgid "Undoing Flip Vertically"
-msgstr "Prekidam preokretanje"
+msgstr "Poništi okomito okretanje"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
+#, fuzzy
 msgid "Reverting"
 msgstr "Vraćam promjene"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
+#, fuzzy
 msgid "Undoing Revert"
-msgstr "Prekidam vraćanje promjena"
+msgstr "Poništi vraćanje promjena"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
+#, fuzzy
 msgid "Enhancing"
 msgstr "Poboljšanje"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
+#, fuzzy
 msgid "Undoing Enhance"
-msgstr "Prekidam poboljšavanje"
+msgstr "Poništavanje poboljšavanja"
 
-#: ../src/Commands.vala:845
+#: src/Commands.vala:857
+#, fuzzy
 msgid "Applying Color Transformations"
 msgstr "Primjenjivanje transformacija boje"
 
-#: ../src/Commands.vala:845
+#: src/Commands.vala:857
+#, fuzzy
 msgid "Undoing Color Transformations"
 msgstr "Poništavanje transformacija boje"
 
-#: ../src/Commands.vala:995
+#: src/Commands.vala:1007
+#, fuzzy
 msgid "Creating New Event"
 msgstr "Stvaranje novog događaja"
 
-#: ../src/Commands.vala:996
+#: src/Commands.vala:1008
+#, fuzzy
 msgid "Removing Event"
 msgstr "Uklanjanje događaja"
 
-#: ../src/Commands.vala:1005
+#: src/Commands.vala:1017
+#, fuzzy
 msgid "Moving Photos to New Event"
 msgstr "Premještanje fotografija u novi događaj"
 
-#: ../src/Commands.vala:1006
+#: src/Commands.vala:1018
+#, fuzzy
 msgid "Setting Photos to Previous Event"
 msgstr "Postavljanje fotografija u prijašnji događaj"
 
-#: ../src/Commands.vala:1063
+#: src/Commands.vala:1075
+#, fuzzy
 msgid "Merging"
 msgstr "Spajanje"
 
-#: ../src/Commands.vala:1064
+#: src/Commands.vala:1076
+#, fuzzy
 msgid "Unmerging"
 msgstr "Razdvajanje"
 
-#: ../src/Commands.vala:1073
+#: src/Commands.vala:1085
+#, fuzzy
 msgid "Duplicating photos"
 msgstr "Dupliciranje fotografija"
 
-#: ../src/Commands.vala:1073
+#: src/Commands.vala:1085
+#, fuzzy
 msgid "Removing duplicated photos"
 msgstr "Uklanjanje duplikata fotografija"
 
-#: ../src/Commands.vala:1096
+#: 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] "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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Commands.vala:1183
+#: src/Commands.vala:1195
+#, fuzzy
 msgid "Restoring previous rating"
-msgstr "Vraćanje na prijašnje vrijednosti"
+msgstr "Vraćanje prijašnje ocjene"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: src/Commands.vala:1205 src/Commands.vala:1206
+#, fuzzy
 msgid "Increasing ratings"
-msgstr "Povećavanje ocijena"
+msgstr "Povećanje ocjena"
 
-#: ../src/Commands.vala:1193 ../src/Commands.vala:1194
+#: src/Commands.vala:1205 src/Commands.vala:1206
+#, fuzzy
 msgid "Decreasing ratings"
-msgstr "Smanjujem ocijenu"
+msgstr "Smanjenje ocjena"
 
-#: ../src/Commands.vala:1244
+#: src/Commands.vala:1256
+#, fuzzy
 msgid "Setting RAW developer"
 msgstr "Postavljanje RAW razvijatelja"
 
-#: ../src/Commands.vala:1244
+#: src/Commands.vala:1256
+#, fuzzy
 msgid "Restoring previous RAW developer"
-msgstr "Obnavaljanje prijašnjeg RAW razvijatelja"
+msgstr "Vraćanje prijašnjeg RAW razvijatelja"
 
-#: ../src/Commands.vala:1245
+#: src/Commands.vala:1257
+#, fuzzy
 msgid "Set Developer"
 msgstr "Postavi razvijatelja"
 
-#: ../src/Commands.vala:1335
+#: src/Commands.vala:1347
+#, fuzzy
 msgid "Original photo could not be adjusted."
-msgstr "Orginalna fotografija se ne može podesiti"
+msgstr "Izvorna fotografija se ne može prilagoditi"
 
-#: ../src/Commands.vala:1356
+#: src/Commands.vala:1368
+#, fuzzy
 msgid "Adjusting Date and Time"
 msgstr "Podešavanje vremena i datuma"
 
-#: ../src/Commands.vala:1356
+#: src/Commands.vala:1368
+#, fuzzy
 msgid "Undoing Date and Time Adjustment"
-msgstr "Prekid podešavanja datuma i vremena"
+msgstr "Poništavanje podešavanje datuma i vremena"
 
-#: ../src/Commands.vala:1387
+#: src/Commands.vala:1399
 msgid "One original photo could not be adjusted."
 msgid_plural "The following original photos could not be adjusted."
-msgstr[0] "Orginalna fotografija se ne može podesiti"
-msgstr[1] "Orginalne fotografije se ne može podesiti"
-msgstr[2] "Orginalne fotografije se ne može podesiti"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Commands.vala:1389 ../src/Commands.vala:1413
+#: src/Commands.vala:1401 src/Commands.vala:1425
+#, fuzzy
 msgid "Time Adjustment Error"
-msgstr "Greška kod podešavanja vremena"
+msgstr "Greška podešavanje vremena"
 
-#: ../src/Commands.vala:1411
+#: 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] ""
-"Podešavanje vremena se ne može vratiti natrag na sljedećoj fotografiji."
 msgstr[1] ""
-"Podešavanje vremena se ne može vratiti natrag na sljedećim fotografijama."
 msgstr[2] ""
-"Podešavanje vremena se ne može vratiti natrag na sljedećim fotografijama."
 
-#: ../src/Commands.vala:1625 ../src/Commands.vala:1648
+#: src/Commands.vala:1637 src/Commands.vala:1660
+#, fuzzy
 msgid "Create Tag"
 msgstr "Stvori oznaku"
 
-#: ../src/Commands.vala:1683
+#: src/Commands.vala:1695
 #, c-format
-msgid "Move Tag \"%s\""
-msgstr "Premjesti oznaku \"%s\""
+msgid "Move Tag “%s”"
+msgstr ""
 
-#: ../src/Commands.vala:2335
+#: src/Commands.vala:2347
+#, fuzzy
 msgid "Move Photos to Trash"
 msgstr "Premjesti fotografije u smeće"
 
-#: ../src/Commands.vala:2335
+#: src/Commands.vala:2347
+#, fuzzy
 msgid "Restore Photos from Trash"
 msgstr "Vrati fotografije iz smeća"
 
-#: ../src/Commands.vala:2336
+#: src/Commands.vala:2348
+#, fuzzy
 msgid "Move the photos to the Shotwell trash"
 msgstr "Premjesti fotografije u Shotwell smeće"
 
-#: ../src/Commands.vala:2336
+#: src/Commands.vala:2348
+#, fuzzy
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Vrati fotografije natrag u Shotwell fototeku"
 
-#: ../src/Commands.vala:2355
+#: src/Commands.vala:2367
+#, fuzzy
 msgid "Moving Photos to Trash"
 msgstr "Premještanje fotografija u smeće"
 
-#: ../src/Commands.vala:2355
+#: src/Commands.vala:2367
+#, fuzzy
 msgid "Restoring Photos From Trash"
 msgstr "Vraćanje fotografija iz smeća"
 
-#: ../src/Commands.vala:2441
+#: src/Commands.vala:2453
+#, fuzzy
 msgid "Flag selected photos"
 msgstr "Označi odabrane fotografije"
 
-#: ../src/Commands.vala:2442
+#: src/Commands.vala:2454
+#, fuzzy
 msgid "Unflag selected photos"
-msgstr "Odznači odabrane fotografije"
+msgstr "Ukloni oznaku odabrane fotografije"
 
-#: ../src/Commands.vala:2443
+#: src/Commands.vala:2455
+#, fuzzy
 msgid "Flagging selected photos"
 msgstr "Označavanje odabrane fotografije"
 
-#: ../src/Commands.vala:2444
+#: src/Commands.vala:2456
+#, fuzzy
 msgid "Unflagging selected photos"
-msgstr "Odznačavanje odabrane fotografije"
+msgstr "Uklanjanje oznake odabrane fotografije"
 
-#: ../src/Commands.vala:2451
+#: src/Commands.vala:2463
+#, fuzzy
 msgid "Flag"
 msgstr "Označi"
 
-#: ../src/Commands.vala:2451
+#: src/Commands.vala:2463
+#, fuzzy
 msgid "Unflag"
-msgstr "Odznači"
+msgstr "Ukloni oznaku"
 
-#: ../src/DesktopIntegration.vala:118
+#. 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
+msgid "%s Database"
+msgstr "%s baza podataka"
+
+#: 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 ""
+
+#: src/data_imports/DataImportsPluginHost.vala:151
+#, fuzzy
+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"
+"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 ""
+"Nemate omogućen nijedan priključak za uvoz podataka.\n"
+"\n"
+"Kako bi mogli koristiti uvoz iz aplikacija, morate imati omogućen barem "
+"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
+msgid "_Import"
+msgstr "_Uvoz"
+
+#: src/data_imports/DataImportsUI.vala:220
+#, fuzzy
+msgid "Import From Application"
+msgstr "Uvezi iz aplikacije"
+
+#: src/data_imports/DataImportsUI.vala:221
+#, fuzzy
+msgid "Import media _from:"
+msgstr "Uvezi medije _iz:"
+
+#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+#, fuzzy
+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
+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"
+
+#: src/db/DatabaseTable.vala:46
+#, fuzzy, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"Nemoguće pisati u datoteku baze podataka slike:\n"
+" %s"
+
+#: src/db/DatabaseTable.vala:48
+#, fuzzy, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"Greška u pristupanju datoteke baze podataka:\n"
+" %s\n"
+"\n"
+"Greška je: \n"
+"%s"
+
+#: src/db/DatabaseTable.vala:92
+#, c-format
+msgid "Unable to restore photo database %s"
+msgstr ""
+
+#: src/DesktopIntegration.vala:121
+#, fuzzy, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
-msgstr "Ne mogu pokrenuti Nautilus Pošalji: %s"
+msgstr "Nemoguće pokretanje Nautilusovog Pošalji-u: %s"
 
-#: ../src/DesktopIntegration.vala:126
+#: src/DesktopIntegration.vala:129
+#, fuzzy
 msgid "Send To"
-msgstr "Pošalji"
+msgstr "Pošalji u"
 
-#: ../src/DesktopIntegration.vala:171
-#, c-format
+#: src/DesktopIntegration.vala:174
+#, fuzzy, c-format
 msgid "Unable to export background to %s: %s"
-msgstr "Ne mogu izvesti pozadinu  u %s: %s"
+msgstr "Nemoguć izvoz pozadine  u %s: %s"
 
-#: ../src/DesktopIntegration.vala:299
-#, c-format
+#: src/DesktopIntegration.vala:311
+#, fuzzy, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Nemoguće pripremanje prezentacije na radnoj površini: %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] "Ovo će ukloniti oznaku \"%s\" s %d fotografije. Nastavi?"
-msgstr[1] "Ovo će ukloniti oznaku \"%s\" s %d fotografije. Nastavi?"
-msgstr[2] "Ovo će ukloniti oznaku \"%s\" s %d fotografija. Nastavi?"
-
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1329
-#: ../src/Resources.vala:330 ../src/Resources.vala:378
-#: ../src/Resources.vala:643
+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] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
+#, fuzzy
 msgid "_Delete"
-msgstr "Obriši"
+msgstr "_Obriši"
 
-#: ../src/Dialogs.vala:25
+#: src/Dialogs.vala:25
 #, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
-msgstr "Ovo će ukloniti spremljeno pretraživanje %s. Nastavi?"
+msgid "This will remove the saved search “%s”. Continue?"
+msgstr ""
 
-#: ../src/Dialogs.vala:35
+#: src/Dialogs.vala:36
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -1232,20 +3198,16 @@ 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 učinili na ovoj "
-"fotografiji u Shotwellu"
 msgstr[1] ""
-"Zamjena razvijatelja će poništiti sve promjene koje ste učinili na ovim "
-"fotografijama u Shotwellu"
 msgstr[2] ""
-"Zamjena razvijatelja će poništiti sve promjene koje ste učinili na ovim "
-"fotografijama u Shotwellu"
 
-#: ../src/Dialogs.vala:39
+#: src/Dialogs.vala:40
+#, fuzzy
 msgid "_Switch Developer"
 msgstr "_Zamijeni razvijatelja"
 
-#: ../src/Dialogs.vala:58
+#: src/Dialogs.vala:59
+#, fuzzy
 msgid "Export Video"
 msgstr "Izvoz video snimke"
 
@@ -1254,24 +3216,24 @@ msgstr "Izvoz video snimke"
 #. 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 nije mogao stvoriti datoteku za uređivanje ove fotografije jer "
-"nemate dozvole za pisanje u %s."
 
-#: ../src/Dialogs.vala:124
+#: src/Dialogs.vala:121
+#, fuzzy
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
 msgstr ""
-"Ne mogu izvesti fotografiju zbog greške na datoteci.\n"
+"Nemoguć izvoz fotografije zbog greške na datoteci.\n"
 "\n"
 
-#: ../src/Dialogs.vala:130
+#: src/Dialogs.vala:127
+#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -1284,211 +3246,208 @@ 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
+#, fuzzy
 msgid "Unmodified"
-msgstr "Nepromjenjeno"
+msgstr "Nepromijenjeni"
 
-#: ../src/Dialogs.vala:148
+#: src/Dialogs.vala:145
+#, fuzzy
 msgid "Current"
 msgstr "Trenutni"
 
 #. layout controls
-#: ../src/Dialogs.vala:212
+#: src/Dialogs.vala:221
+#, fuzzy
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../src/Dialogs.vala:215
+#: src/Dialogs.vala:224
+#, fuzzy
 msgid "_Quality:"
 msgstr "_Kvaliteta:"
 
-#: ../src/Dialogs.vala:218
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
-msgstr "Ograničenje promjene veličine:"
+msgstr ""
 
-#: ../src/Dialogs.vala:221
-msgid " _pixels"
-msgstr " _piksela"
+#: src/Dialogs.vala:230
+#, fuzzy
+msgid "_Pixels:"
+msgstr "_Piksela:"
 
-#: ../src/Dialogs.vala:229
-msgid "Export metadata"
-msgstr "Izvezi metapodatke"
+#: src/Dialogs.vala:234
+msgid "Export _metadata:"
+msgstr ""
 
-#: ../src/Dialogs.vala:465
-msgid "Save Details..."
-msgstr "Spremi pojedinosti..."
+#: src/Dialogs.vala:478
+msgid "Save Details…"
+msgstr ""
 
-#: ../src/Dialogs.vala:466
+#: src/Dialogs.vala:479
+#, fuzzy
 msgid "Save Details"
 msgstr "Spremi pojedinosti"
 
-#: ../src/Dialogs.vala:481
-#, c-format
+#: src/Dialogs.vala:494
+#, fuzzy, c-format
 msgid "(and %d more)\n"
-msgstr "Još %d.\n"
+msgstr "(i još %d).\n"
 
-#: ../src/Dialogs.vala:534
+#: src/Dialogs.vala:547
+#, fuzzy
 msgid "Import Results Report"
 msgstr "Uvezi izvještaj rezultata"
 
-#: ../src/Dialogs.vala:538
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
-msgstr[0] "Pokušaj uvoza %d datoteke."
-msgstr[1] "Pokušaj uvoza %d datoteke."
-msgstr[2] "Pokušaj uvoza %d datoteka."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:541
+#: src/Dialogs.vala:554
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
-msgstr[0] "Od toga, %d datoteka je uspješno uvezena."
-msgstr[1] "Od toga, %d datoteke su uspješno uvezene."
-msgstr[2] "Od toga, %d datoteka je uspješno uvezeno."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:553
+#: src/Dialogs.vala:566
+#, fuzzy
 msgid "Duplicate Photos/Videos Not Imported:"
-msgstr "Duplikat fotografija/video snimka nije uvezen:"
+msgstr "Duplikati fotografija/video snimka nisu uvezeni:"
 
-#: ../src/Dialogs.vala:557
+#: src/Dialogs.vala:570
+#, fuzzy
 msgid "duplicates existing media item"
 msgstr "napravi duplikat postojeće medijske stavke"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:568
+#: src/Dialogs.vala:581
+#, fuzzy
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
-msgstr "Fotografije/Video snimke nisu uvezeni zbog greške na kameri:"
+msgstr "Fotografije/Video snimke nisu uvezene zbog greške na kameri:"
 
-#: ../src/Dialogs.vala:571 ../src/Dialogs.vala:586 ../src/Dialogs.vala:601
-#: ../src/Dialogs.vala:617 ../src/Dialogs.vala:632 ../src/Dialogs.vala:646
+#: 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
 msgid "error message:"
 msgstr "poruka greške:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:582
-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 ""
-"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:597
+#: 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 ""
-"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:612
+#: 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 ""
-"Fotografije/Video snimke nisu uvezene zato jer ih Shotwell nije mogao "
-"kopirati u fototeku:"
 
-#: ../src/Dialogs.vala:616
+#: src/Dialogs.vala:629
 #, c-format
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
-"nemoguće kopiranje %s\n"
-"\tu %s"
 
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:628
+#: src/Dialogs.vala:641
+#, fuzzy
 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:643
+#: src/Dialogs.vala:656
+#, fuzzy
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Fotografije/Video snimke nisu uvezene zbog drugih razloga:"
 
-#: ../src/Dialogs.vala:663
+#: 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 duplikat nije uvezen:\n"
-msgstr[1] "%d duplikata nisu uvezena:\n"
-msgstr[2] "%d duplikata nije uvezeno:\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:666
+#: 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 duplikat video snimke nije uvezen:\n"
-msgstr[1] "%d duplikata video snimaka nisu uvezni:\n"
-msgstr[2] "%d duplikata video snimaka nisu uvezni:\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:669
+#: 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 duplikat fotografije/video snimke nije uvezen:\n"
-msgstr[1] "%d duplikata fotografija/video snimaka nisu uvezni:\n"
-msgstr[2] "%d duplikata fotografija/video snimaka nisu uvezni:\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:683
+#: 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 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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:686
+#: 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 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:689
+#: src/Dialogs.vala:702
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
 "%d photos/videos failed to import due to a file or hardware error:\n"
 msgstr[0] ""
-"%d 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:692
+#: 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 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 nisu uvezene zbog greške na datoteci ili hardveru:\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:706
+#: src/Dialogs.vala:719
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1496,13 +3455,10 @@ msgid_plural ""
 "%d photos failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"%d fotografija nije uvezena zbog toga što mapa fototeke nije zapisiva:\n"
 msgstr[1] ""
-"%d fotografije nisu uvezene zbog toga što mapa fototeke nije zapisiva:\n"
 msgstr[2] ""
-"%d fotografija nije uvezeno zbog toga što mapa fototeke nije zapisiva:\n"
 
-#: ../src/Dialogs.vala:709
+#: src/Dialogs.vala:722
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1510,13 +3466,10 @@ 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:712
+#: src/Dialogs.vala:725
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1525,16 +3478,10 @@ 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:715
+#: src/Dialogs.vala:728
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1542,396 +3489,399 @@ msgid_plural ""
 "%d files failed to import because the photo library folder was not "
 "writable:\n"
 msgstr[0] ""
-"%d datoteka nije uvezena zbog toga što mapa fototeke nije zapisiva:\n"
 msgstr[1] ""
-"%d datoteke nisu uvezene zbog toga što mapa fototeke nije zapisiva:\n"
 msgstr[2] ""
-"%d datoteka nije uvezeno zbog toga što mapa fototeke nije zapisiva:\n"
 
-#: ../src/Dialogs.vala:729
+#: 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 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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:732
+#: 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 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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:735
+#: 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 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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:738
+#: 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 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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:752
+#: 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 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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:755
+#: 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 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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:758
+#: 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 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[0] ""
+msgstr[1] ""
 msgstr[2] ""
-"%d  fotografija/video snimaka se nije uvezlo zato jer su oštećene:\n"
 
-#: ../src/Dialogs.vala:761
+#: 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] "%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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #. 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:778
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
-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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #. 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:793
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
-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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:804
+#: 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 preskočena fotografije uslijed korisnikovog prekida.\n"
-msgstr[1] "%d preskočene fotografije uslijed korisnikovog prekida.\n"
-msgstr[2] "%d preskočenih fotografije uslijed korisnikovog prekida.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:807
+#: 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 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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:810
+#: 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 fotografija/video snimka preskočena uslijed korisnikovog prekida.\n"
 msgstr[1] ""
-"%d Fotografije/video snimke preskočena uslijed korisnikovog prekida.\n"
 msgstr[2] ""
-"%d fotografija/video snimaka preskočeno uslijed korisnikovog prekida.\n"
 
-#: ../src/Dialogs.vala:813
+#: 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 datoteka preskočena uslijed korisnikova prekida:\n"
-msgstr[1] "%d datoteke preskočene zbog korisnikova prekida:\n"
-msgstr[2] "%d datoteka preskočeno uslijed korisnikova prekida:\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:827
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
-msgstr[0] "%d fotografija uspješno uvezena.\n"
-msgstr[1] "%d fotografije uspješno uvezeno.\n"
-msgstr[2] "%d fotografija uspješno uvezenih.\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:830
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
-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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:833
+#: src/Dialogs.vala:846
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
-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"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #. 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:849
+#: src/Dialogs.vala:862
+#, fuzzy
 msgid "No photos or videos imported.\n"
 msgstr "Niti jedna fotografija nije uvezena.\n"
 
-#: ../src/Dialogs.vala:856 ../src/Dialogs.vala:875
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
+#, fuzzy
 msgid "Import Complete"
 msgstr "Uvoz završen"
 
-#: ../src/Dialogs.vala:1103
+#: 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[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:1106
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "%d minuta"
-msgstr[1] "%d minute"
-msgstr[2] "%d minuta"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:1110
+#: 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[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:1113
+#: src/Dialogs.vala:1170
+#, fuzzy
 msgid "1 day"
 msgstr "jedan dan"
 
-#: ../src/Dialogs.vala:1263 ../src/Resources.vala:205
+#: src/Dialogs.vala:1317 src/Resources.vala:231
+#, fuzzy
 msgid "Rename Event"
 msgstr "Preimenuj događaj"
 
-#: ../src/Dialogs.vala:1263
+#: src/Dialogs.vala:1317
+#, fuzzy
 msgid "Name:"
 msgstr "Naziv:"
 
-#: ../src/Dialogs.vala:1273 ../src/Resources.vala:274
+#. Dialog title
+#: src/Dialogs.vala:1328
+msgctxt "Dialog Title"
 msgid "Edit Title"
-msgstr "Uredi naslov"
+msgstr ""
 
-#: ../src/Dialogs.vala:1273 ../src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
+#, fuzzy
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../src/Dialogs.vala:1287 ../src/Resources.vala:280
+#. Dialog title
+#: src/Dialogs.vala:1345 src/Resources.vala:307
+#, fuzzy
 msgid "Edit Event Comment"
 msgstr "Uredi komentar događaja"
 
-#: ../src/Dialogs.vala:1287
+#: src/Dialogs.vala:1346
+#, fuzzy
 msgid "Edit Photo/Video Comment"
 msgstr "Uredi komentar fotografije/video snimke"
 
-#: ../src/Dialogs.vala:1288 ../src/Properties.vala:630
+#: src/Dialogs.vala:1347 src/Properties.vala:631
+#, fuzzy
 msgid "Comment:"
 msgstr "Komentar:"
 
-#: ../src/Dialogs.vala:1304
-msgid "_Trash File"
-msgid_plural "_Trash Files"
-msgstr[0] "Premjesti u _smeće"
-msgstr[1] "Premjesti u _smeće"
-msgstr[2] "Premjesti u _smeće"
-
-#: ../src/Dialogs.vala:1308
-msgid "Only _Remove"
-msgstr "Samo _ukloni"
+#: src/Dialogs.vala:1363
+msgid "Remove and _Trash File"
+msgid_plural "Remove and _Trash Files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:1328 ../src/camera/ImportPage.vala:1739
-msgid "_Keep"
-msgstr "_Zadrži"
+#: src/Dialogs.vala:1367
+#, fuzzy
+msgid "_Remove From Library"
+msgstr "_Ukloni iz fototeke"
 
-#: ../src/Dialogs.vala:1351
+#: src/Dialogs.vala:1410
+#, fuzzy
 msgid "Revert External Edit?"
-msgstr "Poništi vanjske promjene?"
+msgstr "Poništi vanjsku promjenu?"
 
-#: ../src/Dialogs.vala:1351
+#: src/Dialogs.vala:1410
+#, fuzzy
 msgid "Revert External Edits?"
 msgstr "Poništi vanjske promjene?"
 
-#: ../src/Dialogs.vala:1353
+#: 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?"
-msgstr[0] "Sve promjene na %d vanjskoj datoteci će biti izgubljene. Nastavi?"
-msgstr[1] "Sve promjene na %d vanjske datoteke će biti izgubljene. Nastavi?"
-msgstr[2] "Sve promjene na %d vanjskih datoteka će biti izgubljene. Nastavi?"
+"This will destroy all changes made to %d external files. Continue?"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:1357
+#: src/Dialogs.vala:1416
+#, fuzzy
 msgid "Re_vert External Edit"
-msgstr "_Poništi vanjske promjene?"
+msgstr "_Poništi vanjsku promjenu"
 
-#: ../src/Dialogs.vala:1357
+#: src/Dialogs.vala:1416
+#, fuzzy
 msgid "Re_vert External Edits"
-msgstr "_Poništi vanjske promjene?"
+msgstr "_Poništi vanjske promjene"
 
-#: ../src/Dialogs.vala:1378
+#: 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] "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?"
+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] ""
 
-#: ../src/Dialogs.vala:1385
+#: src/Dialogs.vala:1444 src/Resources.vala:173
+#, fuzzy
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../src/Dialogs.vala:1386
+#: src/Dialogs.vala:1445
+#, fuzzy
 msgid "Remove Photo From Library"
 msgstr "Ukloni fotografiju iz fototeke"
 
-#: ../src/Dialogs.vala:1386
+#: src/Dialogs.vala:1445
+#, fuzzy
 msgid "Remove Photos From Library"
 msgstr "Ukloni fotografije iz fototeke"
 
-#: ../src/Dialogs.vala:1479
-#, c-format
+#: src/Dialogs.vala:1543
+#, fuzzy, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1626
+#: src/Dialogs.vala:1697
+#, fuzzy
 msgid "AM"
 msgstr "AM"
 
-#: ../src/Dialogs.vala:1627
+#: src/Dialogs.vala:1698
+#, fuzzy
 msgid "PM"
 msgstr "PM"
 
-#: ../src/Dialogs.vala:1628
+#: src/Dialogs.vala:1699
+#, fuzzy
 msgid "24 Hr"
 msgstr "24 sata"
 
-#: ../src/Dialogs.vala:1643
+#: src/Dialogs.vala:1714
+#, fuzzy
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Prebaci fotografije/video snimke za jednaki iznos"
 
-#: ../src/Dialogs.vala:1648
+#: 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:1655
+#: src/Dialogs.vala:1725
 msgid "_Modify original photo file"
-msgstr "_Promjeni izvornu datoteku fotografije"
-
-#: ../src/Dialogs.vala:1655
-msgid "_Modify original photo files"
-msgstr "_Promjeni izvornu datoteku fotografija"
+msgid_plural "_Modify original photo files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:1658
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
-msgstr "_Promijeni izvornu datototeka"
-
-#: ../src/Dialogs.vala:1658
-msgid "_Modify original files"
-msgstr "_Promijeni izvorne datoteke"
+msgid_plural "_Modify original files"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:1744
+#: src/Dialogs.vala:1817
+#, fuzzy
 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.vala:1745
+#: src/Dialogs.vala:1818
+#, fuzzy
 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.vala:1746
+#: src/Dialogs.vala:1819
+#, fuzzy
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%d.%m.%Y., %I:%M:%S %p"
 
-#: ../src/Dialogs.vala:1835
-#, c-format
+#: 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 ""
-"Vrijem ekspozicije će biti pomaknuto unaprijed za\n"
+"Vrijeme ekspozicije će biti pomaknuto unaprijed za\n"
 "%d %s, %d %s, %d %s, i %d %s."
 
-#: ../src/Dialogs.vala:1836
-#, c-format
+#: 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 ""
-"Vrijem ekspozicije će biti pomaknuto unatrag za\n"
+"Vrijeme ekspozicije će biti pomaknuto unatrag za\n"
 "%d %s, %d %s, %d %s, i %d %s."
 
-#: ../src/Dialogs.vala:1838
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
-msgstr[0] "dan"
-msgstr[1] "dana"
-msgstr[2] "dana"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:1839
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
-msgstr[0] "sat"
-msgstr[1] "sata"
-msgstr[2] "sati"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:1840
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
-msgstr[0] "minuta"
-msgstr[1] "minute"
-msgstr[2] "minuta"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:1841
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
-msgstr[0] "sekunda"
-msgstr[1] "sekunde"
-msgstr[2] "sekundi"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dialogs.vala:1885
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -1942,106 +3892,108 @@ msgid_plural ""
 "\n"
 "And %d others."
 msgstr[0] ""
-"\n"
-"\n"
-"I %d ostali."
 msgstr[1] ""
-"\n"
-"\n"
-"I %d ostala."
 msgstr[2] ""
-"\n"
-"\n"
-"I %d ostalih."
 
-#: ../src/Dialogs.vala:1907 ../src/Dialogs.vala:1934
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
+#, fuzzy
 msgid "Tags (separated by commas):"
 msgstr "Oznake (odvojene zarezom):"
 
-#: ../src/Dialogs.vala:2014
+#: src/Dialogs.vala:2089
+#, fuzzy
 msgid "Welcome!"
 msgstr "Dobrodošli!"
 
-#: ../src/Dialogs.vala:2021
+#: src/Dialogs.vala:2096
+#, fuzzy
 msgid "Welcome to Shotwell!"
 msgstr "Dobrodošli u Shotwell!"
 
-#: ../src/Dialogs.vala:2025
+#: 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:2044
-#, c-format
+#: 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 direktorija</span>"
+msgstr "Odaberite <span weight=\"bold\"> Datoteka %s Uvezi iz mape</span>"
 
-#: ../src/Dialogs.vala:2045
+#: 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:2046
+#: 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:2056
-#, c-format
+#: src/Dialogs.vala:2134
+#, fuzzy, c-format
 msgid "_Import photos from your %s folder"
-msgstr "_Uvoz fotografija iz direktorija %s"
+msgstr "_Uvezi fotografije iz mape %s"
 
-#: ../src/Dialogs.vala:2063
+#: 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:2073
-msgid "_Don't show this message again"
-msgstr "_Ne prikazuj više ovu poruku"
+#: src/Dialogs.vala:2152
+msgid "_Don’t show this message again"
+msgstr ""
 
-#: ../src/Dialogs.vala:2108
-#, c-format
+#: 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 ghelp: URIs.
-#: ../src/Dialogs.vala:2252 ../src/Dialogs.vala:2256
+#. 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:2265
-#, c-format
+#: src/Dialogs.vala:2346
+#, fuzzy, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Godina%sMjesec%sDan"
 
-#: ../src/Dialogs.vala:2267
-#, c-format
+#: src/Dialogs.vala:2348
+#, fuzzy, c-format
 msgid "Year%sMonth"
 msgstr "Godina%sMjesec"
 
-#: ../src/Dialogs.vala:2269
-#, c-format
+#: src/Dialogs.vala:2350
+#, fuzzy, c-format
 msgid "Year%sMonth-Day"
 msgstr "Godina%sMjesec-Dan"
 
-#: ../src/Dialogs.vala:2271
+#: src/Dialogs.vala:2352
+#, fuzzy
 msgid "Year-Month-Day"
 msgstr "Godina-Mjesec-Dan"
 
-#: ../src/Dialogs.vala:2272 ../src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
+#, fuzzy
 msgid "Custom"
-msgstr "Prilagođena"
+msgstr "Prilagođeno"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2509
+#: 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:2612
+#: src/Dialogs.vala:2692
+#, fuzzy
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2049,312 +4001,720 @@ msgstr ""
 "Shotwell može dodati fotografije u fototeku kopiranjem u mapu ili samo "
 "uvozom."
 
-#: ../src/Dialogs.vala:2617
+#: src/Dialogs.vala:2697
+#, fuzzy
 msgid "Co_py Photos"
 msgstr "_Kopiraj fotografije"
 
-#: ../src/Dialogs.vala:2618
+#: src/Dialogs.vala:2698
+#, fuzzy
 msgid "_Import in Place"
 msgstr "_Uvezi"
 
-#: ../src/Dialogs.vala:2619
+#: src/Dialogs.vala:2699
+#, fuzzy
 msgid "Import to Library"
 msgstr "Uvezi u fototeku"
 
-#: ../src/Dialogs.vala:2629 ../src/PhotoPage.vala:3079
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
+#, fuzzy
 msgid "Remove From Library"
 msgstr "Ukloni iz fototeke"
 
-#: ../src/Dialogs.vala:2630 ../src/PhotoPage.vala:3079
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
+#, fuzzy
 msgid "Removing Photo From Library"
 msgstr "Uklanjanje fotografije iz fototeke"
 
-#: ../src/Dialogs.vala:2630
+#: src/Dialogs.vala:2710
+#, fuzzy
 msgid "Removing Photos From Library"
 msgstr "Uklanjanje fotografija iz fototeke"
 
-#: ../src/Dialogs.vala:2644
+#: src/Dialogs.vala:2724
 #, 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] ""
-"Ovo će ukloniti %d fotografiju/video snimke iz vaše Shotwell fototeke. "
-"Želite li također premjestiti datoteku u smeće?\n"
-"\n"
-"Ova se radnja ne može poništiti."
 msgstr[1] ""
-"Ovo će ukloniti %d fotografije/video snimke iz vaše Shotwell fototeke. "
-"Želite li također premjestiti datoteke u smeće?\n"
-"\n"
-"Ova se radnja ne može poništiti."
 msgstr[2] ""
-"Ovo će ukloniti %d fotografija/video snimaka iz vaše Shotwell fototeke. "
-"Želite li također premjestiti datoteke u smeće?\n"
-"\n"
-"Ova se radnja ne može poništiti."
 
-#: ../src/Dialogs.vala:2648
+#: src/Dialogs.vala:2728
 #, 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] ""
-"Ovo će ukloniti %d video snimku iz vaše Shotwell fototeke. Želite li također "
-"premjestiti datoteku u smeće?\n"
-"\n"
-"Ova se radnja ne može poništiti."
 msgstr[1] ""
-"Ovo će ukloniti %d video snimke iz vaše Shotwell fototeke. Želite li također "
-"premjestiti datoteke u smeće?\n"
-"\n"
-"Ova se radnja ne može poništiti."
 msgstr[2] ""
-"Ovo će ukloniti %d video snimaka iz vaše Shotwell fototeke. Želite li "
-"također premjestiti datoteke u smeće?\n"
-"\n"
-"Ova se radnja ne može poništiti."
 
-#: ../src/Dialogs.vala:2652
+#: src/Dialogs.vala:2732
 #, 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] ""
-"Uklanjanje %d fotografije iz Shotwell fototeke. Želite li fotografiju "
-"premjestiti u smeće?\n"
-"\n"
-"Ova radnja se ne može vratiti natrag."
 msgstr[1] ""
-"Uklanjanje %d fotografije iz Shotwell fototeke. Želite li fotografije "
-"premjestiti u smeće?\n"
-"\n"
-"Ova radnja se ne može vratiti natrag."
 msgstr[2] ""
-"Uklanjanje %d fotografija iz Shotwell fototeke. Želite li fotografije "
-"premjestiti u smeće?\n"
-"\n"
-"Ova radnja se ne može vratiti natrag."
 
-#: ../src/Dialogs.vala:2684
+#: src/Dialogs.vala:2764
 #, 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 fotografija ili video snimka se ne može premjestiti u smeće. Obriši ovu "
-"datoteku?"
 msgstr[1] ""
-"%d fotografije/video snimke se ne mogu premjestiti u smeće. Obriši ove "
-"datoteke?"
 msgstr[2] ""
-"%d fotografija/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:2701
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
-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:20
-msgid "Width or height"
-msgstr "Širina ili visina"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Dimensions.vala:23
+#: src/Dimensions.vala:23
+#, fuzzy
 msgid "Width"
 msgstr "Širina"
 
-#: ../src/Dimensions.vala:26
+#: src/Dimensions.vala:26
+#, fuzzy
 msgid "Height"
 msgstr "Visina"
 
-#. verify this is a directory
-#: ../src/DirectoryMonitor.vala:889
+#: src/direct/DirectPhotoPage.vala:99
+#, fuzzy, c-format
+msgid "%s does not exist."
+msgstr "%s ne postoji."
+
+#: src/direct/DirectPhotoPage.vala:101
+#, fuzzy, c-format
+msgid "%s is not a file."
+msgstr "%s nije datoteka."
+
+#: src/direct/DirectPhotoPage.vala:103
+#, fuzzy, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s ne podržava vrstu datoteke\n"
+"%s."
+
+#: src/direct/DirectPhotoPage.vala:120
 #, c-format
+msgid "Unable open photo %s. Sorry."
+msgstr ""
+
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:175 ui/direct.ui:8
+#, fuzzy
+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
+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
+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
 msgid "Unable to monitor %s: Not a directory (%s)"
-msgstr "Ne mogo pratiti %s: Nije direktorij (%s)"
+msgstr "Nemoguće nadziranje %s: Nije mapa (%s)"
 
-#. if no name, pretty up the start time
-#: ../src/Event.vala:753
+#: src/editing_tools/EditingTools.vala:666
+#, fuzzy
+msgid "Return to current photo dimensions"
+msgstr "Vrati na trenutne dimenzije fotografije"
+
+#: src/editing_tools/EditingTools.vala:669
+#, fuzzy
+msgid "Set the crop for this photo"
+msgstr "Postavi obrezivanje za ovu fotografiju"
+
+#: src/editing_tools/EditingTools.vala:681
+#, fuzzy
+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
+msgid "Unconstrained"
+msgstr "Neograničeno"
+
+#: src/editing_tools/EditingTools.vala:755
+#, fuzzy
+msgid "Square"
+msgstr "Kvadrat"
+
+#: src/editing_tools/EditingTools.vala:756
+#, fuzzy
+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
+msgid "-"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:759
+msgid "SD Video (4 ∶ 3)"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:760
+msgid "HD Video (16 ∶ 9)"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
+msgid "Wallet (2 × 3 in.)"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
+msgid "Notecard (3 × 5 in.)"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+msgid "4 × 6 in."
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+msgid "5 × 7 in."
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+msgid "8 × 10 in."
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:767
+msgid "Letter (8.5 × 11 in.)"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+msgid "11 × 14 in."
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:769
+msgid "Tabloid (11 × 17 in.)"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+msgid "16 × 20 in."
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
+msgid "Metric Wallet (9 × 13 cm)"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
+msgid "Postcard (10 × 15 cm)"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+msgid "13 × 18 cm"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+msgid "18 × 24 cm"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:776
+msgid "A4 (210 × 297 mm)"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+msgid "20 × 30 cm"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+msgid "24 × 40 cm"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+msgid "30 × 40 cm"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:780
+msgid "A3 (297 × 420 mm)"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+#, fuzzy
+msgid "Size:"
+msgstr "Veličina:"
+
+#: src/editing_tools/EditingTools.vala:1895
+#, fuzzy
+msgid "Close the red-eye tool"
+msgstr "Zatvori alat za uklanjanje crvenih očiju"
+
+#: src/editing_tools/EditingTools.vala:1898
+#, fuzzy
+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/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/Properties.vala:443 src/Properties.vala:450
+#, fuzzy
+msgid "Exposure:"
+msgstr "Ekspozicija:"
+
+#: src/editing_tools/EditingTools.vala:2261
+msgid "Contrast:"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:2270
+#, fuzzy
+msgid "Saturation:"
+msgstr "Zasićenje:"
+
+#: src/editing_tools/EditingTools.vala:2279
+#, fuzzy
+msgid "Tint:"
+msgstr "Nijansa:"
+
+#: src/editing_tools/EditingTools.vala:2289
+#, fuzzy
+msgid "Temperature:"
+msgstr "Temperatura:"
+
+#: src/editing_tools/EditingTools.vala:2298
+#, fuzzy
+msgid "Shadows:"
+msgstr "Sjenke:"
+
+#: src/editing_tools/EditingTools.vala:2307
+#, fuzzy
+msgid "Highlights:"
+msgstr "Osvjetljenje:"
+
+#: src/editing_tools/EditingTools.vala:2363
+#, fuzzy
+msgid "Reset Colors"
+msgstr "Vrati izvorne boje"
+
+#: src/editing_tools/EditingTools.vala:2363
+#, fuzzy
+msgid "Reset all color adjustments to original"
+msgstr "Vrati sve boje na izvorne postavke"
+
+#: src/editing_tools/EditingTools.vala:2722
+#, fuzzy
+msgid "Temperature"
+msgstr "Temperatura"
+
+#: src/editing_tools/EditingTools.vala:2734
+#, fuzzy
+msgid "Tint"
+msgstr "Nijansa"
+
+#: src/editing_tools/EditingTools.vala:2746
+msgid "Contrast"
+msgstr ""
+
+#: src/editing_tools/EditingTools.vala:2760
+#, fuzzy
+msgid "Saturation"
+msgstr "Zasićenje"
+
+#: src/editing_tools/EditingTools.vala:2773
+#, fuzzy
+msgid "Exposure"
+msgstr "Ekspozicija"
+
+#: src/editing_tools/EditingTools.vala:2786
+#, fuzzy
+msgid "Shadows"
+msgstr "Sjenke"
+
+#: src/editing_tools/EditingTools.vala:2799
+#, fuzzy
+msgid "Highlights"
+msgstr "Osvjetljenje"
+
+#: src/editing_tools/EditingTools.vala:2809
+#, fuzzy
+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
+#: 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
+#, c-format
+msgid "%d Photo/Video"
+msgid_plural "%d Photos/Videos"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
+#, c-format
+msgid "%d Video"
+msgid_plural "%d Videos"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
 #, c-format
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: src/events/EventPage.vala:128
+#, fuzzy
+msgid "No Event"
+msgstr "Nema događaja"
+
+#: src/events/EventsDirectoryPage.vala:150
+#, fuzzy
+msgid "No events"
+msgstr "Nema događaja"
+
+#: src/events/EventsDirectoryPage.vala:154
+#, fuzzy
+msgid "No events found"
+msgstr "Nema pronađenih događaja"
+
+#: src/events/EventsDirectoryPage.vala:227
+#, fuzzy
+msgid "All Events"
+msgstr "Svi događaji"
+
+#: src/events/EventsDirectoryPage.vala:241
+#, fuzzy
+msgid "Undated"
+msgstr "Bez datuma"
+
+#: src/events/EventsDirectoryPage.vala:242
+#, fuzzy
+msgid "%Y"
+msgstr "%Y"
+
+#: src/events/EventsDirectoryPage.vala:243
+#, fuzzy
+msgid "%B"
+msgstr "%B"
+
+#. if no name, pretty up the start time
+#: src/Event.vala:753
+#, fuzzy, c-format
 msgid "Event %s"
 msgstr "Događaj %s"
 
-#: ../src/Exporter.vala:232
-#, c-format
+#: src/Exporter.vala:232
+#, fuzzy, c-format
 msgid "Unable to generate a temporary file for %s: %s"
-msgstr "Ne mogu napraviti privremenu datoteku za %s: %s"
+msgstr "Nemoguće stvaranje privremene datoteke za %s: %s"
 
-#: ../src/Exporter.vala:299
+#: src/Exporter.vala:299
+#, fuzzy
 msgid "Exporting"
 msgstr "Izvoz"
 
-#: ../src/Exporter.vala:317
+#: src/Exporter.vala:317
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "Datoteka %s već postoji. Zamjeniti?"
+msgid "File %s already exists. Replace?"
+msgstr ""
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
+#, fuzzy
 msgid "_Skip"
-msgstr "_Preskoći"
+msgstr "_Preskoči"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
+#, fuzzy
 msgid "_Replace"
-msgstr "_Zamjeni"
+msgstr "_Zamijeni"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
+#, fuzzy
 msgid "Replace _All"
-msgstr "Zamjeni _sve"
+msgstr "Zamijeni _sve"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
+#, fuzzy
 msgid "Export"
 msgstr "Izvoz"
 
-#: ../src/MediaMonitor.vala:400
-#, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "Nemoguće obraditi dopune nadzora: %s"
+#: src/folders/Branch.vala:144
+#, fuzzy
+msgid "Folders"
+msgstr "Mape"
 
-#: ../src/MediaPage.vala:143
-msgid "Adjust the size of the thumbnails"
-msgstr "Podesi veličinu sličica"
+#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
+#, fuzzy
+msgid "Library"
+msgstr "Fototeka"
 
-#: ../src/MediaPage.vala:325 ../src/PhotoPage.vala:2583
-#: ../src/direct/DirectPhotoPage.vala:174
-msgid "Zoom _In"
-msgstr "_Povećaj"
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
+#, fuzzy
+msgid "Photos"
+msgstr "Fotografije"
 
-#: ../src/MediaPage.vala:326
-msgid "Increase the magnification of the thumbnails"
-msgstr "Povećaj veličinu sličica"
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
+#, fuzzy
+msgid "Flagged"
+msgstr "Označeno"
 
-#: ../src/MediaPage.vala:331 ../src/PhotoPage.vala:2589
-#: ../src/direct/DirectPhotoPage.vala:180
-msgid "Zoom _Out"
-msgstr "Smanji"
+#: src/library/ImportQueuePage.vala:8
+msgid "Importing…"
+msgstr ""
 
-#: ../src/MediaPage.vala:332
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Smanji veličinu sličica"
+#: src/library/ImportQueuePage.vala:129
+msgid "Preparing to import…"
+msgstr ""
 
-#: ../src/MediaPage.vala:399
-msgid "Sort _Photos"
-msgstr "Razvrstaj _fotografije"
+#: src/library/ImportQueuePage.vala:156
+#, fuzzy, c-format
+msgid "Imported %s"
+msgstr "Uvezeno %s"
 
-#: ../src/MediaPage.vala:408
-msgid "_Play Video"
-msgstr "_Reproduciraj video snimku"
+#: src/library/LastImportPage.vala:8
+#, fuzzy
+msgid "Last Import"
+msgstr "Posljednji uvoz"
 
-#: ../src/MediaPage.vala:409
-msgid "Open the selected videos in the system video player"
-msgstr "Otvori odabrane video snimke u video reproduktoru sustava"
+#: src/library/LibraryWindow.vala:507
+#, fuzzy
+msgid "Import From Folder"
+msgstr "Uvozi iz mape"
 
-#: ../src/MediaPage.vala:413 ../src/PhotoPage.vala:2632
-msgid "_Developer"
-msgstr "_Razvijatelj"
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+#, fuzzy
+msgid "Empty Trash"
+msgstr "Isprazni smeće"
 
-#: ../src/MediaPage.vala:420 ../src/photos/RawSupport.vala:297
-msgid "Shotwell"
-msgstr "Shotwell"
+#: src/library/LibraryWindow.vala:576
+msgid "Emptying Trash…"
+msgstr ""
 
-#: ../src/MediaPage.vala:425 ../src/camera/Branch.vala:101
-#: ../src/camera/ImportPage.vala:711 ../src/camera/ImportPage.vala:727
-#: ../src/photos/RawSupport.vala:300
-msgid "Camera"
-msgstr "Kamera"
+#: src/library/LibraryWindow.vala:772
+#, fuzzy, 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 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"
+"Želite li nastaviti s uvozom fotografija?"
 
-#: ../src/MediaPage.vala:436 ../src/camera/ImportPage.vala:872
-msgid "_Titles"
-msgstr "Nas_lovi"
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+#, fuzzy
+msgid "Library Location"
+msgstr "Lokacija fototeke"
 
-#: ../src/MediaPage.vala:437 ../src/camera/ImportPage.vala:873
-msgid "Display the title of each photo"
-msgstr "Prikaži naslov svake fotografije"
+#. TODO: Specify which directory/file.
+#: src/library/LibraryWindow.vala:788
+#, fuzzy
+msgid "Photos cannot be imported from this directory."
+msgstr "Fotografije se ne mogu uvesti iz ove mape."
 
-#: ../src/MediaPage.vala:442 ../src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "_Komentari"
+#: src/library/LibraryWindow.vala:1068
+#, fuzzy, c-format
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
 
-#: ../src/MediaPage.vala:443
-msgid "Display the comment of each photo"
-msgstr "Prikaži komentar svake fotografije"
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+msgid "Updating library…"
+msgstr ""
 
-#: ../src/MediaPage.vala:454 ../src/library/LibraryWindow.vala:376
-msgid "Ta_gs"
-msgstr "O_znake"
+#: src/library/LibraryWindow.vala:1129
+msgid "Preparing to auto-import photos…"
+msgstr ""
 
-#: ../src/MediaPage.vala:455
-msgid "Display each photo's tags"
-msgstr "Prikaži oznake svake fotografije"
+#: src/library/LibraryWindow.vala:1134
+msgid "Auto-importing photos…"
+msgstr ""
 
-#: ../src/MediaPage.vala:471
-msgid "By _Title"
-msgstr "Po _Naslovu"
+#: src/library/LibraryWindow.vala:1142
+msgid "Writing metadata to files…"
+msgstr ""
 
-#: ../src/MediaPage.vala:472
-msgid "Sort photos by title"
-msgstr "Razvrstaj fotografije po naslovu"
+#: src/library/OfflinePage.vala:8
+#, fuzzy
+msgid "Missing Files"
+msgstr "Datoteke koje nedostaju"
 
-#: ../src/MediaPage.vala:477
-msgid "By Exposure _Date"
-msgstr "Po datumu _ekspozicije"
+#: src/library/OfflinePage.vala:110
+msgid "Deleting…"
+msgstr ""
 
-#: ../src/MediaPage.vala:478
-msgid "Sort photos by exposure date"
-msgstr "Razvrstaj fotografije po datumu prikaza"
+#: src/library/TrashPage.vala:8
+#, fuzzy
+msgid "Trash"
+msgstr "Smeće"
 
-#: ../src/MediaPage.vala:483
-msgid "By _Rating"
-msgstr "Po _ocjeni"
+#: src/library/TrashPage.vala:108
+#, fuzzy
+msgid "Trash is empty"
+msgstr "Smeće je prazno"
 
-#: ../src/MediaPage.vala:484
-msgid "Sort photos by rating"
-msgstr "Razvrstaj fotografije po ocjeni"
+#: src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr ""
 
-#: ../src/MediaPage.vala:494 ../src/library/LibraryWindow.vala:422
-msgid "_Ascending"
-msgstr "_Rastući"
+#: src/library/TrashPage.vala:113
+#, fuzzy
+msgid "Deleting Photos"
+msgstr "Brisanje fotografija"
 
-#: ../src/MediaPage.vala:495 ../src/library/LibraryWindow.vala:423
-msgid "Sort photos in an ascending order"
-msgstr "Razvrstaj fotografije u rastući niz"
+#: 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 ""
 
-#: ../src/MediaPage.vala:500 ../src/library/LibraryWindow.vala:429
-msgid "D_escending"
-msgstr "_Padajuci"
+#: 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 ""
 
-#: ../src/MediaPage.vala:501 ../src/library/LibraryWindow.vala:430
-msgid "Sort photos in a descending order"
-msgstr "Razvrstaj fotografije u padajući niz"
+#: 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 ""
 
-#: ../src/MediaPage.vala:702
+#: src/main.vala:71
 #, c-format
+msgid "Unknown error attempting to verify Shotwell’s database: %s"
+msgstr ""
+
+#: src/main.vala:104
+#, fuzzy
+msgid "Loading Shotwell"
+msgstr "Učitavanje Shotwella"
+
+#: src/main.vala:293
+msgid "Path to Shotwell’s private data"
+msgstr ""
+
+#: src/main.vala:293
+#, fuzzy
+msgid "DIRECTORY"
+msgstr "MAPA"
+
+#: src/main.vala:297
+#, fuzzy
+msgid "Do not monitor library directory at runtime for changes"
+msgstr "Ne nadziri mapu fototeke u vremenu izvršavanja promjena"
+
+#: src/main.vala:301
+msgid "Don’t display startup progress meter"
+msgstr ""
+
+#: src/main.vala:305
+msgid "Show the application’s version"
+msgstr ""
+
+#. init GTK (valac has already called g_threads_init())
+#: src/main.vala:342
+#, fuzzy
+msgid "[FILE]"
+msgstr "[DATOTEKA]"
+
+#: src/main.vala:346
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options.\n"
+msgstr ""
+
+#: src/MediaMonitor.vala:400
+#, fuzzy, 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
 msgid ""
 "Shotwell was unable to play the selected video:\n"
 "%s"
@@ -2362,1021 +4722,1240 @@ msgstr ""
 "Shotwell nije uspio prikazati video snimku:\n"
 " %s"
 
-#: ../src/Page.vala:1268
+#: src/Page.vala:1318
+#, fuzzy
 msgid "No photos/videos"
 msgstr "Nema fotografija/video snimaka"
 
-#: ../src/Page.vala:1272
-msgid "No photos/videos found"
-msgstr "Nisu pronađene fotografije/video snimke"
+#: src/Page.vala:1322
+msgid "No photos/videos found which match the current filter"
+msgstr ""
 
-#: ../src/Page.vala:2569
+#: src/Page.vala:2628
+#, fuzzy
 msgid "Photos cannot be exported to this directory."
-msgstr "Fotografije ne mogu biti izvezene u zadani direktorij."
-
-#: ../src/Photo.vala:3656
-msgid "modified"
-msgstr "promjenjeno"
+msgstr "Fotografije ne mogu biti izvezene u ovu mapu."
 
 #. previous button
-#: ../src/PhotoPage.vala:532
+#: src/PhotoPage.vala:538
+#, fuzzy
 msgid "Previous photo"
 msgstr "Prijašnja fotografija"
 
 #. next button
-#: ../src/PhotoPage.vala:537
+#: src/PhotoPage.vala:544
+#, fuzzy
 msgid "Next photo"
 msgstr "Sljedeća fotografija"
 
-#: ../src/PhotoPage.vala:1844
-#, c-format
+#: src/PhotoPage.vala:1850
+#, fuzzy, c-format
 msgid "Photo source file missing: %s"
 msgstr "Nedostaje izvorišna datoteka: %s"
 
-#: ../src/PhotoPage.vala:2404 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:360
-msgid "_View"
-msgstr "_Prikaz"
-
-#: ../src/PhotoPage.vala:2408 ../src/direct/DirectPhotoPage.vala:81
-msgid "T_ools"
-msgstr "A_lati"
-
-#: ../src/PhotoPage.vala:2413 ../src/direct/DirectPhotoPage.vala:86
-msgid "_Previous Photo"
-msgstr "_Prijašnja fotografija"
-
-#: ../src/PhotoPage.vala:2414 ../src/direct/DirectPhotoPage.vala:87
-msgid "Previous Photo"
-msgstr "Prijašnja fotografija"
-
-#: ../src/PhotoPage.vala:2419 ../src/direct/DirectPhotoPage.vala:92
-msgid "_Next Photo"
-msgstr "_Sljedeća fotografija"
+#: src/PhotoPage.vala:3018
+#, fuzzy, c-format
+msgid "Unable to export %s: %s"
+msgstr "Nemoguće izvesti %s: %s"
 
-#: ../src/PhotoPage.vala:2420 ../src/direct/DirectPhotoPage.vala:93
-msgid "Next Photo"
-msgstr "Sljedeća fotografija"
+#: src/photos/BmpSupport.vala:32
+#, fuzzy
+msgid "BMP"
+msgstr "BMP"
 
-#: ../src/PhotoPage.vala:2584 ../src/direct/DirectPhotoPage.vala:175
-msgid "Increase the magnification of the photo"
-msgstr "Povećanje faktora veličine fotografije"
+#: src/photos/JfifSupport.vala:84
+#, fuzzy
+msgid "JPEG"
+msgstr "JPEG"
 
-#: ../src/PhotoPage.vala:2590 ../src/direct/DirectPhotoPage.vala:181
-msgid "Decrease the magnification of the photo"
-msgstr "Smanji faktor povećanja fotografije"
+#: src/photos/JfifSupport.vala:185
+#, fuzzy, c-format
+msgid "Low (%d%%)"
+msgstr "Nisko (%d%%)"
 
-#: ../src/PhotoPage.vala:2595 ../src/direct/DirectPhotoPage.vala:186
-msgid "Fit to _Page"
-msgstr "Prilagodi _stranici"
+#: src/photos/JfifSupport.vala:188
+#, fuzzy, c-format
+msgid "Medium (%d%%)"
+msgstr "Srednje (%d%%)"
 
-#: ../src/PhotoPage.vala:2596 ../src/direct/DirectPhotoPage.vala:187
-msgid "Zoom the photo to fit on the screen"
-msgstr "Zumiraj fotograiju da popuni ekran"
+#: src/photos/JfifSupport.vala:191
+#, fuzzy, c-format
+msgid "High (%d%%)"
+msgstr "Visoko (%d%%)"
 
-#: ../src/PhotoPage.vala:2602 ../src/direct/DirectPhotoPage.vala:193
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Povećaj _100%"
+#: src/photos/JfifSupport.vala:194
+#, fuzzy, c-format
+msgid "Maximum (%d%%)"
+msgstr "Najveće (%d%%)"
 
-#: ../src/PhotoPage.vala:2604 ../src/direct/DirectPhotoPage.vala:195
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Povećavanje fotografije na 100%"
+#: src/photos/PngSupport.vala:30
+#, fuzzy
+msgid "PNG"
+msgstr "PNG"
 
-#: ../src/PhotoPage.vala:2610 ../src/direct/DirectPhotoPage.vala:201
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Povećaj _200%"
+#: src/photos/RawSupport.vala:134
+#, fuzzy
+msgid "RAW"
+msgstr "RAW"
 
-#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:203
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Povećavanje fotografije na 200%"
+#: src/photos/TiffSupport.vala:86
+#, fuzzy
+msgid "TIFF"
+msgstr "TIFF"
 
-#: ../src/PhotoPage.vala:3220
-#, c-format
-msgid "Unable to export %s: %s"
-msgstr "Ne mogu izvesti %s: %s"
+#: src/Photo.vala:3755
+#, fuzzy
+msgid "modified"
+msgstr "promjenjeno"
 
-#: ../src/Printing.vala:255
+#: src/Printing.vala:255
+#, fuzzy
 msgid "Fill the entire page"
-msgstr "Ispuni cijelu stranicu"
+msgstr "Popuni cijelu stranicu"
 
-#: ../src/Printing.vala:256
+#: src/Printing.vala:256
+#, fuzzy
 msgid "2 images per page"
 msgstr "2 slike po stranici"
 
-#: ../src/Printing.vala:257
+#: src/Printing.vala:257
+#, fuzzy
 msgid "4 images per page"
 msgstr "4 slike po stranici"
 
-#: ../src/Printing.vala:258
+#: src/Printing.vala:258
+#, fuzzy
 msgid "6 images per page"
 msgstr "6 slika po stranici"
 
-#: ../src/Printing.vala:259
+#: src/Printing.vala:259
+#, fuzzy
 msgid "8 images per page"
 msgstr "8 slika po stranici"
 
-#: ../src/Printing.vala:260
+#: src/Printing.vala:260
+#, fuzzy
 msgid "16 images per page"
 msgstr "16 slika po stranici"
 
-#: ../src/Printing.vala:261
+#: src/Printing.vala:261
+#, fuzzy
 msgid "32 images per page"
 msgstr "32 slike po stranici"
 
-#: ../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 "Novčanik (2 x 3 in.)"
-
-#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
-msgid "Notecard (3 x 5 in.)"
-msgstr "Zabilješka (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 "Metrički novčanik (9 x 13 cm)"
-
-#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
-msgid "Postcard (10 x 15 cm)"
-msgstr "Razglednica (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
+#, fuzzy
 msgid "Image Settings"
 msgstr "Postavke slike"
 
-#: ../src/Printing.vala:888
-msgid "Printing..."
-msgstr "Ispisivanje..."
+#: src/Printing.vala:864
+msgid "Printing…"
+msgstr ""
 
-#: ../src/Printing.vala:908 ../src/Printing.vala:1111
-#, c-format
+#: src/Printing.vala:884 src/Printing.vala:1087
+#, fuzzy, c-format
 msgid ""
 "Unable to print photo:\n"
 "\n"
 "%s"
 msgstr ""
-"Greška kod ispisa fotografije:\n"
+"Nemoguć ispis fotografije:\n"
 "\n"
 "%s"
 
-#: ../src/Properties.vala:84
+#: src/Properties.vala:87
+#, fuzzy
 msgid "Today"
 msgstr "Danas"
 
-#: ../src/Properties.vala:86
+#: src/Properties.vala:89
+#, fuzzy
 msgid "Yesterday"
 msgstr "Jučer"
 
-#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:312
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
-
-#: ../src/Properties.vala:343
+#: src/Properties.vala:346
+#, fuzzy
 msgid "Items:"
-msgstr "Stavki:"
+msgstr "Stavke:"
 
-#: ../src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
-msgstr[0] "%d događaj"
-msgstr[1] "%d događaja"
-msgstr[2] "%d događaja"
-
-#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
-#, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d fotografija"
-msgstr[1] "%d fotografije"
-msgstr[2] "%d fotografija"
-
-#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
-#, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d video snimka"
-msgstr[1] "%d video snimke"
-msgstr[2] "%d video snimaka"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
 #. display only one date if start and end are the same
-#: ../src/Properties.vala:377
+#: src/Properties.vala:380
+#, fuzzy
 msgid "Date:"
 msgstr "Datum:"
 
 #. display only one time if start and end are the same
-#: ../src/Properties.vala:381
+#: src/Properties.vala:384
+#, fuzzy
 msgid "Time:"
 msgstr "Vrijeme:"
 
 #. display time range
 #. display date range
-#: ../src/Properties.vala:384 ../src/Properties.vala:389
+#: src/Properties.vala:387 src/Properties.vala:392
+#, fuzzy
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/Properties.vala:385 ../src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
-msgstr "Do:"
-
-#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1861
-msgid "Size:"
-msgstr "Veličina:"
+msgstr ""
 
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
+#, fuzzy
 msgid "Duration:"
 msgstr "Trajanje:"
 
-#: ../src/Properties.vala:404
-#, c-format
+#: src/Properties.vala:407
+#, fuzzy, c-format
 msgid "%.1f seconds"
-msgstr "%.1f sekundi"
+msgstr "%.1f sekunda"
 
-#: ../src/Properties.vala:408
+#: src/Properties.vala:411
+#, fuzzy
 msgid "Developer:"
 msgstr "Razvijatelj:"
 
-#. 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:2229
-msgid "Exposure:"
-msgstr "Ekspozicija:"
-
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:585
+#: src/Properties.vala:586
+#, fuzzy
 msgid "Location:"
 msgstr "Lokacija:"
 
-#: ../src/Properties.vala:588
+#: src/Properties.vala:589
+#, fuzzy
 msgid "File size:"
-msgstr "Veličina datoteke"
+msgstr "Veličina datoteke:"
 
-#: ../src/Properties.vala:592
+#: src/Properties.vala:593
+#, fuzzy
 msgid "Current Development:"
 msgstr "Trenutni razvoj:"
 
-#: ../src/Properties.vala:594
+#: src/Properties.vala:595
+#, fuzzy
 msgid "Original dimensions:"
-msgstr "Orginalne dimenzije:"
+msgstr "Izvorna razlučivost:"
 
-#: ../src/Properties.vala:597
+#: src/Properties.vala:598
+#, fuzzy
 msgid "Camera make:"
 msgstr "Proizvođač kamere:"
 
-#: ../src/Properties.vala:600
+#: src/Properties.vala:601
+#, fuzzy
 msgid "Camera model:"
 msgstr "Model kamere:"
 
-#: ../src/Properties.vala:603
+#: src/Properties.vala:604
+#, fuzzy
 msgid "Flash:"
 msgstr "Bljeskalica:"
 
-#: ../src/Properties.vala:605
+#: src/Properties.vala:606
+#, fuzzy
 msgid "Focal length:"
 msgstr "Žarišna duljina:"
 
-#: ../src/Properties.vala:608
+#: src/Properties.vala:609
+#, fuzzy
 msgid "Exposure date:"
 msgstr "Datum ekspozicije:"
 
-#: ../src/Properties.vala:611
+#: src/Properties.vala:612
+#, fuzzy
 msgid "Exposure time:"
 msgstr "Vrijeme ekspozicije:"
 
-#: ../src/Properties.vala:614
+#: src/Properties.vala:615
+#, fuzzy
 msgid "Exposure bias:"
 msgstr "Kompenzacija ekspozicije:"
 
-#: ../src/Properties.vala:616
+#: src/Properties.vala:617
+#, fuzzy
 msgid "GPS latitude:"
 msgstr "GPS širina:"
 
-#: ../src/Properties.vala:619
+#: src/Properties.vala:620
+#, fuzzy
 msgid "GPS longitude:"
 msgstr "GPS dužina:"
 
-#: ../src/Properties.vala:622
+#: src/Properties.vala:623
+#, fuzzy
 msgid "Artist:"
 msgstr "Umjetnik:"
 
-#: ../src/Properties.vala:624
+#: src/Properties.vala:625
+#, fuzzy
 msgid "Copyright:"
-msgstr "Prava:"
+msgstr "Autorsko pravo:"
 
-#: ../src/Properties.vala:626
+#: src/Properties.vala:627
+#, fuzzy
 msgid "Software:"
 msgstr "Softver:"
 
-#: ../src/Properties.vala:639
+#: src/Properties.vala:644
+#, fuzzy
 msgid "Extended Information"
 msgstr "Dodatne informacije"
 
-# GNOME Application Class ("Generic Name")
-#: ../src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Upravitelj fotografija"
+#: src/publishing/PublishingPluginHost.vala:11
+#, fuzzy
+msgid "Preparing for upload"
+msgstr "Pripremanje za slanje"
 
-# GNOME Application Class for Direct Edit Mode
-#: ../src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Preglednik fotografija"
+#: src/publishing/PublishingPluginHost.vala:12
+#, fuzzy, c-format
+msgid "Uploading %d of %d"
+msgstr "Šaljem %d od %d"
 
-#: ../src/Resources.vala:144
-msgid "Rotate _Right"
-msgstr "Zakreni _desno"
+#: src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can’t continue because an error occurred:"
+msgstr ""
+
+#: 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."
+
+#. 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] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: 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] ""
+
+#: 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 ""
+
+#: src/publishing/PublishingUI.vala:133
+msgid "Logging in…"
+msgstr ""
 
-#: ../src/Resources.vala:145 ../src/Resources.vala:150
+#: src/publishing/PublishingUI.vala:193
+#, fuzzy
+msgid "Publish Photos"
+msgstr "Objavi fotografije"
+
+#: src/publishing/PublishingUI.vala:194
+#, fuzzy
+msgid "Publish photos _to:"
+msgstr "Objavi fotografije _na:"
+
+#: src/publishing/PublishingUI.vala:196
+#, fuzzy
+msgid "Publish Videos"
+msgstr "Objavi video snimke"
+
+#: src/publishing/PublishingUI.vala:197
+#, fuzzy
+msgid "Publish videos _to"
+msgstr "Objavi video snimke _na"
+
+#: src/publishing/PublishingUI.vala:199
+#, fuzzy
+msgid "Publish Photos and Videos"
+msgstr "Objavi fotografije i video snimke"
+
+#: src/publishing/PublishingUI.vala:200
+#, fuzzy
+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
+msgid "Unable to publish"
+msgstr "Nije moguće objaviti"
+
+#: src/publishing/PublishingUI.vala:411
+#, fuzzy, 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 može objaviti odabrane stavke jer nemate omogućen odgovarajući "
+"priključak za objavljivanje. Kako bi ispravili ovo, odaberite <b>Uredi %s "
+"Osobitosti</b> i omogućite jedan ili više priključaka za objavljivanje u "
+"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
 msgid "Rotate"
 msgstr "Zakreni"
 
-#: ../src/Resources.vala:146
+#: src/Resources.vala:141
+#, fuzzy
 msgid "Rotate Right"
-msgstr "Zakreni desno"
+msgstr "Zakreni udesno"
 
-#: ../src/Resources.vala:147
+#: src/Resources.vala:142 ui/collection.ui:146
+#, fuzzy
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Zakreni fotografije udesno ( pritisni Ctrl za zakretanje ulijevo)"
 
-#: ../src/Resources.vala:149
-msgid "Rotate _Left"
-msgstr "Zakreni _lijevo"
-
-#: ../src/Resources.vala:151
+#: src/Resources.vala:146
+#, fuzzy
 msgid "Rotate Left"
 msgstr "Zakreni lijevo"
 
-#: ../src/Resources.vala:152
+#: src/Resources.vala:147
+#, fuzzy
 msgid "Rotate the photos left"
 msgstr "Zakreni fotografije ulijevo"
 
-#: ../src/Resources.vala:154
-msgid "Flip Hori_zontally"
-msgstr "Okreni _vodoravno"
-
-#: ../src/Resources.vala:155
+#: src/Resources.vala:150
+#, fuzzy
 msgid "Flip Horizontally"
-msgstr "Okreni okomito"
-
-#: ../src/Resources.vala:157
-msgid "Flip Verti_cally"
-msgstr "Okreni _okomito"
+msgstr "Okreni vodoravno"
 
-#: ../src/Resources.vala:158
+#: src/Resources.vala:153
+#, fuzzy
 msgid "Flip Vertically"
 msgstr "Okreni okomito"
 
-#: ../src/Resources.vala:160
-msgid "_Enhance"
-msgstr "_Poboljšaj"
+#: 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
+msgid "_About"
+msgstr "_O programu"
+
+#: src/Resources.vala:156
+#, fuzzy
+msgid "_Apply"
+msgstr "_Primijeni"
 
-#: ../src/Resources.vala:161
+#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
+#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
+#, fuzzy
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: src/Resources.vala:160
+#, fuzzy
+msgid "_Forward"
+msgstr "_Naprijed"
+
+#: src/Resources.vala:161 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
+msgid "_Help"
+msgstr "_Pomoć"
+
+#: src/Resources.vala:163
+#, fuzzy
+msgid "Leave _Fullscreen"
+msgstr "Napusti _cijelozaslonski prikaz"
+
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
+#, fuzzy
+msgid "_New"
+msgstr "_Novo"
+
+#: src/Resources.vala:165
+#, fuzzy
+msgid "_Next"
+msgstr "_Sljedeće"
+
+#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
+#, fuzzy
+msgid "_Preferences"
+msgstr "_Osobitosti"
+
+#: src/Resources.vala:169
+#, fuzzy
+msgid "_Previous"
+msgstr "_Prijašnje"
+
+#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
+#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
+#, fuzzy
+msgid "_Quit"
+msgstr "_Zatvori"
+
+#: src/Resources.vala:172
+#, fuzzy
+msgid "_Refresh"
+msgstr "_Osvježi"
+
+#: src/Resources.vala:174
+#, fuzzy
+msgid "_Revert"
+msgstr "_Vrati"
+
+#: src/Resources.vala:176
+#, fuzzy
+msgid "Save _As"
+msgstr "Spremi _kao"
+
+#: src/Resources.vala:177
+#, fuzzy
+msgid "Sort _Ascending"
+msgstr "Poredaj _rastući"
+
+#: src/Resources.vala:178
+#, fuzzy
+msgid "Sort _Descending"
+msgstr "Poredaj _padajući"
+
+#: src/Resources.vala:179
+#, fuzzy
+msgid "_Stop"
+msgstr "_Zaustavi"
+
+#: src/Resources.vala:180
+#, fuzzy
+msgid "_Undelete"
+msgstr "_Vrati obrisano"
+
+#: src/Resources.vala:181
+#, fuzzy
+msgid "_Normal Size"
+msgstr "_Normalna veličina"
+
+#: src/Resources.vala:182
+#, fuzzy
+msgid "Best _Fit"
+msgstr "_Najbolja prilagodba"
+
+#: src/Resources.vala:183 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
+#: ui/photo.ui:149 ui/tags.ui:265
+#, fuzzy
+msgid "Zoom _Out"
+msgstr "Smanji"
+
+#: src/Resources.vala:187 ui/collection.ui:165
+#, fuzzy
 msgid "Enhance"
 msgstr "Poboljšaj"
 
-#: ../src/Resources.vala:162
-msgid "Automatically improve the photo's appearance"
-msgstr "Automatski poboljšaj izgled fotografije"
-
-#: ../src/Resources.vala:164
-msgid "_Copy Color Adjustments"
-msgstr "_Kopiraj prilagodbe boje"
+#: src/Resources.vala:188 ui/collection.ui:162
+msgid "Automatically improve the photo’s appearance"
+msgstr ""
 
-#: ../src/Resources.vala:165
+#: src/Resources.vala:191
+#, fuzzy
 msgid "Copy Color Adjustments"
 msgstr "Kopiraj prilagodbe boje"
 
-#: ../src/Resources.vala:166
+#: src/Resources.vala:192
+#, fuzzy
 msgid "Copy the color adjustments applied to the photo"
-msgstr "Kopiraj prilagodbe boje primjenjene na fotografiju"
+msgstr "Kopiraj prilagodbe boje primijenjene na fotografiju"
 
-#: ../src/Resources.vala:168
-msgid "_Paste Color Adjustments"
-msgstr "_Zalijepi prilagodbe boje"
-
-#: ../src/Resources.vala:169
+#: src/Resources.vala:195
+#, fuzzy
 msgid "Paste Color Adjustments"
 msgstr "Zalijepi prilagodbe boje"
 
-#: ../src/Resources.vala:170
+#: src/Resources.vala:196
+#, fuzzy
 msgid "Apply copied color adjustments to the selected photos"
-msgstr "Kopiraj prilagodbe boje primijenjene na odabranoj fotografiji"
+msgstr "Primijeni kopirane prilagodbe boje na odabrane fotografije"
 
-#: ../src/Resources.vala:172
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
+#, fuzzy
 msgid "_Crop"
-msgstr "Odreži"
+msgstr "_Obreži"
 
-#: ../src/Resources.vala:173
+#: src/Resources.vala:199
+#, fuzzy
 msgid "Crop"
-msgstr "Odreži"
-
-#: ../src/Resources.vala:174
-msgid "Crop the photo's size"
-msgstr "Obreži fotografiju na odabranu veličinu."
+msgstr "Obreži"
 
-#: ../src/Resources.vala:176 ../src/editing_tools/StraightenTool.vala:100
-msgid "_Straighten"
-msgstr "_Ispravi"
+#: src/Resources.vala:200
+msgid "Crop the photo’s size"
+msgstr ""
 
-#: ../src/Resources.vala:177
+#: src/Resources.vala:203
+#, fuzzy
 msgid "Straighten"
 msgstr "Ispravi"
 
-#: ../src/Resources.vala:178
+#: src/Resources.vala:204
+#, fuzzy
 msgid "Straighten the photo"
-msgstr "Izravnaj fotografiju"
+msgstr "Ispravi fotografiju"
 
-#: ../src/Resources.vala:180
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
+#, fuzzy
 msgid "_Red-eye"
 msgstr "_Crvene oči"
 
-#: ../src/Resources.vala:181
+#: src/Resources.vala:207
+#, fuzzy
 msgid "Red-eye"
 msgstr "Crvene oči"
 
-#: ../src/Resources.vala:182
+#: src/Resources.vala:208
+#, fuzzy
 msgid "Reduce or eliminate any red-eye effects in the photo"
-msgstr "Uklanjanje ili reduciranje efekta crvenih očiju na fotografiji"
+msgstr "Uklanjanje ili smanjenje efekta crvenih očiju na fotografiji"
 
-#: ../src/Resources.vala:184
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
+#, fuzzy
 msgid "_Adjust"
-msgstr "Podesi"
+msgstr "_Prilagodi"
 
-#: ../src/Resources.vala:185
+#: src/Resources.vala:211
+#, fuzzy
 msgid "Adjust"
-msgstr "Podešavanje"
+msgstr "Prilagodi"
 
-#: ../src/Resources.vala:186
-msgid "Adjust the photo's color and tone"
-msgstr "Podešavanje boje i tonaliteta na fotografiji"
-
-#: ../src/Resources.vala:188
-msgid "Re_vert to Original"
-msgstr "_Vrati na izvorno"
+#: src/Resources.vala:212
+msgid "Adjust the photo’s color and tone"
+msgstr ""
 
-#: ../src/Resources.vala:189
+#: src/Resources.vala:215
+#, fuzzy
 msgid "Revert to Original"
 msgstr "Vrati na izvorno"
 
-#: ../src/Resources.vala:191
+#: src/Resources.vala:217
+#, fuzzy
 msgid "Revert External E_dits"
 msgstr "Poništi _vanjska uređivanja fotografije"
 
-#: ../src/Resources.vala:192
+#: src/Resources.vala:218
+#, fuzzy
 msgid "Revert to the master photo"
 msgstr "Vrati na izvornu fotografiju"
 
-#: ../src/Resources.vala:194
-msgid "Set as _Desktop Background"
-msgstr "Podesi kao pozadinu _radne površine"
-
-#: ../src/Resources.vala:195
+#: src/Resources.vala:221
+#, fuzzy
 msgid "Set selected image to be the new desktop background"
 msgstr "Postavi odabranu sliku kao pozadinu radne površine"
 
-#: ../src/Resources.vala:196
-msgid "Set as _Desktop Slideshow..."
-msgstr "Postavi kao prezentaciju na _radnu površinu"
+#: src/Resources.vala:222
+msgid "Set as _Desktop Slideshow…"
+msgstr ""
 
-#: ../src/Resources.vala:198
+#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
+#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
+#, fuzzy
 msgid "_Undo"
 msgstr "_Vrati"
 
-#: ../src/Resources.vala:199
+#: src/Resources.vala:225
+#, fuzzy
 msgid "Undo"
 msgstr "Vrati"
 
-#: ../src/Resources.vala:201
+#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
+#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
+#, fuzzy
 msgid "_Redo"
-msgstr "Vrati _natrag"
+msgstr "_Ponovi"
 
-#: ../src/Resources.vala:202
+#: src/Resources.vala:228
+#, fuzzy
 msgid "Redo"
-msgstr "Vrati natrag"
+msgstr "Ponovi"
 
-#: ../src/Resources.vala:204
-msgid "Re_name Event..."
-msgstr "P_reimenuj događaj..."
+#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:391 ui/event.ui:584
+msgid "Re_name Event…"
+msgstr ""
 
-#: ../src/Resources.vala:207
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
+#, fuzzy
 msgid "Make _Key Photo for Event"
 msgstr "Napravi _glavnu fotografiju za događaj"
 
-#: ../src/Resources.vala:208
+#: src/Resources.vala:234
+#, fuzzy
 msgid "Make Key Photo for Event"
 msgstr "Napravi glavnu fotografiju za događaj"
 
-#: ../src/Resources.vala:210
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
+#, fuzzy
 msgid "_New Event"
 msgstr "_Novi događaj"
 
-#: ../src/Resources.vala:211
+#: src/Resources.vala:237
+#, fuzzy
 msgid "New Event"
 msgstr "Novi događaj"
 
-#: ../src/Resources.vala:213
+#: src/Resources.vala:239
+#, fuzzy
 msgid "Move Photos"
 msgstr "Premjesti fotografije"
 
-#: ../src/Resources.vala:214
+#: src/Resources.vala:240
+#, fuzzy
 msgid "Move photos to an event"
 msgstr "Premjesti fotografije u događaj"
 
-#: ../src/Resources.vala:216
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
+#, fuzzy
 msgid "_Merge Events"
 msgstr "_Spoji događaje"
 
-#: ../src/Resources.vala:217
+#: src/Resources.vala:243
+#, fuzzy
 msgid "Merge"
 msgstr "Spoji"
 
-#: ../src/Resources.vala:218
+#: src/Resources.vala:244
+#, fuzzy
 msgid "Combine events into a single event"
 msgstr "Kombiniraj više događaja u jedan događaj"
 
-#: ../src/Resources.vala:220
+#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
+#, fuzzy
 msgid "_Set Rating"
-msgstr "_Postavi ocjene"
+msgstr "_Postavi ocjenu"
 
-#: ../src/Resources.vala:221
+#: src/Resources.vala:247
+#, fuzzy
 msgid "Set Rating"
 msgstr "Postavi ocijenu"
 
-#: ../src/Resources.vala:222
+#: src/Resources.vala:248
+#, fuzzy
 msgid "Change the rating of your photo"
-msgstr "Promjeni ocjenu fotografije"
+msgstr "Promijeni ocjenu fotografije"
 
-#: ../src/Resources.vala:224
+#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
+#, fuzzy
 msgid "_Increase"
 msgstr "_Povećaj"
 
-#: ../src/Resources.vala:225
+#: src/Resources.vala:251
+#, fuzzy
 msgid "Increase Rating"
 msgstr "Povećaj ocjenu"
 
-#: ../src/Resources.vala:227
+#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
+#, fuzzy
 msgid "_Decrease"
 msgstr "_Smanji"
 
-#: ../src/Resources.vala:228
+#: src/Resources.vala:254
+#, fuzzy
 msgid "Decrease Rating"
 msgstr "Smanji ocjenu"
 
-#: ../src/Resources.vala:230
+#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
+#, fuzzy
 msgid "_Unrated"
 msgstr "_Neocijenjeno"
 
-#: ../src/Resources.vala:231
+#: src/Resources.vala:257
+#, fuzzy
 msgid "Unrated"
 msgstr "Neocjenjeno"
 
-#: ../src/Resources.vala:232
+#: src/Resources.vala:258
+#, fuzzy
 msgid "Rate Unrated"
 msgstr "Ocijeni neocjenjeno"
 
-#: ../src/Resources.vala:233
+#: src/Resources.vala:259
+#, fuzzy
 msgid "Setting as unrated"
-msgstr "Postavljanje neocjenjeno"
+msgstr "Postavljanje kao neocjenjeno"
 
-#: ../src/Resources.vala:234
+#: src/Resources.vala:260
+#, fuzzy
 msgid "Remove any ratings"
 msgstr "Ukloni sve ocjene"
 
-#: ../src/Resources.vala:236
+#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
+#, fuzzy
 msgid "_Rejected"
 msgstr "_Odbačene"
 
-#: ../src/Resources.vala:237
+#: src/Resources.vala:263
+#, fuzzy
 msgid "Rejected"
-msgstr "Odbijeno"
+msgstr "Odbačene"
 
-#: ../src/Resources.vala:238
+#: src/Resources.vala:264
+#, fuzzy
 msgid "Rate Rejected"
-msgstr "Ocjeni odbijeno"
+msgstr "Ocjeni odbačene"
 
-#: ../src/Resources.vala:239
+#: src/Resources.vala:265
+#, fuzzy
 msgid "Setting as rejected"
-msgstr "Postavljeno kao odbijeno"
+msgstr "Postavljanje kao odbačeno"
 
-#: ../src/Resources.vala:240
+#: src/Resources.vala:266
+#, fuzzy
 msgid "Set rating to rejected"
-msgstr "Postavi ocjenu kao odbijeno"
+msgstr "Postavi ocjenu kao odbačenu"
 
-#: ../src/Resources.vala:242
+#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
+#, fuzzy
 msgid "Rejected _Only"
-msgstr "Samo _odbijene"
+msgstr "Samo _odbačene"
 
-#: ../src/Resources.vala:243
+#: src/Resources.vala:269
+#, fuzzy
 msgid "Rejected Only"
-msgstr "Samo odbijene"
+msgstr "Samo odbačene"
 
-#: ../src/Resources.vala:244
+#: src/Resources.vala:270
+#, fuzzy
 msgid "Show only rejected photos"
-msgstr "Prikaži samo odbijene fotografije"
+msgstr "Prikaži samo odbačene fotografije"
 
-#: ../src/Resources.vala:246
+#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
+#, fuzzy
 msgid "All + _Rejected"
-msgstr "Sve + _odbijene"
+msgstr "Sve + _Odbačene"
 
-#: ../src/Resources.vala:247 ../src/Resources.vala:248
+#: src/Resources.vala:273
+#, fuzzy
+msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
-msgstr "Prikaži sve fotografije, zajedno s odbijenima"
+msgstr "Prikaži sve fotografije, zajedno s odbačenima"
 
-#: ../src/Resources.vala:250
+#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
+#, fuzzy
 msgid "_All Photos"
 msgstr "_Sve fotografije"
 
-#: ../src/Resources.vala:251 ../src/Resources.vala:252
+#. Button tooltip
+#: src/Resources.vala:277
+#, fuzzy
 msgid "Show all photos"
 msgstr "Prikaži sve fotografije"
 
-#: ../src/Resources.vala:254
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
+#, fuzzy
 msgid "_Ratings"
 msgstr "_Ocjene"
 
-#: ../src/Resources.vala:255
-msgid "Display each photo's rating"
-msgstr "Prikaži ocjene svake fotografije"
+#: src/Resources.vala:280
+msgid "Display each photo’s rating"
+msgstr ""
 
-#: ../src/Resources.vala:257
+#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
+#, fuzzy
 msgid "_Filter Photos"
 msgstr "_Filtriraj fotografije"
 
-#: ../src/Resources.vala:258
+#: src/Resources.vala:283
+#, fuzzy
 msgid "Filter Photos"
 msgstr "Filtriraj fotografije"
 
-#: ../src/Resources.vala:259
+#: src/Resources.vala:284
+#, fuzzy
 msgid "Limit the number of photos displayed based on a filter"
-msgstr "Ogranići broj fotografija bazirano na filter"
-
-#: ../src/Resources.vala:261
-msgid "_Duplicate"
-msgstr "_Duplikat"
+msgstr "Ograniči broj prikaza fotografija temeljeno na filteru"
 
-#: ../src/Resources.vala:262
+#: src/Resources.vala:287
+#, fuzzy
 msgid "Duplicate"
 msgstr "Duplikat"
 
-#: ../src/Resources.vala:263
+#: src/Resources.vala:288
+#, fuzzy
 msgid "Make a duplicate of the photo"
 msgstr "Napravi duplikat fotografije"
 
-#: ../src/Resources.vala:265
-msgid "_Export..."
-msgstr "_Izvoz..."
+#: src/Resources.vala:290 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
+msgid "_Export…"
+msgstr ""
 
-#: ../src/Resources.vala:267
-msgid "_Print..."
-msgstr "Is_pis..."
+#: src/Resources.vala:292
+msgid "_Print…"
+msgstr ""
 
-#: ../src/Resources.vala:269
-msgid "Pu_blish..."
-msgstr "O_bjavi..."
+#: src/Resources.vala:294
+msgid "Pu_blish…"
+msgstr ""
 
-#: ../src/Resources.vala:271
+#: src/Resources.vala:296 ui/collection.ui:187
+#, fuzzy
 msgid "Publish to various websites"
-msgstr "Objavi na internet stranice"
+msgstr "Objavi na raznim web stranicama"
 
-#: ../src/Resources.vala:273
-msgid "Edit _Title..."
-msgstr "Uredi _naslov..."
+#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
+msgid "Edit _Title…"
+msgstr ""
+
+#. Button label
+#: src/Resources.vala:300
+msgctxt "Button Label"
+msgid "Edit Title"
+msgstr ""
 
-#: ../src/Resources.vala:276
-msgid "Edit _Comment..."
-msgstr "Uredi _komentar..."
+#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539
+#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344
+msgid "Edit _Comment…"
+msgstr ""
 
-#: ../src/Resources.vala:277
+#. Button label
+#: src/Resources.vala:304
+#, fuzzy
 msgid "Edit Comment"
 msgstr "Uredi komentar"
 
-#: ../src/Resources.vala:279
-msgid "Edit Event _Comment..."
-msgstr "Uredi događaj _komentara..."
+#: src/Resources.vala:306 ui/event.ui:588
+msgid "Edit Event _Comment…"
+msgstr ""
 
-#: ../src/Resources.vala:282
-msgid "_Adjust Date and Time..."
-msgstr "Podesi _datum i vrijeme"
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
+msgid "_Adjust Date and Time…"
+msgstr ""
 
-#: ../src/Resources.vala:283
+#: src/Resources.vala:310
+#, fuzzy
 msgid "Adjust Date and Time"
 msgstr "Podesi datum i vrijeme"
 
-#: ../src/Resources.vala:285
-msgid "Add _Tags..."
-msgstr "Dodaj _oznake"
+#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456
+#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388
+msgid "Add _Tags…"
+msgstr ""
 
-#: ../src/Resources.vala:286
-msgid "_Add Tags..."
-msgstr "_Dodaj oznake..."
+#: src/Resources.vala:313 ui/photo_context.ui:17
+msgid "_Add Tags…"
+msgstr ""
 
-#: ../src/Resources.vala:287 ../src/Resources.vala:318
+#. Dialog title
+#: src/Resources.vala:315
+#, fuzzy
+msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Dodaj oznake"
 
-#: ../src/Resources.vala:289
-msgid "_Preferences"
-msgstr "_Osobitosti"
-
-#: ../src/Resources.vala:291
-msgid "Open With E_xternal Editor"
-msgstr "Otvori s v_anjskim uređivačem"
-
-#: ../src/Resources.vala:293
-msgid "Open With RA_W Editor"
-msgstr "Otvori sa _RAW uređivačem"
-
-#: ../src/Resources.vala:295
-msgid "Send _To..."
-msgstr "Pošalji _na..."
-
-#: ../src/Resources.vala:296
-msgid "Send T_o..."
-msgstr "Pošalj_i u..."
+#: src/Resources.vala:324 ui/photo_context.ui:133
+msgid "Send T_o…"
+msgstr ""
 
-#: ../src/Resources.vala:298
-msgid "_Find..."
-msgstr "_Pretraži..."
+#: src/Resources.vala:326
+msgid "_Find…"
+msgstr ""
 
-#: ../src/Resources.vala:299
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
+#, fuzzy
 msgid "Find"
 msgstr "Pretraži"
 
-#: ../src/Resources.vala:300
+#: src/Resources.vala:328 ui/collection.ui:212 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:302
+#: src/Resources.vala:330
+#, fuzzy
 msgid "_Flag"
 msgstr "_Označi"
 
-#: ../src/Resources.vala:304
+#: src/Resources.vala:332
+#, fuzzy
 msgid "Un_flag"
-msgstr "_Odznači"
+msgstr "_Ukloni oznaku"
 
-#: ../src/Resources.vala:307
-#, c-format
+#: src/Resources.vala:335
+#, fuzzy, c-format
 msgid "Unable to launch editor: %s"
-msgstr "Ne mogu pokrenuti uređivač: %s"
+msgstr "Nemoguće pokretanje uređivača: %s"
 
-#: ../src/Resources.vala:312
+#: src/Resources.vala:340
 #, c-format
-msgid "Add Tag \"%s\""
-msgstr "Dodaj oznaku \"%s\""
+msgid "Add Tag “%s”"
+msgstr ""
 
-#: ../src/Resources.vala:314
+#. Used when adding two tags to photo(s)
+#: src/Resources.vala:343
 #, c-format
-msgid "Add Tags \"%s\" and \"%s\""
-msgstr "Dodaj oznake \"%s\" i \"%s\""
+msgid "Add Tags “%s” and “%s”"
+msgstr ""
 
-#: ../src/Resources.vala:322
+#. Undo/Redo command name (in Edit menu)
+#: src/Resources.vala:348
+#, fuzzy
+msgctxt "UndoRedo menu entry"
+msgid "Add Tags"
+msgstr "Dodaj oznake"
+
+#: src/Resources.vala:353
 #, c-format
-msgid "_Delete Tag \"%s\""
-msgstr "O_briši oznaku \"%s\""
+msgid "_Delete Tag “%s”"
+msgstr ""
 
-#: ../src/Resources.vala:326
+#: src/Resources.vala:357
 #, c-format
-msgid "Delete Tag \"%s\""
-msgstr "Obriši oznaku \"%s\""
+msgid "Delete Tag “%s”"
+msgstr ""
 
-#: ../src/Resources.vala:329
+#: src/Resources.vala:360
+#, fuzzy
 msgid "Delete Tag"
 msgstr "Obriši oznaku"
 
-#: ../src/Resources.vala:332
-msgid "_New"
-msgstr "_Novo"
-
-#: ../src/Resources.vala:335
+#: src/Resources.vala:366
 #, c-format
-msgid "Re_name Tag \"%s\"..."
-msgstr "_Preimenuj oznaku \"%s\""
+msgid "Re_name Tag “%s”…"
+msgstr ""
 
-#: ../src/Resources.vala:339
+#: src/Resources.vala:370
 #, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
-msgstr "Preimenuj oznaku \"%s\" u \"%s\""
+msgid "Rename Tag “%s” to “%s”"
+msgstr ""
 
-#: ../src/Resources.vala:342
-msgid "_Rename..."
-msgstr "_Preimenuj..."
+#: src/Resources.vala:373 ui/tags.ui:454
+msgid "_Rename…"
+msgstr ""
 
-#: ../src/Resources.vala:344
-msgid "Modif_y Tags..."
-msgstr "Promijen_i oznake..."
+#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461
+#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393
+msgid "Modif_y Tags…"
+msgstr ""
 
-#: ../src/Resources.vala:345
+#: src/Resources.vala:376
+#, fuzzy
 msgid "Modify Tags"
 msgstr "Promijeni oznake"
 
-#: ../src/Resources.vala:348
+#: src/Resources.vala:379
 #, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "Označi fotografija kao \"%s\""
-
-#: ../src/Resources.vala:348
-#, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "Označi fotografije kao \"%s\""
-
-#: ../src/Resources.vala:352
-#, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "Označi odabrane fotografije kao \"%s\""
-
-#: ../src/Resources.vala:353
-#, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr "Označi odabrane forografije s \"%s\""
-
-#: ../src/Resources.vala:357
-#, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "Ukloni oznaku \"%s\" s _fotografije"
+msgid "Tag Photo as “%s”"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Resources.vala:358
+#: src/Resources.vala:385
 #, c-format
-msgid "Remove Tag \"%s\" From _Photos"
-msgstr "Ukloni oznaku \"%s\" s _fotografija"
+msgid "Tag the selected photo as “%s”"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Resources.vala:362
+#: src/Resources.vala:391
 #, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "Ukloni oznaku \"%s\" s fotografije"
+msgid "Remove Tag “%s” From _Photo"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Resources.vala:363
+#: src/Resources.vala:397
 #, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr "Ukloni oznaku \"%s\" s fotografija"
+msgid "Remove Tag “%s” From Photo"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
 
-#: ../src/Resources.vala:367
+#: src/Resources.vala:403
 #, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
-msgstr "Nemoguće preimenovati oznaku \"%s\" jer ta oznaka već postoji."
+msgid "Unable to rename tag to “%s” because the tag already exists."
+msgstr ""
 
-#: ../src/Resources.vala:371
+#: src/Resources.vala:407
 #, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
-msgstr "Nemoguće preimenovati pretragu u \"%s\" jer ta pretraga već postoji."
+msgid "Unable to rename search to “%s” because the search already exists."
+msgstr ""
 
-#: ../src/Resources.vala:374
+#. Saved search button
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
+#, fuzzy
 msgid "Saved Search"
 msgstr "Spremljena pretraga"
 
-#: ../src/Resources.vala:376
+#: src/Resources.vala:412
+#, fuzzy
 msgid "Delete Search"
 msgstr "Obriši pretragu"
 
-#: ../src/Resources.vala:379
-msgid "_Edit..."
-msgstr "_Uredi"
+#: src/Resources.vala:415 ui/savedsearch.ui:11
+msgid "_Edit…"
+msgstr ""
 
-#: ../src/Resources.vala:380
-msgid "Re_name..."
-msgstr "Pre_imenuj"
+#: src/Resources.vala:416 ui/savedsearch.ui:7
+msgid "Re_name…"
+msgstr ""
 
-#: ../src/Resources.vala:383
+#: src/Resources.vala:419
 #, c-format
-msgid "Rename Search \"%s\" to \"%s\""
-msgstr "Preimenuj pretragu \"%s\" u \"%s\""
+msgid "Rename Search “%s” to “%s”"
+msgstr ""
 
-#: ../src/Resources.vala:387
+#: src/Resources.vala:423
 #, c-format
-msgid "Delete Search \"%s\""
-msgstr "Obriši pretragu \"%s\""
+msgid "Delete Search “%s”"
+msgstr ""
 
-#: ../src/Resources.vala:545
-#, c-format
+#: src/Resources.vala:560
+#, fuzzy, c-format
 msgid "Rate %s"
-msgstr "Ocijeni %s"
+msgstr "Ocjeni %s"
 
-#: ../src/Resources.vala:546
-#, c-format
+#: src/Resources.vala:561
+#, fuzzy, c-format
 msgid "Set rating to %s"
 msgstr "Postavi ocjenu na %s"
 
-#: ../src/Resources.vala:547
-#, c-format
+#: src/Resources.vala:562
+#, fuzzy, c-format
 msgid "Setting rating to %s"
 msgstr "Postavljanje ocjene na %s"
 
-#: ../src/Resources.vala:549
-#, c-format
+#: src/Resources.vala:564
+#, fuzzy, c-format
 msgid "Display %s"
 msgstr "Prikaži %s"
 
-#: ../src/Resources.vala:550
-#, c-format
+#: src/Resources.vala:565
+#, fuzzy, c-format
 msgid "Only show photos with a rating of %s"
-msgstr "Prikaz fotografija sa ocijenom %s"
+msgstr "Prikaži samo fotografije sa ocjenom %s"
 
-#: ../src/Resources.vala:551
-#, c-format
+#: src/Resources.vala:566
+#, fuzzy, c-format
 msgid "%s or Better"
 msgstr "%s ili bolje"
 
-#: ../src/Resources.vala:552
-#, c-format
+#: src/Resources.vala:567
+#, fuzzy, c-format
 msgid "Display %s or Better"
 msgstr "Prikaži %s ili bolje"
 
-#: ../src/Resources.vala:553
-#, c-format
+#: src/Resources.vala:568
+#, fuzzy, 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:644
+#: src/Resources.vala:659 ui/trash.ui:255
+#, fuzzy
 msgid "Remove the selected photos from the trash"
 msgstr "Ukloni odabrane fotografije iz smeća"
 
-#: ../src/Resources.vala:645
+#: src/Resources.vala:660 ui/offline.ui:221
+#, fuzzy
 msgid "Remove the selected photos from the library"
 msgstr "Ukloni odabrane fotografije iz fototeke"
 
-#: ../src/Resources.vala:647
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
+#, fuzzy
 msgid "_Restore"
 msgstr "_Vrati natrag"
 
-#: ../src/Resources.vala:648
+#: src/Resources.vala:663 ui/trash.ui:270
+#, fuzzy
 msgid "Move the selected photos back into the library"
 msgstr "Vrati odabrane fotografije natrag u fototeku"
 
-#: ../src/Resources.vala:650
+#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
+#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
+#, fuzzy
 msgid "Show in File Mana_ger"
-msgstr "Otvori upraviteljem datotekama"
+msgstr "Prikaži u upravitelju _datoteka"
 
-#: ../src/Resources.vala:651
-msgid "Open the selected photo's directory in the file manager"
-msgstr "Otvori odabrane fotografije u upravitelju datoteka"
+#: src/Resources.vala:666
+msgid "Open the selected photo’s directory in the file manager"
+msgstr ""
 
-#: ../src/Resources.vala:654
-#, c-format
+#: src/Resources.vala:669
+#, fuzzy, c-format
 msgid "Unable to open in file manager: %s"
-msgstr "Ne mogu otvoriti u upravitelju datoteka: %s"
+msgstr "Nemoguće otvaranje u upravitelju datoteka: %s"
 
-#: ../src/Resources.vala:657
+#: src/Resources.vala:672 ui/offline.ui:224
+#, fuzzy
 msgid "R_emove From Library"
 msgstr "_Ukloni iz fototeke"
 
-#: ../src/Resources.vala:659
+#: 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
 msgid "_Move to Trash"
 msgstr "_Premjesti u smeće"
 
-#: ../src/Resources.vala:661
+#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
+#, fuzzy
 msgid "Select _All"
 msgstr "Odaberi _sve"
 
-#: ../src/Resources.vala:662
+#: src/Resources.vala:677
+#, fuzzy
 msgid "Select all items"
 msgstr "Odaberi sve stavke"
 
@@ -3384,1388 +5963,908 @@ msgstr "Odaberi sve stavke"
 #. / 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:743
-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:748
-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:752
+#: src/Resources.vala:738
+#, fuzzy
 msgid "%a %b %d, %Y"
-msgstr "%A, %d %b , %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:757 ../src/Resources.vala:767
+#: src/Resources.vala:743
+#, fuzzy
+msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a %b %d"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:762
+#: src/Resources.vala:748
+#, fuzzy
+msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
-#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
-msgid "Slideshow"
-msgstr "Prezentacija"
-
-#. Flagged label and toggle
-#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:990 ../src/library/FlaggedPage.vala:8
-msgid "Flagged"
-msgstr "Označeno"
-
-#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
-msgid "Photos"
-msgstr "Fotografije"
-
-#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Video snimke"
-
-#: ../src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "RAW fotografija"
-
-#: ../src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "RAW fotografije"
-
-#: ../src/SearchFilter.vala:952
-#, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Greška kod čitanja UI datoteke %s: %s"
-
-#. Type label and toggles
-#: ../src/SearchFilter.vala:969
-msgid "Type"
-msgstr "Vrsta"
-
-#. Rating label and button
-#: ../src/SearchFilter.vala:1003 ../src/searches/SearchBoolean.vala:184
-msgid "Rating"
-msgstr "Ocjena"
-
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:182
-msgid "Settings"
-msgstr "Postavke"
-
-#. Set up toolbar
-#. add toolbar buttons
-#: ../src/SlideshowPage.vala:161
-msgid "Back"
-msgstr "Natrag"
-
-#: ../src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Na prijašnju fotografiju"
-
-#: ../src/SlideshowPage.vala:168 ../src/SlideshowPage.vala:273
-msgid "Pause"
-msgstr "Pauza"
-
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:274
-msgid "Pause the slideshow"
-msgstr "Pauziraj prezentaciju"
-
-#: ../src/SlideshowPage.vala:175
-msgid "Next"
-msgstr "Naprijed"
-
-#: ../src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Na sljedeću fotografiju"
-
-#: ../src/SlideshowPage.vala:183
-msgid "Change slideshow settings"
-msgstr "Promjeni postavke prezentacije"
-
-#. An entire slideshow set might be missing, so check for a loop.
-#: ../src/SlideshowPage.vala:237
-msgid "All photo source files are missing."
-msgstr "Nedostaju sve fotografije."
-
-#: ../src/SlideshowPage.vala:269
-msgid "Play"
-msgstr "Pokreni"
-
-#: ../src/SlideshowPage.vala:270
-msgid "Continue the slideshow"
-msgstr "Nastavi prezentaciju"
-
-#: ../src/Tag.vala:817
-msgid "untitled"
-msgstr "neimenovano"
-
-#. multiple videos
-#: ../src/VideoSupport.vala:486
-msgid "Export Videos"
-msgstr "Izvoz video snimke"
-
-#: ../src/camera/Branch.vala:87
-msgid "Cameras"
-msgstr "Kamere"
-
-#: ../src/camera/ImportPage.vala:459
-msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
-msgstr ""
-"Ne mogu odmontirati kameru. Pokušajte je odmontirati preko upravitelja "
-"datoteka."
-
-#. hide duplicates checkbox
-#: ../src/camera/ImportPage.vala:776
-msgid "Hide photos already imported"
-msgstr "Sakrij fotografije koje su već uvezene."
-
-#: ../src/camera/ImportPage.vala:777
-msgid "Only display photos that have not been imported"
-msgstr "Prikaži samo fotografije koje nisu uvezene."
-
-#. 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:845
-msgid "Starting import, please wait..."
-msgstr "Uvoženje, pričekajte..."
-
-#: ../src/camera/ImportPage.vala:884
-msgid "Import _Selected"
-msgstr "Uvezi _odabrane"
-
-#: ../src/camera/ImportPage.vala:885
-msgid "Import the selected photos into your library"
-msgstr "Uvezi odabrane fotografije u fototeku"
-
-#: ../src/camera/ImportPage.vala:890
-msgid "Import _All"
-msgstr "Uvezi _sve"
-
-#: ../src/camera/ImportPage.vala:891
-msgid "Import all the photos into your library"
-msgstr "Uvezi sve fotografije u fototeku"
-
-#. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1012
-msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
-msgstr ""
-"Shotwell treba maknuti kameru u datotečnog sistema. Želite li nastaviti?"
-
-#: ../src/camera/ImportPage.vala:1018
-msgid "_Unmount"
-msgstr "_Odmontiraj"
-
-#: ../src/camera/ImportPage.vala:1023
-msgid "Please unmount the camera."
-msgstr "Molim domontirajte kameru"
-
-#: ../src/camera/ImportPage.vala:1028
-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:1038
-msgid "Please close any other application using the camera."
-msgstr "Zatvorite druge aplikacije koje bi mogle koristiti kameru."
-
-#: ../src/camera/ImportPage.vala:1043
-#, c-format
-msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
-msgstr ""
-"Ne mogu preuzeti pretpregled s kamere: \n"
-" %s"
-
-#: ../src/camera/ImportPage.vala:1060
-msgid "Unmounting..."
-msgstr "Odmontiravam...."
-
-#: ../src/camera/ImportPage.vala:1166
-msgid "Fetching photo information"
-msgstr "Preuzimam informacije o fotografijama"
-
-#: ../src/camera/ImportPage.vala:1521
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "Preuzimam pretpregled za %s"
-
-#: ../src/camera/ImportPage.vala:1637
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "Ne mogu zaključati kameru: %s"
-
-#: ../src/camera/ImportPage.vala:1722
-#, c-format
-msgid "Delete this photo from camera?"
-msgid_plural "Delete these %d photos from camera?"
-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:1725
-#, c-format
-msgid "Delete this video from camera?"
-msgid_plural "Delete these %d videos from camera?"
-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:1728
-#, c-format
-msgid "Delete this photo/video from camera?"
-msgid_plural "Delete these %d photos/videos from camera?"
-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:1731
-#, c-format
-msgid "Delete these files from camera?"
-msgid_plural "Delete these %d files from camera?"
-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:1758
-msgid "Removing photos/videos from camera"
-msgstr "Uklanjanje fotografija/video snimaka s kamere"
-
-#: ../src/camera/ImportPage.vala:1762
-#, 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] ""
-"Nemoguće obrisati %d fotografiju/video snimku s kamere zbog grešaka."
-msgstr[1] ""
-"Nemoguće obrisati %d fotografije/video snimke s kamere zbog grešaka."
-msgstr[2] ""
-"Nemoguće obrisati %d fotografija/video snimaka s kamere zbog grešaka."
-
-#: ../src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Uvoz podataka"
-
-#. 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 "Baza podataka %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 "Uvoz iz %s se ne može nastaviti zbog greške:"
-
-#: ../src/data_imports/DataImportsPluginHost.vala:151
-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
-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 ""
-"Nemate omogućen nijedan priključak za uvoz podataka.\n"
-"\n"
-"Kako bi mogli koristiti uvoz iz aplikacija, morate imati omogućen barem "
-"jedan takav priključak. Oni se mogu omogućiti u dijalogu \"Osobitosti\"."
-
-#: ../src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Datoteka baze podataka:"
-
-#: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:899
-msgid "_Import"
-msgstr "_Uvezi"
-
-#: ../src/data_imports/DataImportsUI.vala:216
-msgid "Import From Application"
-msgstr "Uvezi iz aplikacije"
-
-#: ../src/data_imports/DataImportsUI.vala:217
-msgid "Import media _from:"
-msgstr "Uvezi medije _iz:"
-
-#: ../src/data_imports/DataImportsUI.vala:394
-#: ../src/publishing/PublishingUI.vala:556
-msgid "_Close"
-msgstr "_Zatvori"
-
-#: ../src/db/DatabaseTable.vala:37
-#, 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"
-
-#: ../src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"Nemoguće pisati u datoteku baze podataka slike:\n"
-" %s"
-
-#: ../src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Greška u pristupanju datoteke baze podataka:\n"
-" %s\n"
-"\n"
-"Greška je: \n"
-"%s"
-
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:352
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../src/direct/DirectPhotoPage.vala:51 ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save"
-msgstr "_Spremi"
-
-#: ../src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Spremi fotografiju"
-
-#: ../src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Spremi _kao..."
-
-#: ../src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Spremi fotografiju pod drugim nazivom"
-
-#: ../src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Ispisivanje fotografije na pisač koji je prikljućen na računalo"
-
-#: ../src/direct/DirectPhotoPage.vala:73 ../src/library/LibraryWindow.vala:356
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:364
-msgid "_Photo"
-msgstr "_Fotografija"
-
-#: ../src/direct/DirectPhotoPage.vala:169 ../src/library/LibraryWindow.vala:380
-msgid "_Help"
-msgstr "_Pomoć"
-
-#: ../src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid "%s does not exist."
-msgstr "%s ne postoji."
-
-#: ../src/direct/DirectPhotoPage.vala:229
-#, c-format
-msgid "%s is not a file."
-msgstr "%s nije datoteka."
-
-#: ../src/direct/DirectPhotoPage.vala:231
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s ne podržava vrstu datoteke\n"
-"%s."
-
-#: ../src/direct/DirectPhotoPage.vala:417
-msgid "_Save a Copy"
-msgstr "_Spremi kopiju"
-
-#: ../src/direct/DirectPhotoPage.vala:420
-#, c-format
-msgid "Lose changes to %s?"
-msgstr "Poništavanje promjena na %s?"
-
-#: ../src/direct/DirectPhotoPage.vala:421
-msgid "Close _without Saving"
-msgstr "Zatvori _bez spremanja"
-
-#: ../src/direct/DirectPhotoPage.vala:454
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "greška kod spremanja %s: %s"
-
-#: ../src/direct/DirectPhotoPage.vala:482
-#: ../src/direct/DirectPhotoPage.vala:503
-msgid "Save As"
-msgstr "Spremi kao"
-
-#: ../src/editing_tools/EditingTools.vala:665
-msgid "Return to current photo dimensions"
-msgstr "Vrati na trenutne dimenzije"
-
-#: ../src/editing_tools/EditingTools.vala:668
-msgid "Set the crop for this photo"
-msgstr "Postavi okvir za rezanje fotografije"
-
-#: ../src/editing_tools/EditingTools.vala:680
-msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr ""
-"Zakreni pravokutnik za rezanje fotografije između vodoravnog i horizontalnog."
-
-#: ../src/editing_tools/EditingTools.vala:753
-msgid "Unconstrained"
-msgstr "Bez ograničenja"
-
-#: ../src/editing_tools/EditingTools.vala:754
-msgid "Square"
-msgstr "Kvadrat"
-
-#: ../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 "Pismo (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:1876
-msgid "Close the red-eye tool"
-msgstr "Zatvori alat za uklanjanje crvenih očiju"
-
-#: ../src/editing_tools/EditingTools.vala:1879
-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:2215
-#: ../src/editing_tools/StraightenTool.vala:102
-msgid "_Reset"
-msgstr "_Poništi"
-
-#: ../src/editing_tools/EditingTools.vala:2237
-msgid "Saturation:"
-msgstr "Zasičenje:"
-
-#: ../src/editing_tools/EditingTools.vala:2245
-msgid "Tint:"
-msgstr "Sjenčanje:"
-
-#: ../src/editing_tools/EditingTools.vala:2254
-msgid "Temperature:"
-msgstr "Temperatura:"
-
-#: ../src/editing_tools/EditingTools.vala:2262
-msgid "Shadows:"
-msgstr "Sjene:"
-
-#: ../src/editing_tools/EditingTools.vala:2270
-msgid "Highlights:"
-msgstr "Osvjetljenje:"
-
-#: ../src/editing_tools/EditingTools.vala:2324
-msgid "Reset Colors"
-msgstr "Vrati boje"
-
-#: ../src/editing_tools/EditingTools.vala:2324
-msgid "Reset all color adjustments to original"
-msgstr "Postavi boje na orginalne"
-
-#: ../src/editing_tools/EditingTools.vala:2676
-msgid "Temperature"
-msgstr "Temperatura"
-
-#: ../src/editing_tools/EditingTools.vala:2689
-msgid "Tint"
-msgstr "Sjenčanje"
-
-#: ../src/editing_tools/EditingTools.vala:2702
-msgid "Saturation"
-msgstr "Zasićenje"
-
-#: ../src/editing_tools/EditingTools.vala:2715
-msgid "Exposure"
-msgstr "Ekspozicija"
-
-#: ../src/editing_tools/EditingTools.vala:2728
-msgid "Shadows"
-msgstr "Sjene"
-
-#: ../src/editing_tools/EditingTools.vala:2741
-msgid "Highlights"
-msgstr "Osvjetljenje"
-
-#: ../src/editing_tools/EditingTools.vala:2751
-msgid "Contrast Expansion"
-msgstr "Proširenje kontrasta"
-
-#: ../src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Kut:"
-
-#: ../src/events/EventDirectoryItem.vala:83
-#, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d fotografija/video snimka"
-msgstr[1] "%d fotografije/video snimke"
-msgstr[2] "%d fotografija/video snimaka"
-
-#: ../src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "Nema događaja"
-
-#: ../src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Prikaži komentar svakog događaja"
-
-#: ../src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "Nema događaja"
-
-#: ../src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "Nije pronađen niti jedan događaj."
-
-#: ../src/events/EventsDirectoryPage.vala:230
-msgid "Events"
-msgstr "Događaji"
-
-#: ../src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Nema datuma"
-
-#: ../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 "Mape"
-
-#: ../src/library/Branch.vala:37 ../ui/shotwell.glade.h:33
-msgid "Library"
-msgstr "Fototeka"
-
-#: ../src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Uvozim..."
-
-#: ../src/library/ImportQueuePage.vala:66
-msgid "_Stop Import"
-msgstr "_Prekini uvoz"
-
-#: ../src/library/ImportQueuePage.vala:67
-msgid "Stop importing photos"
-msgstr "Prekini uvoz fotografija"
-
-#: ../src/library/ImportQueuePage.vala:123
-msgid "Preparing to import..."
-msgstr "Priprema za uvoz..."
-
-#: ../src/library/ImportQueuePage.vala:150
-#, c-format
-msgid "Imported %s"
-msgstr "Uvezeno %s"
-
-#: ../src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Zadnji uvoz"
-
-#: ../src/library/LibraryWindow.vala:301
-msgid "_Import From Folder..."
-msgstr "Uvezi iz direktorija..."
-
-#: ../src/library/LibraryWindow.vala:302
-msgid "Import photos from disk to library"
-msgstr "Uvoz fotografija iz datotečnog sustava u fototeku"
-
-#: ../src/library/LibraryWindow.vala:309
-msgid "Import From _Application..."
-msgstr "Uvezi iz _aplikacije..."
-
-#: ../src/library/LibraryWindow.vala:313
-msgid "Sort _Events"
-msgstr "Razvrstaj _događaje"
-
-#: ../src/library/LibraryWindow.vala:323
-msgid "Empty T_rash"
-msgstr "Isprazni _smeće"
-
-#: ../src/library/LibraryWindow.vala:324
-msgid "Delete all photos in the trash"
-msgstr "Obriši sve fotografije iz smeća"
-
-#: ../src/library/LibraryWindow.vala:329
-msgid "View Eve_nt for Photo"
-msgstr "Prikaži dog_ađaj fotografije"
-
-#: ../src/library/LibraryWindow.vala:334
-msgid "_Find"
-msgstr "_Pretraži"
-
-#: ../src/library/LibraryWindow.vala:335
-msgid "Find photos and videos by search criteria"
-msgstr "Pretraži fotografije i video snimke prema kriterijima pretrage"
-
-#: ../src/library/LibraryWindow.vala:346 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:195
-msgid "Ne_w Saved Search..."
-msgstr "No_va spremljena pretraga..."
-
-#: ../src/library/LibraryWindow.vala:368
-msgid "_Photos"
-msgstr "_Fotografije"
-
-#: ../src/library/LibraryWindow.vala:372
-msgid "Even_ts"
-msgstr "Događaji"
-
-#: ../src/library/LibraryWindow.vala:391
-msgid "_Basic Information"
-msgstr "_Osnovne informacije"
-
-#: ../src/library/LibraryWindow.vala:392
-msgid "Display basic information for the selection"
-msgstr "Prikaži osnovne informacije odabira"
-
-#: ../src/library/LibraryWindow.vala:397
-msgid "E_xtended Information"
-msgstr "_Proširene informacije"
-
-#: ../src/library/LibraryWindow.vala:398
-msgid "Display extended information for the selection"
-msgstr "Prikaži proširene informacije odabira"
-
-#: ../src/library/LibraryWindow.vala:403
-msgid "_Search Bar"
-msgstr "T_raka za pretraživanje"
-
-#: ../src/library/LibraryWindow.vala:404
-msgid "Display the search bar"
-msgstr "Prikaži traku za pretraživanje"
-
-#: ../src/library/LibraryWindow.vala:409
-msgid "S_idebar"
-msgstr "B_očna traka"
-
-#: ../src/library/LibraryWindow.vala:410
-msgid "Display the sidebar"
-msgstr "Prikaži bočnu traku"
-
-#: ../src/library/LibraryWindow.vala:668
-msgid "Import From Folder"
-msgstr "Uvoz iz direktorija"
-
-#: ../src/library/LibraryWindow.vala:737
-msgid "Empty Trash"
-msgstr "Isprazni smeće"
-
-#: ../src/library/LibraryWindow.vala:737
-msgid "Emptying Trash..."
-msgstr "Pražnjenje smeća..."
-
-#: ../src/library/LibraryWindow.vala:896
-#, 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 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"
-"Želite li nastaviti s uvozom fotografija?"
-
-#: ../src/library/LibraryWindow.vala:899 ../ui/shotwell.glade.h:19
-msgid "Library Location"
-msgstr "Lokacija fototeke"
-
-#. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:912
-msgid "Photos cannot be imported from this directory."
-msgstr "Fotografije se ne mogu importirati iz tog direktorija."
-
-#: ../src/library/LibraryWindow.vala:1200
-#, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
-
-#: ../src/library/LibraryWindow.vala:1244
-#: ../src/library/LibraryWindow.vala:1255
-msgid "Updating library..."
-msgstr "Nadopunjavanje fototeke..."
-
-#: ../src/library/LibraryWindow.vala:1261
-msgid "Preparing to auto-import photos..."
-msgstr "Priprema za automatski uvoz fotografija..."
-
-#: ../src/library/LibraryWindow.vala:1266
-msgid "Auto-importing photos..."
-msgstr "Automatski uvoz fotografija..."
-
-#: ../src/library/LibraryWindow.vala:1274
-msgid "Writing metadata to files..."
-msgstr "Zapisujem meta podatke u datoteke..."
-
-#: ../src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Datoteke koje nedostaju"
-
-#: ../src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Brisanje..."
-
-#: ../src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Smeće"
-
-#: ../src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "Smeće je prazno"
-
-#: ../src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Obriši"
-
-#: ../src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "Brisanje fotografija"
-
-#: ../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 ""
-"Vaša fototeke fotografija nije kompatibilna s 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
-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 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
-msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please clear your library by deleting %s and re-import your "
-"photos."
-msgstr ""
-"Vaša fototeke 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 "Nepoznata greška kod provjere Shotwell baze podataka: %s"
-
-#: ../src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Učitavanje Shotwell-a"
-
-#: ../src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "Putanja do Shotwellovih privatnih podataka"
-
-#: ../src/main.vala:294
-msgid "DIRECTORY"
-msgstr "DIREKTORIJ"
-
-#: ../src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr "Ne nadziri mapu fototeke u vremenu izvršavanja promjena"
-
-#: ../src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "Ne prikazuj pokretanje prikaza napretka"
-
-#: ../src/main.vala:306
-msgid "Show the application's version"
-msgstr "Prikaži inačicu aplikacije"
-
-#. init GTK (valac has already called g_threads_init())
-#: ../src/main.vala:338
-msgid "[FILE]"
-msgstr "[FILE]"
-
-#: ../src/main.vala:342
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr "Pokrenite '%s --help' za popis svih dostupnih opcija.\n"
-
-#: ../src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
-
-#: ../src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
-
-#: ../src/photos/JfifSupport.vala:182
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Nisko (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Srednje (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:188
-#, c-format
-msgid "High (%d%%)"
-msgstr "Visoko (%d%%)"
-
-#: ../src/photos/JfifSupport.vala:191
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Maksimalno (%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 "Objavljivanje"
-
-#: ../src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Priprema za slanje"
-
-#: ../src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "Šaljem %d od %d"
-
-#: ../src/publishing/PublishingPluginHost.vala:82
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr "Objavljivanje na %s nije moguće zbog greške:"
-
-#: ../src/publishing/PublishingPluginHost.vala:85
-msgid "To try publishing to another service, select one from the above menu."
-msgstr "Za objavu na nekoj drugoj usluzi, odaberite ju iz gornjeg izbornika."
-
-#: ../src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Odabrane fotografije/video snimke su uspješno objavljene."
-
-#: ../src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Odabrane video snimke su uspješno objavljene."
-
-#: ../src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Odabrane fotografije su uspješno objavljene."
-
-#: ../src/publishing/PublishingUI.vala:112
-msgid "The selected video was successfully published."
-msgstr "Odabrana video snimka je uspješno objavljena."
-
-#: ../src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "IOdabrana fotografija je uspješno objavljena."
-
-#: ../src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr "Preuzimam podatke o korisničkom računu..."
-
-#: ../src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "Prijava..."
-
-#: ../src/publishing/PublishingUI.vala:191
-msgid "Publish Photos"
-msgstr "Objavi fotografije"
-
-#: ../src/publishing/PublishingUI.vala:192
-msgid "Publish photos _to:"
-msgstr "Objavi fotografije _na:"
-
-#: ../src/publishing/PublishingUI.vala:194
-msgid "Publish Videos"
-msgstr "Objavi video snimke"
-
-#: ../src/publishing/PublishingUI.vala:195
-msgid "Publish videos _to"
-msgstr "Objavi video snimke _na"
-
-#: ../src/publishing/PublishingUI.vala:197
-msgid "Publish Photos and Videos"
-msgstr "Objavi fotografije i video snimke"
-
-#: ../src/publishing/PublishingUI.vala:198
-msgid "Publish photos and videos _to"
-msgstr "Objavi fotografije i video snimke _na"
-
-#: ../src/publishing/PublishingUI.vala:275
-msgid "Add more accounts..."
-msgstr "Dodaj više računa..."
+#. / 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
+msgctxt "MultimonthFormat"
+msgid "%a %b %d"
+msgstr "%a %b %d"
 
-#. There are no enabled publishing services that accept this media type,
-#. warn the user.
-#: ../src/publishing/PublishingUI.vala:435
-msgid "Unable to publish"
-msgstr "Nije moguće objaviti"
+#. / 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
+msgctxt "MultimonthFormat"
+msgid "%a %b %d, %Y"
+msgstr "%a, %d %b , %Y"
 
-#: ../src/publishing/PublishingUI.vala:436
-#, 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 može objaviti odabrane stavke jer nemate omogućen odgovarajući "
-"priključak. Kako bi ispravili ovo, odaberite <b>Uredi %s osobitosti</b> i "
-"omogućite jedan ili više priključaka za objavljivanje u kartici "
-"<b>Priključci</b>."
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+#, fuzzy
+msgid "Slideshow"
+msgstr "Prezentacija"
 
-#: ../src/searches/Branch.vala:68
+#: src/searches/Branch.vala:68
+#, fuzzy
 msgid "Saved Searches"
 msgstr "Spremljene pretrage"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:169
+#: src/searches/SavedSearchDialog.vala:162
+#, fuzzy
 msgid "contains"
 msgstr "sadrži"
 
 #. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:170
-#: ../src/searches/SavedSearchDialog.vala:497
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
+#, fuzzy
 msgid "is exactly"
 msgstr "je točno"
 
-#: ../src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:164
+#, fuzzy
 msgid "starts with"
-msgstr "počinje sa"
+msgstr "počinje s"
 
-#: ../src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:165
+#, fuzzy
 msgid "ends with"
 msgstr "završava s"
 
-#: ../src/searches/SavedSearchDialog.vala:173
+#: src/searches/SavedSearchDialog.vala:166
+#, fuzzy
 msgid "does not contain"
 msgstr "ne sadrži"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-#: ../src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
+#, fuzzy
 msgid "is not set"
 msgstr "nije postavljeno"
 
+#: src/searches/SavedSearchDialog.vala:168
+#, fuzzy
+msgid "is set"
+msgstr "je postavljen"
+
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:245
-#: ../src/searches/SavedSearchDialog.vala:376
-#: ../src/searches/SavedSearchDialog.vala:441
+#: src/searches/SavedSearchDialog.vala:242
+#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:438
 msgid "is"
-msgstr "."
+msgstr ""
 
-#: ../src/searches/SavedSearchDialog.vala:246
+#: src/searches/SavedSearchDialog.vala:243
 msgid "is not"
-msgstr "nije"
+msgstr ""
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:252
+#: src/searches/SavedSearchDialog.vala:249
+#, fuzzy
 msgid "any photo"
 msgstr "bilo koja fotografija"
 
-#: ../src/searches/SavedSearchDialog.vala:253
+#: src/searches/SavedSearchDialog.vala:250
+#, fuzzy
 msgid "a raw photo"
 msgstr "raw fotografija"
 
-#: ../src/searches/SavedSearchDialog.vala:254
+#: src/searches/SavedSearchDialog.vala:251
+#, fuzzy
 msgid "a video"
 msgstr "video snimka"
 
-#: ../src/searches/SavedSearchDialog.vala:308
+#: src/searches/SavedSearchDialog.vala:305
+#, fuzzy
 msgid "has"
 msgstr "ima"
 
-#: ../src/searches/SavedSearchDialog.vala:309
+#: src/searches/SavedSearchDialog.vala:306
+#, fuzzy
 msgid "has no"
 msgstr "nema"
 
-#: ../src/searches/SavedSearchDialog.vala:314
+#: src/searches/SavedSearchDialog.vala:311
+#, fuzzy
 msgid "modifications"
 msgstr "promjene"
 
-#: ../src/searches/SavedSearchDialog.vala:315
+#: src/searches/SavedSearchDialog.vala:312
+#, fuzzy
 msgid "internal modifications"
 msgstr "unutrašnje promjene"
 
-#: ../src/searches/SavedSearchDialog.vala:316
+#: src/searches/SavedSearchDialog.vala:313
+#, fuzzy
 msgid "external modifications"
 msgstr "vanjske promjene"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:370
+#: src/searches/SavedSearchDialog.vala:367
+#, fuzzy
 msgid "flagged"
-msgstr "sa zastavicom"
+msgstr "oznečeno"
 
-#: ../src/searches/SavedSearchDialog.vala:371
+#: src/searches/SavedSearchDialog.vala:368
+#, fuzzy
 msgid "not flagged"
-msgstr "bez zastavice"
+msgstr "neoznačeno"
 
-#: ../src/searches/SavedSearchDialog.vala:434
+#: src/searches/SavedSearchDialog.vala:431
+#, fuzzy
 msgid "and higher"
 msgstr "i više"
 
-#: ../src/searches/SavedSearchDialog.vala:435
+#: src/searches/SavedSearchDialog.vala:432
+#, fuzzy
 msgid "only"
 msgstr "samo"
 
-#: ../src/searches/SavedSearchDialog.vala:436
+#: src/searches/SavedSearchDialog.vala:433
+#, fuzzy
 msgid "and lower"
 msgstr "i niže"
 
-#: ../src/searches/SavedSearchDialog.vala:498
+#: src/searches/SavedSearchDialog.vala:495
+#, fuzzy
 msgid "is after"
 msgstr "je nakon"
 
-#: ../src/searches/SavedSearchDialog.vala:499
+#: src/searches/SavedSearchDialog.vala:496
+#, fuzzy
 msgid "is before"
 msgstr "je prije"
 
-#: ../src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:497
+#, fuzzy
 msgid "is between"
 msgstr "je između"
 
-#: ../src/searches/SavedSearchDialog.vala:513
+#: src/searches/SavedSearchDialog.vala:510
 msgid "and"
-msgstr "i"
+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:720
+#: 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:721
+#: src/searches/SavedSearchDialog.vala:717
+#, fuzzy
 msgid "all"
 msgstr "sve"
 
-#: ../src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:718
+#, fuzzy
 msgid "none"
 msgstr "nijedan"
 
-#: ../src/searches/SearchBoolean.vala:157
+#: src/searches/SearchBoolean.vala:157
+#, fuzzy
 msgid "Any text"
 msgstr "Bilo koji tekst"
 
-#: ../src/searches/SearchBoolean.vala:160
+#: src/searches/SearchBoolean.vala:160
+#, fuzzy
 msgid "Title"
-msgstr "Naslov"
+msgstr "Naziv"
 
-#: ../src/searches/SearchBoolean.vala:163
+#: src/searches/SearchBoolean.vala:163
+#, fuzzy
 msgid "Tag"
 msgstr "Oznaka"
 
-#: ../src/searches/SearchBoolean.vala:166
+#: src/searches/SearchBoolean.vala:166
+#, fuzzy
 msgid "Comment"
 msgstr "Komentar"
 
-#: ../src/searches/SearchBoolean.vala:169
+#: src/searches/SearchBoolean.vala:169
+#, fuzzy
 msgid "Event name"
 msgstr "Naziv događaja"
 
-#: ../src/searches/SearchBoolean.vala:172
+#: src/searches/SearchBoolean.vala:172
+#, fuzzy
 msgid "File name"
-msgstr "Ime datoteke"
+msgstr "Naziv datoteke"
 
-#: ../src/searches/SearchBoolean.vala:175
+#: src/searches/SearchBoolean.vala:175
+#, fuzzy
 msgid "Media type"
 msgstr "Vrsta medija"
 
-#: ../src/searches/SearchBoolean.vala:178
+#: src/searches/SearchBoolean.vala:178
+#, fuzzy
 msgid "Flag state"
-msgstr "Stanje zastavice"
+msgstr "Stanje oznake"
 
-#: ../src/searches/SearchBoolean.vala:181
+#: src/searches/SearchBoolean.vala:181
+#, fuzzy
 msgid "Photo state"
 msgstr "Stanje fotografije"
 
-#: ../src/searches/SearchBoolean.vala:187
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
+#, fuzzy
+msgid "Rating"
+msgstr "Ocjena"
+
+#: src/searches/SearchBoolean.vala:187
+#, fuzzy
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/sidebar/Tree.vala:199
-msgid "New _Tag..."
-msgstr "Nova _oznaka..."
+#: src/SearchFilter.vala:815
+msgid "★+ Rating"
+msgstr ""
+
+#: src/SearchFilter.vala:818
+msgid "★★+ Rating"
+msgstr ""
+
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr ""
+
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr ""
+
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr ""
+
+#: src/SearchFilter.vala:1064
+#, c-format
+msgid "Error loading search bar UI: %s"
+msgstr ""
+
+#. 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
+msgid "Close"
+msgstr "Zatvori"
+
+#. Type label and toggles
+#: src/SearchFilter.vala:1079
+#, fuzzy
+msgid "Type"
+msgstr "Vrsta"
+
+#: src/SearchFilter.vala:1086
+#, fuzzy
+msgid "Videos"
+msgstr "Video snimke"
+
+#: src/SearchFilter.vala:1089
+#, fuzzy
+msgid "RAW Photos"
+msgstr "RAW fotografije"
+
+#: src/SearchFilter.vala:1125
+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"
+
+#. Set up toolbar
+#. add toolbar buttons
+#: src/SlideshowPage.vala:160
+#, fuzzy
+msgid "Back"
+msgstr "Natrag"
+
+#: src/SlideshowPage.vala:162
+#, fuzzy
+msgid "Go to the previous photo"
+msgstr "Idi na prijašnju fotografiju"
+
+#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+#, fuzzy
+msgid "Pause"
+msgstr "Pauziraj"
+
+#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+#, fuzzy
+msgid "Pause the slideshow"
+msgstr "Pauziraj prezentaciju"
+
+#: src/SlideshowPage.vala:174
+#, fuzzy
+msgid "Next"
+msgstr "Sljedeća"
+
+#: src/SlideshowPage.vala:176
+#, fuzzy
+msgid "Go to the next photo"
+msgstr "Idi na sljedeću fotografiju"
+
+#: src/SlideshowPage.vala:184
+#, fuzzy
+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
+msgid "All photo source files are missing."
+msgstr "Nedostaju sve izvorne datoteke fotografije."
+
+#: src/SlideshowPage.vala:270
+#, fuzzy
+msgid "Play"
+msgstr "Reproduciraj"
+
+#: src/SlideshowPage.vala:271
+#, fuzzy
+msgid "Continue the slideshow"
+msgstr "Nastavi prezentaciju"
 
-#: ../src/slideshow/Slideshow.vala:22
+#: src/slideshow/Slideshow.vala:22
+#, fuzzy
 msgid "Slideshow Transitions"
 msgstr "Prijelazi prezentacije"
 
-#: ../src/slideshow/TransitionEffects.vala:98
+#: src/slideshow/TransitionEffects.vala:98
+#, fuzzy
 msgid "(None)"
 msgstr "(nema)"
 
-#: ../src/slideshow/TransitionEffects.vala:287
+#: src/slideshow/TransitionEffects.vala:287
+#, fuzzy
 msgid "None"
-msgstr "Nema"
+msgstr "Nepoznato"
 
-#: ../src/slideshow/TransitionEffects.vala:339
+#: src/slideshow/TransitionEffects.vala:339
+#, fuzzy
 msgid "Random"
 msgstr "Naizmjenično"
 
-#: ../src/tags/Branch.vala:127
+#: src/tags/Branch.vala:131
+#, fuzzy
 msgid "Tags"
 msgstr "Oznake"
 
-#: ../ui/set_background_dialog.glade.h:1
-msgid "Set as Desktop Slideshow"
-msgstr "Postavi kao prezentaciju na radnu površinu"
+#: src/Tag.vala:830
+#, fuzzy
+msgid "untitled"
+msgstr "neimenovano"
 
-#: ../ui/set_background_dialog.glade.h:2
-msgid "Generate desktop background slideshow"
-msgstr "Generiraj prezentaciju za pozadinu radne površine"
+#. multiple videos
+#: src/VideoSupport.vala:523
+#, fuzzy
+msgid "Export Videos"
+msgstr "Izvezi video snimke"
 
-#: ../ui/set_background_dialog.glade.h:3
-msgid "Show each photo for"
-msgstr "Prikaži svaku fotografiju na"
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr ""
 
-#: ../ui/set_background_dialog.glade.h:4
-msgid "period of time"
-msgstr "vremenski period"
+#: 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
+msgid "_Developer"
+msgstr "_Razvijatelj"
 
-#: ../ui/set_background_dialog.glade.h:5
-msgid "How long each photo is shown on the desktop background"
-msgstr "Koliko je pojedinačna fotografija prikazana na radnoj površini"
+#: 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/shotwell.glade.h:1
-msgid "Search"
-msgstr "Pretraga"
+#: 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
+msgid "View Eve_nt for Photo"
+msgstr "Prikaži dog_ađaj fotografije"
 
-#: ../ui/shotwell.glade.h:2
-msgid "_Name of search:"
-msgstr "_Ime pretrage:"
+#: 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/shotwell.glade.h:3
-msgid "_Match"
-msgstr "_Podudara se"
+#: ui/direct.ui:13
+msgid "Save _As…"
+msgstr ""
 
-#: ../ui/shotwell.glade.h:4
-msgid "of the following:"
-msgstr "od sljedećih:"
+#: 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/shotwell.glade.h:5
+#: 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
+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
+msgid "_Report a Problem…"
+msgstr ""
+
+#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
+#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
+msgid "_Import from Folder…"
+msgstr ""
+
+#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
+#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
+#: ui/trash.ui:13
+msgid "Import From _Application…"
+msgstr ""
+
+#: ui/events_directory.ui:19 ui/event.ui:34 ui/import_queue.ui:25
+#: ui/import.ui:27 ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 ui/tags.ui:34
+#: ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242
+#, 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"
+
+#: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51
+#: ui/photo.ui:70 ui/search_sidebar_context.ui:6
+#: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56
+msgid "Ne_w Saved Search…"
+msgstr ""
+
+#: ui/events_directory.ui:74 ui/event.ui:102 ui/import_queue.ui:41
+#: ui/import.ui:77 ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98
+#: ui/tags.ui:102 ui/trash.ui:90
+#, 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 ""
+
+#: 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"
+
+#: 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
+#, 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
+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
+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 ""
+
+#: 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/shotwell.glade.h:6
+#: ui/printing_widget.ui:36
+#, fuzzy
 msgid "Use a _standard size:"
 msgstr "Koristi _standardnu veličinu:"
 
-#: ../ui/shotwell.glade.h:7
+#: ui/printing_widget.ui:80
+#, fuzzy
 msgid "Use a c_ustom size:"
-msgstr "Koristi korisnički definiranu veličinu:"
+msgstr "Koristi _prilagođenu veličinu:"
 
-#: ../ui/shotwell.glade.h:8
+#. 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/shotwell.glade.h:9
+#: ui/printing_widget.ui:197
+#, fuzzy
 msgid "_Autosize:"
 msgstr "_Automatska veličina:"
 
-#: ../ui/shotwell.glade.h:10
+#: ui/printing_widget.ui:237
+#, fuzzy
 msgid "<b>Titles</b>"
 msgstr "<b>Naslovi</b>"
 
-#: ../ui/shotwell.glade.h:11
+#: ui/printing_widget.ui:254
+#, fuzzy
 msgid "Print image _title"
-msgstr "Ispiši naslov slike"
+msgstr "Ispiši naslov _slike"
 
-#: ../ui/shotwell.glade.h:12
+#: ui/printing_widget.ui:297
+#, fuzzy
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Razlučivost u pikselima</b>"
 
-#: ../ui/shotwell.glade.h:13
+#: ui/printing_widget.ui:317
+#, fuzzy
 msgid "_Output photo at:"
 msgstr "_Izlaz slike na:"
 
-#: ../ui/shotwell.glade.h:14
+#: ui/printing_widget.ui:351
+#, fuzzy
 msgid "pixels per inch"
 msgstr "piksela po inču"
 
-#: ../ui/shotwell.glade.h:16
-msgid "Shotwell Preferences"
-msgstr "Shotwell osobitosti"
+#: 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/shotwell.glade.h:17
+#: ui/set_background_slideshow_dialog.ui:116
+msgid "How long each photo is shown on the desktop background"
+msgstr ""
+
+#: ui/shotwell.ui:65
+#, fuzzy
 msgid "white"
 msgstr "bijela"
 
-#: ../ui/shotwell.glade.h:18
+#: ui/shotwell.ui:92
+#, fuzzy
 msgid "black"
 msgstr "crna"
 
-#: ../ui/shotwell.glade.h:20
-msgid "_Watch library directory for new files"
-msgstr "_Nadziri mapu fototeke za novim datotekama"
-
-#: ../ui/shotwell.glade.h:21
-msgid "Metadata"
-msgstr "Meta podaci"
-
-#: ../ui/shotwell.glade.h:22
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Zapiši oznake, naslove i ostale _metapodatke u fotografije"
-
-#: ../ui/shotwell.glade.h:23
+#: ui/shotwell.ui:123
+#, fuzzy
 msgid "Display"
 msgstr "Prikaz"
 
-#: ../ui/shotwell.glade.h:24
+#: ui/shotwell.ui:160
+#, fuzzy
+msgid "_Background:"
+msgstr "_Pozadina:"
+
+#: ui/shotwell.ui:175
+#, fuzzy
 msgid "_Import photos to:"
-msgstr "_Uvoz fotografija u:"
+msgstr "_Uvezi fotografije u:"
 
-#: ../ui/shotwell.glade.h:25
-msgid "_Background:"
-msgstr "Pozadina:"
+#: ui/shotwell.ui:186
+#, fuzzy
+msgid "_Watch library directory for new files"
+msgstr "_Nadziri mapu fototeke za nove datoteke"
 
-#: ../ui/shotwell.glade.h:26
+#: ui/shotwell.ui:209
+#, fuzzy
 msgid "Importing"
-msgstr "Uvoz"
+msgstr "Uvažanje"
 
-#: ../ui/shotwell.glade.h:27
+#: ui/shotwell.ui:226
+#, fuzzy
 msgid "_Directory structure:"
-msgstr "_Struktura direktorija:"
+msgstr "_Struktura mape:"
 
-#: ../ui/shotwell.glade.h:28
-msgid "_Pattern:"
-msgstr "_Uzorak:"
-
-#: ../ui/shotwell.glade.h:29
+#: ui/shotwell.ui:240
+#, fuzzy
 msgid "Example:"
 msgstr "Primjer:"
 
-#: ../ui/shotwell.glade.h:30
+#: ui/shotwell.ui:249
+#, fuzzy
 msgid "R_ename imported files to lowercase"
 msgstr "P_reimenuj uvezene datoteke u mala slova"
 
-#: ../ui/shotwell.glade.h:31
+#: ui/shotwell.ui:271
+#, fuzzy
+msgid "Metadata"
+msgstr "Metapodaci"
+
+#: ui/shotwell.ui:284
+#, fuzzy
+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
 msgid "RAW Developer"
 msgstr "RAW razvijatelj"
 
-#: ../ui/shotwell.glade.h:32
+#: ui/shotwell.ui:323
+#, fuzzy
 msgid "De_fault:"
 msgstr "_Uobičajeno:"
 
-#: ../ui/shotwell.glade.h:34
+#: ui/shotwell.ui:377
+#, fuzzy
+msgid "_Pattern:"
+msgstr "_Uzorak:"
+
+#: ui/shotwell.ui:439
+#, fuzzy
 msgid "E_xternal photo editor:"
 msgstr "Vanjs_ki uređivač fotografija:"
 
-#: ../ui/shotwell.glade.h:35
+#: ui/shotwell.ui:456
+#, fuzzy
 msgid "External _RAW editor:"
 msgstr "Vanjski uređivač _RAW datoteka:"
 
-#: ../ui/shotwell.glade.h:36
+#: ui/shotwell.ui:517
+#, fuzzy
 msgid "External Editors"
 msgstr "Vanjski uređivači"
 
-#: ../ui/shotwell.glade.h:37
+#: ui/shotwell.ui:542
+#, fuzzy
 msgid "Plugins"
 msgstr "Priključci"
 
-#: ../ui/shotwell.glade.h:38
+#: ui/shotwell.ui:590
+#, fuzzy
+msgid "_Name of search:"
+msgstr "_Naziv pretrage:"
+
+#: ui/shotwell.ui:644
+#, fuzzy
+msgid "_Match"
+msgstr "_Podudara se"
+
+#: ui/shotwell.ui:671
+#, fuzzy
+msgid "of the following:"
+msgstr "od sljedećih:"
+
+#: ui/shotwell.ui:752
+#, fuzzy
+msgid "label"
+msgstr "naslov"
+
+#: ui/shotwell.ui:903
+#, fuzzy
 msgid "_Delay:"
 msgstr "_Odgoda:"
 
-#: ../ui/shotwell.glade.h:39
+#: ui/shotwell.ui:917
+#, fuzzy
 msgid "_Transition effect:"
 msgstr "Efekt _prijelaza:"
 
-#: ../ui/shotwell.glade.h:40
+#: ui/shotwell.ui:931
+#, fuzzy
 msgid "Transition d_elay:"
 msgstr "O_dgoda prijelaza:"
 
-#: ../ui/shotwell.glade.h:41
+#: ui/shotwell.ui:941
+#, fuzzy
 msgid "Show t_itle"
 msgstr "Prikaži n_aslov"
 
-#: ../ui/shotwell.glade.h:42
+#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
+#, fuzzy
 msgid "seconds"
-msgstr "sekundi"
+msgstr "sekunda"
 
-#: ../ui/shotwell.glade.h:43
-msgid "_Login"
-msgstr "_Prijava"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nova _oznaka…"
+
+#: ui/trash.ui:285
+#, fuzzy
+msgid "Delete all photos in the trash"
+msgstr "Obriši sve fotografije u smeću"
diff --git a/po/hu.gmo b/po/hu.gmo
index 7c65a94..52a2318 100644
--- a/po/hu.gmo
+++ b/po/hu.gmo
diff --git a/po/hu.po b/po/hu.po
index da07e37..0b9acf0 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,31 +1,31 @@
 # Hungarian translation for shotwell.
-# Copyright (C) 2011, 2012, 2014, 2015, 2016. Free Software Foundation, Inc.
+# Copyright (C) 2011, 2012, 2014, 2015, 2016, 2017. 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.
+# 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.
+# Balázs Úr <urbalazs at gmail dot com>, 2014, 2016, 2017.
 # Meskó Balázs <meskobalazs@gmail.com>, 2016.
 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-11-20 22:19+0000\n"
-"PO-Revision-Date: 2016-11-23 00:14+0100\n"
-"Last-Translator: Gabor Kelemen <kelemeng at ubuntu dot com>\n"
+"POT-Creation-Date: 2017-03-14 23:56+0000\n"
+"PO-Revision-Date: 2017-03-15 18:10+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: Lokalize 1.5\n"
+"X-Generator: Lokalize 1.2\n"
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354
+#: 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
 msgid "Shotwell"
@@ -66,6 +66,10 @@ msgstr ""
 "A Shotwell a JPEG, PNG, TIFF, valamint különböző nyers fájl formátumokat "
 "támogatja."
 
+#: misc/shotwell.appdata.xml.in:52
+msgid "The Shotwell developers"
+msgstr "A Shotwell fejlesztői"
+
 #: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Fényképkezelő"
@@ -1284,7 +1288,6 @@ 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:798
 msgid "enable slideshow slide transition"
 msgstr "csúszás diaátmenet engedélyezése"
 
@@ -1303,7 +1306,6 @@ msgid ""
 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:792
 msgid "enable slideshow circle transition"
 msgstr "kör diaátmenet engedélyezése"
 
@@ -1312,11 +1314,21 @@ 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
+#| msgid "enable slideshow circle transition"
+msgid "enable slideshow circles transition"
+msgstr "körök diaátmenet engedélyezése"
+
 #: misc/org.yorba.shotwell.gschema.xml:793
 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
+#| msgid "enable slideshow slide transition"
+msgid "enable slideshow blinds transition"
+msgstr "lamellák diaátmenet engedélyezése"
+
 #: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
@@ -1352,6 +1364,121 @@ msgid ""
 msgstr ""
 "Igaz, ha a Sakktábla diaátmenet bővítmény engedélyezett, különben hamis"
 
+#: 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 ""
+"Jelenleg nincs bejelentkezve a Facebookra.\n"
+"\n"
+"Ha nincs még Facebook fiókja, a bejelentkezés során létrehozhat egyet. "
+"Engedélyeznie kell a fényképek feltöltését, és a falon való közzétételét. "
+"Ezek az engedélyek szükségesek a Shotwell kapcsolat működéséhez."
+
+#: 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 ""
+"A Shotwell használata közben már bejelentkezett a Facebookra, és "
+"kijelentkezett onnan.\n"
+"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
+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 ""
+"Jelenleg nincs bejelentkezve Flickr-re\n"
+"\n"
+"Kattintson a Bejelentkezés gombra a bejelentkezéshez a Flickr fiókjába a "
+"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
+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:481
+msgid "Verifying authorization…"
+msgstr "Felhatalmazás ellenőrzése…"
+
+#: 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 ""
+"A Shotwell használata közben már bejelentkezett a Google szolgáltatásra, és "
+"kijelentkezett onnan.\n"
+"\n"
+"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
+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 ""
+"Jelenleg nincs bejelentkezve Picasa Webalbumokba.\n"
+"\n"
+"Kattintson a Bejelentkezés gombra a bejelentkezéshez a Picasa Webalbumokba a "
+"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
+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 ""
+"Nincs bejelentkezve a YouTube-ra.\n"
+"\n"
+"A folytatáshoz rendelkeznie kell egy Google fiókkal, és be kell azt "
+"á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/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "A Shotwell weboldalának meglátogatása"
@@ -1440,20 +1567,6 @@ msgstr ""
 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/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 ""
-"A Shotwell használata közben már bejelentkezett a Google szolgáltatásra, és "
-"kijelentkezett onnan.\n"
-"\n"
-"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/shotwell-data-imports/FSpotImporter.vala:36
 #: plugins/shotwell-publishing/FacebookPublishing.vala:33
 #: plugins/shotwell-publishing/FlickrPublishing.vala:33
@@ -1549,96 +1662,94 @@ msgstr "Importálás előkészítése"
 msgid "Core Data Import Services"
 msgstr "Alap adatimportáló szolgáltatások"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "_Vissza"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1464
-msgid "_Log in"
-msgstr "Bejele_ntkezés"
-
-#: 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 "_Felhasználónév:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "_Jelszó:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "_Vissza"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1105
+msgid "_Log in"
+msgstr "Bejele_ntkezés"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "API _kulcs:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 msgstr "vagy"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:142
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
-msgstr "_Kijelentkezés"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:156
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-#: src/CollectionPage.vala:76 src/PhotoPage.vala:2456
-msgid "_Publish"
-msgstr "Közzé_tétel"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "_Egy létező album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
 msgid "A _new album"
 msgstr "Új _album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "_Egy létező album"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 "_Hely-, címke- és a fényképezőgép azonosításra alkalmas adatok eltávolítása "
 "a feltöltés előtt"
 
-#: 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éretezési megszorítás:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr "képpont"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
+#: plugins/shotwell-publishing/FlickrPublishing.vala:880
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
 msgstr "Eredeti méret"
 
-#: 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 "Szélesség vagy magasság"
 
+#: 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 "_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/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
+msgid "_Publish"
+msgstr "Közzé_tétel"
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Gallery3 közzétételi modul"
@@ -1731,49 +1842,47 @@ msgstr "Ismeretlen felhasználó"
 msgid " Site Not Found"
 msgstr " Az oldal nem található"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:42
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:892
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr "_E-mail cím"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:82
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:893
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:53
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:82
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr "_Jelszó"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:97
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:100
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:894
 msgid "_Remember"
 msgstr "_Megjegyzés"
 
-#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:118
+#: plugins/shotwell-publishing-extras/rajce_authentication_pane.ui:120
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:895
-#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:101
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
 msgid "Log in"
 msgstr "Bejelentkezés"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:75
 msgid "An _existing album:"
 msgstr "_Egy létező album:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:94
 msgid "A _new album named:"
 msgstr "Új _album, a neve:"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:159
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
 msgid "_Hide album"
 msgstr "_Album elrejtése"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "_Cél album megnyitása böngészőben"
@@ -1804,20 +1913,20 @@ msgid "You are logged into Rajce as %s."
 msgstr "Bejelentkezett a Rajce-ra %s néven."
 
 #: 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 "A fényképek itt fognak megjelenni:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
 msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwell extra közzétételi szolgáltatások"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr "Blogok:"
 
-#: 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 "Fénykép _mérete:"
@@ -1827,13 +1936,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
+#: plugins/shotwell-publishing/FlickrPublishing.vala: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:1232
+#: plugins/shotwell-publishing/FlickrPublishing.vala:877
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr "1024 × 768 képpont"
@@ -1901,51 +2010,51 @@ msgid "Public"
 msgstr "Nyilvános"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
 msgid "Friends"
 msgstr "Barátok"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
 msgid "Private"
 msgstr "Magánjellegű"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:44
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Albumok (vagy új írása):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:59
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "Hozzáférés típusa:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:103
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "H_ozzászólások letiltása"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:120
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "_Eredeti kép letöltésének megtiltása"
 
-#: 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 "Közzététel _meglévő albumban:"
 
-#: 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 "Új _album létrehozása ezen a néven:"
 
-#: 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 "Feltöltés _mérete:"
 
-#: 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 "A _videókat és új fényképalbumokat láthatja:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:155
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:92
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:203
 msgid ""
 "_Remove location, camera, and other identifying information before uploading"
@@ -1953,57 +2062,25 @@ 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:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "Shotwell kapcsolat"
 
-#: 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 ""
-"Jelenleg nincs bejelentkezve a Facebookra.\n"
-"\n"
-"Ha nincs még Facebook fiókja, a bejelentkezés során létrehozhat egyet. "
-"Engedélyeznie kell a fényképek feltöltését, és a falon való közzétételét. "
-"Ezek az engedélyek szükségesek a Shotwell kapcsolat működéséhez."
-
-#: 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 ""
-"A Shotwell használata közben már bejelentkezett a Facebookra, és "
-"kijelentkezett onnan.\n"
-"A Facebookra való feltöltés folytatásához indítsa újra a Shotwellt, és "
-"próbálja újra a feltöltést."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:87
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Szabványos (720 képpont)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Nagy (2048 képpont)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook…"
-msgstr "Kapcsolat tesztelése a Facebookhoz…"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
 msgid "Creating album…"
 msgstr "Album létrehozása…"
 
-#: 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."
@@ -2011,7 +2088,7 @@ msgstr ""
 "Egy, a közzétételhez szükséges fájl nem érhető el. A közzététel a Facebookra "
 "nem folytatódhat."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:982
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -2020,79 +2097,22 @@ msgstr ""
 "Bejelentkezett a Facebookra %s néven.\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 "Hová szeretné feltölteni a kijelölt fényképeket?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:858
 msgid "Just me"
 msgstr "Csak én"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:854
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Mindenki"
 
-#: 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 ""
-"Í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/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Hitelesítési szám:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Foly_tatás"
-
-#: 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 ""
-"Jelenleg nincs bejelentkezve Flickr-re\n"
-"\n"
-"Kattintson a Bejelentkezés gombra a bejelentkezéshez a Flickr fiókjába a "
-"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/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 ""
-"A Shotwell használata közben már bejelentkezett a Flickr-re, és "
-"kijelentkezett onnan.\n"
-"A Flickr-re való feltöltés folytatásához indítsa újra a Shotwellt, és "
-"próbálja újra a feltöltést."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login…"
-msgstr "Felkészülés a bejelentkezésre…"
-
-#: 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 ""
-"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:457
-msgid "Verifying authorization…"
-msgstr "Felhatalmazás ellenőrzése…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2101,81 +2121,66 @@ msgstr ""
 "Bejelentkezett a Flickr-re %s néven.\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 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] ""
-"Az ingyenes Flickr fiókja korlátozza a havonta feltölthető adatmennyiséget.\n"
-"Ebben a hónapban még %d megabájt feltöltésére van lehetősége."
-msgstr[1] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Az ingyenes Flickr fiókja korlátozza a havonta feltölthető adatmennyiséget.\n"
-"Ebben a hónapban még %d megabájt feltöltésére van lehetősége."
+"Ebben a hónapban még %s feltöltésére van lehetősége."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 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:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "A _fényképeket láthatja:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "A _videókat láthatja:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr "A _fényképeket/videókat láthatja:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "Csak barátok és család"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "Csak család"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "Csak barátok"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 képpont"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 képpont"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
-msgid "L_ist album in public gallery"
-msgstr "Alb_um listázása a nyilvános galériában"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
 msgid "Photo _size preset:"
 msgstr "Fénykép_méret előbeállítása:"
 
-#: 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 ""
-"Jelenleg nincs bejelentkezve Picasa Webalbumokba.\n"
-"\n"
-"Kattintson a Bejelentkezés gombra a bejelentkezéshez a Picasa Webalbumokba a "
-"böngészőből. A bejelentkezés során jogosultságot kell adnia a Shotwell "
-"Connectnek, hogy hozzáférjen a Picasa Webalbumokhoz."
+#. 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 "Alapértelmezett album"
 
-#: 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."
@@ -2184,33 +2189,33 @@ msgstr ""
 "nem folytatódhat."
 
 #. 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 "Bejelentkezett a Picasa Webalbumokba %s néven."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "A videók itt jelennek meg:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
 msgstr "Kicsi (640 × 480 képpont)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
 msgstr "Közepes (1024 × 768 képpont)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr "Ajánlott (1600 × 1200 képpont)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
 msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048 × 1536 képpont)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:755
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Eredeti méret"
 
@@ -2223,37 +2228,30 @@ msgid "User _name"
 msgstr "_Felhasználónév"
 
 #: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
-#| msgid "_Remember Password"
 msgid "Remember Password"
 msgstr "Jelszó megjegyzése"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
-#| msgid "An _existing category:"
 msgid "An _existing category"
 msgstr "Egy létező _kategória:"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
-#| msgid "A _new album named:"
 msgid "A _new album named"
 msgstr "Új _album, a neve:"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
-#| msgid "within category:"
 msgid "within category"
 msgstr "kategóriában:"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
-#| msgid "Album comment:"
 msgid "Album comment"
 msgstr "Albummegjegyzés"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
-#| msgid "Photos will be _visible by:"
 msgid "Photos will be _visible by"
 msgstr "Fényképek lát_hatók lesznek"
 
 #: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
-#| msgid "Photo size:"
 msgid "Photo size"
 msgstr "Fénykép mérete"
 
@@ -2356,7 +2354,7 @@ msgstr "Tanúsítvány megjelenítése…"
 msgid "I understand, please _proceed."
 msgstr "Megértettem, _folytatás."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/shotwell-publishing.vala:55
 msgid "Core Publishing Services"
 msgstr "Alap közzétételi szolgáltatások"
 
@@ -2364,21 +2362,7 @@ msgstr "Alap közzétételi szolgáltatások"
 msgid "Video privacy _setting:"
 msgstr "Videók _magánszféra-beállítása:"
 
-#: 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 ""
-"Nincs bejelentkezve a YouTube-ra.\n"
-"\n"
-"A folytatáshoz rendelkeznie kell egy Google fiókkal, és be kell azt "
-"á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/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."
@@ -2386,21 +2370,16 @@ msgstr ""
 "Egy, a közzétételhez szükséges fájl nem érhető el. A közzététel a Youtube-ra "
 "nem folytatódhat."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Bejelentkezett a YouTube-ra %s néven."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-msgid "Videos will appear in “%s”"
-msgstr "A videók itt jelennek meg: „%s”"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
 msgstr "Nyilvános, felsorolt"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
 msgstr "Nyilvános, felsorolatlan"
 
@@ -2506,7 +2485,7 @@ msgstr "Teljes képernyő elhagyása"
 #: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
 #: src/data_imports/DataImportsUI.vala:301
 #: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1430 src/Dialogs.vala:1453
+#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
 #: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
 #: src/Resources.vala:157
 msgid "_Cancel"
@@ -2609,8 +2588,8 @@ msgstr "Az importálás meghiúsult (%d)"
 msgid "Cameras"
 msgstr "Fényképezőgépek"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/photos/RawSupport.vala:303
+#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
+#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala: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
 msgid "Camera"
@@ -2620,7 +2599,7 @@ msgstr "Fényképezőgép"
 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 ""
@@ -2628,26 +2607,34 @@ msgstr ""
 "leválasztani."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:775
+#: src/camera/ImportPage.vala:783
 msgid "Hide photos already imported"
 msgstr "Már importált fényképek elrejtése"
 
-#: src/camera/ImportPage.vala:776
+#: src/camera/ImportPage.vala:784
 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:842
+#: src/camera/ImportPage.vala:823 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
+msgid "Import _All"
+msgstr "Összes im_portálása"
+
+#: src/camera/ImportPage.vala:857
 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:846
+#: src/camera/ImportPage.vala:861
 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:999
+#: src/camera/ImportPage.vala:1021
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2655,15 +2642,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:1005
+#: src/camera/ImportPage.vala:1027
 msgid "_Unmount"
 msgstr "_Leválasztás"
 
-#: src/camera/ImportPage.vala:1010
+#: src/camera/ImportPage.vala:1032
 msgid "Please unmount the camera."
 msgstr "Válassza le a fényképezőgépet."
 
-#: src/camera/ImportPage.vala:1015
+#: src/camera/ImportPage.vala:1037
 msgid ""
 "The camera is locked by another application. Shotwell can only access the "
 "camera when it’s unlocked. Please close any other application using the "
@@ -2673,11 +2660,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:1025
+#: src/camera/ImportPage.vala:1047
 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:1030
+#: src/camera/ImportPage.vala:1052
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2686,65 +2673,65 @@ msgstr ""
 "Nem tölthetők le az előnézetek a fényképezőgépről:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1047
+#: src/camera/ImportPage.vala:1069
 msgid "Unmounting…"
 msgstr "Leválasztás…"
 
-#: src/camera/ImportPage.vala:1138
+#: src/camera/ImportPage.vala:1160
 msgid "Starting import, please wait…"
 msgstr "Importálás kezdése, kis türelmet…"
 
-#: src/camera/ImportPage.vala:1155
+#: src/camera/ImportPage.vala:1177
 msgid "Fetching photo information"
 msgstr "Fénykép-információk lekérése"
 
-#: src/camera/ImportPage.vala:1513
+#: src/camera/ImportPage.vala:1535
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "%s előnézetének lekérése"
 
-#: src/camera/ImportPage.vala:1629
+#: src/camera/ImportPage.vala:1651
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "A fényképezőgép nem zárolható: %s"
 
-#: src/camera/ImportPage.vala:1714
+#: src/camera/ImportPage.vala:1736
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "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:1717
+#: src/camera/ImportPage.vala:1739
 #, 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:1720
+#: src/camera/ImportPage.vala:1742
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
 msgstr[0] "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:1723
+#: src/camera/ImportPage.vala:1745
 #, 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:1731 src/Dialogs.vala:1397
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Megtartás"
 
-#: src/camera/ImportPage.vala:1750
+#: src/camera/ImportPage.vala:1772
 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:1754
+#: src/camera/ImportPage.vala:1776
 #, c-format
 msgid "Unable to delete %d photo/video from the camera due to errors."
 msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
@@ -2753,129 +2740,127 @@ msgstr[0] ""
 msgstr[1] ""
 "Hiba történt, %d fénykép vagy videó nem törölhető a fényképezőgépről."
 
-#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:78
-#: src/PhotoPage.vala:2451 src/Resources.vala:170
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:170
 msgid "_Print"
 msgstr "_Nyomtatás"
 
-#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: 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
 msgid "Send _To…"
 msgstr "Kül_dés…"
 
-#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:83
-#: src/PhotoPage.vala:2461 src/Resources.vala:220
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:220
 msgid "Set as _Desktop Background"
 msgstr "Beállítás _asztalháttérként"
 
-#: src/CollectionPage.vala:86 src/Resources.vala:286
+#: src/CollectionPage.vala:92 src/Resources.vala:286
 msgid "_Duplicate"
 msgstr "_Kettőzés"
 
-#: src/CollectionPage.vala:94
-#| msgid "Fulls_creen"
+#: src/CollectionPage.vala:100
 msgid "Fullscreen"
 msgstr "Teljes képernyő"
 
-#: src/CollectionPage.vala:96 ui/photo.ui:180
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "_Diavetítés"
 
-#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: src/CollectionPage.vala:110 src/Resources.vala:139 ui/direct.ui:111
 #: ui/photo.ui:200
 msgid "Rotate _Right"
 msgstr "Forgatás j_obbra"
 
-#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: src/CollectionPage.vala:113 src/Resources.vala:144 ui/direct.ui:116
 #: ui/photo.ui:205
 msgid "Rotate _Left"
 msgstr "Forgatás _balra"
 
-#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: src/CollectionPage.vala:116 src/Resources.vala:149 ui/direct.ui:121
 #: ui/photo.ui:210
 msgid "Flip Hori_zontally"
 msgstr "_Vízszintes tükrözés"
 
-#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: src/CollectionPage.vala:117 src/Resources.vala:152 ui/direct.ui:125
 #: ui/photo.ui:214
 msgid "Flip Verti_cally"
 msgstr "_Függőleges tükrözés"
 
-#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
+#: 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
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Feljavítás"
 
-#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: 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
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "_Vissza az eredetihez"
 
-#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+#: src/CollectionPage.vala:122 src/Resources.vala:190 ui/photo.ui:256
 msgid "_Copy Color Adjustments"
 msgstr "_Színbeállítások másolása"
 
-#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+#: src/CollectionPage.vala:125 src/Resources.vala:194 ui/photo.ui:261
 msgid "_Paste Color Adjustments"
 msgstr "_Színbeállítások beillesztése"
 
-#: src/CollectionPage.vala:129
-#| msgid "_Adjust Date and Time…"
+#: src/CollectionPage.vala:135
 msgid "Adjust Date and Time…"
 msgstr "Dátum és idő módosítása…"
 
-#: src/CollectionPage.vala:137 src/Resources.vala:319
+#: src/CollectionPage.vala:143 src/Resources.vala:319
 msgid "Open With E_xternal Editor"
 msgstr "Megnyitás külső _szerkesztővel"
 
-#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: 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
 msgid "Open With RA_W Editor"
 msgstr "Megnyitás RA_W szerkesztővel"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:167
+#: src/CollectionPage.vala:149 src/Resources.vala:167
 msgid "_Play"
 msgstr "_Lejátszás"
 
-#: src/CollectionPage.vala:404
+#: src/CollectionPage.vala:415
 msgid "Export Photo/Video"
 msgstr "Fényképek vagy videók exportálása"
 
-#: src/CollectionPage.vala:404
+#: src/CollectionPage.vala:415
 msgid "Export Photos/Videos"
 msgstr "Fényképek vagy videók exportálása"
 
-#: src/CollectionPage.vala:406 src/Dialogs.vala:59 src/PhotoPage.vala:2988
+#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
 msgstr "Fényképek exportálása"
 
-#: src/CollectionPage.vala:406 src/Dialogs.vala:84
+#: src/CollectionPage.vala:417 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Fényképek exportálása"
 
-#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Rotating"
 msgstr "Forgatás"
 
-#: src/CollectionPage.vala:493 src/CollectionPage.vala:509
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Undoing Rotate"
 msgstr "Forgatás visszavonása"
 
-#: src/CollectionPage.vala:518
+#: src/CollectionPage.vala:529
 msgid "Flipping Horizontally"
 msgstr "Tükrözés vízszintesen"
 
-#: src/CollectionPage.vala:519
+#: src/CollectionPage.vala:530
 msgid "Undoing Flip Horizontally"
 msgstr "Vízszintes tükrözés visszavonása"
 
-#: src/CollectionPage.vala:528
+#: src/CollectionPage.vala:539
 msgid "Flipping Vertically"
 msgstr "Tükrözés függőlegesen"
 
-#: src/CollectionPage.vala:529
+#: src/CollectionPage.vala:540
 msgid "Undoing Flip Vertically"
 msgstr "Függőleges tükrözés visszavonása"
 
@@ -3088,7 +3073,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Adatbázisfájl:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:766
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
 msgid "_Import"
 msgstr "_Importálás"
 
@@ -3168,10 +3153,10 @@ 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:1398
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
 #: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
-#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/trash.ui:63 ui/trash.ui:216
-#: ui/trash.ui:258
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Törlés"
 
@@ -3624,81 +3609,81 @@ msgstr "Nem lettek importálva fényképek vagy videók.\n"
 msgid "Import Complete"
 msgstr "Importálás kész"
 
-#: src/Dialogs.vala:1174
+#: 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:1177
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d perc"
 msgstr[1] "%d perc"
 
-#: src/Dialogs.vala:1181
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d óra"
 msgstr[1] "%d óra"
 
-#: src/Dialogs.vala:1184
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 nap"
 
-#: src/Dialogs.vala:1327 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Esemény átnevezése"
 
-#: src/Dialogs.vala:1327
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Név:"
 
 #. Dialog title
-#: src/Dialogs.vala:1338
+#: src/Dialogs.vala:1328
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Cím szerkesztése"
 
-#: src/Dialogs.vala:1339 src/Properties.vala:343
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Cím:"
 
 #. Dialog title
-#: src/Dialogs.vala:1355 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Eseménymegjegyzés szerkesztése"
 
-#: src/Dialogs.vala:1356
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Fénykép vagy videó megjegyzésének szerkesztése"
 
-#: src/Dialogs.vala:1357 src/Properties.vala:631
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Megjegyzés:"
 
-#: src/Dialogs.vala:1373
+#: src/Dialogs.vala:1363
 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:1377
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "_Eltávolítás a gyűjteményből"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Visszavonja a külső szerkesztést?"
 
-#: src/Dialogs.vala:1420
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Visszavonja a külső szerkesztéseket?"
 
-#: src/Dialogs.vala:1422
+#: src/Dialogs.vala:1412
 #, c-format
 msgid "This will destroy all changes made to the external file. Continue?"
 msgid_plural ""
@@ -3706,85 +3691,83 @@ 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:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "Külső szerkesztés _visszavonása"
 
-#: src/Dialogs.vala:1426
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "Külső szerkesztések _visszavonása"
 
-#: src/Dialogs.vala:1447
+#: src/Dialogs.vala:1437
 #, c-format
 msgid "This will remove the photo from the library. Continue?"
 msgid_plural "This will remove %d photos from the library. Continue?"
 msgstr[0] "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:1454 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Fénykép eltávolítása a gyűjteményből"
 
-#: src/Dialogs.vala:1455
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Fényképek eltávolítása a gyűjteményből"
 
-#: src/Dialogs.vala:1553
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1707
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "DE"
 
-#: src/Dialogs.vala:1708
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "DU"
 
-#: src/Dialogs.vala:1709
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "24 óra"
 
-#: src/Dialogs.vala:1724
+#: 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:1729
+#: 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:1735
-#| msgid "_Modify original photo file"
+#: 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:1739
-#| msgid "_Modify original file"
+#: 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:1827
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Eredeti: "
 
-#: src/Dialogs.vala:1828
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%Y. %m. %d., %k.%M.%S"
 
-#: src/Dialogs.vala:1829
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%Y. %m. %d., %l.%M.%S %p"
 
-#: src/Dialogs.vala:1918
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3793,7 +3776,7 @@ 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:1919
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3802,31 +3785,31 @@ 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:1921
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "nap"
 msgstr[1] "nap"
 
-#: src/Dialogs.vala:1922
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "óra"
 msgstr[1] "óra"
 
-#: src/Dialogs.vala:1923
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "perc"
 msgstr[1] "perc"
 
-#: src/Dialogs.vala:1924
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "másodperc"
 msgstr[1] "másodperc"
 
-#: src/Dialogs.vala:1968
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -3845,53 +3828,53 @@ msgstr[1] ""
 "\n"
 "És %d egyéb."
 
-#: src/Dialogs.vala:1992 src/Dialogs.vala:2019
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Címkék (vesszővel elválasztva):"
 
-#: src/Dialogs.vala:2099
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Üdvözöljük!"
 
-#: src/Dialogs.vala:2106
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Üdvözöljük a Shotwellben!"
 
-#: src/Dialogs.vala:2111
+#: 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:2131
+#: 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:2132
+#: 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:2133
+#: 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:2144
+#: 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:2151
+#: 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:2162
+#: src/Dialogs.vala:2152
 msgid "_Don’t show this message again"
 msgstr "_Ne jelenjen meg ez az üzenet többé"
 
-#: src/Dialogs.vala:2199
+#: 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"
@@ -3899,41 +3882,41 @@ 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:2345 src/Dialogs.vala:2349
+#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
 msgid "(Help)"
 msgstr "(Súgó)"
 
-#: src/Dialogs.vala:2356
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Év%sHónap%sNap"
 
-#: src/Dialogs.vala:2358
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "Év%sHónap"
 
-#: src/Dialogs.vala:2360
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Év%sHónap-Nap"
 
-#: src/Dialogs.vala:2362
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "Év-Hónap-Nap"
 
-#: src/Dialogs.vala:2363 src/editing_tools/EditingTools.vala:780
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Egyéni"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2600
+#: 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:2702
+#: src/Dialogs.vala:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3941,31 +3924,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:2707
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "Fény_képek másolása"
 
-#: src/Dialogs.vala:2708
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "_Importálás"
 
-#: src/Dialogs.vala:2709
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Importálás a gyűjteménybe"
 
-#: src/Dialogs.vala:2719 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Eltávolítás a gyűjteményből"
 
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:2864
+#: src/Dialogs.vala:2710 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:2720
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Fényképek eltávolítása a gyűjteményből"
 
-#: src/Dialogs.vala:2734
+#: src/Dialogs.vala:2724
 #, c-format
 msgid ""
 "This will remove the photo/video from your Shotwell library. Would you also "
@@ -3988,7 +3971,7 @@ msgstr[1] ""
 "\n"
 "Ez a művelet nem vonható vissza."
 
-#: src/Dialogs.vala:2738
+#: src/Dialogs.vala:2728
 #, c-format
 msgid ""
 "This will remove the video from your Shotwell library. Would you also like "
@@ -4011,7 +3994,7 @@ msgstr[1] ""
 "\n"
 "Ez a művelet nem vonható vissza."
 
-#: src/Dialogs.vala:2742
+#: src/Dialogs.vala:2732
 #, c-format
 msgid ""
 "This will remove the photo from your Shotwell library. Would you also like "
@@ -4034,7 +4017,7 @@ msgstr[1] ""
 "\n"
 "Ez a művelet nem vonható vissza."
 
-#: src/Dialogs.vala:2774
+#: src/Dialogs.vala:2764
 #, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
@@ -4044,7 +4027,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:2791
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -4059,17 +4042,17 @@ msgstr "Szélesség"
 msgid "Height"
 msgstr "Magasság"
 
-#: src/direct/DirectPhotoPage.vala:92
+#: src/direct/DirectPhotoPage.vala:99
 #, c-format
 msgid "%s does not exist."
 msgstr "%s nem létezik."
 
-#: src/direct/DirectPhotoPage.vala:94
+#: src/direct/DirectPhotoPage.vala:101
 #, c-format
 msgid "%s is not a file."
 msgstr "%s nem fájl."
 
-#: src/direct/DirectPhotoPage.vala:96
+#: src/direct/DirectPhotoPage.vala:103
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
@@ -4078,34 +4061,34 @@ msgstr ""
 "%s nem támogatja a következő fájlformátumát:\n"
 "%s."
 
-#: src/direct/DirectPhotoPage.vala:113
+#: src/direct/DirectPhotoPage.vala:120
 #, c-format
 msgid "Unable open photo %s. Sorry."
 msgstr "Elnézést, a(z) %s fénykép nem nyitható meg."
 
-#: src/direct/DirectPhotoPage.vala:297 src/Resources.vala:175 ui/direct.ui:8
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:175 ui/direct.ui:8
 msgid "_Save"
 msgstr "M_entés"
 
-#: src/direct/DirectPhotoPage.vala:297
+#: src/direct/DirectPhotoPage.vala:316
 msgid "_Save a Copy"
 msgstr "_Másolat mentése"
 
-#: src/direct/DirectPhotoPage.vala:300
+#: src/direct/DirectPhotoPage.vala:319
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Eldobja a(z) %s változtatásait?"
 
-#: src/direct/DirectPhotoPage.vala:301
+#: src/direct/DirectPhotoPage.vala:320
 msgid "Close _without Saving"
 msgstr "Bezárás mentés _nélkül"
 
-#: src/direct/DirectPhotoPage.vala:334
+#: src/direct/DirectPhotoPage.vala:353
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Hiba a(z) %s helyre mentéskor: %s"
 
-#: src/direct/DirectPhotoPage.vala:362 src/direct/DirectPhotoPage.vala:383
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
 msgid "Save As"
 msgstr "Mentés másként"
 
@@ -4115,201 +4098,201 @@ 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:664
+#: src/editing_tools/EditingTools.vala:666
 msgid "Return to current photo dimensions"
 msgstr "Aktuális fényképméretek visszaállítása"
 
-#: src/editing_tools/EditingTools.vala:667
+#: src/editing_tools/EditingTools.vala:669
 msgid "Set the crop for this photo"
 msgstr "Képkivágás beállítása a képhez"
 
-#: src/editing_tools/EditingTools.vala:679
+#: src/editing_tools/EditingTools.vala:681
 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:752
+#: src/editing_tools/EditingTools.vala:754
 msgid "Unconstrained"
 msgstr "Korlátlan"
 
-#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:755
 msgid "Square"
 msgstr "Négyzet"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:756
 msgid "Screen"
 msgstr "Képernyő"
 
-#: src/editing_tools/EditingTools.vala:756
-#: src/editing_tools/EditingTools.vala:759
-#: src/editing_tools/EditingTools.vala:769
-#: src/editing_tools/EditingTools.vala:779
+#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:761
+#: src/editing_tools/EditingTools.vala:771
+#: src/editing_tools/EditingTools.vala:781
 msgid "-"
 msgstr "-"
 
-#: src/editing_tools/EditingTools.vala:757
+#: src/editing_tools/EditingTools.vala:759
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD videó (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:758
+#: src/editing_tools/EditingTools.vala:760
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD videó (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:760 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr "Tárca (2 × 3 hüvelyk)"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr "Jegyzettömb (3 × 5 hüvelyk)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 hüvelyk"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 hüvelyk"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 hüvelyk"
 
-#: src/editing_tools/EditingTools.vala:765
+#: src/editing_tools/EditingTools.vala:767
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8.5 × 11 hüvelyk)"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 hüvelyk"
 
-#: src/editing_tools/EditingTools.vala:767
+#: src/editing_tools/EditingTools.vala:769
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11 × 17 hüvelyk)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 hüvelyk"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Metrikus tárca (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr "Képeslap (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:774
+#: src/editing_tools/EditingTools.vala:776
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:778
+#: src/editing_tools/EditingTools.vala:780
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 mm)"
 
-#: src/editing_tools/EditingTools.vala:1878 src/Properties.vala:398
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
 msgid "Size:"
 msgstr "Méret:"
 
-#: src/editing_tools/EditingTools.vala:1893
+#: src/editing_tools/EditingTools.vala:1895
 msgid "Close the red-eye tool"
 msgstr "Vörösszem-effektus eszköz bezárása"
 
-#: src/editing_tools/EditingTools.vala:1896
+#: src/editing_tools/EditingTools.vala:1898
 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:2236
+#: src/editing_tools/EditingTools.vala:2238
 #: 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:2250 src/Properties.vala:439
+#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
 #: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Expozíció:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: src/editing_tools/EditingTools.vala:2261
 msgid "Contrast:"
 msgstr "Kontraszt:"
 
-#: src/editing_tools/EditingTools.vala:2268
+#: src/editing_tools/EditingTools.vala:2270
 msgid "Saturation:"
 msgstr "Telítettség:"
 
-#: src/editing_tools/EditingTools.vala:2277
+#: src/editing_tools/EditingTools.vala:2279
 msgid "Tint:"
 msgstr "Árnyalat:"
 
-#: src/editing_tools/EditingTools.vala:2287
+#: src/editing_tools/EditingTools.vala:2289
 msgid "Temperature:"
 msgstr "Hőmérséklet:"
 
-#: src/editing_tools/EditingTools.vala:2296
+#: src/editing_tools/EditingTools.vala:2298
 msgid "Shadows:"
 msgstr "Árnyékok:"
 
-#: src/editing_tools/EditingTools.vala:2305
+#: src/editing_tools/EditingTools.vala:2307
 msgid "Highlights:"
 msgstr "Kiemelések:"
 
-#: src/editing_tools/EditingTools.vala:2361
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset Colors"
 msgstr "Színek visszaállítása"
 
-#: src/editing_tools/EditingTools.vala:2361
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset all color adjustments to original"
 msgstr "Minden színmódosítás elvetése"
 
-#: src/editing_tools/EditingTools.vala:2720
+#: src/editing_tools/EditingTools.vala:2722
 msgid "Temperature"
 msgstr "Hőmérséklet"
 
-#: src/editing_tools/EditingTools.vala:2732
+#: src/editing_tools/EditingTools.vala:2734
 msgid "Tint"
 msgstr "Árnyalat"
 
-#: src/editing_tools/EditingTools.vala:2744
+#: src/editing_tools/EditingTools.vala:2746
 msgid "Contrast"
 msgstr "Kontraszt"
 
-#: src/editing_tools/EditingTools.vala:2758
+#: src/editing_tools/EditingTools.vala:2760
 msgid "Saturation"
 msgstr "Telítettség"
 
-#: src/editing_tools/EditingTools.vala:2771
+#: src/editing_tools/EditingTools.vala:2773
 msgid "Exposure"
 msgstr "Expozíció"
 
-#: src/editing_tools/EditingTools.vala:2784
+#: src/editing_tools/EditingTools.vala:2786
 msgid "Shadows"
 msgstr "Árnyékok"
 
-#: src/editing_tools/EditingTools.vala:2797
+#: src/editing_tools/EditingTools.vala:2799
 msgid "Highlights"
 msgstr "Kiemelések"
 
-#: src/editing_tools/EditingTools.vala:2807
+#: src/editing_tools/EditingTools.vala:2809
 msgid "Contrast Expansion"
 msgstr "Kontraszt növelése"
 
@@ -4347,31 +4330,31 @@ msgid_plural "%d Photos"
 msgstr[0] "%d fénykép"
 msgstr[1] "%d fénykép"
 
-#: src/events/EventPage.vala:121
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr "Nincs esemény"
 
-#: src/events/EventsDirectoryPage.vala:143
+#: src/events/EventsDirectoryPage.vala:150
 msgid "No events"
 msgstr "Nincsenek események"
 
-#: src/events/EventsDirectoryPage.vala:147
+#: src/events/EventsDirectoryPage.vala:154
 msgid "No events found"
 msgstr "Nem találhatók események"
 
-#: src/events/EventsDirectoryPage.vala:220
+#: src/events/EventsDirectoryPage.vala:227
 msgid "All Events"
 msgstr "Minden esemény"
 
-#: src/events/EventsDirectoryPage.vala:234
+#: src/events/EventsDirectoryPage.vala:241
 msgid "Undated"
 msgstr "Keltezetlen"
 
-#: src/events/EventsDirectoryPage.vala:235
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:236
+#: src/events/EventsDirectoryPage.vala:243
 msgid "%B"
 msgstr "%B"
 
@@ -4419,12 +4402,12 @@ msgstr "Mappák"
 msgid "Library"
 msgstr "Gyűjtemény"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:1084
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
 msgid "Photos"
 msgstr "Fényképek"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1103
-#: src/SearchFilter.vala:1104
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
 msgid "Flagged"
 msgstr "Megjelölve"
 
@@ -4432,11 +4415,11 @@ msgstr "Megjelölve"
 msgid "Importing…"
 msgstr "Importálás…"
 
-#: src/library/ImportQueuePage.vala:122
+#: src/library/ImportQueuePage.vala:129
 msgid "Preparing to import…"
 msgstr "Importálás előkészítése…"
 
-#: src/library/ImportQueuePage.vala:149
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr "%s importálva"
@@ -4445,19 +4428,19 @@ msgstr "%s importálva"
 msgid "Last Import"
 msgstr "Utolsó importálás"
 
-#: src/library/LibraryWindow.vala:501
+#: src/library/LibraryWindow.vala:507
 msgid "Import From Folder"
 msgstr "Importálás mappából"
 
-#: src/library/LibraryWindow.vala:570 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Kuka ürítése"
 
-#: src/library/LibraryWindow.vala:570
+#: src/library/LibraryWindow.vala:576
 msgid "Emptying Trash…"
 msgstr "Kuka ürítése…"
 
-#: src/library/LibraryWindow.vala:763
+#: src/library/LibraryWindow.vala:772
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4470,33 +4453,33 @@ msgstr ""
 "szerkesztése</span> alatt.\n"
 "Szeretné folytatni a fényképek importálását?"
 
-#: src/library/LibraryWindow.vala:766 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Gyűjtemény helye"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:779
+#: src/library/LibraryWindow.vala:788
 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:1059
+#: src/library/LibraryWindow.vala:1068
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1103 src/library/LibraryWindow.vala:1114
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
 msgid "Updating library…"
 msgstr "Gyűjtemény frissítése…"
 
-#: src/library/LibraryWindow.vala:1120
+#: src/library/LibraryWindow.vala:1129
 msgid "Preparing to auto-import photos…"
 msgstr "Felkészülés fényképek automatikus importáláshoz…"
 
-#: src/library/LibraryWindow.vala:1125
+#: src/library/LibraryWindow.vala:1134
 msgid "Auto-importing photos…"
 msgstr "Fényképek automatikus importálása…"
 
-#: src/library/LibraryWindow.vala:1133
+#: src/library/LibraryWindow.vala:1142
 msgid "Writing metadata to files…"
 msgstr "Metaadatok írása a fájlokba…"
 
@@ -4504,7 +4487,7 @@ msgstr "Metaadatok írása a fájlokba…"
 msgid "Missing Files"
 msgstr "Hiányzó fájlok"
 
-#: src/library/OfflinePage.vala:103
+#: src/library/OfflinePage.vala:110
 msgid "Deleting…"
 msgstr "Törlés…"
 
@@ -4512,15 +4495,15 @@ msgstr "Törlés…"
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/library/TrashPage.vala:101
+#: src/library/TrashPage.vala:108
 msgid "Trash is empty"
 msgstr "A Kuka üres"
 
-#: src/library/TrashPage.vala:105
+#: src/library/TrashPage.vala:112
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/library/TrashPage.vala:106
+#: src/library/TrashPage.vala:113
 msgid "Deleting Photos"
 msgstr "Fényképek törlése"
 
@@ -4568,32 +4551,32 @@ msgstr "Ismeretlen hiba a Shotwell adatbázisának ellenőrzésekor: %s"
 msgid "Loading Shotwell"
 msgstr "A Shotwell betöltése"
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "Path to Shotwell’s private data"
 msgstr "A Shotwell privát adatainak útvonala"
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "DIRECTORY"
 msgstr "KÖNYVTÁR"
 
-#: src/main.vala:298
+#: src/main.vala:297
 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:302
+#: src/main.vala:301
 msgid "Don’t display startup progress meter"
 msgstr "Ne jelenítse meg az indítási folyamatjelzőt"
 
-#: src/main.vala:306
+#: src/main.vala:305
 msgid "Show the application’s version"
 msgstr "Az alkalmazás verziószámának megjelenítése"
 
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
+#: src/main.vala:342
 msgid "[FILE]"
 msgstr "[FÁJL]"
 
-#: 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 ""
@@ -4609,7 +4592,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:493
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4618,34 +4601,34 @@ msgstr ""
 "A Shotwell nem tudta lejátszani a kijelölt videót:\n"
 "%s"
 
-#: src/Page.vala:1338
+#: src/Page.vala:1318
 msgid "No photos/videos"
 msgstr "Nincsenek fényképek vagy videók"
 
-#: src/Page.vala:1342
+#: src/Page.vala:1322
 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:2648
+#: src/Page.vala:2628
 msgid "Photos cannot be exported to this directory."
 msgstr "Nem exportálhatók fényképek ebbe a könyvtárba."
 
 #. previous button
-#: src/PhotoPage.vala:535
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Előző fénykép"
 
 #. next button
-#: src/PhotoPage.vala:541
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Következő fénykép"
 
-#: src/PhotoPage.vala:1847
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "A fénykép forrásfájlja hiányzik: %s"
 
-#: src/PhotoPage.vala:3008
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "%s exportálása sikertelen: %s"
@@ -4690,7 +4673,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3755
 msgid "modified"
 msgstr "módosítva"
 
@@ -4722,23 +4705,15 @@ msgstr "16 kép oldalanként"
 msgid "32 images per page"
 msgstr "32 kép oldalanként"
 
-#: src/Printing.vala:348
-msgid "in."
-msgstr "hüvelyk"
-
-#: src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: src/Printing.vala:876
+#: src/Printing.vala:851
 msgid "Image Settings"
 msgstr "Képbeállítások"
 
-#: src/Printing.vala:889
+#: src/Printing.vala:864
 msgid "Printing…"
 msgstr "Nyomtatás…"
 
-#: src/Printing.vala:909 src/Printing.vala:1112
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -4891,13 +4866,18 @@ msgstr ""
 
 #. Here, we check whether more than one item is being uploaded, and if so, display
 #. an alternate message.
-#: src/publishing/PublishingUI.vala:104 src/publishing/PublishingUI.vala:109
-#| msgid "The selected video was successfully published."
+#: src/publishing/PublishingUI.vala:104
 msgid "The selected video was successfully published."
 msgid_plural "The selected videos were successfully published."
 msgstr[0] "A kijelölt videó sikeresen közzétéve."
 msgstr[1] "A kijelölt videók sikeresen közzétéve."
 
+#: src/publishing/PublishingUI.vala:109
+msgid "The selected photo was successfully published."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "A kijelölt fénykép sikeresen közzétéve."
+msgstr[1] "A kijelölt fényképek sikeresen közzétéve."
+
 #: src/publishing/PublishingUI.vala:115
 msgid "The selected photos/videos were successfully published."
 msgstr "A kijelölt fényképek vagy videók sikeresen közzétéve."
@@ -4997,7 +4977,7 @@ msgstr "_Alkalmaz"
 
 #: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
 #: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
-#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
+#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
@@ -5015,7 +4995,7 @@ msgstr "Teljes ké_pernyő"
 #: 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
+#: ui/tags.ui:423 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "_Súgó"
 
@@ -5023,7 +5003,7 @@ msgstr "_Súgó"
 msgid "Leave _Fullscreen"
 msgstr "Teljes képernyő _elhagyása"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "Ú_j"
 
@@ -5378,7 +5358,8 @@ msgstr "Kettőzés"
 msgid "Make a duplicate of the photo"
 msgstr "Másolat készítése a fényképről"
 
-#: src/Resources.vala:290
+#: src/Resources.vala:290 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
 msgid "_Export…"
 msgstr "E_xportálás…"
 
@@ -5515,7 +5496,7 @@ msgstr "„%s” címke át_nevezése…"
 msgid "Rename Tag “%s” to “%s”"
 msgstr "„%s” címke átnevezése erre: „%s”"
 
-#: src/Resources.vala:373
+#: src/Resources.vala:373 ui/tags.ui:454
 msgid "_Rename…"
 msgstr "Át_nevezés…"
 
@@ -5530,7 +5511,6 @@ msgstr "Címkék módosítása"
 
 #: src/Resources.vala:379
 #, c-format
-#| msgid "Tag Photo as “%s”"
 msgid "Tag Photo as “%s”"
 msgid_plural "Tag Photos as “%s”"
 msgstr[0] "Fénykép címkézése ezzel: „%s”"
@@ -5538,7 +5518,6 @@ msgstr[1] "Fényképek címkézése ezzel: „%s”"
 
 #: src/Resources.vala:385
 #, c-format
-#| msgid "Tag the selected photo as “%s”"
 msgid "Tag the selected photo as “%s”"
 msgid_plural "Tag the selected photos as “%s”"
 msgstr[0] "Kiválasztott fénykép címkézése ezzel: „%s”"
@@ -5546,7 +5525,6 @@ msgstr[1] "Kiválasztott fényképek címkézése ezzel: „%s”"
 
 #: src/Resources.vala:391
 #, c-format
-#| msgid "Remove Tag “%s” From _Photo"
 msgid "Remove Tag “%s” From _Photo"
 msgid_plural "Remove Tag “%s” From _Photos"
 msgstr[0] "„%s” címke _eltávolítása a fényképről"
@@ -5554,7 +5532,6 @@ msgstr[1] "„%s” címke _eltávolítása a fényképekről"
 
 #: src/Resources.vala:397
 #, c-format
-#| msgid "Remove Tag “%s” From Photo"
 msgid "Remove Tag “%s” From Photo"
 msgid_plural "Remove Tag “%s” From Photos"
 msgstr[0] "„%s” címke eltávolítása a fényképről"
@@ -5571,7 +5548,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:410 src/SearchFilter.vala:1125
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Mentett keresés"
 
@@ -5696,14 +5673,14 @@ msgstr "Minden elem kijelölése"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:766
+#: src/Resources.vala:738
 msgid "%a %b %d, %Y"
 msgstr "%Y. %b. %d., %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
-#: src/Resources.vala:771
+#: src/Resources.vala:743
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a. %b. %d"
@@ -5711,7 +5688,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:776
+#: src/Resources.vala:748
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%Y. %d."
@@ -5719,7 +5696,7 @@ msgstr "%Y. %d."
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:781
+#: src/Resources.vala:753
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a. %b. %d"
@@ -5727,7 +5704,7 @@ 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:786
+#: src/Resources.vala:758
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%Y. %b. %d., %a"
@@ -5914,7 +5891,7 @@ msgid "Photo state"
 msgstr "Fénykép állapota"
 
 #: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
-#: src/SearchFilter.vala:1115
+#: src/SearchFilter.vala:1114
 msgid "Rating"
 msgstr "Értékelés"
 
@@ -5923,12 +5900,10 @@ msgid "Date"
 msgstr "Dátum"
 
 #: src/SearchFilter.vala:815
-#| msgid "Rating"
 msgid "★+ Rating"
 msgstr "★+ Értékelés"
 
 #: src/SearchFilter.vala:818
-#| msgid "Rating"
 msgid "★★+ Rating"
 msgstr "★★+ Értékelés"
 
@@ -5944,9 +5919,8 @@ msgstr "★★★★+ Értékelés"
 msgid "★★★★★+ Rating"
 msgstr "★★★★★+ Értékelés"
 
-#: src/SearchFilter.vala:1065
+#: src/SearchFilter.vala:1064
 #, c-format
-#| msgid "Error loading UI file %s: %s"
 msgid "Error loading search bar UI: %s"
 msgstr "Hiba a keresősáv felületének betöltésekor: %s"
 
@@ -5955,24 +5929,24 @@ 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:1074
+#: src/SearchFilter.vala:1073
 msgid "Close"
 msgstr "Bezárás"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1080
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr "Típus"
 
-#: src/SearchFilter.vala:1087
+#: src/SearchFilter.vala:1086
 msgid "Videos"
 msgstr "Videók"
 
-#: src/SearchFilter.vala:1090
+#: src/SearchFilter.vala:1089
 msgid "RAW Photos"
 msgstr "RAW fényképek"
 
-#: src/SearchFilter.vala:1126
+#: src/SearchFilter.vala:1125
 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"
 
@@ -6048,7 +6022,7 @@ msgid "untitled"
 msgstr "névtelen"
 
 #. multiple videos
-#: src/VideoSupport.vala:507
+#: src/VideoSupport.vala:523
 msgid "Export Videos"
 msgstr "Videók exportálása"
 
@@ -6063,7 +6037,6 @@ msgid "_Developer"
 msgstr "_Előhívó"
 
 #: 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 "Megnyitás külső _szerkesztővel"
 
@@ -6074,17 +6047,17 @@ msgstr "Fénykép _eseményének megjelenítése"
 
 #: 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 "_Fájl"
 
-#: 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 "Men_tés másként…"
 
 #: 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ézet"
 
@@ -6100,7 +6073,7 @@ msgstr "_100% nagyítás"
 msgid "Zoom _200%"
 msgstr "_200% nagyítás"
 
-#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+#: ui/direct.ui:98 ui/photo.ui:187
 msgid "_Photo"
 msgstr "_Fénykép"
 
@@ -6130,7 +6103,6 @@ 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…"
 
@@ -6206,13 +6178,11 @@ msgid "D_escending"
 msgstr "_Csökkenő"
 
 #: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
-#: ui/top.ui:30
 msgid "Even_ts"
 msgstr "_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"
 msgid "R_emove from Library"
 msgstr "_Eltávolítás a gyűjteményből"
 
@@ -6221,7 +6191,7 @@ msgid "_Titles"
 msgstr "_Címek"
 
 #: 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/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385
 msgid "Ta_gs"
 msgstr "Cí_mkék"
 
@@ -6247,11 +6217,10 @@ msgstr "É_rtékelés szerint"
 
 #: 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 "_Csökkenő"
 
-#: 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 "Fény_képek"
 
@@ -6259,43 +6228,85 @@ msgstr "Fény_képek"
 msgid "_Stop Import"
 msgstr "Importálás l_eállítása"
 
-#: ui/import.ui:13 ui/import.ui:210
-msgid "Import _Selected"
-msgstr "_Kijelöltek importálása"
+#: ui/printing_widget.ui:19
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Nyomtatott képméret</b>"
 
-#: ui/import.ui:17 ui/import.ui:214
-msgid "Import _All"
-msgstr "Összes im_portálása"
+#: 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:15
+#: 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:77 ui/set_background_slideshow_dialog.ui:132
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
 msgid "Use for Desktop"
 msgstr "Használat az asztalhoz"
 
-#: ui/set_background_dialog.ui:92 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
 msgid "Use for Lock Screen"
 msgstr "Használat a zárolási képernyőhöz"
 
-#: ui/set_background_slideshow_dialog.ui:15
+#: 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:33
+#: 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:45
+#: ui/set_background_slideshow_dialog.ui:94
 msgid "period of time"
 msgstr "ennyi ideig"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Asztalháttér-diavetítés készítése"
-
-#: ui/set_background_slideshow_dialog.ui:115
+#: ui/set_background_slideshow_dialog.ui:116
 msgid "How long each photo is shown on the desktop background"
 msgstr "Az egyes fényképek meddig jelenjenek meg asztalháttérként"
 
@@ -6375,79 +6386,39 @@ msgstr "Külső szerkesztők"
 msgid "Plugins"
 msgstr "Bővítmények"
 
-#: ui/shotwell.ui:583
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Nyomtatott képméret</b>"
-
-#: ui/shotwell.ui:600
-msgid "Use a _standard size:"
-msgstr "_Szabványos méret használata:"
-
-#: ui/shotwell.ui:643
-msgid "Use a c_ustom size:"
-msgstr "_Egyéni méret használata:"
-
-#: ui/shotwell.ui:731
-msgid "_Match photo aspect ratio"
-msgstr "Fénykép _méretarányának megtartása"
-
-#: ui/shotwell.ui:755
-msgid "_Autosize:"
-msgstr "_Automatikus méret:"
-
-#: ui/shotwell.ui:795
-msgid "<b>Titles</b>"
-msgstr "<b>Címek</b>"
-
-#: ui/shotwell.ui:812
-msgid "Print image _title"
-msgstr "Kép _címének nyomtatása"
-
-#: ui/shotwell.ui:855
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Felbontás képpontban</b>"
-
-#: ui/shotwell.ui:875
-msgid "_Output photo at:"
-msgstr "_Kimenő fénykép:"
-
-#: ui/shotwell.ui:909
-msgid "pixels per inch"
-msgstr "képpont hüvelykenként"
-
-#: ui/shotwell.ui:949
+#: ui/shotwell.ui:590
 msgid "_Name of search:"
 msgstr "Keresés _neve:"
 
-#: ui/shotwell.ui:1003
+#: ui/shotwell.ui:644
 msgid "_Match"
 msgstr "Illes_zkedjen"
 
-#: ui/shotwell.ui:1030
+#: ui/shotwell.ui:671
 msgid "of the following:"
 msgstr "a következőkkel:"
 
-#: ui/shotwell.ui:1111
+#: ui/shotwell.ui:752
 msgid "label"
 msgstr "címke"
 
-#: ui/shotwell.ui:1262
+#: ui/shotwell.ui:903
 msgid "_Delay:"
 msgstr "_Késleltetés:"
 
-#: ui/shotwell.ui:1276
+#: ui/shotwell.ui:917
 msgid "_Transition effect:"
 msgstr "Átmenet _effektus:"
 
-#: ui/shotwell.ui:1290
+#: ui/shotwell.ui:931
 msgid "Transition d_elay:"
 msgstr "Átmenet _késleltetése:"
 
-#: ui/shotwell.ui:1300
+#: ui/shotwell.ui:941
 msgid "Show t_itle"
 msgstr "_Cím megjelenítése"
 
-#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
 msgid "seconds"
 msgstr "másodperc"
 
@@ -6459,212 +6430,3 @@ msgstr "Új _címke…"
 msgid "Delete all photos in the trash"
 msgstr "Minden fénykép törlése a Kukában"
 
-#~ msgid "_Contents"
-#~ msgstr "_Tartalom"
-
-#~ msgid "Display the title of each photo"
-#~ msgstr "Fényképek címeinek megjelenítése"
-
-#~ msgid "Import the selected photos into your library"
-#~ msgstr "Kijelölt fényképek importálása a gyűjteményébe"
-
-#~ msgid "Import all the photos into your library"
-#~ msgstr "Minden fénykép importálása a gyűjteményébe"
-
-#~ msgid "Play a slideshow"
-#~ msgstr "Diavetítés indítása"
-
-#~ msgid "_Modify original photo files"
-#~ msgstr "Eredeti fényképfájlok _módosítása"
-
-#~ msgid "_Modify original files"
-#~ msgstr "Eredeti fájlok _módosítása"
-
-#~ msgid "Save photo"
-#~ msgstr "Fénykép mentése"
-
-#~ msgid "Save photo with a different name"
-#~ msgstr "Fénykép mentése más névvel"
-
-#~ msgid "Print the photo to a printer connected to your computer"
-#~ msgstr "Fénykép nyomtatása a számítógéphez csatlakozó nyomtatón"
-
-#~ msgid "Previous Photo"
-#~ msgstr "Előző fénykép"
-
-#~ msgid "Next Photo"
-#~ msgstr "Következő fénykép"
-
-#~ msgid "Increase the magnification of the photo"
-#~ msgstr "Fénykép nagyításának növelése"
-
-#~ msgid "Decrease the magnification of the photo"
-#~ msgstr "Fénykép nagyításának csökkentése"
-
-#~ msgid "Zoom the photo to fit on the screen"
-#~ msgstr "Képernyő kitöltése a fényképpel"
-
-#~ msgid "Zoom the photo to 100% magnification"
-#~ msgstr "Fénykép 100%-os nagyítása"
-
-#~ msgid "Zoom the photo to 200% magnification"
-#~ msgstr "Fénykép 200%-os nagyítása"
-
-#~ msgid "Display the comment of each event"
-#~ msgstr "Az egyes események megjegyzéseinek megjelenítése"
-
-#~ msgid "Stop importing photos"
-#~ msgstr "Fényképek importálásának leállítása"
-
-#~ msgid "Import photos from disk to library"
-#~ msgstr "Fényképek importálása a gyűjteménybe lemezről"
-
-#~ msgid "Find photos and videos by search criteria"
-#~ msgstr "Fényképek és videók keresése keresőkifejezésekkel"
-
-#~ msgid "Display basic information for the selection"
-#~ msgstr "Kijelöltek alapvető információinak megjelenítése"
-
-#~ msgid "Display extended information for the selection"
-#~ msgstr "Kijelöltek további információinak megjelenítése"
-
-#~ msgid "Display the search bar"
-#~ msgstr "A keresősáv megjelenítése"
-
-#~ msgid "Display the sidebar"
-#~ msgstr "Az oldalsáv megjelenítése"
-
-#~ msgid "Display the tool bar"
-#~ msgstr "Az eszköztár megjelenítése"
-
-#~ msgid "Sort photos in an ascending order"
-#~ msgstr "Fényképek növekvő sorrendbe rendezése"
-
-#~ msgid "Sort photos in a descending order"
-#~ msgstr "Fényképek csökkenő sorrendbe rendezése"
-
-#~ msgid "Increase the magnification of the thumbnails"
-#~ msgstr "Bélyegképek nagyítása"
-
-#~ msgid "Decrease the magnification of the thumbnails"
-#~ msgstr "Bélyegképek kicsinyítése"
-
-#~ msgid "_Play Video"
-#~ msgstr "_Videó lejátszása"
-
-#~ msgid "Open the selected videos in the system video player"
-#~ msgstr "Kijelölt videók megnyitása a rendszer videolejátszójában"
-
-#~ msgid "Display the comment of each photo"
-#~ msgstr "Az egyes képek megjegyzéseinek megjelenítése"
-
-#~ msgid "Display each photo’s tags"
-#~ msgstr "Fényképek címkéinek megjelenítése"
-
-#~ msgid "Sort photos by title"
-#~ msgstr "Fényképek rendezése cím szerint"
-
-#~ msgid "Sort photos by exposure date"
-#~ msgstr "Fényképek rendezése készítésük dátuma szerint"
-
-#~ msgid "Sort photos by rating"
-#~ msgstr "Fényképek rendezése értékelés szerint"
-
-#~ msgid "Sort photos by filename"
-#~ msgstr "Fényképek rendezése fájlnév szerint"
-
-#~ msgid "The selected videos were successfully published."
-#~ msgstr "A kijelölt videók sikeresen közzétéve."
-
-#~ msgid "The selected photos were successfully published."
-#~ msgstr "A kijelölt fényképek sikeresen közzétéve."
-
-#~ msgid "The selected photo was successfully published."
-#~ msgstr "A kijelölt fénykép sikeresen közzétéve."
-
-#~ msgid "Tag Photos as “%s”"
-#~ msgstr "Fényképek címkézése ezzel: „%s”"
-
-#~ msgid "Tag the selected photos as “%s”"
-#~ msgstr "Kiválasztott fényképek címkézése ezzel: „%s”"
-
-#~ msgid "Remove Tag “%s” From _Photos"
-#~ msgstr "„%s” címke _eltávolítása a fényképekről"
-
-#~ msgid "Remove Tag “%s” From Photos"
-#~ msgstr "„%s” címke eltávolítása a fényképekről"
-
-#~ msgid "RAW photos"
-#~ msgstr "RAW fényképek"
-
-#~ msgid "Shotwell Preferences"
-#~ msgstr "Shotwell beállítások"
-
-#~ msgid "Login"
-#~ msgstr "Bejelentkezés"
-
-#~ msgid "Save Details..."
-#~ msgstr "Részletek mentése…"
-
-#~ msgid "Save _As..."
-#~ msgstr "Men_tés másként…"
-
-#~ msgid "Importing..."
-#~ msgstr "Importálás…"
-
-#~ msgid "Preparing to import..."
-#~ msgstr "Importálás előkészítése…"
-
-#~ msgid "_Import From Folder..."
-#~ msgstr "_Importálás mappából…"
-
-#~ msgid "Import From _Application..."
-#~ msgstr "Importálás _alkalmazásból…"
-
-#~ msgid "Set as _Desktop Slideshow..."
-#~ msgstr "Beállítás asztali _diavetítésként…"
-
-#~ msgid "Re_name Event..."
-#~ msgstr "Esemé_ny átnevezése…"
-
-#~ msgid "_Export..."
-#~ msgstr "_Exportálás…"
-
-#~ msgid "_Print..."
-#~ msgstr "_Nyomtatás…"
-
-#~ msgid "Pu_blish..."
-#~ msgstr "Kö_zzététel…"
-
-#~ msgid "Edit _Title..."
-#~ msgstr "_Cím szerkesztése…"
-
-#~ msgid "Edit _Comment..."
-#~ msgstr "Megjegyzés s_zerkesztése…"
-
-#~ msgid "Edit Event _Comment..."
-#~ msgstr "_Eseménymegjegyzés szerkesztése…"
-
-#~ msgid "_Adjust Date and Time..."
-#~ msgstr "_Dátum és idő módosítása…"
-
-#~ msgid "Add _Tags..."
-#~ msgstr "_Címkék hozzáadása…"
-
-#~ msgid "_Add Tags..."
-#~ msgstr "Címkék hozzáadása…"
-
-#~ msgid "Send _To..."
-#~ msgstr "Kül_dés…"
-
-#~ msgid "Send T_o..."
-#~ msgstr "Küldés _célja…"
-
-#~ msgid "_Find..."
-#~ msgstr "_Keresés…"
-
-#~ msgid "Modif_y Tags..."
-#~ msgstr "Cí_mkék módosítása…"
-
-#~ msgid "_Edit..."
-#~ msgstr "S_zerkesztés…"
diff --git a/po/kk.gmo b/po/kk.gmo
index 2f646a8..7d47fbc 100644
--- a/po/kk.gmo
+++ b/po/kk.gmo
diff --git a/po/kk.po b/po/kk.po
index d26bd16..a6717c5 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -11,10 +11,10 @@
 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: 2016-10-08 14:29+0000\n"
-"PO-Revision-Date: 2016-11-09 14:16+0500\n"
+"POT-Creation-Date: 2017-03-15 21:35+0000\n"
+"PO-Revision-Date: 2017-03-17 13:38+0500\n"
 "Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh (http://www.transifex.com/projects/p/shotwell/language/"
 "kk/)\n"
@@ -27,7 +27,9 @@ msgstr ""
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/MediaPage.vala:435 src/photos/RawSupport.vala:300
+#: src/photos/RawSupport.vala: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
 msgid "Shotwell"
 msgstr "Shotwell"
 
@@ -57,6 +59,10 @@ msgstr ""
 "Shotwell JPEG, PNG, TIFF және RAW файл пішімдерінің бірнеше түрлерін "
 "қолдайды."
 
+#: misc/shotwell.appdata.xml.in:52
+msgid "The Shotwell developers"
+msgstr "Shotwell өндірушілері"
+
 #: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Фотосуреттерді басқару қолданбасы"
@@ -75,12 +81,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 "Shotwell көрсетушісі"
 
@@ -102,7 +106,7 @@ msgstr "Токен"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:15
 msgid "The token to access tumblr"
-msgstr ""
+msgstr "tumblr-ге қатынау токені"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:20
 msgid "Secret token"
@@ -164,7 +168,7 @@ msgstr "соңғы санат"
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:59
 msgid "The last selected Rajce category."
-msgstr ""
+msgstr "Соңғы таңдалған Rajce санаты."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:64
 #: misc/org.yorba.shotwell.gschema.xml:542
@@ -328,10 +332,8 @@ msgid "True if events should be sorted ascending, false if descending."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:95
-#, fuzzy
-#| msgid "Sort photos in an ascending order"
 msgid "sort library photos ascending"
-msgstr "Фотоларды өсу ретімен сұрыптау"
+msgstr "жинақ фотоларын өсу ретімен сұрыптау"
 
 #: misc/org.yorba.shotwell.gschema.xml:96
 msgid "True if library photos should be sorted ascending, false if descending."
@@ -347,20 +349,16 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:107
-#, fuzzy
-#| msgid "Sort photos in an ascending order"
 msgid "sort event photos ascending"
-msgstr "Фотоларды өсу ретімен сұрыптау"
+msgstr "оқиға фотоларын өсу ретімен сұрыптау"
 
 #: misc/org.yorba.shotwell.gschema.xml:108
 msgid "True if event photos should be sorted ascending, false if descending."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:113
-#, fuzzy
-#| msgid "Sort photos by title"
 msgid "sort event photos criteria"
-msgstr "Фотоларды атаулары бойынша сұрыптау"
+msgstr "оқиға фотоларын сұрыптау шарты"
 
 #: misc/org.yorba.shotwell.gschema.xml:114
 msgid "Specifies the sort criteria for event photos."
@@ -387,10 +385,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:131
-#, fuzzy
-#| msgid "_Modify original photo files"
 msgid "modify original photo files"
-msgstr "Түпнұсқа фотосурет файлдарын тү_зету"
+msgstr "түпнұсқа фотосурет файлдарын түзету"
 
 #: misc/org.yorba.shotwell.gschema.xml:132
 msgid ""
@@ -409,10 +405,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:143
-#, fuzzy
-#| msgid "Library Location"
 msgid "sidebar position"
-msgstr "Жинақтың орналасуы"
+msgstr "бүйір панельдің орналасуы"
 
 #: misc/org.yorba.shotwell.gschema.xml:144
 msgid "The width, in pixels, of the sidebar"
@@ -427,20 +421,16 @@ msgid "The scale of photo thumbnails, ranging from 72 to 360."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:155
-#, fuzzy
-#| msgid "Pin the toolbar open"
 msgid "pin toolbar state"
-msgstr "Панельді ашық түрінде бекіту"
+msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:156
 msgid "Pin toolbar in fullscreen, or not."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:161
-#, fuzzy
-#| msgid "_Background:"
 msgid "background color"
-msgstr "_Фон:"
+msgstr "фон түсі"
 
 #: misc/org.yorba.shotwell.gschema.xml:162
 msgid "A grayscale color for use as the background color."
@@ -465,10 +455,8 @@ msgid "Delay (in seconds) between photos in the slideshow."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:181
-#, fuzzy
-#| msgid "Transition d_elay:"
 msgid "transition delay"
-msgstr "Алмасу ара_лығы:"
+msgstr "алмасу кідірісі"
 
 #: misc/org.yorba.shotwell.gschema.xml:182
 msgid ""
@@ -476,10 +464,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:187
-#, fuzzy
-#| msgid "_Transition effect:"
 msgid "transition effect id"
-msgstr "Алма_су эффекті:"
+msgstr "алмасу эффект id-і"
 
 #: misc/org.yorba.shotwell.gschema.xml:188
 msgid ""
@@ -488,10 +474,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:193
-#, fuzzy
-#| msgid "Show t_itle"
 msgid "Show title"
-msgstr "А_тауын көрсету"
+msgstr "Атауын көрсету"
 
 #: misc/org.yorba.shotwell.gschema.xml:194
 msgid "Whether to show the title of a photo during the slideshow"
@@ -556,20 +540,16 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:245
-#, fuzzy
-#| msgid "Import to Library"
 msgid "import directory"
-msgstr "Жинақ ішіне импорттау"
+msgstr "буманы импорттау"
 
 #: misc/org.yorba.shotwell.gschema.xml:246
 msgid "Directory in which imported photo files are placed."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:251
-#, fuzzy
-#| msgid "_Watch library directory for new files"
 msgid "watch library directory for new files"
-msgstr "Жинақ бу_масын жаңа файлдарға бақылау"
+msgstr "жинақ бумасын жаңа файлдарға бақылау"
 
 #: misc/org.yorba.shotwell.gschema.xml:252
 msgid ""
@@ -577,10 +557,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:257
-#, fuzzy
-#| msgid "Writing metadata to files..."
 msgid "write metadata to master files"
-msgstr "Файлдарға метаақпаратты жазу..."
+msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:258
 msgid ""
@@ -599,10 +577,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:269
-#, fuzzy
-#| msgid "_Directory structure:"
 msgid "directory pattern"
-msgstr "Бу_ма құрылысы:"
+msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:270
 msgid ""
@@ -621,10 +597,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:281
-#, fuzzy
-#| msgid "RAW Developer"
 msgid "RAW developer default"
-msgstr "RAW өндіруші"
+msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:282
 msgid "Default option for which RAW developer Shotwell will use."
@@ -659,20 +633,16 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:307
-#, fuzzy
-#| msgid "E_xternal photo editor:"
 msgid "external photo editor"
-msgstr "С_ыртқы фото түзетушісі:"
+msgstr "сыртқы фото түзетушісі"
 
 #: misc/org.yorba.shotwell.gschema.xml:308
 msgid "External application used to edit photos."
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:313
-#, fuzzy
-#| msgid "External _RAW editor:"
 msgid "external raw editor"
-msgstr "С_ыртқы RAW түзетушісі:"
+msgstr "сыртқы RAW түзетушісі"
 
 #: misc/org.yorba.shotwell.gschema.xml:314
 msgid "External application used to edit RAW photos."
@@ -684,10 +654,8 @@ msgid "Setting in export dialog: how to trim images"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:358
-#, fuzzy
-#| msgid "Export metadata"
 msgid "export metadata"
-msgstr "Метаақпаратты экспорттау"
+msgstr "метаақпаратты экспорттау"
 
 #: misc/org.yorba.shotwell.gschema.xml:359
 msgid "Setting in export dialog: option to export metadata"
@@ -726,10 +694,8 @@ msgid "Setting in export dialog: maximal size of image"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:390
-#, fuzzy
-#| msgid "Core Publishing Services"
 msgid "last used publishing service"
-msgstr "Жариялау қызметтері"
+msgstr "соңғы қолданылған жариялау қызметі"
 
 #: misc/org.yorba.shotwell.gschema.xml:391
 #: misc/org.yorba.shotwell.gschema.xml:397
@@ -738,16 +704,12 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:396
-#, fuzzy
-#| msgid "Core Publishing Services"
 msgid "default publishing service"
-msgstr "Жариялау қызметтері"
+msgstr "үнсіз келісім бойынша жариялау қызметі"
 
 #: misc/org.yorba.shotwell.gschema.xml:410
-#, fuzzy
-#| msgid "Access _type:"
 msgid "access token"
-msgstr "Қатынау _түрі:"
+msgstr "қатынау токені"
 
 #: misc/org.yorba.shotwell.gschema.xml:411
 msgid "Facebook OAuth token for the currently logged in session, if any"
@@ -766,10 +728,8 @@ msgid "user name"
 msgstr "пайдаланушы аты"
 
 #: misc/org.yorba.shotwell.gschema.xml:423
-#, fuzzy
-#| msgid "You are not currently logged into Yandex.Fotki."
 msgid "The name of the currently logged in Facebook user, if any"
-msgstr "Сіз қазір Яндекс.Фотки ішіне кірмегенсіз."
+msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:428
 #: misc/org.yorba.shotwell.gschema.xml:460
@@ -893,7 +853,7 @@ msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:531
 msgid "The last selected Piwigo category."
-msgstr ""
+msgstr "Соңғы таңдалған Piwigo санаты."
 
 #: misc/org.yorba.shotwell.gschema.xml:536
 msgid "last permission level"
@@ -916,12 +876,11 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:554
-#, fuzzy
-#| msgid "_If a title is set and comment unset, use title as comment"
 msgid ""
 "if title is set and comment unset, use title as comment for uploads to Piwigo"
 msgstr ""
-"Егер а_тауы болса, ал түсіндірмесі болмаса, атауды түсіндірме ретінде қолдану"
+"Егер атауы болса, ал түсіндірмесі болмаса, Piwigo-ға жариялау үшін атауды "
+"түсіндірме ретінде қолдану"
 
 #: misc/org.yorba.shotwell.gschema.xml:555
 msgid ""
@@ -948,7 +907,6 @@ msgid "API key"
 msgstr "API кілті"
 
 #: misc/org.yorba.shotwell.gschema.xml:575
-#| msgid "_Gallery3 URL:"
 msgid "Gallery3 API key"
 msgstr "Gallery3 API кілті"
 
@@ -957,7 +915,6 @@ msgid "URL"
 msgstr "Сілтеме"
 
 #: misc/org.yorba.shotwell.gschema.xml:581
-#| msgid "_Gallery3 URL:"
 msgid "Gallery3 site URL"
 msgstr "Gallery3 сайт сілтемесі"
 
@@ -992,10 +949,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:620
-#, fuzzy
-#| msgid "Core Data Import Services"
 msgid "last used import service"
-msgstr "Өзек мәлімет импорттау қызметтері"
+msgstr "соңғы қолданылған импорттау қызметі"
 
 #: misc/org.yorba.shotwell.gschema.xml:621
 msgid ""
@@ -1022,10 +977,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:642
-#, fuzzy
-#| msgid "_Contents"
 msgid "content ppi"
-msgstr "Құра_масы"
+msgstr "құраманың ppi шамасы"
 
 #: misc/org.yorba.shotwell.gschema.xml:643
 msgid "The number of pixels per inch (ppi) sent to the printer during printing"
@@ -1040,20 +993,16 @@ msgid "The width of the printed emulsion on the page when printing"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:654
-#, fuzzy
-#| msgid "Rotate Right"
 msgid "content height"
-msgstr "Оңға бұру"
+msgstr "құрама биіктігі"
 
 #: misc/org.yorba.shotwell.gschema.xml:655
 msgid "The height of the printed emulsion on the page when printing"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:660
-#, fuzzy
-#| msgid "_Contents"
 msgid "content units"
-msgstr "Құра_масы"
+msgstr "құраманың өлшем бірліктері"
 
 #: misc/org.yorba.shotwell.gschema.xml:661
 msgid ""
@@ -1062,10 +1011,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:666
-#, fuzzy
-#| msgid "2 images per page"
 msgid "images per page code"
-msgstr "2 сурет парақта"
+msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:667
 msgid ""
@@ -1083,10 +1030,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:678
-#, fuzzy
-#| msgid "_Match photo aspect ratio"
 msgid "match aspect ratio"
-msgstr "_Фото жақтарының қатынасын сақтау"
+msgstr "жақтар ара қатынасын сақтау"
 
 #: misc/org.yorba.shotwell.gschema.xml:679
 msgid ""
@@ -1095,10 +1040,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:684
-#, fuzzy
-#| msgid "Print image _title"
 msgid "print titles"
-msgstr "Сурет ат_ауын да баспаға шығару"
+msgstr "атауларын да баспаға шығару"
 
 #: misc/org.yorba.shotwell.gschema.xml:685
 msgid ""
@@ -1108,7 +1051,7 @@ msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:690
 msgid "titles font"
-msgstr ""
+msgstr "атаулар қарібі"
 
 #: misc/org.yorba.shotwell.gschema.xml:691
 msgid "The name of the font to use for photo titles when they are printed."
@@ -1140,7 +1083,6 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:720
-#| msgid "Unable to publish"
 msgid "enable youtube publishing plugin"
 msgstr "youtube жариялау плагинін іске қосу"
 
@@ -1149,7 +1091,6 @@ msgid "True if the YouTube publishing plugin is enabled, false otherwise"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:726
-#| msgid "Unable to publish"
 msgid "enable piwigo publishing plugin"
 msgstr "piwigo жариялау плагинін іске қосу"
 
@@ -1166,7 +1107,6 @@ msgid "True if the Yandex.Fotki publishing plugin is enabled, false otherwise"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:738
-#| msgid "Unable to publish"
 msgid "enable tumblr publishing plugin"
 msgstr "tumblr жариялау плагинін іске қосу"
 
@@ -1175,7 +1115,6 @@ msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:744
-#| msgid "Gallery3 publishing module"
 msgid "enable rajce publishing plugin"
 msgstr "rajce жариялау плагинін іске қосу"
 
@@ -1184,7 +1123,6 @@ msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:750
-#| msgid "Gallery3 publishing module"
 msgid "enable gallery3 publishing plugin"
 msgstr "gallery3 жариялау плагинін іске қосу"
 
@@ -1201,10 +1139,8 @@ msgid "True if the F-Spot import plugin is enabled, false otherwise"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:762
-#, fuzzy
-#| msgid "Core Slideshow Transitions"
 msgid "enable slideshow crumble transition"
-msgstr "Слайдшоу арасында өту аралығы"
+msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:763
 msgid ""
@@ -1212,10 +1148,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:768
-#, fuzzy
-#| msgid "Core Slideshow Transitions"
 msgid "enable slideshow fade transition"
-msgstr "Слайдшоу арасында өту аралығы"
+msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:769
 msgid ""
@@ -1223,11 +1157,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:774
-#: misc/org.yorba.shotwell.gschema.xml:798
-#, fuzzy
-#| msgid "Core Slideshow Transitions"
 msgid "enable slideshow slide transition"
-msgstr "Слайдшоу арасында өту аралығы"
+msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:775
 msgid ""
@@ -1235,10 +1166,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:780
-#, fuzzy
-#| msgid "Core Slideshow Transitions"
 msgid "enable slideshow clock transition"
-msgstr "Слайдшоу арасында өту аралығы"
+msgstr "слайдшоудың сағат ауысу эффектісін іске қосу"
 
 #: misc/org.yorba.shotwell.gschema.xml:781
 msgid ""
@@ -1246,32 +1175,35 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:786
-#: misc/org.yorba.shotwell.gschema.xml:792
-#, fuzzy
-#| msgid "Core Slideshow Transitions"
 msgid "enable slideshow circle transition"
-msgstr "Слайдшоу арасында өту аралығы"
+msgstr "слайдшоудың шеңбер ауысу эффектісін іске қосу"
 
 #: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
+#: misc/org.yorba.shotwell.gschema.xml:792
+msgid "enable slideshow circles transition"
+msgstr "слайдшоудың шеңберлер ауысу эффектісін іске қосу"
+
 #: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
+#: misc/org.yorba.shotwell.gschema.xml:798
+msgid "enable slideshow blinds transition"
+msgstr "слайдшоудың жалюзилер ауысу эффектісін іске қосу"
+
 #: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:804
-#, fuzzy
-#| msgid "Core Slideshow Transitions"
 msgid "enable slideshow squares transition"
-msgstr "Слайдшоу арасында өту аралығы"
+msgstr "слайдшоудың шаршылар ауысу эффектісін іске қосу"
 
 #: misc/org.yorba.shotwell.gschema.xml:805
 msgid ""
@@ -1279,10 +1211,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:810
-#, fuzzy
-#| msgid "Core Slideshow Transitions"
 msgid "enable slideshow stripes transition"
-msgstr "Слайдшоу арасында өту аралығы"
+msgstr "слайдшоудың жолақтар ауысу эффектісін іске қосу"
 
 #: misc/org.yorba.shotwell.gschema.xml:811
 msgid ""
@@ -1290,10 +1220,8 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:816
-#, fuzzy
-#| msgid "Core Slideshow Transitions"
 msgid "enable slideshow chess transition"
-msgstr "Слайдшоу арасында өту аралығы"
+msgstr "слайдшоудың шахмат ауысу эффектісін іске қосу"
 
 #: misc/org.yorba.shotwell.gschema.xml:817
 msgid ""
@@ -1301,11 +1229,123 @@ msgid ""
 "otherwise"
 msgstr ""
 
+#: 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 Connect сізден фотоларды жүктеу мен оларды "
+"сіздің таспаңызға жариялау үшін рұқсат сұрауы мүмкін. Ол рұқсаттар Shotwell "
+"Connect дұрыс жұмысы үшін керек."
+
+#: 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 ішіне кіріп және шығып үлгердіңіз.\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 "Авторизациялық _нөмірі:"
+
+#: plugins/authenticator/shotwell/flickr_pin_entry_pane.ui:70
+#: src/Dialogs.vala:128
+msgid "Con_tinue"
+msgstr "Жа_лғастыру"
+
+#: 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 ""
+"Сіз Flickr ішіне кірген жоқсыз.\n"
+"\n"
+"Flickr ішіне веб браузеріңізбен кіру үшін Кіру батырмасын шертіңіз. Flickr "
+"тіркелгіңізге сілтеу үшін Shotwell Connect үшін авторизация беруіңіз керек."
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+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:481
+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 ""
+"Сіз осы Shotwell сессиясы кезінде Google ішіне кіріп және шығып үлгердіңіз.\n"
+"Google ішіне жариялауды жалғастыру үшін, Shotwell қайта қосыңыз, одан кейін "
+"жариялап көріңіз."
+
+#: 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 ""
+"Сіз Picasa Web Albums ішіне кірген жоқсыз.\n"
+"\n"
+"Picasa Web Albums ішіне веб браузеріңізбен кіру үшін Кіру батырмасын "
+"шертіңіз. Picasa Web Albums тіркелгіңізге сілтеу үшін Shotwell Connect үшін "
+"авторизация беруіңіз керек."
+
+#: 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 ""
+"Сіз YouTube ішіне кірген жоқсыз.\n"
+"\n"
+"Сізде Google тіркелгісі болып, және оны YouTube-мен қолдануға баптауыңыз "
+"керек. Тіркелгіні осылай баптау үшін браузер көмегімен YouTube сайтына кем "
+"дегенде бір рет кіруіңіз керек."
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Shotwell үй парағын шолу"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:679
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:602
 msgid "translator-credits"
 msgstr "Baurzhan Muftakhidinov <baurthefirst@gmail.com>"
 
@@ -1356,22 +1396,10 @@ msgid ""
 msgstr ""
 
 #: plugins/common/RESTSupport.vala:509
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:959
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Жариялау үшін керек уақытша файл қолжетерсіз"
 
-#: 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 ""
-"Сіз осы Shotwell сессиясы кезінде Google ішіне кіріп және шығып үлгердіңіз.\n"
-"Google ішіне жариялауды жалғастыру үшін, Shotwell қайта қосыңыз, одан кейін "
-"жариялап көріңіз."
-
 #: plugins/shotwell-data-imports/FSpotImporter.vala:36
 #: plugins/shotwell-publishing/FacebookPublishing.vala:33
 #: plugins/shotwell-publishing/FlickrPublishing.vala:33
@@ -1467,94 +1495,93 @@ msgstr "Импортқа дайындалу"
 msgid "Core Data Import Services"
 msgstr "Өзек мәлімет импорттау қызметтері"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "Ар_тқа"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1627
-msgid "_Log in"
-msgstr "_Кіру"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "_Gallery3 сілтемесі:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
 msgid "_User name:"
 msgstr "Па_йдаланушы аты:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "Пар_оль:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "Ар_тқа"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1105
+msgid "_Log in"
+msgstr "_Кіру"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "API _кілті:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 msgstr "немесе"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:115
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
-msgstr "_Шығу"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:129
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-msgid "_Publish"
-msgstr "Жари_ялау"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "Б_ар болып тұрған альбом"
 
-#: 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 "_Жаңа альбом"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "Б_ар болып тұрған альбом"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 "Жүктеу алдында орналасу, тег және камераны сипаттайтын ақпаратты ө_шіру"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr "Масштабтау шегі:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr "пиксель"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1329
+#: 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 "Бастапқы өлшемі"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
 msgid "Width or height"
 msgstr "Ені не биіктігі"
 
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:142
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Шығу"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
+msgid "_Publish"
+msgstr "Жари_ялау"
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Gallery3 жариялау модулі"
@@ -1575,12 +1602,7 @@ msgid "Shotwell default directory"
 msgstr "Shotwell негізгі бумасы"
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:801
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "The file \"%s\" may not be supported by or may be too large for this "
-#| "instance of Gallery3."
+#, c-format
 msgid ""
 "\n"
 "\n"
@@ -1603,10 +1625,7 @@ msgstr ""
 
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1021
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
-#, fuzzy, c-format
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to %s can't "
-#| "continue."
+#, c-format
 msgid ""
 "A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
@@ -1654,56 +1673,52 @@ msgstr "Пайдаланушы танылмады"
 msgid " Site Not Found"
 msgstr " Сайт табылмады"
 
-#: 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 "_Эл. пошта адресі"
 
-#: 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 "Пар_оль"
 
-#: 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 "_Есте сақтау"
 
-#: 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
+#: plugins/shotwell-publishing-extras/tumblr_authentication_pane.ui:104
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:154
 msgid "Log in"
 msgstr "Жүйеге кіру"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:111
-#: plugins/shotwell-publishing-extras/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 "Б_ар болып тұрған альбом:"
 
-#: 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 "Атау_ы келесідей жаңа альбомда:"
 
-#: 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 "Альбомды жа_сыру"
 
-#: 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 "Мақсат _альбомды браузерде ашу"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-#| msgid "Copyright (C) 2013 rajce.net"
 msgid "Copyright © 2013 rajce.net"
 msgstr "Copyright © 2013 rajce.net"
 
@@ -1724,26 +1739,26 @@ msgstr "Эл. пошта мен/не пароль қате. Қайтадан е�
 msgid "Invalid User Email or Password"
 msgstr "Пайдаланушы эл. поштасы не паролі қате"
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
 msgid "You are logged into Rajce as %s."
 msgstr "Сіз Rajce қызметіне %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 "Фотолар қайда көрінеді:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
 msgid "Shotwell Extra Publishing Services"
 msgstr "Shotwell қосымша жариялау қызметтері"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr "Блогтар:"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
 msgid "Photo _size:"
 msgstr "Фотосурет өл_шемі:"
@@ -1753,21 +1768,18 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1231
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1325
-#| msgid "500 x 375 pixels"
+#: 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:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1326
-#| msgid "1024 x 768 pixels"
+#: 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 x 853 pixels"
 msgid "1280 × 853 pixels"
 msgstr "1280 × 853 пиксель"
 
@@ -1778,9 +1790,6 @@ msgid "“%s” isn’t a valid response to an OAuth authentication request"
 msgstr "\"%s\" - OAuth аутентификация сұранымына дұрыс жауап емес"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
-#, fuzzy
-#| msgid ""
-#| "TumblrPublisher: start( ): can't start; this publisher is not restartable."
 msgid ""
 "TumblrPublisher: start( ): can’t start; this publisher is not restartable."
 msgstr ""
@@ -1792,22 +1801,22 @@ 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:1087
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1081
 msgid "Username and/or password invalid. Please try again"
 msgstr "Пайдаланушы аты мен/не пароль қате. Қайтадан енгізіп көріңіз"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:615
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1121
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
 msgid "Invalid User Name or Password"
 msgstr "Пайдаланушы аты не пароль қате"
 
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
 #, c-format
 msgid "Could not load UI: %s"
 msgstr "UI жүктеу мүмкін емес: %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"
@@ -1828,124 +1837,80 @@ msgstr "Яндекс.Фотки веб-сайтын шолу"
 msgid "You are not currently logged into Yandex.Fotki."
 msgstr "Сіз қазір Яндекс.Фотки ішіне кірмегенсіз."
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Публикалық"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+msgid "Friends"
+msgstr "Достар"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
+msgid "Private"
+msgstr "Жеке"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Альбомдар (не жаңасын жазыңыз):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "Қатынау _түрі:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "_Пікірлерді сөндіру:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "Бастапқы фото_ны жүктеп алуға тыйым салу"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
-msgstr "Публикалық"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
-msgid "Friends"
-msgstr "Достар"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Жеке"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
 msgid "Publish to an e_xisting album:"
 msgstr "_Бар болып тұрған альбомға жариялау:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
 msgid "Create a _new album named:"
 msgstr "Атауы келесіде_й жаңа альбомды жасау:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
-#: plugins/shotwell-publishing/FacebookPublishing.vala:984
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
+#: plugins/shotwell-publishing/FacebookPublishing.vala:725
 msgid "Upload _size:"
 msgstr "Жүктеу ө_лшемі:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
 msgid "Videos and new photo albums _visible to:"
 msgstr "Видеолар мен жаңа фото альбомдар кі_мге көрінеді:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing/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 "Жүктеу алдында орналасу, камера және басқа сілтеуші ақпаратты ө_шіру"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1209
+#: 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
-#, fuzzy
-#| msgid ""
-#| "You are not currently logged into Facebook.\n"
-#| "\n"
-#| "If you don't yet have a Facebook account, you can create one during the "
-#| "login process. During login, Shotwell Connect may ask you for permission "
-#| "to upload photos and publish to your feed. These permissions are required "
-#| "for Shotwell Connect to function."
-msgid ""
-"You are not currently logged into Facebook.\n"
-"\n"
-"If you don’t yet have a Facebook account, you can create one during the "
-"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 Connect сізден фотоларды жүктеу мен оларды "
-"сіздің таспаңызға жариялау үшін рұқсат сұрауы мүмкін. Ол рұқсаттар Shotwell "
-"Connect дұрыс жұмысы үшін керек."
-
-#: 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 ішіне кіріп және шығып үлгердіңіз.\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…"
-msgstr "Facebook-пен байланысты сынау…"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
 msgid "Creating album…"
 msgstr "Альбомды жасау…"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
-#, fuzzy
-#| 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."
@@ -1953,7 +1918,7 @@ msgstr ""
 "Жариялау үшін керек файл қолжетерсіз. Facebook-ке жариялауды жалғастыру "
 "мүмкін емес."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:982
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -1962,87 +1927,22 @@ msgstr ""
 "Сіз Facebook-ке %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 "Таңдалған фотоларды қайда жариялауды қалайсыз?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:858
 msgid "Just me"
 msgstr "Тек мен"
 
-#: 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:854
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Әркім"
 
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:16
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Веб браузеріңізде Flickr ішіне кіргеннен кейін көрсетілген растау кодын "
-"енгізіңіз."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "Авторизациялық _нөмірі:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Жа_лғастыру"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:60
-#, fuzzy
-#| msgid ""
-#| "You are not currently logged into Flickr.\n"
-#| "\n"
-#| "Click Login to log into Flickr in your Web browser.  You will have to "
-#| "authorize Shotwell Connect to link to your Flickr account."
-msgid ""
-"You are not currently logged into Flickr.\n"
-"\n"
-"Click 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 ішіне веб браузеріңізбен кіру үшін Кіру батырмасын шертіңіз. Flickr "
-"тіркелгіңізге сілтеу үшін Shotwell Connect үшін авторизация беруіңіз керек."
-
-#: 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 ішіне кіріп және шығып үлгердіңіз.\n"
-"Flickr ішіне жариялауды жалғастыру үшін, Shotwell қайта қосыңыз, одан кейін "
-"жариялап көріңіз."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login…"
-msgstr "Кіру үшін дайындалу…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:444
-#: plugins/shotwell-publishing/FlickrPublishing.vala:594
-#, fuzzy
-#| msgid ""
-#| "A file required for publishing is unavailable. Publishing to Flickr can't "
-#| "continue."
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Жариялау үшін керек файл қолжетерсіз. Flickr-ге жариялауды жалғастыру мүмкін "
-"емес."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization…"
-msgstr "Авторизацияны тексеру…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2051,92 +1951,67 @@ msgstr ""
 "Сіз Flickr-ге %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 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] ""
-"Сіздің тегін Flickr тіркелгісі бір айда қанша мәліметті жүктеуге болатынын "
+"This month you have %s remaining in your upload quota."
+msgstr ""
+"Сіздің тегін Flickr тіркелгісі бір айда қанша деректі жүктеуге болатынын "
 "шектеп отыр.\n"
-"Бұл айда, сізде шекке дейін қалған %d мегабайт бар."
+"Бұл айда, сізде шекке дейін қалған %s мегабайт бар."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Сіздің Flickr Pro тіркелгіңіз шектелмеген жүктеулерді мүмкін қылады."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "Фотолар кі_мге көрінеді:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "Видеолар кі_мге көрінеді:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr "Фото мен видеолар кім_ге көрінеді:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "Тек отбасы мен достар"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "Тек отбасы"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "Тек достар"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1327
-#| msgid "2048 x 1536 pixels"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048 × 1536 пиксель"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1328
-#| msgid "4096 x 3072 pixels"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096 × 3072 пиксель"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
-msgid "L_ist album in public gallery"
-msgstr "Ор_тақ галереясындағы альбомдар тізімі"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
 msgid "Photo _size preset:"
 msgstr "Фото өл_шемінің алдын-ала орнатуы:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:59
-#, fuzzy
-#| msgid ""
-#| "You are not currently logged into Picasa Web Albums.\n"
-#| "\n"
-#| "Click Login to log into Picasa Web Albums in your Web browser. You will "
-#| "have to authorize Shotwell Connect to link to your Picasa Web Albums "
-#| "account."
-msgid ""
-"You are not currently logged into Picasa Web Albums.\n"
-"\n"
-"Click Log in to log into Picasa Web Albums in your Web browser. You will "
-"have to authorize Shotwell Connect to link to your Picasa Web Albums account."
-msgstr ""
-"Сіз Picasa Web Albums ішіне кірген жоқсыз.\n"
-"\n"
-"Picasa Web Albums ішіне веб браузеріңізбен кіру үшін Кіру батырмасын "
-"шертіңіз. Picasa Web Albums тіркелгіңізге сілтеу үшін Shotwell Connect үшін "
-"авторизация беруіңіз керек."
+#. 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 "Үнсіз келісім альбомы"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:361
-#, fuzzy
-#| 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."
@@ -2145,97 +2020,101 @@ msgstr ""
 "емес."
 
 #. 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 Albums ішіне %s ретінде кірдіңіз."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Видеолар жарияланатын жері:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
 msgstr "Кіші (640 × 480 пиксель)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
 msgstr "Орташа (1024 × 768 пиксель)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr "Ұсынылатын (1600 × 1200 пиксель)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
+#: 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:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Бастапқы өлшемі"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
 msgid "_URL of your Piwigo photo library"
 msgstr "Сіздің Piwigo фото ж_инағыңыздың URL-ы"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
 msgid "User _name"
 msgstr "Па_йдаланушы аты"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
-msgstr "Парольді _сақтау"
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+msgid "Remember Password"
+msgstr "Парольді есте сақтау"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
+msgstr "Бар бол_ып тұрған санат"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
-msgstr "Бар са_натта:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+msgid "A _new album named"
+msgstr "Атау_ы келесідей жаңа альбом"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
-msgstr "Фотоларды кі_м көре алады:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+msgid "within category"
+msgstr "қай санатта"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
-msgstr "Фотосурет өлшемі:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "Альбом түсіндірмесі"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
-msgstr "санатта:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
+msgstr "Фотоларды кі_м көре алады"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
-msgstr "Альбом түсіндірмесі:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "Фотосурет өлшемі"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
 msgid "_If a title is set and comment unset, use title as comment"
 msgstr ""
 "Егер а_тауы болса, ал түсіндірмесі болмаса, атауды түсіндірме ретінде қолдану"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
 msgid "_Do no upload tags"
 msgstr "Тегтерді жү_ктемеу"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
 msgid "Logout"
 msgstr "Шығу"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291
-#: src/Resources.vala:295
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:295 ui/collection.ui:190
 msgid "Publish"
 msgstr "Жариялау"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:775
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
 msgid "Creating album %s…"
 msgstr "%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 "Piwigo-ға жариялау кезінде қате хабарламасы алынды. Қайталап көріңіз."
 
 #. %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 "
@@ -2243,7 +2122,17 @@ msgid ""
 "messages, credit card information, or passwords)."
 msgstr ""
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1085
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "%s сертификаты"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:166
+msgid "_OK"
+msgstr "_ОК"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
@@ -2251,7 +2140,7 @@ msgstr ""
 "Piwigo фото жинағыңыздың сілтемесін, және сіздің Piwigo тіркелгіңіздің "
 "пайдаланушы атыңыз бен парольді көрсетіңіз."
 
-#: 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"
@@ -2259,23 +2148,23 @@ msgstr ""
 "Shotwell сіздің Piwigo фото жинағыңызбен байланыса алмады. Енгізілген "
 "сілтемені тексеріңіз"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1116
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "Қате сілтеме"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1314
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Әкімшілер, Отбасы, Достар, Контакттар"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1315
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Әкімшілер, Отбасы, Достар"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1316
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Әкімшілер, Отбасы"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1317
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Әкімшілер"
 
@@ -2291,7 +2180,7 @@ msgstr "Сертификатты көрсету…"
 msgid "I understand, please _proceed."
 msgstr "Мен түсіндім, _жалғастыра беріңіз."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/shotwell-publishing.vala:55
 msgid "Core Publishing Services"
 msgstr "Жариялау қызметтері"
 
@@ -2299,25 +2188,7 @@ msgstr "Жариялау қызметтері"
 msgid "Video privacy _setting:"
 msgstr "Видео ж_екелік баптауы:"
 
-#: 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 ""
-"Сіз YouTube ішіне кірген жоқсыз.\n"
-"\n"
-"Сізде Google тіркелгісі болып, және оны YouTube-мен қолдануға баптауыңыз "
-"керек. Тіркелгіні осылай баптау үшін браузер көмегімен YouTube сайтына кем "
-"дегенде бір рет кіруіңіз керек."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:363
-#, fuzzy
-#| 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."
@@ -2325,21 +2196,16 @@ msgstr ""
 "Жариялау үшін керек файл қолжетерсіз. Youtube-ге жариялауды жалғастыру "
 "мүмкін емес."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Сіз YouTube-ге %s ретінде кірдіңіз."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-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 "Ортақ тізілмеген"
 
@@ -2430,44 +2296,29 @@ msgstr "%s бумасын жазу үшін қолжетерлік жасау м
 msgid "Could not make directory %s writable: %s"
 msgstr "%s бумасын жазу үшін қолжетерлік жасау мүмкін емес: %s"
 
-#: src/AppWindow.vala:54
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "Панельді бекіту"
 
-#: src/AppWindow.vala:55
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "Панельді ашық түрінде бекіту"
 
-#: src/AppWindow.vala:60
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Толық экраннан шығу"
 
-#: src/AppWindow.vala:499
-msgid "_Contents"
-msgstr "Құра_масы"
-
-#: src/AppWindow.vala:504
-msgid "_Frequently Asked Questions"
-msgstr "_Жиі қойылатын сұрақтар"
-
-#: src/AppWindow.vala:509
-msgid "_Report a Problem…"
-msgstr "Мә_селе жөнінде хабарлау…"
-
-#: src/AppWindow.vala:608 src/AppWindow.vala:629 src/AppWindow.vala:646
-#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1441 src/Dialogs.vala:1464
-#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
+#: src/AppWindow.vala:531 src/AppWindow.vala:552 src/AppWindow.vala:569
+#: src/data_imports/DataImportsUI.vala:301
+#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
+#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
+#: src/Resources.vala:157
 msgid "_Cancel"
 msgstr "Ба_с тарту"
 
-#: src/AppWindow.vala:656
-#, fuzzy, c-format
-#| msgid ""
-#| "A fatal error occurred when accessing Shotwell's library.  Shotwell "
-#| "cannot continue.\n"
-#| "\n"
-#| "%s"
+#: src/AppWindow.vala:579
+#, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
 "continue.\n"
@@ -2479,21 +2330,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:676
+#: src/AppWindow.vala:599
 msgid "Visit the Shotwell web site"
 msgstr "Shotwell веб сайтын шолу"
 
-#: src/AppWindow.vala:688
+#: src/AppWindow.vala:611
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Көмек ақпаратын көрсету мүмкін емес: %s"
 
-#: src/AppWindow.vala:696
+#: src/AppWindow.vala:619
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Ақаулықтар дерекқорына өту мүмкін емес: %s"
 
-#: src/AppWindow.vala:704
+#: src/AppWindow.vala:627
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "ЖҚС көрсету мүмкін емес: %s"
@@ -2563,21 +2414,18 @@ msgstr "Импорттау қатесі (%d)"
 msgid "Cameras"
 msgstr "Камералар"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/MediaPage.vala:440
-#: src/photos/RawSupport.vala:303
+#: src/camera/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
 msgid "Camera"
 msgstr "Камера"
 
-#: src/camera/ImportPage.vala:311 src/Properties.vala:227
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: src/camera/ImportPage.vala:458
-#, fuzzy
-#| 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 ""
@@ -2585,54 +2433,32 @@ msgstr ""
 "тіркеуден босатып көріңіз."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:775
+#: src/camera/ImportPage.vala:783
 msgid "Hide photos already imported"
 msgstr "Алдыңда импортталған фотоларды жасыру"
 
-#: src/camera/ImportPage.vala:776
+#: src/camera/ImportPage.vala:784
 msgid "Only display photos that have not been imported"
 msgstr "Тек импортталмаған фотоларды көрсету"
 
-#: src/camera/ImportPage.vala:842
-msgid "The camera seems to be empty. No photos/videos found to import"
-msgstr ""
-
-#: src/camera/ImportPage.vala:846
-#, fuzzy
-#| msgid "No photos/videos found"
-msgid "No new photos/videos found on camera"
-msgstr "Ешбір фото/видео табылмады"
-
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
-msgid "_Titles"
-msgstr "_Атаулар"
-
-#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr "Әр фотоның атауын көрсету"
-
-#: src/camera/ImportPage.vala:885
+#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Таңд_алғанды импорттау"
 
-#: src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Таңдалған фотоларды жинағыңызға импорттау"
-
-#: src/camera/ImportPage.vala:891
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Барл_ығын импорттау"
 
-#: src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Барлық фотоларды жинағыңызға импорттау"
+#: 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 "Камерадан ешбір жаңа фото/видео табылмады"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1013
-#, fuzzy
-#| msgid ""
-#| "Shotwell needs to unmount the camera from the filesystem in order to "
-#| "access it.  Continue?"
+#: src/camera/ImportPage.vala:1021
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2640,20 +2466,15 @@ msgstr ""
 "Shotwell камераға қолын жеткізу үшін оны алдымен тіркеуден босату керек. "
 "Жалғастыру керек пе?"
 
-#: src/camera/ImportPage.vala:1019
+#: src/camera/ImportPage.vala:1027
 msgid "_Unmount"
 msgstr "_Тіркеуден босату"
 
-#: src/camera/ImportPage.vala:1024
+#: src/camera/ImportPage.vala:1032
 msgid "Please unmount the camera."
 msgstr "Камераны тіркеуден босатыңыз."
 
-#: src/camera/ImportPage.vala:1029
-#, fuzzy
-#| msgid ""
-#| "The camera is locked by another application.  Shotwell can only access "
-#| "the camera when it's unlocked.  Please close any other application using "
-#| "the camera and try again."
+#: 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 "
@@ -2663,11 +2484,11 @@ msgstr ""
 "ғана қолын жеткізе алады. Камераны қолданып тұрған барлық қолданбалады "
 "жабыңыз да, әрекетті қайталап көріңіз."
 
-#: src/camera/ImportPage.vala:1039
+#: src/camera/ImportPage.vala:1047
 msgid "Please close any other application using the camera."
 msgstr "Камераны қолданып тұрған барлық қолданбалады жабыңыз."
 
-#: src/camera/ImportPage.vala:1044
+#: src/camera/ImportPage.vala:1052
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2676,111 +2497,187 @@ msgstr ""
 "Камерадан алдын-ала қарауды алу мүмкін емес:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1061
+#: src/camera/ImportPage.vala:1069
 msgid "Unmounting…"
 msgstr "Тіркеуден босатылуда…"
 
-#: src/camera/ImportPage.vala:1152
+#: src/camera/ImportPage.vala:1160
 msgid "Starting import, please wait…"
 msgstr "Импортты бастау, күте тұрыңыз…"
 
-#: src/camera/ImportPage.vala:1169
+#: src/camera/ImportPage.vala:1177
 msgid "Fetching photo information"
 msgstr "Фото ақпаратын алу"
 
-#: src/camera/ImportPage.vala:1527
+#: src/camera/ImportPage.vala:1535
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "%s үшін алдын-ала қарауды алу"
 
-#: src/camera/ImportPage.vala:1643
+#: src/camera/ImportPage.vala:1651
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Камераны блоктау мүмкін емес: %s"
 
-#: src/camera/ImportPage.vala:1728
+#: src/camera/ImportPage.vala:1736
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
 msgstr[0] "Камерадан бұл %d фотоны өшіру керек пе?"
 
-#: src/camera/ImportPage.vala:1731
+#: src/camera/ImportPage.vala:1739
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
 msgstr[0] "Камерадан бұл %d видеоны өшіру керек пе?"
 
-#: src/camera/ImportPage.vala:1734
+#: 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] "Камерадан бұл %d фото/видеоны өшіру керек пе?"
 
-#: src/camera/ImportPage.vala:1737
+#: src/camera/ImportPage.vala:1745
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
 msgstr[0] "Бұл %d файлды камерадан өшіру керек пе?"
 
-#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1408
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "Ұ_стау"
 
-#: src/camera/ImportPage.vala:1764
+#: src/camera/ImportPage.vala:1772
 msgid "Removing photos/videos from camera"
 msgstr "Камерадан фотолар/видеоларды өшіру"
 
-#: src/camera/ImportPage.vala:1768
+#: 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] "Қателер салдарынан камерадан %d фото/видеоны өшіру мүмкін емес."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:170
+msgid "_Print"
+msgstr "Бас_паға шығару"
+
+#: 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
+msgid "Send _To…"
+msgstr "Қа_йда жіберу…"
+
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:220
+msgid "Set as _Desktop Background"
+msgstr "Жұмыс үс_тел тұсқағазы ретінде орнату"
+
+#: src/CollectionPage.vala:92 src/Resources.vala:286
+msgid "_Duplicate"
+msgstr "Кө_шірмесін жасау"
+
+#: src/CollectionPage.vala:100
+msgid "Fullscreen"
+msgstr "Толық экранға"
+
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "С_лайдшоу"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Слайдшоуды ойнату"
+#: src/CollectionPage.vala:110 src/Resources.vala:139 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Оңғ_а бұру"
+
+#: src/CollectionPage.vala:113 src/Resources.vala:144 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "С_олға бұру"
+
+#: src/CollectionPage.vala:116 src/Resources.vala:149 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Горизонта_лды айналдыру"
+
+#: src/CollectionPage.vala:117 src/Resources.vala:152 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "_Вертикалды айналдыру"
+
+#: 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
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "Жақсар_ту"
+
+#: 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
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "Бастапқ_ыға тастау"
+
+#: src/CollectionPage.vala:122 src/Resources.vala:190 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "Түстерді келтіруін _көшіріп алу"
+
+#: src/CollectionPage.vala:125 src/Resources.vala:194 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "Түстерді келтіруін кірі_стіру"
+
+#: src/CollectionPage.vala:135
+msgid "Adjust Date and Time…"
+msgstr "Күн мен уақытын түзету…"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:319
+msgid "Open With E_xternal Editor"
+msgstr "Сыр_тқы түзетушісімен ашу"
+
+#: 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
+msgid "Open With RA_W Editor"
+msgstr "RAW түзетушісімен ашу"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:149 src/Resources.vala:167
+msgid "_Play"
+msgstr "Ой_нату"
+
+#: src/CollectionPage.vala:415
 msgid "Export Photo/Video"
 msgstr "Фото/видеоны экспорттау"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:415
 msgid "Export Photos/Videos"
 msgstr "Фото/видеоларды экспорттау"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
+#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
 msgstr "Фото(лар) экспорттау"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:84
+#: src/CollectionPage.vala:417 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Фотоларды экспорттау"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Rotating"
 msgstr "Айналдыру"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Undoing Rotate"
 msgstr "Айналдыруды болдырмау"
 
-#: src/CollectionPage.vala:570
+#: src/CollectionPage.vala:529
 msgid "Flipping Horizontally"
 msgstr "Горизонталды айналдыру"
 
-#: src/CollectionPage.vala:571
+#: src/CollectionPage.vala:530
 msgid "Undoing Flip Horizontally"
 msgstr "Горизонталды айналдыруды болдырмау"
 
-#: src/CollectionPage.vala:580
+#: src/CollectionPage.vala:539
 msgid "Flipping Vertically"
 msgstr "Вертикалды айналдыру"
 
-#: src/CollectionPage.vala:581
+#: src/CollectionPage.vala:540
 msgid "Undoing Flip Vertically"
 msgstr "Вертикалды айналдыруды болдырмау"
 
@@ -2902,8 +2799,7 @@ msgid "Create Tag"
 msgstr "Тегті жасау"
 
 #: src/Commands.vala:1695
-#, fuzzy, c-format
-#| msgid "Move Tag \"%s\""
+#, c-format
 msgid "Move Tag “%s”"
 msgstr "\"%s\" тегін жылжыту"
 
@@ -2964,8 +2860,7 @@ msgstr "%s дерекқоры"
 
 #: src/data_imports/DataImportsPluginHost.vala:148
 #: src/data_imports/DataImportsPluginHost.vala:294
-#, fuzzy, c-format
-#| msgid "Importing from %s can't continue because an error occurred:"
+#, c-format
 msgid "Importing from %s can’t continue because an error occurred:"
 msgstr "%s ішінен импорттау мүмкін емес, өйткені қате орын алды:"
 
@@ -2992,7 +2887,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Дерекқор файлы:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
 msgid "_Import"
 msgstr "И_мпорттау"
 
@@ -3004,7 +2899,7 @@ msgstr "Қолданбадан импорттау"
 msgid "Import media _from:"
 msgstr "Мульт_имедияны қайдан импорттау:"
 
-#: src/data_imports/DataImportsUI.vala:408 src/publishing/PublishingUI.vala:507
+#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
 msgid "_Close"
 msgstr "_Жабу"
 
@@ -3041,7 +2936,7 @@ msgstr ""
 "Қате: \n"
 "%s"
 
-#: src/db/DatabaseTable.vala:88
+#: src/db/DatabaseTable.vala:92
 #, c-format
 msgid "Unable to restore photo database %s"
 msgstr "%s фотолар дерекқорын қалпына келтіру мүмкін емес"
@@ -3066,22 +2961,20 @@ msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Жұмыс үстел слайдшоуын дайындау мүмкін емес: %s"
 
 #: src/Dialogs.vala:16
-#, fuzzy, c-format
-#| msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-#| msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
+#, 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] "\"%s\" тегі %d фотодан өшіріледі. Жалғастыру керек пе?"
 
-#: 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:1388
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "Ө_шіру"
 
 #: src/Dialogs.vala:25
-#, fuzzy, c-format
-#| msgid "This will remove the saved search \"%s\".  Continue?"
+#, c-format
 msgid "This will remove the saved search “%s”. Continue?"
 msgstr "Бұл әрекет \"%s\" сақталған іздеуін өшіреді. Жалғастыру керек пе?"
 
@@ -3110,10 +3003,7 @@ msgstr "Видеоны экспорттау"
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
 #: src/Dialogs.vala:112
-#, fuzzy, c-format
-#| msgid ""
-#| "Shotwell couldn't create a file for editing this photo because you do not "
-#| "have permission to write to %s."
+#, c-format
 msgid ""
 "Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
@@ -3227,9 +3117,6 @@ msgstr "қате хабарламасы:"
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
 #: src/Dialogs.vala:595
-#, fuzzy
-#| msgid ""
-#| "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
 msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr "Файлдар фото не видео ретінде танылмағандықтан импортталмады:"
 
@@ -3237,10 +3124,6 @@ msgstr "Файлдар фото не видео ретінде танылмағ�
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
 #: src/Dialogs.vala:610
-#, fuzzy
-#| msgid ""
-#| "Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
-#| "Understands:"
 msgid ""
 "Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
@@ -3251,10 +3134,6 @@ msgstr ""
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
 #: src/Dialogs.vala:625
-#, fuzzy
-#| msgid ""
-#| "Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
-#| "Library:"
 msgid ""
 "Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
@@ -3263,10 +3142,7 @@ msgstr ""
 "импортталмады:"
 
 #: src/Dialogs.vala:629
-#, fuzzy, c-format
-#| msgid ""
-#| "couldn't copy %s\n"
-#| "\tto %s"
+#, c-format
 msgid ""
 "couldn’t copy %s\n"
 "\tto %s"
@@ -3490,170 +3366,157 @@ msgstr "Ешбір фото не видео импортталмады.\n"
 msgid "Import Complete"
 msgstr "Импорт аяқталды"
 
-#: src/Dialogs.vala:1174
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d секунд"
 
-#: src/Dialogs.vala:1177
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d минут"
 
-#: src/Dialogs.vala:1181
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d сағат"
 
-#: src/Dialogs.vala:1184
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "%d күн"
 
-#: src/Dialogs.vala:1338 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Оқиға атын ауыстыру"
 
-#: src/Dialogs.vala:1338
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Аты:"
 
 #. Dialog title
-#: src/Dialogs.vala:1349
-#, fuzzy
-#| msgid "Edit Title"
+#: src/Dialogs.vala:1328
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Атауды түзету"
 
-#: src/Dialogs.vala:1350 src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Атауы:"
 
 #. Dialog title
-#: src/Dialogs.vala:1366 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Оқиға түсіндірмесін түзету"
 
-#: src/Dialogs.vala:1367
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Фото/видео түсіндірмесін түзету"
 
-#: src/Dialogs.vala:1368 src/Properties.vala:628
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Түсіндірме:"
 
-#: src/Dialogs.vala:1384
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Файл(дар)ды өшіру және қ_оқыс шелегіне тастау"
 
-#: src/Dialogs.vala:1388
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "Жинақтан ө_шіру"
 
-#: src/Dialogs.vala:1431
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Сыртқы түзетуді болдырмау керек пе?"
 
-#: src/Dialogs.vala:1431
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Сыртқы түзетулерді болдырмау керек пе?"
 
-#: src/Dialogs.vala:1433
-#, fuzzy, c-format
-#| msgid "This will destroy all changes made to the external file.  Continue?"
-#| msgid_plural ""
-#| "This will destroy all changes made to %d external files.  Continue?"
+#: 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?"
 msgstr[0] "%d сыртқы файлға жасалған өзгерістер жоғалады. Жалғастыру керек пе?"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "Сыр_тқы түзетуді болдырмау"
 
-#: src/Dialogs.vala:1437
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "Сыр_тқы түзетулерді болдырмау керек пе?"
 
-#: src/Dialogs.vala:1458
-#, fuzzy, c-format
-#| msgid "This will remove the photo from the library.  Continue?"
-#| msgid_plural "This will remove %d photos from the library.  Continue?"
+#: 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] "Жинақтан %d фото өшіріледі. Жалғастыру керек пе?"
 
-#: src/Dialogs.vala:1465 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "Өші_ру"
 
-#: src/Dialogs.vala:1466
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Фотоны жинақтан өшіру"
 
-#: src/Dialogs.vala:1466
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Фотоларды жинақтан өшіру"
 
-#: src/Dialogs.vala:1559
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: src/Dialogs.vala:1713
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "AM"
 
-#: src/Dialogs.vala:1714
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "PM"
 
-#: src/Dialogs.vala:1715
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "24 сағ"
 
-#: src/Dialogs.vala:1730
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "Бар_лық фото/видеоларды бірдей шамаға жылжыту"
 
-#: src/Dialogs.vala:1735
+#: src/Dialogs.vala:1719
 msgid "Set _all photos/videos to this time"
 msgstr "Б_арлық фото/видеоларды бұл уақытқа орнату"
 
-#: src/Dialogs.vala:1742
+#: src/Dialogs.vala:1725
 msgid "_Modify original photo file"
-msgstr "Түпнұсқа фотосурет файлын тү_зету"
+msgid_plural "_Modify original photo files"
+msgstr[0] "Түпнұсқа фотосурет файл(дар)ын тү_зету"
 
-#: src/Dialogs.vala:1742
-msgid "_Modify original photo files"
-msgstr "Түпнұсқа фотосурет файлдарын тү_зету"
-
-#: src/Dialogs.vala:1745
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
-msgstr "_Бастапқы файлды түзету"
-
-#: src/Dialogs.vala:1745
-msgid "_Modify original files"
-msgstr "Баста_пқы файлдарды түзету"
+msgid_plural "_Modify original files"
+msgstr[0] "_Бастапқы файл(дар)ды түзету"
 
-#: src/Dialogs.vala:1831
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Бастапқы:"
 
-#: src/Dialogs.vala:1832
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%m/%d/%Y, %H:%M:%S"
 
-#: src/Dialogs.vala:1833
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%m/%d/%Y, %I:%M:%S %p"
 
-#: src/Dialogs.vala:1922
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3662,7 +3525,7 @@ msgstr ""
 "Ұсталым уақыты алға келесі мәнге жылжытылады:\n"
 "%d %s, %d %s, %d %s, және %d %s."
 
-#: src/Dialogs.vala:1923
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3671,27 +3534,27 @@ msgstr ""
 "Ұсталым уақыты артқа келесі мәнге жылжытылады:\n"
 "%d %s, %d %s, %d %s, және %d %s."
 
-#: src/Dialogs.vala:1925
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "күн"
 
-#: src/Dialogs.vala:1926
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "сағат"
 
-#: src/Dialogs.vala:1927
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
 
-#: src/Dialogs.vala:1928
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунд"
 
-#: src/Dialogs.vala:1972
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -3706,51 +3569,49 @@ msgstr[0] ""
 "\n"
 "Және %d басқа."
 
-#: src/Dialogs.vala:1996 src/Dialogs.vala:2023
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Тегтер (үтірмен ажыратылған):"
 
-#: src/Dialogs.vala:2103
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Қош келдіңіз!"
 
-#: src/Dialogs.vala:2110
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Shotwell қолданбасына қош келдіңіз!"
 
-#: src/Dialogs.vala:2114
+#: src/Dialogs.vala:2101
 msgid "To get started, import photos in any of these ways:"
 msgstr "Бастау үшін, фотоларды келесі жолдармен импорттай аласыз:"
 
-#: src/Dialogs.vala:2133
+#: 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:2134
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Фотоларды Shotwell терезесіне тартып апарыңыз"
 
-#: src/Dialogs.vala:2135
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "Компьютеріңізге камераны жалғап, ипорттаңыз"
 
-#: src/Dialogs.vala:2145
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "Фотоларды сіздің %s _бумаңыздан импорттау"
 
-#: src/Dialogs.vala:2152
+#: src/Dialogs.vala:2141
 msgid "You can also import photos in any of these ways:"
 msgstr "Оған қоса, фотоларды осы жолдармен импорттай аласыз:"
 
-#: src/Dialogs.vala:2162
-#, fuzzy
-#| msgid "_Don't show this message again"
+#: src/Dialogs.vala:2152
 msgid "_Don’t show this message again"
 msgstr "Бұ_л хабарламаны келесіде көрсетпеу"
 
-#: src/Dialogs.vala:2197
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Фотоларды сіздің %s жинағыңыздан импорттау"
@@ -3758,41 +3619,41 @@ 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:2344 src/Dialogs.vala:2348
+#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
 msgid "(Help)"
 msgstr "(Көмек)"
 
-#: src/Dialogs.vala:2357
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Жыл%sАй%sКүн"
 
-#: src/Dialogs.vala:2359
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "Жыл%sАй"
 
-#: src/Dialogs.vala:2361
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Жыл%sАй-Күн"
 
-#: src/Dialogs.vala:2363
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "Жыл-Ай-Күн"
 
-#: src/Dialogs.vala:2364 src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Таңдауыңызша"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2601
+#: 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:2703
+#: src/Dialogs.vala:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3800,42 +3661,32 @@ msgstr ""
 "Shotwell фотоларды жинағыңызға көшіре алады, немесе көшірмесіз-ақ импорттай "
 "алады."
 
-#: src/Dialogs.vala:2708
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "Фо_толарды көшіру"
 
-#: src/Dialogs.vala:2709
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "Кө_шірусіз импорттау"
 
-#: src/Dialogs.vala:2710
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Жинақ ішіне импорттау"
 
-#: src/Dialogs.vala:2720 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Жинақтан өшіру"
 
-#: src/Dialogs.vala:2721 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Фото(лар) жинақтан өшіру"
 
-#: src/Dialogs.vala:2721
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Фотоларды жинақтан өшіру"
 
-#: src/Dialogs.vala:2735
-#, fuzzy, c-format
-#| msgid ""
-#| "This will remove the photo/video from your Shotwell library.  Would you "
-#| "also like to move the file to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
-#| msgid_plural ""
-#| "This will remove %d photos/videos from your Shotwell library.  Would you "
-#| "also like to move the files to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
+#: 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"
@@ -3852,18 +3703,8 @@ msgstr[0] ""
 "\n"
 "Бұл әрекетті болдырмау мүмкін емес болады."
 
-#: src/Dialogs.vala:2739
-#, fuzzy, c-format
-#| msgid ""
-#| "This will remove the video from your Shotwell library.  Would you also "
-#| "like to move the file to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
-#| msgid_plural ""
-#| "This will remove %d videos from your Shotwell library.  Would you also "
-#| "like to move the files to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
+#: 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"
@@ -3880,18 +3721,8 @@ msgstr[0] ""
 "\n"
 "Бұл әрекетті болдырмау мүмкін емес болады."
 
-#: src/Dialogs.vala:2743
-#, fuzzy, c-format
-#| msgid ""
-#| "This will remove the photo from your Shotwell library.  Would you also "
-#| "like to move the file to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
-#| msgid_plural ""
-#| "This will remove %d photos from your Shotwell library.  Would you also "
-#| "like to move the files to your desktop trash?\n"
-#| "\n"
-#| "This action cannot be undone."
+#: 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"
@@ -3908,14 +3739,8 @@ msgstr[0] ""
 "\n"
 "Бұл әрекетті болдырмау мүмкін емес болады."
 
-#: src/Dialogs.vala:2775
-#, fuzzy, c-format
-#| msgid ""
-#| "The photo or video cannot be moved to your desktop trash.  Delete this "
-#| "file?"
-#| msgid_plural ""
-#| "%d photos/videos cannot be moved to your desktop trash.  Delete these "
-#| "files?"
+#: src/Dialogs.vala:2764
+#, c-format
 msgid ""
 "The photo or video cannot be moved to your desktop trash. Delete this file?"
 msgid_plural ""
@@ -3925,7 +3750,7 @@ msgstr[0] ""
 "керек пе?"
 
 #. Alert the user that the files were not removed.
-#: src/Dialogs.vala:2792
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
@@ -3939,127 +3764,17 @@ msgstr "Ені"
 msgid "Height"
 msgstr "Биіктігі"
 
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Файл"
-
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
-msgid "_Save"
-msgstr "_Сақтау"
-
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Фотоны сақтау"
-
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As…"
-msgstr "Қала_йша сақтау…"
-
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Фотоны басқа атауымен сақтау"
-
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Фотоны компьютеріңізге жалғанған принтерден басып шығару"
-
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr "Тү_зету"
-
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Фото"
-
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr "Са_ймандар"
-
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr "Ал_дыңғы фото"
-
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr "Алдыңғы фото"
-
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr "К_елесі фото"
-
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr "Келесі фото"
-
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2412
-msgid "_View"
-msgstr "_Түрі"
-
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr "_Көмек"
-
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2591 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "Үлке_йту"
-
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr "Фотоны үлкейту"
-
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2597 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "Кі_шірейту"
-
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr "Фотоны кішірейту"
-
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr "Параққа сы_йдыру"
-
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr "Фотоны экранды толығымен алатындай етіп келтіру"
-
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Үлкейту - _100%"
-
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Фотосуретті өлшемнің 100 дейін өзгерту"
-
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Үлкейту - _200%"
-
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Фотосуретті өлшемнің 200 дейін өзгерту"
-
-#: src/direct/DirectPhotoPage.vala:227
+#: src/direct/DirectPhotoPage.vala:99
 #, c-format
 msgid "%s does not exist."
 msgstr "%s жоқ болып тұр."
 
-#: src/direct/DirectPhotoPage.vala:229
+#: src/direct/DirectPhotoPage.vala:101
 #, c-format
 msgid "%s is not a file."
 msgstr "%s файл емес."
 
-#: src/direct/DirectPhotoPage.vala:231
+#: src/direct/DirectPhotoPage.vala:103
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
@@ -4068,37 +3783,34 @@ msgstr ""
 "%s келесі үшін файл пішімін қолдамайды:\n"
 "%s."
 
-#: src/direct/DirectPhotoPage.vala:248
-#, fuzzy, c-format
-#| msgid ""
-#| "Unable to print photo:\n"
-#| "\n"
-#| "%s"
+#: src/direct/DirectPhotoPage.vala:120
+#, c-format
 msgid "Unable open photo %s. Sorry."
-msgstr ""
-"Фотоны баспаға шығару мүмкін емес:\n"
-"\n"
-"%s"
+msgstr "%s фотосын ашу мүмкін емес. Кешіріңіз."
 
-#: src/direct/DirectPhotoPage.vala:432
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:175 ui/direct.ui:8
+msgid "_Save"
+msgstr "_Сақтау"
+
+#: src/direct/DirectPhotoPage.vala:316
 msgid "_Save a Copy"
 msgstr "Кө_шірмесін сақтау"
 
-#: src/direct/DirectPhotoPage.vala:435
+#: src/direct/DirectPhotoPage.vala:319
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "%s үшін өзгерістерді жоғалту керек пе?"
 
-#: src/direct/DirectPhotoPage.vala:436
+#: src/direct/DirectPhotoPage.vala:320
 msgid "Close _without Saving"
 msgstr "Сақтамай-ақ _жабу"
 
-#: src/direct/DirectPhotoPage.vala:469
+#: src/direct/DirectPhotoPage.vala:353
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "%s ішіне сақтау қатесі: %s"
 
-#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
 msgid "Save As"
 msgstr "Қалайша сақтау"
 
@@ -4108,226 +3820,201 @@ msgstr "Қалайша сақтау"
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "%s бақылау мүмкін емес: Бума емес (%s)"
 
-#: src/editing_tools/EditingTools.vala:665
+#: src/editing_tools/EditingTools.vala:666
 msgid "Return to current photo dimensions"
 msgstr "Фотоның бастапқы өлшемдеріне қайту"
 
-#: src/editing_tools/EditingTools.vala:668
+#: src/editing_tools/EditingTools.vala:669
 msgid "Set the crop for this photo"
 msgstr "Бұл фотоны қиып жіберу"
 
-#: src/editing_tools/EditingTools.vala:680
+#: src/editing_tools/EditingTools.vala:681
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Қиып жіберу аймағын тік не жатық қояды"
 
-#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:754
 msgid "Unconstrained"
 msgstr "Еркін"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:755
 msgid "Square"
 msgstr "Шаршы"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:756
 msgid "Screen"
 msgstr "Экран"
 
-#: src/editing_tools/EditingTools.vala:757
-#: src/editing_tools/EditingTools.vala:760
-#: src/editing_tools/EditingTools.vala:770
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala: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)"
+#: src/editing_tools/EditingTools.vala:759
 msgid "SD Video (4 ∶ 3)"
 msgstr "SD видео (4 ∶ 3)"
 
-#: src/editing_tools/EditingTools.vala:759
+#: src/editing_tools/EditingTools.vala:760
 msgid "HD Video (16 ∶ 9)"
 msgstr "HD видео (16 ∶ 9)"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
-#, fuzzy
-#| msgid "Wallet (2 x 3 in.)"
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
-msgstr "Wallet (2 × 3 дюйм)"
+msgstr ""
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
-#, fuzzy
-#| msgid "Notecard (3 x 5 in.)"
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
-msgstr "Notecard (3 × 5 дюйм)"
+msgstr ""
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
-#| msgid "4 x 6 in."
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr "4 × 6 дюйм"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
-#| msgid "5 x 7 in."
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr "5 × 7 дюйм"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
-#| msgid "8 x 10 in."
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr "8 × 10 дюйм"
 
-#: src/editing_tools/EditingTools.vala:766
-#, fuzzy
-#| msgid "Letter (8.5 x 11 in.)"
+#: src/editing_tools/EditingTools.vala:767
 msgid "Letter (8.5 × 11 in.)"
-msgstr "Letter (8.5 × 11 дюйм)"
+msgstr ""
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
-#| msgid "11 x 14 in."
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr "11 × 14 дюйм"
 
-#: src/editing_tools/EditingTools.vala:768
-#, fuzzy
-#| msgid "Tabloid (11 x 17 in.)"
+#: src/editing_tools/EditingTools.vala:769
 msgid "Tabloid (11 × 17 in.)"
-msgstr "Таблоид (11 x 17 дюйм)"
+msgstr ""
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
-#| msgid "16 x 20 in."
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr "16 × 20 дюйм"
 
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
-#, fuzzy
-#| msgid "Metric Wallet (9 x 13 cm)"
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
-msgstr "Metric Wallet (9 x 13 см)"
+msgstr ""
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
-#, fuzzy
-#| msgid "Postcard (10 x 15 cm)"
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
-msgstr "Ашық хат (10 x 15 см)"
+msgstr ""
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
-#| msgid "13 x 18 cm"
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr "13 × 18 см"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
-#| msgid "18 x 24 cm"
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr "18 × 24 см"
 
-#: src/editing_tools/EditingTools.vala:775
-#| msgid "A4 (210 x 297 mm)"
+#: src/editing_tools/EditingTools.vala:776
 msgid "A4 (210 × 297 mm)"
 msgstr "A4 (210 × 297 мм)"
 
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
-#| msgid "20 x 30 cm"
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr "20 × 30 см"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
-#| msgid "24 x 40 cm"
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr "24 × 40 см"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
-#| msgid "30 x 40 cm"
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr "30 × 40 см"
 
-#: src/editing_tools/EditingTools.vala:779
-#| msgid "A3 (297 x 420 mm)"
+#: src/editing_tools/EditingTools.vala:780
 msgid "A3 (297 × 420 mm)"
 msgstr "A3 (297 × 420 мм)"
 
-#: src/editing_tools/EditingTools.vala:1872 src/Properties.vala:395
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
 msgid "Size:"
 msgstr "Өлшемі:"
 
-#: src/editing_tools/EditingTools.vala:1887
+#: src/editing_tools/EditingTools.vala:1895
 msgid "Close the red-eye tool"
 msgstr "Қызыл көздер сайманын жабу"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1898
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Таңдалған аймақта \"қызыл көздер\" эффектісін өшіру"
 
-#: src/editing_tools/EditingTools.vala:2229
+#: src/editing_tools/EditingTools.vala:2238
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Тастау"
 
 #. fit both on the top line, emit and move on
-#: src/editing_tools/EditingTools.vala:2243 src/Properties.vala:436
-#: src/Properties.vala:440 src/Properties.vala:447
+#: src/editing_tools/EditingTools.vala:2252 src/Properties.vala:439
+#: src/Properties.vala:443 src/Properties.vala:450
 msgid "Exposure:"
 msgstr "Экспозиция:"
 
-#: src/editing_tools/EditingTools.vala:2251
+#: src/editing_tools/EditingTools.vala:2261
 msgid "Contrast:"
 msgstr "Контраст:"
 
-#: src/editing_tools/EditingTools.vala:2259
+#: src/editing_tools/EditingTools.vala:2270
 msgid "Saturation:"
 msgstr "Қаңықтылығы:"
 
-#: src/editing_tools/EditingTools.vala:2267
+#: src/editing_tools/EditingTools.vala:2279
 msgid "Tint:"
 msgstr "Реңі:"
 
-#: src/editing_tools/EditingTools.vala:2276
+#: src/editing_tools/EditingTools.vala:2289
 msgid "Temperature:"
 msgstr "Температура:"
 
-#: src/editing_tools/EditingTools.vala:2284
+#: src/editing_tools/EditingTools.vala:2298
 msgid "Shadows:"
 msgstr "Көлеңкелер:"
 
-#: src/editing_tools/EditingTools.vala:2292
+#: src/editing_tools/EditingTools.vala:2307
 msgid "Highlights:"
 msgstr "Ерекшелеу:"
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset Colors"
 msgstr "Түстерді тастау"
 
-#: src/editing_tools/EditingTools.vala:2346
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset all color adjustments to original"
 msgstr "Барлық түстерді келтірудерді бастапқы мәндеріне тастау"
 
-#: src/editing_tools/EditingTools.vala:2705
+#: src/editing_tools/EditingTools.vala:2722
 msgid "Temperature"
 msgstr "Көлеңкелер"
 
-#: src/editing_tools/EditingTools.vala:2717
+#: src/editing_tools/EditingTools.vala:2734
 msgid "Tint"
 msgstr "Реңі"
 
-#: src/editing_tools/EditingTools.vala:2729
+#: src/editing_tools/EditingTools.vala:2746
 msgid "Contrast"
 msgstr "Контраст"
 
-#: src/editing_tools/EditingTools.vala:2743
+#: src/editing_tools/EditingTools.vala:2760
 msgid "Saturation"
 msgstr "Қаңықтылығы"
 
-#: src/editing_tools/EditingTools.vala:2756
+#: src/editing_tools/EditingTools.vala:2773
 msgid "Exposure"
 msgstr "Экспозиция"
 
-#: src/editing_tools/EditingTools.vala:2769
+#: src/editing_tools/EditingTools.vala:2786
 msgid "Shadows"
 msgstr "Көлеңкелер"
 
-#: src/editing_tools/EditingTools.vala:2782
+#: src/editing_tools/EditingTools.vala:2799
 msgid "Highlights"
 msgstr "Ерекшелеу"
 
-#: src/editing_tools/EditingTools.vala:2792
+#: src/editing_tools/EditingTools.vala:2809
 msgid "Contrast Expansion"
 msgstr "Контраст кеңейтілуі"
 
@@ -4336,6 +4023,7 @@ msgid "Angle:"
 msgstr "Бұрыш:"
 
 #: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "Тура_лау"
 
@@ -4349,51 +4037,43 @@ msgid "%d Photo/Video"
 msgid_plural "%d Photos/Videos"
 msgstr[0] "%d фото/видео"
 
-#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:355
+#: src/events/EventDirectoryItem.vala:85 src/Properties.vala:358
 #, c-format
 msgid "%d Video"
 msgid_plural "%d Videos"
 msgstr[0] "%d видео"
 
-#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:353
+#: src/events/EventDirectoryItem.vala:87 src/Properties.vala:356
 #, c-format
 msgid "%d Photo"
 msgid_plural "%d Photos"
 msgstr[0] "%d фото"
 
-#: src/events/EventPage.vala:129
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr "Оқиға жоқ"
 
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "_Пікірлер"
-
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Әр оқиғаның түсіндірмесін көрсету"
-
-#: src/events/EventsDirectoryPage.vala:155
+#: src/events/EventsDirectoryPage.vala:150
 msgid "No events"
 msgstr "Оқиғалар жоқ"
 
-#: src/events/EventsDirectoryPage.vala:159
+#: src/events/EventsDirectoryPage.vala:154
 msgid "No events found"
 msgstr "Ешбір оқиға табылмады"
 
-#: src/events/EventsDirectoryPage.vala:230
+#: src/events/EventsDirectoryPage.vala:227
 msgid "All Events"
 msgstr "Барлық оқиғалар"
 
-#: src/events/EventsDirectoryPage.vala:244
+#: src/events/EventsDirectoryPage.vala:241
 msgid "Undated"
 msgstr "Күні жоқ"
 
-#: 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"
 
@@ -4433,21 +4113,20 @@ msgstr "Барл_ығын алмастыру"
 msgid "Export"
 msgstr "Экспорт"
 
-#: src/folders/Branch.vala:141
+#: src/folders/Branch.vala:144
 msgid "Folders"
 msgstr "Бумалар"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191
+#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
 msgid "Library"
 msgstr "Жинақ"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:608
-#: src/SearchFilter.vala:609
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
 msgid "Photos"
 msgstr "Фотолар"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
-#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
 msgid "Flagged"
 msgstr "Жалауша бар"
 
@@ -4455,21 +4134,11 @@ msgstr "Жалауша бар"
 msgid "Importing…"
 msgstr "Импорттау…"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Импортты тоқтату"
-
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Фотолар импортын тоқтату"
-
-#: src/library/ImportQueuePage.vala:124
-#, fuzzy
-#| msgid "Preparing to import"
+#: src/library/ImportQueuePage.vala:129
 msgid "Preparing to import…"
-msgstr "Импортқа дайындалу"
+msgstr "Импортқа дайындау…"
 
-#: src/library/ImportQueuePage.vala:151
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr "Импортталды %s"
@@ -4478,140 +4147,19 @@ msgstr "Импортталды %s"
 msgid "Last Import"
 msgstr "Соңғы импорт"
 
-#: src/library/LibraryWindow.vala:285
-#, fuzzy
-#| msgid "Import From Folder"
-msgid "_Import From Folder…"
-msgstr "Бумадан импорттау"
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Фотоларды дисктен жинаққа импорттау"
-
-#: src/library/LibraryWindow.vala:293
-#, fuzzy
-#| msgid "Import From Application"
-msgid "Import From _Application…"
-msgstr "Қолданбадан импорттау"
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Оқ_иғаларды сұрыптау"
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Қоқ_ыс шелегін тазарту"
-
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Қоқыс шелегінен барлық фотоларды өшіру"
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Фото ү_шін оқиғаны қарау"
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "Т_абу"
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Фото мен видеоларды іздеу шартына сәйкес табу"
-
-#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
-#: src/sidebar/Tree.vala:199
-#, fuzzy
-#| msgid "Ne_w Saved Search..."
-msgid "Ne_w Saved Search…"
-msgstr "Ж_аңа сақталған іздеу..."
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "Фо_толар"
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "Оқ_иғалар"
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "Те_гтер"
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "Не_гізгі ақпарат"
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Таңдалғаны үшін негізгі ақпаратты көрсету"
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "Кеңе_йтілген ақпарат"
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Таңдалғаны үшін кеңейтілген ақпаратты көрсету"
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "Ізд_еу өрісі"
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Іздеу өрісін көрсету"
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "Бү_йір панелі"
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Бүйір панелін көрсету"
-
-#: src/library/LibraryWindow.vala:398
-#, fuzzy
-#| msgid "Pin Toolbar"
-msgid "T_oolbar"
-msgstr "Панельді бекіту"
-
-#: src/library/LibraryWindow.vala:399
-#, fuzzy
-#| msgid "Display the sidebar"
-msgid "Display the tool bar"
-msgstr "Бүйір панелін көрсету"
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "Өс_у ретімен"
-
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Фотоларды өсу ретімен сұрыптау"
-
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "К_ему ретімен"
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Фотоларды кему ретімен сұрыптау"
-
-#: src/library/LibraryWindow.vala:657
+#: src/library/LibraryWindow.vala:507
 msgid "Import From Folder"
 msgstr "Бумадан импорттау"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Қоқыс шелегін тазарту"
 
-#: src/library/LibraryWindow.vala:726
-#, fuzzy
-#| msgid "Emptying Trash..."
+#: src/library/LibraryWindow.vala:576
 msgid "Emptying Trash…"
-msgstr "Қоқыс шелегі тазартылуда..."
+msgstr "Қоқыс шелегі тазартылуда…"
 
-#: src/library/LibraryWindow.vala:901
+#: src/library/LibraryWindow.vala:772
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4624,53 +4172,43 @@ msgstr ""
 "ұсынамыз.\n"
 "Фотоларды импорттауды жалғастыру керек пе?"
 
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Жинақтың орналасуы"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
+#: src/library/LibraryWindow.vala:788
 msgid "Photos cannot be imported from this directory."
 msgstr "Фотоларды бұл бумадан импорттау мүмкін емес."
 
-#: 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
-#, fuzzy
-#| msgid "Updating library..."
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
 msgid "Updating library…"
-msgstr "Жинақты жаңарту..."
+msgstr "Жинақты жаңарту…"
 
-#: src/library/LibraryWindow.vala:1264
-#, fuzzy
-#| msgid "Preparing to auto-import photos..."
+#: src/library/LibraryWindow.vala:1129
 msgid "Preparing to auto-import photos…"
-msgstr "Фотоларды автоимпорттауды дайындау..."
+msgstr "Фотоларды автоимпорттауды дайындау…"
 
-#: src/library/LibraryWindow.vala:1269
-#, fuzzy
-#| msgid "Auto-importing photos..."
+#: src/library/LibraryWindow.vala:1134
 msgid "Auto-importing photos…"
-msgstr "Фотоларды автоимпорттау..."
+msgstr "Фотоларды автоимпорттау…"
 
-#: src/library/LibraryWindow.vala:1277
-#, fuzzy
-#| msgid "Writing metadata to files..."
+#: src/library/LibraryWindow.vala:1142
 msgid "Writing metadata to files…"
-msgstr "Файлдарға метаақпаратты жазу..."
+msgstr "Файлдарға метаақпаратты жазу…"
 
 #: src/library/OfflinePage.vala:8
 msgid "Missing Files"
 msgstr "Файлдар жоқ"
 
-#: src/library/OfflinePage.vala:106
-#, fuzzy
-#| msgid "Deleting..."
+#: src/library/OfflinePage.vala:110
 msgid "Deleting…"
-msgstr "Өшірілуде..."
+msgstr "Өшірілуде…"
 
 #: src/library/TrashPage.vala:8
 msgid "Trash"
@@ -4689,11 +4227,7 @@ msgid "Deleting Photos"
 msgstr "Фотоларды өшіру"
 
 #: src/main.vala:54
-#, fuzzy, c-format
-#| msgid ""
-#| "Your photo library is not compatible with this version of Shotwell.  It "
-#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
-#| "(schema %d).  Please use the latest version of Shotwell."
+#, 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 "
@@ -4704,11 +4238,7 @@ msgstr ""
 "(схема %d). Shotwell-дың соңғы нұсқасын қолданыңыз."
 
 #: src/main.vala:59
-#, fuzzy, c-format
-#| msgid ""
-#| "Shotwell was unable to upgrade your photo library from version %s (schema "
-#| "%d) to %s (schema %d).  For more information please check the Shotwell "
-#| "Wiki at %s"
+#, 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 "
@@ -4718,12 +4248,7 @@ msgstr ""
 "(схема %d) дейін жаңарта алмады. Көбірек білу үшін Shotwell Wiki оқыңыз: %s"
 
 #: src/main.vala:65
-#, fuzzy, c-format
-#| msgid ""
-#| "Your photo library is not compatible with this version of Shotwell.  It "
-#| "appears it was created by Shotwell %s (schema %d).  This version is %s "
-#| "(schema %d).  Please clear your library by deleting %s and re-import your "
-#| "photos."
+#, 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 "
@@ -4736,8 +4261,7 @@ msgstr ""
 "импорттаңыз."
 
 #: 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 "Shotwell дерекқорын тексеру талабын жасау кезіндегі белгісіз қате: %s"
 
@@ -4745,44 +4269,36 @@ msgstr "Shotwell дерекқорын тексеру талабын жасау �
 msgid "Loading Shotwell"
 msgstr "Shotwell жүктелуде"
 
-#: src/main.vala:294
-#, fuzzy
-#| msgid "Path to Shotwell's private data"
+#: src/main.vala:293
 msgid "Path to Shotwell’s private data"
 msgstr "Shotwell жеке деректеріне дейінгі жол"
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "DIRECTORY"
 msgstr "БУМА"
 
-#: src/main.vala:298
+#: src/main.vala:297
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Жинақ бумасын өзгерістерге бақылап отырмау"
 
-#: src/main.vala:302
-#, fuzzy
-#| msgid "Don't display startup progress meter"
+#: src/main.vala:301
 msgid "Don’t display startup progress meter"
 msgstr "Іске қосылу үрдіс жолағын көрсетпеу"
 
-#: src/main.vala:306
-#, fuzzy
-#| msgid "Show the application's version"
+#: src/main.vala:305
 msgid "Show the application’s version"
 msgstr "Қолданба нұсқасын көрсету"
 
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
+#: src/main.vala:342
 msgid "[FILE]"
 msgstr "[ФАЙЛ]"
 
-#: src/main.vala:342
-#, fuzzy, c-format
-#| msgid ""
-#| "Run '%s --help' to see a full list of available command line options.\n"
+#: src/main.vala:346
+#, c-format
 msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
-"Командалық жолдың барлық опцияларын қарау үшін '%s --help' енгізіңіз.\n"
+"Командалық жолдың барлық опцияларын қарау үшін \"%s --help\" енгізіңіз.\n"
 
 #: src/MediaMonitor.vala:400
 #, c-format
@@ -4793,73 +4309,7 @@ msgstr "Жаңартуларды бақылау мүмкін емес: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Кіші көріністердің өлшемдерін баптау"
 
-#: src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Кіші көріністерді үлкейту"
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Кіші көріністерді кішірейту"
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Фот_оларды сұрыптау"
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "Видеоны о_йнату"
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Таңдалған видеоларды жүйелік видео плеерінде ашу"
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "Ө_ндіруші"
-
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Әр фотоның түсіндірмесін көрсету"
-
-#: src/MediaPage.vala:470
-#, fuzzy
-#| msgid "Display each photo's tags"
-msgid "Display each photo’s tags"
-msgstr "Әр фотоның тегтерін көрсету"
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "А_тауы бойынша"
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Фотоларды атаулары бойынша сұрыптау"
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Түсірілген _күні бойынша"
-
-#: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Фотоларды түсірілген күні бойынша сұрыптау"
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Ре_йтингі бойынша"
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Фотоларды рейтингі бойынша сұрыптау"
-
-#: src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "_Файл аты бойынша"
-
-#: src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Фотоларды файл аты бойынша сұрыптау"
-
-#: src/MediaPage.vala:723
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4868,34 +4318,34 @@ msgstr ""
 "Shotwell таңдалған видеоны ойната алмады:\n"
 "%s"
 
-#: src/Page.vala:1266
+#: src/Page.vala:1318
 msgid "No photos/videos"
 msgstr "Фото/видеолар жоқ"
 
-#: 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 "Фотоларды бұл бумаға экспорттау мүмкін емес."
 
 #. previous button
-#: src/PhotoPage.vala:533
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Алдыңғы фото"
 
 #. next button
-#: src/PhotoPage.vala:539
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Келесі фото"
 
-#: src/PhotoPage.vala:1845
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Фотоның бастапқы файлы жоқ: %s"
 
-#: src/PhotoPage.vala:3229
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "%s экспорттау мүмкін емес: %s"
@@ -4940,7 +4390,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3755
 msgid "modified"
 msgstr "түрлендірілген"
 
@@ -4972,25 +4422,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
-#, fuzzy
-#| msgid "Printing..."
+#: src/Printing.vala:864
 msgid "Printing…"
-msgstr "Баспаға шығару..."
+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"
@@ -5001,123 +4441,123 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "Бүгін"
 
-#: src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "Кеше"
 
-#: src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr "Элементтер:"
 
-#: src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
 msgstr[0] "%d оқиға"
 
 #. display only one date if start and end are the same
-#: src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "Күні:"
 
 #. display only one time if start and end are the same
-#: src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "Уақыты:"
 
 #. display time range
 #. display date range
-#: src/Properties.vala:384 src/Properties.vala:389
+#: src/Properties.vala:387 src/Properties.vala:392
 msgid "From:"
 msgstr "Қайдан:"
 
-#: src/Properties.vala:385 src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "Қайда:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Ұзақтығы:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f секунд"
 
-#: src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Өндіруші:"
 
 #. nothing special to be done for now for Events
-#: src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Орналасуы:"
 
-#: src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Файл өлшемі:"
 
-#: src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Ағымдағы өндеуде:"
 
-#: src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Бастапқы өлшемдері:"
 
-#: src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "Камера моделі:"
 
-#: src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "Камера моделі:"
 
-#: src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Жарқылдау:"
 
-#: src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Фокустық қашықтығы:"
 
-#: src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Экспозиция күні:"
 
-#: src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Экспозиция уақыты:"
 
-#: src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Экспозицияны келтіру:"
 
-#: src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "GPS ендігі:"
 
-#: src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "GPS бойлығы:"
 
-#: src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "Орындаушы:"
 
-#: src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "Copyright:"
 
-#: src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "Бағд. қамтамасы:"
 
-#: src/Properties.vala:641
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr "Кеңейтілген ақпараты"
 
@@ -5131,8 +4571,7 @@ msgid "Uploading %d of %d"
 msgstr "Жүктелуде %d, барлығы %d"
 
 #: src/publishing/PublishingPluginHost.vala:81
-#, fuzzy, c-format
-#| msgid "Publishing to %s can't continue because an error occurred:"
+#, c-format
 msgid "Publishing to %s can’t continue because an error occurred:"
 msgstr "%s ішіне жариялау мүмкін емес, орын алған қате:"
 
@@ -5141,69 +4580,61 @@ msgid "To try publishing to another service, select one from the above menu."
 msgstr ""
 "Басқа қызметке жариялап көру үшін, үстіндегі мәзірден біреуін таңдаңыз."
 
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Таңдалған фото/видеолар сәтті жарияланды."
-
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Таңдалған видеолар сәтті жарияланды."
-
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Таңдалған фотолар сәтті жарияланды."
-
-#: src/publishing/PublishingUI.vala:112
+#. Here, we check whether more than one item is being uploaded, and if so, display
+#. an alternate message.
+#: src/publishing/PublishingUI.vala:104
 msgid "The selected video was successfully published."
-msgstr "Таңдалған видео сәтті жарияланды."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "Таңдалған видео(лар) сәтті жарияланды."
 
-#: src/publishing/PublishingUI.vala:114
+#: src/publishing/PublishingUI.vala:109
 msgid "The selected photo was successfully published."
-msgstr "Таңдалған фото сәтті жарияланды."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "Таңдалған фото(лар) сәтті жарияланды."
 
-#: src/publishing/PublishingUI.vala:122
-#, fuzzy
-#| msgid "Fetching account information..."
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "Таңдалған фото/видеолар сәтті жарияланды."
+
+#: src/publishing/PublishingUI.vala:127
 msgid "Fetching account information…"
-msgstr "Тіркелгі ақпараты алынуда..."
+msgstr "Тіркелгі ақпараты алынуда…"
 
-#: src/publishing/PublishingUI.vala:128
-#, fuzzy
-#| msgid "Logging in..."
+#: src/publishing/PublishingUI.vala:133
 msgid "Logging in…"
-msgstr "Жүйеге кіру..."
+msgstr "Жүйеге кіру…"
 
-#: src/publishing/PublishingUI.vala:188
+#: src/publishing/PublishingUI.vala:193
 msgid "Publish Photos"
 msgstr "Фотоларды жариялау"
 
-#: src/publishing/PublishingUI.vala:189
+#: src/publishing/PublishingUI.vala:194
 msgid "Publish photos _to:"
 msgstr "Фотоларды жари_ялау орны:"
 
-#: src/publishing/PublishingUI.vala:191
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish Videos"
 msgstr "Видеоларды жариялау"
 
-#: src/publishing/PublishingUI.vala:192
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish videos _to"
 msgstr "Видеоларды жари_ялау орны:"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish Photos and Videos"
 msgstr "Фото мен видеоларды жариялау"
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish photos and videos _to"
 msgstr "Фото мен видеоларды жари_ялау орны:"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:397
+#: src/publishing/PublishingUI.vala:410
 msgid "Unable to publish"
 msgstr "Жариялау мүмкін емес"
 
-#: src/publishing/PublishingUI.vala:398
+#: src/publishing/PublishingUI.vala:411
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5220,11 +4651,7 @@ msgstr ""
 msgid "Publishing"
 msgstr "Жариялау"
 
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Оңғ_а бұру"
-
-#: src/Resources.vala:140 src/Resources.vala:145
+#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
 msgid "Rotate"
 msgstr "Бұру"
 
@@ -5232,14 +4659,10 @@ msgstr "Бұру"
 msgid "Rotate Right"
 msgstr "Оңға бұру"
 
-#: src/Resources.vala:142
+#: src/Resources.vala:142 ui/collection.ui:146
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Фотосуреттерді оңға бұру (Солға бұру үшін Ctrl басыңыз)"
 
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "С_олға бұру"
-
 #: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "Солға бұру"
@@ -5248,23 +4671,17 @@ msgstr "Солға бұру"
 msgid "Rotate the photos left"
 msgstr "Фотоларды солға бұру"
 
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Горизонта_лды айналдыру"
-
 #: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "Горизонталды айналдыру"
 
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "_Вертикалды айналдыру"
-
 #: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "Вертикалды айналдыру"
 
-#: src/Resources.vala:155
+#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419
+#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207
 msgid "_About"
 msgstr "О_сы туралы"
 
@@ -5272,19 +4689,35 @@ msgstr "О_сы туралы"
 msgid "_Apply"
 msgstr "Іске _асыру"
 
+#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
+#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
+msgid "_Edit"
+msgstr "Тү_зету"
+
 #: src/Resources.vala:160
 msgid "_Forward"
 msgstr "А_лға"
 
-#: src/Resources.vala:161
+#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "Т_олық экранға"
 
+#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418
+#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420
+#: ui/tags.ui:423 ui/trash.ui:189 ui/trash.ui:192
+msgid "_Help"
+msgstr "_Көмек"
+
 #: src/Resources.vala:163
 msgid "Leave _Fullscreen"
 msgstr "Т_олық экраннан шығу"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "Ж_аңа"
 
@@ -5292,15 +4725,9 @@ msgstr "Ж_аңа"
 msgid "_Next"
 msgstr "_Келесі"
 
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr "_ОК"
-
-#: src/Resources.vala:167
-msgid "_Play"
-msgstr "Ой_нату"
-
-#: src/Resources.vala:168 src/Resources.vala:317
+#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
 msgid "_Preferences"
 msgstr "Ба_птаулар"
 
@@ -5308,11 +4735,9 @@ msgstr "Ба_птаулар"
 msgid "_Previous"
 msgstr "Ал_дыңғы"
 
-#: src/Resources.vala:170
-msgid "_Print"
-msgstr "Бас_паға шығару"
-
-#: src/Resources.vala:171
+#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
+#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
 msgid "_Quit"
 msgstr "_Шығу"
 
@@ -5352,24 +4777,24 @@ msgstr "Қалы_пты өлшемі"
 msgid "Best _Fit"
 msgstr "Жақ_сырақ сыю"
 
-#: src/Resources.vala:186
-msgid "_Enhance"
-msgstr "Жақсар_ту"
+#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "Үлке_йту"
 
-#: src/Resources.vala:187
+#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "Кі_шірейту"
+
+#: src/Resources.vala:187 ui/collection.ui:165
 msgid "Enhance"
 msgstr "Жақсарту"
 
-#: src/Resources.vala:188
-#, fuzzy
-#| msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:188 ui/collection.ui:162
 msgid "Automatically improve the photo’s appearance"
 msgstr "Фото түрін автожақсарту"
 
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "Түстерді келтіруін _көшіріп алу"
-
 #: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "Түстерді келтіруін көшіріп алу"
@@ -5378,10 +4803,6 @@ msgstr "Түстерді келтіруін көшіріп алу"
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Фотосуретке іске асырылған түстерді келтіруін көшіріп алу"
 
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "Түстерді келтіруін кірі_стіру"
-
 #: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "Түстерді келтіруін кірістіру"
@@ -5390,7 +4811,7 @@ msgstr "Түстерді келтіруін кірістіру"
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Таңдалған фотоларға көшірілген түстерді келтіруін кірістіру"
 
-#: src/Resources.vala:198
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "Қ_иып жіберу"
 
@@ -5399,8 +4820,6 @@ msgid "Crop"
 msgstr "Қиып жіберу"
 
 #: src/Resources.vala:200
-#, fuzzy
-#| msgid "Crop the photo's size"
 msgid "Crop the photo’s size"
 msgstr "Фотосуретті қиып жіберу"
 
@@ -5412,7 +4831,7 @@ msgstr "Туралау"
 msgid "Straighten the photo"
 msgstr "Фотосуретті туралау"
 
-#: src/Resources.vala:206
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "Қы_зыл көздер"
 
@@ -5424,7 +4843,7 @@ msgstr "Қызыл көздер"
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Фотодағы қызыл көздер эффектілерін жою"
 
-#: src/Resources.vala:210
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "К_елтіру"
 
@@ -5433,15 +4852,9 @@ msgid "Adjust"
 msgstr "Келтіру"
 
 #: src/Resources.vala:212
-#, fuzzy
-#| msgid "Adjust the photo's color and tone"
 msgid "Adjust the photo’s color and tone"
 msgstr "Фото түсін мен реңің келтіру"
 
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "Бастапқ_ыға тастау"
-
 #: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr "Бастапқы қалпына келтіру"
@@ -5454,21 +4867,17 @@ msgstr "Сыртқы тү_зетулерді болдырмау"
 msgid "Revert to the master photo"
 msgstr "Бас фотоға дейін тастау"
 
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Жұмыс үс_тел тұсқағазы ретінде орнату"
-
 #: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr "Таңдалған суретті жұмыс үстелінің тұсқағазы ретінде орнату"
 
 #: src/Resources.vala:222
-#, fuzzy
-#| msgid "Set as Desktop Slideshow"
 msgid "Set as _Desktop Slideshow…"
-msgstr "Жұмыс үстел слайдшоуы ретінде орнату"
+msgstr "_Жұмыс үстел слайдшоуы ретінде орнату…"
 
-#: src/Resources.vala:224
+#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
+#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
 msgid "_Undo"
 msgstr "Бол_дырмау"
 
@@ -5476,7 +4885,9 @@ msgstr "Бол_дырмау"
 msgid "Undo"
 msgstr "Болдырмау"
 
-#: src/Resources.vala:227
+#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
+#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
 msgid "_Redo"
 msgstr "Қа_йталау"
 
@@ -5484,13 +4895,12 @@ msgstr "Қа_йталау"
 msgid "Redo"
 msgstr "Қайталау"
 
-#: src/Resources.vala:230
-#, fuzzy
-#| msgid "Rename Event"
+#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:391 ui/event.ui:584
 msgid "Re_name Event…"
-msgstr "Оқиға атын ауыстыру"
+msgstr "Оқиға атын ау_ыстыру…"
 
-#: src/Resources.vala:233
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr "Оқиға үшін _негізгі фото жасау"
 
@@ -5498,7 +4908,7 @@ msgstr "Оқиға үшін _негізгі фото жасау"
 msgid "Make Key Photo for Event"
 msgstr "Оқиға үшін негізгі фото жасау"
 
-#: src/Resources.vala:236
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
 msgid "_New Event"
 msgstr "_Жаңа оқиға"
 
@@ -5514,7 +4924,7 @@ msgstr "Фотоларды жылжыту"
 msgid "Move photos to an event"
 msgstr "Фотоларды оқиғаға жылжыту"
 
-#: src/Resources.vala:242
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Оқиғаларды біріктіру"
 
@@ -5526,7 +4936,8 @@ msgstr "Біріктіру"
 msgid "Combine events into a single event"
 msgstr "Оқиғаларды бір оқиғаға біріктіру"
 
-#: src/Resources.vala:246
+#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Рейтингті орнату"
 
@@ -5538,7 +4949,8 @@ msgstr "Рейтингті орнату"
 msgid "Change the rating of your photo"
 msgstr "Фотоңыздың рейтингін орнату"
 
-#: src/Resources.vala:250
+#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "Ү_лкейту"
 
@@ -5546,7 +4958,8 @@ msgstr "Ү_лкейту"
 msgid "Increase Rating"
 msgstr "Рейтингі үлкейту"
 
-#: src/Resources.vala:253
+#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "Кі_шірейту"
 
@@ -5554,7 +4967,8 @@ msgstr "Кі_шірейту"
 msgid "Decrease Rating"
 msgstr "Рейтингі кішірейту"
 
-#: src/Resources.vala:256
+#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "Рейт_ингсіз"
 
@@ -5574,7 +4988,8 @@ msgstr "Рейтингсіз етіп белгілеу"
 msgid "Remove any ratings"
 msgstr "Бар рейтингілерді өшіру"
 
-#: src/Resources.vala:262
+#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "Та_йдырылған"
 
@@ -5594,7 +5009,8 @@ msgstr "Тайдырылған етіп белгілеу"
 msgid "Set rating to rejected"
 msgstr "Рейтингі тайдырылған етіп орнату"
 
-#: src/Resources.vala:268
+#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
 msgid "Rejected _Only"
 msgstr "Тек та_йдырылған"
 
@@ -5606,18 +5022,18 @@ msgstr "Тек тайдырылған"
 msgid "Show only rejected photos"
 msgstr "Тек тайдырылған фотоларды көрсету"
 
-#: src/Resources.vala:272
+#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
 msgid "All + _Rejected"
 msgstr "Барл_ығы + тайдырылған"
 
 #: src/Resources.vala:273
-#, fuzzy
-#| msgid "Show all photos, including rejected"
 msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Барлық фотоларды көрсету, тайдырылғандармен қоса"
 
-#: src/Resources.vala:275
+#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
 msgid "_All Photos"
 msgstr "_Барлық фотолар"
 
@@ -5626,17 +5042,17 @@ msgstr "_Барлық фотолар"
 msgid "Show all photos"
 msgstr "Барлық фотоларды көрсету"
 
-#: src/Resources.vala:279
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "Р_ейтингтер"
 
 #: src/Resources.vala:280
-#, fuzzy
-#| msgid "Display each photo's rating"
 msgid "Display each photo’s rating"
-msgstr "Әр фотоның рейтингі көрсету"
+msgstr "Әр фотоның рейтингін көрсету"
 
-#: src/Resources.vala:282
+#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
 msgid "_Filter Photos"
 msgstr "Фотоларды сүз_гілеу"
 
@@ -5648,10 +5064,6 @@ msgstr "Фотоларды сүзгілеу"
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Көрсетілетін фотолардың санын сүзгі негізінде азайту"
 
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "Кө_шірмесін жасау"
-
 #: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "Көшірмесін жасау"
@@ -5660,120 +5072,87 @@ msgstr "Көшірмесін жасау"
 msgid "Make a duplicate of the photo"
 msgstr "Фотоның көшірмесін жасау"
 
-#: src/Resources.vala:290
-#, fuzzy
-#| msgid "Export"
+#: src/Resources.vala:290 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
 msgid "_Export…"
-msgstr "Экспорт"
+msgstr "_Экспорт…"
 
 #: src/Resources.vala:292
-#, fuzzy
-#| msgid "_Print"
 msgid "_Print…"
-msgstr "Бас_паға шығару"
+msgstr "Ба_спаға шығару…"
 
 #: src/Resources.vala:294
-#, fuzzy
-#| msgid "Publish"
 msgid "Pu_blish…"
-msgstr "Жариялау"
+msgstr "Жар_иялау…"
 
-#: src/Resources.vala:296
+#: src/Resources.vala:296 ui/collection.ui:187
 msgid "Publish to various websites"
 msgstr "Әртүрлі веб сайттарға жариялау"
 
-#: src/Resources.vala:298
-#, fuzzy
-#| msgid "Edit Title"
+#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
 msgid "Edit _Title…"
-msgstr "Атауды түзету"
+msgstr "А_тауды түзету…"
 
 #. Button label
 #: src/Resources.vala:300
-#, fuzzy
-#| msgid "Edit Title"
 msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Атауды түзету"
 
-#: src/Resources.vala:302
-#, fuzzy
-#| msgid "Edit Comment"
+#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539
+#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344
 msgid "Edit _Comment…"
-msgstr "Түсіндірмені түзету"
+msgstr "Тү_сіндірмені түзету…"
 
 #. Button label
 #: src/Resources.vala:304
 msgid "Edit Comment"
 msgstr "Түсіндірмені түзету"
 
-#: src/Resources.vala:306
-#, fuzzy
-#| msgid "Edit Event Comment"
+#: src/Resources.vala:306 ui/event.ui:588
 msgid "Edit Event _Comment…"
-msgstr "Оқиға түсіндірмесін түзету"
+msgstr "Оқиға тү_сіндірмесін түзету…"
 
-#: src/Resources.vala:309
-#, fuzzy
-#| msgid "Adjust Date and Time"
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
 msgid "_Adjust Date and Time…"
-msgstr "Күн мен уақытын түзету"
+msgstr "Күн мен уақытын _түзету…"
 
 #: src/Resources.vala:310
 msgid "Adjust Date and Time"
 msgstr "Күн мен уақытын түзету"
 
-#: src/Resources.vala:312
-#, fuzzy
-#| msgid "Add Tags"
+#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456
+#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388
 msgid "Add _Tags…"
-msgstr "Тегтерді қосу"
+msgstr "_Тегтерді қосу…"
 
-#: src/Resources.vala:313
-#, fuzzy
-#| msgid "Add Tags"
+#: src/Resources.vala:313 ui/photo_context.ui:17
 msgid "_Add Tags…"
-msgstr "Тегтерді қосу"
+msgstr "Тегтерді қ_осу…"
 
 #. Dialog title
 #: src/Resources.vala:315
-#, fuzzy
-#| msgid "Add Tags"
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Тегтерді қосу"
 
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "Сыр_тқы түзетушісімен ашу"
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "RAW түзетушісімен ашу"
-
-#: src/Resources.vala:323
-#, fuzzy
-#| msgid "Send To"
-msgid "Send _To…"
-msgstr "Қайда жіберу"
-
-#: src/Resources.vala:324
-#, fuzzy
-#| msgid "Send To"
+#: src/Resources.vala:324 ui/photo_context.ui:133
 msgid "Send T_o…"
-msgstr "Қайда жіберу"
+msgstr "Қа_йда жіберу…"
 
 #: src/Resources.vala:326
-#, fuzzy
-#| msgid "_Find"
 msgid "_Find…"
-msgstr "Т_абу"
+msgstr "Т_абу…"
 
-#: src/Resources.vala:327
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Табу"
 
-#: src/Resources.vala:328
+#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Суретті оның аты не тегтеріндегі бар мәтін арқылы табу"
 
@@ -5791,35 +5170,29 @@ msgid "Unable to launch editor: %s"
 msgstr "Түзетушіні жөнелту мүмкін емес: %s"
 
 #: src/Resources.vala:340
-#, fuzzy, c-format
-#| msgid "Add Tag \"%s\""
+#, c-format
 msgid "Add Tag “%s”"
 msgstr "\"%s\" тегін қосу"
 
 #. Used when adding two tags to photo(s)
 #: src/Resources.vala:343
-#, fuzzy, c-format
-#| msgid "Add Tags \"%s\" and \"%s\""
+#, c-format
 msgid "Add Tags “%s” and “%s”"
 msgstr "\"%s\" және \"%s\" тегтерін қосу"
 
 #. Undo/Redo command name (in Edit menu)
 #: src/Resources.vala:348
-#, fuzzy
-#| msgid "Add Tags"
 msgctxt "UndoRedo menu entry"
 msgid "Add Tags"
 msgstr "Тегтерді қосу"
 
 #: src/Resources.vala:353
-#, fuzzy, c-format
-#| msgid "_Delete Tag \"%s\""
+#, c-format
 msgid "_Delete Tag “%s”"
 msgstr "\"%s\" те_гін өшіру"
 
 #: src/Resources.vala:357
-#, fuzzy, c-format
-#| msgid "Delete Tag \"%s\""
+#, c-format
 msgid "Delete Tag “%s”"
 msgstr "\"%s\" тегін өшіру"
 
@@ -5828,213 +5201,179 @@ msgid "Delete Tag"
 msgstr "Тегті өшіру"
 
 #: src/Resources.vala:366
-#, fuzzy, c-format
-#| msgid "Re_name Tag \"%s\"..."
+#, c-format
 msgid "Re_name Tag “%s”…"
-msgstr "\"%s\" тегінің атын ауыст_ыру..."
+msgstr "\"%s\" тегінің атын ауыст_ыру…"
 
 #: src/Resources.vala:370
-#, fuzzy, c-format
-#| msgid "Rename Tag \"%s\" to \"%s\""
+#, c-format
 msgid "Rename Tag “%s” to “%s”"
 msgstr "\"%s\" тегтің атын \"%s\" етіп орнату"
 
-#: src/Resources.vala:373
-#, fuzzy
-#| msgid "_Rename..."
+#: src/Resources.vala:373 ui/tags.ui:454
 msgid "_Rename…"
-msgstr "_Атын ауыстыру..."
+msgstr "Атын ауысты_ру…"
 
-#: src/Resources.vala:375
-#, fuzzy
-#| msgid "Modify Tags"
+#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461
+#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393
 msgid "Modif_y Tags…"
-msgstr "Тегті түзету"
+msgstr "Тегтерді түз_ету…"
 
 #: src/Resources.vala:376
 msgid "Modify Tags"
 msgstr "Тегті түзету"
 
 #: src/Resources.vala:379
-#, fuzzy, c-format
-#| msgid "Tag Photo as \"%s\""
+#, c-format
 msgid "Tag Photo as “%s”"
-msgstr "Фото(лар)ға \"%s\" тегін қосу"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Фото(лар)ға \"%s\" тегін қосу"
 
-#: src/Resources.vala:379
-#, fuzzy, c-format
-#| msgid "Tag Photos as \"%s\""
-msgid "Tag Photos as “%s”"
-msgstr "Фотоларға \"%s\" тегін орнату"
-
-#: src/Resources.vala:383
-#, fuzzy, c-format
-#| msgid "Tag the selected photo as \"%s\""
+#: src/Resources.vala:385
+#, c-format
 msgid "Tag the selected photo as “%s”"
-msgstr "Таңдалған фотоға \"%s\" тегін қосу"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Таңдалған фото(лар)ға \"%s\" тегін қосу"
 
-#: src/Resources.vala:384
-#, fuzzy, c-format
-#| msgid "Tag the selected photos as \"%s\""
-msgid "Tag the selected photos as “%s”"
-msgstr "Таңдалған фотоларға \"%s\" тегін орнату"
-
-#: src/Resources.vala:388
-#, fuzzy, c-format
-#| msgid "Remove Tag \"%s\" From _Photo"
+#: src/Resources.vala:391
+#, c-format
 msgid "Remove Tag “%s” From _Photo"
-msgstr "Фото(лар)дан \"%s\" тегін ө_шіру"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "_Фото(лар)дан \"%s\" тегін өшіру"
 
-#: src/Resources.vala:389
-#, fuzzy, c-format
-#| msgid "Remove Tag \"%s\" From _Photos"
-msgid "Remove Tag “%s” From _Photos"
-msgstr "Фо_толардан \"%s\" тегін өшіру"
-
-#: src/Resources.vala:393
-#, fuzzy, c-format
-#| msgid "Remove Tag \"%s\" From Photo"
+#: src/Resources.vala:397
+#, c-format
 msgid "Remove Tag “%s” From Photo"
-msgstr "Фото(лар)дан \"%s\" тегін өшіру"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Фото(лар)дан \"%s\" тегін өшіру"
 
-#: src/Resources.vala:394
-#, fuzzy, c-format
-#| msgid "Remove Tag \"%s\" From Photos"
-msgid "Remove Tag “%s” From Photos"
-msgstr "Фотолардан \"%s\" тегін өшіру"
-
-#: src/Resources.vala:398
-#, fuzzy, c-format
-#| msgid "Unable to rename tag to \"%s\" because the tag already exists."
+#: src/Resources.vala:403
+#, c-format
 msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr ""
 "Тег үшін жаңа \"%s\" атауын орнату мүмкін емес, өйткені ондай тег бар болып "
 "тұр."
 
-#: src/Resources.vala:402
-#, fuzzy, c-format
-#| msgid "Unable to rename search to \"%s\" because the search already exists."
+#: src/Resources.vala:407
+#, c-format
 msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
 "Іздеудің атын \"%s\" етіп ауыстыру сәтсіз, өйткені іздеу бар болып тұр."
 
 #. Saved search button
-#: src/Resources.vala:405 src/SearchFilter.vala:1210
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Сақталған іздеу"
 
-#: src/Resources.vala:407
+#: src/Resources.vala:412
 msgid "Delete Search"
 msgstr "Іздеуді өшіру"
 
-#: src/Resources.vala:410
-#, fuzzy
-#| msgid "_Edit"
+#: src/Resources.vala:415 ui/savedsearch.ui:11
 msgid "_Edit…"
-msgstr "Тү_зету"
+msgstr "Тү_зету…"
 
-#: src/Resources.vala:411
-#, fuzzy
-#| msgid "Re_name..."
+#: src/Resources.vala:416 ui/savedsearch.ui:7
 msgid "Re_name…"
-msgstr "Ат_ын ауыстыру..."
+msgstr "Ат_ын ауыстыру…"
 
-#: src/Resources.vala:414
-#, fuzzy, c-format
-#| msgid "Rename Search \"%s\" to \"%s\""
+#: src/Resources.vala:419
+#, c-format
 msgid "Rename Search “%s” to “%s”"
 msgstr "\"%s\" іздеудің атын \"%s\" етіп ауыстыру"
 
-#: src/Resources.vala:418
-#, fuzzy, c-format
-#| msgid "Delete Search \"%s\""
+#: src/Resources.vala:423
+#, c-format
 msgid "Delete Search “%s”"
 msgstr "\"%s\" іздеуін өшіру"
 
-#: src/Resources.vala:576
+#: src/Resources.vala:560
 #, c-format
 msgid "Rate %s"
 msgstr "%s етіп баға беру"
 
-#: src/Resources.vala:577
+#: src/Resources.vala:561
 #, c-format
 msgid "Set rating to %s"
 msgstr "Рейтингін %s етіп орнату"
 
-#: src/Resources.vala:578
+#: src/Resources.vala:562
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Рейтинг %s етіп орнатылуда"
 
-#: src/Resources.vala:580
+#: src/Resources.vala:564
 #, c-format
 msgid "Display %s"
 msgstr "Көрсету %s"
 
-#: src/Resources.vala:581
+#: src/Resources.vala:565
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Тек қана рейтингі %s болатын фотоларды көрсету"
 
-#: src/Resources.vala:582
+#: src/Resources.vala:566
 #, c-format
 msgid "%s or Better"
 msgstr "%s не жақсырақ"
 
-#: src/Resources.vala:583
+#: src/Resources.vala:567
 #, c-format
 msgid "Display %s or Better"
 msgstr "%s не жақсырақ көрсету"
 
-#: src/Resources.vala:584
+#: src/Resources.vala:568
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Тек қана рейтингі %s не одан жақсы болатын фотоларды көрсету"
 
-#: src/Resources.vala:675
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Таңдалған фотоларды қоқыс шелегінен өшіру"
 
-#: src/Resources.vala:676
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Таңдалған фотоларды жинақтан өшіру"
 
-#: src/Resources.vala:678
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "Қал_пына келтіру"
 
-#: src/Resources.vala:679
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Таңдалған фотоларды жинаққа қайта апару"
 
-#: src/Resources.vala:681
+#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
+#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Файлдар басқарушысында көрсету"
 
-#: src/Resources.vala:682
-#, fuzzy
-#| msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:666
 msgid "Open the selected photo’s directory in the file manager"
 msgstr "Таңдалған фотоның бумасын файлдар басқарушысында ашу"
 
-#: src/Resources.vala:685
+#: src/Resources.vala:669
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Файлдар басқарушысында ашу сәтсіз: %s"
 
-#: src/Resources.vala:688
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "Ж_инақтан өшіру"
 
-#: src/Resources.vala:690
+#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
+#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "Қоқы_с шелегіне тастау"
 
-#: src/Resources.vala:692
+#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr "Б_арлығын таңдау"
 
-#: src/Resources.vala:693
+#: src/Resources.vala:677
 msgid "Select all items"
 msgstr "Барлық нәрсені таңдау"
 
@@ -6047,16 +5386,14 @@ msgstr "Барлық нәрсені таңдау"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:782
+#: src/Resources.vala:738
 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
-#, fuzzy
-#| msgid "%a %b %d"
+#: src/Resources.vala:743
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a %b %d"
@@ -6064,9 +5401,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
-#, fuzzy
-#| msgid "%d, %Y"
+#: src/Resources.vala:748
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
@@ -6074,9 +5409,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
-#| msgid "%a %b %d"
+#: src/Resources.vala:753
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a %b %d"
@@ -6084,9 +5417,7 @@ 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
-#, fuzzy
-#| msgid "%a %b %d, %Y"
+#: src/Resources.vala:758
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a %b %d, %Y"
@@ -6100,139 +5431,139 @@ msgid "Saved Searches"
 msgstr "Сақталған іздеулер"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
 msgstr "құрамында бар"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:169
-#: src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
 msgid "is exactly"
 msgstr "дәл сәйкес"
 
-#: src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:164
 msgid "starts with"
 msgstr "басталады"
 
-#: src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:165
 msgid "ends with"
 msgstr "аяқталады"
 
-#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:166
 msgid "does not contain"
 msgstr "құрамында жоқ"
 
-#: src/searches/SavedSearchDialog.vala:173
-#: src/searches/SavedSearchDialog.vala:504
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
 msgid "is not set"
 msgstr "орнатылмаған"
 
-#: src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:168
 msgid "is set"
 msgstr "орнатылған"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:248
-#: src/searches/SavedSearchDialog.vala:379
-#: src/searches/SavedSearchDialog.vala:444
+#: src/searches/SavedSearchDialog.vala:242
+#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:438
 msgid "is"
 msgstr "екен"
 
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:243
 msgid "is not"
 msgstr "емес"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:249
 msgid "any photo"
 msgstr "кез-келген фото"
 
-#: src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:250
 msgid "a raw photo"
 msgstr "raw фото"
 
-#: src/searches/SavedSearchDialog.vala:257
+#: src/searches/SavedSearchDialog.vala:251
 msgid "a video"
 msgstr "видео"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:305
 msgid "has"
 msgstr "бар"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:306
 msgid "has no"
 msgstr "жоқ"
 
-#: src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:311
 msgid "modifications"
 msgstr "өзгертулер"
 
-#: src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:312
 msgid "internal modifications"
 msgstr "ішкі өзгертулер"
 
-#: src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:313
 msgid "external modifications"
 msgstr "сыртқы өзгертулер"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:367
 msgid "flagged"
 msgstr "жалаушасы бар"
 
-#: src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:368
 msgid "not flagged"
 msgstr "жалаушасы жоқ"
 
-#: src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:431
 msgid "and higher"
 msgstr "және көбірек"
 
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:432
 msgid "only"
 msgstr "тек"
 
-#: src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:433
 msgid "and lower"
 msgstr "және азырақ"
 
-#: src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:495
 msgid "is after"
 msgstr "кейін"
 
-#: src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:496
 msgid "is before"
 msgstr "дейін"
 
-#: src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:497
 msgid "is between"
 msgstr "арасында"
 
-#: src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:510
 msgid "and"
 msgstr "және"
 
-#: src/searches/SavedSearchDialog.vala:697
+#: src/searches/SavedSearchDialog.vala:691
 msgid "Search"
 msgstr "Іздеу"
 
-#: src/searches/SavedSearchDialog.vala:702
+#: src/searches/SavedSearchDialog.vala:696
 msgid "Cancel"
 msgstr "Бас тарту"
 
-#: src/searches/SavedSearchDialog.vala:703
+#: src/searches/SavedSearchDialog.vala:697
 msgid "OK"
 msgstr "ОК"
 
-#: src/searches/SavedSearchDialog.vala:721
+#: src/searches/SavedSearchDialog.vala:716
 msgid "any"
 msgstr "кез-келген"
 
-#: src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:717
 msgid "all"
 msgstr "барлығы"
 
-#: src/searches/SavedSearchDialog.vala:723
+#: src/searches/SavedSearchDialog.vala:718
 msgid "none"
 msgstr "ешнәрсе"
 
@@ -6272,8 +5603,8 @@ msgstr "Жалауша күйі"
 msgid "Photo state"
 msgstr "Фотосурет күйі"
 
-#. Rating button
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
 msgid "Rating"
 msgstr "Рейтинг"
 
@@ -6281,47 +5612,57 @@ msgstr "Рейтинг"
 msgid "Date"
 msgstr "Күн"
 
-#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
-msgid "Videos"
-msgstr "Видеолар"
+#: src/SearchFilter.vala:815
+msgid "★+ Rating"
+msgstr "★+ рейтинг"
 
-#: src/SearchFilter.vala:620
-msgid "RAW Photos"
-msgstr "RAW фотосуреттері"
+#: src/SearchFilter.vala:818
+msgid "★★+ Rating"
+msgstr "★★+ рейтинг"
 
-#: src/SearchFilter.vala:621
-msgid "RAW photos"
-msgstr "RAW фотосуреттері"
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr "★★★+ рейтинг"
 
-#: src/SearchFilter.vala:1148
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr "★★★★+ рейтинг"
+
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr "★★★★★+ рейтинг"
+
+#: src/SearchFilter.vala:1064
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "UI %s файлын жүктеу қатесі: %s"
+msgid "Error loading search bar UI: %s"
+msgstr ""
 
 #. 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:1073
 msgid "Close"
 msgstr "Жабу"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1165
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr "Түрі"
 
-#: src/SearchFilter.vala:1211
+#: src/SearchFilter.vala:1086
+msgid "Videos"
+msgstr "Видеолар"
+
+#: src/SearchFilter.vala:1089
+msgid "RAW Photos"
+msgstr "RAW фотосуреттері"
+
+#: src/SearchFilter.vala:1125
 msgid "Use a saved search to filter items in the current view"
 msgstr ""
 
-#: src/sidebar/Tree.vala:203
-#, fuzzy
-#| msgid "New _Tag..."
-msgid "New _Tag…"
-msgstr "Жаңа _тег..."
-
 #: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Баптаулар"
@@ -6394,198 +5735,583 @@ msgid "untitled"
 msgstr "атаусыз"
 
 #. multiple videos
-#: src/VideoSupport.vala:490
+#: src/VideoSupport.vala:523
 msgid "Export Videos"
 msgstr "Видеоларды экспорттау"
 
-#: ui/set_background_dialog.ui:15
-msgid "Set as Desktop Background"
-msgstr "Жұмыс үстел тұсқағазы ретінде орнату"
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr ""
 
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
-msgid "Use for Desktop"
-msgstr "Жұмыс үстелі үшін қолдану"
+#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
+#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+msgid "_Developer"
+msgstr "Ө_ндіруші"
 
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
-msgid "Use for Lock Screen"
-msgstr "Блоктау экраны үшін қолдану"
+#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
+msgid "Open with E_xternal Editor"
+msgstr "Сыр_тқы түзетушісімен ашу"
 
-#: ui/set_background_slideshow_dialog.ui:15
-msgid "Set as Desktop Slideshow"
-msgstr "Жұмыс үстел слайдшоуы ретінде орнату"
+#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
+#: ui/photo_context.ui:124 ui/tags.ui:379
+msgid "View Eve_nt for Photo"
+msgstr "Фото ү_шін оқиғаны қарау"
 
-#: ui/set_background_slideshow_dialog.ui:33
-msgid "Show each photo for"
-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/trash.ui:5
+msgid "_File"
+msgstr "_Файл"
 
-#: ui/set_background_slideshow_dialog.ui:45
-msgid "period of time"
-msgstr "уақыт аралығы"
+#: ui/direct.ui:13
+msgid "Save _As…"
+msgstr "Қала_йша сақтау…"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-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/trash.ui:87
+msgid "_View"
+msgstr "_Түрі"
 
-#: ui/set_background_slideshow_dialog.ui:115
-msgid "How long each photo is shown on the desktop background"
-msgstr "Әр фото жұмыс үстелдің түсқағазы ретінде тұратын уақыты"
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Параққа сы_йдыру"
 
-#: ui/shotwell.ui:23
-msgid "_Name of search:"
-msgstr "Ізд_еудің аты:"
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "Үлкейту - _100%"
 
-#: ui/shotwell.ui:81
-msgid "_Match"
-msgstr "_Сәйкес"
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "Үлкейту - _200%"
 
-#: ui/shotwell.ui:108
-msgid "of the following:"
-msgstr "келесінің:"
+#: ui/direct.ui:98 ui/photo.ui:187
+msgid "_Photo"
+msgstr "_Фото"
+
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "Ал_дыңғы фото"
+
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "К_елесі фото"
+
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "Са_ймандар"
+
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188
+#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "_Жиі қойылатын сұрақтар"
+
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192
+#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr "Мә_селе жөнінде хабарлау…"
+
+#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
+#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
+msgid "_Import from Folder…"
+msgstr "Бумадан _импорттау…"
+
+#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
+#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
+#: ui/trash.ui:13
+msgid "Import From _Application…"
+msgstr "Қолд_анбадан импорттау…"
+
+#: ui/events_directory.ui:19 ui/event.ui:34 ui/import_queue.ui:25
+#: ui/import.ui:27 ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 ui/tags.ui:34
+#: ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242
+msgid "Empty T_rash"
+msgstr "Қоқ_ыс шелегін тазарту"
+
+#: ui/events_directory.ui:47 ui/event.ui:62 ui/import.ui:55 ui/media.ui:62
+#: ui/offline.ui:47 ui/tags.ui:62 ui/trash.ui:52
+msgid "_Find"
+msgstr "Т_абу"
+
+#: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51
+#: ui/photo.ui:70 ui/search_sidebar_context.ui:6
+#: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56
+msgid "Ne_w Saved Search…"
+msgstr "Ж_аңа сақталған іздеу…"
+
+#: ui/events_directory.ui:74 ui/event.ui:102 ui/import_queue.ui:41
+#: ui/import.ui:77 ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98
+#: ui/tags.ui:102 ui/trash.ui:90
+msgid "_Basic Information"
+msgstr "Не_гізгі ақпарат"
+
+#: ui/events_directory.ui:79 ui/event.ui:107 ui/import.ui:82 ui/media.ui:107
+#: ui/offline.ui:86 ui/photo.ui:103 ui/tags.ui:107 ui/trash.ui:95
+msgid "E_xtended Information"
+msgstr "Кеңе_йтілген ақпарат"
+
+#: ui/events_directory.ui:84 ui/event.ui:112 ui/import.ui:87 ui/media.ui:112
+#: ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100
+msgid "_Search Bar"
+msgstr "Ізд_еу өрісі"
+
+#: ui/events_directory.ui:89 ui/event.ui:117 ui/import.ui:92 ui/media.ui:117
+#: ui/offline.ui:96 ui/photo.ui:108 ui/tags.ui:117 ui/trash.ui:105
+msgid "S_idebar"
+msgstr "Бү_йір панелі"
+
+#: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122
+#: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110
+msgid "T_oolbar"
+msgstr "Саймандар _панелі"
+
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Пікірлер"
+
+#: ui/events_directory.ui:108 ui/event.ui:243 ui/import_queue.ui:48
+#: ui/import.ui:166 ui/media.ui:243 ui/offline.ui:163 ui/photo.ui:127
+#: ui/tags.ui:243 ui/trash.ui:172
+msgid "Sort _Events"
+msgstr "Оқ_иғаларды сұрыптау"
+
+#: ui/events_directory.ui:111 ui/event.ui:231 ui/event.ui:246
+#: ui/import_queue.ui:51 ui/import.ui:169 ui/media.ui:231 ui/media.ui:246
+#: ui/offline.ui:166 ui/photo.ui:130 ui/tags.ui:231 ui/tags.ui:246
+#: ui/trash.ui:175
+msgid "_Ascending"
+msgstr "Өс_у ретімен"
+
+#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56
+#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180
+msgid "D_escending"
+msgstr "К_ему ретімен"
+
+#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
+msgid "Even_ts"
+msgstr "Оқ_иғалар"
+
+#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
+#: ui/photo.ui:77 ui/tags.ui:74
+msgid "R_emove from Library"
+msgstr "Ж_инақтан өшіру"
+
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Атаулар"
+
+#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385
+#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385
+msgid "Ta_gs"
+msgstr "Те_гтер"
+
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Фот_оларды сұрыптау"
+
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "А_тауы бойынша"
+
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "_Файл аты бойынша"
+
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "Түсірілген _күні бойынша"
 
-#: ui/shotwell.ui:195
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Ре_йтингі бойынша"
+
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr "Ке_му ретімен"
+
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
+msgid "_Photos"
+msgstr "Фо_толар"
+
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "_Импортты тоқтату"
+
+#: ui/printing_widget.ui:19
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Басылып шығарылатын сурет өлшемі</b>"
 
-#: ui/shotwell.ui:212
+#: ui/printing_widget.ui:36
 msgid "Use a _standard size:"
 msgstr "Қалы_пты өлшемді қолдану:"
 
-#: ui/shotwell.ui:255
+#: ui/printing_widget.ui:80
 msgid "Use a c_ustom size:"
 msgstr "Таңдау_ыңызша өлшемді қолдану:"
 
-#: ui/shotwell.ui:345
+#. 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 "_Фото жақтарының қатынасын сақтау"
 
-#: ui/shotwell.ui:369
+#: ui/printing_widget.ui:197
 msgid "_Autosize:"
 msgstr "_Автоөлшем:"
 
-#: ui/shotwell.ui:409
+#: ui/printing_widget.ui:237
 msgid "<b>Titles</b>"
 msgstr "<b>Атаулар</b>"
 
-#: ui/shotwell.ui:426
+#: ui/printing_widget.ui:254
 msgid "Print image _title"
 msgstr "Сурет ат_ауын да баспаға шығару"
 
-#: ui/shotwell.ui:470
+#: ui/printing_widget.ui:297
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Пиксель шешімділігі</b>"
 
-#: ui/shotwell.ui:490
+#: ui/printing_widget.ui:317
 msgid "_Output photo at:"
 msgstr "Фото_ны қайда сақтау:"
 
-#: ui/shotwell.ui:525
+#: ui/printing_widget.ui:351
 msgid "pixels per inch"
 msgstr "дюймге пиксель"
 
-#: ui/shotwell.ui:559
-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: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/shotwell.ui:681
-msgid "Shotwell Preferences"
-msgstr "Shotwell баптаулары"
+#: ui/set_background_slideshow_dialog.ui:116
+msgid "How long each photo is shown on the desktop background"
+msgstr "Әр фото жұмыс үстелдің түсқағазы ретінде тұратын уақыты"
 
-#: ui/shotwell.ui:730
+#: ui/shotwell.ui:65
 msgid "white"
 msgstr "ақ"
 
-#: ui/shotwell.ui:757
+#: ui/shotwell.ui:92
 msgid "black"
 msgstr "қара"
 
-#: ui/shotwell.ui:805
-msgid "_Watch library directory for new files"
-msgstr "Жинақ бу_масын жаңа файлдарға бақылау"
-
-#: ui/shotwell.ui:834
-msgid "Metadata"
-msgstr "Метаақпарат"
-
-#: ui/shotwell.ui:854
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Фото файлдарына тег, атау және басқа ме_таақпаратты жазу"
-
-#: ui/shotwell.ui:880
+#: ui/shotwell.ui:123
 msgid "Display"
 msgstr "Көрсету"
 
-#: ui/shotwell.ui:901
+#: ui/shotwell.ui:160
+msgid "_Background:"
+msgstr "_Фон:"
+
+#: ui/shotwell.ui:175
 msgid "_Import photos to:"
 msgstr "Фотоларды қа_йда импорттау:"
 
-#: ui/shotwell.ui:924
-msgid "_Background:"
-msgstr "_Фон:"
+#: ui/shotwell.ui:186
+msgid "_Watch library directory for new files"
+msgstr "Жинақ бу_масын жаңа файлдарға бақылау"
 
-#: ui/shotwell.ui:947
+#: ui/shotwell.ui:209
 msgid "Importing"
 msgstr "Импорттау"
 
-#: ui/shotwell.ui:970
+#: ui/shotwell.ui:226
 msgid "_Directory structure:"
 msgstr "Бу_ма құрылысы:"
 
-#: ui/shotwell.ui:1009
-msgid "_Pattern:"
-msgstr "_Шаблон:"
-
-#: ui/shotwell.ui:1091
+#: ui/shotwell.ui:240
 msgid "Example:"
 msgstr "Мысалы:"
 
-#: ui/shotwell.ui:1108
+#: ui/shotwell.ui:249
 msgid "R_ename imported files to lowercase"
 msgstr "Имп_ортталатын файлдар аттарын төменгі регистрге келтіру"
 
-#: ui/shotwell.ui:1137
+#: ui/shotwell.ui:271
+msgid "Metadata"
+msgstr "Метаақпарат"
+
+#: ui/shotwell.ui:284
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Фото файлдарына тег, атау және басқа ме_таақпаратты жазу"
+
+#: ui/shotwell.ui:306
 msgid "RAW Developer"
 msgstr "RAW өндіруші"
 
-#: ui/shotwell.ui:1172
+#: ui/shotwell.ui:323
 msgid "De_fault:"
 msgstr "Ба_стапқы:"
 
-#: ui/shotwell.ui:1226
+#: ui/shotwell.ui:377
+msgid "_Pattern:"
+msgstr "_Шаблон:"
+
+#: ui/shotwell.ui:439
 msgid "E_xternal photo editor:"
 msgstr "С_ыртқы фото түзетушісі:"
 
-#: ui/shotwell.ui:1242
+#: ui/shotwell.ui:456
 msgid "External _RAW editor:"
 msgstr "С_ыртқы RAW түзетушісі:"
 
-#: ui/shotwell.ui:1307
+#: ui/shotwell.ui:517
 msgid "External Editors"
 msgstr "Сыртқы түзетушілер"
 
-#: ui/shotwell.ui:1334
+#: ui/shotwell.ui:542
 msgid "Plugins"
 msgstr "Плагиндер"
 
-#: ui/shotwell.ui:1400
+#: ui/shotwell.ui:590
+msgid "_Name of search:"
+msgstr "Ізд_еудің аты:"
+
+#: ui/shotwell.ui:644
+msgid "_Match"
+msgstr "_Сәйкес"
+
+#: ui/shotwell.ui:671
+msgid "of the following:"
+msgstr "келесінің:"
+
+#: ui/shotwell.ui:752
+msgid "label"
+msgstr "белгі"
+
+#: ui/shotwell.ui:903
 msgid "_Delay:"
 msgstr "_Аралық:"
 
-#: ui/shotwell.ui:1416
+#: ui/shotwell.ui:917
 msgid "_Transition effect:"
 msgstr "Алма_су эффекті:"
 
-#: ui/shotwell.ui:1432
+#: ui/shotwell.ui:931
 msgid "Transition d_elay:"
 msgstr "Алмасу ара_лығы:"
 
-#: ui/shotwell.ui:1444
+#: ui/shotwell.ui:941
 msgid "Show t_itle"
 msgstr "А_тауын көрсету"
 
-#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
+#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
 msgid "seconds"
 msgstr "секунд"
 
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Жаңа _тег…"
+
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Қоқыс шелегінен барлық фотоларды өшіру"
+
+#~ msgid "Testing connection to Facebook…"
+#~ msgstr "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 ""
+#~ "Сіз осы сессия кезінде Flickr ішіне кіріп және шығып үлгердіңіз.\n"
+#~ "Flickr ішіне жариялауды жалғастыру үшін, Shotwell қайта қосыңыз, одан "
+#~ "кейін жариялап көріңіз."
+
+#~ msgid "L_ist album in public gallery"
+#~ msgstr "Ор_тақ галереясындағы альбомдар тізімі"
+
+#~ msgid "Videos will appear in “%s”"
+#~ msgstr "Видеолар \"%s\" ішіне жарияланады"
+
+#~ msgid "_Contents"
+#~ msgstr "Құра_масы"
+
+#~ msgid "Display the title of each photo"
+#~ msgstr "Әр фотоның атауын көрсету"
+
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "Таңдалған фотоларды жинағыңызға импорттау"
+
+#~ msgid "Import all the photos into your library"
+#~ msgstr "Барлық фотоларды жинағыңызға импорттау"
+
+#~ msgid "Play a slideshow"
+#~ msgstr "Слайдшоуды ойнату"
+
+#~ msgid "_Modify original photo files"
+#~ msgstr "Түпнұсқа фотосурет файлдарын тү_зету"
+
+#~ msgid "_Modify original files"
+#~ msgstr "Баста_пқы файлдарды түзету"
+
+#~ msgid "Save photo"
+#~ msgstr "Фотоны сақтау"
+
+#~ msgid "Save photo with a different name"
+#~ msgstr "Фотоны басқа атауымен сақтау"
+
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr "Фотоны компьютеріңізге жалғанған принтерден басып шығару"
+
+#~ msgid "Previous Photo"
+#~ msgstr "Алдыңғы фото"
+
+#~ msgid "Next Photo"
+#~ msgstr "Келесі фото"
+
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "Фотоны үлкейту"
+
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "Фотоны кішірейту"
+
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "Фотоны экранды толығымен алатындай етіп келтіру"
+
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "Фотосуретті өлшемнің 100 дейін өзгерту"
+
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "Фотосуретті өлшемнің 200 дейін өзгерту"
+
+#~ msgid "Display the comment of each event"
+#~ msgstr "Әр оқиғаның түсіндірмесін көрсету"
+
+#~ msgid "Stop importing photos"
+#~ msgstr "Фотолар импортын тоқтату"
+
+#~ msgid "Import photos from disk to library"
+#~ msgstr "Фотоларды дисктен жинаққа импорттау"
+
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "Фото мен видеоларды іздеу шартына сәйкес табу"
+
+#~ msgid "Display basic information for the selection"
+#~ msgstr "Таңдалғаны үшін негізгі ақпаратты көрсету"
+
+#~ msgid "Display extended information for the selection"
+#~ msgstr "Таңдалғаны үшін кеңейтілген ақпаратты көрсету"
+
+#~ msgid "Display the search bar"
+#~ msgstr "Іздеу өрісін көрсету"
+
+#~ msgid "Display the sidebar"
+#~ msgstr "Бүйір панелін көрсету"
+
+#, fuzzy
+#~| msgid "Display the sidebar"
+#~ msgid "Display the tool bar"
+#~ msgstr "Бүйір панелін көрсету"
+
+#~ msgid "Sort photos in an ascending order"
+#~ msgstr "Фотоларды өсу ретімен сұрыптау"
+
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "Фотоларды кему ретімен сұрыптау"
+
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "Кіші көріністерді үлкейту"
+
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "Кіші көріністерді кішірейту"
+
+#~ msgid "_Play Video"
+#~ msgstr "Видеоны о_йнату"
+
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr "Таңдалған видеоларды жүйелік видео плеерінде ашу"
+
+#~ msgid "Display the comment of each photo"
+#~ msgstr "Әр фотоның түсіндірмесін көрсету"
+
+#, fuzzy
+#~| msgid "Display each photo's tags"
+#~ msgid "Display each photo’s tags"
+#~ msgstr "Әр фотоның тегтерін көрсету"
+
+#~ msgid "Sort photos by title"
+#~ msgstr "Фотоларды атаулары бойынша сұрыптау"
+
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "Фотоларды түсірілген күні бойынша сұрыптау"
+
+#~ msgid "Sort photos by rating"
+#~ msgstr "Фотоларды рейтингі бойынша сұрыптау"
+
+#~ msgid "Sort photos by filename"
+#~ msgstr "Фотоларды файл аты бойынша сұрыптау"
+
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "Таңдалған видеолар сәтті жарияланды."
+
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "Таңдалған фотолар сәтті жарияланды."
+
+#, fuzzy
+#~| msgid "Tag Photos as \"%s\""
+#~ msgid "Tag Photos as “%s”"
+#~ msgstr "Фотоларға \"%s\" тегін орнату"
+
+#, fuzzy
+#~| msgid "Tag the selected photos as \"%s\""
+#~ msgid "Tag the selected photos as “%s”"
+#~ msgstr "Таңдалған фотоларға \"%s\" тегін орнату"
+
+#, fuzzy
+#~| msgid "Remove Tag \"%s\" From _Photos"
+#~ msgid "Remove Tag “%s” From _Photos"
+#~ msgstr "Фо_толардан \"%s\" тегін өшіру"
+
+#, fuzzy
+#~| msgid "Remove Tag \"%s\" From Photos"
+#~ msgid "Remove Tag “%s” From Photos"
+#~ msgstr "Фотолардан \"%s\" тегін өшіру"
+
+#~ msgid "RAW photos"
+#~ msgstr "RAW фотосуреттері"
+
+#~ msgid "Shotwell Preferences"
+#~ msgstr "Shotwell баптаулары"
+
 #~ msgid "Login"
 #~ msgstr "Кіру"
 
diff --git a/po/pl.gmo b/po/pl.gmo
index 43e76dc..2354bd0 100644
--- a/po/pl.gmo
+++ b/po/pl.gmo
diff --git a/po/pl.po b/po/pl.po
index 478b19b..8176349 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,10 +9,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell\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-01-18 21:34+0000\n"
-"PO-Revision-Date: 2017-01-18 21:35+0100\n"
+"POT-Creation-Date: 2017-03-13 18:10+0000\n"
+"PO-Revision-Date: 2017-03-14 13:43+0100\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <community-poland@mozilla.org>\n"
 "Language: pl\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354
+#: 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
 msgid "Shotwell"
@@ -1306,7 +1306,6 @@ msgstr ""
 "slajdów jest włączona"
 
 #: misc/org.yorba.shotwell.gschema.xml:774
-#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow slide transition"
 msgstr "włączenie przejścia osunięcia pokazu slajdów"
 
@@ -1329,7 +1328,6 @@ msgstr ""
 "slajdów jest włączona"
 
 #: misc/org.yorba.shotwell.gschema.xml:786
-#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow circle transition"
 msgstr "włączenie przejścia okręgu pokazu slajdów"
 
@@ -1340,6 +1338,10 @@ 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
+msgid "enable slideshow circles transition"
+msgstr "włączenie przejścia okręgów pokazu slajdów"
+
 #: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
@@ -1347,6 +1349,10 @@ 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
+msgid "enable slideshow blinds transition"
+msgstr "włączenie przejścia żaluzji pokazu slajdów"
+
 #: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
@@ -1388,11 +1394,129 @@ msgstr ""
 "Jeśli jest ustawione na wartość „true”, wtyczka przejścia szachownicy pokazu "
 "slajdów jest włączona"
 
+#: 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 ""
+"Nie zalogowano w serwisie Facebook.\n"
+"\n"
+"Jeśli użytkownik nie ma jeszcze konta w serwisie Facebook, można je utworzyć "
+"podczas procesu logowania. Podczas logowania Shotwell Connect może zapytać "
+"o pozwolenie na wysyłanie zdjęć i publikowanie ich w kanale użytkownika. To "
+"pozwolenie jest wymagane, aby Shotwell Connect mogło działać."
+
+#: 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 ""
+"Już zalogowano się i wylogowano z serwisu Facebook podczas tej sesji "
+"programu Shotwell.\n"
+"Aby kontynuować publikowanie do serwisu Facebook, należy zakończyć "
+"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
+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 ""
+"Nie zalogowano w serwisie Flickr.\n"
+"\n"
+"Należy nacisnąć przycisk Zaloguj, aby zalogować się w serwisie Flickr "
+"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
+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:481
+msgid "Verifying authorization…"
+msgstr "Sprawdzanie upoważnienia…"
+
+#: 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 ""
+"Już zalogowano się i wylogowano z serwisów Google podczas tej sesji programu "
+"Shotwell.\n"
+"\n"
+"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
+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 ""
+"Obecnie nie zalogowano w serwisie Picasa Web Albums.\n"
+"\n"
+"Należy kliknąć przycisk Zaloguj, aby zalogować w serwisie Picasa Web Albums "
+"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
+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 ""
+"Nie zalogowano w serwisie YouTube.\n"
+"\n"
+"Aby kontynuować używanie serwisu YouTube, należy się zalogować do konta "
+"Google i ustawić je do używania serwisu YouTube. Większość kont można "
+"ustawić za pomocą przeglądarki WWW do zalogowania się do serwisu YouTube co "
+"najmniej raz."
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Witryna programu Shotwell"
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:603
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:602
 msgid "translator-credits"
 msgstr ""
 "verayin <vera@yorba.org>, 2011\n"
@@ -1460,20 +1584,6 @@ msgstr ""
 msgid "A temporary file needed for publishing is unavailable"
 msgstr "Plik tymczasowy wymagany do publikacji jest niedostępny"
 
-#: 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 ""
-"Już zalogowano się i wylogowano z serwisów Google podczas tej sesji programu "
-"Shotwell.\n"
-"\n"
-"Aby kontynuować publikowanie do serwisów Google, należy zakończyć i ponownie "
-"uruchomić program Shotwell, a następnie ponownie spróbować publikacji."
-
 #: plugins/shotwell-data-imports/FSpotImporter.vala:36
 #: plugins/shotwell-publishing/FacebookPublishing.vala:33
 #: plugins/shotwell-publishing/FlickrPublishing.vala:33
@@ -1587,7 +1697,7 @@ msgid "Go _Back"
 msgstr "_Wstecz"
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1464
+#: ui/shotwell.ui:1105
 msgid "_Log in"
 msgstr "Za_loguj"
 
@@ -1622,7 +1732,7 @@ msgid "pixels"
 msgstr "piksele"
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:880
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1640,7 +1750,7 @@ msgstr "Szerokość lub wysokość"
 #: 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/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr "_Wyloguj"
@@ -1652,9 +1762,9 @@ msgstr "_Wyloguj"
 #: 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/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 "Opu_blikuj"
 
@@ -1777,13 +1887,11 @@ msgstr "Zaloguj"
 
 #: 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 "Istni_ejącym albumie:"
 
 #: 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 "_Nowym albumie o nazwie:"
 
@@ -1825,12 +1933,12 @@ msgid "You are logged into Rajce as %s."
 msgstr "Zalogowano w serwisie Rajce jako użytkownik %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 "Zdjęcia pojawią się w:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
 msgid "Shotwell Extra Publishing Services"
 msgstr "Dodatkowe usługi publikowania programu Shotwell"
 
@@ -1848,13 +1956,13 @@ 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/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:1206
+#: plugins/shotwell-publishing/FlickrPublishing.vala:877
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr "1024×768 pikseli"
@@ -1923,12 +2031,12 @@ msgid "Public"
 msgstr "Publiczne"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1144
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
 msgid "Friends"
 msgstr "Przyjaciele"
 
 #: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
 msgid "Private"
 msgstr "Prywatne"
 
@@ -1957,7 +2065,7 @@ msgid "Create a _new album named:"
 msgstr "Utworzenie _nowego albumu o nazwie:"
 
 #: 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 "_Rozmiar wysyłania:"
 
@@ -1967,7 +2075,7 @@ msgstr "Nagrania wideo i nowe albumy zdjęć _widoczne dla:"
 
 #: 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"
@@ -1975,59 +2083,25 @@ msgstr ""
 "_Usunięcie położenia, aparatu i innych informacji identyfikacyjnych przed "
 "wysłaniem"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr "Połączenie programu 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 ""
-"Nie zalogowano w serwisie Facebook.\n"
-"\n"
-"Jeśli użytkownik nie ma jeszcze konta w serwisie Facebook, można je utworzyć "
-"podczas procesu logowania. Podczas logowania Shotwell Connect może zapytać "
-"o pozwolenie na wysyłanie zdjęć i publikowanie ich w kanale użytkownika. To "
-"pozwolenie jest wymagane, aby Shotwell Connect mogło działać."
-
-#: 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 ""
-"Już zalogowano się i wylogowano z serwisu Facebook podczas tej sesji "
-"programu Shotwell.\n"
-"Aby kontynuować publikowanie do serwisu Facebook, należy zakończyć "
-"i ponownie uruchomić program Shotwell, a następnie ponownie spróbować "
-"publikacji."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:87
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Standardowe (720 pikseli)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Duże (2048 pikseli)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook…"
-msgstr "Testowanie połączenia z serwisem Facebook…"
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
 msgid "Creating album…"
 msgstr "Tworzenie albumu…"
 
-#: 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."
@@ -2035,7 +2109,7 @@ msgstr ""
 "Plik wymagany do publikowania jest niedostępny. Nie można kontynuować "
 "publikowania do serwisu Facebook."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:982
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -2044,79 +2118,22 @@ msgstr ""
 "Zalogowano w serwisie Facebook jako użytkownik %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 "Gdzie opublikować wybrane zdjęcia?"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1143
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1187
+#: plugins/shotwell-publishing/FacebookPublishing.vala:887
+#: plugins/shotwell-publishing/FlickrPublishing.vala:858
 msgid "Just me"
 msgstr "Tylko dla mnie"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1145
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1183
+#: plugins/shotwell-publishing/FacebookPublishing.vala:889
+#: plugins/shotwell-publishing/FlickrPublishing.vala:854
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1290
 msgid "Everyone"
 msgstr "Wszystkich"
 
-#: 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 ""
-"Proszę podać numer potwierdzenia pojawiający się po zalogowaniu do serwisu "
-"Flickr w przeglądarce WWW."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Numer upoważnienia:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:70 src/Dialogs.vala:128
-msgid "Con_tinue"
-msgstr "Ko_ntynuuj"
-
-#: 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 ""
-"Nie zalogowano w serwisie Flickr.\n"
-"\n"
-"Należy nacisnąć przycisk Zaloguj, aby zalogować się w serwisie Flickr "
-"w przeglądarce WWW. Następnie należy upoważnić Shotwell Connect na "
-"dowiązanie do konta serwisu 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 ""
-"Już zalogowano się i wylogowano z serwisu Flickr podczas tej sesji programu "
-"Shotwell.\n"
-"Aby kontynuować publikowanie do serwisu Flickr, należy zakończyć i ponownie "
-"uruchomić program Shotwell, a następnie ponownie spróbować publikacji."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login…"
-msgstr "Przygotowywanie do zalogowania…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:434
-#: plugins/shotwell-publishing/FlickrPublishing.vala:571
-msgid ""
-"A file required for publishing is unavailable. Publishing to Flickr can’t "
-"continue."
-msgstr ""
-"Plik wymagany do publikowania jest niedostępny. Nie można kontynuować "
-"publikowania do serwisu Flickr."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:447
-msgid "Verifying authorization…"
-msgstr "Sprawdzanie upoważnienia…"
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2125,7 +2142,7 @@ msgstr ""
 "Zalogowano w serwisie Flickr jako użytkownik %s.\n"
 "\n"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
+#: plugins/shotwell-publishing/FlickrPublishing.vala:802
 #, c-format
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
@@ -2135,66 +2152,57 @@ msgstr ""
 "miesiąc.\n"
 "W tym miesiącu pozostało %s."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Konto Flickr Pro umożliwia nieograniczone wysyłanie."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1138
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "Zdjęcia _widoczne dla:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "Nagrania wideo _widoczne dla:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr "Zdjęcia i nagrania wideo _widoczne dla:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "Tylko przyjaciół i rodziny"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "Tylko rodzina"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "Tylko przyjaciele"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr "2048×1536 pikseli"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr "4096×3072 piksele"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:103
-msgid "L_ist album in public gallery"
-msgstr "Wyśw_ietlenie listy albumów w publicznej galerii"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:137
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
 msgid "Photo _size preset:"
 msgstr "Rozmiar _zdjęcia:"
 
-#: 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 ""
-"Obecnie nie zalogowano w serwisie Picasa Web Albums.\n"
-"\n"
-"Należy kliknąć przycisk Zaloguj, aby zalogować w serwisie Picasa Web Albums "
-"w przeglądarce WWW. Należy upoważnić program Shotwell Connect do powiązania "
-"z kontem serwisu 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 "Domyślny album"
 
-#: 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."
@@ -2203,32 +2211,32 @@ msgstr ""
 "publikowania do serwisu 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 "Zalogowano w serwisie Picasa Web Albums jako użytkownik %s."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Nagrania wideo pojawią się w:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
 msgstr "Małe (640×480 pikseli)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
 msgstr "Średnie (1024×768 pikseli)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr "Zalecane (1600×1200 pikseli)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
 msgid "Google+ (2048 × 1536 pixels)"
 msgstr "Google+ (2048×1536 pikseli)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
 #: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Oryginalny rozmiar"
@@ -2369,7 +2377,7 @@ msgstr "Wyświetl certyfikat…"
 msgid "I understand, please _proceed."
 msgstr "_Rozumiem, proszę kontynuować."
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/shotwell-publishing.vala:55
 msgid "Core Publishing Services"
 msgstr "Główne usługi publikowania"
 
@@ -2377,22 +2385,7 @@ msgstr "Główne usługi publikowania"
 msgid "Video privacy _setting:"
 msgstr "U_stawienia prywatności nagrań wideo:"
 
-#: 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 ""
-"Nie zalogowano w serwisie YouTube.\n"
-"\n"
-"Aby kontynuować używanie serwisu YouTube, należy się zalogować do konta "
-"Google i ustawić je do używania serwisu YouTube. Większość kont można "
-"ustawić za pomocą przeglądarki WWW do zalogowania się do serwisu YouTube co "
-"najmniej raz."
-
-#: 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."
@@ -2400,21 +2393,16 @@ msgstr ""
 "Plik wymagany do publikowania jest niedostępny. Nie można kontynuować "
 "publikowania do serwisu YouTube."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Zalogowano w serwisie YouTube jako użytkownik %s."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-msgid "Videos will appear in “%s”"
-msgstr "Nagrania wideo pojawią się w „%s”"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
 msgstr "Wyświetlane publicznie"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
 msgstr "Nie wyświetlane publicznie"
 
@@ -2517,7 +2505,7 @@ msgstr "Przypina pasek narzędziowy"
 msgid "Leave fullscreen"
 msgstr "Opuszcza pełny ekran"
 
-#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570
+#: 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
@@ -2526,7 +2514,7 @@ msgstr "Opuszcza pełny ekran"
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/AppWindow.vala:580
+#: src/AppWindow.vala:579
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2539,21 +2527,21 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/AppWindow.vala:600
+#: src/AppWindow.vala:599
 msgid "Visit the Shotwell web site"
 msgstr "Witryna programu Shotwell"
 
-#: src/AppWindow.vala:612
+#: src/AppWindow.vala:611
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Nie można wyświetlić pomocy: %s"
 
-#: src/AppWindow.vala:620
+#: src/AppWindow.vala:619
 #, 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:628
+#: src/AppWindow.vala:627
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Nie można wyświetlić dokumentu FAQ: %s"
@@ -2624,7 +2612,7 @@ msgid "Cameras"
 msgstr "Aparaty"
 
 #: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:303
+#: 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
 msgid "Camera"
@@ -2779,127 +2767,127 @@ msgstr[0] ""
 msgstr[1] "Nie można usunąć %d zdjęć/nagrań wideo z aparatu z powodu błędów."
 msgstr[2] "Nie można usunąć %d zdjęć/nagrań wideo z aparatu z powodu błędów."
 
-#: src/CollectionPage.vala: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:170
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: 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
 msgid "Send _To…"
 msgstr "Wyślij _do…"
 
-#: 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:220
 msgid "Set as _Desktop Background"
 msgstr "Ustaw jako tło p_ulpitu"
 
-#: src/CollectionPage.vala:86 src/Resources.vala:286
+#: src/CollectionPage.vala:92 src/Resources.vala:286
 msgid "_Duplicate"
 msgstr "Utwórz _kopię"
 
-#: src/CollectionPage.vala:94
+#: src/CollectionPage.vala:100
 msgid "Fullscreen"
 msgstr "Pełny ekran"
 
-#: src/CollectionPage.vala:96 ui/photo.ui:180
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "Pokaz s_lajdów"
 
-#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: src/CollectionPage.vala:110 src/Resources.vala:139 ui/direct.ui:111
 #: ui/photo.ui:200
 msgid "Rotate _Right"
 msgstr "Obróć w p_rawo"
 
-#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: src/CollectionPage.vala:113 src/Resources.vala:144 ui/direct.ui:116
 #: ui/photo.ui:205
 msgid "Rotate _Left"
 msgstr "Obróć w _lewo"
 
-#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: src/CollectionPage.vala:116 src/Resources.vala:149 ui/direct.ui:121
 #: ui/photo.ui:210
 msgid "Flip Hori_zontally"
 msgstr "Odwróć po_ziomo"
 
-#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: src/CollectionPage.vala:117 src/Resources.vala:152 ui/direct.ui:125
 #: ui/photo.ui:214
 msgid "Flip Verti_cally"
 msgstr "Odwróć pi_onowo"
 
-#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
+#: 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
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr "_Uwydatnij"
 
-#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: 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
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr "Przy_wróć oryginalne"
 
-#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+#: src/CollectionPage.vala:122 src/Resources.vala:190 ui/photo.ui:256
 msgid "_Copy Color Adjustments"
 msgstr "S_kopiuj dostosowania kolorów"
 
-#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+#: src/CollectionPage.vala:125 src/Resources.vala:194 ui/photo.ui:261
 msgid "_Paste Color Adjustments"
 msgstr "_Wklej dostosowania kolorów"
 
-#: src/CollectionPage.vala:129
+#: src/CollectionPage.vala:135
 msgid "Adjust Date and Time…"
 msgstr "Dostosuj datę i czas…"
 
-#: src/CollectionPage.vala:137 src/Resources.vala:319
+#: src/CollectionPage.vala:143 src/Resources.vala:319
 msgid "Open With E_xternal Editor"
 msgstr "_Otwórz za pomocą zewnętrznego edytora"
 
-#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: 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
 msgid "Open With RA_W Editor"
 msgstr "Otwórz za pomocą edytora plików _RAW"
 
-#: src/CollectionPage.vala:143 src/Resources.vala:167
+#: src/CollectionPage.vala:149 src/Resources.vala:167
 msgid "_Play"
 msgstr "Od_twórz"
 
-#: src/CollectionPage.vala:409
+#: src/CollectionPage.vala:415
 msgid "Export Photo/Video"
 msgstr "Eksport zdjęcia/nagrania wideo"
 
-#: src/CollectionPage.vala:409
+#: src/CollectionPage.vala:415
 msgid "Export Photos/Videos"
 msgstr "Eksport zdjęć/nagrań wideo"
 
-#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994
+#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
 msgstr "Eksport zdjęcia"
 
-#: src/CollectionPage.vala:411 src/Dialogs.vala:84
+#: src/CollectionPage.vala:417 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Eksport zdjęć"
 
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Rotating"
 msgstr "Obracanie"
 
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Undoing Rotate"
 msgstr "Cofanie obrotu"
 
-#: src/CollectionPage.vala:523
+#: src/CollectionPage.vala:529
 msgid "Flipping Horizontally"
 msgstr "Odwracanie poziome"
 
-#: src/CollectionPage.vala:524
+#: src/CollectionPage.vala:530
 msgid "Undoing Flip Horizontally"
 msgstr "Cofanie odwrócenia poziomego"
 
-#: src/CollectionPage.vala:533
+#: src/CollectionPage.vala:539
 msgid "Flipping Vertically"
 msgstr "Odwracanie pionowe"
 
-#: src/CollectionPage.vala:534
+#: src/CollectionPage.vala:540
 msgid "Undoing Flip Vertically"
 msgstr "Cofanie odwrócenia pionowego"
 
@@ -4089,11 +4077,11 @@ msgstr "_Zaimportowanie"
 msgid "Import to Library"
 msgstr "Zaimportuj do kolekcji"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Usuń z kolekcji"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Usuwanie zdjęcia z kolekcji"
 
@@ -4239,29 +4227,29 @@ msgstr ""
 msgid "Unable open photo %s. Sorry."
 msgstr "Nie można otworzyć zdjęcia %s."
 
-#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:175 ui/direct.ui:8
 msgid "_Save"
 msgstr "Zapi_sz"
 
-#: src/direct/DirectPhotoPage.vala:304
+#: src/direct/DirectPhotoPage.vala:316
 msgid "_Save a Copy"
 msgstr "Zapi_sz kopię"
 
-#: src/direct/DirectPhotoPage.vala:307
+#: src/direct/DirectPhotoPage.vala:319
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Utracić zmiany w %s?"
 
-#: src/direct/DirectPhotoPage.vala:308
+#: src/direct/DirectPhotoPage.vala:320
 msgid "Close _without Saving"
 msgstr "Zamknij _bez zapisywania"
 
-#: src/direct/DirectPhotoPage.vala:341
+#: src/direct/DirectPhotoPage.vala:353
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Błąd podczas zapisywania zdjęcia do %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 "Zapisz jako"
 
@@ -4310,23 +4298,23 @@ msgstr "Plik wideo SD (4∶3)"
 msgid "HD Video (16 ∶ 9)"
 msgstr "Plik wideo HD (16∶9)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:789
 msgid "Wallet (2 × 3 in.)"
 msgstr "Portfel (2×3 cale)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:792
 msgid "Notecard (3 × 5 in.)"
 msgstr "Notatka (3×5 cali)"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:795
 msgid "4 × 6 in."
 msgstr "4×6 cali"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:798
 msgid "5 × 7 in."
 msgstr "5×7 cali"
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:801
 msgid "8 × 10 in."
 msgstr "8×10 cali"
 
@@ -4334,7 +4322,7 @@ msgstr "8×10 cali"
 msgid "Letter (8.5 × 11 in.)"
 msgstr "Letter (8,5×11 cali)"
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:804
 msgid "11 × 14 in."
 msgstr "11×14 cali"
 
@@ -4342,23 +4330,23 @@ msgstr "11×14 cali"
 msgid "Tabloid (11 × 17 in.)"
 msgstr "Tabloid (11×17 cali)"
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:807
 msgid "16 × 20 in."
 msgstr "16×20 cali"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:813
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr "Portfel metryczny (9×13 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:816
 msgid "Postcard (10 × 15 cm)"
 msgstr "Kartka pocztowa (10×15 cm)"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:819
 msgid "13 × 18 cm"
 msgstr "13×18 cm"
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:822
 msgid "18 × 24 cm"
 msgstr "18×24 cm"
 
@@ -4366,15 +4354,15 @@ msgstr "18×24 cm"
 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:777 src/Printing.vala:825
 msgid "20 × 30 cm"
 msgstr "20×30 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:828
 msgid "24 × 40 cm"
 msgstr "24×40 cm"
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:831
 msgid "30 × 40 cm"
 msgstr "30×40 cm"
 
@@ -4729,32 +4717,32 @@ msgstr ""
 msgid "Loading Shotwell"
 msgstr "Wczytywanie programu Shotwell"
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "Path to Shotwell’s private data"
 msgstr "Ścieżka do prywatnych danych programu Shotwell"
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "DIRECTORY"
 msgstr "KATALOG"
 
-#: src/main.vala:298
+#: src/main.vala:297
 msgid "Do not monitor library directory at runtime for changes"
 msgstr "Bez monitorowania zmian w katalogu kolekcji podczas uruchamiania"
 
-#: src/main.vala:302
+#: src/main.vala:301
 msgid "Don’t display startup progress meter"
 msgstr "Bez wyświetlania paska postępu uruchamiania"
 
-#: src/main.vala:306
+#: src/main.vala:305
 msgid "Show the application’s version"
 msgstr "Wyświetla wersję programu"
 
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
+#: src/main.vala:342
 msgid "[FILE]"
 msgstr "[PLIK]"
 
-#: 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 ""
@@ -4779,34 +4767,34 @@ msgstr ""
 "Program Shotwell nie może odtworzyć wybranego nagrania wideo:\n"
 "%s"
 
-#: src/Page.vala:1312
+#: src/Page.vala:1318
 msgid "No photos/videos"
 msgstr "Brak zdjęć/nagrań wideo"
 
-#: src/Page.vala:1316
+#: src/Page.vala:1322
 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:2622
+#: src/Page.vala:2628
 msgid "Photos cannot be exported to this directory."
 msgstr "Nie można eksportować zdjęć do tego katalogu."
 
 #. previous button
-#: src/PhotoPage.vala:535
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Poprzednie zdjęcie"
 
 #. next button
-#: src/PhotoPage.vala:541
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Następne zdjęcie"
 
-#: src/PhotoPage.vala:1847
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Brak pliku źródłowego zdjęcia: %s"
 
-#: src/PhotoPage.vala:3014
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Nie można wyeksportować: %s: %s"
@@ -4851,7 +4839,7 @@ msgstr "RAW"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3755
 msgid "modified"
 msgstr "zmodyfikowany"
 
@@ -4883,23 +4871,15 @@ msgstr "16 obrazów na stronę"
 msgid "32 images per page"
 msgstr "32 obrazy na stronę"
 
-#: src/Printing.vala:348
-msgid "in."
-msgstr "cale"
-
-#: src/Printing.vala:349
-msgid "cm"
-msgstr "cm"
-
-#: src/Printing.vala:876
+#: src/Printing.vala:848
 msgid "Image Settings"
 msgstr "Ustawienia obrazu"
 
-#: src/Printing.vala:889
+#: src/Printing.vala:861
 msgid "Printing…"
 msgstr "Drukowanie…"
 
-#: src/Printing.vala:909 src/Printing.vala:1112
+#: src/Printing.vala:881 src/Printing.vala:1084
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -5167,7 +5147,7 @@ msgstr "_Zastosuj"
 
 #: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
 #: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
-#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
+#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
 msgid "_Edit"
 msgstr "_Edycja"
 
@@ -5185,7 +5165,7 @@ msgstr "_Pełny ekran"
 #: 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
+#: ui/tags.ui:423 ui/trash.ui:189 ui/trash.ui:192
 msgid "_Help"
 msgstr "Pomo_c"
 
@@ -5548,7 +5528,8 @@ msgstr "Utwórz kopię"
 msgid "Make a duplicate of the photo"
 msgstr "Tworzy kopię zdjęcia"
 
-#: src/Resources.vala:290
+#: src/Resources.vala:290 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
 msgid "_Export…"
 msgstr "Wy_eksportuj…"
 
@@ -5871,14 +5852,14 @@ msgstr "Zaznacza wszystkie elementy"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:739
+#: src/Resources.vala:738
 msgid "%a %b %d, %Y"
 msgstr "%a, %e %b %Y"
 
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:744
+#: src/Resources.vala:743
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%a, %e %b"
@@ -5886,7 +5867,7 @@ msgstr "%a, %e %b"
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:749
+#: src/Resources.vala:748
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%e, %Y"
@@ -5894,7 +5875,7 @@ msgstr "%e, %Y"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:754
+#: src/Resources.vala:753
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%a, %e %b"
@@ -5902,7 +5883,7 @@ msgstr "%a, %e %b"
 #. / Locale-specific calendar date format for multi-month strings,
 #. / i.e. the "Mon Apr 06, 2006" in "Tue Mar 08 to Mon Apr 06, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:759
+#: src/Resources.vala:758
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%a, %e %b %Y"
@@ -6221,7 +6202,7 @@ msgid "untitled"
 msgstr "bez nazwy"
 
 #. multiple videos
-#: src/VideoSupport.vala:507
+#: src/VideoSupport.vala:523
 msgid "Export Videos"
 msgstr "Eksport nagrań wideo"
 
@@ -6246,17 +6227,17 @@ msgstr "Wyświetl wydarze_nie dla zdjęcia"
 
 #: 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 "_Plik"
 
-#: 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 "Z_apisz jako…"
 
 #: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99
 #: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78
-#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87
+#: ui/photo.ui:95 ui/tags.ui:99 ui/trash.ui:87
 msgid "_View"
 msgstr "_Widok"
 
@@ -6272,7 +6253,7 @@ msgstr "Powiększenie _100%"
 msgid "Zoom _200%"
 msgstr "Powiększenie _200%"
 
-#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+#: ui/direct.ui:98 ui/photo.ui:187
 msgid "_Photo"
 msgstr "_Zdjęcie"
 
@@ -6377,7 +6358,6 @@ msgid "D_escending"
 msgstr "Mal_ejąco"
 
 #: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
-#: ui/top.ui:30
 msgid "Even_ts"
 msgstr "Wy_darzenia"
 
@@ -6391,7 +6371,7 @@ msgid "_Titles"
 msgstr "_Tytuły"
 
 #: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385
-#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35
+#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385
 msgid "Ta_gs"
 msgstr "_Etykiety"
 
@@ -6420,7 +6400,7 @@ msgstr "Według _oceny"
 msgid "_Descending"
 msgstr "Mal_ejąco"
 
-#: 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 "_Zdjęcia"
 
@@ -6428,6 +6408,56 @@ msgstr "_Zdjęcia"
 msgid "_Stop Import"
 msgstr "_Zatrzymaj importowanie"
 
+#: ui/printing_widget.ui:19
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Rozmiar wydrukowanego obrazu</b>"
+
+#: ui/printing_widget.ui:36
+msgid "Use a _standard size:"
+msgstr "Użycie _standardowego rozmiaru:"
+
+#: ui/printing_widget.ui:80
+msgid "Use a c_ustom size:"
+msgstr "_Użycie własnego rozmiaru:"
+
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:146
+msgid "in."
+msgstr "cale"
+
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:147
+msgid "cm"
+msgstr "cm"
+
+#: ui/printing_widget.ui:173
+msgid "_Match photo aspect ratio"
+msgstr "Utrzy_mywanie proporcji zdjęcia"
+
+#: ui/printing_widget.ui:197
+msgid "_Autosize:"
+msgstr "Rozmiar _automatyczny:"
+
+#: ui/printing_widget.ui:237
+msgid "<b>Titles</b>"
+msgstr "<b>Tytuły</b>"
+
+#: ui/printing_widget.ui:254
+msgid "Print image _title"
+msgstr "Drukowanie _tytułów obrazów"
+
+#: ui/printing_widget.ui:297
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Rozdzielczość w pikselach</b>"
+
+#: ui/printing_widget.ui:317
+msgid "_Output photo at:"
+msgstr "_Wyjście zdjęcia na:"
+
+#: ui/printing_widget.ui:351
+msgid "pixels per inch"
+msgstr "piksele na cal"
+
 #: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr "Ustaw jako tło pulpitu"
@@ -6536,79 +6566,39 @@ msgstr "Zewnętrzne edytory"
 msgid "Plugins"
 msgstr "Wtyczki"
 
-#: ui/shotwell.ui:583
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Rozmiar wydrukowanego obrazu</b>"
-
-#: ui/shotwell.ui:600
-msgid "Use a _standard size:"
-msgstr "Użycie _standardowego rozmiaru:"
-
-#: ui/shotwell.ui:643
-msgid "Use a c_ustom size:"
-msgstr "_Użycie własnego rozmiaru:"
-
-#: ui/shotwell.ui:731
-msgid "_Match photo aspect ratio"
-msgstr "Utrzy_mywanie proporcji zdjęcia"
-
-#: ui/shotwell.ui:755
-msgid "_Autosize:"
-msgstr "Rozmiar _automatyczny:"
-
-#: ui/shotwell.ui:795
-msgid "<b>Titles</b>"
-msgstr "<b>Tytuły</b>"
-
-#: ui/shotwell.ui:812
-msgid "Print image _title"
-msgstr "Drukowanie _tytułów obrazów"
-
-#: ui/shotwell.ui:855
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Rozdzielczość w pikselach</b>"
-
-#: ui/shotwell.ui:875
-msgid "_Output photo at:"
-msgstr "_Wyjście zdjęcia na:"
-
-#: ui/shotwell.ui:909
-msgid "pixels per inch"
-msgstr "piksele na cal"
-
-#: ui/shotwell.ui:949
+#: ui/shotwell.ui:590
 msgid "_Name of search:"
 msgstr "_Nazwa wyszukiwania:"
 
-#: ui/shotwell.ui:1003
+#: ui/shotwell.ui:644
 msgid "_Match"
 msgstr "_Dopasowanie"
 
-#: ui/shotwell.ui:1030
+#: ui/shotwell.ui:671
 msgid "of the following:"
 msgstr "następujących:"
 
-#: ui/shotwell.ui:1111
+#: ui/shotwell.ui:752
 msgid "label"
 msgstr "etykieta"
 
-#: ui/shotwell.ui:1262
+#: ui/shotwell.ui:903
 msgid "_Delay:"
 msgstr "_Opóźnienie:"
 
-#: ui/shotwell.ui:1276
+#: ui/shotwell.ui:917
 msgid "_Transition effect:"
 msgstr "_Efekt przejścia:"
 
-#: ui/shotwell.ui:1290
+#: ui/shotwell.ui:931
 msgid "Transition d_elay:"
 msgstr "Opóźnienie prz_ejścia:"
 
-#: ui/shotwell.ui:1300
+#: ui/shotwell.ui:941
 msgid "Show t_itle"
 msgstr "Wyświetlanie tyt_ułu"
 
-#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
 msgid "seconds"
 msgstr "s"
 
diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo
index a7c2443..fd71085 100644
--- a/po/pt_BR.gmo
+++ b/po/pt_BR.gmo
diff --git a/po/pt_BR.po b/po/pt_BR.po
index fa78166..aa2f13b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,18 +16,18 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=shotwel"
-"l&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-12-23 00:18+0000\n"
-"PO-Revision-Date: 2016-12-26 07:07-0200\n"
-"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=shotwell&keywords=I18N+L10N&component=Internationalization\n"
+"POT-Creation-Date: 2017-02-05 10:25+0000\n"
+"PO-Revision-Date: 2017-02-06 10:16-0200\n"
+"Last-Translator: Enrico Nicoletto <liverig@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 1.0.0-beta1\n"
+"X-Generator: Poedit 1.8.7\n"
 "X-Project-Style: gnome\n"
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
@@ -72,6 +72,10 @@ msgstr ""
 "Shotwell oferece suporte a JPEG, PNG, TIFF e a uma variedade de formatos de "
 "arquivo RAW."
 
+#: misc/shotwell.appdata.xml.in:52
+msgid "The Shotwell developers"
+msgstr "Os desenvolvedores do Shotwell"
+
 #: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Organizador de fotos"
@@ -1683,7 +1687,7 @@ msgstr "_Sair"
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141
 #: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:222
 #: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-#: src/CollectionPage.vala:76 src/PhotoPage.vala:2456
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2465
 msgid "_Publish"
 msgstr "_Publicar"
 
@@ -2150,12 +2154,6 @@ msgstr ""
 
 #: plugins/shotwell-publishing/FlickrPublishing.vala:1131
 #, c-format
-#| msgid ""
-#| "Your free Flickr account limits how much data you can upload per month.\n"
-#| "This month you have %d megabyte remaining in your upload quota."
-#| msgid_plural ""
-#| "Your free Flickr account limits how much data you can upload per month.\n"
-#| "This month you have %d megabytes remaining in your upload quota."
 msgid ""
 "Your free Flickr account limits how much data you can upload per month.\n"
 "This month you have %s remaining in your upload quota."
@@ -2647,8 +2645,8 @@ msgstr "A importação falhou (%d)"
 msgid "Cameras"
 msgstr "Câmeras"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/photos/RawSupport.vala:303
+#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
+#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:303
 #: ui/collection.ui:90 ui/event.ui:359 ui/event.ui:527 ui/media.ui:359
 #: ui/photo_context.ui:96 ui/photo.ui:349 ui/tags.ui:359
 msgid "Camera"
@@ -2658,7 +2656,7 @@ msgstr "Câmera"
 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 ""
@@ -2666,32 +2664,32 @@ msgstr ""
 "gerenciador de arquivos."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:775
+#: src/camera/ImportPage.vala:783
 msgid "Hide photos already imported"
 msgstr "Ocultar fotos já importadas"
 
-#: src/camera/ImportPage.vala:776
+#: src/camera/ImportPage.vala:784
 msgid "Only display photos that have not been imported"
 msgstr "Somente exibir fotos que não foram importadas"
 
-#: src/camera/ImportPage.vala:815 ui/import.ui:17 ui/import.ui:214
-msgid "Import _All"
-msgstr "Importar _todas"
-
-#: src/camera/ImportPage.vala:825 ui/import.ui:13 ui/import.ui:210
+#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Importar _selecionadas"
 
-#: src/camera/ImportPage.vala:849
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "Importar _todas"
+
+#: src/camera/ImportPage.vala:857
 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:853
+#: src/camera/ImportPage.vala:861
 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:1006
+#: src/camera/ImportPage.vala:1021
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
 "it. Continue?"
@@ -2699,15 +2697,15 @@ msgstr ""
 "Shotwell precisa desmontar a câmera do sistema de arquivos para acessá-la. "
 "Continuar?"
 
-#: src/camera/ImportPage.vala:1012
+#: src/camera/ImportPage.vala:1027
 msgid "_Unmount"
 msgstr "_Desmontar"
 
-#: src/camera/ImportPage.vala:1017
+#: src/camera/ImportPage.vala:1032
 msgid "Please unmount the camera."
 msgstr "Por favor, desmonte a câmera."
 
-#: src/camera/ImportPage.vala:1022
+#: 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 "
@@ -2717,12 +2715,12 @@ msgstr ""
 "a câmera quando ela está destravada. Por favor, feche qualquer outro "
 "aplicativo que estiver usando a câmera e tente novamente."
 
-#: src/camera/ImportPage.vala:1032
+#: src/camera/ImportPage.vala:1047
 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:1037
+#: src/camera/ImportPage.vala:1052
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2731,73 +2729,73 @@ msgstr ""
 "Não foi possível obter pré-visualizações da câmera:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1054
+#: src/camera/ImportPage.vala:1069
 msgid "Unmounting…"
 msgstr "Desmontando…"
 
-#: src/camera/ImportPage.vala:1145
+#: src/camera/ImportPage.vala:1160
 msgid "Starting import, please wait…"
 msgstr "Iniciando importação, por favor, aguarde…"
 
-#: src/camera/ImportPage.vala:1162
+#: src/camera/ImportPage.vala:1177
 msgid "Fetching photo information"
 msgstr "Obtendo informação da foto"
 
-#: src/camera/ImportPage.vala:1520
+#: src/camera/ImportPage.vala:1535
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Obtendo visualização para %s"
 
-#: src/camera/ImportPage.vala:1636
+#: src/camera/ImportPage.vala:1651
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Não foi possível travar a câmera: %s"
 
-#: src/camera/ImportPage.vala:1721
+#: src/camera/ImportPage.vala:1736
 #, 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:1724
+#: src/camera/ImportPage.vala:1739
 #, 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:1727
+#: 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] "Excluir essa foto/vídeo da câmera?"
 msgstr[1] "Excluir essas %d fotos/vídeos da câmera?"
 
-#: src/camera/ImportPage.vala:1730
+#: src/camera/ImportPage.vala:1745
 #, 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:1738 src/Dialogs.vala:1387
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Manter"
 
-#: src/camera/ImportPage.vala:1757
+#: src/camera/ImportPage.vala:1772
 msgid "Removing photos/videos from camera"
 msgstr "Excluindo fotos/vídeos da câmera"
 
-#: src/camera/ImportPage.vala:1761
+#: 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] "Não foi possível excluir %d foto/vídeo da câmera devido a erros."
 msgstr[1] "Não foi possível excluir %d fotos/vídeos da câmera devido a erros."
 
-#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:78
-#: src/PhotoPage.vala:2451 src/Resources.vala:170
+#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2460 src/Resources.vala:170
 msgid "_Print"
 msgstr "Im_primir"
 
@@ -2806,8 +2804,8 @@ msgstr "Im_primir"
 msgid "Send _To…"
 msgstr "Enviar _para…"
 
-#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:83
-#: src/PhotoPage.vala:2461 src/Resources.vala:220
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2470 src/Resources.vala:220
 msgid "Set as _Desktop Background"
 msgstr "Definir como _plano de fundo da área de trabalho"
 
@@ -2880,43 +2878,43 @@ msgstr "Abrir com editor de RA_W"
 msgid "_Play"
 msgstr "_Reproduzir"
 
-#: src/CollectionPage.vala:402
+#: src/CollectionPage.vala:409
 msgid "Export Photo/Video"
 msgstr "Exportar foto/vídeo"
 
-#: src/CollectionPage.vala:402
+#: src/CollectionPage.vala:409
 msgid "Export Photos/Videos"
 msgstr "Exportar fotos/vídeos"
 
-#: src/CollectionPage.vala:404 src/Dialogs.vala:59 src/PhotoPage.vala:2977
+#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994
 msgid "Export Photo"
 msgstr "Exportar fotos"
 
-#: src/CollectionPage.vala:404 src/Dialogs.vala:84
+#: src/CollectionPage.vala:411 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Exportar fotos"
 
-#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Rotating"
 msgstr "Girando"
 
-#: src/CollectionPage.vala:491 src/CollectionPage.vala:507
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Undoing Rotate"
 msgstr "Desfazendo rotação"
 
-#: src/CollectionPage.vala:516
+#: src/CollectionPage.vala:523
 msgid "Flipping Horizontally"
 msgstr "Invertendo horizontalmente"
 
-#: src/CollectionPage.vala:517
+#: src/CollectionPage.vala:524
 msgid "Undoing Flip Horizontally"
 msgstr "Desfazendo inversão horizontal"
 
-#: src/CollectionPage.vala:526
+#: src/CollectionPage.vala:533
 msgid "Flipping Vertically"
 msgstr "Invertendo verticalmente"
 
-#: src/CollectionPage.vala:527
+#: src/CollectionPage.vala:534
 msgid "Undoing Flip Vertically"
 msgstr "Desfazendo inversão vertical"
 
@@ -3130,7 +3128,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Arquivo de banco de dados:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:773
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
 msgid "_Import"
 msgstr "Parar _importação"
 
@@ -4004,11 +4002,11 @@ msgstr "_Importar no local"
 msgid "Import to Library"
 msgstr "Importar para a biblioteca"
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2853
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870
 msgid "Remove From Library"
 msgstr "Remover da biblioteca"
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2853
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870
 msgid "Removing Photo From Library"
 msgstr "Removendo fotos da biblioteca"
 
@@ -4112,17 +4110,17 @@ msgstr "Largura"
 msgid "Height"
 msgstr "Altura"
 
-#: src/direct/DirectPhotoPage.vala:92
+#: src/direct/DirectPhotoPage.vala:99
 #, c-format
 msgid "%s does not exist."
 msgstr "%s não existe."
 
-#: src/direct/DirectPhotoPage.vala:94
+#: src/direct/DirectPhotoPage.vala:101
 #, c-format
 msgid "%s is not a file."
 msgstr "%s não é um arquivo."
 
-#: src/direct/DirectPhotoPage.vala:96
+#: src/direct/DirectPhotoPage.vala:103
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
@@ -4131,34 +4129,34 @@ msgstr ""
 "%s não oferece suporte ao formato do arquivo de\n"
 "%s."
 
-#: src/direct/DirectPhotoPage.vala:113
+#: src/direct/DirectPhotoPage.vala:120
 #, c-format
 msgid "Unable open photo %s. Sorry."
 msgstr "Não foi possível abrir a foto %s. Desculpe-me."
 
-#: src/direct/DirectPhotoPage.vala:297 src/Resources.vala:175 ui/direct.ui:8
+#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8
 msgid "_Save"
 msgstr "_Salvar"
 
-#: src/direct/DirectPhotoPage.vala:297
+#: src/direct/DirectPhotoPage.vala:304
 msgid "_Save a Copy"
 msgstr "_Salvar uma cópia"
 
-#: src/direct/DirectPhotoPage.vala:300
+#: src/direct/DirectPhotoPage.vala:307
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Descartar alterações para %s?"
 
-#: src/direct/DirectPhotoPage.vala:301
+#: src/direct/DirectPhotoPage.vala:308
 msgid "Close _without Saving"
 msgstr "Fechar s_em salvar"
 
-#: src/direct/DirectPhotoPage.vala:334
+#: src/direct/DirectPhotoPage.vala:341
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Erro ao salvar para %s: %s"
 
-#: src/direct/DirectPhotoPage.vala:362 src/direct/DirectPhotoPage.vala:383
+#: src/direct/DirectPhotoPage.vala:369 src/direct/DirectPhotoPage.vala:390
 msgid "Save As"
 msgstr "Salvar como"
 
@@ -4400,31 +4398,31 @@ msgid_plural "%d Photos"
 msgstr[0] "%d foto"
 msgstr[1] "%d fotos"
 
-#: src/events/EventPage.vala:121
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr "Nenhum Evento"
 
-#: src/events/EventsDirectoryPage.vala:143
+#: src/events/EventsDirectoryPage.vala:150
 msgid "No events"
 msgstr "Sem eventos"
 
-#: src/events/EventsDirectoryPage.vala:147
+#: src/events/EventsDirectoryPage.vala:154
 msgid "No events found"
 msgstr "Sem eventos encontrados"
 
-#: src/events/EventsDirectoryPage.vala:220
+#: src/events/EventsDirectoryPage.vala:227
 msgid "All Events"
 msgstr "Todos eventos"
 
-#: src/events/EventsDirectoryPage.vala:234
+#: src/events/EventsDirectoryPage.vala:241
 msgid "Undated"
 msgstr "Sem data"
 
-#: src/events/EventsDirectoryPage.vala:235
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%Y"
 msgstr "%Y"
 
-#: src/events/EventsDirectoryPage.vala:236
+#: src/events/EventsDirectoryPage.vala:243
 msgid "%B"
 msgstr "%B"
 
@@ -4485,11 +4483,11 @@ msgstr "Marcadas"
 msgid "Importing…"
 msgstr "Importando…"
 
-#: src/library/ImportQueuePage.vala:122
+#: src/library/ImportQueuePage.vala:129
 msgid "Preparing to import…"
 msgstr "Preparando para importar…"
 
-#: src/library/ImportQueuePage.vala:149
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr "Importado %s"
@@ -4498,19 +4496,19 @@ msgstr "Importado %s"
 msgid "Last Import"
 msgstr "Última importação"
 
-#: src/library/LibraryWindow.vala:505
+#: src/library/LibraryWindow.vala:507
 msgid "Import From Folder"
 msgstr "Importa da pasta"
 
-#: src/library/LibraryWindow.vala:574 ui/trash.ui:288
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Esvaziar lixeira"
 
-#: src/library/LibraryWindow.vala:574
+#: src/library/LibraryWindow.vala:576
 msgid "Emptying Trash…"
 msgstr "Esvaziando lixeira…"
 
-#: src/library/LibraryWindow.vala:770
+#: src/library/LibraryWindow.vala:772
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4523,33 +4521,33 @@ msgstr ""
 "%s</span>.\n"
 "Você deseja continuar a importação de fotos?"
 
-#: src/library/LibraryWindow.vala:773 ui/shotwell.ui:142
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Localização da biblioteca"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:786
+#: src/library/LibraryWindow.vala:788
 msgid "Photos cannot be imported from this directory."
 msgstr "Fotos não podem ser importadas deste diretório."
 
-#: src/library/LibraryWindow.vala:1066
+#: src/library/LibraryWindow.vala:1068
 #, c-format
 msgid "%s (%d%%)"
 msgstr "%s (%d%%)"
 
-#: src/library/LibraryWindow.vala:1110 src/library/LibraryWindow.vala:1121
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
 msgid "Updating library…"
 msgstr "Atualizando biblioteca…"
 
-#: src/library/LibraryWindow.vala:1127
+#: src/library/LibraryWindow.vala:1129
 msgid "Preparing to auto-import photos…"
 msgstr "Preparando para auto-importação de fotos…"
 
-#: src/library/LibraryWindow.vala:1132
+#: src/library/LibraryWindow.vala:1134
 msgid "Auto-importing photos…"
 msgstr "Auto-importação de fotos…"
 
-#: src/library/LibraryWindow.vala:1140
+#: src/library/LibraryWindow.vala:1142
 msgid "Writing metadata to files…"
 msgstr "Escrevendo metadados para arquivos…"
 
@@ -4557,7 +4555,7 @@ msgstr "Escrevendo metadados para arquivos…"
 msgid "Missing Files"
 msgstr "Arquivos faltantes"
 
-#: src/library/OfflinePage.vala:103
+#: src/library/OfflinePage.vala:110
 msgid "Deleting…"
 msgstr "Excluindo…"
 
@@ -4565,15 +4563,15 @@ msgstr "Excluindo…"
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/library/TrashPage.vala:101
+#: src/library/TrashPage.vala:108
 msgid "Trash is empty"
 msgstr "A lixeira está vazia"
 
-#: src/library/TrashPage.vala:105
+#: src/library/TrashPage.vala:112
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/library/TrashPage.vala:106
+#: src/library/TrashPage.vala:113
 msgid "Deleting Photos"
 msgstr "Apagando fotos"
 
@@ -4664,7 +4662,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:493
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4673,15 +4671,15 @@ msgstr ""
 "Shotwell foi incapaz de reproduzir o vídeo selecionado:\n"
 "%s"
 
-#: src/Page.vala:1300
+#: src/Page.vala:1312
 msgid "No photos/videos"
 msgstr "Sem fotos/vídeos"
 
-#: src/Page.vala:1304
+#: src/Page.vala:1316
 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:2610
+#: src/Page.vala:2622
 msgid "Photos cannot be exported to this directory."
 msgstr "Fotos não podem ser exportadas para este diretório."
 
@@ -4700,7 +4698,7 @@ msgstr "Próxima foto"
 msgid "Photo source file missing: %s"
 msgstr "Faltando arquivo fonte da foto: %s"
 
-#: src/PhotoPage.vala:2997
+#: src/PhotoPage.vala:3014
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Não foi possível exportar %s: %s"
@@ -4952,7 +4950,6 @@ msgstr[0] "O vídeo selecionado foi publicado com sucesso."
 msgstr[1] "Os vídeos selecionados foram publicados com sucesso."
 
 #: src/publishing/PublishingUI.vala:109
-#| msgid "The selected photo was successfully published."
 msgid "The selected photo was successfully published."
 msgid_plural "The selected photos were successfully published."
 msgstr[0] "A foto selecionada foi publicada com sucesso."
diff --git a/po/shotwell.pot b/po/shotwell.pot
index ca05247..550caa3 100644
--- a/po/shotwell.pot
+++ b/po/shotwell.pot
@@ -6,10 +6,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: shotwell 0.25.4\n"
+"Project-Id-Version: shotwell 0.26.0\n"
 "Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
 "product=Shotwell&component=Internationalization\n"
-"POT-Creation-Date: 2017-01-31 21:27+0100\n"
+"POT-Creation-Date: 2017-03-20 14:36+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: misc/shotwell.appdata.xml.in:8 misc/shotwell.desktop.in.in:4
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:115
-#: src/photos/RawSupport.vala:300 ui/collection.ui:85 ui/event.ui:354
+#: 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
 msgid "Shotwell"
@@ -1147,7 +1147,6 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:774
-#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow slide transition"
 msgstr ""
 
@@ -1166,7 +1165,6 @@ msgid ""
 msgstr ""
 
 #: misc/org.yorba.shotwell.gschema.xml:786
-#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow circle transition"
 msgstr ""
 
@@ -1175,11 +1173,19 @@ msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
+#: misc/org.yorba.shotwell.gschema.xml:792
+msgid "enable slideshow circles transition"
+msgstr ""
+
 #: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 
+#: misc/org.yorba.shotwell.gschema.xml:798
+msgid "enable slideshow blinds transition"
+msgstr ""
+
 #: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
@@ -1213,11 +1219,93 @@ msgid ""
 "otherwise"
 msgstr ""
 
+#: 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 ""
+
+#: 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 ""
+
+#: 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
+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 ""
+
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+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:481
+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 ""
+
+#: 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 ""
+
+#: 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 ""
+
 #: plugins/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr ""
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:603
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:604
 msgid "translator-credits"
 msgstr ""
 
@@ -1272,15 +1360,6 @@ msgstr ""
 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 ""
-
 #: plugins/shotwell-data-imports/FSpotImporter.vala:36
 #: plugins/shotwell-publishing/FacebookPublishing.vala:33
 #: plugins/shotwell-publishing/FlickrPublishing.vala:33
@@ -1373,7 +1452,7 @@ msgid "Go _Back"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-#: ui/shotwell.ui:1464
+#: ui/shotwell.ui:1105
 msgid "_Log in"
 msgstr ""
 
@@ -1406,7 +1485,7 @@ msgid "pixels"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:158
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1209
+#: plugins/shotwell-publishing/FlickrPublishing.vala:880
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1306
 #: src/Dimensions.vala:17
 msgid "Original size"
@@ -1424,7 +1503,7 @@ msgstr ""
 #: 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/youtube_publishing_options_pane.ui:99
 msgid "_Logout"
 msgstr ""
@@ -1436,9 +1515,9 @@ msgstr ""
 #: 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/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 ""
 
@@ -1542,13 +1621,11 @@ 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 ""
 
@@ -1588,12 +1665,12 @@ msgid "You are logged into Rajce as %s."
 msgstr ""
 
 #: 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:31
 msgid "Shotwell Extra Publishing Services"
 msgstr ""
 
@@ -1611,13 +1688,13 @@ msgid "Copyright 2012 BJA Electronics"
 msgstr ""
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:105
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1205
+#: 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:1206
+#: plugins/shotwell-publishing/FlickrPublishing.vala:877
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1303
 msgid "1024 × 768 pixels"
 msgstr ""
@@ -1681,12 +1758,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 ""
 
@@ -1715,7 +1792,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 ""
 
@@ -1725,226 +1802,155 @@ 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"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:62
-#: plugins/shotwell-publishing/PicasaPublishing.vala:60
+#: plugins/shotwell-publishing/FacebookPublishing.vala:61
+#: plugins/shotwell-publishing/PicasaPublishing.vala:58
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1188
 msgid "Shotwell Connect"
 msgstr ""
 
-#: 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 ""
-
-#: 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 ""
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:87
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook…"
-msgstr ""
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
 msgid "Creating album…"
 msgstr ""
 
-#: 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."
 msgstr ""
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:982
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
 "\n"
 msgstr ""
 
-#: 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:858
 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:854
 #: 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 ""
-
-#: 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 Log in to log into Flickr in your Web browser. You will have to "
-"authorize Shotwell Connect to link to your Flickr account."
-msgstr ""
-
-#: 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 ""
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login…"
-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."
-msgstr ""
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:447
-msgid "Verifying authorization…"
-msgstr ""
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1129
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
 "\n"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1131
+#: 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 %s remaining in your upload quota."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1133
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1138
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1140
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1143
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1184
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1185
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1186
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1207
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
 msgid "2048 × 1536 pixels"
 msgstr ""
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1208
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
 msgid "4096 × 3072 pixels"
 msgstr ""
 
-#: 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 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."
+#. 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 ""
 
-#: 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."
 msgstr ""
 
 #. 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 ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
 msgid "Small (640 × 480 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
 msgid "Medium (1024 × 768 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
 msgid "Recommended (1600 × 1200 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
 msgid "Google+ (2048 × 1536 pixels)"
 msgstr ""
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
 #: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr ""
@@ -1998,7 +2004,7 @@ 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:190
 msgid "Publish"
 msgstr ""
 
@@ -2026,7 +2032,7 @@ msgid "Certificate of %s"
 msgstr ""
 
 #: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
-#: src/Resources.vala:166
+#: src/Resources.vala:167
 msgid "_OK"
 msgstr ""
 
@@ -2074,7 +2080,7 @@ msgstr ""
 msgid "I understand, please _proceed."
 msgstr ""
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/shotwell-publishing.vala:55
 msgid "Core Publishing Services"
 msgstr ""
 
@@ -2082,36 +2088,22 @@ msgstr ""
 msgid "Video privacy _setting:"
 msgstr ""
 
-#: 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 ""
-
-#: 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."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr ""
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-msgid "Videos will appear in “%s”"
-msgstr ""
-
-#: 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 ""
 
@@ -2212,16 +2204,16 @@ msgstr ""
 msgid "Leave fullscreen"
 msgstr ""
 
-#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570
+#: 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
+#: src/Resources.vala:158
 msgid "_Cancel"
 msgstr ""
 
-#: src/AppWindow.vala:580
+#: src/AppWindow.vala:579
 #, c-format
 msgid ""
 "A fatal error occurred when accessing Shotwell’s library. Shotwell cannot "
@@ -2234,17 +2226,17 @@ msgstr ""
 msgid "Visit the Shotwell web site"
 msgstr ""
 
-#: src/AppWindow.vala:612
+#: src/AppWindow.vala:613
 #, c-format
 msgid "Unable to display help: %s"
 msgstr ""
 
-#: src/AppWindow.vala:620
+#: src/AppWindow.vala:621
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr ""
 
-#: src/AppWindow.vala:628
+#: src/AppWindow.vala:629
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr ""
@@ -2315,7 +2307,7 @@ msgid "Cameras"
 msgstr ""
 
 #: src/camera/Branch.vala:99 src/camera/ImportPage.vala:718
-#: src/camera/ImportPage.vala:734 src/photos/RawSupport.vala:303
+#: 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
 msgid "Camera"
@@ -2453,127 +2445,127 @@ msgid_plural "Unable to delete %d photos/videos from the camera due to errors."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala: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 ""
 
-#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: src/CollectionPage.vala:83 src/Resources.vala:324 ui/collection.ui:126
 #: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28
 msgid "Send _To…"
 msgstr ""
 
-#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala: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
+#: 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
+#: src/CollectionPage.vala:119 src/Resources.vala:187 ui/collection.ui:8
 #: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:445
 #: ui/photo_context.ui:6 ui/photo.ui:223
 msgid "_Enhance"
 msgstr ""
 
-#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: src/CollectionPage.vala:120 src/Resources.vala:215 ui/collection.ui:13
 #: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:450
 #: ui/photo_context.ui:11 ui/photo.ui:250
 msgid "Re_vert to Original"
 msgstr ""
 
-#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+#: 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
+#: 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
 msgid "Open With E_xternal Editor"
 msgstr ""
 
-#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: src/CollectionPage.vala:146 src/Resources.vala:322 ui/collection.ui:111
 #: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363
 msgid "Open With RA_W Editor"
 msgstr ""
 
-#: src/CollectionPage.vala:143 src/Resources.vala:167
+#: src/CollectionPage.vala:149 src/Resources.vala:168
 msgid "_Play"
 msgstr ""
 
-#: src/CollectionPage.vala:409
+#: src/CollectionPage.vala:415
 msgid "Export Photo/Video"
 msgstr ""
 
-#: src/CollectionPage.vala:409
+#: src/CollectionPage.vala:415
 msgid "Export Photos/Videos"
 msgstr ""
 
-#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2994
+#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
 msgstr ""
 
-#: src/CollectionPage.vala:411 src/Dialogs.vala:84
+#: src/CollectionPage.vala:417 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr ""
 
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Rotating"
 msgstr ""
 
-#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Undoing Rotate"
 msgstr ""
 
-#: src/CollectionPage.vala:523
+#: src/CollectionPage.vala:529
 msgid "Flipping Horizontally"
 msgstr ""
 
-#: src/CollectionPage.vala:524
+#: src/CollectionPage.vala:530
 msgid "Undoing Flip Horizontally"
 msgstr ""
 
-#: src/CollectionPage.vala:533
+#: src/CollectionPage.vala:539
 msgid "Flipping Vertically"
 msgstr ""
 
-#: src/CollectionPage.vala:534
+#: src/CollectionPage.vala:540
 msgid "Undoing Flip Vertically"
 msgstr ""
 
@@ -2854,8 +2846,8 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
-#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
-#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/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:15 ui/tags.ui:458 ui/trash.ui:63
 #: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr ""
@@ -3291,7 +3283,7 @@ msgstr[1] ""
 msgid "1 day"
 msgstr ""
 
-#: src/Dialogs.vala:1317 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:232
 msgid "Rename Event"
 msgstr ""
 
@@ -3310,7 +3302,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 ""
 
@@ -3363,7 +3355,7 @@ msgid_plural "This will remove %d photos from the library. Continue?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/Dialogs.vala:1444 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:174
 msgid "_Remove"
 msgstr ""
 
@@ -3577,11 +3569,11 @@ msgstr ""
 msgid "Import to Library"
 msgstr ""
 
-#: src/Dialogs.vala:2709 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr ""
 
-#: src/Dialogs.vala:2710 src/PhotoPage.vala:2870
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr ""
 
@@ -3681,29 +3673,29 @@ msgstr ""
 msgid "Unable open photo %s. Sorry."
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: src/direct/DirectPhotoPage.vala:369 src/direct/DirectPhotoPage.vala:390
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
 msgid "Save As"
 msgstr ""
 
@@ -3752,23 +3744,23 @@ msgstr ""
 msgid "HD Video (16 ∶ 9)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:792
 msgid "Wallet (2 × 3 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:795
 msgid "Notecard (3 × 5 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
 msgid "4 × 6 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
 msgid "5 × 7 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
 msgid "8 × 10 in."
 msgstr ""
 
@@ -3776,7 +3768,7 @@ msgstr ""
 msgid "Letter (8.5 × 11 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
 msgid "11 × 14 in."
 msgstr ""
 
@@ -3784,23 +3776,23 @@ msgstr ""
 msgid "Tabloid (11 × 17 in.)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
 msgid "16 × 20 in."
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:816
 msgid "Metric Wallet (9 × 13 cm)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:819
 msgid "Postcard (10 × 15 cm)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
 msgid "13 × 18 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
 msgid "18 × 24 cm"
 msgstr ""
 
@@ -3808,15 +3800,15 @@ msgstr ""
 msgid "A4 (210 × 297 mm)"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
 msgid "20 × 30 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
 msgid "24 × 40 cm"
 msgstr ""
 
-#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
 msgid "30 × 40 cm"
 msgstr ""
 
@@ -3915,7 +3907,7 @@ 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 ""
@@ -4152,32 +4144,32 @@ msgstr ""
 msgid "Loading Shotwell"
 msgstr ""
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "Path to Shotwell’s private data"
 msgstr ""
 
-#: src/main.vala:294
+#: src/main.vala:293
 msgid "DIRECTORY"
 msgstr ""
 
-#: src/main.vala:298
+#: src/main.vala:297
 msgid "Do not monitor library directory at runtime for changes"
 msgstr ""
 
-#: src/main.vala:302
+#: src/main.vala:301
 msgid "Don’t display startup progress meter"
 msgstr ""
 
-#: src/main.vala:306
+#: src/main.vala:305
 msgid "Show the application’s version"
 msgstr ""
 
 #. init GTK (valac has already called g_threads_init())
-#: src/main.vala:338
+#: src/main.vala:342
 msgid "[FILE]"
 msgstr ""
 
-#: 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 ""
@@ -4198,34 +4190,34 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/Page.vala:1312
+#: src/Page.vala:1318
 msgid "No photos/videos"
 msgstr ""
 
-#: src/Page.vala:1316
+#: src/Page.vala:1322
 msgid "No photos/videos found which match the current filter"
 msgstr ""
 
-#: src/Page.vala:2622
+#: src/Page.vala:2628
 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 ""
 
-#: src/PhotoPage.vala:3014
+#: src/PhotoPage.vala:3018
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr ""
@@ -4270,7 +4262,7 @@ msgstr ""
 msgid "TIFF"
 msgstr ""
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3755
 msgid "modified"
 msgstr ""
 
@@ -4302,23 +4294,15 @@ msgstr ""
 msgid "32 images per page"
 msgstr ""
 
-#: 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
+#: 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"
@@ -4534,729 +4518,730 @@ 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:149
 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:146
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr ""
 
-#: 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
+#: src/Resources.vala:156 ui/direct.ui:191 ui/events_directory.ui:168
 #: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419
 #: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207
 msgid "_About"
 msgstr ""
 
-#: 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
+#: 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
+#: 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: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
+#: ui/tags.ui:423 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:448
 msgid "_New"
 msgstr ""
 
-#: src/Resources.vala:165
+#: 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
+#: 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
+#: src/Resources.vala:175
 msgid "_Revert"
 msgstr ""
 
-#: src/Resources.vala:176
+#: src/Resources.vala:177
 msgid "Save _As"
 msgstr ""
 
-#: src/Resources.vala:177
+#: src/Resources.vala:178
 msgid "Sort _Ascending"
 msgstr ""
 
-#: src/Resources.vala:178
+#: src/Resources.vala:179
 msgid "Sort _Descending"
 msgstr ""
 
-#: src/Resources.vala:179
+#: src/Resources.vala:180
 msgid "_Stop"
 msgstr ""
 
-#: src/Resources.vala:180
+#: src/Resources.vala:181
 msgid "_Undelete"
 msgstr ""
 
-#: src/Resources.vala:181
+#: 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:165
 msgid "Enhance"
 msgstr ""
 
-#: src/Resources.vala:188 ui/collection.ui:162
+#: src/Resources.vala:189 ui/collection.ui:162
 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
+#: 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
+#: 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
+#: 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
+#: src/Resources.vala:231 ui/events_directory.ui:139 ui/events_directory.ui:181
 #: ui/event.ui:391 ui/event.ui:584
 msgid "Re_name Event…"
 msgstr ""
 
-#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
+#: src/Resources.vala:234 ui/event.ui:371 ui/event.ui:576
 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:380 ui/media.ui:374 ui/tags.ui:374
 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:476
 #: 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:509
 #: 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:513
 #: 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:499
 #: 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:503
 #: 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
+#: 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
+#: 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
+#: 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
+#: src/Resources.vala:293
 msgid "_Print…"
 msgstr ""
 
-#: src/Resources.vala:294
+#: src/Resources.vala:295
 msgid "Pu_blish…"
 msgstr ""
 
-#: src/Resources.vala:296 ui/collection.ui:187
+#: src/Resources.vala:297 ui/collection.ui:187
 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:535
 #: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
 msgid "Edit _Title…"
 msgstr ""
 
 #. Button label
-#: src/Resources.vala:300
+#: src/Resources.vala:301
 msgctxt "Button Label"
 msgid "Edit Title"
 msgstr ""
 
-#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144
+#: src/Resources.vala:303 ui/collection.ui:102 ui/events_directory.ui:144
 #: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539
 #: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344
 msgid "Edit _Comment…"
 msgstr ""
 
 #. Button label
-#: src/Resources.vala:304
+#: src/Resources.vala:305
 msgid "Edit Comment"
 msgstr ""
 
-#: src/Resources.vala:306 ui/event.ui:588
+#: src/Resources.vala:307 ui/event.ui:588
 msgid "Edit Event _Comment…"
 msgstr ""
 
-#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
+#: src/Resources.vala:310 ui/direct.ui:167 ui/photo.ui:335
 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
+#: src/Resources.vala:313 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456
 #: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388
 msgid "Add _Tags…"
 msgstr ""
 
-#: src/Resources.vala:313 ui/photo_context.ui:17
+#: src/Resources.vala:314 ui/photo_context.ui:17
 msgid "_Add Tags…"
 msgstr ""
 
 #. Dialog title
-#: src/Resources.vala:315
+#: src/Resources.vala:316
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr ""
 
-#: src/Resources.vala:324 ui/photo_context.ui:133
+#: src/Resources.vala:325 ui/photo_context.ui:133
 msgid "Send T_o…"
 msgstr ""
 
-#: src/Resources.vala:326
+#: 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:215 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:212 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 ""
 
-#: src/Resources.vala:340
+#: src/Resources.vala:341
 #, c-format
 msgid "Add Tag “%s”"
 msgstr ""
 
 #. 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 ""
 
 #. Undo/Redo command name (in Edit menu)
-#: src/Resources.vala:348
+#: 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”"
 msgstr ""
 
-#: src/Resources.vala:357
+#: src/Resources.vala:358
 #, c-format
 msgid "Delete Tag “%s”"
 msgstr ""
 
-#: 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”…"
 msgstr ""
 
-#: src/Resources.vala:370
+#: src/Resources.vala:371
 #, c-format
 msgid "Rename Tag “%s” to “%s”"
 msgstr ""
 
-#: src/Resources.vala:373 ui/tags.ui:454
+#: src/Resources.vala:374 ui/tags.ui:454
 msgid "_Rename…"
 msgstr ""
 
-#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461
+#: src/Resources.vala:376 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461
 #: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393
 msgid "Modif_y Tags…"
 msgstr ""
 
-#: 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_plural "Tag Photos as “%s”"
 msgstr[0] ""
 msgstr[1] ""
 
-#: 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] ""
 
-#: 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] ""
 
-#: 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] ""
 
-#: src/Resources.vala:403
+#: src/Resources.vala:404
 #, c-format
 msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr ""
 
-#: src/Resources.vala:407
+#: src/Resources.vala:408
 #, c-format
 msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
 
 #. Saved search button
-#: src/Resources.vala:410 src/SearchFilter.vala:1124
+#: src/Resources.vala:411 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr ""
 
-#: src/Resources.vala:412
+#: src/Resources.vala:413
 msgid "Delete Search"
 msgstr ""
 
-#: src/Resources.vala:415 ui/savedsearch.ui:11
+#: src/Resources.vala:416 ui/savedsearch.ui:11
 msgid "_Edit…"
 msgstr ""
 
-#: src/Resources.vala:416 ui/savedsearch.ui:7
+#: src/Resources.vala:417 ui/savedsearch.ui:7
 msgid "Re_name…"
 msgstr ""
 
-#: src/Resources.vala:419
+#: src/Resources.vala:420
 #, c-format
 msgid "Rename Search “%s” to “%s”"
 msgstr ""
 
-#: src/Resources.vala:423
+#: src/Resources.vala:424
 #, c-format
 msgid "Delete Search “%s”"
 msgstr ""
 
-#: src/Resources.vala:560
+#: src/Resources.vala:561
 #, c-format
 msgid "Rate %s"
 msgstr ""
 
-#: src/Resources.vala:561
+#: src/Resources.vala:562
 #, c-format
 msgid "Set rating to %s"
 msgstr ""
 
-#: src/Resources.vala:562
+#: src/Resources.vala:563
 #, c-format
 msgid "Setting rating to %s"
 msgstr ""
 
-#: src/Resources.vala:564
+#: src/Resources.vala:565
 #, c-format
 msgid "Display %s"
 msgstr ""
 
-#: src/Resources.vala:565
+#: src/Resources.vala:566
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr ""
 
-#: src/Resources.vala:566
+#: src/Resources.vala:567
 #, c-format
 msgid "%s or Better"
 msgstr ""
 
-#: src/Resources.vala:567
+#: src/Resources.vala:568
 #, c-format
 msgid "Display %s or Better"
 msgstr ""
 
-#: src/Resources.vala:568
+#: src/Resources.vala:569
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr ""
 
-#: 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
+#: src/Resources.vala:666 ui/collection.ui:121 ui/direct_context.ui:20
 #: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
 #: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
 #: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr ""
 
-#: src/Resources.vala:666
+#: 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 ""
 
-#: src/Resources.vala:672 ui/offline.ui:224
+#: src/Resources.vala:673 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr ""
 
-#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
+#: src/Resources.vala:675 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
 #: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr ""
 
-#: src/Resources.vala:676 ui/events_directory.ui: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 ""
 
@@ -5618,7 +5603,7 @@ msgid "untitled"
 msgstr ""
 
 #. multiple videos
-#: src/VideoSupport.vala:507
+#: src/VideoSupport.vala:523
 msgid "Export Videos"
 msgstr ""
 
@@ -5643,17 +5628,17 @@ 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
+#: 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 ""
 
@@ -5669,7 +5654,7 @@ msgstr ""
 msgid "Zoom _200%"
 msgstr ""
 
-#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+#: ui/direct.ui:98 ui/photo.ui:187
 msgid "_Photo"
 msgstr ""
 
@@ -5774,7 +5759,6 @@ msgid "D_escending"
 msgstr ""
 
 #: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
-#: ui/top.ui:30
 msgid "Even_ts"
 msgstr ""
 
@@ -5788,7 +5772,7 @@ 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/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385
 msgid "Ta_gs"
 msgstr ""
 
@@ -5817,7 +5801,7 @@ msgstr ""
 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 ""
 
@@ -5825,6 +5809,56 @@ 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:"
+msgstr ""
+
+#: ui/printing_widget.ui:80
+msgid "Use a c_ustom size:"
+msgstr ""
+
+#. 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 ""
+
+#: ui/printing_widget.ui:197
+msgid "_Autosize:"
+msgstr ""
+
+#: ui/printing_widget.ui:237
+msgid "<b>Titles</b>"
+msgstr ""
+
+#: ui/printing_widget.ui:254
+msgid "Print image _title"
+msgstr ""
+
+#: ui/printing_widget.ui:297
+msgid "<b>Pixel Resolution</b>"
+msgstr ""
+
+#: ui/printing_widget.ui:317
+msgid "_Output photo at:"
+msgstr ""
+
+#: ui/printing_widget.ui:351
+msgid "pixels per inch"
+msgstr ""
+
 #: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr ""
@@ -5933,79 +5967,39 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#: ui/shotwell.ui:583
-msgid "<b>Printed Image Size</b>"
-msgstr ""
-
-#: ui/shotwell.ui:600
-msgid "Use a _standard size:"
-msgstr ""
-
-#: ui/shotwell.ui:643
-msgid "Use a c_ustom size:"
-msgstr ""
-
-#: ui/shotwell.ui:731
-msgid "_Match photo aspect ratio"
-msgstr ""
-
-#: ui/shotwell.ui:755
-msgid "_Autosize:"
-msgstr ""
-
-#: ui/shotwell.ui:795
-msgid "<b>Titles</b>"
-msgstr ""
-
-#: ui/shotwell.ui:812
-msgid "Print image _title"
-msgstr ""
-
-#: ui/shotwell.ui:855
-msgid "<b>Pixel Resolution</b>"
-msgstr ""
-
-#: ui/shotwell.ui:875
-msgid "_Output photo at:"
-msgstr ""
-
-#: ui/shotwell.ui:909
-msgid "pixels per inch"
-msgstr ""
-
-#: ui/shotwell.ui:949
+#: ui/shotwell.ui:590
 msgid "_Name of search:"
 msgstr ""
 
-#: ui/shotwell.ui:1003
+#: ui/shotwell.ui:644
 msgid "_Match"
 msgstr ""
 
-#: ui/shotwell.ui:1030
+#: ui/shotwell.ui:671
 msgid "of the following:"
 msgstr ""
 
-#: ui/shotwell.ui:1111
+#: ui/shotwell.ui:752
 msgid "label"
 msgstr ""
 
-#: ui/shotwell.ui:1262
+#: ui/shotwell.ui:903
 msgid "_Delay:"
 msgstr ""
 
-#: ui/shotwell.ui:1276
+#: ui/shotwell.ui:917
 msgid "_Transition effect:"
 msgstr ""
 
-#: ui/shotwell.ui:1290
+#: ui/shotwell.ui:931
 msgid "Transition d_elay:"
 msgstr ""
 
-#: ui/shotwell.ui:1300
+#: ui/shotwell.ui:941
 msgid "Show t_itle"
 msgstr ""
 
-#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
 msgid "seconds"
 msgstr ""
 
diff --git a/po/sr.gmo b/po/sr.gmo
index 72bd351..a5e66eb 100644
--- a/po/sr.gmo
+++ b/po/sr.gmo
diff --git a/po/sr.po b/po/sr.po
index 13a2f2f..36f2e8f 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—2016.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2011—2017.
 # Copyright 2016 Software Freedom Conservancy Inc.
 # Mitko Krstev <m.krstev@hotmail.com>, 2011.
 # Nikola Radovanović <nrad@eunet.rs>, 2011—2013.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014—2016.
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014—2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=shotwel"
-"l&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-08-26 21:27+0000\n"
-"PO-Revision-Date: 2016-09-03 16:51+0200\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-03-04 15:02+0000\n"
+"PO-Revision-Date: 2017-03-05 20:45+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: српски <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
@@ -23,12 +23,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:354
+#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344
+#: ui/tags.ui:354
 msgid "Shotwell"
 msgstr "Фото-бунар"
 
 #: misc/shotwell.appdata.xml.in:9
-#| msgid "Photo Manager"
 msgid "Popular photo manager"
 msgstr "Популарни управник фотографија"
 
@@ -38,7 +39,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 ""
 "Фото-бунар је једноставан за употребу, брз организатор фотографија осмишљен "
@@ -61,12 +62,16 @@ msgstr ""
 msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
 msgstr "Фото-бунар подржава ЈПЕГ, ПНГ, ТИФФ и разне сирове записе датотека."
 
+#: misc/shotwell.appdata.xml.in:52
+#| msgid "Shotwell Viewer"
+msgid "The Shotwell developers"
+msgstr "Програмери Фото-бунара"
+
 #: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Управник фотографија"
 
 #: misc/shotwell.desktop.in.in:6
-#| msgid "any photo"
 msgid "Organize your photos"
 msgstr "Организујте ваше фотографије"
 
@@ -77,9 +82,9 @@ msgid ""
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
 "rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
 msgstr ""
-"албум;фото-апарат;фото-апарати;отсеци;уреди;побољшај;извези;галерија;збирка;с"
-"лика;слике;увези;среди;разврстај;фотографија;фотографије;штампај;објави;окрен"
-"и;дели;ознаке;видео;фејсбук;фликр;пикаса;јутуб;пивиго;"
+"албум;фото-апарат;фото-апарати;отсеци;уреди;побољшај;извези;галерија;збирка;"
+"слика;слике;увези;среди;разврстај;фотографија;фотографије;штампај;објави;"
+"окрени;дели;ознаке;видео;фејсбук;фликр;пикаса;јутуб;пивиго;"
 
 #. Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 #: misc/shotwell.desktop.in.in:11 misc/shotwell-viewer.desktop.in.in:8
@@ -87,7 +92,6 @@ msgid "shotwell"
 msgstr "shotwell"
 
 #: misc/shotwell-viewer.desktop.in.in:4
-#| msgid "Photo Viewer"
 msgid "Shotwell Viewer"
 msgstr "Фото-бунар прегледач фотографија"
 
@@ -120,7 +124,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 "основна величина"
 
@@ -148,10 +152,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 "корисник"
 
@@ -168,8 +171,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 "последња категорија"
 
@@ -178,8 +180,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 "последња величина фотографије"
 
@@ -192,7 +193,6 @@ msgstr ""
 "је коришћена приликом објављивања на Рајце."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:70
-#| msgid "_Remember"
 msgid "remember"
 msgstr "памти"
 
@@ -201,7 +201,6 @@ msgid "If true, remember last login."
 msgstr "Ако је изабрано, памтиће последње пријављивање."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:76
-#| msgid "_Hide album"
 msgid "hide album"
 msgstr "скрива албум"
 
@@ -210,7 +209,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 "отвара албум у веб прегледнику"
 
@@ -222,11 +220,11 @@ 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 "уклања осетљиве податке из отпремања"
 
@@ -236,62 +234,58 @@ 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 "приказује проширена својства"
 
-#: 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 "приказује бочну површ"
 
-#: 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 "приказује траку алата"
 
-#: 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 "Изабрано ако ће доња трака алата бити приказана, у супротном поништено."
+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 "приказује траку претраге"
 
-#: 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 "приказује наслове фотографија"
 
-#: 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."
@@ -299,12 +293,11 @@ 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 "приказује напомене фотографија"
 
-#: 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."
@@ -312,12 +305,11 @@ msgstr ""
 "Изабрано ако ће напомене фотографија бити приказане испод сличица у прегледу "
 "збирке, у супротном поништено."
 
-#: misc/org.yorba.shotwell.gschema.xml:64
-#| msgid "Edit Event Comment"
+#: misc/org.yorba.shotwell.gschema.xml:65
 msgid "display event comments"
 msgstr "приказује напомене догађаја"
 
-#: 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."
@@ -325,12 +317,11 @@ 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 "приказује ознаке фотографија"
 
-#: 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."
@@ -338,24 +329,23 @@ 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 "приказује оцене фотографија"
 
-#: 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 "
@@ -365,63 +355,59 @@ msgstr ""
 "Одбачене или боље, 2: Неоцењене или боље, 3: Један или боље, 4: Два или "
 "боље, 5: Три или боље, 6: Четири или боље, 7: Пет или боље."
 
-#: misc/org.yorba.shotwell.gschema.xml:88
-#| msgid "Sort _Descending"
+#: misc/org.yorba.shotwell.gschema.xml:89
 msgid "sort events ascending"
 msgstr "ређа догађаје растућим редом"
 
-#: 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 "ређа фотографије библиотеке растућим редом"
 
-#: 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 "ређа фотографије догађаја растућим редом"
 
-#: 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 "користи 24-часовно време"
 
-#: 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."
@@ -429,11 +415,11 @@ msgstr ""
 "Изабрано ако времена требају бити приказана са 24-часовним сатом, поништено "
 "ако времена треба да користе ПрП/ПоП обележавање."
 
-#: 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."
@@ -442,12 +428,11 @@ 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 "мења датотеке изворне фотографије"
 
-#: 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."
@@ -456,11 +441,11 @@ 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."
@@ -468,79 +453,73 @@ msgstr ""
 "Изабрано ако, приликом покретања, прозорче добродошлице треба бити "
 "приказано. Поништено ако не треба бити приказано."
 
-#: misc/org.yorba.shotwell.gschema.xml:142
-#| msgid "Library Location"
+#: misc/org.yorba.shotwell.gschema.xml:143
 msgid "sidebar position"
 msgstr "положај бочне површи"
 
-#: 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 "Сразмера минијатуре фотографије, у опсегу од 72 до 360."
 
-#: misc/org.yorba.shotwell.gschema.xml:154
-#| msgid "Pin the toolbar open"
+#: misc/org.yorba.shotwell.gschema.xml:155
 msgid "pin toolbar state"
 msgstr "прибада стање траке алата"
 
-#: 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 "боја позадине"
 
-#: 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 "застој"
 
-#: 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 "застој прелаза"
 
-#: 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 "ид дејства прелаза"
 
-#: 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"
@@ -548,70 +527,69 @@ msgstr ""
 "Назив дејства прелаза које ће се користити између фотографија приликом "
 "трајања покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:192
-#| msgid "Show t_itle"
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "Show title"
 msgstr "приказује наслов"
 
-#: 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."
@@ -619,32 +597,29 @@ msgstr ""
 "Последњи запамћени положај разделника између бочне површи и прегледа у "
 "прозору програма библиотеке."
 
-#: misc/org.yorba.shotwell.gschema.xml:244
-#| msgid "Import to Library"
+#: misc/org.yorba.shotwell.gschema.xml:245
 msgid "import directory"
 msgstr "директоријум увоза"
 
-#: 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 "прати приспеће нових датотека у фасцикли фототеке"
 
-#: 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 "уписује метаподатке у главне датотеке"
 
-#: 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."
@@ -652,11 +627,11 @@ 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"
@@ -664,12 +639,11 @@ msgstr ""
 "Ако је изабрано, Фото-бунар ће пребацити све називе датотека на мала слова "
 "приликом увоза датотека фотографија"
 
-#: misc/org.yorba.shotwell.gschema.xml:268
-#| msgid "_Directory structure:"
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "directory pattern"
 msgstr "шаблон директоријума"
 
-#: 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."
@@ -677,11 +651,11 @@ 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."
@@ -689,30 +663,30 @@ msgstr ""
 "Ниска која кодира произвољни шаблон именовања који ће бити коришћен за "
 "именовање директоријума фотографија при увозу."
 
-#: misc/org.yorba.shotwell.gschema.xml:280
-#| msgid "RAW Developer"
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "RAW developer default"
 msgstr "основни сирови развијач"
 
-#: 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."
-msgstr "Најчешће скоро коришћен нумератор произвољног односа сразмере одсецања."
-
 #: misc/org.yorba.shotwell.gschema.xml:294
+msgid "Most-recently-used crop custom aspect ratio’s numerator."
+msgstr ""
+"Најчешће скоро коришћен нумератор произвољног односа сразмере одсецања."
+
+#: misc/org.yorba.shotwell.gschema.xml:295
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -720,12 +694,12 @@ 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."
@@ -733,104 +707,144 @@ 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 "спољни уређивач фотографија"
 
-#: 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 "спољни сирови уређивач"
 
-#: 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 "извоз метаподатака"
+
+#: 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 "последња коришћена услуга објављивања"
 
-#: 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 "основна услуга објављивања"
 
-#: misc/org.yorba.shotwell.gschema.xml:340
-#| msgid "Access _type:"
+#: misc/org.yorba.shotwell.gschema.xml:410
 msgid "access token"
 msgstr "симбол приступа"
 
-#: 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 "и.д. корисника Фејсбука, за тренутно пријављеног корисника, ако постоји"
+msgstr ""
+"и.д. корисника Фејсбука, за тренутно пријављеног корисника, ако постоји"
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#| msgid "User _name"
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "user name"
 msgstr "корисник"
 
-#: 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"
@@ -838,22 +852,22 @@ 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"
@@ -861,18 +875,18 @@ 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."
@@ -880,7 +894,7 @@ 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"
@@ -888,66 +902,64 @@ 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 "лозинка"
 
-#: 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 "запамти лозинку"
 
-#: 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."
@@ -955,21 +967,20 @@ 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 ""
 "ако је наслов подешен а напомена није, користи наслов као напомену за "
 "отпремања на Пивиго"
 
-#: 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"
@@ -977,11 +988,11 @@ 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."
@@ -989,31 +1000,27 @@ msgstr ""
 "Да ли из слика које се отпремају на Пивиго треба да се уклоне њихове ознаке "
 "при отпремању, тако да се те ознаке неће појавити на удаљеном серверу Пивига."
 
-#: misc/org.yorba.shotwell.gschema.xml:499
-#| msgid "Gallery3 publishing module"
+#: misc/org.yorba.shotwell.gschema.xml:569
 msgid "Gallery3 username"
 msgstr "Корисничко име Галерије 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:504
-#| msgid "API _Key:"
+#: misc/org.yorba.shotwell.gschema.xml:574
 msgid "API key"
 msgstr "АПИ кључ"
 
-#: misc/org.yorba.shotwell.gschema.xml:505
-#| msgid "_Gallery3 URL:"
+#: misc/org.yorba.shotwell.gschema.xml:575
 msgid "Gallery3 API key"
 msgstr "АПИ кључ Галерије 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "URL"
 msgstr "Адреса"
 
-#: misc/org.yorba.shotwell.gschema.xml:511
-#| msgid "_Gallery3 URL:"
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 site URL"
 msgstr "Адреса сајта Галерије 3"
 
-#: 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"
@@ -1021,19 +1028,19 @@ msgstr ""
 "Назначава да ли ће са слика отпремљених на Галерију 3 бити прво уклоњени "
 "метаподаци"
 
-#: 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"
@@ -1041,7 +1048,7 @@ 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."
@@ -1049,31 +1056,30 @@ 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 "последња коришћена услуга увоза"
 
-#: 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"
@@ -1081,38 +1087,35 @@ 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 "висина садржаја"
 
-#: 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 "јединице садржаја"
 
-#: 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"
@@ -1120,12 +1123,11 @@ 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"
@@ -1133,23 +1135,22 @@ 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 "одговара односу сразмере"
 
-#: 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"
@@ -1157,12 +1158,11 @@ msgstr ""
 "Одређује да ли произвољне величине штампања морају да одговарају односу "
 "сразмере изворне фотографије"
 
-#: misc/org.yorba.shotwell.gschema.xml:614
-#| msgid "Print image _title"
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "print titles"
 msgstr "штампа наслове"
 
-#: 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."
@@ -1170,227 +1170,213 @@ 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 "укључује прикључак објављивања на галерију 3"
 
-#: 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 ""
 "Изабрано ако је укључен прикључак за објављивање на Галерију 3, у супротном "
 "поништено"
 
-#: 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
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable slideshow crumble transition"
 msgstr "укључује распадање прелаза покретног приказа"
 
-#: 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
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable slideshow fade transition"
 msgstr "укључује ишчезавање прелаза покретног приказа"
 
-#: 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
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow slide transition"
 msgstr "укључује клизање прелаза покретног приказа"
 
-#: 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
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow clock transition"
 msgstr "укључује сат прелаза покретног приказа"
 
-#: 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
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow circle transition"
 msgstr "укључује круг прелаза покретног приказа"
 
-#: misc/org.yorba.shotwell.gschema.xml:717
+#: misc/org.yorba.shotwell.gschema.xml:787
 msgid ""
 "True if the Circle slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак круга прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:723
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак кругова прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:729
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Изабрано ако је укључен прикључак застора прелаза покретног приказа, у "
 "супротном поништено"
 
-#: misc/org.yorba.shotwell.gschema.xml:734
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow squares transition"
 msgstr "укључује квадрате прелаза покретног приказа"
 
-#: 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
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow stripes transition"
 msgstr "укључује штрафте прелаза покретног приказа"
 
-#: 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
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow chess transition"
 msgstr "укључује шах прелаза покретног приказа"
 
-#: 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"
@@ -1398,24 +1384,81 @@ msgstr ""
 "Изабрано ако је укључен прикључак шаха прелаза покретног приказа, у "
 "супротном поништено"
 
-#: plugins/common/Resources.vala:12
-msgid "Visit the Shotwell home page"
-msgstr "Посетите веб страницу Фото-бунара"
+#: 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 ""
+"Тренутно нисте пријављени на Фејсбук.\n"
+"\n"
+"Ако још увек не поседујете налог на Фејсбуку, можете да га направите током "
+"поступка пријављивања. За време пријављивања, Повезивање Фото-бунара може да "
+"вам затражи овлашћење да отпреми фотографије и да их објави на вашем доводу. "
+"Ова овлашћења су неопходна да би Повезивање Фото-бунара радило."
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:676
-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 ""
-"Никола Радовановић <nrad@eunet.rs>\n"
-"Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"Већ сте се једном пријавили и одјавили са Фејсбука током ове сесије Фото-"
+"бунара.\n"
+"Да наставите објављивање фотографија на Фејсбуку, изађите и поново покрените "
+"Фото-бунар, па покушајте поново."
+
+#: 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
+msgid ""
+"You are not currently logged into Flickr.\n"
 "\n"
-"http://prevod.org — превод на српски језик"
+"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 ""
+"Тренутно нисте пријављени на Фликр.\n"
+"\n"
+"Пријавите се на Фликр у вашем интернет прегледнику. Мораћете да овластите "
+"Повезивање Фото-бунара да направи везу до вашег налога Фликра."
 
-#: plugins/common/RESTSupport.vala:451
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "Привремена датотека неопходна за објављивање није доступна"
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+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:481
+msgid "Verifying authorization…"
+msgstr "Проверавам овлашћење…"
 
-#: 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"
@@ -1429,6 +1472,106 @@ msgstr ""
 "Да наставите објављивање на Гугловим услугама, изађите и поново покрените "
 "Фото-бунар, па покушајте поново."
 
+#: 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 ""
+"Тренутно нисте пријављени на Веб албуме Пикасе.\n"
+"\n"
+"Пријавите се на Веб албуме Пикасе у вашем интернет прегледнику. Мораћете да "
+"овластите Повезивање Фото-бунара да направи везу до вашег налога Веб албума "
+"Пикасе."
+
+#: 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 ""
+"Тренутно нисте пријављени на Јутуб.\n"
+"\n"
+"Да наставите морате да поседујете Гуглов налог који сте подесили за "
+"коришћење са Јутубом. Можете да подесите већину налога користећи ваш "
+"прегледник да се пријавите на сајт Јутуба барем једном."
+
+#: plugins/common/Resources.vala:12
+msgid "Visit the Shotwell home page"
+msgstr "Посетите веб страницу Фото-бунара"
+
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:603
+msgid "translator-credits"
+msgstr ""
+"Никола Радовановић <nrad@eunet.rs>\n"
+"Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
+"\n"
+"http://prevod.org — превод на српски језик"
+
+#. 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 "Привремена датотека неопходна за објављивање није доступна"
+
 #: plugins/shotwell-data-imports/FSpotImporter.vala:36
 #: plugins/shotwell-publishing/FacebookPublishing.vala:33
 #: plugins/shotwell-publishing/FlickrPublishing.vala:33
@@ -1524,94 +1667,93 @@ msgstr "Припремам за увоз"
 msgid "Core Data Import Services"
 msgstr "Услуге увоза кључних података"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "_Назад"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:8
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:145
-#: ui/shotwell.ui:1627
-msgid "_Login"
-msgstr "_Пријави ме"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "Адреса _Галерије 3:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
 msgid "_User name:"
 msgstr "Корисничко _име:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "_Назад"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1464
+msgid "_Log in"
+msgstr "_Пријави ме"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "АПИ _кључ:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 msgstr "или"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:5
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:38
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:116
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:115
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:197
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:137
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:229
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
-msgid "_Logout"
-msgstr "_Одјави ме"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:8
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:247
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:134
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:129
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:212
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:153
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:243
-#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
-msgid "_Publish"
-msgstr "_Објави"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "_Постојећи албум"
 
-#: 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 "_Нови албум"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "_Постојећи албум"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 "_Уклони место, податке препознавања ознаке и фото-апарата пре отпремања"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr "Однос промене величине:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr "тачкица"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:195
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: plugins/shotwell-publishing/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 "Изворна величина"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:196
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
 #: src/Dimensions.vala:20
 msgid "Width or height"
 msgstr "Ширина и висина"
 
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:203
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1019
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:105
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:145
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:177
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:125
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:142
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:99
+msgid "_Logout"
+msgstr "_Одјави ме"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:216
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:220
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1018
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:121
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:192
+#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2466
+msgid "_Publish"
+msgstr "_Објави"
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Модулобјављивања Галерије 3"
@@ -1637,8 +1779,8 @@ msgstr "Основни директоријум Фото-бунара"
 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"
@@ -1657,7 +1799,7 @@ msgstr ""
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
 #, c-format
 msgid ""
-"A file required for publishing is unavailable. Publishing to %s can't "
+"A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
 msgstr ""
 "Датотека за објављивање није доступна. Објављивање на „%s“ не може да се "
@@ -1704,57 +1846,55 @@ msgstr "Непознати корисник"
 msgid " Site Not Found"
 msgstr " Нисам пронашао сајт"
 
-#: 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 "Адреса _ел. поште"
 
-#: 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 "_Лозинка"
 
-#: 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 "_Запамти"
 
-#: 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 "Пријави ме"
 
-#: 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 "_Постојећи албум:"
 
-#: 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 "_Нови албум под називом:"
 
-#: 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 "_Сакриј албум"
 
-#: 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 "Отвори циљни _албум у прегледнику"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-msgid "Copyright (C) 2013 rajce.net"
-msgstr "Ауторска права (C) 2013 rajce.net"
+msgid "Copyright © 2013 rajce.net"
+msgstr "Ауторска права © 2013 rajce.net"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
 msgid "An error message occurred when publishing to Rajce. Please try again."
@@ -1772,61 +1912,61 @@ msgstr "Ел. пошта и/или лозинка нису исправни. П�
 msgid "Invalid User Email or Password"
 msgstr "Неисправна ел. пошта корисника или лозинка"
 
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1012
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
 msgid "You are logged into Rajce as %s."
 msgstr "Пријављени сте на Рајс као %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 "Фотографије ће се појавити у:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
 msgid "Shotwell Extra Publishing Services"
 msgstr "Фото-бунарове додатне услуге објављивања"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr "Блогови:"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:60
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:59
 #: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:61
 msgid "Photo _size:"
 msgstr "Величина _фотографије:"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
 msgid "Copyright 2012 BJA Electronics"
-msgstr "Ауторска права 2012 BJA Electronics"
+msgstr "Ауторска права 2012 БЈА Електроника"
 
 #: 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 тачкица"
+#: 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:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1231
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 тачкица"
+#: 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 x 853 pixels"
-msgstr "1280 x 853 тачкица"
+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“ није исправан одговор на захтев потврђивања идентитета отвореног "
 "потврђивања"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
 msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
 msgstr ""
 "„TumblrPublisher: start( ):“ не може да се покрене; овај објављивач није за "
 "поновно покретање."
@@ -1836,22 +1976,22 @@ msgid "Enter the username and password associated with your Tumblr account."
 msgstr "Унесите корисничко име и лозинку придружену вашем налогу Тумблр-а."
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:992
+#: 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:1026
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1117
 msgid "Invalid User Name or Password"
 msgstr "Неисправно корисничко име или лозинка"
 
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:634
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:752
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:635
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:753
 #, c-format
 msgid "Could not load UI: %s"
 msgstr "Не могу да учитам корисничко сучеље: %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"
@@ -1868,125 +2008,92 @@ msgstr "Ауторска права 2010+ Јевгениј Полјаков <zbr
 msgid "Visit the Yandex.Fotki web site"
 msgstr "Посетите веб сајт „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 "Тренутно нисте пријављени на „Yandex.Fotki“."
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Јавно"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+msgid "Friends"
+msgstr "Пријатељи"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
+msgid "Private"
+msgstr "Приватно"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Албуми (или направи нови):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "_Врста приступа:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "Искључи _коментаре"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "_Забрани преузимање изворне фотографије"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
-msgstr "Јавно"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1194
-msgid "Friends"
-msgstr "Пријатељи"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Приватно"
-
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:39
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
 msgid "Publish to an e_xisting album:"
 msgstr "Објави у _постојећи албум:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:57
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
 msgid "Create a _new album named:"
 msgstr "Направи _нови албум:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:108
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1034
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
+#: plugins/shotwell-publishing/FacebookPublishing.vala:725
 msgid "Upload _size:"
 msgstr "_Величина слања:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:139
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:125
 msgid "Videos and new photo albums _visible to:"
 msgstr "Видео снимке и нове албуме фотографија могу _видети:"
 
-#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:175
-#: plugins/shotwell-publishing/flickr_publishing_options_pane.ui:102
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing/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 "_Уклони место, фото-апарат, и друге податке препознавања пре отпремања"
 
-#: 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 "Повезивање Фото-бунара"
 
-#: 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 ""
-"Тренутно нисте пријављени на Фејсбук.\n"
-"\n"
-"Ако још увек не поседујете налог на Фејсбуку, можете да га направите током "
-"поступка пријављивања. За време пријављивања, Повезивање Фото-бунара може да "
-"вам затражи овлашћење да отпреми фотографије и да их објави на вашем доводу. "
-"Ова овлашћења су неопходна да би Повезивање Фото-бунара радило."
-
-#: 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 ""
-"Већ сте се једном пријавили и одјавили са Фејсбука током ове сесије Фото-"
-"бунара.\n"
-"Да наставите објављивање фотографија на Фејсбуку, изађите и поново покрените "
-"Фото-бунар, па покушајте поново."
-
-#: 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..."
-msgstr "Испробавам везу са Фејсбуком..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
+msgid "Creating album…"
+msgstr "Правим албум…"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
-msgstr "Правим албум..."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:374
+#: plugins/shotwell-publishing/FacebookPublishing.vala: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 ""
 "Датотека затражена за објављивање није доступна. Објављивање на Фејсбуку не "
 "може да се настави."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1032
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -1995,78 +2102,22 @@ msgstr ""
 "Пријављени сте на Фејсбук као %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 "Где желите да објавите изабране фотографије?"
 
-#: 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 "Само мени"
 
-#: 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 "Свима"
 
-#: 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 ""
-"Унесите број потврђивања који се појављује након пријављивања на Фликр у "
-"вашем интернет прегледнику."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Број овлашћења:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:132
-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."
-msgstr ""
-"Тренутно нисте пријављени на Фликр.\n"
-"\n"
-"Пријавите се на Фликр у вашем интернет прегледнику.  Мораћете да овластите "
-"Повезивање Фото-бунара да направи везу до вашег налога Фликра."
-
-#: 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 ""
-"Већ сте се пријављивали и одјављивали са Фликра током ове сесије Фото-"
-"бунара.\n"
-"Да наставите објављивање на Фликр, поново покрените Фото-бунар и затим "
-"покушајте поново."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login..."
-msgstr "Припремам се за пријављивање..."
-
-#: 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 ""
-"Датотека за објављивање није доступна. Објављивање на Фликр не може да се "
-"настави."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Проверавам овлашћење..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2075,188 +2126,200 @@ msgstr ""
 "Пријављени сте на Фликр као %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 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] ""
-"Ваш бесплатни налог Фликра ограничава количину података коју можете месечно "
-"да отпремите.\n"
-"За овај месец вам је преостао још %d мегабајт за отпремање."
-msgstr[1] ""
-"Ваш бесплатни налог Фликра ограничава количину података коју можете месечно "
-"да отпремите.\n"
-"За овај месец су вам преостала још %d мегабајта за отпремање."
-msgstr[2] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Ваш бесплатни налог Фликра ограничава количину података коју можете месечно "
 "да отпремите.\n"
-"За овај месец вам је преостало још %d мегабајта за отпремање."
-msgstr[3] ""
-"Ваш бесплатни налог Фликра има ограничење количине података за месечно "
-"отпремање.\n"
-"За овај месец вам је преосто још један мегабајт за отпремање."
+"За овај месец имате само још %s за отпремање."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 msgid "Your Flickr Pro account entitles you to unlimited uploads."
 msgstr "Ваш налог Фликра Про вам омогућава неограничена отпремања."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "Фотографије могу _видети:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "Видео снимке могу _видети:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr "Фотографије и снимке могу _видети:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "Само пријатељи и породица"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "Само породица"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "Само пријатељи"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1232
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 тачкица"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
+msgid "2048 × 1536 pixels"
+msgstr "2048 × 1536 пиксела"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1233
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 тачкица"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
+msgid "4096 × 3072 pixels"
+msgstr "4096 × 3072 пиксела"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
-msgid "L_ist album in public gallery"
-msgstr "_Испиши албум у јавној галерији"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: 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."
-msgstr ""
-"Тренутно нисте пријављени на Веб албуме Пикасе.\n"
-"\n"
-"Пријавите се на Веб албуме Пикасе у вашем интернет прегледнику. Мораћете да "
-"овластите Повезивање Фото-бунара да направи везу до вашег налога Веб албума "
-"Пикасе."
+#. 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
+#: 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 ""
 "Датотека за објављивање није доступна. Објављивање на Пикасу не може да се "
 "настави."
 
 #. 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."
 
-#: 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)"
-msgstr "Мала (640 x 480 тачкица)"
+#: 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)"
-msgstr "Средња (1024 x 768 тачкица)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
+#| msgid "Medium (1024 x 768 pixels)"
+msgid "Medium (1024 × 768 pixels)"
+msgstr "Средња (1024 × 768 пиксела)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Препоручено (1600 x 1200 тачкица)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
+#| msgid "Recommended (1600 x 1200 pixels)"
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr "Препоручено (1600 × 1200 пиксела)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Гугл+ (2048 x 1536 тачкица)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
+#| msgid "Google+ (2048 x 1536 pixels)"
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr "Гугл+ (2048 × 1536 пиксела)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Изворна величина"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
 msgid "_URL of your Piwigo photo library"
 msgstr "_Адреса ваше фототеке Пивигоа"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
 msgid "User _name"
 msgstr "Корисничко _име"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
-msgstr "_Запамти лозинку"
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+msgid "Remember Password"
+msgstr "Запамти лозинку"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
-msgstr "_Постојећа категорија:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
+msgstr "_Постојећа категорија"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
-msgstr "Фотографије могу _видети:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+msgid "A _new album named"
+msgstr "_Нови албум под називом"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+msgid "within category"
+msgstr "у категорији"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
-msgstr "Величина фотографије:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "Напомена албума"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
-msgstr "у категорији:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
+msgstr "Фотографије могу _видети"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
-msgstr "Напомена албума:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "Величина фотографије"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
 msgid "_If a title is set and comment unset, use title as comment"
 msgstr "_Ако је наслов подешен а напомена није, користи наслов као напомену"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
 msgid "_Do no upload tags"
 msgstr "_Не отпремај ознаке"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
 msgid "Logout"
 msgstr "Одјави ме"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291
-#: src/Resources.vala:295
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:295 ui/collection.ui:190
 msgid "Publish"
 msgstr "Објави"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:747
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-msgid "Creating album %s..."
-msgstr "Правим албум „%s“..."
+msgid "Creating album %s…"
+msgstr "Правим албум „%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 "Дошли је до грешке приликом објављивања на Пивигоу. Покушајте поново."
 
-#: 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 ""
+"Ово не изгледа као да је прави <b>%s</b>. Можда нападачи покушавају да "
+"украду или да измене податке који иду ка или од овог сајта (на пример, личне "
+"поруке, податке о кредитним картицама, или лозинке)."
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "Уверење „%sд"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:166
+msgid "_OK"
+msgstr "У _реду"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
@@ -2264,7 +2327,7 @@ msgstr ""
 "Унесите адресу ваше фототеке Пивигоа као и корисничко име и лозинку "
 "придружене вешем налогу Пивигоа за ту фототеку."
 
-#: 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"
@@ -2272,27 +2335,39 @@ msgstr ""
 "Фото-бунар не може да ступи у везу са вашом фототеком Пивигоа. Проверите "
 "адресу коју сте унели"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1021
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "Неисправна адреса"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1219
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Администратори, Породица, Пријатељи, Контакти"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1220
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Администратори, Породица, Пријатељи"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1221
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Администратори, Породица"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1222
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Администратори"
 
-#: 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:50
 msgid "Core Publishing Services"
 msgstr "Кључне услуге објављивања"
 
@@ -2300,43 +2375,24 @@ msgstr "Кључне услуге објављивања"
 msgid "Video privacy _setting:"
 msgstr "Подешавање _приватности снимка:"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:58
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
 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 ""
-"Тренутно нисте пријављени на Јутуб.\n"
-"\n"
-"Да наставите морате да поседујете Гуглов налог који сте подесили за "
-"коришћење са Јутубом. Можете да подесите већину налога користећи ваш "
-"прегледник да се пријавите на сајт Јутуба барем једном."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:363
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
+"A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
 msgstr ""
 "Датотека за објављивање није доступна. Објављивање на Јутуб не може да се "
 "настави."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Пријавили сте се на Јутуб као %s."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-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 "Није јавно доступно"
 
@@ -2373,7 +2429,6 @@ msgid "Core Slideshow Transitions"
 msgstr "Кључни прелази покретног приказа"
 
 #: 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."
@@ -2428,66 +2483,55 @@ msgstr "Не могу да учиним директоријум „%s“ упи
 msgid "Could not make directory %s writable: %s"
 msgstr "Не могу да учиним директоријум „%s“ уписивим: %s"
 
-#: src/AppWindow.vala:54
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "Прибоди траку лата"
 
-#: src/AppWindow.vala:55
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "Прибодите отворену траку лата"
 
-#: src/AppWindow.vala:60
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Напустите приказ преко целог екрана"
 
-#: src/AppWindow.vala:496
-msgid "_Contents"
-msgstr "_Садржај"
-
-#: src/AppWindow.vala:501
-msgid "_Frequently Asked Questions"
-msgstr "_Често постаљана питања"
-
-#: src/AppWindow.vala:506
-msgid "_Report a Problem..."
-msgstr "_Пријави проблем..."
-
-#: src/AppWindow.vala:605 src/AppWindow.vala:626 src/AppWindow.vala:643
-#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1425 src/Dialogs.vala:1448
-#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
+#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570
+#: src/data_imports/DataImportsUI.vala:301
+#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
+#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
+#: src/Resources.vala:157
 msgid "_Cancel"
 msgstr "_Откажи"
 
-#: src/AppWindow.vala:653
+#: src/AppWindow.vala:580
 #, 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 ""
-"Дошло је до кобне грешке приликом приступања фототеци Фото-бунара.  Фото-"
+"Дошло је до кобне грешке приликом приступања фототеци Фото-бунара. Фото-"
 "бунар не може да настави рад.\n"
 "\n"
 "%s"
 
-#: src/AppWindow.vala:673
-#| msgid "Visit the Shotwell home page"
+#: src/AppWindow.vala:600
 msgid "Visit the Shotwell web site"
 msgstr "Посетите веб страницу Фото-бунара"
 
-#: src/AppWindow.vala:685
+#: src/AppWindow.vala:612
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Не могу да прикажем помоћ: %s"
 
-#: src/AppWindow.vala:693
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Не могу да приступим бази података грешака: %s"
 
-#: src/AppWindow.vala:701
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Не могу да прикажем ЧПП: %s"
@@ -2557,97 +2601,81 @@ msgstr "Увоз није успео (%d)"
 msgid "Cameras"
 msgstr "Фото-апарати"
 
-#: src/camera/Branch.vala:99 src/camera/ImportPage.vala:710
-#: src/camera/ImportPage.vala:726 src/MediaPage.vala:440
-#: src/photos/RawSupport.vala:303
+#: src/camera/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
 msgid "Camera"
 msgstr "Фото-апарат"
 
-#: src/camera/ImportPage.vala:311 src/Properties.vala:227
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "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."
+"Unable to unmount camera. Try unmounting the camera from the file manager."
 msgstr ""
-"Не могу да откачим фото-апарат.  Пробајте да откачите фото-апарат из "
+"Не могу да откачим фото-апарат. Пробајте да откачите фото-апарат из "
 "управника датотека."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:775
+#: src/camera/ImportPage.vala:783
 msgid "Hide photos already imported"
 msgstr "Сакриј већ увезене фотографије"
 
-#: src/camera/ImportPage.vala:776
+#: src/camera/ImportPage.vala:784
 msgid "Only display photos that have not been imported"
 msgstr "Прикажи само фотографије које нису увезене"
 
-#: src/camera/ImportPage.vala:842
-msgid "The camera seems to be empty. No photos/videos found to import"
-msgstr "Изгледа да је фото-апарат празан. Нема фотографија/снимака за увоз"
-
-#: src/camera/ImportPage.vala:846
-#| msgid "No photos/videos found"
-msgid "No new photos/videos found on camera"
-msgstr "Нисам пронашао нове фотографије/снимке на фото-апарату"
-
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
-msgid "_Titles"
-msgstr "_Наслови"
-
-#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr "Прикажите називе сваке фотографије"
-
-#: src/camera/ImportPage.vala:885
+#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Увези _изабрано"
 
-#: src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Увезите изабране фотографије у вашу фототеку"
-
-#: src/camera/ImportPage.vala:891
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Увези _све"
 
-#: src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Увезите све фотографије у вашу фототеку"
+#: 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 "Нисам пронашао нове фотографије/снимке на фото-апарату"
 
 #. it's mounted, offer to unmount for the user
-#: src/camera/ImportPage.vala:1013
+#: src/camera/ImportPage.vala:1021
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+"it. Continue?"
 msgstr ""
-"Фото-бунар мора да откачи фото-апарат са система да би му приступио.  Да "
+"Фото-бунар мора да откачи фото-апарат са система да би му приступио. Да "
 "наставим?"
 
-#: src/camera/ImportPage.vala:1019
+#: src/camera/ImportPage.vala:1027
 msgid "_Unmount"
 msgstr "_Откачи"
 
-#: src/camera/ImportPage.vala:1024
+#: src/camera/ImportPage.vala:1032
 msgid "Please unmount the camera."
 msgstr "Откачите фото-апарат."
 
-#: src/camera/ImportPage.vala:1029
+#: 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 "
+"The camera is locked by another application. Shotwell can only access the "
+"camera when it’s unlocked. Please close any other application using the "
 "camera and try again."
 msgstr ""
-"Фото-апарат је закључан другим програмом.  Фото-бунар може да приступи фото-"
-"апарату само када је откључан.  Затворите све друге програме који користе "
+"Фото-апарат је закључан другим програмом. Фото-бунар може да приступи фото-"
+"апарату само када је откључан. Затворите све друге програме који користе "
 "фото-апарат и покушајте поново."
 
-#: src/camera/ImportPage.vala:1039
+#: src/camera/ImportPage.vala:1047
 msgid "Please close any other application using the camera."
 msgstr "Затворите све друге програме који користе фото-апарат."
 
-#: src/camera/ImportPage.vala:1044
+#: src/camera/ImportPage.vala:1052
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2656,29 +2684,29 @@ msgstr ""
 "Не могу да довучем претпрегледе фотографија са фото-апарата:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1061
-msgid "Unmounting..."
-msgstr "Откачињем..."
+#: src/camera/ImportPage.vala:1069
+msgid "Unmounting…"
+msgstr "Откачињем…"
 
-#: src/camera/ImportPage.vala:1152
-msgid "Starting import, please wait..."
-msgstr "Започињем увоз, сачекајте мало..."
+#: src/camera/ImportPage.vala:1160
+msgid "Starting import, please wait…"
+msgstr "Започињем увоз, сачекајте мало…"
 
-#: src/camera/ImportPage.vala:1169
+#: src/camera/ImportPage.vala:1177
 msgid "Fetching photo information"
 msgstr "Преузимам податке о фотографији"
 
-#: src/camera/ImportPage.vala:1527
+#: src/camera/ImportPage.vala:1535
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Преузимам претпреглед за „%s“"
 
-#: src/camera/ImportPage.vala:1643
+#: src/camera/ImportPage.vala:1651
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Не могу да закључам фото-апарат: %s"
 
-#: src/camera/ImportPage.vala:1728
+#: src/camera/ImportPage.vala:1736
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2687,7 +2715,7 @@ msgstr[1] "Да обришем ове %d фотографије са фото-а
 msgstr[2] "Да обришем ових %d фотографија са фото-апарата?"
 msgstr[3] "Да обришем ову %d фотографију са фото-апарата?"
 
-#: src/camera/ImportPage.vala:1731
+#: src/camera/ImportPage.vala:1739
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2696,7 +2724,7 @@ msgstr[1] "Да обришем ова %d снимка са фото-апарат
 msgstr[2] "Да обришем ових %d снимака са фото-апарата?"
 msgstr[3] "Да обришем овај %d снимак са фото-апарата?"
 
-#: src/camera/ImportPage.vala:1734
+#: src/camera/ImportPage.vala:1742
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2705,7 +2733,7 @@ msgstr[1] "Да обришем ове %d фотографије/снимка с�
 msgstr[2] "Да обришем ових %d фотографија/снимака са фото-апарата?"
 msgstr[3] "Да обришем ову %d фотографију/снимак са фото-апарата?"
 
-#: src/camera/ImportPage.vala:1737
+#: src/camera/ImportPage.vala:1745
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2714,15 +2742,15 @@ msgstr[1] "Да обришем ове %d датотеке са фото-апар
 msgstr[2] "Да обришем ових %d датотека са фото-апарата?"
 msgstr[3] "Да обришем ову %d датотеку са фото-апарата?"
 
-#: src/camera/ImportPage.vala:1745 src/Dialogs.vala:1392
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Задржи"
 
-#: src/camera/ImportPage.vala:1764
+#: src/camera/ImportPage.vala:1772
 msgid "Removing photos/videos from camera"
 msgstr "Уклањам фотографије/снимке са фото-апарата"
 
-#: src/camera/ImportPage.vala:1768
+#: 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."
@@ -2735,51 +2763,127 @@ msgstr[2] ""
 msgstr[3] ""
 "Не могу да обришем %d фотографију/снимак са фото-апарата, услед грешке."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
+#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2461 src/Resources.vala:170
+msgid "_Print"
+msgstr "_Штампај"
+
+#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28
+msgid "Send _To…"
+msgstr "Пошаљи _у…"
+
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2471 src/Resources.vala:220
+msgid "Set as _Desktop Background"
+msgstr "Постави за _позадину"
+
+#: src/CollectionPage.vala:86 src/Resources.vala:286
+msgid "_Duplicate"
+msgstr "_Удвостручи"
+
+#: src/CollectionPage.vala:94
+msgid "Fullscreen"
+msgstr "Преко целог екрана"
+
+#: src/CollectionPage.vala:96 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "_Покретни приказ"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Покрените покретни приказ"
+#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Окрени на _десно"
+
+#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Окрени на _лево"
+
+#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Изврни _водоравно"
+
+#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Изврни _усправно"
+
+#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
+#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:445
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "_Побољшај"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:450
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "_Врати на изворно"
+
+#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "_Умножи дотеривања боје"
+
+#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "_Убаци дотеривања боје"
+
+#: src/CollectionPage.vala:129
+msgid "Adjust Date and Time…"
+msgstr "Подесите датум и време…"
+
+#: src/CollectionPage.vala:137 src/Resources.vala:319
+msgid "Open With E_xternal Editor"
+msgstr "_Отвори спољним уређивачем"
+
+#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363
+msgid "Open With RA_W Editor"
+msgstr "Отвори уређивачем _сирових"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:167
+msgid "_Play"
+msgstr "Пу_сти"
+
+#: src/CollectionPage.vala:409
 msgid "Export Photo/Video"
 msgstr "Извезите фотографију/снимак"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:409
 msgid "Export Photos/Videos"
 msgstr "Извезите фотографије/снимке"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
+#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2995
 msgid "Export Photo"
 msgstr "Извезите фотографију"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:88
+#: src/CollectionPage.vala:411 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Извезите фотографије"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Rotating"
 msgstr "Окрећем"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Undoing Rotate"
 msgstr "Поништавам окретање"
 
-#: src/CollectionPage.vala:570
+#: src/CollectionPage.vala:523
 msgid "Flipping Horizontally"
 msgstr "Изврћем водоравно"
 
-#: src/CollectionPage.vala:571
+#: src/CollectionPage.vala:524
 msgid "Undoing Flip Horizontally"
 msgstr "Поништавам водоравно извртање"
 
-#: src/CollectionPage.vala:580
+#: src/CollectionPage.vala:533
 msgid "Flipping Vertically"
 msgstr "Изврћем усправно"
 
-#: src/CollectionPage.vala:581
+#: src/CollectionPage.vala:534
 msgid "Undoing Flip Vertically"
 msgstr "Поништавам усправно извртање"
 
@@ -2915,7 +3019,7 @@ msgstr "Направи ознаку"
 
 #: src/Commands.vala:1695
 #, c-format
-msgid "Move Tag \"%s\""
+msgid "Move Tag “%s”"
 msgstr "Премести ознаку „%s“"
 
 #: src/Commands.vala:2347
@@ -2976,7 +3080,7 @@ 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“ јер се појавила грешка:"
 
 #: src/data_imports/DataImportsPluginHost.vala:151
@@ -3001,7 +3105,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Датотека збирке:"
 
-#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:904
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
 msgid "_Import"
 msgstr "_Увези"
 
@@ -3013,7 +3117,7 @@ msgstr "Увезите из програма"
 msgid "Import media _from:"
 msgstr "Увези медијум _из:"
 
-#: src/data_imports/DataImportsUI.vala:408 src/publishing/PublishingUI.vala:507
+#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
 msgid "_Close"
 msgstr "_Затвори"
 
@@ -3051,11 +3155,8 @@ msgstr ""
 "Грешка је:\n"
 "%s"
 
-#: src/db/DatabaseTable.vala:88
+#: 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“"
 
@@ -3080,23 +3181,26 @@ 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?"
-msgstr[0] "Ово ће уклонити ознаку „%s“ из %d фотографије.  Да наставим?"
-msgstr[1] "Ово ће уклонити ознаку „%s“ из %d фотографије.  Да наставим?"
-msgstr[2] "Ово ће уклонити ознаку „%s“ из %d фотографија.  Да наставим?"
-msgstr[3] "Ово ће уклонити ознаку „%s“ из %d фотографије.  Да наставим?"
-
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1393
-#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
-#: src/Resources.vala:674
+#| msgid "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] "    "
+
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Избриши"
 
 #: src/Dialogs.vala:25
 #, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
-msgstr "Ово ће уклонити сачувану претрагу „%s“.  Да наставим?"
+msgid "This will remove the saved search “%s”. Continue?"
+msgstr "Ово ће уклонити сачувану претрагу „%s“. Да наставим?"
 
 #: src/Dialogs.vala:36
 msgid ""
@@ -3131,16 +3235,16 @@ msgstr "Извези снимак"
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: src/Dialogs.vala:116
+#: src/Dialogs.vala:112
 #, c-format
 msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
+"Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
 msgstr ""
 "Фото-бунар не може да направи датотеку за уређивање ове фотографије јер "
 "немате неопходне дозволе за писање у „%s“."
 
-#: src/Dialogs.vala:125
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -3148,7 +3252,7 @@ msgstr ""
 "Не могу да извезем следећу фотографију због грешке у датотеци.\n"
 "\n"
 
-#: src/Dialogs.vala:131
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -3161,53 +3265,54 @@ 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 "Неизмењено"
 
-#: src/Dialogs.vala:149
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "Текуће"
 
 #. layout controls
-#: src/Dialogs.vala:216
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "_Запис:"
 
-#: src/Dialogs.vala:219
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Квалитет:"
 
-#: src/Dialogs.vala:222
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "_Однос промене величине:"
 
-#: src/Dialogs.vala:225
+#: src/Dialogs.vala:230
 msgid "_Pixels:"
 msgstr "_Тачкица:"
 
-#: src/Dialogs.vala:228
-msgid "Export metadata"
-msgstr "Извоз метаподатака"
+#: src/Dialogs.vala:234
+#| msgid "Export metadata"
+msgid "Export _metadata:"
+msgstr "Извези _метаподатке:"
 
-#: src/Dialogs.vala:462
-msgid "Save Details..."
-msgstr "Сачувај појединости..."
+#: src/Dialogs.vala:478
+msgid "Save Details…"
+msgstr "Сачувај појединости…"
 
-#: src/Dialogs.vala:463
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Сачувај појединости"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(и још %d)\n"
 
-#: src/Dialogs.vala:531
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "Извештај резултата увоза"
 
-#: src/Dialogs.vala:535
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -3216,7 +3321,7 @@ msgstr[1] "Покушах да увезем %d датотеке."
 msgstr[2] "Покушах да увезем %d датотека."
 msgstr[3] "Покушах да увезем %d датотеку."
 
-#: 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."
@@ -3228,39 +3333,39 @@ msgstr[3] "Од ових, %d датотека је успешно увезена
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:550
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Удвостручене фотографије/снимци нису увезени:"
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr "удвостручава постојећу ставку медијума"
 
 #.
 #. 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 "Фотографије/снимци нису увезени због грешке фото-апарата:"
 
-#: 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 "порука грешке:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:579
-msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:595
+msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr "Датотеке нису увезене јер нису препознате као фотографије или снимци:"
 
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: src/Dialogs.vala:594
+#: src/Dialogs.vala:610
 msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
 msgstr ""
 "Фотографије/снимци нису увезени јер нису били у запису који Фото-бунар "
@@ -3269,18 +3374,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:609
+#: src/Dialogs.vala:625
 msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr ""
 "Фотографије/снимци нису увезени јер Фото-бунар не може да их умножи у својој "
 "фототеци:"
 
-#: src/Dialogs.vala:613
+#: src/Dialogs.vala:629
 #, c-format
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
 "не могу да умножим „%s“\n"
@@ -3289,18 +3394,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:641
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Фотографије/снимци нису увезени јер су датотеке оштећене:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:640
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Фотографије/снимци нису увезени из других разлога:"
 
-#: 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"
@@ -3309,7 +3414,7 @@ msgstr[1] "%d удвостручене фотографије нису увез�
 msgstr[2] "%d удвостручених фотографија није увезено:\n"
 msgstr[3] "%d удвостручена фотографија није увезена:\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"
@@ -3318,7 +3423,7 @@ msgstr[1] "%d удвостручена снимка нису увезена:\n"
 msgstr[2] "%d удвостручених снимака није увезено:\n"
 msgstr[3] "%d удвостручени снимак није увезен:\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"
@@ -3327,7 +3432,7 @@ msgstr[1] "%d удвостручене фотографије/снимка ни�
 msgstr[2] "%d удвостручених фотографија/снимака није увезено:\n"
 msgstr[3] "%d удвостручена фотографија/снимак није увезенa:\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"
@@ -3342,7 +3447,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d фотографију због грешке у датотеци или на уређају:\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"
@@ -3355,7 +3460,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d снимак због грешке у датотеци или на уређају:\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 ""
@@ -3373,7 +3478,7 @@ msgstr[3] ""
 "Нисам успео да увезем %d фотографију/снимак због грешке у датотеци или на "
 "уређају:\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"
@@ -3386,7 +3491,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d датотеку због грешке у датотеци или на уређају:\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"
@@ -3402,7 +3507,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d фотографију јер фасцикла фототеке није уписива:\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"
@@ -3418,7 +3523,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d снимак јер фасцикла фототеке није уписива:\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 "
@@ -3439,7 +3544,7 @@ msgstr[3] ""
 "Нисам успео да увезем %d фотографију/снимак јер фасцикла фототеке није "
 "уписива:\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"
@@ -3455,7 +3560,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d датотеку јер фасцикла фототеке није уписива:\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"
@@ -3464,7 +3569,7 @@ msgstr[1] "Нисам успео да увезем %d фотографије з�
 msgstr[2] "Нисам успео да увезем %d фотографија због грешке на фото-апарату:\n"
 msgstr[3] "Нисам успео да увезем %d фотографију због грешке на фото-апарату:\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"
@@ -3473,7 +3578,7 @@ msgstr[1] "Нисам успео да увезем %d снимка због гр
 msgstr[2] "Нисам успео да увезем %d снимака због грешке на фото-апарату:\n"
 msgstr[3] "Нисам успео да увезем %d снимак због грешке на фото-апарату:\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"
@@ -3486,7 +3591,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Нисам успео да увезем %d фотографију/снимак због грешке на фото-апарату:\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"
@@ -3495,7 +3600,7 @@ msgstr[1] "Нисам успео да увезем %d датотеке због
 msgstr[2] "Нисам успео да увезем %d датотека због грешке на фото-апарату:\n"
 msgstr[3] "Нисам успео да увезем %d датотеку због грешке на фото-апарату:\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"
@@ -3504,7 +3609,7 @@ msgstr[1] "Нисам успео да увезем %d фотографије ј�
 msgstr[2] "Нисам успео да увезем %d фотографија јер су оштећене:\n"
 msgstr[3] "Нисам успео да увезем %d фотографију јер је оштећена:\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"
@@ -3513,7 +3618,7 @@ msgstr[1] "Нисам успео да увезем %d снимка јер су �
 msgstr[2] "Нисам успео да увезем %d снимка јер су оштећени:\n"
 msgstr[3] "Нисам успео да увезем %d снимак јер је оштећен:\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"
@@ -3522,7 +3627,7 @@ msgstr[1] "Нисам успео да увезем %d фотографије/с�
 msgstr[2] "Нисам успео да увезем %d фотографија/снимака јер су оштећене:\n"
 msgstr[3] "Нисам успео да увезем %d фотографију/снимак јер је оштећена:\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"
@@ -3535,7 +3640,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:775
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3546,7 +3651,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:790
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -3555,7 +3660,7 @@ msgstr[1] "Прескочио сам %d датотеке које нису фо�
 msgstr[2] "Прескочио сам %d датотека које нису фотографије.\n"
 msgstr[3] "Прескочио сам %d датотеку која није фотографија.\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"
@@ -3564,7 +3669,7 @@ msgstr[1] "Прескочио сам %d фотографије јер је ко�
 msgstr[2] "Прескочио сам %d фотографија јер је корисник отказао:\n"
 msgstr[3] "Прескочио сам %d фотографију јер је корисник отказао:\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"
@@ -3573,7 +3678,7 @@ msgstr[1] "Прескочио сам %d снимка јер је корисни�
 msgstr[2] "Прескочио сам %d снимака јер је корисник отказао:\n"
 msgstr[3] "Прескочио сам %d снимак јер је корисник отказао:\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"
@@ -3582,7 +3687,7 @@ msgstr[1] "Прескочио сам %d фотографије/снимка је
 msgstr[2] "Прескочио сам %d фотографија/снимака јер је корисник отказао:\n"
 msgstr[3] "Прескочио сам %d фотографију/снимак јер је корисник отказао:\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"
@@ -3591,7 +3696,7 @@ msgstr[1] "Прескочио сам %d датотеке јер је корис�
 msgstr[2] "Прескочио сам %d датотека јер је корисник отказао:\n"
 msgstr[3] "Прескочио сам %d датотеку јер је корисник отказао:\n"
 
-#: src/Dialogs.vala:824
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -3600,7 +3705,7 @@ msgstr[1] "Успешно сам увезао %d фотографије.\n"
 msgstr[2] "Успешно сам увезао %d фотографија.\n"
 msgstr[3] "Успешно сам увезао %d фотографију.\n"
 
-#: src/Dialogs.vala:827
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -3609,7 +3714,7 @@ msgstr[1] "Успешно сам увезао %d снимка.\n"
 msgstr[2] "Успешно сам увезао %d снимака.\n"
 msgstr[3] "Успешно сам увезао %d снимак.\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"
@@ -3620,15 +3725,15 @@ 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:846
+#: src/Dialogs.vala:862
 msgid "No photos or videos imported.\n"
 msgstr "Није увезена ниједна фотографија ни снимак.\n"
 
-#: src/Dialogs.vala:853 src/Dialogs.vala:872
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "Увоз је завршен"
 
-#: src/Dialogs.vala:1158
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -3637,7 +3742,7 @@ msgstr[1] "%d секунде"
 msgstr[2] "%d секунди"
 msgstr[3] "%d секунда"
 
-#: src/Dialogs.vala:1161
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -3646,7 +3751,7 @@ msgstr[1] "%d минута"
 msgstr[2] "%d минута"
 msgstr[3] "%d минут"
 
-#: src/Dialogs.vala:1165
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -3655,43 +3760,42 @@ msgstr[1] "%d сата"
 msgstr[2] "%d сати"
 msgstr[3] "%d сат"
 
-#: src/Dialogs.vala:1168
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 дан"
 
-#: src/Dialogs.vala:1322 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Преименујте догађај"
 
-#: src/Dialogs.vala:1322
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Назив:"
 
 #. Dialog title
-#: src/Dialogs.vala:1333
-#| msgid "Edit Title"
+#: src/Dialogs.vala:1328
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Уредите наслов"
 
-#: src/Dialogs.vala:1334 src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Наслов:"
 
 #. Dialog title
-#: src/Dialogs.vala:1350 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Уредите напомену догађаја"
 
-#: src/Dialogs.vala:1351
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Уредите напомену фотографије/снимка"
 
-#: src/Dialogs.vala:1352 src/Properties.vala:628
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Напомена:"
 
-#: src/Dialogs.vala:1368
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Уклони и _oбриши фотографију"
@@ -3699,58 +3803,57 @@ msgstr[1] "Уклони и _oбриши фотографије"
 msgstr[2] "Уклони и _oбриши фотографије"
 msgstr[3] "Уклони и _oбриши фотографију"
 
-#: src/Dialogs.vala:1372
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "_Уклони из фототеке"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Да ли да вратим спољну измену?"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Да ли да вратим спољне измене?"
 
-#: 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?"
+"This will destroy all changes made to %d external files. Continue?"
 msgstr[0] ""
-"Ова радња ће уништити све измене на %d спољној датотеци.  Да наставим?"
+"Ова радња ће уништити све измене на %d спољној датотеци. Да наставим?"
 msgstr[1] ""
-"Ова радња ће уништити све измене на %d спољне датотеке.  Да наставим?"
+"Ова радња ће уништити све измене на %d спољне датотеке. Да наставим?"
 msgstr[2] ""
-"Ова радња ће уништити све измене на %d спољних датотека.  Да наставим?"
-msgstr[3] ""
-"Ова радња ће уништити све измене на %d спољној датотеци.  Да наставим?"
+"Ова радња ће уништити све измене на %d спољних датотека. Да наставим?"
+msgstr[3] " "
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "_Врати спољну измену"
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "_Врати спољне измене"
 
-#: 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?"
-msgstr[0] "Ово ће уклонити %d фотографију из фототеке.  Да наставим?"
-msgstr[1] "Ово ће уклонити %d фотографије из фототеке.  Да наставим?"
-msgstr[2] "Ово ће уклонити %d фотографија из фототеке.  Да наставим?"
-msgstr[3] "Ово ће уклонити %d фотографију из фототеке.  Да наставим?"
+msgid "This will remove the photo from the library. Continue?"
+msgid_plural "This will remove %d photos from the library. Continue?"
+msgstr[0] "Ово ће уклонити %d фотографију из фототеке. Да наставим?"
+msgstr[1] "Ово ће уклонити %d фотографије из фототеке. Да наставим?"
+msgstr[2] "Ово ће уклонити %d фотографија из фототеке. Да наставим?"
+msgstr[3] "     "
 
-#: src/Dialogs.vala:1449 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Уклоните фотографију из фототеке"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Уклоните фотографије из фототеке"
 
@@ -3779,35 +3882,37 @@ msgstr "_Помери фотографије/снимке за исти изно
 msgid "Set _all photos/videos to this time"
 msgstr "Постави _све фотографије/снимке на ово време"
 
-#: src/Dialogs.vala:1726
+#: src/Dialogs.vala:1725
+#| msgid "_Modify original photo file"
 msgid "_Modify original photo file"
-msgstr "_Измени изворну фотографију"
-
-#: src/Dialogs.vala:1726
-msgid "_Modify original photo files"
-msgstr "_Измени изворне фотографије"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Измени изворну фотографију"
+msgstr[1] "_Измени изворне фотографије"
+msgstr[2] "_Измени изворне фотографије"
+msgstr[3] "_Измени изворну фотографију"
 
 #: src/Dialogs.vala:1729
+#| msgid "_Modify original file"
 msgid "_Modify original file"
-msgstr "_Измени изворну датотеку"
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original files"
-msgstr "_Измени изворне датотеке"
+msgid_plural "_Modify original files"
+msgstr[0] "_Измени изворну датотеку"
+msgstr[1] "_Измени изворне датотеке"
+msgstr[2] "_Измени изворне датотеке"
+msgstr[3] "_Измени изворну датотеку"
 
-#: src/Dialogs.vala:1815
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Изворно: "
 
-#: 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. %H:%M:%S"
 
-#: src/Dialogs.vala:1906
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3816,7 +3921,7 @@ msgstr ""
 "Време излагања ће бити померено унапред за\n"
 "%d %s, %d %s, %d %s, и %d %s."
 
-#: src/Dialogs.vala:1907
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3825,7 +3930,7 @@ msgstr ""
 "Вреем излагања ће бити померено уназад за\n"
 "%d %s, %d %s, %d %s, и %d %s."
 
-#: src/Dialogs.vala:1909
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "дан"
@@ -3833,7 +3938,7 @@ msgstr[1] "дана"
 msgstr[2] "дана"
 msgstr[3] "дан"
 
-#: src/Dialogs.vala:1910
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "сат"
@@ -3841,7 +3946,7 @@ msgstr[1] "сата"
 msgstr[2] "сати"
 msgstr[3] "сат"
 
-#: src/Dialogs.vala:1911
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
@@ -3849,7 +3954,7 @@ msgstr[1] "минута"
 msgstr[2] "минута"
 msgstr[3] "минут"
 
-#: src/Dialogs.vala:1912
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунду"
@@ -3857,7 +3962,7 @@ msgstr[1] "секунде"
 msgstr[2] "секунди"
 msgstr[3] "секунду"
 
-#: src/Dialogs.vala:1956
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -3884,49 +3989,49 @@ msgstr[3] ""
 "\n"
 "И %d друга."
 
-#: src/Dialogs.vala:1980 src/Dialogs.vala:2007
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Ознаке (раздвојене запетом):"
 
-#: src/Dialogs.vala:2087
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Добро дошли!"
 
-#: src/Dialogs.vala:2094
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Добро дошли у Фото-бунар!"
 
-#: src/Dialogs.vala:2098
+#: src/Dialogs.vala:2101
 msgid "To get started, import photos in any of these ways:"
 msgstr "Да започнете, увезите фотографије на један од следећих начина:"
 
-#: src/Dialogs.vala:2117
+#: 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:2118
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Превуците и убаците фотографију у прозор Фото-бунара"
 
-#: src/Dialogs.vala:2119
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "Повежите фото-апарат на рачунар и увезите фотографије"
 
-#: src/Dialogs.vala:2129
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Увези фотографије из фасцикле „%s“"
 
-#: src/Dialogs.vala:2136
+#: src/Dialogs.vala:2141
 msgid "You can also import photos in any of these ways:"
 msgstr "Можете увести фотографије на неки од следећих начина:"
 
-#: src/Dialogs.vala:2146
-msgid "_Don't show this message again"
+#: src/Dialogs.vala:2152
+msgid "_Don’t show this message again"
 msgstr "_Не приказуј више ову поруку"
 
-#: src/Dialogs.vala:2181
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Увезите фотографије из фототеке „%s“"
@@ -3934,41 +4039,41 @@ 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:2328 src/Dialogs.vala:2332
+#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
 msgid "(Help)"
 msgstr "(Помоћ)"
 
-#: src/Dialogs.vala:2341
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Година%sмесец%sдан"
 
-#: src/Dialogs.vala:2343
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "Година%sмесец"
 
-#: src/Dialogs.vala:2345
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Година%sмесец-дан"
 
-#: src/Dialogs.vala:2347
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "Година-месец-дан"
 
-#: src/Dialogs.vala:2348 src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Произвољно"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2585
+#: 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:2687
+#: src/Dialogs.vala:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3976,146 +4081,133 @@ msgstr ""
 "Фото-бунар може да умножи фотографије у фасциклу фототеке или да их увезе "
 "без умножавања."
 
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "_Умножи фотографије"
 
-#: src/Dialogs.vala:2693
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "Увези _на месту"
 
-#: src/Dialogs.vala:2694
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Увезите у фототеку"
 
-#: src/Dialogs.vala:2704 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2871
 msgid "Remove From Library"
 msgstr "Уклоните из фототеке"
 
-#: src/Dialogs.vala:2705 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2871
 msgid "Removing Photo From Library"
 msgstr "Уклањам фотографију из фототеке"
 
-#: src/Dialogs.vala:2705
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Уклањам фотографије из фототеке"
 
-#: src/Dialogs.vala:2719
+#: src/Dialogs.vala:2724
 #, 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] ""
-"Ово ће уклонити %d фотографију/снимак из ваше фототеке Фото-бунара.  Да ли "
+"Ово ће уклонити %d фотографију/снимак из ваше фототеке Фото-бунара. Да ли "
 "бисте такође желели да преместите датотеку у корпу ваше радне површи?\n"
 "\n"
 "Ова радња не може бити поништена."
 msgstr[1] ""
-"Ово ће уклонити %d фотографије/снимка из ваше фототеке Фото-бунара.  Да ли "
+"Ово ће уклонити %d фотографије/снимка из ваше фототеке Фото-бунара. Да ли "
 "бисте такође желели да преместите датотеке у корпу ваше радне површи?\n"
 "\n"
 "Ова радња не може бити поништена."
 msgstr[2] ""
-"Ово ће уклонити %d фотографија/снимака из ваше фототеке Фото-бунара.  Да ли "
+"Ово ће уклонити %d фотографија/снимака из ваше фототеке Фото-бунара. Да ли "
 "бисте такође желели да преместите датотеке у корпу ваше радне површи?\n"
 "\n"
 "Ова радња не може бити поништена."
-msgstr[3] ""
-"Ово ће уклонити %d фотографију/снимак из ваше фототеке Фото-бунара.  Да ли "
-"бисте такође желели да преместите датотеку у корпу ваше радне површи?\n"
-"\n"
-"Ова радња не може бити поништена."
+msgstr[3] "   "
 
-#: src/Dialogs.vala:2723
+#: src/Dialogs.vala:2728
 #, 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] ""
-"Ово ће уклонити %d снимак из ваше фототеке Фото-бунара.  Да ли бисте такође "
+"Ово ће уклонити %d снимак из ваше фототеке Фото-бунара. Да ли бисте такође "
 "желели да преместите датотеку у корпу ваше радне површи?\n"
 "\n"
 "Ова радња не може бити поништена."
 msgstr[1] ""
-"Ово ће уклонити %d снимка из ваше фототеке Фото-бунара.  Да ли бисте такође "
+"Ово ће уклонити %d снимка из ваше фототеке Фото-бунара. Да ли бисте такође "
 "желели да преместите датотеке у корпу ваше радне површи?\n"
 "\n"
 "Ова радња не може бити поништена."
 msgstr[2] ""
-"Ово ће уклонити %d снимака из ваше фототеке Фото-бунара.  Да ли бисте такође "
+"Ово ће уклонити %d снимака из ваше фототеке Фото-бунара. Да ли бисте такође "
 "желели да преместите датотеке у корпу ваше радне површи?\n"
 "\n"
 "Ова радња не може бити поништена."
-msgstr[3] ""
-"Ово ће уклонити %d снимак из ваше фототеке Фото-бунара.  Да ли бисте такође "
-"желели да преместите датотеку у корпу ваше радне површи?\n"
-"\n"
-"Ова радња не може бити поништена."
+msgstr[3] "  "
 
-#: src/Dialogs.vala:2727
+#: src/Dialogs.vala:2732
 #, 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] ""
-"Ово ће уклонити %d фотографију из ваше фототеке Фото-бунара.  Да ли бисте "
+"Ово ће уклонити %d фотографију из ваше фототеке Фото-бунара. Да ли бисте "
 "такође желели да преместите датотеку у корпу ваше радне површи?\n"
 "\n"
 "Ова радња не може бити поништена."
 msgstr[1] ""
-"Ово ће уклонити %d фотографије из ваше фототеке Фото-бунара.  Да ли бисте "
+"Ово ће уклонити %d фотографије из ваше фототеке Фото-бунара. Да ли бисте "
 "такође желели да преместите датотеке у корпу ваше радне површи?\n"
 "\n"
 "Ова радња не може бити поништена."
 msgstr[2] ""
-"Ово ће уклонити %d фотографија из ваше фототеке Фото-бунара.  Да ли бисте "
+"Ово ће уклонити %d фотографија из ваше фототеке Фото-бунара. Да ли бисте "
 "такође желели да преместите датотеке у корпу ваше радне површи?\n"
 "\n"
 "Ова радња не може бити поништена."
-msgstr[3] ""
-"Ово ће уклонити %d фотографију из ваше фототеке Фото-бунара.  Да ли бисте "
-"такође желели да преместите датотеку у корпу ваше радне површи?\n"
-"\n"
-"Ова радња не може бити поништена."
+msgstr[3] "       "
 
-#: 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?"
+"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 фотографију/снимак.  Да ли да уклоним?"
+"Не могу да преместим у смеће %d фотографију/снимак. Да ли да уклоним?"
 msgstr[1] ""
-"Не могу да преместим у смеће %d фотографије/снимка.  Да ли да уклоним?"
+"Не могу да преместим у смеће %d фотографије/снимка. Да ли да уклоним?"
 msgstr[2] ""
-"Не могу да преместим у смеће %d фотографија/снимака.  Да ли да уклоним?"
-msgstr[3] ""
-"Не могу да преместим у смеће %d фотографију/снимак.  Да ли да уклоним?"
+"Не могу да преместим у смеће %d фотографија/снимака. Да ли да уклоним?"
+msgstr[3] "      "
 
 #. 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."
@@ -4132,127 +4224,17 @@ msgstr "Ширина"
 msgid "Height"
 msgstr "Висина"
 
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Датотека"
-
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
-msgid "_Save"
-msgstr "_Сачувај"
-
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Сачувајте фотографију"
-
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Сачувај _као..."
-
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Сачувајте фотографију под другим називом"
-
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Штампајте фотографију на штампачу који је повезан на овај рачунар"
-
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr "_Уређивање"
-
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Фотографија"
-
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr "_Алати"
-
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr "_Претходна фотографија"
-
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr "Претходна фотографија"
-
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr "_Следећа фотографија"
-
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr "Следећа фотографија"
-
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2412
-msgid "_View"
-msgstr "_Преглед"
-
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr "По_моћ"
-
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2591 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "У_већај"
-
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr "Увећајте приказ фотографије"
-
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2597 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "У_мањи"
-
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr "Умањите приказ фотографије"
-
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr "Испуни _страницу"
-
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr "Увећајте фотографију да испуни екран"
-
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Увећај на _100%"
-
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Прикажите фотографију у пуној величини"
-
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Увећај на _200%"
-
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Прикажите фотографију увећану два пута"
-
-#: src/direct/DirectPhotoPage.vala:227
+#: src/direct/DirectPhotoPage.vala:99
 #, c-format
 msgid "%s does not exist."
 msgstr "„%s“ не постоји."
 
-#: src/direct/DirectPhotoPage.vala:229
+#: src/direct/DirectPhotoPage.vala:101
 #, c-format
 msgid "%s is not a file."
 msgstr "„%s“ није датотека."
 
-#: src/direct/DirectPhotoPage.vala:231
+#: src/direct/DirectPhotoPage.vala:103
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
@@ -4261,34 +4243,34 @@ msgstr ""
 "„%s“ не подржава запис датотеке\n"
 "%s."
 
-#: src/direct/DirectPhotoPage.vala:248
+#: 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:432
+#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8
+msgid "_Save"
+msgstr "_Сачувај"
+
+#: src/direct/DirectPhotoPage.vala:304
 msgid "_Save a Copy"
 msgstr "_Сачувај примерак"
 
-#: src/direct/DirectPhotoPage.vala:435
+#: src/direct/DirectPhotoPage.vala:307
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Да заборавим измене над „%s“?"
 
-#: src/direct/DirectPhotoPage.vala:436
+#: src/direct/DirectPhotoPage.vala:308
 msgid "Close _without Saving"
 msgstr "Затвори _без чувања"
 
-#: src/direct/DirectPhotoPage.vala:469
+#: src/direct/DirectPhotoPage.vala:341
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Грешка приликом чувања у „%s“: %s"
 
-#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
+#: src/direct/DirectPhotoPage.vala:371 src/direct/DirectPhotoPage.vala:392
 msgid "Save As"
 msgstr "Сачувајте као"
 
@@ -4298,193 +4280,202 @@ msgstr "Сачувајте као"
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Не могу да пратим „%s“: Није директоријум (%s)"
 
-#: src/editing_tools/EditingTools.vala:665
+#: src/editing_tools/EditingTools.vala:666
 msgid "Return to current photo dimensions"
 msgstr "Врати на постојећу величину фотографије"
 
-#: src/editing_tools/EditingTools.vala:668
+#: src/editing_tools/EditingTools.vala:669
 msgid "Set the crop for this photo"
 msgstr "Подесите исецање за ову фотографију"
 
-#: src/editing_tools/EditingTools.vala:680
+#: src/editing_tools/EditingTools.vala:681
 msgid "Pivot the crop rectangle between portrait and landscape orientations"
 msgstr "Заокрените правоугаоник исецања између водоравног и усправног усмерења"
 
-#: src/editing_tools/EditingTools.vala:753
+#: src/editing_tools/EditingTools.vala:754
 msgid "Unconstrained"
 msgstr "Невезано"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:755
 msgid "Square"
 msgstr "Квадратно"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:756
 msgid "Screen"
 msgstr "Екранско"
 
-#: src/editing_tools/EditingTools.vala:757
-#: src/editing_tools/EditingTools.vala:760
-#: src/editing_tools/EditingTools.vala:770
-#: src/editing_tools/EditingTools.vala:780
+#: src/editing_tools/EditingTools.vala: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)"
+#: src/editing_tools/EditingTools.vala:759
+msgid "SD Video (4 ∶ 3)"
 msgstr "СД видео (4 : 3)"
 
-#: src/editing_tools/EditingTools.vala:759
-msgid "HD Video (16 : 9)"
+#: src/editing_tools/EditingTools.vala:760
+msgid "HD Video (16 ∶ 9)"
 msgstr "ХД видео (16 : 9)"
 
-#: src/editing_tools/EditingTools.vala:761 src/Printing.vala:818
-msgid "Wallet (2 x 3 in.)"
-msgstr "Новчаник (2 x 3 инча)"
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
+msgid "Wallet (2 × 3 in.)"
+msgstr "Новчаник (2 × 3 инча)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
-msgid "Notecard (3 x 5 in.)"
-msgstr "Забелешка (3 x 5 инча)"
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
+msgid "Notecard (3 × 5 in.)"
+msgstr "Забелешка (3 × 5 инча)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
-msgid "4 x 6 in."
-msgstr "4 x 6 инча"
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
+msgid "4 × 6 in."
+msgstr "4 × 6 инча"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
-msgid "5 x 7 in."
-msgstr "5 x 7 инча"
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
+msgid "5 × 7 in."
+msgstr "5 × 7 инча"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
-msgid "8 x 10 in."
-msgstr "8 x 10 инча"
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
+msgid "8 × 10 in."
+msgstr "8 × 10 инча"
 
-#: src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
-msgstr "Писмо (8.5 x 11 ин.)"
+#: src/editing_tools/EditingTools.vala:767
+msgid "Letter (8.5 × 11 in.)"
+msgstr "Писмо (8.5 × 11 ин.)"
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
-msgid "11 x 14 in."
-msgstr "11 x 14 инча"
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
+msgid "11 × 14 in."
+msgstr "11 × 14 инча"
 
-#: src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Таблоид (11 x 17 ин.)"
+#: src/editing_tools/EditingTools.vala:769
+msgid "Tabloid (11 × 17 in.)"
+msgstr "Таблоид (11 × 17 ин.)"
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
-msgid "16 x 20 in."
-msgstr "16 x 20 инча"
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
+msgid "16 × 20 in."
+msgstr "16 × 20 инча"
 
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Метрички новчаник (9 x 13 cm)"
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
+msgid "Metric Wallet (9 × 13 cm)"
+msgstr "Метрички новчаник (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
-msgid "Postcard (10 x 15 cm)"
-msgstr "Честитка (10 x 15 cm)"
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
+msgid "Postcard (10 × 15 cm)"
+msgstr "Честитка (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
-msgid "13 x 18 cm"
-msgstr "13 x 18 cm"
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
+msgid "13 × 18 cm"
+msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
-msgid "18 x 24 cm"
-msgstr "18 x 24 cm"
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
+msgid "18 × 24 cm"
+msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:775
-msgid "A4 (210 x 297 mm)"
-msgstr "A4 (210 x 297 mm)"
+#: src/editing_tools/EditingTools.vala:776
+msgid "A4 (210 × 297 mm)"
+msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
-msgid "20 x 30 cm"
-msgstr "20 x 30 cm"
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
+msgid "20 × 30 cm"
+msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
-msgid "24 x 40 cm"
-msgstr "24 x 40 cm"
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
+msgid "24 × 40 cm"
+msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
-msgid "30 x 40 cm"
-msgstr "30 x 40 cm"
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
+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 × 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 "Величина:"
 
-#: src/editing_tools/EditingTools.vala:1887
+#: src/editing_tools/EditingTools.vala:1895
 msgid "Close the red-eye tool"
 msgstr "Затворите алат за уклањање црвених очију"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1898
 msgid "Remove any red-eye effects in the selected region"
 msgstr "Уклоните ефекат црвених очију у изабраном делу фотографије"
 
-#: src/editing_tools/EditingTools.vala:2226
+#: src/editing_tools/EditingTools.vala:2238
 #: src/editing_tools/StraightenTool.vala:102
 msgid "_Reset"
 msgstr "_Поново постави"
 
 #. 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 "Излагање:"
 
-#: src/editing_tools/EditingTools.vala:2248
+#: src/editing_tools/EditingTools.vala:2261
+msgid "Contrast:"
+msgstr "Контраст:"
+
+#: src/editing_tools/EditingTools.vala:2270
 msgid "Saturation:"
 msgstr "Засићење:"
 
-#: src/editing_tools/EditingTools.vala:2256
+#: src/editing_tools/EditingTools.vala:2279
 msgid "Tint:"
 msgstr "Боја:"
 
-#: src/editing_tools/EditingTools.vala:2265
+#: src/editing_tools/EditingTools.vala:2289
 msgid "Temperature:"
 msgstr "Температура:"
 
-#: src/editing_tools/EditingTools.vala:2273
+#: src/editing_tools/EditingTools.vala:2298
 msgid "Shadows:"
 msgstr "Сенке:"
 
-#: src/editing_tools/EditingTools.vala:2281
+#: src/editing_tools/EditingTools.vala:2307
 msgid "Highlights:"
 msgstr "Истицања:"
 
-#: src/editing_tools/EditingTools.vala:2335
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset Colors"
 msgstr "Поврати боје"
 
-#: src/editing_tools/EditingTools.vala:2335
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset all color adjustments to original"
 msgstr "Вратите сва дотеривања боје на изворна"
 
-#: src/editing_tools/EditingTools.vala:2687
+#: src/editing_tools/EditingTools.vala:2722
 msgid "Temperature"
 msgstr "Температура"
 
-#: src/editing_tools/EditingTools.vala:2700
+#: src/editing_tools/EditingTools.vala:2734
 msgid "Tint"
 msgstr "Боја"
 
-#: src/editing_tools/EditingTools.vala:2713
+#: src/editing_tools/EditingTools.vala:2746
+#| msgid "Contrast Expansion"
+msgid "Contrast"
+msgstr "Контраст"
+
+#: src/editing_tools/EditingTools.vala:2760
 msgid "Saturation"
 msgstr "Засићеност"
 
-#: src/editing_tools/EditingTools.vala:2726
+#: src/editing_tools/EditingTools.vala:2773
 msgid "Exposure"
 msgstr "Изложеност"
 
-#: src/editing_tools/EditingTools.vala:2739
+#: src/editing_tools/EditingTools.vala:2786
 msgid "Shadows"
 msgstr "Сенке"
 
-#: src/editing_tools/EditingTools.vala:2752
+#: src/editing_tools/EditingTools.vala:2799
 msgid "Highlights"
 msgstr "Истицања"
 
-#: src/editing_tools/EditingTools.vala:2762
+#: src/editing_tools/EditingTools.vala:2809
 msgid "Contrast Expansion"
 msgstr "Повећање контраста"
 
@@ -4493,6 +4484,7 @@ msgid "Angle:"
 msgstr "Угао:"
 
 #: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "_Исправи"
 
@@ -4509,7 +4501,7 @@ msgstr[1] "%d фотографије/снимка"
 msgstr[2] "%d фотографија/снимака"
 msgstr[3] "%d фотографија/снимак"
 
-#: 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"
@@ -4518,7 +4510,7 @@ msgstr[1] "%d снимка"
 msgstr[2] "%d снимака"
 msgstr[3] "%d снимак"
 
-#: 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"
@@ -4527,44 +4519,36 @@ msgstr[1] "%d фотографије"
 msgstr[2] "%d фотографија"
 msgstr[3] "%d фотографија"
 
-#: src/events/EventPage.vala:129
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr "Без догађаја"
 
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "_Напомене"
-
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Прикажите напомену сваког догађаја"
-
-#: src/events/EventsDirectoryPage.vala:155
+#: src/events/EventsDirectoryPage.vala:150
 msgid "No events"
 msgstr "Нема догађаја"
 
-#: src/events/EventsDirectoryPage.vala:159
+#: src/events/EventsDirectoryPage.vala:154
 msgid "No events found"
 msgstr "Нисам пронашао догађаје"
 
-#: src/events/EventsDirectoryPage.vala:230
+#: src/events/EventsDirectoryPage.vala:227
 msgid "All Events"
 msgstr "Сви догађаји"
 
-#: src/events/EventsDirectoryPage.vala:244
+#: src/events/EventsDirectoryPage.vala:241
 msgid "Undated"
 msgstr "Без датума"
 
-#: src/events/EventsDirectoryPage.vala:245
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%Y"
 msgstr "%Y."
 
-#: src/events/EventsDirectoryPage.vala:246
+#: src/events/EventsDirectoryPage.vala:243
 msgid "%B"
 msgstr "%B"
 
 #. if no name, pretty up the start time
-#: src/Event.vala:751
+#: src/Event.vala:753
 #, c-format
 msgid "Event %s"
 msgstr "Догађај „%s“"
@@ -4580,8 +4564,8 @@ msgstr "Извозим"
 
 #: src/Exporter.vala:317
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "Већ постоји датотека „%s“.  Да је заменим?"
+msgid "File %s already exists. Replace?"
+msgstr "Већ постоји датотека „%s“. Да је заменим?"
 
 #: src/Exporter.vala:319
 msgid "_Skip"
@@ -4599,41 +4583,32 @@ msgstr "Замени _све"
 msgid "Export"
 msgstr "Извези"
 
-#: src/folders/Branch.vala:141
+#: src/folders/Branch.vala:144
 msgid "Folders"
 msgstr "Фасцикле"
 
-#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:1191
+#: src/library/Branch.vala:30 src/library/Branch.vala:130 ui/shotwell.ui:412
 msgid "Library"
 msgstr "Фототека"
 
-#: src/library/Branch.vala:97 src/SearchFilter.vala:608
-#: src/SearchFilter.vala:609
+#: src/library/Branch.vala:97 src/SearchFilter.vala:1083
 msgid "Photos"
 msgstr "Фотографије"
 
-#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:602
-#: src/SearchFilter.vala:603 src/SearchFilter.vala:1188
+#: src/library/FlaggedPage.vala:8 src/SearchFilter.vala:1102
+#: src/SearchFilter.vala:1103
 msgid "Flagged"
 msgstr "Обележенe"
 
 #: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Увозим..."
+msgid "Importing…"
+msgstr "Увозим…"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Заустави увоз"
-
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Прекините увоз фотографија"
+#: src/library/ImportQueuePage.vala:129
+msgid "Preparing to import…"
+msgstr "Припремам за увоз…"
 
-#: src/library/ImportQueuePage.vala:124
-msgid "Preparing to import..."
-msgstr "Припремам фотографије за увоз..."
-
-#: src/library/ImportQueuePage.vala:151
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr "Увезао сам „%s“"
@@ -4642,130 +4617,19 @@ msgstr "Увезао сам „%s“"
 msgid "Last Import"
 msgstr "Последњи увоз"
 
-#: src/library/LibraryWindow.vala:285
-msgid "_Import From Folder..."
-msgstr "_Увези из фасцикле..."
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Увезите фотографије са диска у фототеку"
-
-#: src/library/LibraryWindow.vala:293
-msgid "Import From _Application..."
-msgstr "Увези из _програма..."
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Поређај _догађаје"
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Испразни _корпу"
-
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Обришите све фотографије из корпе"
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Прегледај _догађај за фотографију"
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "_Нађи"
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Пронађите фотографије и снимке према мерилу претраге"
-
-#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
-#: src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search..."
-msgstr "Нова _сачувана претрага..."
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Фотографије"
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "_Догађаји"
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "_Ознаке"
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "_Основни подаци"
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Прикажите основне податке за изабрану фотографију"
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "_Додатни подаци"
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Прикажите додатне податке за изабрану фотографију"
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "_Трака претраге"
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Прикажите траку претраге"
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "_Бочна површ"
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Прикажите бочну површ"
-
-#: src/library/LibraryWindow.vala:398
-#| msgid "Pin Toolbar"
-msgid "T_oolbar"
-msgstr "_Трака алата"
-
-#: src/library/LibraryWindow.vala:399
-#| msgid "Display the sidebar"
-msgid "Display the tool bar"
-msgstr "Прикажите траку алата"
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "_Растуће"
-
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Поређајте фотографије растућим редом"
-
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "_Опадајуће"
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Поређајте фотографије опадајућим редом"
-
-#: src/library/LibraryWindow.vala:657
+#: src/library/LibraryWindow.vala:507
 msgid "Import From Folder"
 msgstr "Увезите из фасцикле"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Испразни корпу"
 
-#: src/library/LibraryWindow.vala:726
-msgid "Emptying Trash..."
-msgstr "Празним корпу..."
+#: src/library/LibraryWindow.vala:576
+msgid "Emptying Trash…"
+msgstr "Празним корпу…"
 
-#: src/library/LibraryWindow.vala:901
+#: src/library/LibraryWindow.vala:772
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4778,43 +4642,43 @@ msgstr ""
 "%s Поставке</span>.\n"
 "Да ли желите да наставите увоз фотографија?"
 
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Место фототеке"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
+#: src/library/LibraryWindow.vala:788
 msgid "Photos cannot be imported from this directory."
 msgstr "Не могу да увезем фотографије из овог директоријума."
 
-#: 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 "Освежавам фототеку..."
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+msgid "Updating library…"
+msgstr "Освежавам фототеку…"
 
-#: src/library/LibraryWindow.vala:1264
-msgid "Preparing to auto-import photos..."
-msgstr "Припремам фотографије за самостални увоз..."
+#: src/library/LibraryWindow.vala:1129
+msgid "Preparing to auto-import photos…"
+msgstr "Припремам фотографије за самостални увоз…"
 
-#: src/library/LibraryWindow.vala:1269
-msgid "Auto-importing photos..."
-msgstr "Самостално увозим фотографије..."
+#: src/library/LibraryWindow.vala:1134
+msgid "Auto-importing photos…"
+msgstr "Самостално увозим фотографије…"
 
-#: src/library/LibraryWindow.vala:1277
-msgid "Writing metadata to files..."
-msgstr "Уписујем метаподатке у датотеке..."
+#: src/library/LibraryWindow.vala:1142
+msgid "Writing metadata to files…"
+msgstr "Уписујем метаподатке у датотеке…"
 
 #: src/library/OfflinePage.vala:8
 msgid "Missing Files"
 msgstr "Недостају датотеке"
 
-#: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Бришем..."
+#: src/library/OfflinePage.vala:110
+msgid "Deleting…"
+msgstr "Бришем…"
 
 #: src/library/TrashPage.vala:8
 msgid "Trash"
@@ -4835,39 +4699,39 @@ 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."
+"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 ""
-"Ваша фототека није сагласна са овим издањем Фото-бунара.  Изгледа да ју је "
-"створио Фото-бунар %s (шема %d).  Ово издање је %s (шема %d).  Користите "
+"Ваша фототека није сагласна са овим издањем Фото-бунара. Изгледа да ју је "
+"створио Фото-бунар %s (шема %d). Ово издање је %s (шема %d). Користите "
 "најновије издање Фото-бунара."
 
 #: 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 "
+"%d) to %s (schema %d). For more information please check the Shotwell Wiki "
 "at %s"
 msgstr ""
 "Фото-бунар није успео да надогради вашу фототеку са издања %s (шема %d) на "
-"%s (шема %d).  За више података посетите Вики Фото-бунара на „%s“"
+"%s (шема %d). За више података посетите Вики Фото-бунара на „%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 "
+"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 ""
-"Ваша фототека није сагласна са овим издањем Фото-бунара.  Изгледа да ју је "
-"створио Фото-бунар %s (шема %d).  Ово издање је %s (шема %d).  Очистите вашу "
+"Ваша фототека није сагласна са овим издањем Фото-бунара. Изгледа да ју је "
+"створио Фото-бунар %s (шема %d). Ово издање је %s (шема %d). Очистите вашу "
 "фототеку, тако што ћете обрисати „%s“, а затим поново увезите фотографије."
 
 #: 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 ""
 "Догодила се непозната грешка приликом покушаја провере збирке Фото-бунара: %s"
 
@@ -4876,7 +4740,7 @@ msgid "Loading Shotwell"
 msgstr "Учитавам Фото-бунар"
 
 #: src/main.vala:294
-msgid "Path to Shotwell's private data"
+msgid "Path to Shotwell’s private data"
 msgstr "Путања до личних података Фото-бунара"
 
 #: src/main.vala:294
@@ -4888,11 +4752,11 @@ msgid "Do not monitor library directory at runtime for changes"
 msgstr "Не прати директоријум фототеке за изменама у време покретања"
 
 #: src/main.vala:302
-msgid "Don't display startup progress meter"
+msgid "Don’t display startup progress meter"
 msgstr "Не приказује мерач напредовања покретања"
 
 #: src/main.vala:306
-msgid "Show the application's version"
+msgid "Show the application’s version"
 msgstr "Приказује издање програма"
 
 #. init GTK (valac has already called g_threads_init())
@@ -4902,7 +4766,7 @@ msgstr "[ДАТОТЕКА]"
 
 #: src/main.vala:342
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
 "Покрените „%s --help“ да видите потпун списак доступних опција линије "
 "наредби.\n"
@@ -4916,71 +4780,7 @@ msgstr "Не могу да обрадим освежења праћења: %s"
 msgid "Adjust the size of the thumbnails"
 msgstr "Измените величину минијатура"
 
-#: src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Повећајте минијатуре"
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Смањите минијатуре"
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Поређај _фотографије"
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Пусти снимак"
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Отворите изабрани снимак у системском програму за пуштање"
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "_Развијач"
-
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Прикажите напомене сваке фотографије"
-
-#: src/MediaPage.vala:470
-msgid "Display each photo's tags"
-msgstr "Прикажите ознаке фотографија"
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Према _називу"
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Поређајте фотографије према називу"
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Према _датуму излагања"
-
-#: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Поређајте фотографије према датуму излагања"
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Према _оцени"
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Поређајте фотографије према оцени"
-
-#: src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Према називу _датотеке"
-
-#: src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Поређајте фотографије према називу датотеке"
-
-#: src/MediaPage.vala:723
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4989,34 +4789,34 @@ msgstr ""
 "Фото-бунар није успео да пусти изабрани снимак:\n"
 "%s"
 
-#: src/Page.vala:1266
+#: src/Page.vala:1319
 msgid "No photos/videos"
 msgstr "Нема фотографија/снимака"
 
-#: src/Page.vala:1270
+#: src/Page.vala:1323
 msgid "No photos/videos found which match the current filter"
 msgstr "Нисам пронашао фотографије/снимке који одговарају текућем филтеру"
 
-#: src/Page.vala:2576
+#: src/Page.vala:2629
 msgid "Photos cannot be exported to this directory."
 msgstr "Не могу да извезем фотографије у овај директоријум."
 
 #. previous button
-#: src/PhotoPage.vala:533
+#: src/PhotoPage.vala:535
 msgid "Previous photo"
 msgstr "Претходна фотографија"
 
 #. next button
-#: src/PhotoPage.vala:539
+#: src/PhotoPage.vala:541
 msgid "Next photo"
 msgstr "Наредна фотографија"
 
-#: src/PhotoPage.vala:1845
+#: src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Недостаје изворна датотека фотографије: %s"
 
-#: src/PhotoPage.vala:3229
+#: src/PhotoPage.vala:3015
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Не могу да извезем „%s“: %s"
@@ -5061,7 +4861,7 @@ msgstr "Сирово"
 msgid "TIFF"
 msgstr "ТИФФ"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3755
 msgid "modified"
 msgstr "измењено"
 
@@ -5106,8 +4906,8 @@ msgid "Image Settings"
 msgstr "Подешавања фотографије"
 
 #: src/Printing.vala:889
-msgid "Printing..."
-msgstr "Штампам..."
+msgid "Printing…"
+msgstr "Штампам…"
 
 #: src/Printing.vala:909 src/Printing.vala:1112
 #, c-format
@@ -5120,19 +4920,19 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "Данас"
 
-#: src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "Јуче"
 
-#: src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr "Ставки:"
 
-#: src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
@@ -5142,104 +4942,104 @@ msgstr[2] "%d догађаја"
 msgstr[3] "%d догађај"
 
 #. display only one date if start and end are the same
-#: src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "Датум:"
 
 #. display only one time if start and end are the same
-#: src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "Време:"
 
 #. display time range
 #. display date range
-#: src/Properties.vala:384 src/Properties.vala:389
+#: src/Properties.vala:387 src/Properties.vala:392
 msgid "From:"
 msgstr "Од:"
 
-#: src/Properties.vala:385 src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "До:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Трајање:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f секунде"
 
-#: src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Развијач:"
 
 #. nothing special to be done for now for Events
-#: src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Место:"
 
-#: src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Величина датотеке:"
 
-#: src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Текући развој:"
 
-#: src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Изворне димензије:"
 
-#: src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "Марка фото-апарата:"
 
-#: src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "Модел фото-апарата:"
 
-#: src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Блиц:"
 
-#: src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Жижна даљина:"
 
-#: src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Датум излагања:"
 
-#: src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Време излагања:"
 
-#: src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Компензација излагања:"
 
-#: src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "Географска ширина:"
 
-#: src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "Географска дужина:"
 
-#: src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "Фотограф:"
 
-#: src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "Ауторско право:"
 
-#: src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "Софтвер:"
 
-#: src/Properties.vala:641
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr "Додатни подаци"
 
@@ -5254,7 +5054,7 @@ 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“ јер се појавила грешка:"
 
 #: src/publishing/PublishingPluginHost.vala:84
@@ -5263,65 +5063,69 @@ msgstr ""
 "Да покушате објављивање на другој услузи, изаберите једну из горњег "
 "изборника."
 
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Изабране фотографије/снимци су успешно објављени."
-
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Изабрани снимци су успешно објављени."
-
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Изабране фотографије су успешно објављене."
-
-#: src/publishing/PublishingUI.vala:112
+#. Here, we check whether more than one item is being uploaded, and if so, display
+#. an alternate message.
+#: src/publishing/PublishingUI.vala:104
+#| msgid "The selected video was successfully published."
 msgid "The selected video was successfully published."
-msgstr "Изабрани снимак је успешно објављен."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "Изабрани снимак је успешно објављен."
+msgstr[1] "Изабрани снимци су успешно објављени."
+msgstr[2] "Изабрани снимци су успешно објављени."
+msgstr[3] "Изабрани снимак је успешно објављен."
 
-#: 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 "Изабрана фотографија је успешно објављена."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "Изабрана фотографија је успешно објављена."
+msgstr[1] "Изабране фотографије су успешно објављене."
+msgstr[2] "Изабране фотографије су успешно објављене."
+msgstr[3] "Изабрана фотографија је успешно објављена."
 
-#: src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr "Прибављам податаке о налогу..."
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "Изабране фотографије/снимци су успешно објављени."
 
-#: src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "Пријављујем се..."
+#: src/publishing/PublishingUI.vala:127
+msgid "Fetching account information…"
+msgstr "Прибављам податаке о налогу…"
 
-#: src/publishing/PublishingUI.vala:188
+#: src/publishing/PublishingUI.vala:133
+msgid "Logging in…"
+msgstr "Пријављујем се…"
+
+#: src/publishing/PublishingUI.vala:193
 msgid "Publish Photos"
 msgstr "Објавите фотографије"
 
-#: src/publishing/PublishingUI.vala:189
+#: src/publishing/PublishingUI.vala:194
 msgid "Publish photos _to:"
 msgstr "Објави фотографије _на:"
 
-#: src/publishing/PublishingUI.vala:191
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish Videos"
 msgstr "Објавите снимке"
 
-#: src/publishing/PublishingUI.vala:192
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish videos _to"
 msgstr "Објави снимке _на"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish Photos and Videos"
 msgstr "Објавите фотографије и снимке"
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:200
 msgid "Publish photos and videos _to"
 msgstr "Објави фотографије и снимке _на"
 
 #. There are no enabled publishing services that accept this media type,
 #. warn the user.
-#: src/publishing/PublishingUI.vala:397
+#: src/publishing/PublishingUI.vala:410
 msgid "Unable to publish"
 msgstr "Објављивање није успело"
 
-#: src/publishing/PublishingUI.vala:398
+#: src/publishing/PublishingUI.vala:411
 #, c-format
 msgid ""
 "Shotwell cannot publish the selected items because you do not have a "
@@ -5330,19 +5134,15 @@ msgid ""
 "<b>Plugins</b> tab."
 msgstr ""
 "Фото-бунар не може да објави изабране ставке јер немате укључен сагласан "
-"прикључак објављивања. Да исправите ово, изаберите <b>Уређивање %s "
-"Поставке</b> и укључите један или више прикључака објављивања у језичку "
-"<b>Прикључци</b>."
+"прикључак објављивања. Да исправите ово, изаберите <b>Уређивање %s Поставке</"
+"b> и укључите један или више прикључака објављивања у језичку <b>Прикључци</"
+"b>."
 
 #: src/publishing/Publishing.vala:16
 msgid "Publishing"
 msgstr "Објављивање"
 
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Окрени на _десно"
-
-#: src/Resources.vala:140 src/Resources.vala:145
+#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
 msgid "Rotate"
 msgstr "Окрените"
 
@@ -5350,14 +5150,10 @@ msgstr "Окрените"
 msgid "Rotate Right"
 msgstr "Окрените на десно"
 
-#: src/Resources.vala:142
+#: src/Resources.vala:142 ui/collection.ui:146
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Окрените фотографије на десно (притисните Ктрл да окренете на лево)"
 
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Окрени на _лево"
-
 #: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "Окрените на лево"
@@ -5366,23 +5162,17 @@ msgstr "Окрените на лево"
 msgid "Rotate the photos left"
 msgstr "Окрените фотографије на лево"
 
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Изврни _водоравно"
-
 #: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "Изврните водоравно"
 
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Изврни _усправно"
-
 #: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "Изврните усправно"
 
-#: src/Resources.vala:155
+#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419
+#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207
 msgid "_About"
 msgstr "_О програму"
 
@@ -5390,19 +5180,35 @@ msgstr "_О програму"
 msgid "_Apply"
 msgstr "_Примени"
 
+#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
+#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
+msgid "_Edit"
+msgstr "_Уређивање"
+
 #: src/Resources.vala:160
 msgid "_Forward"
 msgstr "Просл_еди"
 
-#: src/Resources.vala:161
+#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "Преко _целог екрана"
 
+#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418
+#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420
+#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192
+msgid "_Help"
+msgstr "По_моћ"
+
 #: src/Resources.vala:163
 msgid "Leave _Fullscreen"
 msgstr "Напусти приказ преко _целог екрана"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "_Ново"
 
@@ -5410,15 +5216,9 @@ msgstr "_Ново"
 msgid "_Next"
 msgstr "_Следеће"
 
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr "У _реду"
-
-#: src/Resources.vala:167
-msgid "_Play"
-msgstr "Пу_сти"
-
-#: src/Resources.vala:168 src/Resources.vala:317
+#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
 msgid "_Preferences"
 msgstr "_Поставке"
 
@@ -5426,11 +5226,9 @@ msgstr "_Поставке"
 msgid "_Previous"
 msgstr "_Претходно"
 
-#: src/Resources.vala:170
-msgid "_Print"
-msgstr "_Штампај"
-
-#: src/Resources.vala:171
+#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
+#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
 msgid "_Quit"
 msgstr "_Изађи"
 
@@ -5470,22 +5268,24 @@ msgstr "_Уобичајена величина"
 msgid "Best _Fit"
 msgstr "_Најбоље уклапање"
 
-#: src/Resources.vala:186
-msgid "_Enhance"
-msgstr "_Побољшај"
+#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "У_већај"
 
-#: src/Resources.vala:187
+#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "У_мањи"
+
+#: src/Resources.vala:187 ui/collection.ui:165
 msgid "Enhance"
 msgstr "Побољшајте"
 
-#: src/Resources.vala:188
-msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:188 ui/collection.ui:162
+msgid "Automatically improve the photo’s appearance"
 msgstr "Самостално унапредите изглед фотографије"
 
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "_Умножи дотеривања боје"
-
 #: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "Умножите дотеривања боје"
@@ -5494,10 +5294,6 @@ msgstr "Умножите дотеривања боје"
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Умножите дотеривања боје примењена на фотографији"
 
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "_Убаци дотеривања боје"
-
 #: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "Убаците дотеривања боје"
@@ -5506,7 +5302,7 @@ msgstr "Убаците дотеривања боје"
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Примените умножена дотеривања боје на изабраним фотографијама"
 
-#: src/Resources.vala:198
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Исеци"
 
@@ -5515,7 +5311,7 @@ msgid "Crop"
 msgstr "Исеците"
 
 #: src/Resources.vala:200
-msgid "Crop the photo's size"
+msgid "Crop the photo’s size"
 msgstr "Исеците величину фотографије"
 
 #: src/Resources.vala:203
@@ -5526,7 +5322,7 @@ msgstr "Исправите"
 msgid "Straighten the photo"
 msgstr "Исправите фотографију"
 
-#: src/Resources.vala:206
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Црвене очи"
 
@@ -5538,7 +5334,7 @@ msgstr "Уклоните црвене очи"
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Умањите или уклоните дејства црвених очију са фотографије"
 
-#: src/Resources.vala:210
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Дотерај"
 
@@ -5547,13 +5343,9 @@ msgid "Adjust"
 msgstr "Дотерајте"
 
 #: src/Resources.vala:212
-msgid "Adjust the photo's color and tone"
+msgid "Adjust the photo’s color and tone"
 msgstr "Дотерајте боје и тоналитет фотографије"
 
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "_Врати на изворно"
-
 #: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr "Вратите на изворно"
@@ -5566,19 +5358,17 @@ msgstr "Врати спољне _измене"
 msgid "Revert to the master photo"
 msgstr "Вратите изворну фотографију"
 
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Постави за _позадину"
-
 #: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr "Поставите изабрану фотографију за позадину ваше радне површи"
 
 #: src/Resources.vala:222
-msgid "Set as _Desktop Slideshow..."
-msgstr "Постави као смењиву _позадину..."
+msgid "Set as _Desktop Slideshow…"
+msgstr "Постави као смењиву позадину _радне површи…"
 
-#: src/Resources.vala:224
+#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
+#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
 msgid "_Undo"
 msgstr "_Опозови"
 
@@ -5586,7 +5376,9 @@ msgstr "_Опозови"
 msgid "Undo"
 msgstr "Опозовите"
 
-#: src/Resources.vala:227
+#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
+#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
 msgid "_Redo"
 msgstr "_Понови"
 
@@ -5594,11 +5386,12 @@ msgstr "_Понови"
 msgid "Redo"
 msgstr "Поновите"
 
-#: src/Resources.vala:230
-msgid "Re_name Event..."
-msgstr "_Преименуј догађај..."
+#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:391 ui/event.ui:584
+msgid "Re_name Event…"
+msgstr "_Преименуј догађај…"
 
-#: src/Resources.vala:233
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr "Направи _кључну фотографију догађаја"
 
@@ -5606,7 +5399,7 @@ msgstr "Направи _кључну фотографију догађаја"
 msgid "Make Key Photo for Event"
 msgstr "Направите кључну фотографију за овај догађај"
 
-#: src/Resources.vala:236
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
 msgid "_New Event"
 msgstr "_Нови догађај"
 
@@ -5622,7 +5415,7 @@ msgstr "Премести фотографије"
 msgid "Move photos to an event"
 msgstr "Преместите фотографије у догађај"
 
-#: src/Resources.vala:242
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Спој догађаје"
 
@@ -5634,7 +5427,8 @@ msgstr "Спојите"
 msgid "Combine events into a single event"
 msgstr "Обједините догађаје у један"
 
-#: src/Resources.vala:246
+#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Оцени"
 
@@ -5646,7 +5440,8 @@ msgstr "Оцените"
 msgid "Change the rating of your photo"
 msgstr "Измените оцену фотографије"
 
-#: src/Resources.vala:250
+#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Повећај"
 
@@ -5654,7 +5449,8 @@ msgstr "_Повећај"
 msgid "Increase Rating"
 msgstr "Повећајте оцену"
 
-#: src/Resources.vala:253
+#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Смањи"
 
@@ -5662,7 +5458,8 @@ msgstr "_Смањи"
 msgid "Decrease Rating"
 msgstr "Смањите оцену"
 
-#: src/Resources.vala:256
+#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Без оцене"
 
@@ -5682,7 +5479,8 @@ msgstr "Означите да фотографија није оцењена"
 msgid "Remove any ratings"
 msgstr "Уклоните било какве оцене"
 
-#: src/Resources.vala:262
+#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "_Одбачене"
 
@@ -5702,7 +5500,8 @@ msgstr "Означавам да је фотографија одбачена"
 msgid "Set rating to rejected"
 msgstr "Означите да је фотографија одбачена"
 
-#: src/Resources.vala:268
+#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
 msgid "Rejected _Only"
 msgstr "Само _одбачене"
 
@@ -5714,17 +5513,18 @@ msgstr "Само одбачене"
 msgid "Show only rejected photos"
 msgstr "Прикажите само одбачене фотографије"
 
-#: src/Resources.vala:272
+#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
 msgid "All + _Rejected"
 msgstr "Све + _одбачене"
 
 #: src/Resources.vala:273
-#| msgid "Show all photos, including rejected"
 msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Прикажите све фотографије, укључујући и одбачене"
 
-#: src/Resources.vala:275
+#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
 msgid "_All Photos"
 msgstr "_Све фотографије"
 
@@ -5733,15 +5533,17 @@ msgstr "_Све фотографије"
 msgid "Show all photos"
 msgstr "Прикажите све фотографије"
 
-#: src/Resources.vala:279
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Оцене"
 
 #: src/Resources.vala:280
-msgid "Display each photo's rating"
+msgid "Display each photo’s rating"
 msgstr "Прикажите оцене свих фотографија"
 
-#: src/Resources.vala:282
+#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
 msgid "_Filter Photos"
 msgstr "_Издвој фотографије"
 
@@ -5753,10 +5555,6 @@ msgstr "Издвојте фотографије"
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Ограничите број приказаних фотографија на основу пропусника"
 
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "_Удвостручи"
-
 #: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "Удвостручи"
@@ -5765,94 +5563,87 @@ msgstr "Удвостручи"
 msgid "Make a duplicate of the photo"
 msgstr "Направите умножак фотографије"
 
-#: src/Resources.vala:290
-msgid "_Export..."
-msgstr "_Извези..."
+#: src/Resources.vala:290 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..."
-msgstr "_Штампај..."
+msgid "_Print…"
+msgstr "_Штампај…"
 
 #: src/Resources.vala:294
-msgid "Pu_blish..."
-msgstr "_Објави..."
+msgid "Pu_blish…"
+msgstr "_Објави…"
 
-#: src/Resources.vala:296
+#: src/Resources.vala:296 ui/collection.ui:187
 msgid "Publish to various websites"
 msgstr "Објавите изабране фотографије на разним сајтовима"
 
-#: src/Resources.vala:298
-msgid "Edit _Title..."
-msgstr "Измени _наслов..."
+#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
+msgid "Edit _Title…"
+msgstr "Измени _наслов…"
 
 #. Button label
 #: src/Resources.vala:300
-#| msgid "Edit Title"
 msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Уреди наслов"
 
-#: src/Resources.vala:302
-msgid "Edit _Comment..."
-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…"
+msgstr "Измени _напомену…"
 
 #. Button label
 #: src/Resources.vala:304
 msgid "Edit Comment"
 msgstr "Измените напомену"
 
-#: src/Resources.vala:306
-msgid "Edit Event _Comment..."
-msgstr "Измени _напомену догађаја..."
+#: src/Resources.vala:306 ui/event.ui:588
+msgid "Edit Event _Comment…"
+msgstr "Измени _напомену догађаја…"
 
-#: src/Resources.vala:309
-msgid "_Adjust Date and Time..."
-msgstr "_Подеси датум и време..."
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
+msgid "_Adjust Date and Time…"
+msgstr "_Подеси датум и време…"
 
 #: src/Resources.vala:310
 msgid "Adjust Date and Time"
 msgstr "Подесите датум и време"
 
-#: src/Resources.vala:312
-msgid "Add _Tags..."
-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…"
+msgstr "Додај _ознаке…"
 
-#: src/Resources.vala:313
-msgid "_Add Tags..."
-msgstr "_Додај ознаке..."
+#: src/Resources.vala:313 ui/photo_context.ui:17
+msgid "_Add Tags…"
+msgstr "Додај _ознаке…"
 
 #. Dialog title
 #: src/Resources.vala:315
-#| msgid "Add Tags"
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Додајте ознаке"
 
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "_Отвори спољним уређивачем"
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "Отвори уређивачем _сирових"
-
-#: src/Resources.vala:323
-msgid "Send _To..."
-msgstr "Пошаљи _у..."
-
-#: src/Resources.vala:324
-msgid "Send T_o..."
-msgstr "Пошаљи _у..."
+#: src/Resources.vala:324 ui/photo_context.ui:133
+msgid "Send T_o…"
+msgstr "Пошаљи _у…"
 
 #: src/Resources.vala:326
-msgid "_Find..."
-msgstr "_Нађи..."
+msgid "_Find…"
+msgstr "_Нађи…"
 
-#: src/Resources.vala:327
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Пронађите"
 
-#: src/Resources.vala:328
+#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Пронађите фотографије на основу назива или ознаке"
 
@@ -5871,31 +5662,30 @@ msgstr "Не могу да покренем уређивача: %s"
 
 #: src/Resources.vala:340
 #, c-format
-msgid "Add Tag \"%s\""
+msgid "Add Tag “%s”"
 msgstr "Додај ознаку „%s“"
 
 #. Used when adding two tags to photo(s)
 #: src/Resources.vala:343
 #, c-format
-msgid "Add Tags \"%s\" and \"%s\""
+msgid "Add Tags “%s” and “%s”"
 msgstr "Додај ознаку „%s“ и „%s“"
 
 #. Undo/Redo command name (in Edit menu)
 #: src/Resources.vala:348
-#| msgid "Add Tags"
 msgctxt "UndoRedo menu entry"
 msgid "Add Tags"
 msgstr "Додај ознаке"
 
 #: src/Resources.vala:353
 #, c-format
-msgid "_Delete Tag \"%s\""
+msgid "_Delete Tag “%s”"
 msgstr "_Обриши ознаку „%s“"
 
 #: src/Resources.vala:357
 #, c-format
-msgid "Delete Tag \"%s\""
-msgstr "Обриши ознаку „%s“"
+msgid "Delete Tag “%s”"
+msgstr "Обришите ознаку „%s“"
 
 #: src/Resources.vala:360
 msgid "Delete Tag"
@@ -5903,21 +5693,22 @@ msgstr "Обришите ознаку"
 
 #: src/Resources.vala:366
 #, c-format
-msgid "Re_name Tag \"%s\"..."
-msgstr "_Преименуј ознаку „%s“..."
+msgid "Re_name Tag “%s”…"
+msgstr "_Преименуј ознаку „%s“…"
 
 #: src/Resources.vala:370
 #, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
-msgstr "Преименуј ознаку „%s“ у „%s“"
+msgid "Rename Tag “%s” to “%s”"
+msgstr "Преименујте ознаку „%s“ у „%s“"
 
-#: src/Resources.vala:373
-msgid "_Rename..."
-msgstr "_Преименуј..."
+#: src/Resources.vala:373 ui/tags.ui:454
+msgid "_Rename…"
+msgstr "_Преименуј…"
 
-#: src/Resources.vala:375
-msgid "Modif_y Tags..."
-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 "Modif_y Tags…"
+msgstr "Измени _ознаке…"
 
 #: src/Resources.vala:376
 msgid "Modify Tags"
@@ -5925,163 +5716,169 @@ msgstr "Измените ознаке"
 
 #: src/Resources.vala:379
 #, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "Означи фотографије као „%s“"
-
-#: src/Resources.vala:379
-#, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "Означи фотографије као „%s“"
-
-#: src/Resources.vala:383
-#, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "Означи изабрану фотографију као „%s“"
-
-#: src/Resources.vala:384
-#, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr "Означи изабране фотографије као „%s“"
-
-#: src/Resources.vala:388
-#, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "Уклони ознаку „%s“ са _фотографије"
-
-#: src/Resources.vala:389
-#, c-format
-msgid "Remove Tag \"%s\" From _Photos"
-msgstr "Уклони ознаку „%s“ са _фотографија"
-
-#: src/Resources.vala:393
-#, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "Уклоните ознаку „%s“ са фотографије"
-
-#: src/Resources.vala:394
-#, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr "Уклоните ознаку „%s“ са фотографија"
-
-#: src/Resources.vala:398
-#, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
+#| msgid "Tag Photo as \"%s\""
+msgid "Tag Photo as “%s”"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Означи фотографију као „%s“"
+msgstr[1] "Означи фотографије као „%s“"
+msgstr[2] "Означи фотографије као „%s“"
+msgstr[3] "Означи фотографије као „%s“"
+
+#: src/Resources.vala:385
+#, c-format
+#| msgid "Tag the selected photo as \"%s\""
+msgid "Tag the selected photo as “%s”"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Означи изабрану фотографију као „%s“"
+msgstr[1] "Означи изабране фотографије као „%s“"
+msgstr[2] "Означи изабране фотографије као „%s“"
+msgstr[3] "Означи изабрану фотографију као „%s“"
+
+#: src/Resources.vala:391
+#, c-format
+#| msgid "Remove Tag \"%s\" From _Photo"
+msgid "Remove Tag “%s” From _Photo"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "Уклони ознаку „%s“ са _фотографије"
+msgstr[1] "Уклони ознаку „%s“ са _фотографија"
+msgstr[2] "Уклони ознаку „%s“ са _фотографија"
+msgstr[3] "Уклони ознаку „%s“ са _фотографије"
+
+#: src/Resources.vala:397
+#, c-format
+#| msgid "Remove Tag \"%s\" From Photo"
+msgid "Remove Tag “%s” From Photo"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Уклоните ознаку „%s“ са фотографије"
+msgstr[1] "Уклоните ознаку „%s“ са фотографија"
+msgstr[2] "Уклоните ознаку „%s“ са фотографија"
+msgstr[3] "Уклоните ознаку „%s“ са фотографије"
+
+#: src/Resources.vala:403
+#, c-format
+msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr "Не могу да преименујем ознаку „%s“ јер већ постоји та ознака."
 
-#: src/Resources.vala:402
+#: src/Resources.vala:407
 #, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
+msgid "Unable to rename search to “%s” because the search already exists."
 msgstr "Не могу да преименујем претрагу „%s“ јер већ постоји та претрага."
 
 #. Saved search button
-#: src/Resources.vala:405 src/SearchFilter.vala:1210
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Сачуване претраге"
 
-#: src/Resources.vala:407
+#: src/Resources.vala:412
 msgid "Delete Search"
 msgstr "Избриши претрагу"
 
-#: src/Resources.vala:410
-msgid "_Edit..."
-msgstr "_Измени..."
+#: src/Resources.vala:415 ui/savedsearch.ui:11
+#| msgid "_Edit"
+msgid "_Edit…"
+msgstr "_Уреди…"
 
-#: src/Resources.vala:411
-msgid "Re_name..."
-msgstr "Пре_именуј..."
+#: src/Resources.vala:416 ui/savedsearch.ui:7
+msgid "Re_name…"
+msgstr "_Преименуј…"
 
-#: src/Resources.vala:414
+#: src/Resources.vala:419
 #, c-format
-msgid "Rename Search \"%s\" to \"%s\""
+msgid "Rename Search “%s” to “%s”"
 msgstr "Преименуј претрагу „%s“ у „%s“"
 
-#: src/Resources.vala:418
+#: src/Resources.vala:423
 #, c-format
-msgid "Delete Search \"%s\""
+msgid "Delete Search “%s”"
 msgstr "Избриши претрагу „%s“"
 
-#: src/Resources.vala:576
+#: src/Resources.vala:560
 #, c-format
 msgid "Rate %s"
 msgstr "Оцени „%s“"
 
-#: src/Resources.vala:577
+#: src/Resources.vala:561
 #, c-format
 msgid "Set rating to %s"
 msgstr "Поставите оцену на „%s“"
 
-#: src/Resources.vala:578
+#: src/Resources.vala:562
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Постављам оцену на „%s“"
 
-#: src/Resources.vala:580
+#: src/Resources.vala:564
 #, c-format
 msgid "Display %s"
 msgstr "Прикажи „%s“"
 
-#: src/Resources.vala:581
+#: src/Resources.vala:565
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Прикажите само фотографије са оценом „%s“"
 
-#: src/Resources.vala:582
+#: src/Resources.vala:566
 #, c-format
 msgid "%s or Better"
 msgstr "%s или боље"
 
-#: src/Resources.vala:583
+#: src/Resources.vala:567
 #, c-format
 msgid "Display %s or Better"
 msgstr "Прикажи %s или боље"
 
-#: src/Resources.vala:584
+#: src/Resources.vala:568
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Прикажите само фотографије са оценом %s или бољом"
 
-#: src/Resources.vala:675
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Уклоните изабране фотографије из корпе"
 
-#: src/Resources.vala:676
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Уклоните изабране фотографије из фототеке"
 
-#: src/Resources.vala:678
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Поврати"
 
-#: src/Resources.vala:679
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Преместите изабране фотографије назад у фототеку"
 
-#: src/Resources.vala:681
+#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
+#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Прикажи у _управнику датотека"
 
-#: src/Resources.vala:682
-msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:666
+msgid "Open the selected photo’s directory in the file manager"
 msgstr "Отворите директоријум изабраних фотографија у управнику датотека"
 
-#: src/Resources.vala:685
+#: src/Resources.vala:669
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Не могу да отворим управника датотека: %s"
 
-#: src/Resources.vala:688
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "Уклони из _фототеке"
 
-#: src/Resources.vala:690
+#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
+#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Премести у корпу"
 
-#: src/Resources.vala:692
+#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr "Изабери _све"
 
-#: src/Resources.vala:693
+#: src/Resources.vala:677
 msgid "Select all items"
 msgstr "Изаберите све ставке"
 
@@ -6094,15 +5891,14 @@ msgstr "Изаберите све ставке"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: src/Resources.vala:782
+#: src/Resources.vala: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
-#| msgid "%a %b %d"
+#: src/Resources.vala:744
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%A, %d. %B"
@@ -6110,8 +5906,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
-#| msgid "%d, %Y"
+#: src/Resources.vala:749
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d., %Y."
@@ -6119,8 +5914,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
-#| msgid "%a %b %d"
+#: src/Resources.vala:754
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%A, %d. %B"
@@ -6128,8 +5922,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
-#| msgid "%a %b %d, %Y"
+#: src/Resources.vala:759
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%A, %d. %B %Y."
@@ -6143,139 +5936,139 @@ msgid "Saved Searches"
 msgstr "Сачуване претраге"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
 msgstr "садржи"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:169
-#: src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
 msgid "is exactly"
 msgstr "је тачно"
 
-#: src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:164
 msgid "starts with"
 msgstr "почиње на"
 
-#: src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:165
 msgid "ends with"
 msgstr "завршава се на"
 
-#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:166
 msgid "does not contain"
 msgstr "не садржи"
 
-#: src/searches/SavedSearchDialog.vala:173
-#: src/searches/SavedSearchDialog.vala:504
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
 msgid "is not set"
 msgstr "није подешено"
 
-#: src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:168
 msgid "is set"
 msgstr "подешено"
 
 #. Ordering must correspond with SearchConditionMediaType.Context
-#: src/searches/SavedSearchDialog.vala:248
-#: src/searches/SavedSearchDialog.vala:379
-#: src/searches/SavedSearchDialog.vala:444
+#: src/searches/SavedSearchDialog.vala:242
+#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:438
 msgid "is"
 msgstr "јесте"
 
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:243
 msgid "is not"
 msgstr "није"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:249
 msgid "any photo"
 msgstr "фотографија"
 
-#: src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:250
 msgid "a raw photo"
 msgstr "сирова фотографија"
 
-#: src/searches/SavedSearchDialog.vala:257
+#: src/searches/SavedSearchDialog.vala:251
 msgid "a video"
 msgstr "снимак"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:305
 msgid "has"
 msgstr "има"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:306
 msgid "has no"
 msgstr "нема"
 
-#: src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:311
 msgid "modifications"
 msgstr "измене"
 
-#: src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:312
 msgid "internal modifications"
 msgstr "унутрашње измене"
 
-#: src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:313
 msgid "external modifications"
 msgstr "спољне измене"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:367
 msgid "flagged"
 msgstr "обележена"
 
-#: src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:368
 msgid "not flagged"
 msgstr "необележена"
 
-#: src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:431
 msgid "and higher"
 msgstr "и више"
 
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:432
 msgid "only"
 msgstr "само"
 
-#: src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:433
 msgid "and lower"
 msgstr "и ниже"
 
-#: src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:495
 msgid "is after"
 msgstr "после"
 
-#: src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:496
 msgid "is before"
 msgstr "пре"
 
-#: src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:497
 msgid "is between"
 msgstr "између"
 
-#: src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:510
 msgid "and"
 msgstr "и"
 
-#: src/searches/SavedSearchDialog.vala:697
+#: src/searches/SavedSearchDialog.vala:691
 msgid "Search"
 msgstr "Претрага"
 
-#: src/searches/SavedSearchDialog.vala:702
+#: src/searches/SavedSearchDialog.vala:696
 msgid "Cancel"
 msgstr "Откажи"
 
-#: src/searches/SavedSearchDialog.vala:703
+#: src/searches/SavedSearchDialog.vala:697
 msgid "OK"
 msgstr "У реду"
 
-#: src/searches/SavedSearchDialog.vala:721
+#: src/searches/SavedSearchDialog.vala:716
 msgid "any"
 msgstr "било која"
 
-#: src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:717
 msgid "all"
 msgstr "све"
 
-#: src/searches/SavedSearchDialog.vala:723
+#: src/searches/SavedSearchDialog.vala:718
 msgid "none"
 msgstr "ништа"
 
@@ -6315,8 +6108,8 @@ msgstr "Врста обележја"
 msgid "Photo state"
 msgstr "Стање фотографије"
 
-#. Rating button
-#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:1199
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
 msgid "Rating"
 msgstr "Оцена"
 
@@ -6324,45 +6117,60 @@ msgstr "Оцена"
 msgid "Date"
 msgstr "Датум"
 
-#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
-msgid "Videos"
-msgstr "Снимци"
+#: src/SearchFilter.vala:815
+#| msgid "Rating"
+msgid "★+ Rating"
+msgstr "★+ оцена"
 
-#: src/SearchFilter.vala:620
-msgid "RAW Photos"
-msgstr "Сирове фотографије"
+#: src/SearchFilter.vala:818
+#| msgid "Rating"
+msgid "★★+ Rating"
+msgstr "★★+ оцена"
 
-#: src/SearchFilter.vala:621
-msgid "RAW photos"
-msgstr "Сирове фотографије"
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr "★★★+ оцена"
+
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr "★★★★+ оцена"
+
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr "★★★★★+ оцена"
 
-#: src/SearchFilter.vala:1148
+#: src/SearchFilter.vala:1064
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Грешка учитавања датотеке корисничког сучеља „%s“: %s"
+#| msgid "Error loading UI file %s: %s"
+msgid "Error loading search bar UI: %s"
+msgstr "Грешка учитавања корисничког сучеља траке претраге: %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:1073
 msgid "Close"
 msgstr "Затвори"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1165
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr "Врста"
 
-#: src/SearchFilter.vala:1211
+#: src/SearchFilter.vala:1086
+msgid "Videos"
+msgstr "Снимци"
+
+#: src/SearchFilter.vala:1089
+msgid "RAW Photos"
+msgstr "Сирове фотографије"
+
+#: 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 "Нова _ознака..."
-
 #: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Подешавања"
@@ -6435,198 +6243,634 @@ msgid "untitled"
 msgstr "безимено"
 
 #. multiple videos
-#: src/VideoSupport.vala:490
+#: src/VideoSupport.vala:523
 msgid "Export Videos"
 msgstr "Извезите снимке"
 
-#: ui/set_background_dialog.ui:15
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr "Окини _заставицу"
+
+#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
+#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+msgid "_Developer"
+msgstr "_Развијач"
+
+#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
+msgid "Open with E_xternal Editor"
+msgstr "_Отвори спољним уређивачем"
+
+#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
+#: ui/photo_context.ui:124 ui/tags.ui:379
+msgid "View Eve_nt for Photo"
+msgstr "Прегледај _догађај за фотографију"
+
+#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5
+#: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5
+#: ui/top.ui:5 ui/trash.ui:5
+msgid "_File"
+msgstr "_Датотека"
+
+#: ui/direct.ui:13
+msgid "Save _As…"
+msgstr "Сачувај _као…"
+
+#: ui/direct.ui:59 ui/events_directory.ui:71 ui/event.ui:99
+#: ui/import_queue.ui:38 ui/import.ui:74 ui/media.ui:99 ui/offline.ui:78
+#: ui/photo.ui:95 ui/tags.ui:99 ui/top.ui:15 ui/trash.ui:87
+msgid "_View"
+msgstr "_Преглед"
+
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Испуни _страницу"
+
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "Увећај на _100%"
+
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "Увећај на _200%"
+
+#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+msgid "_Photo"
+msgstr "_Фотографија"
+
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "_Претходна фотографија"
+
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "_Следећа фотографија"
+
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "_Алати"
+
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188
+#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "_Често постаљана питања"
+
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192
+#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr "_Пријави проблем…"
+
+#: ui/events_directory.ui:8 ui/event.ui:8 ui/import_queue.ui:14 ui/import.ui:8
+#: ui/media.ui:8 ui/offline.ui:8 ui/photo.ui:8 ui/tags.ui:8 ui/trash.ui:8
+msgid "_Import from Folder…"
+msgstr "_Увези из фасцикле…"
+
+#: ui/events_directory.ui:13 ui/event.ui:13 ui/import_queue.ui:19
+#: ui/import.ui:21 ui/media.ui:13 ui/offline.ui:13 ui/photo.ui:13 ui/tags.ui:13
+#: ui/trash.ui:13
+msgid "Import From _Application…"
+msgstr "Увези из _програма…"
+
+#: ui/events_directory.ui:19 ui/event.ui:34 ui/import_queue.ui:25
+#: ui/import.ui:27 ui/media.ui:34 ui/offline.ui:19 ui/photo.ui:42 ui/tags.ui:34
+#: ui/trash.ui:24 ui/trash.ui:234 ui/trash.ui:242
+msgid "Empty T_rash"
+msgstr "Испразни _корпу"
+
+#: ui/events_directory.ui:47 ui/event.ui:62 ui/import.ui:55 ui/media.ui:62
+#: ui/offline.ui:47 ui/tags.ui:62 ui/trash.ui:52
+msgid "_Find"
+msgstr "_Нађи"
+
+#: ui/events_directory.ui:51 ui/event.ui:66 ui/media.ui:66 ui/offline.ui:51
+#: ui/photo.ui:70 ui/search_sidebar_context.ui:6
+#: ui/sidebar_default_context.ui:6 ui/tags.ui:66 ui/trash.ui:56
+msgid "Ne_w Saved Search…"
+msgstr "Нова _сачувана претрага…"
+
+#: ui/events_directory.ui:74 ui/event.ui:102 ui/import_queue.ui:41
+#: ui/import.ui:77 ui/media.ui:102 ui/offline.ui:81 ui/photo.ui:98
+#: ui/tags.ui:102 ui/trash.ui:90
+msgid "_Basic Information"
+msgstr "_Основни подаци"
+
+#: ui/events_directory.ui:79 ui/event.ui:107 ui/import.ui:82 ui/media.ui:107
+#: ui/offline.ui:86 ui/photo.ui:103 ui/tags.ui:107 ui/trash.ui:95
+msgid "E_xtended Information"
+msgstr "_Додатни подаци"
+
+#: ui/events_directory.ui:84 ui/event.ui:112 ui/import.ui:87 ui/media.ui:112
+#: ui/offline.ui:91 ui/tags.ui:112 ui/trash.ui:100
+msgid "_Search Bar"
+msgstr "_Трака претраге"
+
+#: ui/events_directory.ui:89 ui/event.ui:117 ui/import.ui:92 ui/media.ui:117
+#: ui/offline.ui:96 ui/photo.ui:108 ui/tags.ui:117 ui/trash.ui:105
+msgid "S_idebar"
+msgstr "_Бочна површ"
+
+#: ui/events_directory.ui:94 ui/event.ui:122 ui/import.ui:97 ui/media.ui:122
+#: ui/offline.ui:101 ui/photo.ui:113 ui/tags.ui:122 ui/trash.ui:110
+msgid "T_oolbar"
+msgstr "_Трака алата"
+
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Напомене"
+
+#: ui/events_directory.ui:108 ui/event.ui:243 ui/import_queue.ui:48
+#: ui/import.ui:166 ui/media.ui:243 ui/offline.ui:163 ui/photo.ui:127
+#: ui/tags.ui:243 ui/trash.ui:172
+msgid "Sort _Events"
+msgstr "Поређај _догађаје"
+
+#: ui/events_directory.ui:111 ui/event.ui:231 ui/event.ui:246
+#: ui/import_queue.ui:51 ui/import.ui:169 ui/media.ui:231 ui/media.ui:246
+#: ui/offline.ui:166 ui/photo.ui:130 ui/tags.ui:231 ui/tags.ui:246
+#: ui/trash.ui:175
+msgid "_Ascending"
+msgstr "_Растуће"
+
+#: ui/events_directory.ui:116 ui/event.ui:236 ui/import_queue.ui:56
+#: ui/media.ui:236 ui/offline.ui:171 ui/tags.ui:236 ui/trash.ui:180
+msgid "D_escending"
+msgstr "_Опадајуће"
+
+#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
+#: ui/top.ui:30
+msgid "Even_ts"
+msgstr "_Догађаји"
+
+#: ui/event.ui:74 ui/media.ui:74 ui/offline.ui:58 ui/offline.ui:207
+#: ui/photo.ui:77 ui/tags.ui:74
+msgid "R_emove from Library"
+msgstr "Уклони из _фототеке"
+
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Наслови"
+
+#: ui/event.ui:139 ui/event.ui:402 ui/media.ui:139 ui/media.ui:385
+#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35
+msgid "Ta_gs"
+msgstr "_Ознаке"
+
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Поређај _фотографије"
+
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "Према _називу"
+
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "Према називу _датотеке"
+
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "Према _датуму излагања"
+
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Према _оцени"
+
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr "_Опадајуће"
+
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
+msgid "_Photos"
+msgstr "_Фотографије"
+
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "_Заустави увоз"
+
+#: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr "Постави за позадину"
 
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
 msgid "Use for Desktop"
 msgstr "Користи за радну површ"
 
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
 msgid "Use for Lock Screen"
 msgstr "Користи за екран закључавања"
 
-#: ui/set_background_slideshow_dialog.ui:15
+#: ui/set_background_slideshow_dialog.ui:16
 msgid "Set as Desktop Slideshow"
 msgstr "Постави као смењиву позадину радне површи"
 
-#: ui/set_background_slideshow_dialog.ui:33
+#: 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:45
+#: ui/set_background_slideshow_dialog.ui:94
 msgid "period of time"
 msgstr "време"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Направи смењиву позадину радне површи"
-
-#: ui/set_background_slideshow_dialog.ui:115
+#: ui/set_background_slideshow_dialog.ui:116
 msgid "How long each photo is shown on the desktop background"
 msgstr ""
 "Колико дуго ће свака фотографија бити приказана као позадина радне површи"
 
-#: ui/shotwell.ui:23
-msgid "_Name of search:"
-msgstr "_Назив претраге:"
+#: ui/shotwell.ui:65
+msgid "white"
+msgstr "бела"
 
-#: ui/shotwell.ui:81
-msgid "_Match"
-msgstr "_Поклапа"
+#: ui/shotwell.ui:92
+msgid "black"
+msgstr "црна"
 
-#: ui/shotwell.ui:108
-msgid "of the following:"
-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/shotwell.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Прати приспеће нових датотека у фасцикли фототеке"
+
+#: ui/shotwell.ui:209
+msgid "Importing"
+msgstr "Увозим"
+
+#: ui/shotwell.ui:226
+msgid "_Directory structure:"
+msgstr "Структура _директоријума:"
+
+#: ui/shotwell.ui:240
+msgid "Example:"
+msgstr "Пример:"
+
+#: ui/shotwell.ui:249
+msgid "R_ename imported files to lowercase"
+msgstr "_Промени назив увезених датотека на мала слова"
+
+#: ui/shotwell.ui:271
+msgid "Metadata"
+msgstr "Метаподаци"
+
+#: ui/shotwell.ui:284
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Уписуј ознаке, наслове и остале _метаподатке у датотеке фотографија"
+
+#: ui/shotwell.ui:306
+msgid "RAW Developer"
+msgstr "Сирови развијач"
+
+#: ui/shotwell.ui:323
+msgid "De_fault:"
+msgstr "_Основно:"
+
+#: ui/shotwell.ui:377
+msgid "_Pattern:"
+msgstr "_Шаблон:"
+
+#: ui/shotwell.ui:439
+msgid "E_xternal photo editor:"
+msgstr "_Спољни уређивач фотографија:"
+
+#: ui/shotwell.ui:456
+msgid "External _RAW editor:"
+msgstr "Спољни _сирови уређивач:"
+
+#: ui/shotwell.ui:517
+msgid "External Editors"
+msgstr "Спољни уређивачи"
 
-#: ui/shotwell.ui:195
+#: ui/shotwell.ui:542
+msgid "Plugins"
+msgstr "Прикључци"
+
+#: ui/shotwell.ui:583
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Величина одштампане фотографије</b>"
 
-#: ui/shotwell.ui:212
+#: ui/shotwell.ui:600
 msgid "Use a _standard size:"
 msgstr "Користи _уобичајену величину:"
 
-#: ui/shotwell.ui:255
+#: ui/shotwell.ui:643
 msgid "Use a c_ustom size:"
 msgstr "Користи _произвољну величину:"
 
-#: ui/shotwell.ui:345
+#: ui/shotwell.ui:731
 msgid "_Match photo aspect ratio"
 msgstr "_Одговара сразмери фотографије"
 
-#: ui/shotwell.ui:369
+#: ui/shotwell.ui:755
 msgid "_Autosize:"
 msgstr "_Самостална величина:"
 
-#: ui/shotwell.ui:409
+#: ui/shotwell.ui:795
 msgid "<b>Titles</b>"
 msgstr "<b>Наслови</b>"
 
-#: ui/shotwell.ui:426
+#: ui/shotwell.ui:812
 msgid "Print image _title"
 msgstr "Штампај _називе фотографија"
 
-#: ui/shotwell.ui:470
+#: ui/shotwell.ui:855
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Резолуција у тачкицама</b>"
 
-#: ui/shotwell.ui:490
+#: ui/shotwell.ui:875
 msgid "_Output photo at:"
 msgstr "_Штампај фотографије у:"
 
-#: ui/shotwell.ui:525
+#: ui/shotwell.ui:909
 msgid "pixels per inch"
 msgstr "тачкица по инчу"
 
-#: ui/shotwell.ui:559
+#: ui/shotwell.ui:949
+msgid "_Name of search:"
+msgstr "_Назив претраге:"
+
+#: ui/shotwell.ui:1003
+msgid "_Match"
+msgstr "_Поклапа"
+
+#: ui/shotwell.ui:1030
+msgid "of the following:"
+msgstr "од следећег:"
+
+#: ui/shotwell.ui:1111
 msgid "label"
 msgstr "натпис"
 
-#: ui/shotwell.ui:681
-msgid "Shotwell Preferences"
-msgstr "Поставке Фото-бунара"
+#: ui/shotwell.ui:1262
+msgid "_Delay:"
+msgstr "_Застој:"
 
-#: ui/shotwell.ui:730
-msgid "white"
-msgstr "бела"
+#: ui/shotwell.ui:1276
+msgid "_Transition effect:"
+msgstr "_Дејство прелаза:"
 
-#: ui/shotwell.ui:757
-msgid "black"
-msgstr "црна"
+#: ui/shotwell.ui:1290
+msgid "Transition d_elay:"
+msgstr "_Застој прелаза:"
 
-#: ui/shotwell.ui:805
-msgid "_Watch library directory for new files"
-msgstr "_Прати приспеће нових датотека у фасцикли фототеке"
+#: ui/shotwell.ui:1300
+msgid "Show t_itle"
+msgstr "Прикажи _наслов"
 
-#: ui/shotwell.ui:834
-msgid "Metadata"
-msgstr "Метаподаци"
+#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+msgid "seconds"
+msgstr "секунде"
 
-#: ui/shotwell.ui:854
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Уписуј ознаке, наслове и остале _метаподатке у датотеке фотографија"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Нова _ознака…"
 
-#: ui/shotwell.ui:880
-msgid "Display"
-msgstr "Приказ"
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Обришите све фотографије из корпе"
 
-#: ui/shotwell.ui:901
-msgid "_Import photos to:"
-msgstr "_Увези фотографије у:"
+#~ msgid "L_ist album in public gallery"
+#~ msgstr "_Испиши албум у јавној галерији"
 
-#: ui/shotwell.ui:924
-msgid "_Background:"
-msgstr "_Позадина:"
+#~| msgid "Videos will appear in '%s'"
+#~ msgid "Videos will appear in “%s”"
+#~ msgstr "Видео снимци ће се појавити у „%s“"
 
-#: ui/shotwell.ui:947
-msgid "Importing"
-msgstr "Увозим"
+#~ msgid "Login"
+#~ msgstr "Пријави ме"
 
-#: ui/shotwell.ui:970
-msgid "_Directory structure:"
-msgstr "Структура _директоријума:"
+#~ msgid "Testing connection to Facebook..."
+#~ msgstr "Испробавам везу са Фејсбуком..."
 
-#: ui/shotwell.ui:1009
-msgid "_Pattern:"
-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 ""
+#~ "Већ сте се пријављивали и одјављивали са Фликра током ове сесије Фото-"
+#~ "бунара.\n"
+#~ "Да наставите објављивање на Фликр, поново покрените Фото-бунар и затим "
+#~ "покушајте поново."
 
-#: ui/shotwell.ui:1091
-msgid "Example:"
-msgstr "Пример:"
+#~ msgid "_Contents"
+#~ msgstr "_Садржај"
 
-#: ui/shotwell.ui:1108
-msgid "R_ename imported files to lowercase"
-msgstr "_Промени назив увезених датотека на мала слова"
+#~ msgid "Display the title of each photo"
+#~ msgstr "Прикажите називе сваке фотографије"
 
-#: ui/shotwell.ui:1137
-msgid "RAW Developer"
-msgstr "Сирови развијач"
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "Увезите изабране фотографије у вашу фототеку"
 
-#: ui/shotwell.ui:1172
-msgid "De_fault:"
-msgstr "_Основно:"
+#~ msgid "Import all the photos into your library"
+#~ msgstr "Увезите све фотографије у вашу фототеку"
 
-#: ui/shotwell.ui:1226
-msgid "E_xternal photo editor:"
-msgstr "_Спољни уређивач фотографија:"
+#~ msgid "Play a slideshow"
+#~ msgstr "Покрените покретни приказ"
 
-#: ui/shotwell.ui:1242
-msgid "External _RAW editor:"
-msgstr "Спољни _сирови уређивач:"
+#~ msgid "Save Details..."
+#~ msgstr "Сачувај појединости..."
 
-#: ui/shotwell.ui:1307
-msgid "External Editors"
-msgstr "Спољни уређивачи"
+#~ msgid "_Modify original photo files"
+#~ msgstr "_Измени изворне фотографије"
 
-#: ui/shotwell.ui:1334
-msgid "Plugins"
-msgstr "Прикључци"
+#~ msgid "_Modify original files"
+#~ msgstr "_Измени изворне датотеке"
 
-#: ui/shotwell.ui:1400
-msgid "_Delay:"
-msgstr "_Застој:"
+#~ msgid "Save photo"
+#~ msgstr "Сачувајте фотографију"
 
-#: ui/shotwell.ui:1416
-msgid "_Transition effect:"
-msgstr "_Дејство прелаза:"
+#~ msgid "Save _As..."
+#~ msgstr "Сачувај _као..."
 
-#: ui/shotwell.ui:1432
-msgid "Transition d_elay:"
-msgstr "_Застој прелаза:"
+#~ msgid "Save photo with a different name"
+#~ msgstr "Сачувајте фотографију под другим називом"
 
-#: ui/shotwell.ui:1444
-msgid "Show t_itle"
-msgstr "Прикажи _наслов"
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr "Штампајте фотографију на штампачу који је повезан на овај рачунар"
 
-#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
-msgid "seconds"
-msgstr "секунде"
+#~ msgid "Previous Photo"
+#~ msgstr "Претходна фотографија"
+
+#~ msgid "Next Photo"
+#~ msgstr "Следећа фотографија"
+
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "Увећајте приказ фотографије"
+
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "Умањите приказ фотографије"
+
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "Увећајте фотографију да испуни екран"
+
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "Прикажите фотографију у пуној величини"
+
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "Прикажите фотографију увећану два пута"
+
+#~ msgid "Display the comment of each event"
+#~ msgstr "Прикажите напомену сваког догађаја"
+
+#~ msgid "Importing..."
+#~ msgstr "Увозим..."
+
+#~ msgid "Stop importing photos"
+#~ msgstr "Прекините увоз фотографија"
+
+#~ msgid "Preparing to import..."
+#~ msgstr "Припремам фотографије за увоз..."
+
+#~ msgid "_Import From Folder..."
+#~ msgstr "_Увези из фасцикле..."
+
+#~ msgid "Import photos from disk to library"
+#~ msgstr "Увезите фотографије са диска у фототеку"
+
+#~ msgid "Import From _Application..."
+#~ msgstr "Увези из _програма..."
+
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "Пронађите фотографије и снимке према мерилу претраге"
+
+#~ msgid "Display basic information for the selection"
+#~ msgstr "Прикажите основне податке за изабрану фотографију"
+
+#~ msgid "Display extended information for the selection"
+#~ msgstr "Прикажите додатне податке за изабрану фотографију"
+
+#~ msgid "Display the search bar"
+#~ msgstr "Прикажите траку претраге"
+
+#~ msgid "Display the sidebar"
+#~ msgstr "Прикажите бочну површ"
+
+#~| msgid "Display the sidebar"
+#~ msgid "Display the tool bar"
+#~ msgstr "Прикажите траку алата"
+
+#~ msgid "Sort photos in an ascending order"
+#~ msgstr "Поређајте фотографије растућим редом"
+
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "Поређајте фотографије опадајућим редом"
+
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "Повећајте минијатуре"
+
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "Смањите минијатуре"
+
+#~ msgid "_Play Video"
+#~ msgstr "_Пусти снимак"
+
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr "Отворите изабрани снимак у системском програму за пуштање"
+
+#~ msgid "Display the comment of each photo"
+#~ msgstr "Прикажите напомене сваке фотографије"
+
+#~ msgid "Display each photo's tags"
+#~ msgstr "Прикажите ознаке фотографија"
+
+#~ msgid "Sort photos by title"
+#~ msgstr "Поређајте фотографије према називу"
+
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "Поређајте фотографије према датуму излагања"
+
+#~ msgid "Sort photos by rating"
+#~ msgstr "Поређајте фотографије према оцени"
+
+#~ msgid "Sort photos by filename"
+#~ msgstr "Поређајте фотографије према називу датотеке"
+
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "Изабрани снимци су успешно објављени."
+
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "Изабране фотографије су успешно објављене."
+
+#~ msgid "Set as _Desktop Slideshow..."
+#~ msgstr "Постави као смењиву _позадину..."
+
+#~ msgid "Re_name Event..."
+#~ msgstr "_Преименуј догађај..."
+
+#~ msgid "_Export..."
+#~ msgstr "_Извези..."
+
+#~ msgid "_Print..."
+#~ msgstr "_Штампај..."
+
+#~ msgid "Pu_blish..."
+#~ msgstr "_Објави..."
+
+#~ msgid "Edit _Title..."
+#~ msgstr "Измени _наслов..."
+
+#~ msgid "Edit _Comment..."
+#~ msgstr "Измени _напомену..."
+
+#~ msgid "Edit Event _Comment..."
+#~ msgstr "Измени _напомену догађаја..."
+
+#~ msgid "_Adjust Date and Time..."
+#~ msgstr "_Подеси датум и време..."
+
+#~ msgid "Add _Tags..."
+#~ msgstr "Додај _ознаке..."
+
+#~ msgid "_Add Tags..."
+#~ msgstr "_Додај ознаке..."
+
+#~ msgid "Send _To..."
+#~ msgstr "Пошаљи _у..."
+
+#~ msgid "Send T_o..."
+#~ msgstr "Пошаљи _у..."
+
+#~ msgid "_Find..."
+#~ msgstr "_Нађи..."
+
+#~ msgid "Modif_y Tags..."
+#~ msgstr "Измени _ознаке..."
+
+#~ msgid "Tag Photos as \"%s\""
+#~ msgstr "Означи фотографије као „%s“"
+
+#~ msgid "Tag the selected photos as \"%s\""
+#~ msgstr "Означи изабране фотографије као „%s“"
+
+#~ msgid "Remove Tag \"%s\" From _Photos"
+#~ msgstr "Уклони ознаку „%s“ са _фотографија"
+
+#~ msgid "Remove Tag \"%s\" From Photos"
+#~ msgstr "Уклоните ознаку „%s“ са фотографија"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Измени..."
+
+#~ msgid "RAW photos"
+#~ msgstr "Сирове фотографије"
+
+#~ msgid "Shotwell Preferences"
+#~ msgstr "Поставке Фото-бунара"
 
 #~| msgid "Copyright 2009-2014 Yorba Foundation"
 #~ msgid "Copyright 2009-2015 Yorba Foundation"
diff --git a/po/sr@latin.gmo b/po/sr@latin.gmo
index d1495d4..a927546 100644
--- a/po/sr@latin.gmo
+++ b/po/sr@latin.gmo
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 7082049..0e5fb4e 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—2016.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2011—2017.
 # 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—2016.
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2014—2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell-0.15\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=shotwel"
-"l&keywords=I18N+L10N&component=Internationalization\n"
-"POT-Creation-Date: 2016-08-26 21:27+0000\n"
-"PO-Revision-Date: 2016-09-03 16:51+0200\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-03-04 15:02+0000\n"
+"PO-Revision-Date: 2017-03-05 20:45+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: srpski <gnome-sr@googlegroups.org>\n"
 "Language: sr\n"
@@ -23,12 +23,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:354
+#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344
+#: ui/tags.ui:354
 msgid "Shotwell"
 msgstr "Foto-bunar"
 
 #: misc/shotwell.appdata.xml.in:9
-#| msgid "Photo Manager"
 msgid "Popular photo manager"
 msgstr "Popularni upravnik fotografija"
 
@@ -38,7 +39,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 ""
 "Foto-bunar je jednostavan za upotrebu, brz organizator fotografija osmišljen "
@@ -61,12 +62,16 @@ msgstr ""
 msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
 msgstr "Foto-bunar podržava JPEG, PNG, TIFF i razne sirove zapise datoteka."
 
+#: misc/shotwell.appdata.xml.in:52
+#| msgid "Shotwell Viewer"
+msgid "The Shotwell developers"
+msgstr "Programeri Foto-bunara"
+
 #: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
 msgid "Photo Manager"
 msgstr "Upravnik fotografija"
 
 #: misc/shotwell.desktop.in.in:6
-#| msgid "any photo"
 msgid "Organize your photos"
 msgstr "Organizujte vaše fotografije"
 
@@ -77,9 +82,9 @@ msgid ""
 "organize;photo;photographs;photos;picture;pictures;photography;print;publish;"
 "rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
 msgstr ""
-"album;foto-aparat;foto-aparati;otseci;uredi;poboljšaj;izvezi;galerija;zbirka;s"
-"lika;slike;uvezi;sredi;razvrstaj;fotografija;fotografije;štampaj;objavi;okren"
-"i;deli;oznake;video;fejsbuk;flikr;pikasa;jutub;pivigo;"
+"album;foto-aparat;foto-aparati;otseci;uredi;poboljšaj;izvezi;galerija;zbirka;"
+"slika;slike;uvezi;sredi;razvrstaj;fotografija;fotografije;štampaj;objavi;"
+"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
@@ -87,7 +92,6 @@ msgid "shotwell"
 msgstr "shotwell"
 
 #: misc/shotwell-viewer.desktop.in.in:4
-#| msgid "Photo Viewer"
 msgid "Shotwell Viewer"
 msgstr "Foto-bunar pregledač fotografija"
 
@@ -120,7 +124,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:416
+#: misc/org.yorba.shotwell.gschema.xml:486
 msgid "default size"
 msgstr "osnovna veličina"
 
@@ -148,10 +152,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: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 "korisnik"
 
@@ -168,8 +171,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:460
-#| msgid "within category:"
+#: misc/org.yorba.shotwell.gschema.xml:530
 msgid "last category"
 msgstr "poslednja kategorija"
 
@@ -178,8 +180,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:472
-#| msgid "Photo size:"
+#: misc/org.yorba.shotwell.gschema.xml:542
 msgid "last photo size"
 msgstr "poslednja veličina fotografije"
 
@@ -192,7 +193,6 @@ msgstr ""
 "je korišćena prilikom objavljivanja na Rajce."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:70
-#| msgid "_Remember"
 msgid "remember"
 msgstr "pamti"
 
@@ -201,7 +201,6 @@ msgid "If true, remember last login."
 msgstr "Ako je izabrano, pamtiće poslednje prijavljivanje."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:76
-#| msgid "_Hide album"
 msgid "hide album"
 msgstr "skriva album"
 
@@ -210,7 +209,6 @@ msgid "If true, hide the newly created Rajce album."
 msgstr "Ako je izabrano, skriva novostvoren album Rajcea."
 
 #: misc/org.yorba.shotwell-extras.gschema.xml:82
-#| msgid "Open target _album in browser"
 msgid "open album in web browser"
 msgstr "otvara album u veb pregledniku"
 
@@ -222,11 +220,11 @@ msgstr ""
 "fotografija"
 
 #: 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 "uklanja osetljive podatke iz otpremanja"
 
@@ -236,62 +234,58 @@ msgid ""
 "first"
 msgstr "Da li će sa slika otpremljenih na Rajce biti prvo uklonjeni metapodaci"
 
-#: misc/org.yorba.shotwell.gschema.xml:22
+#: misc/org.yorba.shotwell.gschema.xml:23
 msgid "display basic properties"
 msgstr "prikazuje osnovna svojstva"
 
-#: 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 ""
 "Izabrano ako će okno osnovnih svojstava biti prikazano, u suprotnom "
 "poništeno."
 
-#: 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 "prikazuje proširena svojstva"
 
-#: 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 ""
 "Izabrano ako će prozor proširenih svojstava biti prikazan, u suprotnom "
 "poništeno."
 
-#: misc/org.yorba.shotwell.gschema.xml:34
-#| msgid "Display the sidebar"
+#: misc/org.yorba.shotwell.gschema.xml:35
 msgid "display sidebar"
 msgstr "prikazuje bočnu površ"
 
-#: 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 "Izabrano ako će bočna površ biti prikazana, u suprotnom poništeno."
 
-#: misc/org.yorba.shotwell.gschema.xml:40
-#| msgid "Display the sidebar"
+#: misc/org.yorba.shotwell.gschema.xml:41
 msgid "display toolbar"
 msgstr "prikazuje traku alata"
 
-#: 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 "Izabrano ako će donja traka alata biti prikazana, u suprotnom poništeno."
+msgstr ""
+"Izabrano ako će donja traka alata biti prikazana, u suprotnom poništeno."
 
-#: misc/org.yorba.shotwell.gschema.xml:46
-#| msgid "Display the search bar"
+#: misc/org.yorba.shotwell.gschema.xml:47
 msgid "display search bar"
 msgstr "prikazuje traku pretrage"
 
-#: 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 ""
 "Izabrano ako će traka pretrage/filtera biti prikazana, u suprotnom poništeno."
 
-#: 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 "prikazuje naslove fotografija"
 
-#: 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."
@@ -299,12 +293,11 @@ msgstr ""
 "Izabrano ako će naslovi fotografija biti prikazani ispod sličica u pregledu "
 "zbirke, u suprotnom poništeno."
 
-#: 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 "prikazuje napomene fotografija"
 
-#: 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."
@@ -312,12 +305,11 @@ msgstr ""
 "Izabrano ako će napomene fotografija biti prikazane ispod sličica u pregledu "
 "zbirke, u suprotnom poništeno."
 
-#: misc/org.yorba.shotwell.gschema.xml:64
-#| msgid "Edit Event Comment"
+#: misc/org.yorba.shotwell.gschema.xml:65
 msgid "display event comments"
 msgstr "prikazuje napomene događaja"
 
-#: 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."
@@ -325,12 +317,11 @@ msgstr ""
 "Izabrano ako će napomene događaja biti prikazane ispod sličica u pregledu "
 "događaja, u suprotnom poništeno."
 
-#: 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 "prikazuje oznake fotografija"
 
-#: 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."
@@ -338,24 +329,23 @@ msgstr ""
 "Izabrano ako će oznake fotografija biti izlistane ispod sličica u pregledu "
 "zbirke, u suprotnom poništeno."
 
-#: 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 "prikazuje ocene fotografija"
 
-#: 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 ""
 "Izabrano ako ocene fotografija treba da budu prikazane kao preklopljeni "
 "ornament, u suprotnom poništeno."
 
-#: misc/org.yorba.shotwell.gschema.xml:82
+#: misc/org.yorba.shotwell.gschema.xml:83
 msgid "rating filter level"
 msgstr "nivo izdvajanja ocene"
 
-#: 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 "
@@ -365,63 +355,59 @@ msgstr ""
 "Odbačene ili bolje, 2: Neocenjene 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:88
-#| msgid "Sort _Descending"
+#: misc/org.yorba.shotwell.gschema.xml:89
 msgid "sort events ascending"
 msgstr "ređa događaje rastućim redom"
 
-#: 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 ""
 "Izabrano ako će događaji biti poređani rastućim redom, u suprotnom "
 "opadajućim."
 
-#: 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 "ređa fotografije biblioteke rastućim redom"
 
-#: 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 ""
 "Izabrano ako će fotografije biblioteke biti poređane rastućim redom, u "
 "suprotnom opadajućim."
 
-#: misc/org.yorba.shotwell.gschema.xml:100
+#: misc/org.yorba.shotwell.gschema.xml:101
 msgid "sort library photos criteria"
 msgstr "merilo ređanja fotografija biblioteke"
 
-#: 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 ""
 "Brojčani kod koji navodi merilo ređanja za fotografije u pregledu biblioteke."
 
-#: 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 "ređa fotografije događaja rastućim redom"
 
-#: 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 ""
 "Izabrano ako će fotografije događaja biti poređane rastućim redom, u "
 "suprotnom opadajućim."
 
-#: 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 "merilo ređanja fotografija događaja"
 
-#: misc/org.yorba.shotwell.gschema.xml:113
+#: misc/org.yorba.shotwell.gschema.xml:114
 msgid "Specifies the sort criteria for event photos."
 msgstr "Navodi merilo ređanja za fotografije događaja."
 
-#: misc/org.yorba.shotwell.gschema.xml:118
+#: misc/org.yorba.shotwell.gschema.xml:119
 msgid "use 24 hour time"
 msgstr "koristi 24-časovno vreme"
 
-#: 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."
@@ -429,11 +415,11 @@ msgstr ""
 "Izabrano ako vremena trebaju biti prikazana sa 24-časovnim satom, poništeno "
 "ako vremena treba da koriste PrP/PoP obeležavanje."
 
-#: misc/org.yorba.shotwell.gschema.xml:124
+#: misc/org.yorba.shotwell.gschema.xml:125
 msgid "keep relative time between photos"
 msgstr "zadržava relativno vreme između fotografija"
 
-#: 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."
@@ -442,12 +428,11 @@ msgstr ""
 "treba biti zadržano. Poništeno ako sve fotografije trebaju biti podešene na "
 "isto vreme."
 
-#: 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 "menja datoteke izvorne fotografije"
 
-#: 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."
@@ -456,11 +441,11 @@ msgstr ""
 "datoteke trebaju biti takođe izmenjene. Poništeno ako se izmene čine samo u "
 "bazi podataka."
 
-#: misc/org.yorba.shotwell.gschema.xml:136
+#: misc/org.yorba.shotwell.gschema.xml:137
 msgid "show welcome dialog on startup"
 msgstr "prikazuje prozorče dobrodošlice pri pokretanju"
 
-#: 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."
@@ -468,79 +453,73 @@ msgstr ""
 "Izabrano ako, prilikom pokretanja, prozorče dobrodošlice treba biti "
 "prikazano. Poništeno ako ne treba biti prikazano."
 
-#: misc/org.yorba.shotwell.gschema.xml:142
-#| msgid "Library Location"
+#: misc/org.yorba.shotwell.gschema.xml:143
 msgid "sidebar position"
 msgstr "položaj bočne površi"
 
-#: misc/org.yorba.shotwell.gschema.xml:143
+#: misc/org.yorba.shotwell.gschema.xml:144
 msgid "The width, in pixels, of the sidebar"
 msgstr "Širina, u pikselima, bočne površi"
 
-#: misc/org.yorba.shotwell.gschema.xml:148
+#: misc/org.yorba.shotwell.gschema.xml:149
 msgid "photo thumbnail scale"
 msgstr "srazmera minijature fotografije"
 
-#: 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 "Srazmera minijature fotografije, u opsegu od 72 do 360."
 
-#: misc/org.yorba.shotwell.gschema.xml:154
-#| msgid "Pin the toolbar open"
+#: misc/org.yorba.shotwell.gschema.xml:155
 msgid "pin toolbar state"
 msgstr "pribada stanje trake alata"
 
-#: misc/org.yorba.shotwell.gschema.xml:155
+#: misc/org.yorba.shotwell.gschema.xml:156
 msgid "Pin toolbar in fullscreen, or not."
 msgstr "Pribada traku alata u punom ekranu, ili ne."
 
-#: misc/org.yorba.shotwell.gschema.xml:160
-#| msgid "_Background:"
+#: misc/org.yorba.shotwell.gschema.xml:161
 msgid "background color"
 msgstr "boja pozadine"
 
-#: 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 "Boja nijanse sive za upotrebu kao boja pozadine."
 
-#: 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 "Stanje izbora opcije „sakrij fotografije“"
 
-#: 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 ""
 "Poslednje korišćeno stanje izbora opcije „sakrij već uvezene fotografije“ na "
 "stranici uvoza."
 
-#: misc/org.yorba.shotwell.gschema.xml:174
-#| msgid "_Delay:"
+#: misc/org.yorba.shotwell.gschema.xml:175
 msgid "delay"
 msgstr "zastoj"
 
-#: misc/org.yorba.shotwell.gschema.xml:175
+#: misc/org.yorba.shotwell.gschema.xml:176
 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:180
-#| msgid "Transition d_elay:"
+#: misc/org.yorba.shotwell.gschema.xml:181
 msgid "transition delay"
 msgstr "zastoj prelaza"
 
-#: 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 ""
 "Vreme (u sekundama) trajanja prelaza između fotografija u pokretnom prikazu"
 
-#: misc/org.yorba.shotwell.gschema.xml:186
-#| msgid "_Transition effect:"
+#: misc/org.yorba.shotwell.gschema.xml:187
 msgid "transition effect id"
 msgstr "id dejstva prelaza"
 
-#: 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"
@@ -548,70 +527,69 @@ msgstr ""
 "Naziv dejstva prelaza koje će se koristiti između fotografija prilikom "
 "trajanja pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:192
-#| msgid "Show t_itle"
+#: misc/org.yorba.shotwell.gschema.xml:193
 msgid "Show title"
 msgstr "prikazuje naslov"
 
-#: 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 "Da li će prikazivati naslov fotografije za vreme pokretnog prikaza"
 
-#: misc/org.yorba.shotwell.gschema.xml:200
+#: misc/org.yorba.shotwell.gschema.xml:201
 msgid "maximize library window"
 msgstr "uveličava prozor bibliteke"
 
-#: misc/org.yorba.shotwell.gschema.xml:201
+#: misc/org.yorba.shotwell.gschema.xml:202
 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:206
+#: misc/org.yorba.shotwell.gschema.xml:207
 msgid "width of library window"
 msgstr "širina prozora biblioteke"
 
-#: 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 "Poslednja pribeležena širina prozora programa biblioteke."
 
-#: misc/org.yorba.shotwell.gschema.xml:212
+#: misc/org.yorba.shotwell.gschema.xml:213
 msgid "height of library window"
 msgstr "visina prozora biblioteke"
 
-#: 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 "Poslednja pribeležena visina prozora programa biblioteke."
 
-#: misc/org.yorba.shotwell.gschema.xml:218
+#: misc/org.yorba.shotwell.gschema.xml:219
 msgid "maximize direct-edit window"
 msgstr "uveličava prozor neposrednog uređivanja"
 
-#: 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 ""
 "Izabrano ako je program neposrednog uređivanja uveličan, poništeno u "
 "suprotnom."
 
-#: misc/org.yorba.shotwell.gschema.xml:224
+#: misc/org.yorba.shotwell.gschema.xml:225
 msgid "width of direct-edit window"
 msgstr "širina prozora neposrednog uređivanja"
 
-#: 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 "Poslednja pribeležena širina prozora programa neposrednog uređivanja."
 
-#: misc/org.yorba.shotwell.gschema.xml:230
+#: misc/org.yorba.shotwell.gschema.xml:231
 msgid "height of direct-edit window"
 msgstr "visina prozora neposrednog uređivanja"
 
-#: 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 "Poslednja pribeležena visina prozora programa neposrednog uređivanja."
 
-#: misc/org.yorba.shotwell.gschema.xml:236
+#: misc/org.yorba.shotwell.gschema.xml:237
 msgid "sidebar divider position"
 msgstr "položaj razdelnika bočne površi"
 
-#: 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."
@@ -619,32 +597,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:244
-#| msgid "Import to Library"
+#: misc/org.yorba.shotwell.gschema.xml:245
 msgid "import directory"
 msgstr "direktorijum uvoza"
 
-#: misc/org.yorba.shotwell.gschema.xml:245
+#: misc/org.yorba.shotwell.gschema.xml:246
 msgid "Directory in which imported photo files are placed."
 msgstr "Direktorijum u kome se stavljaju datoteke uvezenih fotografija."
 
-#: 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 "prati prispeće novih datoteka u fascikli fototeke"
 
-#: 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 ""
 "Ako je izabrano, datoteke dodate u direktorijum biblioteke se odmah uvoze."
 
-#: 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 "upisuje metapodatke u glavne datoteke"
 
-#: 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."
@@ -652,11 +627,11 @@ msgstr ""
 "Ako je izabrano, izmene u metapodacima (oznake, naslovi, itd.) se zapisuju u "
 "datoteku glavne fotografije."
 
-#: misc/org.yorba.shotwell.gschema.xml:262
+#: misc/org.yorba.shotwell.gschema.xml:263
 msgid "use lowercase filenames"
 msgstr "koristi nazive datoteka malim slovima"
 
-#: 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"
@@ -664,12 +639,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:268
-#| msgid "_Directory structure:"
+#: misc/org.yorba.shotwell.gschema.xml:269
 msgid "directory pattern"
 msgstr "šablon direktorijuma"
 
-#: 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."
@@ -677,11 +651,11 @@ msgstr ""
 "Niska koja kodira šablon imenovanja koji će biti korišćen za imenovanje "
 "direktorijuma fotografija pri uvozu."
 
-#: misc/org.yorba.shotwell.gschema.xml:274
+#: misc/org.yorba.shotwell.gschema.xml:275
 msgid "directory pattern custom"
 msgstr "proizvoljni šablon direktorijuma"
 
-#: 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."
@@ -689,30 +663,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:280
-#| msgid "RAW Developer"
+#: misc/org.yorba.shotwell.gschema.xml:281
 msgid "RAW developer default"
 msgstr "osnovni sirovi razvijač"
 
-#: 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 "Osnovna opcija za koju će sirovog razvijača Foto-bunar koristiti."
 
-#: misc/org.yorba.shotwell.gschema.xml:288
+#: misc/org.yorba.shotwell.gschema.xml:289
 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:289
+#: misc/org.yorba.shotwell.gschema.xml:290
 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:293
-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:294
+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
 msgid ""
 "A nonzero, positive integer representing the width part of the last custom "
 "crop ratio the user entered."
@@ -720,12 +694,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: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 ""
 "Najčešće skoro korišćen denomerator proizvoljnog odnosa srazmere odsecanja."
 
-#: 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."
@@ -733,104 +707,144 @@ msgstr ""
 "Ne-nulti, pozitivni ceo broj koji predstavlja deo visine poslednje srazmere "
 "proizvoljnog odsecanja koji je uneo korisnik."
 
-#: misc/org.yorba.shotwell.gschema.xml:306
-#| msgid "E_xternal photo editor:"
+#: misc/org.yorba.shotwell.gschema.xml:307
 msgid "external photo editor"
 msgstr "spoljni uređivač fotografija"
 
-#: misc/org.yorba.shotwell.gschema.xml:307
+#: misc/org.yorba.shotwell.gschema.xml:308
 msgid "External application used to edit photos."
 msgstr "Spoljni program korišćen za uređivanje fotografija."
 
-#: misc/org.yorba.shotwell.gschema.xml:312
-#| msgid "External _RAW editor:"
+#: misc/org.yorba.shotwell.gschema.xml:313
 msgid "external raw editor"
 msgstr "spoljni sirovi uređivač"
 
-#: misc/org.yorba.shotwell.gschema.xml:313
+#: misc/org.yorba.shotwell.gschema.xml:314
 msgid "External application used to edit RAW photos."
 msgstr "Spoljni program korišćen za uređivanje sirovih fotografija."
 
-#: 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 "Podešavanje u prozorčetu izvoza: kako da skrati slike"
+
+#: misc/org.yorba.shotwell.gschema.xml:358
+#| msgid "Export metadata"
+msgid "export metadata"
+msgstr "izvoz metapodataka"
+
+#: misc/org.yorba.shotwell.gschema.xml:359
+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
+msgid "format setting, special value"
+msgstr "podešavanje formata, posebna vrednost"
+
+#: misc/org.yorba.shotwell.gschema.xml:365
+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
+msgid "format setting, type value"
+msgstr "podešavanje formata, vrednost vrste"
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+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
+msgid "JPEG quality option"
+msgstr "Opcija JPEG kvaliteta"
+
+#: misc/org.yorba.shotwell.gschema.xml:377
+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
+msgid "maximal size of image"
+msgstr "najveća veličina slike"
+
+#: misc/org.yorba.shotwell.gschema.xml:383
+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
 msgid "last used publishing service"
 msgstr "poslednja korišćena usluga objavljivanja"
 
-#: 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 ""
 "Brojčani kod koji predstavlja poslednju uslugu na kojoj su fotografije "
 "objavljene"
 
-#: misc/org.yorba.shotwell.gschema.xml:326
-#| msgid "Core Publishing Services"
+#: misc/org.yorba.shotwell.gschema.xml:396
 msgid "default publishing service"
 msgstr "osnovna usluga objavljivanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:340
-#| msgid "Access _type:"
+#: misc/org.yorba.shotwell.gschema.xml:410
 msgid "access token"
 msgstr "simbol pristupa"
 
-#: 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 ""
 "Simbol otvorenog potvrđivanja Fejsbuka za trenutno prijavljenu sesiju, ako "
 "postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:346
+#: misc/org.yorba.shotwell.gschema.xml:416
 msgid "user i.d."
 msgstr "i.d. korisnika"
 
-#: 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 "i.d. korisnika Fejsbuka, za trenutno prijavljenog korisnika, ako postoji"
+msgstr ""
+"i.d. korisnika Fejsbuka, za trenutno prijavljenog korisnika, ako postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:352
-#| msgid "User _name"
+#: misc/org.yorba.shotwell.gschema.xml:422
 msgid "user name"
 msgstr "korisnik"
 
-#: 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 "Ime trenutno prijavljenog korisnika Fejsbuka, ako ga ima"
 
-#: 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 "šifra osnovne veličine"
 
-#: 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 ""
 "Brojčani kod koji predstavlja osnovnu veličinu za fotografije objavljene na "
 "Fejsbuku"
 
-#: 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 "Da li će sa slika otpremljenih na Fejsbuk biti prvo uklonjeni metapodaci"
 
-#: misc/org.yorba.shotwell.gschema.xml:372
+#: misc/org.yorba.shotwell.gschema.xml:442
 msgid "OAuth Access Phase Token"
 msgstr "Simbol otvorenog potvrđivanja faze pristupa"
 
-#: 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 ""
 "Simbol potvrđivanja identiteta za trenutno prijavljenog korisnika Flikra, ako "
 "postoji"
 
-#: misc/org.yorba.shotwell.gschema.xml:378
+#: misc/org.yorba.shotwell.gschema.xml:448
 msgid "OAuth Access Phase Token Secret"
 msgstr "Tajna simbola otvorenog potvrđivanja faze pristupa"
 
-#: 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"
@@ -838,22 +852,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:385
+#: misc/org.yorba.shotwell.gschema.xml:455
 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:391
+#: misc/org.yorba.shotwell.gschema.xml:461
 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:396
+#: misc/org.yorba.shotwell.gschema.xml:466
 msgid "default visibility"
 msgstr "osnovna vidljivost"
 
-#: 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"
@@ -861,18 +875,18 @@ msgstr ""
 "Brojčani kod koji predstavlja osnovnu vidljivost za fotografije objavljene na "
 "Flikru"
 
-#: 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 "Da li će sa slika otpremljenih na Flikr biti prvo uklonjeni metapodaci"
 
-#: 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 "simbol osvežavanja"
 
-#: 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."
@@ -880,7 +894,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:417
+#: misc/org.yorba.shotwell.gschema.xml:487
 msgid ""
 "A numeric code representing the default size for photos uploaded to Picasa "
 "Web Albums"
@@ -888,66 +902,64 @@ msgstr ""
 "Brojčani kod koji predstavlja osnovnu veličinu za fotografije otpremljene na "
 "Pikasa veb albume"
 
-#: 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 "poslednji album"
 
-#: misc/org.yorba.shotwell.gschema.xml:423
-#: misc/org.yorba.shotwell.gschema.xml:517
+#: misc/org.yorba.shotwell.gschema.xml:493
+#: misc/org.yorba.shotwell.gschema.xml:587
 msgid "The name of the last album the user published photos to, if any"
 msgstr ""
 "Naziv poslednjeg albuma na koji je korisnik objavio fotografije, ako postoji"
 
-#: 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 "Da li će sa slika otpremljenih na Pikasu biti prvo uklonjeni metapodaci"
 
-#: misc/org.yorba.shotwell.gschema.xml:436
+#: misc/org.yorba.shotwell.gschema.xml:506
 msgid "Piwigo URL"
 msgstr "Adresa Piviga"
 
-#: misc/org.yorba.shotwell.gschema.xml:437
+#: misc/org.yorba.shotwell.gschema.xml:507
 msgid "URL of the Piwigo server."
 msgstr "Adresa Pivigo servera."
 
-#: misc/org.yorba.shotwell.gschema.xml:443
+#: misc/org.yorba.shotwell.gschema.xml:513
 msgid "Piwigo username, if logged in."
 msgstr "Korisničko ime za Pivigo, ako ste prijavljeni."
 
-#: misc/org.yorba.shotwell.gschema.xml:448
-#| msgid "_Password"
+#: misc/org.yorba.shotwell.gschema.xml:518
 msgid "password"
 msgstr "lozinka"
 
-#: misc/org.yorba.shotwell.gschema.xml:449
+#: misc/org.yorba.shotwell.gschema.xml:519
 msgid "Piwigo password, if logged in."
 msgstr "Lozinka za Pivigo, ako ste prijavljeni."
 
-#: misc/org.yorba.shotwell.gschema.xml:454
-#| msgid "_Remember Password"
+#: misc/org.yorba.shotwell.gschema.xml:524
 msgid "remember password"
 msgstr "zapamti lozinku"
 
-#: misc/org.yorba.shotwell.gschema.xml:455
+#: misc/org.yorba.shotwell.gschema.xml:525
 msgid "If true, remember the Piwigo password."
 msgstr "Ako je izabrano, pamtiće lozinku za Pivigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:461
+#: misc/org.yorba.shotwell.gschema.xml:531
 msgid "The last selected Piwigo category."
 msgstr "Poslednja izabrana kategorija za Pivigo."
 
-#: misc/org.yorba.shotwell.gschema.xml:466
+#: misc/org.yorba.shotwell.gschema.xml:536
 msgid "last permission level"
 msgstr "poslednji nivo ovlašćenja"
 
-#: misc/org.yorba.shotwell.gschema.xml:467
+#: misc/org.yorba.shotwell.gschema.xml:537
 msgid "The last chosen Piwigo permission level."
 msgstr "Poslednji izabrani nivo ovlašćenja za Pivigo."
 
-#: 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."
@@ -955,21 +967,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:479
+#: misc/org.yorba.shotwell.gschema.xml:549
 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: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 ""
 "ako je naslov podešen a napomena nije, koristi naslov kao napomenu za "
 "otpremanja na Pivigo"
 
-#: 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"
@@ -977,11 +988,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:490
+#: misc/org.yorba.shotwell.gschema.xml:560
 msgid "do not upload tags when uploading to Piwigo"
 msgstr "ne otprema oznake kada otprema na Pivigo"
 
-#: 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."
@@ -989,31 +1000,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:499
-#| msgid "Gallery3 publishing module"
+#: misc/org.yorba.shotwell.gschema.xml:569
 msgid "Gallery3 username"
 msgstr "Korisničko ime Galerije 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:504
-#| msgid "API _Key:"
+#: misc/org.yorba.shotwell.gschema.xml:574
 msgid "API key"
 msgstr "API ključ"
 
-#: misc/org.yorba.shotwell.gschema.xml:505
-#| msgid "_Gallery3 URL:"
+#: misc/org.yorba.shotwell.gschema.xml:575
 msgid "Gallery3 API key"
 msgstr "API ključ Galerije 3"
 
-#: misc/org.yorba.shotwell.gschema.xml:510
+#: misc/org.yorba.shotwell.gschema.xml:580
 msgid "URL"
 msgstr "Adresa"
 
-#: misc/org.yorba.shotwell.gschema.xml:511
-#| msgid "_Gallery3 URL:"
+#: misc/org.yorba.shotwell.gschema.xml:581
 msgid "Gallery3 site URL"
 msgstr "Adresa sajta Galerije 3"
 
-#: 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"
@@ -1021,19 +1028,19 @@ msgstr ""
 "Naznačava da li će sa slika otpremljenih na Galeriju 3 biti prvo uklonjeni "
 "metapodaci"
 
-#: misc/org.yorba.shotwell.gschema.xml:528
+#: misc/org.yorba.shotwell.gschema.xml:598
 msgid "scaling constraint of uploaded picture"
 msgstr "ograničenje srazmeravanja otpremljene slike"
 
-#: 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 "ID ograničenja srazmeravanja slike koja se otprema"
 
-#: misc/org.yorba.shotwell.gschema.xml:534
+#: misc/org.yorba.shotwell.gschema.xml:604
 msgid "pixels of the major axis uploaded picture"
 msgstr "pikseli veće ose otpremljene slike"
 
-#: 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"
@@ -1041,7 +1048,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: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."
@@ -1049,31 +1056,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:550
-#| msgid "Core Data Import Services"
+#: misc/org.yorba.shotwell.gschema.xml:620
 msgid "last used import service"
 msgstr "poslednja korišćena usluga uvoza"
 
-#: 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 ""
 "Brojčani kod koji predstavlja poslednju uslugu sa koje su fotografije uvezene"
 
-#: misc/org.yorba.shotwell.gschema.xml:558
+#: misc/org.yorba.shotwell.gschema.xml:628
 msgid "interpreter state cookie"
 msgstr "kolačić stanja tumača"
 
-#: 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 "Brojčani kod koji hvata stanje okruženja priključka Gstrimera"
 
-#: misc/org.yorba.shotwell.gschema.xml:566
+#: misc/org.yorba.shotwell.gschema.xml:636
 msgid "content layout mode"
 msgstr "režim rasporeda sadržaja"
 
-#: 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"
@@ -1081,38 +1087,35 @@ msgstr ""
 "Brojčani kod koji opisuje kako se fotografije ređaju na stranici za vreme "
 "štampanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:572
-#| msgid "_Contents"
+#: misc/org.yorba.shotwell.gschema.xml:642
 msgid "content ppi"
 msgstr "ppi sadržaja"
 
-#: 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 "Broj piksela po inču (ppi) poslatih štampaču za vreme štampanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:578
+#: misc/org.yorba.shotwell.gschema.xml:648
 msgid "content width"
 msgstr "širina sadržaja"
 
-#: 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 "Širina štampanog materijala na stranici prilikom štampanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:584
-#| msgid "Rotate Right"
+#: misc/org.yorba.shotwell.gschema.xml:654
 msgid "content height"
 msgstr "visina sadržaja"
 
-#: 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 "Visina štampanog materijala na stranici prilikom štampanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:590
-#| msgid "_Contents"
+#: misc/org.yorba.shotwell.gschema.xml:660
 msgid "content units"
 msgstr "jedinice sadržaja"
 
-#: 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"
@@ -1120,12 +1123,11 @@ msgstr ""
 "Brojčani kod koji predstavlja jedinicu mere (inči ili centimetri) koja se "
 "koristi prilikom štampanja"
 
-#: 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 "broj fotografija po stranici"
 
-#: 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"
@@ -1133,23 +1135,22 @@ msgstr ""
 "Brojčani kod koji predstavlja trenutno izabrani režim broja slika po stranici "
 "prilikom štampanja"
 
-#: misc/org.yorba.shotwell.gschema.xml:602
+#: misc/org.yorba.shotwell.gschema.xml:672
 msgid "size selection"
 msgstr "izbor veličine"
 
-#: 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 ""
 "Indeks trenutne veličine štampanja u unapred određenom spisku standardnih "
 "veličina"
 
-#: misc/org.yorba.shotwell.gschema.xml:608
-#| msgid "_Match photo aspect ratio"
+#: misc/org.yorba.shotwell.gschema.xml:678
 msgid "match aspect ratio"
 msgstr "odgovara odnosu srazmere"
 
-#: 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"
@@ -1157,12 +1158,11 @@ msgstr ""
 "Određuje da li proizvoljne veličine štampanja moraju da odgovaraju odnosu "
 "srazmere izvorne fotografije"
 
-#: misc/org.yorba.shotwell.gschema.xml:614
-#| msgid "Print image _title"
+#: misc/org.yorba.shotwell.gschema.xml:684
 msgid "print titles"
 msgstr "štampa naslove"
 
-#: 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."
@@ -1170,227 +1170,213 @@ msgstr ""
 "Izabrano ako naslov fotografije treba da se odštampa prilikom štampanja, u "
 "suprotnom poništeno."
 
-#: misc/org.yorba.shotwell.gschema.xml:620
+#: misc/org.yorba.shotwell.gschema.xml:690
 msgid "titles font"
 msgstr "slova naslova"
 
-#: 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 ""
 "Naziv slovne grupe koja će se koristiti za naslove fotografija prilikom "
 "štampanja."
 
-#: misc/org.yorba.shotwell.gschema.xml:632
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:702
 msgid "enable facebook publishing plugin"
 msgstr "uključuje priključak objavljivanja na fejsbuk"
 
-#: 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 ""
 "Izabrano ako je uključen priključak za objavljivanje na Fejsbuk, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:638
+#: misc/org.yorba.shotwell.gschema.xml:708
 msgid "enable flickr publishing plugin"
 msgstr "uključuje priključak objavljivanja na flikr"
 
-#: 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 ""
 "Izabrano ako je uključen priključak za objavljivanje na Flikr, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:644
+#: misc/org.yorba.shotwell.gschema.xml:714
 msgid "enable picasa publishing plugin"
 msgstr "uključuje priključak objavljivanja na pikasu"
 
-#: 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 ""
 "Izabrano ako je uključen priključak za objavljivanje na Pikasu, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:650
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:720
 msgid "enable youtube publishing plugin"
 msgstr "uključuje priključak objavljivanja na jutub"
 
-#: 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 ""
 "Izabrano ako je uključen priključak za objavljivanje na Jutub, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:656
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:726
 msgid "enable piwigo publishing plugin"
 msgstr "uključuje priključak objavljivanja na pivigo"
 
-#: 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 ""
 "Izabrano ako je uključen priključak za objavljivanje na Pivigo, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:662
+#: misc/org.yorba.shotwell.gschema.xml:732
 msgid "enable yandex publishing plugin"
 msgstr "uključuje priključak objavljivanja na jandeks"
 
-#: 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 ""
 "Izabrano ako je uključen priključak za objavljivanje na Jandeks.Fotki, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:668
-#| msgid "Unable to publish"
+#: misc/org.yorba.shotwell.gschema.xml:738
 msgid "enable tumblr publishing plugin"
 msgstr "uključuje priključak objavljivanja na tumblr"
 
-#: misc/org.yorba.shotwell.gschema.xml:669
+#: misc/org.yorba.shotwell.gschema.xml:739
 msgid "True if the Tumblr publishing plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak za objavljivanje na Tumblr, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:674
-#| msgid "Gallery3 publishing module"
+#: misc/org.yorba.shotwell.gschema.xml:744
 msgid "enable rajce publishing plugin"
 msgstr "uključuje priključak objavljivanja na rajce"
 
-#: misc/org.yorba.shotwell.gschema.xml:675
+#: misc/org.yorba.shotwell.gschema.xml:745
 msgid "True if the Rajce publishing plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak za objavljivanje na Rajse, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:680
-#| msgid "Gallery3 publishing module"
+#: misc/org.yorba.shotwell.gschema.xml:750
 msgid "enable gallery3 publishing plugin"
 msgstr "uključuje priključak objavljivanja na galeriju 3"
 
-#: 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 ""
 "Izabrano ako je uključen priključak za objavljivanje na Galeriju 3, u suprotnom "
 "poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:686
+#: misc/org.yorba.shotwell.gschema.xml:756
 msgid "enable F-Spot import plugin"
 msgstr "uključuje priključak uvoza F-broja"
 
-#: 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 "Izabrano ako je uključen priključak uvoza F-boja, u suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:692
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:762
 msgid "enable slideshow crumble transition"
 msgstr "uključuje raspadanje prelaza pokretnog prikaza"
 
-#: 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 ""
 "Izabrano ako je uključen priključak raspadanja prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:698
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:768
 msgid "enable slideshow fade transition"
 msgstr "uključuje iščezavanje prelaza pokretnog prikaza"
 
-#: 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 ""
 "Izabrano ako je uključen priključak iščezavanja prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:704
-#: misc/org.yorba.shotwell.gschema.xml:728
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:774
+#: misc/org.yorba.shotwell.gschema.xml:798
 msgid "enable slideshow slide transition"
 msgstr "uključuje klizanje prelaza pokretnog prikaza"
 
-#: 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 ""
 "Izabrano ako je uključen priključak klizanja prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:710
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:780
 msgid "enable slideshow clock transition"
 msgstr "uključuje sat prelaza pokretnog prikaza"
 
-#: 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 ""
 "Izabrano ako je uključen priključak sata prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:716
-#: misc/org.yorba.shotwell.gschema.xml:722
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:786
+#: misc/org.yorba.shotwell.gschema.xml:792
 msgid "enable slideshow circle transition"
 msgstr "uključuje krug prelaza pokretnog prikaza"
 
-#: 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 ""
 "Izabrano ako je uključen priključak kruga prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:723
+#: misc/org.yorba.shotwell.gschema.xml:793
 msgid ""
 "True if the Circles slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak krugova prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:729
+#: misc/org.yorba.shotwell.gschema.xml:799
 msgid ""
 "True if the Blinds slideshow transition plugin is enabled, false otherwise"
 msgstr ""
 "Izabrano ako je uključen priključak zastora prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:734
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:804
 msgid "enable slideshow squares transition"
 msgstr "uključuje kvadrate prelaza pokretnog prikaza"
 
-#: 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 ""
 "Izabrano ako je uključen priključak kvadrata prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:740
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:810
 msgid "enable slideshow stripes transition"
 msgstr "uključuje štrafte prelaza pokretnog prikaza"
 
-#: 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 ""
 "Izabrano ako je uključen priključak štrafti prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: misc/org.yorba.shotwell.gschema.xml:746
-#| msgid "Core Slideshow Transitions"
+#: misc/org.yorba.shotwell.gschema.xml:816
 msgid "enable slideshow chess transition"
 msgstr "uključuje šah prelaza pokretnog prikaza"
 
-#: 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"
@@ -1398,24 +1384,81 @@ msgstr ""
 "Izabrano ako je uključen priključak šaha prelaza pokretnog prikaza, u "
 "suprotnom poništeno"
 
-#: plugins/common/Resources.vala:12
-msgid "Visit the Shotwell home page"
-msgstr "Posetite veb stranicu Foto-bunara"
+#: 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 ""
+"Trenutno niste prijavljeni na Fejsbuk.\n"
+"\n"
+"Ako još uvek ne posedujete nalog na Fejsbuku, možete da ga napravite tokom "
+"postupka prijavljivanja. Za vreme prijavljivanja, Povezivanje Foto-bunara može da "
+"vam zatraži ovlašćenje da otpremi fotografije i da ih objavi na vašem dovodu. "
+"Ova ovlašćenja su neophodna da bi Povezivanje Foto-bunara radilo."
 
-#: plugins/common/Resources.vala:31 src/AppWindow.vala:676
-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 ""
-"Nikola Radovanović <nrad@eunet.rs>\n"
-"Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
+"Već ste se jednom prijavili i odjavili sa Fejsbuka tokom ove sesije Foto-"
+"bunara.\n"
+"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
+msgid ""
+"You are not currently logged into Flickr.\n"
 "\n"
-"http://prevod.org — prevod na srpski jezik"
+"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 Flikr.\n"
+"\n"
+"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/common/RESTSupport.vala:451
-#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:958
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "Privremena datoteka neophodna za objavljivanje nije dostupna"
+#: plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala:364
+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:481
+msgid "Verifying authorization…"
+msgstr "Proveravam ovlašćenje…"
 
-#: 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"
@@ -1429,6 +1472,106 @@ msgstr ""
 "Da nastavite objavljivanje na Guglovim uslugama, izađite i ponovo pokrenite "
 "Foto-bunar, pa pokušajte ponovo."
 
+#: 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 ""
+"Trenutno niste prijavljeni na Veb albume Pikase.\n"
+"\n"
+"Prijavite se na Veb albume Pikase u vašem internet pregledniku. Moraćete da "
+"ovlastite Povezivanje Foto-bunara da napravi vezu do vašeg naloga Veb albuma "
+"Pikase."
+
+#: 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 ""
+"Trenutno niste prijavljeni na Jutub.\n"
+"\n"
+"Da nastavite morate da posedujete Guglov nalog koji ste podesili za "
+"korišćenje sa Jutubom. Možete da podesite većinu naloga koristeći vaš "
+"preglednik da se prijavite na sajt Jutuba barem jednom."
+
+#: 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:603
+msgid "translator-credits"
+msgstr ""
+"Nikola Radovanović <nrad@eunet.rs>\n"
+"Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
+"\n"
+"http://prevod.org — prevod na srpski jezik"
+
+#. 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 ""
+"⚫ 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
+msgid ""
+"⚫ This website’s identification is too old to trust. Check the date on your "
+"computer’s calendar."
+msgstr ""
+"⚫ Raspoznavanje ovog veb sajta je prestaro za vreovanje. Proverite datum na "
+"kalendaru vašeg računara."
+
+#. 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 ""
+"⚫ 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
+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
+msgid ""
+"⚫ This website’s identification has been revoked by the trusted organization "
+"that issued it."
+msgstr ""
+"⚫ Raspoznavanje ovog veb sajta je opozvano od strane poverljive organizacije "
+"koja ga je izdala."
+
+#. 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 ""
+"⚫ Raspoznavanju ovog veb sajta se ne može verovati jer koristi vrlo slabo "
+"šifrovanje."
+
+#. 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 ""
+"⚫ 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
+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
@@ -1524,94 +1667,93 @@ msgstr "Pripremam za uvoz"
 msgid "Core Data Import Services"
 msgstr "Usluge uvoza ključnih podataka"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:5
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
-msgid "Go _Back"
-msgstr "_Nazad"
-
-#: 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 "_Prijavi me"
-
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:34
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
 msgid "_Gallery3 URL:"
 msgstr "Adresa _Galerije 3:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:64
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
 msgid "_User name:"
 msgstr "Korisničko _ime:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:79
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:178
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "_Nazad"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1464
+msgid "_Log in"
+msgstr "_Prijavi me"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
 msgid "API _Key:"
 msgstr "API _ključ:"
 
-#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:208
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
 msgid "or"
 msgstr "ili"
 
-#: 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 "_Odjavi me"
-
-#: 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 "_Objavi"
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "_Postojeći album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:11
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
 msgid "A _new album"
 msgstr "_Novi album"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:17
-msgid "An _existing album"
-msgstr "_Postojeći album"
-
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:22
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
 msgid "_Remove location, tag and camera-identifying data before uploading"
 msgstr ""
 "_Ukloni mesto, podatke prepoznavanja oznake i foto-aparata pre otpremanja"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:135
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
 msgid "Scaling constraint:"
 msgstr "Odnos promene veličine:"
 
-#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:153
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
 msgid "pixels"
 msgstr "tačkica"
 
-#: 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 "Izvorna veličina"
 
-#: 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 "Širina i visina"
 
+#: 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 "_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/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:76 src/PhotoPage.vala:2466
+msgid "_Publish"
+msgstr "_Objavi"
+
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Modulobjavljivanja Galerije 3"
@@ -1637,8 +1779,8 @@ msgstr "Osnovni direktorijum Foto-bunara"
 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"
@@ -1657,7 +1799,7 @@ msgstr ""
 #: plugins/shotwell-publishing-extras/GalleryConnector.vala:1773
 #, c-format
 msgid ""
-"A file required for publishing is unavailable. Publishing to %s can't "
+"A file required for publishing is unavailable. Publishing to %s can’t "
 "continue."
 msgstr ""
 "Datoteka za objavljivanje nije dostupna. Objavljivanje na „%s“ ne može da se "
@@ -1704,57 +1846,55 @@ msgstr "Nepoznati korisnik"
 msgid " Site Not Found"
 msgstr " Nisam pronašao sajt"
 
-#: 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 "Adresa _el. pošte"
 
-#: 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 "_Lozinka"
 
-#: 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 "_Zapamti"
 
-#: 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 "Prijavi me"
 
-#: 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 "_Postojeći album:"
 
-#: 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 "_Novi album pod nazivom:"
 
-#: 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 "_Sakrij album"
 
-#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:178
-#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
 msgid "Open target _album in browser"
 msgstr "Otvori ciljni _album u pregledniku"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
-msgid "Copyright (C) 2013 rajce.net"
-msgstr "Autorska prava (C) 2013 rajce.net"
+msgid "Copyright © 2013 rajce.net"
+msgstr "Autorska prava © 2013 rajce.net"
 
 #: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
 msgid "An error message occurred when publishing to Rajce. Please try again."
@@ -1772,61 +1912,61 @@ msgstr "El. pošta i/ili lozinka nisu ispravni. Pokušajte ponovo"
 msgid "Invalid User Email or Password"
 msgstr "Neispravna el. pošta korisnika ili lozinka"
 
-#: 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 "Prijavljeni ste na Rajs kao %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 "Fotografije će se pojaviti u:"
 
-#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
 msgid "Shotwell Extra Publishing Services"
 msgstr "Foto-bunarove dodatne usluge objavljivanja"
 
-#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:43
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
 msgid "Blogs:"
 msgstr "Blogovi:"
 
-#: 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 "Veličina _fotografije:"
 
 #: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
 msgid "Copyright 2012 BJA Electronics"
-msgstr "Autorska prava 2012 BJA Electronics"
+msgstr "Autorska prava 2012 BJA Elektronika"
 
 #: 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 tačkica"
+#: 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:1232
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1231
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 tačkica"
+#: 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 x 853 pixels"
-msgstr "1280 x 853 tačkica"
+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"
+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."
+"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."
@@ -1836,22 +1976,22 @@ 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:992
+#: 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:1026
+#: 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: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 "Ne mogu da učitam korisničko sučelje: %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"
@@ -1868,125 +2008,92 @@ msgstr "Autorska prava 2010+ Jevgenij Poljakov <zbr@ioremap.net>"
 msgid "Visit the Yandex.Fotki web site"
 msgstr "Posetite veb sajt „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 "Trenutno niste prijavljeni na „Yandex.Fotki“."
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:24
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Javno"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+msgid "Friends"
+msgstr "Prijatelji"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
+msgid "Private"
+msgstr "Privatno"
+
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:47
 msgid "_Albums (or write new):"
 msgstr "_Albumi (ili napravi novi):"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:38
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "_Vrsta pristupa:"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:81
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "Isključi _komentare"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:96
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:123
 msgid "_Forbid downloading original photo"
 msgstr "_Zabrani preuzimanje izvorne fotografije"
 
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:159
-msgid "Public"
-msgstr "Javno"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:162
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1194
-msgid "Friends"
-msgstr "Prijatelji"
-
-#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:165
-#: plugins/shotwell-publishing/YouTubePublishing.vala:498
-msgid "Private"
-msgstr "Privatno"
-
-#: 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 "Objavi u _postojeći 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 "Napravi _novi album:"
 
-#: 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 "_Veličina slanja:"
 
-#: 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 snimke i nove albume fotografija mogu _videti:"
 
-#: 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 "_Ukloni mesto, foto-aparat, i druge podatke prepoznavanja pre otpremanja"
 
-#: 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 "Povezivanje Foto-bunara"
 
-#: 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 ""
-"Trenutno niste prijavljeni na Fejsbuk.\n"
-"\n"
-"Ako još uvek ne posedujete nalog na Fejsbuku, možete da ga napravite tokom "
-"postupka prijavljivanja. Za vreme prijavljivanja, Povezivanje Foto-bunara može da "
-"vam zatraži ovlašćenje da otpremi fotografije i da ih objavi na vašem dovodu. "
-"Ova ovlašćenja su neophodna da bi Povezivanje Foto-bunara radilo."
-
-#: 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 ""
-"Već ste se jednom prijavili i odjavili sa Fejsbuka tokom ove sesije Foto-"
-"bunara.\n"
-"Da nastavite objavljivanje fotografija na Fejsbuku, izađite i ponovo pokrenite "
-"Foto-bunar, pa pokušajte ponovo."
-
-#: plugins/shotwell-publishing/FacebookPublishing.vala:87
+#: plugins/shotwell-publishing/FacebookPublishing.vala:81
 msgid "Standard (720 pixels)"
 msgstr "Standardna (720 tačkica)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:90
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Velika (2048 tačkica)"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:255
-msgid "Testing connection to Facebook..."
-msgstr "Isprobavam vezu sa Fejsbukom..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
+msgid "Creating album…"
+msgstr "Pravim album…"
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:348
-#: plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
-msgstr "Pravim 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 ""
 "Datoteka zatražena za objavljivanje nije dostupna. Objavljivanje na Fejsbuku ne "
 "može da se nastavi."
 
-#: plugins/shotwell-publishing/FacebookPublishing.vala:1032
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -1995,78 +2102,22 @@ msgstr ""
 "Prijavljeni ste na Fejsbuk kao %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 "Gde želite da objavite izabrane fotografije?"
 
-#: 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 "Samo meni"
 
-#: 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 "Svima"
 
-#: 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 ""
-"Unesite broj potvrđivanja koji se pojavljuje nakon prijavljivanja na Flikr u "
-"vašem internet pregledniku."
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:37
-msgid "Authorization _Number:"
-msgstr "_Broj ovlašćenja:"
-
-#: plugins/shotwell-publishing/flickr_pin_entry_pane.ui:83 src/Dialogs.vala:132
-msgid "Con_tinue"
-msgstr "_Nastavi"
-
-#: 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 ""
-"Trenutno niste prijavljeni na Flikr.\n"
-"\n"
-"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/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 ""
-"Već ste se prijavljivali i odjavljivali sa Flikra tokom ove sesije Foto-"
-"bunara.\n"
-"Da nastavite objavljivanje na Flikr, ponovo pokrenite Foto-bunar i zatim "
-"pokušajte ponovo."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:374
-msgid "Preparing for login..."
-msgstr "Pripremam se za prijavljivanje..."
-
-#: 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 ""
-"Datoteka za objavljivanje nije dostupna. Objavljivanje na Flikr ne može da se "
-"nastavi."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Proveravam ovlašćenje..."
-
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1152
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -2075,188 +2126,200 @@ msgstr ""
 "Prijavljeni ste na Flikr kao %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 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] ""
-"Vaš besplatni nalog Flikra ograničava količinu podataka koju možete mesečno "
-"da otpremite.\n"
-"Za ovaj mesec vam je preostao još %d megabajt za otpremanje."
-msgstr[1] ""
-"Vaš besplatni nalog Flikra ograničava količinu podataka koju možete mesečno "
-"da otpremite.\n"
-"Za ovaj mesec su vam preostala još %d megabajta za otpremanje."
-msgstr[2] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Vaš besplatni nalog Flikra ograničava količinu podataka koju možete mesečno "
 "da otpremite.\n"
-"Za ovaj mesec vam je preostalo još %d megabajta za otpremanje."
-msgstr[3] ""
-"Vaš besplatni nalog Flikra ima ograničenje količine podataka za mesečno "
-"otpremanje.\n"
-"Za ovaj mesec vam je preosto još jedan megabajt za otpremanje."
+"Za ovaj mesec imate samo još %s za otpremanje."
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1159
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 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:1164
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "Fotografije mogu _videti:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1166
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "Video snimke mogu _videti:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1169
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr "Fotografije i snimke mogu _videti:"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1210
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "Samo prijatelji i porodica"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "Samo porodica"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "Samo prijatelji"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1232
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 tačkica"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
+msgid "2048 × 1536 pixels"
+msgstr "2048 × 1536 piksela"
 
-#: plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1233
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 tačkica"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
+msgid "4096 × 3072 pixels"
+msgstr "4096 × 3072 piksela"
 
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:113
-msgid "L_ist album in public gallery"
-msgstr "_Ispiši album u javnoj galeriji"
-
-#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:150
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
 msgid "Photo _size preset:"
 msgstr "_Veličina fotografije:"
 
-#: 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 ""
-"Trenutno niste prijavljeni na Veb albume Pikase.\n"
-"\n"
-"Prijavite se na Veb albume Pikase u vašem internet pregledniku. Moraćete da "
-"ovlastite Povezivanje Foto-bunara da napravi vezu do vašeg naloga Veb albuma "
-"Pikase."
+#. 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 "Osnovni album"
 
-#: 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 ""
 "Datoteka za objavljivanje nije dostupna. Objavljivanje na Pikasu ne može da se "
 "nastavi."
 
 #. 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 "Prijavljeni ste na veb albume Pikase kao %s."
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Video snimci će se pojaviti u:"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Mala (640 x 480 tačkica)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
+msgid "Small (640 × 480 pixels)"
+msgstr "Mala (640 × 480 piksela)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Srednja (1024 x 768 tačkica)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
+#| msgid "Medium (1024 x 768 pixels)"
+msgid "Medium (1024 × 768 pixels)"
+msgstr "Srednja (1024 × 768 piksela)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Preporučeno (1600 x 1200 tačkica)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
+#| msgid "Recommended (1600 x 1200 pixels)"
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr "Preporučeno (1600 × 1200 piksela)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Gugl+ (2048 x 1536 tačkica)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
+#| msgid "Google+ (2048 x 1536 pixels)"
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr "Gugl+ (2048 × 1536 piksela)"
 
-#: plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Izvorna veličina"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:49
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
 msgid "_URL of your Piwigo photo library"
 msgstr "_Adresa vaše fototeke Pivigoa"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:59
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
 msgid "User _name"
 msgstr "Korisničko _ime"
 
-#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:130
-msgid "_Remember Password"
-msgstr "_Zapamti lozinku"
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+msgid "Remember Password"
+msgstr "Zapamti lozinku"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:40
-msgid "An _existing category:"
-msgstr "_Postojeća kategorija:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
+msgstr "_Postojeća kategorija"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:121
-msgid "Photos will be _visible by:"
-msgstr "Fotografije mogu _videti:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+msgid "A _new album named"
+msgstr "_Novi album pod nazivom"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+msgid "within category"
+msgstr "u kategoriji"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:149
-msgid "Photo size:"
-msgstr "Veličina fotografije:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "Napomena albuma"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:176
-msgid "within category:"
-msgstr "u kategoriji:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
+msgstr "Fotografije mogu _videti"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:210
-msgid "Album comment:"
-msgstr "Napomena albuma:"
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "Veličina fotografije"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:242
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
 msgid "_If a title is set and comment unset, use title as comment"
 msgstr "_Ako je naslov podešen a napomena nije, koristi naslov kao napomenu"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:258
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
 msgid "_Do no upload tags"
 msgstr "_Ne otpremaj oznake"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:278
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
 msgid "Logout"
 msgstr "Odjavi me"
 
-#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:291
-#: src/Resources.vala:295
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:295 ui/collection.ui:190
 msgid "Publish"
 msgstr "Objavi"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:747
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-msgid "Creating album %s..."
-msgstr "Pravim album „%s“..."
+msgid "Creating album %s…"
+msgstr "Pravim album „%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 "Došli je do greške prilikom objavljivanja na Pivigou. Pokušajte ponovo."
 
-#: 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 ""
+"Ovo ne izgleda kao da je pravi <b>%s</b>. Možda napadači pokušavaju da "
+"ukradu ili da izmene podatke koji idu ka ili od ovog sajta (na primer, lične "
+"poruke, podatke o kreditnim karticama, ili lozinke)."
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "Uverenje „%sd"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:166
+msgid "_OK"
+msgstr "U _redu"
+
+#: 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."
@@ -2264,7 +2327,7 @@ msgstr ""
 "Unesite adresu vaše fototeke Pivigoa kao i korisničko ime i lozinku "
 "pridružene vešem nalogu Pivigoa za tu fototeku."
 
-#: 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"
@@ -2272,27 +2335,39 @@ msgstr ""
 "Foto-bunar ne može da stupi u vezu sa vašom fototekom Pivigoa. Proverite "
 "adresu koju ste uneli"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1021
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "Neispravna adresa"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1219
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Administratori, Porodica, Prijatelji, Kontakti"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1220
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Administratori, Porodica, Prijatelji"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1221
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Administratori, Porodica"
 
-#: plugins/shotwell-publishing/PiwigoPublishing.vala:1222
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Administratori"
 
-#: plugins/shotwell-publishing/shotwell-publishing.vala:26
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr "Ova veza nije bezbedna"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr "Prikaži uverenje…"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr "Razumem, _nastavi"
+
+#: plugins/shotwell-publishing/shotwell-publishing.vala:50
 msgid "Core Publishing Services"
 msgstr "Ključne usluge objavljivanja"
 
@@ -2300,43 +2375,24 @@ msgstr "Ključne usluge objavljivanja"
 msgid "Video privacy _setting:"
 msgstr "Podešavanje _privatnosti snimka:"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:58
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
 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 ""
-"Trenutno niste prijavljeni na Jutub.\n"
-"\n"
-"Da nastavite morate da posedujete Guglov nalog koji ste podesili za "
-"korišćenje sa Jutubom. Možete da podesite većinu naloga koristeći vaš "
-"preglednik da se prijavite na sajt Jutuba barem jednom."
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:363
-msgid ""
-"A file required for publishing is unavailable. Publishing to Youtube can't "
+"A file required for publishing is unavailable. Publishing to YouTube can’t "
 "continue."
 msgstr ""
 "Datoteka za objavljivanje nije dostupna. Objavljivanje na Jutub ne može da se "
 "nastavi."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:462
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Prijavili ste se na Jutub kao %s."
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:464
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Video snimci će se pojaviti u „%s“"
-
-#: plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
 msgstr "Javno je dostupno"
 
-#: plugins/shotwell-publishing/YouTubePublishing.vala:497
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
 msgstr "Nije javno dostupno"
 
@@ -2373,7 +2429,6 @@ msgid "Core Slideshow Transitions"
 msgstr "Ključni prelazi pokretnog prikaza"
 
 #: 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."
@@ -2428,66 +2483,55 @@ msgstr "Ne mogu da učinim direktorijum „%s“ upisivim"
 msgid "Could not make directory %s writable: %s"
 msgstr "Ne mogu da učinim direktorijum „%s“ upisivim: %s"
 
-#: src/AppWindow.vala:54
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "Pribodi traku lata"
 
-#: src/AppWindow.vala:55
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "Pribodite otvorenu traku lata"
 
-#: src/AppWindow.vala:60
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Napustite prikaz preko celog ekrana"
 
-#: src/AppWindow.vala:496
-msgid "_Contents"
-msgstr "_Sadržaj"
-
-#: src/AppWindow.vala:501
-msgid "_Frequently Asked Questions"
-msgstr "_Često postaljana pitanja"
-
-#: src/AppWindow.vala:506
-msgid "_Report a Problem..."
-msgstr "_Prijavi problem..."
-
-#: src/AppWindow.vala:605 src/AppWindow.vala:626 src/AppWindow.vala:643
-#: src/data_imports/DataImportsUI.vala:413 src/Dialogs.vala:20
-#: src/Dialogs.vala:28 src/Dialogs.vala:1425 src/Dialogs.vala:1448
-#: src/publishing/PublishingUI.vala:512 src/Resources.vala:157
+#: src/AppWindow.vala:532 src/AppWindow.vala:553 src/AppWindow.vala:570
+#: src/data_imports/DataImportsUI.vala:301
+#: src/data_imports/DataImportsUI.vala:419 src/Dialogs.vala:20
+#: src/Dialogs.vala:28 src/Dialogs.vala:1420 src/Dialogs.vala:1443
+#: src/publishing/PublishingUI.vala:301 src/publishing/PublishingUI.vala:525
+#: src/Resources.vala:157
 msgid "_Cancel"
 msgstr "_Otkaži"
 
-#: src/AppWindow.vala:653
+#: src/AppWindow.vala:580
 #, 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 ""
-"Došlo je do kobne greške prilikom pristupanja fototeci Foto-bunara.  Foto-"
+"Došlo je do kobne greške prilikom pristupanja fototeci Foto-bunara. Foto-"
 "bunar ne može da nastavi rad.\n"
 "\n"
 "%s"
 
-#: src/AppWindow.vala:673
-#| msgid "Visit the Shotwell home page"
+#: src/AppWindow.vala:600
 msgid "Visit the Shotwell web site"
 msgstr "Posetite veb stranicu Foto-bunara"
 
-#: src/AppWindow.vala:685
+#: src/AppWindow.vala:612
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Ne mogu da prikažem pomoć: %s"
 
-#: src/AppWindow.vala:693
+#: src/AppWindow.vala:620
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Ne mogu da pristupim bazi podataka grešaka: %s"
 
-#: src/AppWindow.vala:701
+#: src/AppWindow.vala:628
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Ne mogu da prikažem ČPP: %s"
@@ -2557,97 +2601,81 @@ msgstr "Uvoz nije uspeo (%d)"
 msgid "Cameras"
 msgstr "Foto-aparati"
 
-#: 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/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
 msgid "Camera"
 msgstr "Foto-aparat"
 
-#: src/camera/ImportPage.vala:311 src/Properties.vala:227
+#: src/camera/ImportPage.vala:311 src/Properties.vala:230
 msgid "RAW+JPEG"
 msgstr "RAW+JPEG"
 
-#: src/camera/ImportPage.vala:458
+#: src/camera/ImportPage.vala:466
 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 ""
-"Ne mogu da otkačim foto-aparat.  Probajte da otkačite foto-aparat iz "
+"Ne mogu da otkačim foto-aparat. Probajte da otkačite foto-aparat iz "
 "upravnika datoteka."
 
 #. hide duplicates checkbox
-#: src/camera/ImportPage.vala:775
+#: src/camera/ImportPage.vala:783
 msgid "Hide photos already imported"
 msgstr "Sakrij već uvezene fotografije"
 
-#: src/camera/ImportPage.vala:776
+#: src/camera/ImportPage.vala:784
 msgid "Only display photos that have not been imported"
 msgstr "Prikaži samo fotografije koje nisu uvezene"
 
-#: src/camera/ImportPage.vala:842
-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:846
-#| msgid "No photos/videos found"
-msgid "No new photos/videos found on camera"
-msgstr "Nisam pronašao nove fotografije/snimke na foto-aparatu"
-
-#: src/camera/ImportPage.vala:873 src/MediaPage.vala:451
-msgid "_Titles"
-msgstr "_Naslovi"
-
-#: src/camera/ImportPage.vala:874 src/MediaPage.vala:452
-msgid "Display the title of each photo"
-msgstr "Prikažite nazive svake fotografije"
-
-#: src/camera/ImportPage.vala:885
+#: src/camera/ImportPage.vala:823 ui/import.ui:13 ui/import.ui:210
 msgid "Import _Selected"
 msgstr "Uvezi _izabrano"
 
-#: src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Uvezite izabrane fotografije u vašu fototeku"
-
-#: src/camera/ImportPage.vala:891
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
 msgid "Import _All"
 msgstr "Uvezi _sve"
 
-#: src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Uvezite sve fotografije u vašu fototeku"
+#: src/camera/ImportPage.vala:857
+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
+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:1013
+#: src/camera/ImportPage.vala:1021
 msgid ""
 "Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
+"it. Continue?"
 msgstr ""
-"Foto-bunar mora da otkači foto-aparat sa sistema da bi mu pristupio.  Da "
+"Foto-bunar mora da otkači foto-aparat sa sistema da bi mu pristupio. Da "
 "nastavim?"
 
-#: src/camera/ImportPage.vala:1019
+#: src/camera/ImportPage.vala:1027
 msgid "_Unmount"
 msgstr "_Otkači"
 
-#: src/camera/ImportPage.vala:1024
+#: src/camera/ImportPage.vala:1032
 msgid "Please unmount the camera."
 msgstr "Otkačite foto-aparat."
 
-#: src/camera/ImportPage.vala:1029
+#: 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 "
+"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 ""
-"Foto-aparat je zaključan drugim programom.  Foto-bunar može da pristupi foto-"
-"aparatu samo kada je otključan.  Zatvorite sve druge programe koji koriste "
+"Foto-aparat je zaključan drugim programom. Foto-bunar može da pristupi foto-"
+"aparatu samo kada je otključan. Zatvorite sve druge programe koji koriste "
 "foto-aparat i pokušajte ponovo."
 
-#: src/camera/ImportPage.vala:1039
+#: src/camera/ImportPage.vala:1047
 msgid "Please close any other application using the camera."
 msgstr "Zatvorite sve druge programe koji koriste foto-aparat."
 
-#: src/camera/ImportPage.vala:1044
+#: src/camera/ImportPage.vala:1052
 #, c-format
 msgid ""
 "Unable to fetch previews from the camera:\n"
@@ -2656,29 +2684,29 @@ msgstr ""
 "Ne mogu da dovučem pretpreglede fotografija sa foto-aparata:\n"
 "%s"
 
-#: src/camera/ImportPage.vala:1061
-msgid "Unmounting..."
-msgstr "Otkačinjem..."
+#: src/camera/ImportPage.vala:1069
+msgid "Unmounting…"
+msgstr "Otkačinjem…"
 
-#: src/camera/ImportPage.vala:1152
-msgid "Starting import, please wait..."
-msgstr "Započinjem uvoz, sačekajte malo..."
+#: src/camera/ImportPage.vala:1160
+msgid "Starting import, please wait…"
+msgstr "Započinjem uvoz, sačekajte malo…"
 
-#: src/camera/ImportPage.vala:1169
+#: src/camera/ImportPage.vala:1177
 msgid "Fetching photo information"
 msgstr "Preuzimam podatke o fotografiji"
 
-#: src/camera/ImportPage.vala:1527
+#: src/camera/ImportPage.vala:1535
 #, c-format
 msgid "Fetching preview for %s"
 msgstr "Preuzimam pretpregled za „%s“"
 
-#: src/camera/ImportPage.vala:1643
+#: src/camera/ImportPage.vala:1651
 #, c-format
 msgid "Unable to lock camera: %s"
 msgstr "Ne mogu da zaključam foto-aparat: %s"
 
-#: src/camera/ImportPage.vala:1728
+#: src/camera/ImportPage.vala:1736
 #, c-format
 msgid "Delete this photo from camera?"
 msgid_plural "Delete these %d photos from camera?"
@@ -2687,7 +2715,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:1731
+#: src/camera/ImportPage.vala:1739
 #, c-format
 msgid "Delete this video from camera?"
 msgid_plural "Delete these %d videos from camera?"
@@ -2696,7 +2724,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:1734
+#: src/camera/ImportPage.vala:1742
 #, c-format
 msgid "Delete this photo/video from camera?"
 msgid_plural "Delete these %d photos/videos from camera?"
@@ -2705,7 +2733,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:1737
+#: src/camera/ImportPage.vala:1745
 #, c-format
 msgid "Delete these files from camera?"
 msgid_plural "Delete these %d files from camera?"
@@ -2714,15 +2742,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:1745 src/Dialogs.vala:1392
+#: src/camera/ImportPage.vala:1753 src/Dialogs.vala:1387
 msgid "_Keep"
 msgstr "_Zadrži"
 
-#: src/camera/ImportPage.vala:1764
+#: src/camera/ImportPage.vala:1772
 msgid "Removing photos/videos from camera"
 msgstr "Uklanjam fotografije/snimke sa foto-aparata"
 
-#: src/camera/ImportPage.vala:1768
+#: 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."
@@ -2735,51 +2763,127 @@ msgstr[2] ""
 msgstr[3] ""
 "Ne mogu da obrišem %d fotografiju/snimak sa foto-aparata, usled greške."
 
-#: src/CollectionPage.vala:230 src/PhotoPage.vala:2635
+#: src/CollectionPage.vala:74 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2461 src/Resources.vala:170
+msgid "_Print"
+msgstr "_Štampaj"
+
+#: src/CollectionPage.vala:77 src/Resources.vala:323 ui/collection.ui:126
+#: ui/direct_context.ui:25 ui/direct.ui:23 ui/event.ui:563 ui/photo.ui:28
+msgid "Send _To…"
+msgstr "Pošalji _u…"
+
+#: src/CollectionPage.vala:78 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2471 src/Resources.vala:220
+msgid "Set as _Desktop Background"
+msgstr "Postavi za _pozadinu"
+
+#: src/CollectionPage.vala:86 src/Resources.vala:286
+msgid "_Duplicate"
+msgstr "_Udvostruči"
+
+#: src/CollectionPage.vala:94
+msgid "Fullscreen"
+msgstr "Preko celog ekrana"
+
+#: src/CollectionPage.vala:96 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "_Pokretni prikaz"
 
-#: src/CollectionPage.vala:231 src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Pokrenite pokretni prikaz"
+#: src/CollectionPage.vala:104 src/Resources.vala:139 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Okreni na _desno"
+
+#: src/CollectionPage.vala:107 src/Resources.vala:144 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Okreni na _levo"
+
+#: src/CollectionPage.vala:110 src/Resources.vala:149 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Izvrni _vodoravno"
+
+#: src/CollectionPage.vala:111 src/Resources.vala:152 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Izvrni _uspravno"
+
+#: src/CollectionPage.vala:113 src/Resources.vala:186 ui/collection.ui:8
+#: ui/direct_context.ui:9 ui/direct.ui:134 ui/event.ui:445
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "_Poboljšaj"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:114 src/Resources.vala:214 ui/collection.ui:13
+#: ui/direct_context.ui:14 ui/direct.ui:161 ui/event.ui:450
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "_Vrati na izvorno"
+
+#: src/CollectionPage.vala:116 src/Resources.vala:190 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "_Umnoži doterivanja boje"
+
+#: src/CollectionPage.vala:119 src/Resources.vala:194 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "_Ubaci doterivanja boje"
+
+#: src/CollectionPage.vala:129
+msgid "Adjust Date and Time…"
+msgstr "Podesite datum i vreme…"
+
+#: src/CollectionPage.vala:137 src/Resources.vala:319
+msgid "Open With E_xternal Editor"
+msgstr "_Otvori spoljnim uređivačem"
+
+#: src/CollectionPage.vala:140 src/Resources.vala:321 ui/collection.ui:111
+#: ui/event.ui:548 ui/photo_context.ui:118 ui/photo.ui:363
+msgid "Open With RA_W Editor"
+msgstr "Otvori uređivačem _sirovih"
+
+#: src/CollectionPage.vala:143 src/Resources.vala:167
+msgid "_Play"
+msgstr "Pu_sti"
+
+#: src/CollectionPage.vala:409
 msgid "Export Photo/Video"
 msgstr "Izvezite fotografiju/snimak"
 
-#: src/CollectionPage.vala:456
+#: src/CollectionPage.vala:409
 msgid "Export Photos/Videos"
 msgstr "Izvezite fotografije/snimke"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:59 src/PhotoPage.vala:3209
+#: src/CollectionPage.vala:411 src/Dialogs.vala:59 src/PhotoPage.vala:2995
 msgid "Export Photo"
 msgstr "Izvezite fotografiju"
 
-#: src/CollectionPage.vala:458 src/Dialogs.vala:88
+#: src/CollectionPage.vala:411 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Izvezite fotografije"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Rotating"
 msgstr "Okrećem"
 
-#: src/CollectionPage.vala:545 src/CollectionPage.vala:561
+#: src/CollectionPage.vala:498 src/CollectionPage.vala:514
 msgid "Undoing Rotate"
 msgstr "Poništavam okretanje"
 
-#: src/CollectionPage.vala:570
+#: src/CollectionPage.vala:523
 msgid "Flipping Horizontally"
 msgstr "Izvrćem vodoravno"
 
-#: src/CollectionPage.vala:571
+#: src/CollectionPage.vala:524
 msgid "Undoing Flip Horizontally"
 msgstr "Poništavam vodoravno izvrtanje"
 
-#: src/CollectionPage.vala:580
+#: src/CollectionPage.vala:533
 msgid "Flipping Vertically"
 msgstr "Izvrćem uspravno"
 
-#: src/CollectionPage.vala:581
+#: src/CollectionPage.vala:534
 msgid "Undoing Flip Vertically"
 msgstr "Poništavam uspravno izvrtanje"
 
@@ -2915,7 +3019,7 @@ msgstr "Napravi oznaku"
 
 #: src/Commands.vala:1695
 #, c-format
-msgid "Move Tag \"%s\""
+msgid "Move Tag “%s”"
 msgstr "Premesti oznaku „%s“"
 
 #: src/Commands.vala:2347
@@ -2976,7 +3080,7 @@ msgstr "„%s“ baza podataka"
 #: 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 "Ne mogu da nastavim uvoz iz „%s“ jer se pojavila greška:"
 
 #: src/data_imports/DataImportsPluginHost.vala:151
@@ -3001,7 +3105,7 @@ msgstr ""
 msgid "Database file:"
 msgstr "Datoteka zbirke:"
 
-#: 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 "_Uvezi"
 
@@ -3013,7 +3117,7 @@ msgstr "Uvezite iz programa"
 msgid "Import media _from:"
 msgstr "Uvezi medijum _iz:"
 
-#: 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 "_Zatvori"
 
@@ -3051,11 +3155,8 @@ msgstr ""
 "Greška je:\n"
 "%s"
 
-#: src/db/DatabaseTable.vala:88
+#: 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 "Ne mogu da vratim bazu podataka fotografija „%s“"
 
@@ -3080,23 +3181,26 @@ msgstr "Ne mogu da pripremim smenjivanje pozadine radne površine: %s"
 
 #: src/Dialogs.vala:16
 #, c-format
-msgid "This will remove the tag \"%s\" from one photo.  Continue?"
-msgid_plural "This will remove the tag \"%s\" from %d photos.  Continue?"
-msgstr[0] "Ovo će ukloniti oznaku „%s“ iz %d fotografije.  Da nastavim?"
-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] "Ovo će ukloniti oznaku „%s“ iz %d fotografije.  Da nastavim?"
-
-#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1393
-#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:409
-#: src/Resources.vala:674
+#| msgid "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] "Ovo će ukloniti oznaku „%s“ iz %d fotografije. Da nastavim?"
+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/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Izbriši"
 
 #: src/Dialogs.vala:25
 #, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
-msgstr "Ovo će ukloniti sačuvanu pretragu „%s“.  Da nastavim?"
+msgid "This will remove the saved search “%s”. Continue?"
+msgstr "Ovo će ukloniti sačuvanu pretragu „%s“. Da nastavim?"
 
 #: src/Dialogs.vala:36
 msgid ""
@@ -3131,16 +3235,16 @@ msgstr "Izvezi snimak"
 #. if we can't copy an image over for editing in an external tool.
 #. Did we fail because we can't write to this directory?
 #. Yes - display an alternate error message here.
-#: src/Dialogs.vala:116
+#: src/Dialogs.vala:112
 #, c-format
 msgid ""
-"Shotwell couldn't create a file for editing this photo because you do not "
+"Shotwell couldn’t create a file for editing this photo because you do not "
 "have permission to write to %s."
 msgstr ""
 "Foto-bunar ne može da napravi datoteku za uređivanje ove fotografije jer "
 "nemate neophodne dozvole za pisanje u „%s“."
 
-#: src/Dialogs.vala:125
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -3148,7 +3252,7 @@ msgstr ""
 "Ne mogu da izvezem sledeću fotografiju zbog greške u datoteci.\n"
 "\n"
 
-#: src/Dialogs.vala:131
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -3161,53 +3265,54 @@ 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 "Neizmenjeno"
 
-#: src/Dialogs.vala:149
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "Tekuće"
 
 #. layout controls
-#: src/Dialogs.vala:216
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "_Zapis:"
 
-#: src/Dialogs.vala:219
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Kvalitet:"
 
-#: src/Dialogs.vala:222
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "_Odnos promene veličine:"
 
-#: src/Dialogs.vala:225
+#: src/Dialogs.vala:230
 msgid "_Pixels:"
 msgstr "_Tačkica:"
 
-#: src/Dialogs.vala:228
-msgid "Export metadata"
-msgstr "Izvoz metapodataka"
+#: src/Dialogs.vala:234
+#| msgid "Export metadata"
+msgid "Export _metadata:"
+msgstr "Izvezi _metapodatke:"
 
-#: src/Dialogs.vala:462
-msgid "Save Details..."
-msgstr "Sačuvaj pojedinosti..."
+#: src/Dialogs.vala:478
+msgid "Save Details…"
+msgstr "Sačuvaj pojedinosti…"
 
-#: src/Dialogs.vala:463
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Sačuvaj pojedinosti"
 
-#: src/Dialogs.vala:478
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(i još %d)\n"
 
-#: src/Dialogs.vala:531
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "Izveštaj rezultata uvoza"
 
-#: src/Dialogs.vala:535
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
@@ -3216,7 +3321,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:538
+#: src/Dialogs.vala:554
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -3228,39 +3333,39 @@ msgstr[3] "Od ovih, %d datoteka je uspešno uvezena."
 #.
 #. Duplicates
 #.
-#: src/Dialogs.vala:550
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Udvostručene fotografije/snimci nisu uvezeni:"
 
-#: src/Dialogs.vala:554
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr "udvostručava postojeću stavku medijuma"
 
 #.
 #. 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 "Fotografije/snimci nisu uvezeni zbog greške foto-aparata:"
 
-#: 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 "poruka greške:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: src/Dialogs.vala:579
-msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:595
+msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr "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:594
+#: src/Dialogs.vala:610
 msgid ""
-"Photos/Videos Not Imported Because They Weren't in a Format Shotwell "
+"Photos/Videos Not Imported Because They Weren’t in a Format Shotwell "
 "Understands:"
 msgstr ""
 "Fotografije/snimci nisu uvezeni jer nisu bili u zapisu koji Foto-bunar "
@@ -3269,18 +3374,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: src/Dialogs.vala:609
+#: src/Dialogs.vala:625
 msgid ""
-"Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its "
+"Photos/Videos Not Imported Because Shotwell Couldn’t Copy Them into its "
 "Library:"
 msgstr ""
 "Fotografije/snimci nisu uvezeni jer Foto-bunar ne može da ih umnoži u svojoj "
 "fototeci:"
 
-#: src/Dialogs.vala:613
+#: src/Dialogs.vala:629
 #, c-format
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
 "ne mogu da umnožim „%s“\n"
@@ -3289,18 +3394,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: src/Dialogs.vala:625
+#: src/Dialogs.vala:641
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Fotografije/snimci nisu uvezeni jer su datoteke oštećene:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: src/Dialogs.vala:640
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Fotografije/snimci nisu uvezeni iz drugih razloga:"
 
-#: 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"
@@ -3309,7 +3414,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:663
+#: src/Dialogs.vala:679
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
@@ -3318,7 +3423,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: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"
@@ -3327,7 +3432,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: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"
@@ -3342,7 +3447,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d fotografiju zbog greške u datoteci ili na uređaju:\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"
@@ -3355,7 +3460,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d snimak zbog greške u datoteci ili na uređaju:\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 ""
@@ -3373,7 +3478,7 @@ msgstr[3] ""
 "Nisam uspeo da uvezem %d fotografiju/snimak zbog greške u datoteci ili na "
 "uređaju:\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"
@@ -3386,7 +3491,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d datoteku zbog greške u datoteci ili na uređaju:\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"
@@ -3402,7 +3507,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d fotografiju jer fascikla fototeke nije upisiva:\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"
@@ -3418,7 +3523,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d snimak jer fascikla fototeke nije upisiva:\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 "
@@ -3439,7 +3544,7 @@ msgstr[3] ""
 "Nisam uspeo da uvezem %d fotografiju/snimak jer fascikla fototeke nije "
 "upisiva:\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"
@@ -3455,7 +3560,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d datoteku jer fascikla fototeke nije upisiva:\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"
@@ -3464,7 +3569,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: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"
@@ -3473,7 +3578,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: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"
@@ -3486,7 +3591,7 @@ msgstr[2] ""
 msgstr[3] ""
 "Nisam uspeo da uvezem %d fotografiju/snimak zbog greške na foto-aparatu:\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"
@@ -3495,7 +3600,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: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"
@@ -3504,7 +3609,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: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"
@@ -3513,7 +3618,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: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"
@@ -3522,7 +3627,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: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"
@@ -3535,7 +3640,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:775
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -3546,7 +3651,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:790
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
@@ -3555,7 +3660,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: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"
@@ -3564,7 +3669,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: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"
@@ -3573,7 +3678,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: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"
@@ -3582,7 +3687,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: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"
@@ -3591,7 +3696,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:824
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
@@ -3600,7 +3705,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:827
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
@@ -3609,7 +3714,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:830
+#: src/Dialogs.vala:846
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -3620,15 +3725,15 @@ 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:846
+#: src/Dialogs.vala:862
 msgid "No photos or videos imported.\n"
 msgstr "Nije uvezena nijedna fotografija ni snimak.\n"
 
-#: src/Dialogs.vala:853 src/Dialogs.vala:872
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "Uvoz je završen"
 
-#: src/Dialogs.vala:1158
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -3637,7 +3742,7 @@ msgstr[1] "%d sekunde"
 msgstr[2] "%d sekundi"
 msgstr[3] "%d sekunda"
 
-#: src/Dialogs.vala:1161
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -3646,7 +3751,7 @@ msgstr[1] "%d minuta"
 msgstr[2] "%d minuta"
 msgstr[3] "%d minut"
 
-#: src/Dialogs.vala:1165
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -3655,43 +3760,42 @@ msgstr[1] "%d sata"
 msgstr[2] "%d sati"
 msgstr[3] "%d sat"
 
-#: src/Dialogs.vala:1168
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "1 dan"
 
-#: src/Dialogs.vala:1322 src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Preimenujte događaj"
 
-#: src/Dialogs.vala:1322
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Naziv:"
 
 #. Dialog title
-#: src/Dialogs.vala:1333
-#| msgid "Edit Title"
+#: src/Dialogs.vala:1328
 msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Uredite naslov"
 
-#: src/Dialogs.vala:1334 src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Naslov:"
 
 #. Dialog title
-#: src/Dialogs.vala:1350 src/Resources.vala:307
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Uredite napomenu događaja"
 
-#: src/Dialogs.vala:1351
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Uredite napomenu fotografije/snimka"
 
-#: src/Dialogs.vala:1352 src/Properties.vala:628
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Napomena:"
 
-#: src/Dialogs.vala:1368
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "Ukloni i _obriši fotografiju"
@@ -3699,58 +3803,57 @@ msgstr[1] "Ukloni i _obriši fotografije"
 msgstr[2] "Ukloni i _obriši fotografije"
 msgstr[3] "Ukloni i _obriši fotografiju"
 
-#: src/Dialogs.vala:1372
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "_Ukloni iz fototeke"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Da li da vratim spoljnu izmenu?"
 
-#: src/Dialogs.vala:1415
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Da li da vratim spoljne izmene?"
 
-#: 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?"
+"This will destroy all changes made to %d external files. Continue?"
 msgstr[0] ""
-"Ova radnja će uništiti sve izmene na %d spoljnoj datoteci.  Da nastavim?"
+"Ova radnja će uništiti sve izmene na %d spoljnoj datoteci. Da nastavim?"
 msgstr[1] ""
-"Ova radnja će uništiti sve izmene na %d spoljne datoteke.  Da nastavim?"
+"Ova radnja će uništiti sve izmene na %d spoljne datoteke. Da nastavim?"
 msgstr[2] ""
-"Ova radnja će uništiti sve izmene na %d spoljnih datoteka.  Da nastavim?"
-msgstr[3] ""
-"Ova radnja će uništiti sve izmene na %d spoljnoj datoteci.  Da nastavim?"
+"Ova radnja će uništiti sve izmene na %d spoljnih datoteka. Da nastavim?"
+msgstr[3] " "
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "_Vrati spoljnu izmenu"
 
-#: src/Dialogs.vala:1421
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "_Vrati spoljne izmene"
 
-#: 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?"
-msgstr[0] "Ovo će ukloniti %d fotografiju iz fototeke.  Da nastavim?"
-msgstr[1] "Ovo će ukloniti %d fotografije iz fototeke.  Da nastavim?"
-msgstr[2] "Ovo će ukloniti %d fotografija iz fototeke.  Da nastavim?"
-msgstr[3] "Ovo će ukloniti %d fotografiju iz fototeke.  Da nastavim?"
+msgid "This will remove the photo from the library. Continue?"
+msgid_plural "This will remove %d photos from the library. Continue?"
+msgstr[0] "Ovo će ukloniti %d fotografiju iz fototeke. Da nastavim?"
+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:1449 src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Uklonite fotografiju iz fototeke"
 
-#: src/Dialogs.vala:1450
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Uklonite fotografije iz fototeke"
 
@@ -3779,35 +3882,37 @@ msgstr "_Pomeri fotografije/snimke za isti iznos"
 msgid "Set _all photos/videos to this time"
 msgstr "Postavi _sve fotografije/snimke na ovo vreme"
 
-#: src/Dialogs.vala:1726
+#: src/Dialogs.vala:1725
+#| msgid "_Modify original photo file"
 msgid "_Modify original photo file"
-msgstr "_Izmeni izvornu fotografiju"
-
-#: src/Dialogs.vala:1726
-msgid "_Modify original photo files"
-msgstr "_Izmeni izvorne fotografije"
+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 "_Modify original file"
-msgstr "_Izmeni izvornu datoteku"
-
-#: src/Dialogs.vala:1729
-msgid "_Modify original files"
-msgstr "_Izmeni izvorne datoteke"
+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:1815
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Izvorno: "
 
-#: 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. %H:%M:%S"
 
-#: src/Dialogs.vala:1906
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -3816,7 +3921,7 @@ msgstr ""
 "Vreme izlaganja će biti pomereno unapred za\n"
 "%d %s, %d %s, %d %s, i %d %s."
 
-#: src/Dialogs.vala:1907
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -3825,7 +3930,7 @@ msgstr ""
 "Vreem izlaganja će biti pomereno unazad za\n"
 "%d %s, %d %s, %d %s, i %d %s."
 
-#: src/Dialogs.vala:1909
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
@@ -3833,7 +3938,7 @@ msgstr[1] "dana"
 msgstr[2] "dana"
 msgstr[3] "dan"
 
-#: src/Dialogs.vala:1910
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "sat"
@@ -3841,7 +3946,7 @@ msgstr[1] "sata"
 msgstr[2] "sati"
 msgstr[3] "sat"
 
-#: src/Dialogs.vala:1911
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -3849,7 +3954,7 @@ msgstr[1] "minuta"
 msgstr[2] "minuta"
 msgstr[3] "minut"
 
-#: src/Dialogs.vala:1912
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekundu"
@@ -3857,7 +3962,7 @@ msgstr[1] "sekunde"
 msgstr[2] "sekundi"
 msgstr[3] "sekundu"
 
-#: src/Dialogs.vala:1956
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -3884,49 +3989,49 @@ msgstr[3] ""
 "\n"
 "I %d druga."
 
-#: src/Dialogs.vala:1980 src/Dialogs.vala:2007
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Oznake (razdvojene zapetom):"
 
-#: src/Dialogs.vala:2087
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Dobro došli!"
 
-#: src/Dialogs.vala:2094
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Dobro došli u Foto-bunar!"
 
-#: src/Dialogs.vala:2098
+#: 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:2117
+#: 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:2118
+#: 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:2119
+#: 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:2129
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Uvezi fotografije iz fascikle „%s“"
 
-#: src/Dialogs.vala:2136
+#: 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:2146
-msgid "_Don't show this message again"
+#: src/Dialogs.vala:2152
+msgid "_Don’t show this message again"
 msgstr "_Ne prikazuj više ovu poruku"
 
-#: src/Dialogs.vala:2181
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 msgstr "Uvezite fotografije iz fototeke „%s“"
@@ -3934,41 +4039,41 @@ 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:2328 src/Dialogs.vala:2332
+#: src/Dialogs.vala:2335 src/Dialogs.vala:2339
 msgid "(Help)"
 msgstr "(Pomoć)"
 
-#: src/Dialogs.vala:2341
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "Godina%smesec%sdan"
 
-#: src/Dialogs.vala:2343
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "Godina%smesec"
 
-#: src/Dialogs.vala:2345
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "Godina%smesec-dan"
 
-#: src/Dialogs.vala:2347
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "Godina-mesec-dan"
 
-#: src/Dialogs.vala:2348 src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Proizvoljno"
 
 #. Invalid pattern.
-#: src/Dialogs.vala:2585
+#: 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:2687
+#: src/Dialogs.vala:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -3976,146 +4081,133 @@ msgstr ""
 "Foto-bunar može da umnoži fotografije u fasciklu fototeke ili da ih uveze "
 "bez umnožavanja."
 
-#: src/Dialogs.vala:2692
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "_Umnoži fotografije"
 
-#: src/Dialogs.vala:2693
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "Uvezi _na mestu"
 
-#: src/Dialogs.vala:2694
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Uvezite u fototeku"
 
-#: src/Dialogs.vala:2704 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2871
 msgid "Remove From Library"
 msgstr "Uklonite iz fototeke"
 
-#: src/Dialogs.vala:2705 src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2871
 msgid "Removing Photo From Library"
 msgstr "Uklanjam fotografiju iz fototeke"
 
-#: src/Dialogs.vala:2705
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Uklanjam fotografije iz fototeke"
 
-#: src/Dialogs.vala:2719
+#: src/Dialogs.vala:2724
 #, 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] ""
-"Ovo će ukloniti %d fotografiju/snimak iz vaše fototeke Foto-bunara.  Da li "
+"Ovo će ukloniti %d fotografiju/snimak iz vaše fototeke Foto-bunara. Da li "
 "biste takođe želeli da premestite datoteku u korpu vaše radne površi?\n"
 "\n"
 "Ova radnja ne može biti poništena."
 msgstr[1] ""
-"Ovo će ukloniti %d fotografije/snimka iz vaše fototeke Foto-bunara.  Da li "
+"Ovo će ukloniti %d fotografije/snimka iz vaše fototeke Foto-bunara. Da li "
 "biste takođe želeli da premestite datoteke u korpu vaše radne površi?\n"
 "\n"
 "Ova radnja ne može biti poništena."
 msgstr[2] ""
-"Ovo će ukloniti %d fotografija/snimaka iz vaše fototeke Foto-bunara.  Da li "
+"Ovo će ukloniti %d fotografija/snimaka iz vaše fototeke Foto-bunara. Da li "
 "biste takođe želeli da premestite datoteke u korpu vaše radne površi?\n"
 "\n"
 "Ova radnja ne može biti poništena."
-msgstr[3] ""
-"Ovo će ukloniti %d fotografiju/snimak iz vaše fototeke Foto-bunara.  Da li "
-"biste takođe želeli da premestite datoteku u korpu vaše radne površi?\n"
-"\n"
-"Ova radnja ne može biti poništena."
+msgstr[3] "   "
 
-#: src/Dialogs.vala:2723
+#: src/Dialogs.vala:2728
 #, 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] ""
-"Ovo će ukloniti %d snimak iz vaše fototeke Foto-bunara.  Da li biste takođe "
+"Ovo će ukloniti %d snimak iz vaše fototeke Foto-bunara. Da li biste takođe "
 "želeli da premestite datoteku u korpu vaše radne površi?\n"
 "\n"
 "Ova radnja ne može biti poništena."
 msgstr[1] ""
-"Ovo će ukloniti %d snimka iz vaše fototeke Foto-bunara.  Da li biste takođe "
+"Ovo će ukloniti %d snimka iz vaše fototeke Foto-bunara. Da li biste takođe "
 "želeli da premestite datoteke u korpu vaše radne površi?\n"
 "\n"
 "Ova radnja ne može biti poništena."
 msgstr[2] ""
-"Ovo će ukloniti %d snimaka iz vaše fototeke Foto-bunara.  Da li biste takođe "
+"Ovo će ukloniti %d snimaka iz vaše fototeke Foto-bunara. Da li biste takođe "
 "želeli da premestite datoteke u korpu vaše radne površi?\n"
 "\n"
 "Ova radnja ne može biti poništena."
-msgstr[3] ""
-"Ovo će ukloniti %d snimak iz vaše fototeke Foto-bunara.  Da li biste takođe "
-"želeli da premestite datoteku u korpu vaše radne površi?\n"
-"\n"
-"Ova radnja ne može biti poništena."
+msgstr[3] "  "
 
-#: src/Dialogs.vala:2727
+#: src/Dialogs.vala:2732
 #, 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] ""
-"Ovo će ukloniti %d fotografiju iz vaše fototeke Foto-bunara.  Da li biste "
+"Ovo će ukloniti %d fotografiju iz vaše fototeke Foto-bunara. Da li biste "
 "takođe želeli da premestite datoteku u korpu vaše radne površi?\n"
 "\n"
 "Ova radnja ne može biti poništena."
 msgstr[1] ""
-"Ovo će ukloniti %d fotografije iz vaše fototeke Foto-bunara.  Da li biste "
+"Ovo će ukloniti %d fotografije iz vaše fototeke Foto-bunara. Da li biste "
 "takođe želeli da premestite datoteke u korpu vaše radne površi?\n"
 "\n"
 "Ova radnja ne može biti poništena."
 msgstr[2] ""
-"Ovo će ukloniti %d fotografija iz vaše fototeke Foto-bunara.  Da li biste "
+"Ovo će ukloniti %d fotografija iz vaše fototeke Foto-bunara. Da li biste "
 "takođe želeli da premestite datoteke u korpu vaše radne površi?\n"
 "\n"
 "Ova radnja ne može biti poništena."
-msgstr[3] ""
-"Ovo će ukloniti %d fotografiju iz vaše fototeke Foto-bunara.  Da li biste "
-"takođe želeli da premestite datoteku u korpu vaše radne površi?\n"
-"\n"
-"Ova radnja ne može biti poništena."
+msgstr[3] "       "
 
-#: 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?"
+"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] ""
-"Ne mogu da premestim u smeće %d fotografiju/snimak.  Da li da uklonim?"
+"Ne mogu da premestim u smeće %d fotografiju/snimak. Da li da uklonim?"
 msgstr[1] ""
-"Ne mogu da premestim u smeće %d fotografije/snimka.  Da li da uklonim?"
+"Ne mogu da premestim u smeće %d fotografije/snimka. Da li da uklonim?"
 msgstr[2] ""
-"Ne mogu da premestim u smeće %d fotografija/snimaka.  Da li da uklonim?"
-msgstr[3] ""
-"Ne mogu da premestim u smeće %d fotografiju/snimak.  Da li da uklonim?"
+"Ne mogu da premestim u smeće %d fotografija/snimaka. Da li da uklonim?"
+msgstr[3] "      "
 
 #. 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."
@@ -4132,127 +4224,17 @@ msgstr "Širina"
 msgid "Height"
 msgstr "Visina"
 
-#: src/direct/DirectPhotoPage.vala:46 src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Datoteka"
-
-#: src/direct/DirectPhotoPage.vala:51 src/direct/DirectPhotoPage.vala:432
-#: src/Resources.vala:175
-msgid "_Save"
-msgstr "_Sačuvaj"
-
-#: src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Sačuvajte fotografiju"
-
-#: src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "Sačuvaj _kao..."
-
-#: src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Sačuvajte fotografiju pod drugim nazivom"
-
-#: src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Štampajte fotografiju na štampaču koji je povezan na ovaj računar"
-
-#: src/direct/DirectPhotoPage.vala:73 src/library/LibraryWindow.vala:339
-#: src/Resources.vala:159
-msgid "_Edit"
-msgstr "_Uređivanje"
-
-#: src/direct/DirectPhotoPage.vala:77 src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Fotografija"
-
-#: src/direct/DirectPhotoPage.vala:81 src/PhotoPage.vala:2416
-msgid "T_ools"
-msgstr "_Alati"
-
-#: src/direct/DirectPhotoPage.vala:86 src/PhotoPage.vala:2421
-msgid "_Previous Photo"
-msgstr "_Prethodna fotografija"
-
-#: src/direct/DirectPhotoPage.vala:87 src/PhotoPage.vala:2422
-msgid "Previous Photo"
-msgstr "Prethodna fotografija"
-
-#: src/direct/DirectPhotoPage.vala:92 src/PhotoPage.vala:2427
-msgid "_Next Photo"
-msgstr "_Sledeća fotografija"
-
-#: src/direct/DirectPhotoPage.vala:93 src/PhotoPage.vala:2428
-msgid "Next Photo"
-msgstr "Sledeća fotografija"
-
-#: src/direct/DirectPhotoPage.vala:165 src/library/LibraryWindow.vala:343
-#: src/PhotoPage.vala:2412
-msgid "_View"
-msgstr "_Pregled"
-
-#: src/direct/DirectPhotoPage.vala:169 src/library/LibraryWindow.vala:363
-#: src/Resources.vala:162
-msgid "_Help"
-msgstr "Po_moć"
-
-#: src/direct/DirectPhotoPage.vala:174 src/MediaPage.vala:340
-#: src/PhotoPage.vala:2591 src/Resources.vala:183
-msgid "Zoom _In"
-msgstr "U_većaj"
-
-#: src/direct/DirectPhotoPage.vala:175 src/PhotoPage.vala:2592
-msgid "Increase the magnification of the photo"
-msgstr "Uvećajte prikaz fotografije"
-
-#: src/direct/DirectPhotoPage.vala:180 src/MediaPage.vala:346
-#: src/PhotoPage.vala:2597 src/Resources.vala:184
-msgid "Zoom _Out"
-msgstr "U_manji"
-
-#: src/direct/DirectPhotoPage.vala:181 src/PhotoPage.vala:2598
-msgid "Decrease the magnification of the photo"
-msgstr "Umanjite prikaz fotografije"
-
-#: src/direct/DirectPhotoPage.vala:186 src/PhotoPage.vala:2603
-msgid "Fit to _Page"
-msgstr "Ispuni _stranicu"
-
-#: src/direct/DirectPhotoPage.vala:187 src/PhotoPage.vala:2604
-msgid "Zoom the photo to fit on the screen"
-msgstr "Uvećajte fotografiju da ispuni ekran"
-
-#: src/direct/DirectPhotoPage.vala:193 src/PhotoPage.vala:2610
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Uvećaj na _100%"
-
-#: src/direct/DirectPhotoPage.vala:195 src/PhotoPage.vala:2612
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Prikažite fotografiju u punoj veličini"
-
-#: src/direct/DirectPhotoPage.vala:201 src/PhotoPage.vala:2618
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "Uvećaj na _200%"
-
-#: src/direct/DirectPhotoPage.vala:203 src/PhotoPage.vala:2620
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Prikažite fotografiju uvećanu dva puta"
-
-#: src/direct/DirectPhotoPage.vala:227
+#: src/direct/DirectPhotoPage.vala:99
 #, c-format
 msgid "%s does not exist."
 msgstr "„%s“ ne postoji."
 
-#: src/direct/DirectPhotoPage.vala:229
+#: src/direct/DirectPhotoPage.vala:101
 #, c-format
 msgid "%s is not a file."
 msgstr "„%s“ nije datoteka."
 
-#: src/direct/DirectPhotoPage.vala:231
+#: src/direct/DirectPhotoPage.vala:103
 #, c-format
 msgid ""
 "%s does not support the file format of\n"
@@ -4261,34 +4243,34 @@ msgstr ""
 "„%s“ ne podržava zapis datoteke\n"
 "%s."
 
-#: src/direct/DirectPhotoPage.vala:248
+#: src/direct/DirectPhotoPage.vala:120
 #, c-format
-#| msgid ""
-#| "Unable to print photo:\n"
-#| "\n"
-#| "%s"
 msgid "Unable open photo %s. Sorry."
 msgstr "Ne mogu da otvorim fotografiju „%s“. Izvinite."
 
-#: src/direct/DirectPhotoPage.vala:432
+#: src/direct/DirectPhotoPage.vala:304 src/Resources.vala:175 ui/direct.ui:8
+msgid "_Save"
+msgstr "_Sačuvaj"
+
+#: src/direct/DirectPhotoPage.vala:304
 msgid "_Save a Copy"
 msgstr "_Sačuvaj primerak"
 
-#: src/direct/DirectPhotoPage.vala:435
+#: src/direct/DirectPhotoPage.vala:307
 #, c-format
 msgid "Lose changes to %s?"
 msgstr "Da zaboravim izmene nad „%s“?"
 
-#: src/direct/DirectPhotoPage.vala:436
+#: src/direct/DirectPhotoPage.vala:308
 msgid "Close _without Saving"
 msgstr "Zatvori _bez čuvanja"
 
-#: src/direct/DirectPhotoPage.vala:469
+#: src/direct/DirectPhotoPage.vala:341
 #, c-format
 msgid "Error while saving to %s: %s"
 msgstr "Greška prilikom čuvanja u „%s“: %s"
 
-#: src/direct/DirectPhotoPage.vala:497 src/direct/DirectPhotoPage.vala:518
+#: src/direct/DirectPhotoPage.vala:371 src/direct/DirectPhotoPage.vala:392
 msgid "Save As"
 msgstr "Sačuvajte kao"
 
@@ -4298,193 +4280,202 @@ msgstr "Sačuvajte kao"
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Ne mogu da pratim „%s“: Nije direktorijum (%s)"
 
-#: src/editing_tools/EditingTools.vala:665
+#: src/editing_tools/EditingTools.vala:666
 msgid "Return to current photo dimensions"
 msgstr "Vrati na postojeću veličinu fotografije"
 
-#: src/editing_tools/EditingTools.vala:668
+#: src/editing_tools/EditingTools.vala:669
 msgid "Set the crop for this photo"
 msgstr "Podesite isecanje za ovu fotografiju"
 
-#: src/editing_tools/EditingTools.vala:680
+#: src/editing_tools/EditingTools.vala:681
 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:753
+#: src/editing_tools/EditingTools.vala:754
 msgid "Unconstrained"
 msgstr "Nevezano"
 
-#: src/editing_tools/EditingTools.vala:754
+#: src/editing_tools/EditingTools.vala:755
 msgid "Square"
 msgstr "Kvadratno"
 
-#: src/editing_tools/EditingTools.vala:755
+#: src/editing_tools/EditingTools.vala:756
 msgid "Screen"
 msgstr "Ekransko"
 
-#: 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)"
+#: src/editing_tools/EditingTools.vala:759
+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:760
+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 "Novčanik (2 x 3 inča)"
+#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:818
+msgid "Wallet (2 × 3 in.)"
+msgstr "Novčanik (2 × 3 inča)"
 
-#: src/editing_tools/EditingTools.vala:762 src/Printing.vala:821
-msgid "Notecard (3 x 5 in.)"
-msgstr "Zabeleška (3 x 5 inča)"
+#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:821
+msgid "Notecard (3 × 5 in.)"
+msgstr "Zabeleška (3 × 5 inča)"
 
-#: src/editing_tools/EditingTools.vala:763 src/Printing.vala:824
-msgid "4 x 6 in."
-msgstr "4 x 6 inča"
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:824
+msgid "4 × 6 in."
+msgstr "4 × 6 inča"
 
-#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:827
-msgid "5 x 7 in."
-msgstr "5 x 7 inča"
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:827
+msgid "5 × 7 in."
+msgstr "5 × 7 inča"
 
-#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:830
-msgid "8 x 10 in."
-msgstr "8 x 10 inča"
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:830
+msgid "8 × 10 in."
+msgstr "8 × 10 inča"
 
-#: src/editing_tools/EditingTools.vala:766
-msgid "Letter (8.5 x 11 in.)"
-msgstr "Pismo (8.5 x 11 in.)"
+#: src/editing_tools/EditingTools.vala:767
+msgid "Letter (8.5 × 11 in.)"
+msgstr "Pismo (8.5 × 11 in.)"
 
-#: src/editing_tools/EditingTools.vala:767 src/Printing.vala:833
-msgid "11 x 14 in."
-msgstr "11 x 14 inča"
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:833
+msgid "11 × 14 in."
+msgstr "11 × 14 inča"
 
-#: src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Tabloid (11 x 17 in.)"
+#: src/editing_tools/EditingTools.vala:769
+msgid "Tabloid (11 × 17 in.)"
+msgstr "Tabloid (11 × 17 in.)"
 
-#: src/editing_tools/EditingTools.vala:769 src/Printing.vala:836
-msgid "16 x 20 in."
-msgstr "16 x 20 inča"
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:836
+msgid "16 × 20 in."
+msgstr "16 × 20 inča"
 
-#: src/editing_tools/EditingTools.vala:771 src/Printing.vala:842
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Metrički novčanik (9 x 13 cm)"
+#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:842
+msgid "Metric Wallet (9 × 13 cm)"
+msgstr "Metrički novčanik (9 × 13 cm)"
 
-#: src/editing_tools/EditingTools.vala:772 src/Printing.vala:845
-msgid "Postcard (10 x 15 cm)"
-msgstr "Čestitka (10 x 15 cm)"
+#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:845
+msgid "Postcard (10 × 15 cm)"
+msgstr "Čestitka (10 × 15 cm)"
 
-#: src/editing_tools/EditingTools.vala:773 src/Printing.vala:848
-msgid "13 x 18 cm"
-msgstr "13 x 18 cm"
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:848
+msgid "13 × 18 cm"
+msgstr "13 × 18 cm"
 
-#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:851
-msgid "18 x 24 cm"
-msgstr "18 x 24 cm"
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:851
+msgid "18 × 24 cm"
+msgstr "18 × 24 cm"
 
-#: src/editing_tools/EditingTools.vala:775
-msgid "A4 (210 x 297 mm)"
-msgstr "A4 (210 x 297 mm)"
+#: src/editing_tools/EditingTools.vala:776
+msgid "A4 (210 × 297 mm)"
+msgstr "A4 (210 × 297 mm)"
 
-#: src/editing_tools/EditingTools.vala:776 src/Printing.vala:854
-msgid "20 x 30 cm"
-msgstr "20 x 30 cm"
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:854
+msgid "20 × 30 cm"
+msgstr "20 × 30 cm"
 
-#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:857
-msgid "24 x 40 cm"
-msgstr "24 x 40 cm"
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:857
+msgid "24 × 40 cm"
+msgstr "24 × 40 cm"
 
-#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:860
-msgid "30 x 40 cm"
-msgstr "30 x 40 cm"
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:860
+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 × 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 "Veličina:"
 
-#: src/editing_tools/EditingTools.vala:1887
+#: src/editing_tools/EditingTools.vala:1895
 msgid "Close the red-eye tool"
 msgstr "Zatvorite alat za uklanjanje crvenih očiju"
 
-#: src/editing_tools/EditingTools.vala:1890
+#: src/editing_tools/EditingTools.vala:1898
 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:2226
+#: src/editing_tools/EditingTools.vala:2238
 #: 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: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 "Izlaganje:"
 
-#: src/editing_tools/EditingTools.vala:2248
+#: src/editing_tools/EditingTools.vala:2261
+msgid "Contrast:"
+msgstr "Kontrast:"
+
+#: src/editing_tools/EditingTools.vala:2270
 msgid "Saturation:"
 msgstr "Zasićenje:"
 
-#: src/editing_tools/EditingTools.vala:2256
+#: src/editing_tools/EditingTools.vala:2279
 msgid "Tint:"
 msgstr "Boja:"
 
-#: src/editing_tools/EditingTools.vala:2265
+#: src/editing_tools/EditingTools.vala:2289
 msgid "Temperature:"
 msgstr "Temperatura:"
 
-#: src/editing_tools/EditingTools.vala:2273
+#: src/editing_tools/EditingTools.vala:2298
 msgid "Shadows:"
 msgstr "Senke:"
 
-#: src/editing_tools/EditingTools.vala:2281
+#: src/editing_tools/EditingTools.vala:2307
 msgid "Highlights:"
 msgstr "Isticanja:"
 
-#: src/editing_tools/EditingTools.vala:2335
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset Colors"
 msgstr "Povrati boje"
 
-#: src/editing_tools/EditingTools.vala:2335
+#: src/editing_tools/EditingTools.vala:2363
 msgid "Reset all color adjustments to original"
 msgstr "Vratite sva doterivanja boje na izvorna"
 
-#: src/editing_tools/EditingTools.vala:2687
+#: src/editing_tools/EditingTools.vala:2722
 msgid "Temperature"
 msgstr "Temperatura"
 
-#: src/editing_tools/EditingTools.vala:2700
+#: src/editing_tools/EditingTools.vala:2734
 msgid "Tint"
 msgstr "Boja"
 
-#: src/editing_tools/EditingTools.vala:2713
+#: src/editing_tools/EditingTools.vala:2746
+#| msgid "Contrast Expansion"
+msgid "Contrast"
+msgstr "Kontrast"
+
+#: src/editing_tools/EditingTools.vala:2760
 msgid "Saturation"
 msgstr "Zasićenost"
 
-#: src/editing_tools/EditingTools.vala:2726
+#: src/editing_tools/EditingTools.vala:2773
 msgid "Exposure"
 msgstr "Izloženost"
 
-#: src/editing_tools/EditingTools.vala:2739
+#: src/editing_tools/EditingTools.vala:2786
 msgid "Shadows"
 msgstr "Senke"
 
-#: src/editing_tools/EditingTools.vala:2752
+#: src/editing_tools/EditingTools.vala:2799
 msgid "Highlights"
 msgstr "Isticanja"
 
-#: src/editing_tools/EditingTools.vala:2762
+#: src/editing_tools/EditingTools.vala:2809
 msgid "Contrast Expansion"
 msgstr "Povećanje kontrasta"
 
@@ -4493,6 +4484,7 @@ msgid "Angle:"
 msgstr "Ugao:"
 
 #: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: ui/direct.ui:144 ui/photo.ui:233
 msgid "_Straighten"
 msgstr "_Ispravi"
 
@@ -4509,7 +4501,7 @@ msgstr[1] "%d fotografije/snimka"
 msgstr[2] "%d fotografija/snimaka"
 msgstr[3] "%d fotografija/snimak"
 
-#: 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"
@@ -4518,7 +4510,7 @@ msgstr[1] "%d snimka"
 msgstr[2] "%d snimaka"
 msgstr[3] "%d snimak"
 
-#: 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"
@@ -4527,44 +4519,36 @@ msgstr[1] "%d fotografije"
 msgstr[2] "%d fotografija"
 msgstr[3] "%d fotografija"
 
-#: src/events/EventPage.vala:129
+#: src/events/EventPage.vala:128
 msgid "No Event"
 msgstr "Bez događaja"
 
-#: src/events/EventsDirectoryPage.vala:130 src/MediaPage.vala:457
-msgid "_Comments"
-msgstr "_Napomene"
-
-#: src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Prikažite napomenu svakog događaja"
-
-#: src/events/EventsDirectoryPage.vala:155
+#: src/events/EventsDirectoryPage.vala:150
 msgid "No events"
 msgstr "Nema događaja"
 
-#: src/events/EventsDirectoryPage.vala:159
+#: src/events/EventsDirectoryPage.vala:154
 msgid "No events found"
 msgstr "Nisam pronašao događaje"
 
-#: src/events/EventsDirectoryPage.vala:230
+#: src/events/EventsDirectoryPage.vala:227
 msgid "All Events"
 msgstr "Svi događaji"
 
-#: src/events/EventsDirectoryPage.vala:244
+#: src/events/EventsDirectoryPage.vala:241
 msgid "Undated"
 msgstr "Bez datuma"
 
-#: src/events/EventsDirectoryPage.vala:245
+#: src/events/EventsDirectoryPage.vala:242
 msgid "%Y"
 msgstr "%Y."
 
-#: src/events/EventsDirectoryPage.vala:246
+#: src/events/EventsDirectoryPage.vala:243
 msgid "%B"
 msgstr "%B"
 
 #. if no name, pretty up the start time
-#: src/Event.vala:751
+#: src/Event.vala:753
 #, c-format
 msgid "Event %s"
 msgstr "Događaj „%s“"
@@ -4580,8 +4564,8 @@ msgstr "Izvozim"
 
 #: src/Exporter.vala:317
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "Već postoji datoteka „%s“.  Da je zamenim?"
+msgid "File %s already exists. Replace?"
+msgstr "Već postoji datoteka „%s“. Da je zamenim?"
 
 #: src/Exporter.vala:319
 msgid "_Skip"
@@ -4599,41 +4583,32 @@ msgstr "Zameni _sve"
 msgid "Export"
 msgstr "Izvezi"
 
-#: src/folders/Branch.vala:141
+#: src/folders/Branch.vala:144
 msgid "Folders"
 msgstr "Fascikle"
 
-#: 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 "Fototeka"
 
-#: 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 "Fotografije"
 
-#: 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 "Obeležene"
 
 #: src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Uvozim..."
+msgid "Importing…"
+msgstr "Uvozim…"
 
-#: src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Zaustavi uvoz"
-
-#: src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Prekinite uvoz fotografija"
+#: src/library/ImportQueuePage.vala:129
+msgid "Preparing to import…"
+msgstr "Pripremam za uvoz…"
 
-#: src/library/ImportQueuePage.vala:124
-msgid "Preparing to import..."
-msgstr "Pripremam fotografije za uvoz..."
-
-#: src/library/ImportQueuePage.vala:151
+#: src/library/ImportQueuePage.vala:156
 #, c-format
 msgid "Imported %s"
 msgstr "Uvezao sam „%s“"
@@ -4642,130 +4617,19 @@ msgstr "Uvezao sam „%s“"
 msgid "Last Import"
 msgstr "Poslednji uvoz"
 
-#: src/library/LibraryWindow.vala:285
-msgid "_Import From Folder..."
-msgstr "_Uvezi iz fascikle..."
-
-#: src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Uvezite fotografije sa diska u fototeku"
-
-#: src/library/LibraryWindow.vala:293
-msgid "Import From _Application..."
-msgstr "Uvezi iz _programa..."
-
-#: src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "Poređaj _događaje"
-
-#: src/library/LibraryWindow.vala:307
-msgid "Empty T_rash"
-msgstr "Isprazni _korpu"
-
-#: src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Obrišite sve fotografije iz korpe"
-
-#: src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "Pregledaj _događaj za fotografiju"
-
-#: src/library/LibraryWindow.vala:317
-msgid "_Find"
-msgstr "_Nađi"
-
-#: src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Pronađite fotografije i snimke prema merilu pretrage"
-
-#: src/library/LibraryWindow.vala:329 src/searches/Branch.vala:77
-#: src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search..."
-msgstr "Nova _sačuvana pretraga..."
-
-#: src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Fotografije"
-
-#: src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "_Događaji"
-
-#: src/library/LibraryWindow.vala:359 src/MediaPage.vala:469
-msgid "Ta_gs"
-msgstr "_Oznake"
-
-#: src/library/LibraryWindow.vala:374
-msgid "_Basic Information"
-msgstr "_Osnovni podaci"
-
-#: src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Prikažite osnovne podatke za izabranu fotografiju"
-
-#: src/library/LibraryWindow.vala:380
-msgid "E_xtended Information"
-msgstr "_Dodatni podaci"
-
-#: src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Prikažite dodatne podatke za izabranu fotografiju"
-
-#: src/library/LibraryWindow.vala:386
-msgid "_Search Bar"
-msgstr "_Traka pretrage"
-
-#: src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Prikažite traku pretrage"
-
-#: src/library/LibraryWindow.vala:392
-msgid "S_idebar"
-msgstr "_Bočna površ"
-
-#: src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Prikažite bočnu površ"
-
-#: src/library/LibraryWindow.vala:398
-#| msgid "Pin Toolbar"
-msgid "T_oolbar"
-msgstr "_Traka alata"
-
-#: src/library/LibraryWindow.vala:399
-#| msgid "Display the sidebar"
-msgid "Display the tool bar"
-msgstr "Prikažite traku alata"
-
-#: src/library/LibraryWindow.vala:411 src/MediaPage.vala:515
-msgid "_Ascending"
-msgstr "_Rastuće"
-
-#: src/library/LibraryWindow.vala:412 src/MediaPage.vala:516
-msgid "Sort photos in an ascending order"
-msgstr "Poređajte fotografije rastućim redom"
-
-#: src/library/LibraryWindow.vala:418 src/MediaPage.vala:521
-msgid "D_escending"
-msgstr "_Opadajuće"
-
-#: src/library/LibraryWindow.vala:419 src/MediaPage.vala:522
-msgid "Sort photos in a descending order"
-msgstr "Poređajte fotografije opadajućim redom"
-
-#: src/library/LibraryWindow.vala:657
+#: src/library/LibraryWindow.vala:507
 msgid "Import From Folder"
 msgstr "Uvezite iz fascikle"
 
-#: src/library/LibraryWindow.vala:726
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
 msgid "Empty Trash"
 msgstr "Isprazni korpu"
 
-#: src/library/LibraryWindow.vala:726
-msgid "Emptying Trash..."
-msgstr "Praznim korpu..."
+#: src/library/LibraryWindow.vala:576
+msgid "Emptying Trash…"
+msgstr "Praznim korpu…"
 
-#: src/library/LibraryWindow.vala:901
+#: src/library/LibraryWindow.vala:772
 #, c-format
 msgid ""
 "Shotwell is configured to import photos to your home directory.\n"
@@ -4778,43 +4642,43 @@ msgstr ""
 "%s Postavke</span>.\n"
 "Da li želite da nastavite uvoz fotografija?"
 
-#: src/library/LibraryWindow.vala:904 ui/shotwell.ui:784
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
 msgid "Library Location"
 msgstr "Mesto fototeke"
 
 #. TODO: Specify which directory/file.
-#: src/library/LibraryWindow.vala:917
+#: src/library/LibraryWindow.vala:788
 msgid "Photos cannot be imported from this directory."
 msgstr "Ne mogu da uvezem fotografije iz ovog direktorijuma."
 
-#: 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 "Osvežavam fototeku..."
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+msgid "Updating library…"
+msgstr "Osvežavam fototeku…"
 
-#: src/library/LibraryWindow.vala:1264
-msgid "Preparing to auto-import photos..."
-msgstr "Pripremam fotografije za samostalni uvoz..."
+#: src/library/LibraryWindow.vala:1129
+msgid "Preparing to auto-import photos…"
+msgstr "Pripremam fotografije za samostalni uvoz…"
 
-#: src/library/LibraryWindow.vala:1269
-msgid "Auto-importing photos..."
-msgstr "Samostalno uvozim fotografije..."
+#: src/library/LibraryWindow.vala:1134
+msgid "Auto-importing photos…"
+msgstr "Samostalno uvozim fotografije…"
 
-#: src/library/LibraryWindow.vala:1277
-msgid "Writing metadata to files..."
-msgstr "Upisujem metapodatke u datoteke..."
+#: src/library/LibraryWindow.vala:1142
+msgid "Writing metadata to files…"
+msgstr "Upisujem metapodatke u datoteke…"
 
 #: src/library/OfflinePage.vala:8
 msgid "Missing Files"
 msgstr "Nedostaju datoteke"
 
-#: src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Brišem..."
+#: src/library/OfflinePage.vala:110
+msgid "Deleting…"
+msgstr "Brišem…"
 
 #: src/library/TrashPage.vala:8
 msgid "Trash"
@@ -4835,39 +4699,39 @@ msgstr "Brišem fotografije"
 #: src/main.vala:54
 #, c-format
 msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please use the latest version of Shotwell."
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please use the latest version of Shotwell."
 msgstr ""
-"Vaša fototeka nije saglasna sa ovim izdanjem Foto-bunara.  Izgleda da ju je "
-"stvorio Foto-bunar %s (šema %d).  Ovo izdanje je %s (šema %d).  Koristite "
+"Vaša fototeka nije saglasna sa ovim izdanjem Foto-bunara. Izgleda da ju je "
+"stvorio Foto-bunar %s (šema %d). Ovo izdanje je %s (šema %d). Koristite "
 "najnovije izdanje Foto-bunara."
 
 #: 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 "
+"%d) to %s (schema %d). For more information please check the Shotwell Wiki "
 "at %s"
 msgstr ""
 "Foto-bunar nije uspeo da nadogradi vašu fototeku sa izdanja %s (šema %d) na "
-"%s (šema %d).  Za više podataka posetite Viki Foto-bunara na „%s“"
+"%s (šema %d). Za više podataka posetite Viki Foto-bunara na „%s“"
 
 #: src/main.vala:65
 #, c-format
 msgid ""
-"Your photo library is not compatible with this version of Shotwell.  It "
-"appears it was created by Shotwell %s (schema %d).  This version is %s "
-"(schema %d).  Please clear your library by deleting %s and re-import your "
+"Your photo library is not compatible with this version of Shotwell. It "
+"appears it was created by Shotwell %s (schema %d). This version is %s "
+"(schema %d). Please clear your library by deleting %s and re-import your "
 "photos."
 msgstr ""
-"Vaša fototeka nije saglasna sa ovim izdanjem Foto-bunara.  Izgleda da ju je "
-"stvorio Foto-bunar %s (šema %d).  Ovo izdanje je %s (šema %d).  Očistite vašu "
+"Vaša fototeka nije saglasna sa ovim izdanjem Foto-bunara. Izgleda da ju je "
+"stvorio Foto-bunar %s (šema %d). Ovo izdanje je %s (šema %d). Očistite vašu "
 "fototeku, tako što ćete obrisati „%s“, a zatim ponovo uvezite fotografije."
 
 #: 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 ""
 "Dogodila se nepoznata greška prilikom pokušaja provere zbirke Foto-bunara: %s"
 
@@ -4876,7 +4740,7 @@ msgid "Loading Shotwell"
 msgstr "Učitavam Foto-bunar"
 
 #: src/main.vala:294
-msgid "Path to Shotwell's private data"
+msgid "Path to Shotwell’s private data"
 msgstr "Putanja do ličnih podataka Foto-bunara"
 
 #: src/main.vala:294
@@ -4888,11 +4752,11 @@ msgid "Do not monitor library directory at runtime for changes"
 msgstr "Ne prati direktorijum fototeke za izmenama u vreme pokretanja"
 
 #: src/main.vala:302
-msgid "Don't display startup progress meter"
+msgid "Don’t display startup progress meter"
 msgstr "Ne prikazuje merač napredovanja pokretanja"
 
 #: src/main.vala:306
-msgid "Show the application's version"
+msgid "Show the application’s version"
 msgstr "Prikazuje izdanje programa"
 
 #. init GTK (valac has already called g_threads_init())
@@ -4902,7 +4766,7 @@ msgstr "[DATOTEKA]"
 
 #: src/main.vala:342
 #, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgid "Run “%s --help” to see a full list of available command line options.\n"
 msgstr ""
 "Pokrenite „%s --help“ da vidite potpun spisak dostupnih opcija linije "
 "naredbi.\n"
@@ -4916,71 +4780,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:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Povećajte minijature"
-
-#: src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Smanjite minijature"
-
-#: src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Poređaj _fotografije"
-
-#: src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "_Pusti snimak"
-
-#: src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Otvorite izabrani snimak u sistemskom programu za puštanje"
-
-#: src/MediaPage.vala:428 src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "_Razvijač"
-
-#: src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Prikažite napomene svake fotografije"
-
-#: src/MediaPage.vala:470
-msgid "Display each photo's tags"
-msgstr "Prikažite oznake fotografija"
-
-#: src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Prema _nazivu"
-
-#: src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Poređajte fotografije prema nazivu"
-
-#: src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Prema _datumu izlaganja"
-
-#: src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Poređajte fotografije prema datumu izlaganja"
-
-#: src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Prema _oceni"
-
-#: src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Poređajte fotografije prema oceni"
-
-#: src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Prema nazivu _datoteke"
-
-#: src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Poređajte fotografije prema nazivu datoteke"
-
-#: src/MediaPage.vala:723
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -4989,34 +4789,34 @@ msgstr ""
 "Foto-bunar nije uspeo da pusti izabrani snimak:\n"
 "%s"
 
-#: src/Page.vala:1266
+#: src/Page.vala:1319
 msgid "No photos/videos"
 msgstr "Nema fotografija/snimaka"
 
-#: src/Page.vala:1270
+#: src/Page.vala:1323
 msgid "No photos/videos found which match the current filter"
 msgstr "Nisam pronašao fotografije/snimke koji odgovaraju tekućem filteru"
 
-#: src/Page.vala:2576
+#: src/Page.vala:2629
 msgid "Photos cannot be exported to this directory."
 msgstr "Ne mogu da izvezem fotografije u ovaj direktorijum."
 
 #. previous button
-#: src/PhotoPage.vala:533
+#: src/PhotoPage.vala:535
 msgid "Previous photo"
 msgstr "Prethodna fotografija"
 
 #. next button
-#: src/PhotoPage.vala:539
+#: src/PhotoPage.vala:541
 msgid "Next photo"
 msgstr "Naredna fotografija"
 
-#: src/PhotoPage.vala:1845
+#: src/PhotoPage.vala:1847
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Nedostaje izvorna datoteka fotografije: %s"
 
-#: src/PhotoPage.vala:3229
+#: src/PhotoPage.vala:3015
 #, c-format
 msgid "Unable to export %s: %s"
 msgstr "Ne mogu da izvezem „%s“: %s"
@@ -5061,7 +4861,7 @@ msgstr "Sirovo"
 msgid "TIFF"
 msgstr "TIFF"
 
-#: src/Photo.vala:3753
+#: src/Photo.vala:3755
 msgid "modified"
 msgstr "izmenjeno"
 
@@ -5106,8 +4906,8 @@ msgid "Image Settings"
 msgstr "Podešavanja fotografije"
 
 #: src/Printing.vala:889
-msgid "Printing..."
-msgstr "Štampam..."
+msgid "Printing…"
+msgstr "Štampam…"
 
 #: src/Printing.vala:909 src/Printing.vala:1112
 #, c-format
@@ -5120,19 +4920,19 @@ msgstr ""
 "\n"
 "%s"
 
-#: src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "Danas"
 
-#: src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "Juče"
 
-#: src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr "Stavki:"
 
-#: src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
@@ -5142,104 +4942,104 @@ msgstr[2] "%d događaja"
 msgstr[3] "%d događaj"
 
 #. display only one date if start and end are the same
-#: src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "Datum:"
 
 #. display only one time if start and end are the same
-#: src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "Vreme:"
 
 #. display time range
 #. display date range
-#: src/Properties.vala:384 src/Properties.vala:389
+#: src/Properties.vala:387 src/Properties.vala:392
 msgid "From:"
 msgstr "Od:"
 
-#: src/Properties.vala:385 src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "Do:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Trajanje:"
 
-#: src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekunde"
 
-#: src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Razvijač:"
 
 #. nothing special to be done for now for Events
-#: src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Mesto:"
 
-#: src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Veličina datoteke:"
 
-#: src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Tekući razvoj:"
 
-#: src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Izvorne dimenzije:"
 
-#: src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "Marka foto-aparata:"
 
-#: src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "Model foto-aparata:"
 
-#: src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Blic:"
 
-#: src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Žižna daljina:"
 
-#: src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Datum izlaganja:"
 
-#: src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Vreme izlaganja:"
 
-#: src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Kompenzacija izlaganja:"
 
-#: src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "Geografska širina:"
 
-#: src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "Geografska dužina:"
 
-#: src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "Fotograf:"
 
-#: src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "Autorsko pravo:"
 
-#: src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "Softver:"
 
-#: src/Properties.vala:641
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr "Dodatni podaci"
 
@@ -5254,7 +5054,7 @@ msgstr "Otpremam %d od %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 "Ne mogu da nastavim objavljivanje na „%s“ jer se pojavila greška:"
 
 #: src/publishing/PublishingPluginHost.vala:84
@@ -5263,65 +5063,69 @@ msgstr ""
 "Da pokušate objavljivanje na drugoj usluzi, izaberite jednu iz gornjeg "
 "izbornika."
 
-#: src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "Izabrane fotografije/snimci su uspešno objavljeni."
-
-#: src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "Izabrani snimci su uspešno objavljeni."
-
-#: src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "Izabrane fotografije su uspešno objavljene."
-
-#: 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 "Izabrani snimak je uspešno objavljen."
+msgid_plural "The selected videos were successfully published."
+msgstr[0] "Izabrani snimak je uspešno objavljen."
+msgstr[1] "Izabrani snimci su uspešno objavljeni."
+msgstr[2] "Izabrani snimci su uspešno objavljeni."
+msgstr[3] "Izabrani snimak je uspešno objavljen."
 
-#: 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 "Izabrana fotografija je uspešno objavljena."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "Izabrana fotografija je uspešno objavljena."
+msgstr[1] "Izabrane fotografije su uspešno objavljene."
+msgstr[2] "Izabrane fotografije su uspešno objavljene."
+msgstr[3] "Izabrana fotografija je uspešno objavljena."
 
-#: src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr "Pribavljam podatake o nalogu..."
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "Izabrane fotografije/snimci su uspešno objavljeni."
 
-#: src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "Prijavljujem se..."
+#: src/publishing/PublishingUI.vala:127
+msgid "Fetching account information…"
+msgstr "Pribavljam podatake o nalogu…"
 
-#: src/publishing/PublishingUI.vala:188
+#: src/publishing/PublishingUI.vala:133
+msgid "Logging in…"
+msgstr "Prijavljujem se…"
+
+#: src/publishing/PublishingUI.vala:193
 msgid "Publish Photos"
 msgstr "Objavite fotografije"
 
-#: src/publishing/PublishingUI.vala:189
+#: src/publishing/PublishingUI.vala:194
 msgid "Publish photos _to:"
 msgstr "Objavi fotografije _na:"
 
-#: src/publishing/PublishingUI.vala:191
+#: src/publishing/PublishingUI.vala:196
 msgid "Publish Videos"
 msgstr "Objavite snimke"
 
-#: src/publishing/PublishingUI.vala:192
+#: src/publishing/PublishingUI.vala:197
 msgid "Publish videos _to"
 msgstr "Objavi snimke _na"
 
-#: src/publishing/PublishingUI.vala:194
+#: src/publishing/PublishingUI.vala:199
 msgid "Publish Photos and Videos"
 msgstr "Objavite fotografije i snimke"
 
-#: src/publishing/PublishingUI.vala:195
+#: src/publishing/PublishingUI.vala:200
 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:397
+#: src/publishing/PublishingUI.vala:410
 msgid "Unable to publish"
 msgstr "Objavljivanje nije uspelo"
 
-#: 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 "
@@ -5330,19 +5134,15 @@ msgid ""
 "<b>Plugins</b> tab."
 msgstr ""
 "Foto-bunar ne može da objavi izabrane stavke jer nemate uključen saglasan "
-"priključak objavljivanja. Da ispravite ovo, izaberite <b>Uređivanje %s "
-"Postavke</b> i uključite jedan ili više priključaka objavljivanja u jezičku "
-"<b>Priključci</b>."
+"priključak objavljivanja. Da ispravite ovo, izaberite <b>Uređivanje %s Postavke</"
+"b> i uključite jedan ili više priključaka objavljivanja u jezičku <b>Priključci</"
+"b>."
 
 #: src/publishing/Publishing.vala:16
 msgid "Publishing"
 msgstr "Objavljivanje"
 
-#: src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Okreni na _desno"
-
-#: src/Resources.vala:140 src/Resources.vala:145
+#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
 msgid "Rotate"
 msgstr "Okrenite"
 
@@ -5350,14 +5150,10 @@ msgstr "Okrenite"
 msgid "Rotate Right"
 msgstr "Okrenite na desno"
 
-#: src/Resources.vala:142
+#: src/Resources.vala:142 ui/collection.ui:146
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Okrenite fotografije na desno (pritisnite Ktrl da okrenete na levo)"
 
-#: src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Okreni na _levo"
-
 #: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "Okrenite na levo"
@@ -5366,23 +5162,17 @@ msgstr "Okrenite na levo"
 msgid "Rotate the photos left"
 msgstr "Okrenite fotografije na levo"
 
-#: src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Izvrni _vodoravno"
-
 #: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "Izvrnite vodoravno"
 
-#: src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Izvrni _uspravno"
-
 #: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "Izvrnite uspravno"
 
-#: src/Resources.vala:155
+#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419
+#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207
 msgid "_About"
 msgstr "_O programu"
 
@@ -5390,19 +5180,35 @@ msgstr "_O programu"
 msgid "_Apply"
 msgstr "_Primeni"
 
+#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
+#: ui/photo.ui:55 ui/tags.ui:47 ui/top.ui:10 ui/trash.ui:37
+msgid "_Edit"
+msgstr "_Uređivanje"
+
 #: src/Resources.vala:160
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: src/Resources.vala:161
+#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "Preko _celog ekrana"
 
+#: src/Resources.vala:162 ui/direct.ui:173 ui/direct.ui:176
+#: ui/events_directory.ui:150 ui/events_directory.ui:153 ui/event.ui:418
+#: ui/event.ui:421 ui/import_queue.ui:65 ui/import_queue.ui:68 ui/import.ui:183
+#: ui/import.ui:186 ui/media.ui:401 ui/media.ui:404 ui/offline.ui:180
+#: ui/offline.ui:183 ui/photo.ui:384 ui/photo.ui:387 ui/tags.ui:420
+#: ui/tags.ui:423 ui/top.ui:40 ui/trash.ui:189 ui/trash.ui:192
+msgid "_Help"
+msgstr "Po_moć"
+
 #: src/Resources.vala:163
 msgid "Leave _Fullscreen"
 msgstr "Napusti prikaz preko _celog ekrana"
 
-#: src/Resources.vala:164 src/Resources.vala:363
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "_Novo"
 
@@ -5410,15 +5216,9 @@ msgstr "_Novo"
 msgid "_Next"
 msgstr "_Sledeće"
 
-#: src/Resources.vala:166
-msgid "_OK"
-msgstr "U _redu"
-
-#: src/Resources.vala:167
-msgid "_Play"
-msgstr "Pu_sti"
-
-#: src/Resources.vala:168 src/Resources.vala:317
+#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
 msgid "_Preferences"
 msgstr "_Postavke"
 
@@ -5426,11 +5226,9 @@ msgstr "_Postavke"
 msgid "_Previous"
 msgstr "_Prethodno"
 
-#: src/Resources.vala:170
-msgid "_Print"
-msgstr "_Štampaj"
-
-#: src/Resources.vala:171
+#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
+#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
 msgid "_Quit"
 msgstr "_Izađi"
 
@@ -5470,22 +5268,24 @@ msgstr "_Uobičajena veličina"
 msgid "Best _Fit"
 msgstr "_Najbolje uklapanje"
 
-#: src/Resources.vala:186
-msgid "_Enhance"
-msgstr "_Poboljšaj"
+#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "U_većaj"
 
-#: src/Resources.vala:187
+#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "U_manji"
+
+#: src/Resources.vala:187 ui/collection.ui:165
 msgid "Enhance"
 msgstr "Poboljšajte"
 
-#: src/Resources.vala:188
-msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:188 ui/collection.ui:162
+msgid "Automatically improve the photo’s appearance"
 msgstr "Samostalno unapredite izgled fotografije"
 
-#: src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "_Umnoži doterivanja boje"
-
 #: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "Umnožite doterivanja boje"
@@ -5494,10 +5294,6 @@ msgstr "Umnožite doterivanja boje"
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Umnožite doterivanja boje primenjena na fotografiji"
 
-#: src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "_Ubaci doterivanja boje"
-
 #: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "Ubacite doterivanja boje"
@@ -5506,7 +5302,7 @@ msgstr "Ubacite doterivanja boje"
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Primenite umnožena doterivanja boje na izabranim fotografijama"
 
-#: src/Resources.vala:198
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Iseci"
 
@@ -5515,7 +5311,7 @@ msgid "Crop"
 msgstr "Isecite"
 
 #: src/Resources.vala:200
-msgid "Crop the photo's size"
+msgid "Crop the photo’s size"
 msgstr "Isecite veličinu fotografije"
 
 #: src/Resources.vala:203
@@ -5526,7 +5322,7 @@ msgstr "Ispravite"
 msgid "Straighten the photo"
 msgstr "Ispravite fotografiju"
 
-#: src/Resources.vala:206
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Crvene oči"
 
@@ -5538,7 +5334,7 @@ msgstr "Uklonite crvene oči"
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Umanjite ili uklonite dejstva crvenih očiju sa fotografije"
 
-#: src/Resources.vala:210
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Doteraj"
 
@@ -5547,13 +5343,9 @@ msgid "Adjust"
 msgstr "Doterajte"
 
 #: src/Resources.vala:212
-msgid "Adjust the photo's color and tone"
+msgid "Adjust the photo’s color and tone"
 msgstr "Doterajte boje i tonalitet fotografije"
 
-#: src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "_Vrati na izvorno"
-
 #: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr "Vratite na izvorno"
@@ -5566,19 +5358,17 @@ msgstr "Vrati spoljne _izmene"
 msgid "Revert to the master photo"
 msgstr "Vratite izvornu fotografiju"
 
-#: src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Postavi za _pozadinu"
-
 #: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr "Postavite izabranu fotografiju za pozadinu vaše radne površi"
 
 #: src/Resources.vala:222
-msgid "Set as _Desktop Slideshow..."
-msgstr "Postavi kao smenjivu _pozadinu..."
+msgid "Set as _Desktop Slideshow…"
+msgstr "Postavi kao smenjivu pozadinu _radne površi…"
 
-#: src/Resources.vala:224
+#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
+#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
 msgid "_Undo"
 msgstr "_Opozovi"
 
@@ -5586,7 +5376,9 @@ msgstr "_Opozovi"
 msgid "Undo"
 msgstr "Opozovite"
 
-#: src/Resources.vala:227
+#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
+#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
 msgid "_Redo"
 msgstr "_Ponovi"
 
@@ -5594,11 +5386,12 @@ msgstr "_Ponovi"
 msgid "Redo"
 msgstr "Ponovite"
 
-#: src/Resources.vala:230
-msgid "Re_name Event..."
-msgstr "_Preimenuj događaj..."
+#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:391 ui/event.ui:584
+msgid "Re_name Event…"
+msgstr "_Preimenuj događaj…"
 
-#: src/Resources.vala:233
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr "Napravi _ključnu fotografiju događaja"
 
@@ -5606,7 +5399,7 @@ msgstr "Napravi _ključnu fotografiju događaja"
 msgid "Make Key Photo for Event"
 msgstr "Napravite ključnu fotografiju za ovaj događaj"
 
-#: src/Resources.vala:236
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
 msgid "_New Event"
 msgstr "_Novi događaj"
 
@@ -5622,7 +5415,7 @@ msgstr "Premesti fotografije"
 msgid "Move photos to an event"
 msgstr "Premestite fotografije u događaj"
 
-#: src/Resources.vala:242
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "_Spoj događaje"
 
@@ -5634,7 +5427,8 @@ msgstr "Spojite"
 msgid "Combine events into a single event"
 msgstr "Objedinite događaje u jedan"
 
-#: src/Resources.vala:246
+#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Oceni"
 
@@ -5646,7 +5440,8 @@ msgstr "Ocenite"
 msgid "Change the rating of your photo"
 msgstr "Izmenite ocenu fotografije"
 
-#: src/Resources.vala:250
+#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Povećaj"
 
@@ -5654,7 +5449,8 @@ msgstr "_Povećaj"
 msgid "Increase Rating"
 msgstr "Povećajte ocenu"
 
-#: src/Resources.vala:253
+#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Smanji"
 
@@ -5662,7 +5458,8 @@ msgstr "_Smanji"
 msgid "Decrease Rating"
 msgstr "Smanjite ocenu"
 
-#: src/Resources.vala:256
+#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Bez ocene"
 
@@ -5682,7 +5479,8 @@ msgstr "Označite da fotografija nije ocenjena"
 msgid "Remove any ratings"
 msgstr "Uklonite bilo kakve ocene"
 
-#: src/Resources.vala:262
+#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "_Odbačene"
 
@@ -5702,7 +5500,8 @@ msgstr "Označavam da je fotografija odbačena"
 msgid "Set rating to rejected"
 msgstr "Označite da je fotografija odbačena"
 
-#: src/Resources.vala:268
+#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
 msgid "Rejected _Only"
 msgstr "Samo _odbačene"
 
@@ -5714,17 +5513,18 @@ msgstr "Samo odbačene"
 msgid "Show only rejected photos"
 msgstr "Prikažite samo odbačene fotografije"
 
-#: src/Resources.vala:272
+#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
 msgid "All + _Rejected"
 msgstr "Sve + _odbačene"
 
 #: src/Resources.vala:273
-#| msgid "Show all photos, including rejected"
 msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Prikažite sve fotografije, uključujući i odbačene"
 
-#: src/Resources.vala:275
+#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
 msgid "_All Photos"
 msgstr "_Sve fotografije"
 
@@ -5733,15 +5533,17 @@ msgstr "_Sve fotografije"
 msgid "Show all photos"
 msgstr "Prikažite sve fotografije"
 
-#: src/Resources.vala:279
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Ocene"
 
 #: src/Resources.vala:280
-msgid "Display each photo's rating"
+msgid "Display each photo’s rating"
 msgstr "Prikažite ocene svih fotografija"
 
-#: src/Resources.vala:282
+#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
 msgid "_Filter Photos"
 msgstr "_Izdvoj fotografije"
 
@@ -5753,10 +5555,6 @@ msgstr "Izdvojte fotografije"
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Ograničite broj prikazanih fotografija na osnovu propusnika"
 
-#: src/Resources.vala:286
-msgid "_Duplicate"
-msgstr "_Udvostruči"
-
 #: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "Udvostruči"
@@ -5765,94 +5563,87 @@ msgstr "Udvostruči"
 msgid "Make a duplicate of the photo"
 msgstr "Napravite umnožak fotografije"
 
-#: src/Resources.vala:290
-msgid "_Export..."
-msgstr "_Izvezi..."
+#: src/Resources.vala:290 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
+msgid "_Export…"
+msgstr "_Izvezi…"
 
 #: src/Resources.vala:292
-msgid "_Print..."
-msgstr "_Štampaj..."
+msgid "_Print…"
+msgstr "_Štampaj…"
 
 #: src/Resources.vala:294
-msgid "Pu_blish..."
-msgstr "_Objavi..."
+msgid "Pu_blish…"
+msgstr "_Objavi…"
 
-#: src/Resources.vala:296
+#: src/Resources.vala:296 ui/collection.ui:187
 msgid "Publish to various websites"
 msgstr "Objavite izabrane fotografije na raznim sajtovima"
 
-#: src/Resources.vala:298
-msgid "Edit _Title..."
-msgstr "Izmeni _naslov..."
+#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
+msgid "Edit _Title…"
+msgstr "Izmeni _naslov…"
 
 #. Button label
 #: src/Resources.vala:300
-#| msgid "Edit Title"
 msgctxt "Button Label"
 msgid "Edit Title"
 msgstr "Uredi naslov"
 
-#: src/Resources.vala:302
-msgid "Edit _Comment..."
-msgstr "Izmeni _napomenu..."
+#: src/Resources.vala:302 ui/collection.ui:102 ui/events_directory.ui:144
+#: ui/events_directory.ui:186 ui/event.ui:344 ui/event.ui:396 ui/event.ui:539
+#: ui/media.ui:344 ui/photo_context.ui:109 ui/photo.ui:331 ui/tags.ui:344
+msgid "Edit _Comment…"
+msgstr "Izmeni _napomenu…"
 
 #. Button label
 #: src/Resources.vala:304
 msgid "Edit Comment"
 msgstr "Izmenite napomenu"
 
-#: src/Resources.vala:306
-msgid "Edit Event _Comment..."
-msgstr "Izmeni _napomenu događaja..."
+#: src/Resources.vala:306 ui/event.ui:588
+msgid "Edit Event _Comment…"
+msgstr "Izmeni _napomenu događaja…"
 
-#: src/Resources.vala:309
-msgid "_Adjust Date and Time..."
-msgstr "_Podesi datum i vreme..."
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
+msgid "_Adjust Date and Time…"
+msgstr "_Podesi datum i vreme…"
 
 #: src/Resources.vala:310
 msgid "Adjust Date and Time"
 msgstr "Podesite datum i vreme"
 
-#: src/Resources.vala:312
-msgid "Add _Tags..."
-msgstr "Dodaj _oznake..."
+#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456
+#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388
+msgid "Add _Tags…"
+msgstr "Dodaj _oznake…"
 
-#: src/Resources.vala:313
-msgid "_Add Tags..."
-msgstr "_Dodaj oznake..."
+#: src/Resources.vala:313 ui/photo_context.ui:17
+msgid "_Add Tags…"
+msgstr "Dodaj _oznake…"
 
 #. Dialog title
 #: src/Resources.vala:315
-#| msgid "Add Tags"
 msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Dodajte oznake"
 
-#: src/Resources.vala:319
-msgid "Open With E_xternal Editor"
-msgstr "_Otvori spoljnim uređivačem"
-
-#: src/Resources.vala:321
-msgid "Open With RA_W Editor"
-msgstr "Otvori uređivačem _sirovih"
-
-#: src/Resources.vala:323
-msgid "Send _To..."
-msgstr "Pošalji _u..."
-
-#: src/Resources.vala:324
-msgid "Send T_o..."
-msgstr "Pošalji _u..."
+#: src/Resources.vala:324 ui/photo_context.ui:133
+msgid "Send T_o…"
+msgstr "Pošalji _u…"
 
 #: src/Resources.vala:326
-msgid "_Find..."
-msgstr "_Nađi..."
+msgid "_Find…"
+msgstr "_Nađi…"
 
-#: src/Resources.vala:327
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Pronađite"
 
-#: src/Resources.vala:328
+#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr "Pronađite fotografije na osnovu naziva ili oznake"
 
@@ -5871,31 +5662,30 @@ msgstr "Ne mogu da pokrenem uređivača: %s"
 
 #: src/Resources.vala:340
 #, c-format
-msgid "Add Tag \"%s\""
+msgid "Add Tag “%s”"
 msgstr "Dodaj oznaku „%s“"
 
 #. Used when adding two tags to photo(s)
 #: src/Resources.vala:343
 #, c-format
-msgid "Add Tags \"%s\" and \"%s\""
+msgid "Add Tags “%s” and “%s”"
 msgstr "Dodaj oznaku „%s“ i „%s“"
 
 #. Undo/Redo command name (in Edit menu)
 #: src/Resources.vala:348
-#| msgid "Add Tags"
 msgctxt "UndoRedo menu entry"
 msgid "Add Tags"
 msgstr "Dodaj oznake"
 
 #: src/Resources.vala:353
 #, c-format
-msgid "_Delete Tag \"%s\""
+msgid "_Delete Tag “%s”"
 msgstr "_Obriši oznaku „%s“"
 
 #: src/Resources.vala:357
 #, c-format
-msgid "Delete Tag \"%s\""
-msgstr "Obriši oznaku „%s“"
+msgid "Delete Tag “%s”"
+msgstr "Obrišite oznaku „%s“"
 
 #: src/Resources.vala:360
 msgid "Delete Tag"
@@ -5903,21 +5693,22 @@ msgstr "Obrišite oznaku"
 
 #: src/Resources.vala:366
 #, c-format
-msgid "Re_name Tag \"%s\"..."
-msgstr "_Preimenuj oznaku „%s“..."
+msgid "Re_name Tag “%s”…"
+msgstr "_Preimenuj oznaku „%s“…"
 
 #: src/Resources.vala:370
 #, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
-msgstr "Preimenuj oznaku „%s“ u „%s“"
+msgid "Rename Tag “%s” to “%s”"
+msgstr "Preimenujte oznaku „%s“ u „%s“"
 
-#: src/Resources.vala:373
-msgid "_Rename..."
-msgstr "_Preimenuj..."
+#: src/Resources.vala:373 ui/tags.ui:454
+msgid "_Rename…"
+msgstr "_Preimenuj…"
 
-#: src/Resources.vala:375
-msgid "Modif_y Tags..."
-msgstr "Izmeni _oznake..."
+#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461
+#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393
+msgid "Modif_y Tags…"
+msgstr "Izmeni _oznake…"
 
 #: src/Resources.vala:376
 msgid "Modify Tags"
@@ -5925,163 +5716,169 @@ msgstr "Izmenite oznake"
 
 #: src/Resources.vala:379
 #, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "Označi fotografije kao „%s“"
-
-#: src/Resources.vala:379
-#, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "Označi fotografije kao „%s“"
-
-#: src/Resources.vala:383
-#, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "Označi izabranu fotografiju kao „%s“"
-
-#: src/Resources.vala:384
-#, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr "Označi izabrane fotografije kao „%s“"
-
-#: src/Resources.vala:388
-#, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "Ukloni oznaku „%s“ sa _fotografije"
-
-#: src/Resources.vala:389
-#, c-format
-msgid "Remove Tag \"%s\" From _Photos"
-msgstr "Ukloni oznaku „%s“ sa _fotografija"
-
-#: src/Resources.vala:393
-#, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "Uklonite oznaku „%s“ sa fotografije"
-
-#: src/Resources.vala:394
-#, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr "Uklonite oznaku „%s“ sa fotografija"
-
-#: src/Resources.vala:398
-#, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
+#| msgid "Tag Photo as \"%s\""
+msgid "Tag Photo as “%s”"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Označi fotografiju kao „%s“"
+msgstr[1] "Označi fotografije kao „%s“"
+msgstr[2] "Označi fotografije kao „%s“"
+msgstr[3] "Označi fotografije kao „%s“"
+
+#: src/Resources.vala:385
+#, c-format
+#| msgid "Tag the selected photo as \"%s\""
+msgid "Tag the selected photo as “%s”"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Označi izabranu fotografiju kao „%s“"
+msgstr[1] "Označi izabrane fotografije kao „%s“"
+msgstr[2] "Označi izabrane fotografije kao „%s“"
+msgstr[3] "Označi izabranu fotografiju kao „%s“"
+
+#: src/Resources.vala:391
+#, c-format
+#| msgid "Remove Tag \"%s\" From _Photo"
+msgid "Remove Tag “%s” From _Photo"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "Ukloni oznaku „%s“ sa _fotografije"
+msgstr[1] "Ukloni oznaku „%s“ sa _fotografija"
+msgstr[2] "Ukloni oznaku „%s“ sa _fotografija"
+msgstr[3] "Ukloni oznaku „%s“ sa _fotografije"
+
+#: src/Resources.vala:397
+#, c-format
+#| msgid "Remove Tag \"%s\" From Photo"
+msgid "Remove Tag “%s” From Photo"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Uklonite oznaku „%s“ sa fotografije"
+msgstr[1] "Uklonite oznaku „%s“ sa fotografija"
+msgstr[2] "Uklonite oznaku „%s“ sa fotografija"
+msgstr[3] "Uklonite oznaku „%s“ sa fotografije"
+
+#: src/Resources.vala:403
+#, c-format
+msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr "Ne mogu da preimenujem oznaku „%s“ jer već postoji ta oznaka."
 
-#: src/Resources.vala:402
+#: src/Resources.vala:407
 #, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
+msgid "Unable to rename search to “%s” because the search already exists."
 msgstr "Ne mogu da preimenujem pretragu „%s“ jer već postoji ta pretraga."
 
 #. Saved search button
-#: src/Resources.vala:405 src/SearchFilter.vala:1210
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Sačuvane pretrage"
 
-#: src/Resources.vala:407
+#: src/Resources.vala:412
 msgid "Delete Search"
 msgstr "Izbriši pretragu"
 
-#: src/Resources.vala:410
-msgid "_Edit..."
-msgstr "_Izmeni..."
+#: src/Resources.vala:415 ui/savedsearch.ui:11
+#| msgid "_Edit"
+msgid "_Edit…"
+msgstr "_Uredi…"
 
-#: src/Resources.vala:411
-msgid "Re_name..."
-msgstr "Pre_imenuj..."
+#: src/Resources.vala:416 ui/savedsearch.ui:7
+msgid "Re_name…"
+msgstr "_Preimenuj…"
 
-#: src/Resources.vala:414
+#: src/Resources.vala:419
 #, c-format
-msgid "Rename Search \"%s\" to \"%s\""
+msgid "Rename Search “%s” to “%s”"
 msgstr "Preimenuj pretragu „%s“ u „%s“"
 
-#: src/Resources.vala:418
+#: src/Resources.vala:423
 #, c-format
-msgid "Delete Search \"%s\""
+msgid "Delete Search “%s”"
 msgstr "Izbriši pretragu „%s“"
 
-#: src/Resources.vala:576
+#: src/Resources.vala:560
 #, c-format
 msgid "Rate %s"
 msgstr "Oceni „%s“"
 
-#: src/Resources.vala:577
+#: src/Resources.vala:561
 #, c-format
 msgid "Set rating to %s"
 msgstr "Postavite ocenu na „%s“"
 
-#: src/Resources.vala:578
+#: src/Resources.vala:562
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Postavljam ocenu na „%s“"
 
-#: src/Resources.vala:580
+#: src/Resources.vala:564
 #, c-format
 msgid "Display %s"
 msgstr "Prikaži „%s“"
 
-#: src/Resources.vala:581
+#: src/Resources.vala:565
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Prikažite samo fotografije sa ocenom „%s“"
 
-#: src/Resources.vala:582
+#: src/Resources.vala:566
 #, c-format
 msgid "%s or Better"
 msgstr "%s ili bolje"
 
-#: src/Resources.vala:583
+#: src/Resources.vala:567
 #, c-format
 msgid "Display %s or Better"
 msgstr "Prikaži %s ili bolje"
 
-#: src/Resources.vala:584
+#: src/Resources.vala:568
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Prikažite samo fotografije sa ocenom %s ili boljom"
 
-#: src/Resources.vala:675
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Uklonite izabrane fotografije iz korpe"
 
-#: src/Resources.vala:676
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Uklonite izabrane fotografije iz fototeke"
 
-#: src/Resources.vala:678
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "_Povrati"
 
-#: src/Resources.vala:679
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Premestite izabrane fotografije nazad u fototeku"
 
-#: src/Resources.vala:681
+#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
+#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Prikaži u _upravniku datoteka"
 
-#: src/Resources.vala:682
-msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:666
+msgid "Open the selected photo’s directory in the file manager"
 msgstr "Otvorite direktorijum izabranih fotografija u upravniku datoteka"
 
-#: src/Resources.vala:685
+#: src/Resources.vala:669
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Ne mogu da otvorim upravnika datoteka: %s"
 
-#: src/Resources.vala:688
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "Ukloni iz _fototeke"
 
-#: src/Resources.vala:690
+#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
+#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Premesti u korpu"
 
-#: src/Resources.vala:692
+#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr "Izaberi _sve"
 
-#: src/Resources.vala:693
+#: src/Resources.vala:677
 msgid "Select all items"
 msgstr "Izaberite sve stavke"
 
@@ -6094,15 +5891,14 @@ msgstr "Izaberite 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: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
-#| msgid "%a %b %d"
+#: src/Resources.vala:744
 msgctxt "MultidayFormat"
 msgid "%a %b %d"
 msgstr "%A, %d. %B"
@@ -6110,8 +5906,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
-#| msgid "%d, %Y"
+#: src/Resources.vala:749
 msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d., %Y."
@@ -6119,8 +5914,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
-#| msgid "%a %b %d"
+#: src/Resources.vala:754
 msgctxt "MultimonthFormat"
 msgid "%a %b %d"
 msgstr "%A, %d. %B"
@@ -6128,8 +5922,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
-#| msgid "%a %b %d, %Y"
+#: src/Resources.vala:759
 msgctxt "MultimonthFormat"
 msgid "%a %b %d, %Y"
 msgstr "%A, %d. %B %Y."
@@ -6143,139 +5936,139 @@ msgid "Saved Searches"
 msgstr "Sačuvane pretrage"
 
 #. Ordering must correspond with SearchConditionText.Context
-#: src/searches/SavedSearchDialog.vala:168
+#: src/searches/SavedSearchDialog.vala:162
 msgid "contains"
 msgstr "sadrži"
 
 #. Ordering must correspond with Context
-#: src/searches/SavedSearchDialog.vala:169
-#: src/searches/SavedSearchDialog.vala:500
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
 msgid "is exactly"
 msgstr "je tačno"
 
-#: src/searches/SavedSearchDialog.vala:170
+#: src/searches/SavedSearchDialog.vala:164
 msgid "starts with"
 msgstr "počinje na"
 
-#: src/searches/SavedSearchDialog.vala:171
+#: src/searches/SavedSearchDialog.vala:165
 msgid "ends with"
 msgstr "završava se na"
 
-#: src/searches/SavedSearchDialog.vala:172
+#: src/searches/SavedSearchDialog.vala:166
 msgid "does not contain"
 msgstr "ne sadrži"
 
-#: 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 "nije podešeno"
 
-#: src/searches/SavedSearchDialog.vala:174
+#: src/searches/SavedSearchDialog.vala:168
 msgid "is set"
 msgstr "podešeno"
 
 #. 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 "jeste"
 
-#: src/searches/SavedSearchDialog.vala:249
+#: src/searches/SavedSearchDialog.vala:243
 msgid "is not"
 msgstr "nije"
 
 #. Ordering must correspond with SearchConditionMediaType.MediaType
-#: src/searches/SavedSearchDialog.vala:255
+#: src/searches/SavedSearchDialog.vala:249
 msgid "any photo"
 msgstr "fotografija"
 
-#: src/searches/SavedSearchDialog.vala:256
+#: src/searches/SavedSearchDialog.vala:250
 msgid "a raw photo"
 msgstr "sirova fotografija"
 
-#: src/searches/SavedSearchDialog.vala:257
+#: src/searches/SavedSearchDialog.vala:251
 msgid "a video"
 msgstr "snimak"
 
-#: src/searches/SavedSearchDialog.vala:311
+#: src/searches/SavedSearchDialog.vala:305
 msgid "has"
 msgstr "ima"
 
-#: src/searches/SavedSearchDialog.vala:312
+#: src/searches/SavedSearchDialog.vala:306
 msgid "has no"
 msgstr "nema"
 
-#: src/searches/SavedSearchDialog.vala:317
+#: src/searches/SavedSearchDialog.vala:311
 msgid "modifications"
 msgstr "izmene"
 
-#: src/searches/SavedSearchDialog.vala:318
+#: src/searches/SavedSearchDialog.vala:312
 msgid "internal modifications"
 msgstr "unutrašnje izmene"
 
-#: src/searches/SavedSearchDialog.vala:319
+#: src/searches/SavedSearchDialog.vala:313
 msgid "external modifications"
 msgstr "spoljne izmene"
 
 #. Ordering must correspond with SearchConditionFlagged.State
-#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:367
 msgid "flagged"
 msgstr "obeležena"
 
-#: src/searches/SavedSearchDialog.vala:374
+#: src/searches/SavedSearchDialog.vala:368
 msgid "not flagged"
 msgstr "neobeležena"
 
-#: src/searches/SavedSearchDialog.vala:437
+#: src/searches/SavedSearchDialog.vala:431
 msgid "and higher"
 msgstr "i više"
 
-#: src/searches/SavedSearchDialog.vala:438
+#: src/searches/SavedSearchDialog.vala:432
 msgid "only"
 msgstr "samo"
 
-#: src/searches/SavedSearchDialog.vala:439
+#: src/searches/SavedSearchDialog.vala:433
 msgid "and lower"
 msgstr "i niže"
 
-#: src/searches/SavedSearchDialog.vala:501
+#: src/searches/SavedSearchDialog.vala:495
 msgid "is after"
 msgstr "posle"
 
-#: src/searches/SavedSearchDialog.vala:502
+#: src/searches/SavedSearchDialog.vala:496
 msgid "is before"
 msgstr "pre"
 
-#: src/searches/SavedSearchDialog.vala:503
+#: src/searches/SavedSearchDialog.vala:497
 msgid "is between"
 msgstr "između"
 
-#: src/searches/SavedSearchDialog.vala:516
+#: src/searches/SavedSearchDialog.vala:510
 msgid "and"
 msgstr "i"
 
-#: src/searches/SavedSearchDialog.vala:697
+#: src/searches/SavedSearchDialog.vala:691
 msgid "Search"
 msgstr "Pretraga"
 
-#: src/searches/SavedSearchDialog.vala:702
+#: src/searches/SavedSearchDialog.vala:696
 msgid "Cancel"
 msgstr "Otkaži"
 
-#: src/searches/SavedSearchDialog.vala:703
+#: src/searches/SavedSearchDialog.vala:697
 msgid "OK"
 msgstr "U redu"
 
-#: src/searches/SavedSearchDialog.vala:721
+#: src/searches/SavedSearchDialog.vala:716
 msgid "any"
 msgstr "bilo koja"
 
-#: src/searches/SavedSearchDialog.vala:722
+#: src/searches/SavedSearchDialog.vala:717
 msgid "all"
 msgstr "sve"
 
-#: src/searches/SavedSearchDialog.vala:723
+#: src/searches/SavedSearchDialog.vala:718
 msgid "none"
 msgstr "ništa"
 
@@ -6315,8 +6108,8 @@ msgstr "Vrsta obeležja"
 msgid "Photo state"
 msgstr "Stanje fotografije"
 
-#. 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 "Ocena"
 
@@ -6324,45 +6117,60 @@ msgstr "Ocena"
 msgid "Date"
 msgstr "Datum"
 
-#: src/SearchFilter.vala:614 src/SearchFilter.vala:615
-msgid "Videos"
-msgstr "Snimci"
+#: src/SearchFilter.vala:815
+#| msgid "Rating"
+msgid "★+ Rating"
+msgstr "★+ ocena"
 
-#: src/SearchFilter.vala:620
-msgid "RAW Photos"
-msgstr "Sirove fotografije"
+#: src/SearchFilter.vala:818
+#| msgid "Rating"
+msgid "★★+ Rating"
+msgstr "★★+ ocena"
 
-#: src/SearchFilter.vala:621
-msgid "RAW photos"
-msgstr "Sirove fotografije"
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr "★★★+ ocena"
+
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr "★★★★+ ocena"
+
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr "★★★★★+ ocena"
 
-#: src/SearchFilter.vala:1148
+#: src/SearchFilter.vala:1064
 #, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Greška učitavanja datoteke korisničkog sučelja „%s“: %s"
+#| msgid "Error loading UI file %s: %s"
+msgid "Error loading search bar UI: %s"
+msgstr "Greška učitavanja korisnič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:1159
+#: src/SearchFilter.vala:1073
 msgid "Close"
 msgstr "Zatvori"
 
 #. Type label and toggles
-#: src/SearchFilter.vala:1165
+#: src/SearchFilter.vala:1079
 msgid "Type"
 msgstr "Vrsta"
 
-#: src/SearchFilter.vala:1211
+#: src/SearchFilter.vala:1086
+msgid "Videos"
+msgstr "Snimci"
+
+#: src/SearchFilter.vala:1089
+msgid "RAW Photos"
+msgstr "Sirove fotografije"
+
+#: src/SearchFilter.vala:1125
 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/sidebar/Tree.vala:203
-msgid "New _Tag..."
-msgstr "Nova _oznaka..."
-
 #: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
 msgid "Settings"
 msgstr "Podešavanja"
@@ -6435,198 +6243,634 @@ msgid "untitled"
 msgstr "bezimeno"
 
 #. multiple videos
-#: src/VideoSupport.vala:490
+#: src/VideoSupport.vala:523
 msgid "Export Videos"
 msgstr "Izvezite snimke"
 
-#: ui/set_background_dialog.ui:15
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr "Okini _zastavicu"
+
+#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
+#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+msgid "_Developer"
+msgstr "_Razvijač"
+
+#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
+msgid "Open with E_xternal Editor"
+msgstr "_Otvori spoljnim uređivačem"
+
+#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
+#: ui/photo_context.ui:124 ui/tags.ui:379
+msgid "View Eve_nt for Photo"
+msgstr "Pregledaj _događaj za fotografiju"
+
+#: ui/direct.ui:5 ui/events_directory.ui:5 ui/event.ui:5 ui/import_queue.ui:5
+#: ui/import.ui:5 ui/media.ui:5 ui/offline.ui:5 ui/photo.ui:5 ui/tags.ui:5
+#: ui/top.ui:5 ui/trash.ui:5
+msgid "_File"
+msgstr "_Datoteka"
+
+#: ui/direct.ui:13
+msgid "Save _As…"
+msgstr "Sačuvaj _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/top.ui:15 ui/trash.ui:87
+msgid "_View"
+msgstr "_Pregled"
+
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "Ispuni _stranicu"
+
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "Uvećaj na _100%"
+
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "Uvećaj na _200%"
+
+#: ui/direct.ui:98 ui/photo.ui:187 ui/top.ui:20
+msgid "_Photo"
+msgstr "_Fotografija"
+
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "_Prethodna fotografija"
+
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "_Sledeća fotografija"
+
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "_Alati"
+
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188
+#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "_Često postaljana 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
+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…"
+msgstr "_Uvezi iz fascikle…"
+
+#: 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 "Uvezi iz _programa…"
+
+#: 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 "Isprazni _korpu"
+
+#: ui/events_directory.ui:47 ui/event.ui:62 ui/import.ui:55 ui/media.ui:62
+#: ui/offline.ui:47 ui/tags.ui:62 ui/trash.ui:52
+msgid "_Find"
+msgstr "_Nađi"
+
+#: 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 _sačuvana 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
+msgid "_Basic Information"
+msgstr "_Osnovni podaci"
+
+#: 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 "_Dodatni podaci"
+
+#: 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 "_Traka 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
+msgid "S_idebar"
+msgstr "_Bočna površ"
+
+#: 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 "_Traka alata"
+
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Napomene"
+
+#: 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 "Poređaj _događaje"
+
+#: 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 "_Rastuće"
+
+#: 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 "_Opadajuće"
+
+#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
+#: ui/top.ui:30
+msgid "Even_ts"
+msgstr "_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:402 ui/media.ui:139 ui/media.ui:385
+#: ui/photo.ui:369 ui/tags.ui:139 ui/tags.ui:385 ui/top.ui:35
+msgid "Ta_gs"
+msgstr "_Oznake"
+
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Poređaj _fotografije"
+
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "Prema _nazivu"
+
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "Prema nazivu _datoteke"
+
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "Prema _datumu izlaganja"
+
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Prema _oceni"
+
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr "_Opadajuće"
+
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275 ui/top.ui:25
+msgid "_Photos"
+msgstr "_Fotografije"
+
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "_Zaustavi uvoz"
+
+#: ui/set_background_dialog.ui:9
 msgid "Set as Desktop Background"
 msgstr "Postavi za pozadinu"
 
-#: ui/set_background_dialog.ui:77 ui/set_background_slideshow_dialog.ui:132
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
 msgid "Use for Desktop"
 msgstr "Koristi za radnu površ"
 
-#: ui/set_background_dialog.ui:93 ui/set_background_slideshow_dialog.ui:148
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
 msgid "Use for Lock Screen"
 msgstr "Koristi za ekran zaključavanja"
 
-#: ui/set_background_slideshow_dialog.ui:15
+#: ui/set_background_slideshow_dialog.ui:16
 msgid "Set as Desktop Slideshow"
 msgstr "Postavi kao smenjivu pozadinu radne površi"
 
-#: ui/set_background_slideshow_dialog.ui:33
+#: ui/set_background_slideshow_dialog.ui:56
+msgid "Generate desktop background slideshow"
+msgstr "Napravi smenjivu pozadinu radne površi"
+
+#: ui/set_background_slideshow_dialog.ui:82
 msgid "Show each photo for"
 msgstr "Prikaži svaku fotografiju za"
 
-#: ui/set_background_slideshow_dialog.ui:45
+#: ui/set_background_slideshow_dialog.ui:94
 msgid "period of time"
 msgstr "vreme"
 
-#: ui/set_background_slideshow_dialog.ui:94
-msgid "Generate desktop background slideshow"
-msgstr "Napravi smenjivu pozadinu radne površi"
-
-#: ui/set_background_slideshow_dialog.ui:115
+#: ui/set_background_slideshow_dialog.ui:116
 msgid "How long each photo is shown on the desktop background"
 msgstr ""
 "Koliko dugo će svaka fotografija biti prikazana kao pozadina radne površi"
 
-#: ui/shotwell.ui:23
-msgid "_Name of search:"
-msgstr "_Naziv pretrage:"
+#: ui/shotwell.ui:65
+msgid "white"
+msgstr "bela"
 
-#: ui/shotwell.ui:81
-msgid "_Match"
-msgstr "_Poklapa"
+#: ui/shotwell.ui:92
+msgid "black"
+msgstr "crna"
 
-#: ui/shotwell.ui:108
-msgid "of the following:"
-msgstr "od sledećeg:"
+#: 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/shotwell.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Prati prispeće novih datoteka u fascikli fototeke"
+
+#: ui/shotwell.ui:209
+msgid "Importing"
+msgstr "Uvozim"
+
+#: ui/shotwell.ui:226
+msgid "_Directory structure:"
+msgstr "Struktura _direktorijuma:"
+
+#: ui/shotwell.ui:240
+msgid "Example:"
+msgstr "Primer:"
+
+#: ui/shotwell.ui:249
+msgid "R_ename imported files to lowercase"
+msgstr "_Promeni naziv uvezenih datoteka na mala slova"
+
+#: ui/shotwell.ui:271
+msgid "Metadata"
+msgstr "Metapodaci"
+
+#: 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/shotwell.ui:306
+msgid "RAW Developer"
+msgstr "Sirovi razvijač"
+
+#: ui/shotwell.ui:323
+msgid "De_fault:"
+msgstr "_Osnovno:"
+
+#: ui/shotwell.ui:377
+msgid "_Pattern:"
+msgstr "_Šablon:"
+
+#: ui/shotwell.ui:439
+msgid "E_xternal photo editor:"
+msgstr "_Spoljni uređivač fotografija:"
+
+#: ui/shotwell.ui:456
+msgid "External _RAW editor:"
+msgstr "Spoljni _sirovi uređivač:"
+
+#: ui/shotwell.ui:517
+msgid "External Editors"
+msgstr "Spoljni uređivači"
 
-#: ui/shotwell.ui:195
+#: ui/shotwell.ui:542
+msgid "Plugins"
+msgstr "Priključci"
+
+#: ui/shotwell.ui:583
 msgid "<b>Printed Image Size</b>"
 msgstr "<b>Veličina odštampane fotografije</b>"
 
-#: ui/shotwell.ui:212
+#: ui/shotwell.ui:600
 msgid "Use a _standard size:"
 msgstr "Koristi _uobičajenu veličinu:"
 
-#: ui/shotwell.ui:255
+#: ui/shotwell.ui:643
 msgid "Use a c_ustom size:"
 msgstr "Koristi _proizvoljnu veličinu:"
 
-#: ui/shotwell.ui:345
+#: ui/shotwell.ui:731
 msgid "_Match photo aspect ratio"
 msgstr "_Odgovara srazmeri fotografije"
 
-#: ui/shotwell.ui:369
+#: ui/shotwell.ui:755
 msgid "_Autosize:"
 msgstr "_Samostalna veličina:"
 
-#: ui/shotwell.ui:409
+#: ui/shotwell.ui:795
 msgid "<b>Titles</b>"
 msgstr "<b>Naslovi</b>"
 
-#: ui/shotwell.ui:426
+#: ui/shotwell.ui:812
 msgid "Print image _title"
 msgstr "Štampaj _nazive fotografija"
 
-#: ui/shotwell.ui:470
+#: ui/shotwell.ui:855
 msgid "<b>Pixel Resolution</b>"
 msgstr "<b>Rezolucija u tačkicama</b>"
 
-#: ui/shotwell.ui:490
+#: ui/shotwell.ui:875
 msgid "_Output photo at:"
 msgstr "_Štampaj fotografije u:"
 
-#: ui/shotwell.ui:525
+#: ui/shotwell.ui:909
 msgid "pixels per inch"
 msgstr "tačkica po inču"
 
-#: ui/shotwell.ui:559
+#: ui/shotwell.ui:949
+msgid "_Name of search:"
+msgstr "_Naziv pretrage:"
+
+#: ui/shotwell.ui:1003
+msgid "_Match"
+msgstr "_Poklapa"
+
+#: ui/shotwell.ui:1030
+msgid "of the following:"
+msgstr "od sledećeg:"
+
+#: ui/shotwell.ui:1111
 msgid "label"
 msgstr "natpis"
 
-#: ui/shotwell.ui:681
-msgid "Shotwell Preferences"
-msgstr "Postavke Foto-bunara"
+#: ui/shotwell.ui:1262
+msgid "_Delay:"
+msgstr "_Zastoj:"
 
-#: ui/shotwell.ui:730
-msgid "white"
-msgstr "bela"
+#: ui/shotwell.ui:1276
+msgid "_Transition effect:"
+msgstr "_Dejstvo prelaza:"
 
-#: ui/shotwell.ui:757
-msgid "black"
-msgstr "crna"
+#: ui/shotwell.ui:1290
+msgid "Transition d_elay:"
+msgstr "_Zastoj prelaza:"
 
-#: ui/shotwell.ui:805
-msgid "_Watch library directory for new files"
-msgstr "_Prati prispeće novih datoteka u fascikli fototeke"
+#: ui/shotwell.ui:1300
+msgid "Show t_itle"
+msgstr "Prikaži _naslov"
 
-#: ui/shotwell.ui:834
-msgid "Metadata"
-msgstr "Metapodaci"
+#: ui/shotwell.ui:1375 ui/shotwell.ui:1386
+msgid "seconds"
+msgstr "sekunde"
 
-#: ui/shotwell.ui:854
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Upisuj oznake, naslove i ostale _metapodatke u datoteke fotografija"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "Nova _oznaka…"
 
-#: ui/shotwell.ui:880
-msgid "Display"
-msgstr "Prikaz"
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Obrišite sve fotografije iz korpe"
 
-#: ui/shotwell.ui:901
-msgid "_Import photos to:"
-msgstr "_Uvezi fotografije u:"
+#~ msgid "L_ist album in public gallery"
+#~ msgstr "_Ispiši album u javnoj galeriji"
 
-#: ui/shotwell.ui:924
-msgid "_Background:"
-msgstr "_Pozadina:"
+#~| msgid "Videos will appear in '%s'"
+#~ msgid "Videos will appear in “%s”"
+#~ msgstr "Video snimci će se pojaviti u „%s“"
 
-#: ui/shotwell.ui:947
-msgid "Importing"
-msgstr "Uvozim"
+#~ msgid "Login"
+#~ msgstr "Prijavi me"
 
-#: ui/shotwell.ui:970
-msgid "_Directory structure:"
-msgstr "Struktura _direktorijuma:"
+#~ msgid "Testing connection to Facebook..."
+#~ msgstr "Isprobavam vezu sa Fejsbukom..."
 
-#: ui/shotwell.ui:1009
-msgid "_Pattern:"
-msgstr "_Šablon:"
+#~ 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 ""
+#~ "Već ste se prijavljivali i odjavljivali sa Flikra tokom ove sesije Foto-"
+#~ "bunara.\n"
+#~ "Da nastavite objavljivanje na Flikr, ponovo pokrenite Foto-bunar i zatim "
+#~ "pokušajte ponovo."
 
-#: ui/shotwell.ui:1091
-msgid "Example:"
-msgstr "Primer:"
+#~ msgid "_Contents"
+#~ msgstr "_Sadržaj"
 
-#: ui/shotwell.ui:1108
-msgid "R_ename imported files to lowercase"
-msgstr "_Promeni naziv uvezenih datoteka na mala slova"
+#~ msgid "Display the title of each photo"
+#~ msgstr "Prikažite nazive svake fotografije"
 
-#: ui/shotwell.ui:1137
-msgid "RAW Developer"
-msgstr "Sirovi razvijač"
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "Uvezite izabrane fotografije u vašu fototeku"
 
-#: ui/shotwell.ui:1172
-msgid "De_fault:"
-msgstr "_Osnovno:"
+#~ msgid "Import all the photos into your library"
+#~ msgstr "Uvezite sve fotografije u vašu fototeku"
 
-#: ui/shotwell.ui:1226
-msgid "E_xternal photo editor:"
-msgstr "_Spoljni uređivač fotografija:"
+#~ msgid "Play a slideshow"
+#~ msgstr "Pokrenite pokretni prikaz"
 
-#: ui/shotwell.ui:1242
-msgid "External _RAW editor:"
-msgstr "Spoljni _sirovi uređivač:"
+#~ msgid "Save Details..."
+#~ msgstr "Sačuvaj pojedinosti..."
 
-#: ui/shotwell.ui:1307
-msgid "External Editors"
-msgstr "Spoljni uređivači"
+#~ msgid "_Modify original photo files"
+#~ msgstr "_Izmeni izvorne fotografije"
 
-#: ui/shotwell.ui:1334
-msgid "Plugins"
-msgstr "Priključci"
+#~ msgid "_Modify original files"
+#~ msgstr "_Izmeni izvorne datoteke"
 
-#: ui/shotwell.ui:1400
-msgid "_Delay:"
-msgstr "_Zastoj:"
+#~ msgid "Save photo"
+#~ msgstr "Sačuvajte fotografiju"
 
-#: ui/shotwell.ui:1416
-msgid "_Transition effect:"
-msgstr "_Dejstvo prelaza:"
+#~ msgid "Save _As..."
+#~ msgstr "Sačuvaj _kao..."
 
-#: ui/shotwell.ui:1432
-msgid "Transition d_elay:"
-msgstr "_Zastoj prelaza:"
+#~ msgid "Save photo with a different name"
+#~ msgstr "Sačuvajte fotografiju pod drugim nazivom"
 
-#: ui/shotwell.ui:1444
-msgid "Show t_itle"
-msgstr "Prikaži _naslov"
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr "Štampajte fotografiju na štampaču koji je povezan na ovaj računar"
 
-#: ui/shotwell.ui:1534 ui/shotwell.ui:1547
-msgid "seconds"
-msgstr "sekunde"
+#~ msgid "Previous Photo"
+#~ msgstr "Prethodna fotografija"
+
+#~ msgid "Next Photo"
+#~ msgstr "Sledeća fotografija"
+
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "Uvećajte prikaz fotografije"
+
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "Umanjite prikaz fotografije"
+
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "Uvećajte fotografiju da ispuni ekran"
+
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "Prikažite fotografiju u punoj veličini"
+
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "Prikažite fotografiju uvećanu dva puta"
+
+#~ msgid "Display the comment of each event"
+#~ msgstr "Prikažite napomenu svakog događaja"
+
+#~ msgid "Importing..."
+#~ msgstr "Uvozim..."
+
+#~ msgid "Stop importing photos"
+#~ msgstr "Prekinite uvoz fotografija"
+
+#~ msgid "Preparing to import..."
+#~ msgstr "Pripremam fotografije za uvoz..."
+
+#~ msgid "_Import From Folder..."
+#~ msgstr "_Uvezi iz fascikle..."
+
+#~ msgid "Import photos from disk to library"
+#~ msgstr "Uvezite fotografije sa diska u fototeku"
+
+#~ msgid "Import From _Application..."
+#~ msgstr "Uvezi iz _programa..."
+
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "Pronađite fotografije i snimke prema merilu pretrage"
+
+#~ msgid "Display basic information for the selection"
+#~ msgstr "Prikažite osnovne podatke za izabranu fotografiju"
+
+#~ msgid "Display extended information for the selection"
+#~ msgstr "Prikažite dodatne podatke za izabranu fotografiju"
+
+#~ msgid "Display the search bar"
+#~ msgstr "Prikažite traku pretrage"
+
+#~ msgid "Display the sidebar"
+#~ msgstr "Prikažite bočnu površ"
+
+#~| msgid "Display the sidebar"
+#~ msgid "Display the tool bar"
+#~ msgstr "Prikažite traku alata"
+
+#~ msgid "Sort photos in an ascending order"
+#~ msgstr "Poređajte fotografije rastućim redom"
+
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "Poređajte fotografije opadajućim redom"
+
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "Povećajte minijature"
+
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "Smanjite minijature"
+
+#~ msgid "_Play Video"
+#~ msgstr "_Pusti snimak"
+
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr "Otvorite izabrani snimak u sistemskom programu za puštanje"
+
+#~ msgid "Display the comment of each photo"
+#~ msgstr "Prikažite napomene svake fotografije"
+
+#~ msgid "Display each photo's tags"
+#~ msgstr "Prikažite oznake fotografija"
+
+#~ msgid "Sort photos by title"
+#~ msgstr "Poređajte fotografije prema nazivu"
+
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "Poređajte fotografije prema datumu izlaganja"
+
+#~ msgid "Sort photos by rating"
+#~ msgstr "Poređajte fotografije prema oceni"
+
+#~ msgid "Sort photos by filename"
+#~ msgstr "Poređajte fotografije prema nazivu datoteke"
+
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "Izabrani snimci su uspešno objavljeni."
+
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "Izabrane fotografije su uspešno objavljene."
+
+#~ msgid "Set as _Desktop Slideshow..."
+#~ msgstr "Postavi kao smenjivu _pozadinu..."
+
+#~ msgid "Re_name Event..."
+#~ msgstr "_Preimenuj događaj..."
+
+#~ msgid "_Export..."
+#~ msgstr "_Izvezi..."
+
+#~ msgid "_Print..."
+#~ msgstr "_Štampaj..."
+
+#~ msgid "Pu_blish..."
+#~ msgstr "_Objavi..."
+
+#~ msgid "Edit _Title..."
+#~ msgstr "Izmeni _naslov..."
+
+#~ msgid "Edit _Comment..."
+#~ msgstr "Izmeni _napomenu..."
+
+#~ msgid "Edit Event _Comment..."
+#~ msgstr "Izmeni _napomenu događaja..."
+
+#~ msgid "_Adjust Date and Time..."
+#~ msgstr "_Podesi datum i vreme..."
+
+#~ msgid "Add _Tags..."
+#~ msgstr "Dodaj _oznake..."
+
+#~ msgid "_Add Tags..."
+#~ msgstr "_Dodaj oznake..."
+
+#~ msgid "Send _To..."
+#~ msgstr "Pošalji _u..."
+
+#~ msgid "Send T_o..."
+#~ msgstr "Pošalji _u..."
+
+#~ msgid "_Find..."
+#~ msgstr "_Nađi..."
+
+#~ msgid "Modif_y Tags..."
+#~ msgstr "Izmeni _oznake..."
+
+#~ msgid "Tag Photos as \"%s\""
+#~ msgstr "Označi fotografije kao „%s“"
+
+#~ msgid "Tag the selected photos as \"%s\""
+#~ msgstr "Označi izabrane fotografije kao „%s“"
+
+#~ msgid "Remove Tag \"%s\" From _Photos"
+#~ msgstr "Ukloni oznaku „%s“ sa _fotografija"
+
+#~ msgid "Remove Tag \"%s\" From Photos"
+#~ msgstr "Uklonite oznaku „%s“ sa fotografija"
+
+#~ msgid "_Edit..."
+#~ msgstr "_Izmeni..."
+
+#~ 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"
diff --git a/po/sv.gmo b/po/sv.gmo
index d06c023..0ae1e31 100644
--- a/po/sv.gmo
+++ b/po/sv.gmo
diff --git a/po/sv.po b/po/sv.po
index 066765c..287aea4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -14,26 +14,1418 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: shotwell\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-05-29 14:27+0000\n"
-"PO-Revision-Date: 2016-05-31 20:46+0200\n"
-"Last-Translator: Anders Jonsson <anders.jonsson@norsjovallen.se>\n"
+"POT-Creation-Date: 2017-03-13 18:35+0000\n"
+"PO-Revision-Date: 2017-03-14 14:39+0100\n"
+"Last-Translator: Josef Andersson <l10nl18nsweja@gmail.com>\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.7.1\n"
+"X-Generator: Poedit 1.8.11\n"
 "X-Project-Style: gnome\n"
 
-#: ../plugins/common/RESTSupport.vala:425
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:968
-msgid "A temporary file needed for publishing is unavailable"
-msgstr "En temporärfil som krävs för publicering är inte tillgänglig"
+#: 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:354
+#: ui/event.ui:522 ui/media.ui:354 ui/photo_context.ui:91 ui/photo.ui:344
+#: ui/tags.ui:354
+msgid "Shotwell"
+msgstr "Shotwell"
+
+#: misc/shotwell.appdata.xml.in:9
+msgid "Popular photo manager"
+msgstr "Populär bildhanterare"
+
+#: 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 är en lättanvänd, snabb bildorganiserare designad för GNOME-"
+"skrivbordet. Det låter dig importera bilder från din kamera eller disk, "
+"organisera dem efter datum och ämne samt betyg. Det erbjuder grundläggande "
+"bildredigering, beskärning, röda ögon-korrigering, färgjusteringar och "
+"verktyg för att räta ut bilder. Shotwells icke-destruktiva bildredigerare "
+"ändrar inte dina huvudbilder och gör det enkelt att experimentera och rätta "
+"fel."
+
+#: 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 ""
+"Shotwell kan, om så önskas, skicka upp dina bilder till olika webbplatser "
+"som Facebook, Flickr, Picasa (Google Plus) och fler."
+
+#: misc/shotwell.appdata.xml.in:22
+msgid "Shotwell supports JPEG, PNG, TIFF, and a variety of RAW file formats."
+msgstr "Shotwell stödjer JPEG, PNG, TIFF och flera varianter av RAW-filformat."
+
+#: misc/shotwell.appdata.xml.in:52
+msgid "The Shotwell developers"
+msgstr "Shotwells utvecklare"
+
+#: misc/shotwell.desktop.in.in:5 src/Resources.vala:17
+msgid "Photo Manager"
+msgstr "Bildhanterare"
+
+#: misc/shotwell.desktop.in.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
+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;kamera;kameror;beskär;redigera;förbättra;exportera;galleri;bild;bilder;"
+"importera;organisera;bild;foto;bilder;fotografier;skriv ut;publicera;rotera;"
+"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
+msgid "shotwell"
+msgstr "shotwell"
+
+#: misc/shotwell-viewer.desktop.in.in:4
+msgid "Shotwell Viewer"
+msgstr "Shotwell bildvisare"
+
+#: misc/shotwell-viewer.desktop.in.in:5 src/Resources.vala:18
+msgid "Photo Viewer"
+msgstr "Bildvisare"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:6
+msgid "authentication token"
+msgstr "autentiseringstoken"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:7
+msgid "Yandex-Fotki authentication token, if logged in."
+msgstr "Yandex-Fotki-autentiseringstoken om inloggad."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:14
+msgid "Token"
+msgstr "Token"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:15
+msgid "The token to access tumblr"
+msgstr "Token för att komma åt tumblr"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:20
+msgid "Secret token"
+msgstr "Hemlig token"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:21
+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
+msgid "default size"
+msgstr "standardstorlek"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:27
+msgid ""
+"A numeric code representing the default size for photos uploaded to Tumblr"
+msgstr ""
+"En sifferkod representerande standardstorlek för bilder skickade till Tumblr"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:32
+msgid "default blog"
+msgstr "standardblogg"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:33
+msgid "The name of the default blog of the user, if any"
+msgstr "Namnet på standardbloggen för användaren, om någon"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:40
+msgid "Rajce URL"
+msgstr "Rajce-URL"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:41
+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
+msgid "username"
+msgstr "användarnamn"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:47
+msgid "Rajce username, if logged in."
+msgstr "Rajce-användarnamn om inloggad."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:52
+msgid "token"
+msgstr "token"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:53
+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
+msgid "last category"
+msgstr "senaste kategori"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:59
+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
+msgid "last photo size"
+msgstr "senaste bildstorlek"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:65
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Rajce."
+msgstr ""
+"En sifferkod representerande den senaste förinställningen för bildstorlek "
+"använd vid publicering till Rajce."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:70
+msgid "remember"
+msgstr "kom ihåg"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:71
+msgid "If true, remember last login."
+msgstr "Om true, dölj den senast skapade inloggningen."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:76
+msgid "hide album"
+msgstr "göm album"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:77
+msgid "If true, hide the newly created Rajce album."
+msgstr "Om true, dölj det senast skapade Rajce-albumet."
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:82
+msgid "open album in web browser"
+msgstr "öppna album i webbläsare"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:83
+msgid ""
+"If true, open target album in the web browser just after uploading photos"
+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
+msgid "remove sensitive info from uploads"
+msgstr "ta bort känslig information från sändningar"
+
+#: misc/org.yorba.shotwell-extras.gschema.xml:89
+msgid ""
+"Whether images being uploaded to Rajce should have their metadata removed "
+"first"
+msgstr "Huruvida bilder uppskickade till Rajce ska rensas på metadata först"
+
+#: misc/org.yorba.shotwell.gschema.xml:23
+msgid "display basic properties"
+msgstr "visa grundläggande egenskaper"
+
+#: misc/org.yorba.shotwell.gschema.xml:24
+msgid "True if the basic properties pane is to be displayed, false otherwise."
+msgstr ""
+"True om panelen för de grundläggande egenskaperna ska visas, annars false."
+
+#: misc/org.yorba.shotwell.gschema.xml:29
+msgid "display extended properties"
+msgstr "visa utökade egenskaper"
+
+#: misc/org.yorba.shotwell.gschema.xml:30
+msgid ""
+"True if the extended properties window is to be displayed, false otherwise."
+msgstr "True om panelen för de utökade egenskaperna ska visas, annars false."
+
+#: misc/org.yorba.shotwell.gschema.xml:35
+msgid "display sidebar"
+msgstr "visa sidopanelen"
+
+#: misc/org.yorba.shotwell.gschema.xml:36
+msgid "True if the sidebar is to be displayed, false otherwise."
+msgstr "True om sidopanelen ska visas, annars false."
+
+#: misc/org.yorba.shotwell.gschema.xml:41
+msgid "display toolbar"
+msgstr "visa verktygsfältet"
+
+#: misc/org.yorba.shotwell.gschema.xml:42
+msgid "True if the bottom toolbar is to be displayed, false otherwise."
+msgstr "True om det nedre verktygsfältet ska visas, annars false."
+
+#: misc/org.yorba.shotwell.gschema.xml:47
+msgid "display search bar"
+msgstr "visa sökfältet"
+
+#: misc/org.yorba.shotwell.gschema.xml:48
+msgid "True if the Search/Filter Toolbar is to be displayed, false otherwise."
+msgstr "True om sök-/filterverktygsfältet ska visas, annars false."
+
+#: misc/org.yorba.shotwell.gschema.xml:53
+msgid "display photo titles"
+msgstr "visa bildtitlar"
+
+#: misc/org.yorba.shotwell.gschema.xml:54
+msgid ""
+"True if photo titles are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+"True om bildtitlar ska visas under miniatyrbilder i samlingsvyerna, annars "
+"false."
+
+#: misc/org.yorba.shotwell.gschema.xml:59
+msgid "display photo comments"
+msgstr "visa bildkommentarer"
+
+#: misc/org.yorba.shotwell.gschema.xml:60
+msgid ""
+"True if photo comments are to be displayed beneath thumbnails in collection "
+"views, false otherwise."
+msgstr ""
+"True om bildkommentarer ska visas under miniatyrbilder i samlingsvyerna, "
+"annars false."
+
+#: misc/org.yorba.shotwell.gschema.xml:65
+msgid "display event comments"
+msgstr "visa händelsekommentarer"
+
+#: misc/org.yorba.shotwell.gschema.xml:66
+msgid ""
+"True if event comments are to be displayed beneath thumbnails in event "
+"views, false otherwise."
+msgstr ""
+"True om händelsekommentarer ska visas under miniatyrbilder i samlingsvyerna, "
+"annars false."
+
+#: misc/org.yorba.shotwell.gschema.xml:71
+msgid "display photo tags"
+msgstr "visa bildtaggar"
+
+#: misc/org.yorba.shotwell.gschema.xml:72
+msgid ""
+"True if photo tags are to be listed beneath thumbnails in collection views, "
+"false otherwise."
+msgstr ""
+"True om bildtaggar ska visas under miniatyrbilder i samlingsvyerna, annars "
+"false."
+
+#: misc/org.yorba.shotwell.gschema.xml:77
+msgid "display photo ratings"
+msgstr "visa bildbetyg"
+
+#: misc/org.yorba.shotwell.gschema.xml:78
+msgid ""
+"True if a photo’s rating should be displayed as overlaid trinket, false "
+"otherwise."
+msgstr "True om ett bildbetyg ska visas som en överlagd fasad, annars false."
+
+#: misc/org.yorba.shotwell.gschema.xml:83
+msgid "rating filter level"
+msgstr "betygsfilternivå"
+
+#: 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 ""
+"Avgör hur bilder filtreras baserat på deras betyg: 1: Avvisad eller bättre, "
+"2: Ej betygsatt eller bättre, 3: Ett eller bättre, 4: Två eller bättre, 5: "
+"Tre eller bättre, 6: Fyra eller bättre, 7: Fem eller bättre."
+
+#: misc/org.yorba.shotwell.gschema.xml:89
+msgid "sort events ascending"
+msgstr "sortera händelser stigande"
+
+#: misc/org.yorba.shotwell.gschema.xml:90
+msgid "True if events should be sorted ascending, false if descending."
+msgstr "True om händelser ska sorteras stigande, false om fallande."
+
+#: misc/org.yorba.shotwell.gschema.xml:95
+msgid "sort library photos ascending"
+msgstr "sortera biblioteksbilder stigande"
+
+#: misc/org.yorba.shotwell.gschema.xml:96
+msgid "True if library photos should be sorted ascending, false if descending."
+msgstr "True om biblioteksbilder ska sorteras stigande, false om fallande."
+
+#: misc/org.yorba.shotwell.gschema.xml:101
+msgid "sort library photos criteria"
+msgstr "kriterier för att sortera biblioteksbilder"
 
-#: ../plugins/common/RESTSupport.vala:1145
+#: misc/org.yorba.shotwell.gschema.xml:102
+msgid ""
+"A numeric code that specifies the sort criteria for photos in library views."
+msgstr ""
+"En sifferkod som specificerar sökkriterier för bilder i biblioteksvyer."
+
+#: misc/org.yorba.shotwell.gschema.xml:107
+msgid "sort event photos ascending"
+msgstr "sortera händelsebilder stigande"
+
+#: misc/org.yorba.shotwell.gschema.xml:108
+msgid "True if event photos should be sorted ascending, false if descending."
+msgstr "True om händelsebilder ska sorteras stigande, false om fallande."
+
+#: misc/org.yorba.shotwell.gschema.xml:113
+msgid "sort event photos criteria"
+msgstr "sortera händelsebilder efter kriterier"
+
+#: misc/org.yorba.shotwell.gschema.xml:114
+msgid "Specifies the sort criteria for event photos."
+msgstr "Specificerar sorteringskriterier för händelsebilder."
+
+#: misc/org.yorba.shotwell.gschema.xml:119
+msgid "use 24 hour time"
+msgstr "använd 24-timmarstid"
+
+#: 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 ""
+"True om tid ska visas med en 24-timmars klocka, false om den ska visas med "
+"AM/PM-notation."
+
+#: misc/org.yorba.shotwell.gschema.xml:125
+msgid "keep relative time between photos"
+msgstr "behåll relativ tid mellan bilder"
+
+#: 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 ""
+"True om relativ tid ska bevaras vid justering av tid/datum för bilder. False "
+"om alla bilder sätts till samma tid."
+
+#: misc/org.yorba.shotwell.gschema.xml:131
+msgid "modify original photo files"
+msgstr "modifiera filerna för originalbilderna"
+
+#: 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 ""
+"True om originalfilerna ska ändras vid justering av tid/datum för bilder. "
+"False om ändringar endast ska ske i databasen."
+
+#: misc/org.yorba.shotwell.gschema.xml:137
+msgid "show welcome dialog on startup"
+msgstr "visa välkomstdialog vid start"
+
+#: 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 ""
+"True om en välkomstdialog ska visas vid uppstart. False om den inte ska "
+"visas."
+
+#: misc/org.yorba.shotwell.gschema.xml:143
+msgid "sidebar position"
+msgstr "position på sidopanel"
+
+#: misc/org.yorba.shotwell.gschema.xml:144
+msgid "The width, in pixels, of the sidebar"
+msgstr "Sidopanelens bredd i bildpunkter"
+
+#: misc/org.yorba.shotwell.gschema.xml:149
+msgid "photo thumbnail scale"
+msgstr "miniatyrbildsskala"
+
+#: misc/org.yorba.shotwell.gschema.xml:150
+msgid "The scale of photo thumbnails, ranging from 72 to 360."
+msgstr "Skalan för miniatyrbilder, i intervallet 72 till 360."
+
+#: misc/org.yorba.shotwell.gschema.xml:155
+msgid "pin toolbar state"
+msgstr "verktygsfältets fästtillstånd"
+
+#: misc/org.yorba.shotwell.gschema.xml:156
+msgid "Pin toolbar in fullscreen, or not."
+msgstr "Fäst verktygsfält vid helskärm, eller fäst inte."
+
+#: misc/org.yorba.shotwell.gschema.xml:161
+msgid "background color"
+msgstr "bakgrundsfärg"
+
+#: misc/org.yorba.shotwell.gschema.xml:162
+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 "Selection state of “hide photos” option"
+msgstr "Valtillstånd för alternativet ”dölj bilder”"
+
+#: misc/org.yorba.shotwell.gschema.xml:168
+msgid ""
+"Last used selection state of the “hide photos already imported” option in "
+"the import page."
+msgstr ""
+"Senast använda tillstånd för ”dölj bilder som redan importerats” på "
+"importsidan."
+
+#: misc/org.yorba.shotwell.gschema.xml:175
+msgid "delay"
+msgstr "fördröjning"
+
+#: misc/org.yorba.shotwell.gschema.xml:176
+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
+msgid "transition delay"
+msgstr "övergångsfördröjning"
+
+#: misc/org.yorba.shotwell.gschema.xml:182
+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
+msgid "transition effect id"
+msgstr "övergångseffekt-ID"
+
+#: 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 ""
+"Namnet på övergångseffekten som kommer att användas mellan bilder vid "
+"körning av ett bildspel"
+
+#: misc/org.yorba.shotwell.gschema.xml:193
+msgid "Show title"
+msgstr "Visa titel"
+
+#: misc/org.yorba.shotwell.gschema.xml:194
+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
+msgid "maximize library window"
+msgstr "maximera biblioteksfönstret"
+
+#: misc/org.yorba.shotwell.gschema.xml:202
+msgid "True if library application is maximized, false otherwise."
+msgstr "True om biblioteksprogrammet är maximerat, annars false."
+
+#: misc/org.yorba.shotwell.gschema.xml:207
+msgid "width of library window"
+msgstr "bredd på biblioteksfönstret"
+
+#: misc/org.yorba.shotwell.gschema.xml:208
+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
+msgid "height of library window"
+msgstr "höjden på biblioteksfönstret"
+
+#: misc/org.yorba.shotwell.gschema.xml:214
+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
+msgid "maximize direct-edit window"
+msgstr "maximera direktredigeringsfönstret"
+
+#: misc/org.yorba.shotwell.gschema.xml:220
+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
+msgid "width of direct-edit window"
+msgstr "bredd på direktredigeringsfönstret"
+
+#: misc/org.yorba.shotwell.gschema.xml:226
+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
+msgid "height of direct-edit window"
+msgstr "höjd på direktredigeringsfönstret"
+
+#: misc/org.yorba.shotwell.gschema.xml:232
+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
+msgid "sidebar divider position"
+msgstr "position på sidopanelens avdelare"
+
+#: 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 ""
+"Den senast lagrade positionen på avdelaren mellan sidopanelen och vyn i "
+"biblioteksprogrammets fönster."
+
+#: misc/org.yorba.shotwell.gschema.xml:245
+msgid "import directory"
+msgstr "importkatalog"
+
+#: misc/org.yorba.shotwell.gschema.xml:246
+msgid "Directory in which imported photo files are placed."
+msgstr "Katalog i vilken importerade bildfiler placeras."
+
+#: misc/org.yorba.shotwell.gschema.xml:251
+msgid "watch library directory for new files"
+msgstr "bevaka bibliotekskatalogen efter nya filer"
+
+#: misc/org.yorba.shotwell.gschema.xml:252
+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
+msgid "write metadata to master files"
+msgstr "skriver metadata till huvudfiler"
+
+#: misc/org.yorba.shotwell.gschema.xml:258
+msgid ""
+"If true, changes to metadata (tags, titles, etc.) are written to the master "
+"photo file."
+msgstr ""
+"Om true skrivs ändringar i metadata (taggar, titlar och så vidare) till "
+"huvudbildfilen."
+
+#: misc/org.yorba.shotwell.gschema.xml:263
+msgid "use lowercase filenames"
+msgstr "använd filnamn i gemener"
+
+#: misc/org.yorba.shotwell.gschema.xml:264
+msgid ""
+"If true, Shotwell will convert all filenames to lowercase when importing "
+"photo files"
+msgstr ""
+"Om true kommer Shotwell att konvertera alla filnamn till gemener vid import "
+"av bildfiler"
+
+#: misc/org.yorba.shotwell.gschema.xml:269
+msgid "directory pattern"
+msgstr "katalogmönster"
+
+#: 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 ""
+"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
+msgid "directory pattern custom"
+msgstr "anpassat katalogmönster"
+
+#: 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 ""
+"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
+msgid "RAW developer default"
+msgstr "standard-RAW-framkallare"
+
+#: misc/org.yorba.shotwell.gschema.xml:282
+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
+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
+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
+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
+msgid ""
+"A nonzero, positive integer representing the width part of the last custom "
+"crop ratio the user entered."
+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
+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
+msgid ""
+"A nonzero, positive integer representing the height part of the last custom "
+"crop ratio the user entered."
+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
+msgid "external photo editor"
+msgstr "extern bildredigerare"
+
+#: misc/org.yorba.shotwell.gschema.xml:308
+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
+msgid "external raw editor"
+msgstr "extern RAW-redigerare"
+
+#: misc/org.yorba.shotwell.gschema.xml:314
+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
+msgid "Setting in export dialog: how to trim images"
+msgstr "Inställning i exportdialogen: hur bilder justeras"
+
+#: misc/org.yorba.shotwell.gschema.xml:358
+msgid "export metadata"
+msgstr "exportera metadata"
+
+#: misc/org.yorba.shotwell.gschema.xml:359
+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
+msgid "format setting, special value"
+msgstr "formatinställning, specialvärde"
+
+#: misc/org.yorba.shotwell.gschema.xml:365
+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
+msgid "format setting, type value"
+msgstr "formatinställning, typvärde"
+
+#: misc/org.yorba.shotwell.gschema.xml:371
+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
+msgid "JPEG quality option"
+msgstr "Alternativ för JPEG-kvalitet"
+
+#: misc/org.yorba.shotwell.gschema.xml:377
+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
+msgid "maximal size of image"
+msgstr "maximal bildstorlek"
+
+#: misc/org.yorba.shotwell.gschema.xml:383
+msgid "Setting in export dialog: maximal size of image"
+msgstr "Inställning i exportdialogen: maximal bildstorlek"
+
+#: misc/org.yorba.shotwell.gschema.xml:390
+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
+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
+msgid "default publishing service"
+msgstr "standardtjänst för publicering"
+
+#: misc/org.yorba.shotwell.gschema.xml:410
+msgid "access token"
+msgstr "åtkomsttoken"
+
+#: misc/org.yorba.shotwell.gschema.xml:411
+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
+msgid "user i.d."
+msgstr "användar-id"
+
+#: misc/org.yorba.shotwell.gschema.xml:417
+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
+msgid "user name"
+msgstr "användarnamn"
+
+#: misc/org.yorba.shotwell.gschema.xml:423
+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
+msgid "default size code"
+msgstr "standardstorlekskod"
+
+#: misc/org.yorba.shotwell.gschema.xml:429
+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
+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
+msgid "OAuth Access Phase Token"
+msgstr "OAuth-token för åtkomstfas"
+
+#: misc/org.yorba.shotwell.gschema.xml:443
+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
+msgid "OAuth Access Phase Token Secret"
+msgstr "OAuth-hemlighet för åtkomstfas"
+
+#: 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 ""
+"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
+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
+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
+msgid "default visibility"
+msgstr "standardsynlighet"
+
+#: misc/org.yorba.shotwell.gschema.xml:467
+msgid ""
+"A numeric code representing the default visibility for photos published to "
+"Flickr"
+msgstr ""
+"En sifferkod representerande standardsynlighet för bilder publicerade till "
+"Flickr"
+
+#: misc/org.yorba.shotwell.gschema.xml:473
+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
+msgid "refresh token"
+msgstr "uppdatera token"
+
+#: 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 ""
+"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
+msgid ""
+"A numeric code representing the default size for photos uploaded to Picasa "
+"Web Albums"
+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
+msgid "last album"
+msgstr "senaste album"
+
+#: 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 "Namnet på senaste albumet användaren publicerade bilder till, om något"
+
+#: misc/org.yorba.shotwell.gschema.xml:499
+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
+msgid "Piwigo URL"
+msgstr "Piwigo-URL"
+
+#: misc/org.yorba.shotwell.gschema.xml:507
+msgid "URL of the Piwigo server."
+msgstr "URL till Piwigo-servern."
+
+#: misc/org.yorba.shotwell.gschema.xml:513
+msgid "Piwigo username, if logged in."
+msgstr "Piwigo-användarnamn om inloggad."
+
+#: misc/org.yorba.shotwell.gschema.xml:518
+msgid "password"
+msgstr "lösenord"
+
+#: misc/org.yorba.shotwell.gschema.xml:519
+msgid "Piwigo password, if logged in."
+msgstr "Piwigo-lösenord om inloggad."
+
+#: misc/org.yorba.shotwell.gschema.xml:524
+msgid "remember password"
+msgstr "kom ihåg lösenord"
+
+#: misc/org.yorba.shotwell.gschema.xml:525
+msgid "If true, remember the Piwigo password."
+msgstr "Om true, kom ihåg Piwigo-lösenordet."
+
+#: misc/org.yorba.shotwell.gschema.xml:531
+msgid "The last selected Piwigo category."
+msgstr "Senaste valda Piwigo-kategori."
+
+#: misc/org.yorba.shotwell.gschema.xml:536
+msgid "last permission level"
+msgstr "senaste rättighetsnivå"
+
+#: misc/org.yorba.shotwell.gschema.xml:537
+msgid "The last chosen Piwigo permission level."
+msgstr "Den senast valda Piwigo-rättighetsnivån."
+
+#: misc/org.yorba.shotwell.gschema.xml:543
+msgid ""
+"A numeric code representing the last photo size preset used when publishing "
+"to Piwigo."
+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
+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
+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
+msgid ""
+"Whether images being uploaded to Piwigo should have their comment set from "
+"the title if title is set and comment unset"
+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
+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
+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 ""
+"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
+msgid "Gallery3 username"
+msgstr "Gallery3-användarnamn"
+
+#: misc/org.yorba.shotwell.gschema.xml:574
+msgid "API key"
+msgstr "API-nyckel"
+
+#: misc/org.yorba.shotwell.gschema.xml:575
+msgid "Gallery3 API key"
+msgstr "Gallery3-API-nyckel"
+
+#: misc/org.yorba.shotwell.gschema.xml:580
+msgid "URL"
+msgstr "URL"
+
+#: misc/org.yorba.shotwell.gschema.xml:581
+msgid "Gallery3 site URL"
+msgstr "Gallery3-webbplats-URL"
+
+#: misc/org.yorba.shotwell.gschema.xml:593
+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
+msgid "scaling constraint of uploaded picture"
+msgstr "skalningsbegränsning för den uppskickade bilden"
+
+#: misc/org.yorba.shotwell.gschema.xml:599
+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
+msgid "pixels of the major axis uploaded picture"
+msgstr "bildpunkter för storaxeln på den uppskickade bilden"
+
+#: 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 ""
+"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
+msgid ""
+"The OAuth token used to refresh the YouTube session for the currently logged "
+"in user, if any."
+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
+msgid "last used import service"
+msgstr "senast använda importtjänst"
+
+#: misc/org.yorba.shotwell.gschema.xml:621
+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
+msgid "interpreter state cookie"
+msgstr "kaka för tillståndstolkare"
+
+#: misc/org.yorba.shotwell.gschema.xml:629
+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
+msgid "content layout mode"
+msgstr "Layoutläge för innehåll"
+
+#: misc/org.yorba.shotwell.gschema.xml:637
+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
+msgid "content ppi"
+msgstr "innehålls-ppi"
+
+#: misc/org.yorba.shotwell.gschema.xml:643
+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
+msgid "content width"
+msgstr "innehållsbredd"
+
+#: misc/org.yorba.shotwell.gschema.xml:649
+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
+msgid "content height"
+msgstr "innehållshöjd"
+
+#: misc/org.yorba.shotwell.gschema.xml:655
+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
+msgid "content units"
+msgstr "innehållenheter"
+
+#: misc/org.yorba.shotwell.gschema.xml:661
+msgid ""
+"A numeric code representing unit of measure (inches or centimeters) used "
+"when printing"
+msgstr ""
+"En sifferkod representerande mätningsenhet (tum eller centimeter) använd vid "
+"utskrift"
+
+#: misc/org.yorba.shotwell.gschema.xml:666
+msgid "images per page code"
+msgstr "bilder per sidkod"
+
+#: misc/org.yorba.shotwell.gschema.xml:667
+msgid ""
+"A numeric code representing the currently selected images per page mode used "
+"when printing"
+msgstr ""
+"En sifferkod representerande aktuellt valda bilder per sidoläge använt vid "
+"utskrift"
+
+#: misc/org.yorba.shotwell.gschema.xml:672
+msgid "size selection"
+msgstr "storleksval"
+
+#: misc/org.yorba.shotwell.gschema.xml:673
+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
+msgid "match aspect ratio"
+msgstr "matcha bildförhållande"
+
+#: misc/org.yorba.shotwell.gschema.xml:679
+msgid ""
+"Determines whether custom print sizes must match the aspect ratio of the "
+"original photo"
+msgstr ""
+"Avgör huruvida anpassade utskriftsstorlekar måste matcha bildförhållandet "
+"för originalbilden"
+
+#: misc/org.yorba.shotwell.gschema.xml:684
+msgid "print titles"
+msgstr "skriv ut titlar"
+
+#: 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 ""
+"True om en bildtitel ska skrivas ut när bilden skrivs ut, annars false."
+
+#: misc/org.yorba.shotwell.gschema.xml:690
+msgid "titles font"
+msgstr "titeltypsnitt"
+
+#: misc/org.yorba.shotwell.gschema.xml:691
+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
+msgid "enable facebook publishing plugin"
+msgstr "aktivera insticksmodulen för Facebook-publicering"
+
+#: misc/org.yorba.shotwell.gschema.xml:703
+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
+msgid "enable flickr publishing plugin"
+msgstr "aktivera insticksmodulen för Flickr-publicering"
+
+#: misc/org.yorba.shotwell.gschema.xml:709
+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
+msgid "enable picasa publishing plugin"
+msgstr "aktivera insticksmodulen för Picasa-publicering"
+
+#: misc/org.yorba.shotwell.gschema.xml:715
+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
+msgid "enable youtube publishing plugin"
+msgstr "aktivera insticksmodulen för YouTube-publicering"
+
+#: misc/org.yorba.shotwell.gschema.xml:721
+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
+msgid "enable piwigo publishing plugin"
+msgstr "aktivera insticksmodulen för Piwigo-publicering"
+
+#: misc/org.yorba.shotwell.gschema.xml:727
+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
+msgid "enable yandex publishing plugin"
+msgstr "aktivera insticksmodulen för Yandex-publicering"
+
+#: misc/org.yorba.shotwell.gschema.xml:733
+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
+msgid "enable tumblr publishing plugin"
+msgstr "aktivera insticksmodulen för Tumblr-publicering"
+
+#: misc/org.yorba.shotwell.gschema.xml:739
+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
+msgid "enable rajce publishing plugin"
+msgstr "aktivera insticksmodulen för Rajce-publicering"
+
+#: misc/org.yorba.shotwell.gschema.xml:745
+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
+msgid "enable gallery3 publishing plugin"
+msgstr "aktivera insticksmodulen för Gallery3-publicering"
+
+#: misc/org.yorba.shotwell.gschema.xml:751
+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
+msgid "enable F-Spot import plugin"
+msgstr "aktivera insticksmodulen för F-Spot-import"
+
+#: misc/org.yorba.shotwell.gschema.xml:757
+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
+msgid "enable slideshow crumble transition"
+msgstr "aktivera söndersmulningsövergång för bildspel"
+
+#: misc/org.yorba.shotwell.gschema.xml:763
+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
+msgid "enable slideshow fade transition"
+msgstr "aktivera uttoningsövergång för bildspel"
+
+#: misc/org.yorba.shotwell.gschema.xml:769
+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
+msgid "enable slideshow slide transition"
+msgstr "aktivera glidövergång för bildspel"
+
+#: misc/org.yorba.shotwell.gschema.xml:775
+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
+msgid "enable slideshow clock transition"
+msgstr "aktivera klockövergång för bildspel"
+
+#: misc/org.yorba.shotwell.gschema.xml:781
+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
+msgid "enable slideshow circle transition"
+msgstr "aktivera cirkelövergång för bildspel"
+
+#: misc/org.yorba.shotwell.gschema.xml:787
+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
+msgid "enable slideshow circles transition"
+msgstr "aktivera övergång med cirklar för bildspel"
+
+#: misc/org.yorba.shotwell.gschema.xml:793
+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
+msgid "enable slideshow blinds transition"
+msgstr "aktivera persiennövergång för bildspel"
+
+#: misc/org.yorba.shotwell.gschema.xml:799
+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
+msgid "enable slideshow squares transition"
+msgstr "aktivera rutövergång för bildspel"
+
+#: misc/org.yorba.shotwell.gschema.xml:805
+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
+msgid "enable slideshow stripes transition"
+msgstr "aktivera randövergång för bildspel"
+
+#: misc/org.yorba.shotwell.gschema.xml:811
+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
+msgid "enable slideshow chess transition"
+msgstr "aktivera schackövergång för bildspel"
+
+#: misc/org.yorba.shotwell.gschema.xml:817
+msgid ""
+"True if the Chess-Board slideshow transition plugin is enabled, false "
+"otherwise"
+msgstr ""
+"True om insticksmodulen Schackrutig för bildspelsövergångar är aktiverad, "
+"annars 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 ""
+"Du är för närvarande inte inloggad på Facebook.\n"
+"\n"
+"Om du ännu inte har ett Facebook-konto så kan du skapa ett under "
+"inloggningsprocessen. Under inloggningen kan Shotwell Connect fråga dig om "
+"behörighet att skicka upp bilder och publicera till din logg. Dessa "
+"behörigheter krävs för att Shotwell Connect ska fungera."
+
+#: 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 redan loggat in och ut från Facebook under denna Shotwell-session.\n"
+"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
+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 är för närvarande inte inloggad på Flickr.\n"
+"\n"
+"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
+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:481
+msgid "Verifying authorization…"
+msgstr "Verifierar behörighet…"
+
+#: plugins/authenticator/shotwell/GoogleAuthenticator.vala:118
 msgid ""
 "You have already logged in and out of a Google service during this Shotwell "
 "session.\n"
@@ -45,11 +1437,38 @@ 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/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 ""
+"Du är för närvarande inte inloggad på Picasa Web Albums.\n"
+"\n"
+"Klicka på Logga in för att logga in på Picasa Web Albums med din webbläsare. "
+"Du måste specifikt godkänna att Shotwell Connect kan länka till ditt Picasa "
+"Web Albums-konto."
+
+#: 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 ""
+"Du är för närvarande inte inloggad på YouTube.\n"
+"\n"
+"Du måste redan ha registrerat ett Google-konto och konfigurerat det för "
+"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/common/Resources.vala:12
 msgid "Visit the Shotwell home page"
 msgstr "Besök Shotwells webbplats"
 
-#: ../plugins/common/Resources.vala:28 ../src/AppWindow.vala:676
+#: plugins/common/Resources.vala:31 src/AppWindow.vala:602
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -58,17 +1477,81 @@ msgstr ""
 "Joachim Johansson <joachim.j@gmail.com>\n"
 "Josef Andersson <josef.andersson@fripost.org>"
 
-#: ../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
+#. 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 ""
+"⚫ Den här webbplatsen tillhandahöll identifiering som tillhör en annan "
+"webbplats."
+
+#. 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 ""
+"⚫ Den här webbplatsens information är för utdaterad för att lita på. "
+"Kontrollera datumet i din dators kalender."
+
+#. 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 ""
+"⚫ Den här webbplatsens identifiering utfärdades inte av en betrodd "
+"organisation."
+
+#. 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 ""
+"⚫ Den här webbplatsens identifiering kunde inte fortsätta. Den kan vara "
+"trasig."
+
+#. 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 ""
+"⚫ Den här webbplatsens identifiering har återkallats av den betrodda "
+"organisation som utfärdade den."
+
+#. 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 ""
+"⚫ Den här webbplatsens identifiering har ingen tillit eftersom den använder "
+"en väldigt svag kryptering."
+
+#. 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 ""
+"⚫ 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
+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:56
+#: plugins/shotwell-data-imports/FSpotImporter.vala:58
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
@@ -81,7 +1564,7 @@ msgstr ""
 "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:58
+#: plugins/shotwell-data-imports/FSpotImporter.vala:60
 msgid ""
 "Welcome to the F-Spot library import service.\n"
 "\n"
@@ -91,11 +1574,11 @@ msgstr ""
 "\n"
 "Välj en F-Spot-databasfil."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:60
+#: plugins/shotwell-data-imports/FSpotImporter.vala:62
 msgid "Manually select an F-Spot database file to import:"
 msgstr "Välj manuellt den F-Spot-databasfil du vill importera:"
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:62
+#: plugins/shotwell-data-imports/FSpotImporter.vala:64
 msgid ""
 "Cannot open the selected F-Spot database file: the file does not exist or is "
 "not an F-Spot database"
@@ -103,7 +1586,7 @@ 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:64
+#: plugins/shotwell-data-imports/FSpotImporter.vala:66
 msgid ""
 "Cannot open the selected F-Spot database file: this version of the F-Spot "
 "database is not supported by Shotwell"
@@ -111,14 +1594,14 @@ 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:66
+#: 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:68
+#: plugins/shotwell-data-imports/FSpotImporter.vala:70
 msgid ""
 "Cannot read the selected F-Spot database file: error while reading photos "
 "table"
@@ -126,7 +1609,7 @@ 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:70
+#: plugins/shotwell-data-imports/FSpotImporter.vala:72
 #, c-format
 msgid ""
 "Shotwell has found %d photos in the F-Spot library and is currently "
@@ -141,24 +1624,112 @@ msgstr ""
 "Du kan stänga den här dialogrutan. Importen kommer att fortsätta i "
 "bakgrunden."
 
-#: ../plugins/shotwell-data-imports/FSpotImporter.vala:84
+#: 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:422
+#: plugins/shotwell-data-imports/FSpotImporter.vala:424
 msgid "Preparing to import"
 msgstr "Förbereder import"
 
-#: ../plugins/shotwell-data-imports/shotwell-data-imports.vala:22
+#: plugins/shotwell-data-imports/shotwell-data-imports.vala:22
 msgid "Core Data Import Services"
 msgstr "Core Data-importtjänster"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:41
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:28
+msgid "_Gallery3 URL:"
+msgstr "_Gallery3 URL:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:55
+msgid "_User name:"
+msgstr "Användar_namn:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:68
+msgid "_Password:"
+msgstr "_Lösenord:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:108
+msgid "Go _Back"
+msgstr "_Bakåt"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:125
+#: ui/shotwell.ui:1105
+msgid "_Log in"
+msgstr "_Logga in"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:154
+msgid "API _Key:"
+msgstr "API-_nyckel:"
+
+#: plugins/shotwell-publishing-extras/gallery3_authentication_pane.ui:180
+msgid "or"
+msgstr "eller"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:34
+msgid "An _existing album"
+msgstr "Ett _befintligt album"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:60
+msgid "A _new album"
+msgstr "Ett _nytt album"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:86
+msgid "_Remove location, tag and camera-identifying data before uploading"
+msgstr ""
+"_Ta bort plats, tagg och identifieringsdata för kameran innan du skickar upp "
+"något"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:108
+msgid "Scaling constraint:"
+msgstr "Skalningsbegränsning:"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:124
+msgid "pixels"
+msgstr "bildpunkter"
+
+#: 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 "Ursprungsstorlek"
+
+#: plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.ui:159
+#: src/Dimensions.vala:20
+msgid "Width or height"
+msgstr "Bredd eller höjd"
+
+#: 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 "_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/youtube_publishing_options_pane.ui:115
+#: src/CollectionPage.vala:82 src/PhotoPage.vala:2469
+msgid "_Publish"
+msgstr "_Publicera"
+
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:41
 msgid "Gallery3 publishing module"
 msgstr "Publiceringsmodulen 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"
@@ -169,29 +1740,24 @@ msgstr ""
 "\n"
 "Du måste redan ha registrerat ett Gallery3-konto för att fortsätta."
 
-#: ../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 "Standardkatalog för 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"
 "Filen ”%s” kanske inte stöds eller kan vara för stor för denna instans av "
 "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."
@@ -199,11 +1765,11 @@ msgstr ""
 "\n"
 "Observera att Gallery3 endast stödjer samma videotyper som Flowplayer."
 
-#: ../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 ""
 "En fil som krävs för publiceringen saknas. Publiceringen till %s kan inte "
@@ -211,12 +1777,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 "Publicera till %s som %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."
@@ -224,7 +1790,7 @@ msgstr ""
 "Skriv in URL:en för din Gallery3-webbplats och användarnamnet och lösenordet "
 "(eller API-nyckeln) för ditt Gallery3-konto."
 
-#: ../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."
@@ -232,7 +1798,7 @@ msgstr ""
 "Användarnamnet och lösenordet eller API-nyckeln var felaktig. För att "
 "försöka igen, skriv in ditt användarnamn och lösenord på nytt nedan."
 
-#: ../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 "
@@ -242,171 +1808,157 @@ msgstr ""
 "Kontrollera att du angivit det korrekt och att du inte har några avslutande "
 "komponenter (exempelvis index.php)."
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1874
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1872
 msgid "Unrecognized User"
 msgstr "Okänd användare"
 
-#: ../plugins/shotwell-publishing-extras/GalleryConnector.vala:1879
+#: plugins/shotwell-publishing-extras/GalleryConnector.vala:1877
 msgid " Site Not Found"
 msgstr " Webbplatsen hittades inte"
 
-#: ../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 "Ett felmeddelande visades vid publiceringen till Rajce. Försök igen."
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:831
-msgid "Enter email and password associated with your Rajce account."
-msgstr "Fyll i användarnamn och lösenord för ditt Rajce-konto."
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:832
-msgid "Invalid email and/or password. Please try again"
-msgstr "Användarnamn och/eller lösenord ogiltigt. Försök igen"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:863
-msgid "Invalid User Email or Password"
-msgstr "Ogiltigt användare-post eller lösenord"
-
-#: ../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-extras/tumblr_authentication_pane.ui:42
 msgid "_Email address"
 msgstr "_E-postadress"
 
-#: ../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-extras/tumblr_authentication_pane.ui:82
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:119
 msgid "_Password"
 msgstr "_Lösenord"
 
-#: ../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 "_Kom ihåg"
 
-#: ../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"
+#: 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/RajcePublishing.vala:1006
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:5
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:104
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
+msgid "An _existing album:"
+msgstr "Ett _befintligt album:"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:123
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
+msgid "A _new album named:"
+msgstr "Ett _nytt album med namnet:"
+
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:141
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1006
 msgid "_Hide album"
 msgstr "_Göm album"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
+#: plugins/shotwell-publishing-extras/rajce_publishing_options_pane.ui:156
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
+msgid "Open target _album in browser"
+msgstr "Öppna _album i webbläsare"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:40
+msgid "Copyright © 2013 rajce.net"
+msgstr "Copyright © 2013 rajce.net"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:744
+msgid "An error message occurred when publishing to Rajce. Please try again."
+msgstr "Ett felmeddelande visades vid publiceringen till Rajce. Försök igen."
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:833
+msgid "Enter email and password associated with your Rajce account."
+msgstr "Fyll i användarnamn och lösenord för ditt Rajce-konto."
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:834
+msgid "Invalid email and/or password. Please try again"
+msgstr "Användarnamn och/eller lösenord ogiltigt. Försök igen"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:865
+msgid "Invalid User Email or Password"
+msgstr "Ogiltigt användare-post eller lösenord"
+
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1013
 #, c-format
 msgid "You are logged into Rajce as %s."
 msgstr "Du är inloggad på Rajce som %s."
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:670
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:1
+#: plugins/shotwell-publishing-extras/RajcePublishing.vala:1014
+#: plugins/shotwell-publishing/PicasaPublishing.vala:571
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:20
 msgid "Photos will appear in:"
 msgstr "Bilder kommer att visas i:"
 
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1015
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:3
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:1
-msgid "An _existing album:"
-msgstr "Ett _befintligt album:"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1016
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:4
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:2
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:3
-msgid "A _new album named:"
-msgstr "Ett _nytt album med namnet:"
-
-#: ../plugins/shotwell-publishing-extras/RajcePublishing.vala:1017
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:6
-msgid "Open target _album in browser"
-msgstr "Öppna _album i webbläsare"
+#: plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:31
+msgid "Shotwell Extra Publishing Services"
+msgstr "Shotwell extra publiceringstjänster"
 
-#: ../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 "_Publicera"
+#: plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.ui:44
+msgid "Blogs:"
+msgstr "Bloggar:"
 
-#: ../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 "_Logga ut"
+#: 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:35
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:36
 msgid "Copyright 2012 BJA Electronics"
 msgstr "Copyright 2012 BJA Electronics"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:104
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1232
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1246
-msgid "500 x 375 pixels"
-msgstr "500 x 375 bildpunkter"
+#: 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:105
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1233
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1247
-msgid "1024 x 768 pixels"
-msgstr "1024 x 768 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:106
-msgid "1280 x 853 pixels"
-msgstr "1280 x 853 bildpunkter"
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:107
+msgid "1280 × 853 pixels"
+msgstr "1280 × 853 bildpunkter"
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:310
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:320
+#: 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å autentiseringsförsöket med OAuth"
+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:558
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:559
 msgid ""
-"TumblrPublisher: start( ): can't start; this publisher is not restartable."
+"TumblrPublisher: start( ): can’t start; this publisher is not restartable."
 msgstr ""
-"TumblrPublisher: start( ): går inte att starta. Detta publiceringsverktyg "
+"TumblrPublisher: start( ): går inte att starta; detta publiceringsverktyg "
 "går inte att starta om."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:586
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
 msgid "Enter the username and password associated with your Tumblr account."
 msgstr "Fyll i användarnamn och lösenord för ditt Tumblr-konto."
 
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:587
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1000
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:588
+#: plugins/shotwell-publishing/PiwigoPublishing.vala: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:617
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1037
+#: 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:636
-#: ../plugins/shotwell-publishing-extras/TumblrPublishing.vala:757
+#: 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:739
+#: plugins/shotwell-publishing-extras/TumblrPublishing.vala:735
 #, c-format
 msgid ""
 "You are logged into Tumblr as %s.\n"
@@ -415,206 +1967,102 @@ msgstr ""
 "Du är inloggad på Tumblr som %s.\n"
 "\n"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:22
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:22
 msgid "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 msgstr "Copyright 2010+ Evgeniy Polyakov <zbr@ioremap.net>"
 
-#: ../plugins/shotwell-publishing-extras/YandexPublishing.vala:25
+#: plugins/shotwell-publishing-extras/YandexPublishing.vala:25
 msgid "Visit the Yandex.Fotki web site"
 msgstr "Besök webbplatsen för 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 "Du är för närvarande inte inloggad på Yandex.Fotki."
 
-#: ../plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala:20
-msgid "Shotwell Extra Publishing Services"
-msgstr "Shotwell extra publiceringstjänster"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:1
-msgid "Go _Back"
-msgstr "_Bakåt"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:2
-#: ../ui/shotwell.glade.h:42
-msgid "_Login"
-msgstr "_Logga in"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:3
-msgid "Intro message replaced at runtime"
-msgstr "Intromeddelande ersatt vid körtid"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:4
-msgid "_Gallery3 URL:"
-msgstr "_Gallery3 URL:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:5
-msgid "_User name:"
-msgstr "Användar_namn:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:6
-msgid "_Password:"
-msgstr "_Lösenord:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:7
-msgid "API _Key:"
-msgstr "API-_nyckel:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_authentication_pane.glade.h:8
-msgid "or"
-msgstr "eller"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:3
-msgid "A _new album"
-msgstr "Ett _nytt album"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:4
-msgid "An _existing album"
-msgstr "Ett _befintligt album"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:5
-msgid "_Remove location, tag and camera-identifying data before uploading"
-msgstr ""
-"_Ta bort plats, tagg och identifieringsdata för kameran innan du skickar upp "
-"något"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:6
-msgid "'Publishing to $url as $username' (populated in application code)"
-msgstr "'Publicerar till $url som $username' (populerad i programkod)"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:7
-msgid "Scaling constraint:"
-msgstr "Skalningsbegränsning:"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:8
-msgid "pixels"
-msgstr "bildpunkter"
-
-#: ../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 "Ursprungsstorlek"
-
-#: ../plugins/shotwell-publishing-extras/gallery3_publishing_options_pane.glade.h:10
-#: ../src/Dimensions.vala:20
-msgid "Width or height"
-msgstr "Bredd eller höjd"
-
-#: ../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 "etikett"
-
-#: ../plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade.h:1
-msgid "Blogs:"
-msgstr "Bloggar:"
-
-#: ../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 "Bild_storlek:"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:12
+msgid "Public"
+msgstr "Offentlig"
 
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:1
-msgid "you are logged in rajce as $name"
-msgstr "Du är inloggad på rajce som $name"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:15
+#: plugins/shotwell-publishing/FacebookPublishing.vala:888
+msgid "Friends"
+msgstr "Vänner"
 
-#: ../plugins/shotwell-publishing-extras/rajce_publishing_options_pane.glade.h:7
-msgid "$mediatype will appear in"
-msgstr "$mediatype kommer att visas i"
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:18
+#: plugins/shotwell-publishing/YouTubePublishing.vala:378
+msgid "Private"
+msgstr "Privat"
 
-#: ../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 "_Album (eller skriv nytt):"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:2
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:85
 msgid "Access _type:"
 msgstr "Åtkomst_typ:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:3
+#: plugins/shotwell-publishing-extras/yandex_publish_model.ui:106
 msgid "Disable _comments"
 msgstr "Inaktivera _kommentarer"
 
-#: ../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 "_Förbjud hämtning av ursprunglig bild"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:7
-msgid "Public"
-msgstr "Offentlig"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:42
+msgid "Publish to an e_xisting album:"
+msgstr "Publicera till ett _befintligt album:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:8
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1195
-msgid "Friends"
-msgstr "Vänner"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:58
+msgid "Create a _new album named:"
+msgstr "Skapa ett _nytt album med namnet:"
 
-#: ../plugins/shotwell-publishing-extras/yandex_publish_model.glade.h:9
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:497
-msgid "Private"
-msgstr "Privat"
+#: plugins/shotwell-publishing/facebook_publishing_options_pane.ui:100
+#: plugins/shotwell-publishing/FacebookPublishing.vala:725
+msgid "Upload _size:"
+msgstr "_Storlek att skicka upp:"
 
-#: ../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 "Filmer och nya fotoalbum är _synliga för:"
 
-#: ../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 ""
-"Du är för närvarande inte inloggad på Facebook.\n"
-"\n"
-"Om du ännu inte har ett Facebook-konto så kan du skapa ett under "
-"inloggningsprocessen. Under inloggningen kan Shotwell fråga dig om "
-"behörighet att skicka upp bilder och publicera till din logg. Dessa "
-"behörigheter krävs för att Shotwell Connect ska fungera."
+"_Ta bort plats, kamera och annan identifierande information innan bilden "
+"skickas"
 
-#: ../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 ""
-"Du har redan loggat in och ut från Facebook under denna Shotwell-session.\n"
-"För att fortsätta att publicera på Facebook, starta om Shotwell och försök "
-"att publicera igen."
+#: 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 bildpunkter)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:89
+#: plugins/shotwell-publishing/FacebookPublishing.vala:84
 msgid "Large (2048 pixels)"
 msgstr "Stor (2048 bildpunkter)"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:254
-msgid "Testing connection to Facebook..."
-msgstr "Testar anslutningen till Facebook…"
-
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:347
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:379
-msgid "Creating album..."
+#: plugins/shotwell-publishing/FacebookPublishing.vala:314
+msgid "Creating album…"
 msgstr "Skapar 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 ""
 "En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
 "Facebook inte fortsätta."
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1033
+#: plugins/shotwell-publishing/FacebookPublishing.vala:723
 #, c-format
 msgid ""
 "You are logged into Facebook as %s.\n"
@@ -623,66 +2071,22 @@ msgstr ""
 "Du är inloggad på Facebook som %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 "Var vill du publicera de markerade bilderna?"
 
-#: ../plugins/shotwell-publishing/FacebookPublishing.vala:1035
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:3
-msgid "Upload _size:"
-msgstr "_Storlek att skicka upp:"
-
-#: ../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 "Bara jag"
 
-#: ../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 "Alla"
 
-#: ../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 ""
-"Du är för närvarande inte inloggad på Flickr.\n"
-"\n"
-"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/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 ""
-"Du har redan loggat in och ut från Flickr under denna Shotwell-session.\n"
-"För att fortsätta att publicera till Flickr, starta om Shotwell och försök "
-"att publicera igen."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:375
-msgid "Preparing for login..."
-msgstr "Förbereder inloggning…"
-
-#: ../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 ""
-"En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
-"Flickr inte fortsätta."
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:457
-msgid "Verifying authorization..."
-msgstr "Verifierar behörighet…"
-
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1153
+#: plugins/shotwell-publishing/FlickrPublishing.vala:800
 #, c-format
 msgid ""
 "You are logged into Flickr as %s.\n"
@@ -691,121 +2095,190 @@ msgstr ""
 "Du är inloggad på Flickr som %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] ""
-"Ditt gratiskonto på Flickr begränsar hur mycket data som du kan skicka\n"
-"upp per månad. Denna månad har du %d megabyte kvar att skicka upp."
-msgstr[1] ""
+"This month you have %s remaining in your upload quota."
+msgstr ""
 "Ditt gratiskonto på Flickr begränsar hur mycket data som du kan skicka\n"
-"upp per månad. Denna månad har du %d megabyte kvar att skicka upp."
+"upp per månad. Denna månad har du %s kvar att skicka upp."
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1160
+#: plugins/shotwell-publishing/FlickrPublishing.vala:804
 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:1165
+#: plugins/shotwell-publishing/FlickrPublishing.vala:809
 msgid "Photos _visible to:"
 msgstr "Bilderna _visas för:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1167
+#: plugins/shotwell-publishing/FlickrPublishing.vala:811
 msgid "Videos _visible to:"
 msgstr "Filmerna _visas för:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1170
+#: plugins/shotwell-publishing/FlickrPublishing.vala:814
 msgid "Photos and videos _visible to:"
 msgstr "Bilder och filmer _visas för:"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1211
+#: plugins/shotwell-publishing/FlickrPublishing.vala:855
 msgid "Friends & family only"
 msgstr "Endast vänner och familj"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1212
+#: plugins/shotwell-publishing/FlickrPublishing.vala:856
 msgid "Family only"
 msgstr "Endast familj"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1213
+#: plugins/shotwell-publishing/FlickrPublishing.vala:857
 msgid "Friends only"
 msgstr "Endast vänner"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1234
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1248
-msgid "2048 x 1536 pixels"
-msgstr "2048 x 1536 bildpunkter"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:878
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1304
+msgid "2048 × 1536 pixels"
+msgstr "2048 × 1536 bildpunkter"
 
-#: ../plugins/shotwell-publishing/FlickrPublishing.vala:1235
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1249
-msgid "4096 x 3072 pixels"
-msgstr "4096 x 3072 bildpunkter"
+#: plugins/shotwell-publishing/FlickrPublishing.vala:879
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1305
+msgid "4096 × 3072 pixels"
+msgstr "4096 × 3072 bildpunkter"
 
-#: ../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 ""
-"Du är för närvarande inte inloggad på Picasa Web Albums.\n"
-"\n"
-"Klicka på Logga in för att logga in på Picasa Web Albums med din webbläsare. "
-"Du måste specifikt godkänna att Shotwell Connect kan länka till ditt Picasa-"
-"konto."
+#: plugins/shotwell-publishing/picasa_publishing_options_pane.ui:93
+msgid "Photo _size preset:"
+msgstr "Förval för bild_storlek:"
+
+#. 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 "
+"A file required for publishing is unavailable. Publishing to Picasa can’t "
 "continue."
 msgstr ""
 "En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
 "Picasa inte fortsätta."
 
 #. 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 är inloggad på Picasa webbalbum som %s."
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:665
+#: plugins/shotwell-publishing/PicasaPublishing.vala:566
 msgid "Videos will appear in:"
 msgstr "Filmer kommer att visas i:"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:746
-msgid "Small (640 x 480 pixels)"
-msgstr "Liten (640 x 480 bildpunkter)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:610
+msgid "Small (640 × 480 pixels)"
+msgstr "Liten (640 × 480 bildpunkter)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:747
-msgid "Medium (1024 x 768 pixels)"
-msgstr "Medel (1024 x 768 bildpunkter)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:611
+msgid "Medium (1024 × 768 pixels)"
+msgstr "Medel (1024 × 768 bildpunkter)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:748
-msgid "Recommended (1600 x 1200 pixels)"
-msgstr "Rekommenderad (1600 x 1200 bildpunkter)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:612
+msgid "Recommended (1600 × 1200 pixels)"
+msgstr "Rekommenderad (1600 × 1200 bildpunkter)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:749
-msgid "Google+ (2048 x 1536 pixels)"
-msgstr "Google+ (2048 x 1536 bildpunkter)"
+#: plugins/shotwell-publishing/PicasaPublishing.vala:613
+msgid "Google+ (2048 × 1536 pixels)"
+msgstr "Google+ (2048 × 1536 bildpunkter)"
 
-#: ../plugins/shotwell-publishing/PicasaPublishing.vala:750
-#: ../src/editing_tools/EditingTools.vala:756
+#: plugins/shotwell-publishing/PicasaPublishing.vala:614
+#: src/editing_tools/EditingTools.vala:757
 msgid "Original Size"
 msgstr "Ursprungsstorlek"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:746
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:44
+msgid "_URL of your Piwigo photo library"
+msgstr "_URL till ditt Piwigo-bildbibliotek"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:94
+msgid "User _name"
+msgstr "Användar_namn"
+
+#: plugins/shotwell-publishing/piwigo_authentication_pane.ui:133
+msgid "Remember Password"
+msgstr "Kom ihåg lösenord"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:36
+msgid "An _existing category"
+msgstr "En _befintlig kategori"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:110
+msgid "A _new album named"
+msgstr "Ett _nytt album med namnet"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:142
+msgid "within category"
+msgstr "inom kategori"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:155
+msgid "Album comment"
+msgstr "Albumkommentar"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:167
+msgid "Photos will be _visible by"
+msgstr "Bilder kommer att kunna _ses av"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:181
+msgid "Photo size"
+msgstr "Bildstorlek"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:219
+msgid "_If a title is set and comment unset, use title as comment"
+msgstr ""
+"_Om en titel är angiven men inte kommentaren, använd titeln som kommentar"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:235
+msgid "_Do no upload tags"
+msgstr "_Skicka inte upp taggar"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:255
+msgid "Logout"
+msgstr "Logga ut"
+
+#: plugins/shotwell-publishing/piwigo_publishing_options_pane.ui:268
+#: src/Resources.vala:295 ui/collection.ui:190
+msgid "Publish"
+msgstr "Publicera"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:773
 #, c-format
-msgid "Creating album %s..."
+msgid "Creating album %s…"
 msgstr "Skapar album %s…"
 
-#: ../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 "Ett felmeddelande visades vid publiceringen till Piwigo. Försök igen."
 
-#: ../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 ""
+"Det här ser inte ut som det äkta <b>%s</b>. En anfallare kanske försöker att "
+"stjäla eller ändra information som passerar till eller från denna webbplats "
+"(till exempel, privata meddelanden, kreditkortsinformation eller lösenord)."
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1048
+#, c-format
+msgid "Certificate of %s"
+msgstr "Certifikat för %s"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1051
+#: src/Resources.vala:166
+msgid "_OK"
+msgstr "_OK"
+
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1079
 msgid ""
 "Enter the URL of your Piwigo photo library as well as the username and "
 "password associated with your Piwigo account for that library."
@@ -813,223 +2286,107 @@ msgstr ""
 "Skriv in länken till ditt Piwigo-bildbibliotek, samt ditt Piwigo-"
 "användarnamn och -lösenord."
 
-#: ../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 kan inte nå ditt Piwigo-bildbibliotek. Kontrollera länkadressen igen"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1032
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1112
 msgid "Invalid URL"
 msgstr "Ogiltig länkadress"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1235
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1291
 msgid "Admins, Family, Friends, Contacts"
 msgstr "Administratörer, familj, vänner, kontakter"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1236
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1292
 msgid "Admins, Family, Friends"
 msgstr "Administratörer, familj, vänner"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1237
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1293
 msgid "Admins, Family"
 msgstr "Administratörer, familj"
 
-#: ../plugins/shotwell-publishing/PiwigoPublishing.vala:1238
+#: plugins/shotwell-publishing/PiwigoPublishing.vala:1294
 msgid "Admins"
 msgstr "Administratörer"
 
-#: ../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 ""
-"Du är för närvarande inte inloggad på YouTube.\n"
-"\n"
-"Du måste redan ha registrerat ett Google-konto och konfigurerat det för "
-"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/shotwell-publishing/piwigo_ssl_failure_pane.ui:21
+msgid "This connection is not secure"
+msgstr "Anslutningen är inte säker"
+
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:75
+msgid "Show the certificate…"
+msgstr "Visa certifikatet…"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:362
+#: plugins/shotwell-publishing/piwigo_ssl_failure_pane.ui:88
+msgid "I understand, please _proceed."
+msgstr "Jag förstår, _fortsätt."
+
+#: plugins/shotwell-publishing/shotwell-publishing.vala:55
+msgid "Core Publishing Services"
+msgstr "Standardtjänster för publicering"
+
+#: plugins/shotwell-publishing/youtube_publishing_options_pane.ui:55
+msgid "Video privacy _setting:"
+msgstr "_Sekretessinställningar för film:"
+
+#: plugins/shotwell-publishing/YouTubePublishing.vala:236
 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 ""
 "En fil som krävs för publiceringen saknas. Därför kan publiceringen till "
 "YouTube inte fortsätta."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:461
+#: plugins/shotwell-publishing/YouTubePublishing.vala:344
 #, c-format
 msgid "You are logged into YouTube as %s."
 msgstr "Du är inloggad på YouTube som %s."
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:463
-#, c-format
-msgid "Videos will appear in '%s'"
-msgstr "Filmer kommer att visas i ”%s”"
-
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:495
+#: plugins/shotwell-publishing/YouTubePublishing.vala:376
 msgid "Public listed"
 msgstr "Offentligt listad"
 
-#: ../plugins/shotwell-publishing/YouTubePublishing.vala:496
+#: plugins/shotwell-publishing/YouTubePublishing.vala:377
 msgid "Public unlisted"
 msgstr "Offentligt olistad"
 
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:1
-msgid "Publish to an e_xisting album:"
-msgstr "Publicera till ett _befintligt album:"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:2
-msgid "Create a _new album named:"
-msgstr "Skapa ett _nytt album med namnet:"
-
-#: ../plugins/shotwell-publishing/facebook_publishing_options_pane.glade.h:4
-msgid "Videos and new photo albums _visible to:"
-msgstr "Filmer och nya fotoalbum är _synliga för:"
-
-#: ../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 ""
-"_Ta bort plats, kamera och annan identifierande information innan bilden "
-"skickas"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:1
-msgid ""
-"Enter the confirmation number which appears after you log into Flickr in "
-"your Web browser."
-msgstr ""
-"Ange bekräftelsesiffrorna som visas efter att du loggat in till Flickr i din "
-"webbläsare."
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:2
-msgid "Authorization _Number:"
-msgstr "Autentiserings_nummer:"
-
-#: ../plugins/shotwell-publishing/flickr_pin_entry_pane.glade.h:3
-#: ../src/Dialogs.vala:131
-msgid "Con_tinue"
-msgstr "_Fortsätt"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:3
-msgid "L_ist album in public gallery"
-msgstr "L_ista album i publikt galleri"
-
-#: ../plugins/shotwell-publishing/picasa_publishing_options_pane.glade.h:4
-msgid "Photo _size preset:"
-msgstr "Förval för bild_storlek:"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:2
-msgid "_URL of your Piwigo photo library"
-msgstr "_URL till ditt Piwigo-bildbibliotek"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:3
-msgid "User _name"
-msgstr "Användar_namn"
-
-#: ../plugins/shotwell-publishing/piwigo_authentication_pane.glade.h:5
-msgid "_Remember Password"
-msgstr "_Kom ihåg lösenord"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:2
-msgid "An _existing category:"
-msgstr "En _befintlig kategori:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:4
-msgid "Photos will be _visible by:"
-msgstr "Bilder kommer att kunna _ses av:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:5
-msgid "Photo size:"
-msgstr "Bildstorlek:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:6
-msgid "within category:"
-msgstr "inom kategori:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:7
-msgid "Album comment:"
-msgstr "Albumkommentar:"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:9
-msgid "_If a title is set and comment unset, use title as comment"
-msgstr ""
-"_Om en titel är angiven men inte kommentaren, använd titeln som kommentar"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:10
-msgid "_Do no upload tags"
-msgstr "_Skicka inte upp taggar"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:11
-msgid "Logout"
-msgstr "Logga ut"
-
-#: ../plugins/shotwell-publishing/piwigo_publishing_options_pane.glade.h:12
-#: ../src/Resources.vala:298
-msgid "Publish"
-msgstr "Publicera"
-
-#: ../plugins/shotwell-publishing/shotwell-publishing.vala:26
-msgid "Core Publishing Services"
-msgstr "Standardtjänster för publicering"
-
-#: ../plugins/shotwell-publishing/youtube_publishing_options_pane.glade.h:1
-msgid "Video privacy _setting:"
-msgstr "_Sekretessinställningar för film:"
-
-#: ../plugins/shotwell-transitions/BlindsEffect.vala:20
+#: plugins/shotwell-transitions/BlindsEffect.vala:20
 msgid "Blinds"
 msgstr "Persienner"
 
-#: ../plugins/shotwell-transitions/ChessEffect.vala:20
+#: plugins/shotwell-transitions/ChessEffect.vala:20
 msgid "Chess"
 msgstr "Schackrutig"
 
-#: ../plugins/shotwell-transitions/CircleEffect.vala:20
+#: plugins/shotwell-transitions/CircleEffect.vala:20
 msgid "Circle"
 msgstr "Cirkel"
 
-#: ../plugins/shotwell-transitions/CirclesEffect.vala:20
+#: plugins/shotwell-transitions/CirclesEffect.vala:20
 msgid "Circles"
 msgstr "Cirklar"
 
-#: ../plugins/shotwell-transitions/ClockEffect.vala:20
+#: plugins/shotwell-transitions/ClockEffect.vala:20
 msgid "Clock"
 msgstr "Klocka"
 
-#: ../plugins/shotwell-transitions/CrumbleEffect.vala:20
+#: plugins/shotwell-transitions/CrumbleEffect.vala:20
 msgid "Crumble"
 msgstr "Smula sönder"
 
-#: ../plugins/shotwell-transitions/FadeEffect.vala:20
+#: plugins/shotwell-transitions/FadeEffect.vala:20
 msgid "Fade"
 msgstr "Tona ut"
 
-#: ../plugins/shotwell-transitions/SlideEffect.vala:20
-msgid "Slide"
-msgstr "Glid"
-
-#: ../plugins/shotwell-transitions/SquaresEffect.vala:20
-msgid "Squares"
-msgstr "Rutor"
-
-#: ../plugins/shotwell-transitions/StripesEffect.vala:20
-msgid "Stripes"
-msgstr "Randig"
-
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:28
+#: plugins/shotwell-transitions/shotwell-transitions.vala:28
 msgid "Core Slideshow Transitions"
 msgstr "Standardövergångar för bildspel"
 
-#: ../plugins/shotwell-transitions/shotwell-transitions.vala:75
+#: plugins/shotwell-transitions/shotwell-transitions.vala:76
 msgid ""
 "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
 "Inc."
@@ -1037,428 +2394,750 @@ msgstr ""
 "Copyright 2010 Maxim Kartashev, Copyright 2016 Software Freedom Conservancy "
 "Inc."
 
-#: ../src/AppDirs.vala:64 ../src/AppDirs.vala:115
+#: plugins/shotwell-transitions/SlideEffect.vala:20
+msgid "Slide"
+msgstr "Glid"
+
+#: plugins/shotwell-transitions/SquaresEffect.vala:20
+msgid "Squares"
+msgstr "Rutor"
+
+#: plugins/shotwell-transitions/StripesEffect.vala:20
+msgid "Stripes"
+msgstr "Randig"
+
+#: src/AppDirs.vala:64 src/AppDirs.vala:115
 #, c-format
 msgid "Unable to create cache directory %s: %s"
 msgstr "Det går inte att skapa cache-katalogen %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 "Kunde inte skapa datakatalogen %s: %s"
 
 #. If XDG yarfed, use ~/Pictures
-#: ../src/AppDirs.vala:168
+#: src/AppDirs.vala:168
 msgid "Pictures"
 msgstr "Bilder"
 
-#: ../src/AppDirs.vala:206
+#: src/AppDirs.vala:206
 #, c-format
 msgid "Unable to create temporary directory %s: %s"
 msgstr "Kunde inte skapa den temporära katalogen %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 "Kunde inte skapa den underliggande datakatalogen %s: %s"
 
-#: ../src/AppDirs.vala:236
+#: src/AppDirs.vala:236
 #, c-format
 msgid "Could not make directory %s writable"
 msgstr "Kunde inte göra katalogen %s skrivbar"
 
-#: ../src/AppDirs.vala:239
+#: src/AppDirs.vala:239
 #, c-format
 msgid "Could not make directory %s writable: %s"
 msgstr "Kunde inte göra katalogen %s skrivbar: %s"
 
-#: ../src/AppWindow.vala:54
+#: src/AppWindow.vala:47
 msgid "Pin Toolbar"
 msgstr "Fäst verktygsfält"
 
-#: ../src/AppWindow.vala:55
+#: src/AppWindow.vala:48
 msgid "Pin the toolbar open"
 msgstr "Fäst verktygsfältet i öppet läge"
 
-#: ../src/AppWindow.vala:60
+#: src/AppWindow.vala:53
 msgid "Leave fullscreen"
 msgstr "Avsluta helskärmsläge"
 
-#: ../src/AppWindow.vala:496
-msgid "_Contents"
-msgstr "_Innehåll"
-
-#: ../src/AppWindow.vala:501
-msgid "_Frequently Asked Questions"
-msgstr "_Återkommande frågor"
-
-#: ../src/AppWindow.vala:506
-msgid "_Report a Problem..."
-msgstr "_Rapportera ett problem…"
-
-#: ../src/AppWindow.vala:605 ../src/AppWindow.vala:626
-#: ../src/AppWindow.vala:643 ../src/Dialogs.vala:20 ../src/Dialogs.vala:28
-#: ../src/Dialogs.vala:1424 ../src/Dialogs.vala:1447 ../src/Resources.vala:157
-#: ../src/data_imports/DataImportsUI.vala:413
-#: ../src/publishing/PublishingUI.vala:512
+#: src/AppWindow.vala: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
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/AppWindow.vala:653
+#: 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 ""
-"Ett allvarligt fel inträffade vid åtkomsten till Shotwells bibliotek.  "
+"Ett allvarligt fel inträffade vid åtkomsten till Shotwells bibliotek. "
 "Shotwell kan inte fortsätta.\n"
 "\n"
 "%s"
 
-#: ../src/AppWindow.vala:673
+#: src/AppWindow.vala:599
 msgid "Visit the Shotwell web site"
 msgstr "Besök Shotwells webbplats"
 
-#: ../src/AppWindow.vala:685
+#: src/AppWindow.vala:611
 #, c-format
 msgid "Unable to display help: %s"
 msgstr "Kunde inte visa hjälp: %s"
 
-#: ../src/AppWindow.vala:693
+#: src/AppWindow.vala:619
 #, c-format
 msgid "Unable to navigate to bug database: %s"
 msgstr "Det går inte att komma åt feldatabasen: %s"
 
-#: ../src/AppWindow.vala:701
+#: src/AppWindow.vala:627
 #, c-format
 msgid "Unable to display FAQ: %s"
 msgstr "Kunde inte visa återkommande frågor: %s"
 
-#: ../src/BatchImport.vala:26
+#: src/BatchImport.vala:26
 msgid "Success"
 msgstr "Lyckades"
 
-#: ../src/BatchImport.vala:29
+#: src/BatchImport.vala:29
 msgid "File error"
 msgstr "Filfel"
 
-#: ../src/BatchImport.vala:32
+#: src/BatchImport.vala:32
 msgid "Unable to decode file"
 msgstr "Kunde inte avkoda filen"
 
-#: ../src/BatchImport.vala:35
+#: src/BatchImport.vala:35
 msgid "Database error"
 msgstr "Databasfel"
 
-#: ../src/BatchImport.vala:38
+#: src/BatchImport.vala:38
 msgid "User aborted import"
 msgstr "Användaren avbröt importen"
 
-#: ../src/BatchImport.vala:41
+#: src/BatchImport.vala:41
 msgid "Not a file"
 msgstr "Inte en fil"
 
-#: ../src/BatchImport.vala:44
+#: src/BatchImport.vala:44
 msgid "File already exists in database"
 msgstr "Filen finns redan i databasen"
 
-#: ../src/BatchImport.vala:47
+#: src/BatchImport.vala:47
 msgid "Unsupported file format"
 msgstr "Filformatet stöds inte"
 
-#: ../src/BatchImport.vala:50
+#: src/BatchImport.vala:50
 msgid "Not an image file"
 msgstr "Inte en bildfil"
 
-#: ../src/BatchImport.vala:53
+#: src/BatchImport.vala:53
 msgid "Disk failure"
 msgstr "Diskfel"
 
-#: ../src/BatchImport.vala:56
+#: src/BatchImport.vala:56
 msgid "Disk full"
 msgstr "Disken är full"
 
-#: ../src/BatchImport.vala:59
+#: src/BatchImport.vala:59
 msgid "Camera error"
 msgstr "Kamerafel"
 
-#: ../src/BatchImport.vala:62
+#: src/BatchImport.vala:62
 msgid "File write error"
 msgstr "Fel vid filskrivning"
 
-#: ../src/BatchImport.vala:65
+#: src/BatchImport.vala:65
 msgid "Corrupt image file"
 msgstr "Korrupt bildfil"
 
-#: ../src/BatchImport.vala:68
+#: src/BatchImport.vala:68
 #, c-format
 msgid "Imported failed (%d)"
 msgstr "Importen misslyckades (%d)"
 
-#: ../src/CollectionPage.vala:230 ../src/PhotoPage.vala:2635
+#: src/camera/Branch.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
+#: ui/collection.ui:90 ui/event.ui:359 ui/event.ui:527 ui/media.ui:359
+#: ui/photo_context.ui:96 ui/photo.ui:349 ui/tags.ui:359
+msgid "Camera"
+msgstr "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 ""
+"Kunde inte avmontera kameran. Försök att avmontera kameran från "
+"filhanteraren."
+
+#. hide duplicates checkbox
+#: src/camera/ImportPage.vala:783
+msgid "Hide photos already imported"
+msgstr "Dölj bilder som redan importerats"
+
+#: src/camera/ImportPage.vala:784
+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
+msgid "Import _Selected"
+msgstr "Importera _markerade"
+
+#: src/camera/ImportPage.vala:833 ui/import.ui:17 ui/import.ui:214
+msgid "Import _All"
+msgstr "Importera _alla"
+
+#: src/camera/ImportPage.vala:857
+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
+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
+msgid ""
+"Shotwell needs to unmount the camera from the filesystem in order to access "
+"it. Continue?"
+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
+msgid "_Unmount"
+msgstr "A_vmontera"
+
+#: src/camera/ImportPage.vala:1032
+msgid "Please unmount the camera."
+msgstr "Avmontera kameran."
+
+#: 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 ""
+"Kameran är låst av ett annat program. Shotwell kan endast komma åt kameran "
+"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
+msgid "Please close any other application using the camera."
+msgstr "Stäng alla andra program som använder kameran."
+
+#: src/camera/ImportPage.vala:1052
+#, c-format
+msgid ""
+"Unable to fetch previews from the camera:\n"
+"%s"
+msgstr ""
+"Kunde inte hämta förhandsvisningar från kameran:\n"
+"%s"
+
+#: src/camera/ImportPage.vala:1069
+msgid "Unmounting…"
+msgstr "Avmonterar…"
+
+#: src/camera/ImportPage.vala:1160
+msgid "Starting import, please wait…"
+msgstr "Påbörjar importen, var god vänta…"
+
+#: src/camera/ImportPage.vala:1177
+msgid "Fetching photo information"
+msgstr "Hämtar bildinformation"
+
+#: src/camera/ImportPage.vala:1535
+#, c-format
+msgid "Fetching preview for %s"
+msgstr "Hämtar förhandsvisning av %s"
+
+#: src/camera/ImportPage.vala:1651
+#, c-format
+msgid "Unable to lock camera: %s"
+msgstr "Kunde inte låsa kameran: %s"
+
+#: src/camera/ImportPage.vala:1736
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "_Keep"
+msgstr "_Behåll"
+
+#: src/camera/ImportPage.vala:1772
+msgid "Removing photos/videos from camera"
+msgstr "Tar bort bilder och filmer från kameran"
+
+#: 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] ""
+"Kunde inte radera %d bild och film från kameran på grund av ett fel."
+msgstr[1] ""
+"Kunde inte radera %d bilder och filmer från kameran på grund av ett fel."
+
+#: src/CollectionPage.vala:80 src/direct/DirectPhotoPage.vala:85
+#: src/PhotoPage.vala:2464 src/Resources.vala:170
+msgid "_Print"
+msgstr "Skriv _ut"
+
+#: 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
+msgid "Send _To…"
+msgstr "Skicka t_ill…"
+
+#: src/CollectionPage.vala:84 src/direct/DirectPhotoPage.vala:90
+#: src/PhotoPage.vala:2474 src/Resources.vala:220
+msgid "Set as _Desktop Background"
+msgstr "Använd som skrivbords_bakgrund"
+
+#: src/CollectionPage.vala:92 src/Resources.vala:286
+msgid "_Duplicate"
+msgstr "_Duplicera"
+
+#: src/CollectionPage.vala:100
+msgid "Fullscreen"
+msgstr "Helskärm"
+
+#: src/CollectionPage.vala:102 ui/photo.ui:180
 msgid "S_lideshow"
 msgstr "_Bildspel"
 
-#: ../src/CollectionPage.vala:231 ../src/PhotoPage.vala:2636
-msgid "Play a slideshow"
-msgstr "Spela upp ett bildspel"
+#: src/CollectionPage.vala:110 src/Resources.vala:139 ui/direct.ui:111
+#: ui/photo.ui:200
+msgid "Rotate _Right"
+msgstr "Rotera åt _höger"
+
+#: src/CollectionPage.vala:113 src/Resources.vala:144 ui/direct.ui:116
+#: ui/photo.ui:205
+msgid "Rotate _Left"
+msgstr "Rotera åt _vänster"
+
+#: src/CollectionPage.vala:116 src/Resources.vala:149 ui/direct.ui:121
+#: ui/photo.ui:210
+msgid "Flip Hori_zontally"
+msgstr "Vänd hor_isontellt"
+
+#: src/CollectionPage.vala:117 src/Resources.vala:152 ui/direct.ui:125
+#: ui/photo.ui:214
+msgid "Flip Verti_cally"
+msgstr "Vänd verti_kalt"
+
+#: 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
+#: ui/photo_context.ui:6 ui/photo.ui:223
+msgid "_Enhance"
+msgstr "Förbä_ttra"
+
+#: 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
+#: ui/photo_context.ui:11 ui/photo.ui:250
+msgid "Re_vert to Original"
+msgstr "_Återställ till original"
+
+#: src/CollectionPage.vala:122 src/Resources.vala:190 ui/photo.ui:256
+msgid "_Copy Color Adjustments"
+msgstr "_Kopiera färgjusteringar"
+
+#: src/CollectionPage.vala:125 src/Resources.vala:194 ui/photo.ui:261
+msgid "_Paste Color Adjustments"
+msgstr "_Klistra in färgjusteringar"
+
+#: src/CollectionPage.vala:135
+msgid "Adjust Date and Time…"
+msgstr "Justera datum och tid…"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:143 src/Resources.vala:319
+msgid "Open With E_xternal Editor"
+msgstr "Öppna med e_xtern redigerare"
+
+#: 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
+msgid "Open With RA_W Editor"
+msgstr "Öppna i RA_W-redigerare"
+
+#: src/CollectionPage.vala:149 src/Resources.vala:167
+msgid "_Play"
+msgstr "_Spela"
+
+#: src/CollectionPage.vala:415
 msgid "Export Photo/Video"
 msgstr "Exportera bild/film"
 
-#: ../src/CollectionPage.vala:456
+#: src/CollectionPage.vala:415
 msgid "Export Photos/Videos"
 msgstr "Exportera bilder/filmer"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:58
-#: ../src/PhotoPage.vala:3209
+#: src/CollectionPage.vala:417 src/Dialogs.vala:59 src/PhotoPage.vala:2998
 msgid "Export Photo"
 msgstr "Exportera bild"
 
-#: ../src/CollectionPage.vala:458 ../src/Dialogs.vala:87
+#: src/CollectionPage.vala:417 src/Dialogs.vala:84
 msgid "Export Photos"
 msgstr "Exportera bilder"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Rotating"
 msgstr "Roterar"
 
-#: ../src/CollectionPage.vala:545 ../src/CollectionPage.vala:561
+#: src/CollectionPage.vala:504 src/CollectionPage.vala:520
 msgid "Undoing Rotate"
 msgstr "Ångrar rotationen"
 
-#: ../src/CollectionPage.vala:570
+#: src/CollectionPage.vala:529
 msgid "Flipping Horizontally"
 msgstr "Vänder horisontellt"
 
-#: ../src/CollectionPage.vala:571
+#: src/CollectionPage.vala:530
 msgid "Undoing Flip Horizontally"
 msgstr "Ångrar horisontell vändning"
 
-#: ../src/CollectionPage.vala:580
+#: src/CollectionPage.vala:539
 msgid "Flipping Vertically"
 msgstr "Vänder vertikalt"
 
-#: ../src/CollectionPage.vala:581
+#: src/CollectionPage.vala:540
 msgid "Undoing Flip Vertically"
 msgstr "Ångrar vertikal vändning"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Reverting"
 msgstr "Återställer"
 
-#: ../src/Commands.vala:733
+#: src/Commands.vala:737
 msgid "Undoing Revert"
 msgstr "Ångrar återställning"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Enhancing"
 msgstr "Förbättrar"
 
-#: ../src/Commands.vala:777
+#: src/Commands.vala:781
 msgid "Undoing Enhance"
 msgstr "Ångrar förbättring"
 
-#: ../src/Commands.vala:853
+#: src/Commands.vala:857
 msgid "Applying Color Transformations"
 msgstr "Verkställer färgtransformationer"
 
-#: ../src/Commands.vala:853
+#: src/Commands.vala:857
 msgid "Undoing Color Transformations"
 msgstr "Ångrar färgtransformationer"
 
-#: ../src/Commands.vala:1003
+#: src/Commands.vala:1007
 msgid "Creating New Event"
 msgstr "Skapar ny händelse"
 
-#: ../src/Commands.vala:1004
+#: src/Commands.vala:1008
 msgid "Removing Event"
 msgstr "Tar bort händelse"
 
-#: ../src/Commands.vala:1013
+#: src/Commands.vala:1017
 msgid "Moving Photos to New Event"
 msgstr "Flyttar bilder till ny händelse"
 
-#: ../src/Commands.vala:1014
+#: src/Commands.vala:1018
 msgid "Setting Photos to Previous Event"
 msgstr "Ställer in bilder till föregående händelse"
 
-#: ../src/Commands.vala:1071
+#: src/Commands.vala:1075
 msgid "Merging"
 msgstr "Sammanfogar"
 
-#: ../src/Commands.vala:1072
+#: src/Commands.vala:1076
 msgid "Unmerging"
 msgstr "Delar upp"
 
-#: ../src/Commands.vala:1081
+#: src/Commands.vala:1085
 msgid "Duplicating photos"
 msgstr "Skapar kopior av bilderna"
 
-#: ../src/Commands.vala:1081
+#: src/Commands.vala:1085
 msgid "Removing duplicated photos"
 msgstr "Tar bort kopior på bilderna"
 
-#: ../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] "Kunde inte kopiera en bild på grund av en felaktig fil"
 msgstr[1] "Det gick inte kopiera %d bilder på grund av felaktiga filer"
 
-#: ../src/Commands.vala:1191
+#: src/Commands.vala:1195
 msgid "Restoring previous rating"
 msgstr "Återställer tidigare betyg"
 
-#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Increasing ratings"
 msgstr "Ökar betyg"
 
-#: ../src/Commands.vala:1201 ../src/Commands.vala:1202
+#: src/Commands.vala:1205 src/Commands.vala:1206
 msgid "Decreasing ratings"
 msgstr "Sänker betyg"
 
-#: ../src/Commands.vala:1252
+#: src/Commands.vala:1256
 msgid "Setting RAW developer"
 msgstr "Ställer in RAW-framkallare"
 
-#: ../src/Commands.vala:1252
+#: src/Commands.vala:1256
 msgid "Restoring previous RAW developer"
 msgstr "Återställer tidigare RAW-framkallare"
 
-#: ../src/Commands.vala:1253
+#: src/Commands.vala:1257
 msgid "Set Developer"
 msgstr "Ange framkallare"
 
-#: ../src/Commands.vala:1343
+#: src/Commands.vala:1347
 msgid "Original photo could not be adjusted."
 msgstr "Den ursprungliga bilden kunde inte justeras."
 
-#: ../src/Commands.vala:1364
+#: src/Commands.vala:1368
 msgid "Adjusting Date and Time"
 msgstr "Justerar datum och tid"
 
-#: ../src/Commands.vala:1364
+#: src/Commands.vala:1368
 msgid "Undoing Date and Time Adjustment"
 msgstr "Ångrar justering för datum och tid"
 
-#: ../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] "Den ursprungliga bilden kunde inte anpassas."
 msgstr[1] "Följande ursprungliga bilder kunde inte anpassas."
 
-#: ../src/Commands.vala:1397 ../src/Commands.vala:1421
+#: src/Commands.vala:1401 src/Commands.vala:1425
 msgid "Time Adjustment Error"
 msgstr "Anpassning av tidsfel"
 
-#: ../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] "Tidsanpassningen kunde inte återställas för den här bilden."
 msgstr[1] "Tidsanpassningen kunde inte återställas för följande bilder."
 
-#: ../src/Commands.vala:1633 ../src/Commands.vala:1656
+#: src/Commands.vala:1637 src/Commands.vala:1660
 msgid "Create Tag"
 msgstr "Skapa tagg"
 
-#: ../src/Commands.vala:1691
+#: src/Commands.vala:1695
 #, c-format
-msgid "Move Tag \"%s\""
+msgid "Move Tag “%s”"
 msgstr "Flytta taggen ”%s”"
 
-#: ../src/Commands.vala:2343
+#: src/Commands.vala:2347
 msgid "Move Photos to Trash"
 msgstr "Flytta bilder till papperskorgen"
 
-#: ../src/Commands.vala:2343
+#: src/Commands.vala:2347
 msgid "Restore Photos from Trash"
 msgstr "Återställ bilder från papperskorgen"
 
-#: ../src/Commands.vala:2344
+#: src/Commands.vala:2348
 msgid "Move the photos to the Shotwell trash"
 msgstr "Flytta bilderna till Shotwells papperskorg"
 
-#: ../src/Commands.vala:2344
+#: src/Commands.vala:2348
 msgid "Restore the photos back to the Shotwell library"
 msgstr "Återställ bilder tillbaka till Shotwell-biblioteket"
 
-#: ../src/Commands.vala:2363
+#: src/Commands.vala:2367
 msgid "Moving Photos to Trash"
 msgstr "Flyttar bilder till papperskorgen"
 
-#: ../src/Commands.vala:2363
+#: src/Commands.vala:2367
 msgid "Restoring Photos From Trash"
 msgstr "Återställer bilderna från papperskorgen"
 
-#: ../src/Commands.vala:2449
+#: src/Commands.vala:2453
 msgid "Flag selected photos"
 msgstr "Flagga markerade bilder"
 
-#: ../src/Commands.vala:2450
+#: src/Commands.vala:2454
 msgid "Unflag selected photos"
 msgstr "Flagga av markerade bilder"
 
-#: ../src/Commands.vala:2451
+#: src/Commands.vala:2455
 msgid "Flagging selected photos"
 msgstr "Flaggar markerade bilder"
 
-#: ../src/Commands.vala:2452
+#: src/Commands.vala:2456
 msgid "Unflagging selected photos"
 msgstr "Flaggar av markerade bilder"
 
-#: ../src/Commands.vala:2459
+#: src/Commands.vala:2463
 msgid "Flag"
 msgstr "Flagga"
 
-#: ../src/Commands.vala:2459
+#: src/Commands.vala:2463
 msgid "Unflag"
 msgstr "Flagga av"
 
-#: ../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-databas"
+
+#: 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 "Importen från %s kan inte fortsätta då ett fel uppstod:"
+
+#: src/data_imports/DataImportsPluginHost.vala:151
+msgid "To try importing from another service, select one from the above menu."
+msgstr ""
+"För att försöka att importera från en annan tjänst, välj en från ovanstående "
+"meny."
+
+#: 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 ""
+"Du har inte aktiverat några dataimport-insticksmoduler.\n"
+"\n"
+"För att använda kommandot Importera från program, måste du åtminstone ha en "
+"insticksmodul aktiverad. Insticksmoduler kan aktiveras i programmets "
+"inställningar."
+
+#: src/data_imports/DataImportsUI.vala:100
+msgid "Database file:"
+msgstr "Databasfil:"
+
+#: src/data_imports/DataImportsUI.vala:112 src/library/LibraryWindow.vala:775
+msgid "_Import"
+msgstr "_Importera"
+
+#: src/data_imports/DataImportsUI.vala:220
+msgid "Import From Application"
+msgstr "Importera från program"
+
+#: src/data_imports/DataImportsUI.vala:221
+msgid "Import media _from:"
+msgstr "Importera mediafiler från:"
+
+#: src/data_imports/DataImportsUI.vala:414 src/publishing/PublishingUI.vala:520
+msgid "_Close"
+msgstr "S_täng"
+
+#: src/data_imports/DataImports.vala:22
+msgid "Data Imports"
+msgstr "Dataimporter"
+
+#: src/db/DatabaseTable.vala:37
+#, c-format
+msgid "Unable to open/create photo database %s: error code %d"
+msgstr "Kunde inte öppna eller skapa bilddatabasen %s: felkod %d"
+
+#: src/db/DatabaseTable.vala:46
+#, c-format
+msgid ""
+"Unable to write to photo database file:\n"
+" %s"
+msgstr ""
+"Kunde inte skriva till bilddatabasfilen:\n"
+" %s"
+
+#: src/db/DatabaseTable.vala:48
+#, c-format
+msgid ""
+"Error accessing database file:\n"
+" %s\n"
+"\n"
+"Error was: \n"
+"%s"
+msgstr ""
+"Fel vid åtkomst till databasfilen:\n"
+" %s\n"
+"\n"
+"Felet var: \n"
+"%s"
+
+#: src/db/DatabaseTable.vala:92
+#, c-format
+msgid "Unable to restore photo database %s"
+msgstr "Kunde inte återställa bilddatabasen %s"
+
+#: src/DesktopIntegration.vala:121
 #, c-format
 msgid "Unable to launch Nautilus Send-To: %s"
 msgstr "Kunde inte starta Nautilus Skicka-till: %s"
 
-#: ../src/DesktopIntegration.vala:129
+#: src/DesktopIntegration.vala:129
 msgid "Send To"
 msgstr "Skicka till"
 
-#: ../src/DesktopIntegration.vala:174
+#: src/DesktopIntegration.vala:174
 #, c-format
 msgid "Unable to export background to %s: %s"
 msgstr "Kunde inte exportera bakgrund till %s: %s"
 
-#: ../src/DesktopIntegration.vala:311
+#: src/DesktopIntegration.vala:311
 #, c-format
 msgid "Unable to prepare desktop slideshow: %s"
 msgstr "Kunde inte förbereda skrivbordsbildspel: %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] ""
 "Det här kommer att ta bort taggen ”%s” från bilden. Vill du fortsätta?"
 msgstr[1] ""
 "Det här kommer att ta bort taggen ”%s” från %d bilder. Vill du fortsätta?"
 
-#: ../src/Dialogs.vala:20 ../src/Dialogs.vala:28 ../src/Dialogs.vala:1392
-#: ../src/Resources.vala:158 ../src/Resources.vala:364
-#: ../src/Resources.vala:412 ../src/Resources.vala:677
+#: src/Dialogs.vala:20 src/Dialogs.vala:28 src/Dialogs.vala:1388
+#: src/Resources.vala:158 src/Resources.vala:361 src/Resources.vala:414
+#: src/Resources.vala:658 ui/savedsearch.ui:15 ui/tags.ui:458 ui/trash.ui:63
+#: ui/trash.ui:216 ui/trash.ui:258
 msgid "_Delete"
 msgstr "_Radera"
 
-#: ../src/Dialogs.vala:25
+#: src/Dialogs.vala:25
 #, c-format
-msgid "This will remove the saved search \"%s\".  Continue?"
-msgstr "Det här kommer att ta bort sparade sökningen ”%s”.  Vill du fortsätta?"
+msgid "This will remove the saved search “%s”. Continue?"
+msgstr "Det här kommer att ta bort sparade sökningen ”%s”. Vill du fortsätta?"
 
-#: ../src/Dialogs.vala:35
+#: src/Dialogs.vala:36
 msgid ""
 "Switching developers will undo all changes you have made to this photo in "
 "Shotwell"
@@ -1472,11 +3151,11 @@ msgstr[1] ""
 "Om du ändrar råbildsframkallare kommer alla ändringar du gjort på bilderna i "
 "Shotwell att återställas"
 
-#: ../src/Dialogs.vala:39
+#: src/Dialogs.vala:40
 msgid "_Switch Developer"
 msgstr "_Byt råbildsframkallare"
 
-#: ../src/Dialogs.vala:58
+#: src/Dialogs.vala:59
 msgid "Export Video"
 msgstr "Exportera film"
 
@@ -1485,16 +3164,16 @@ msgstr "Exportera film"
 #. 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 kunde inte skapa en fil för redigering av denna bild därför att du "
 "inte har behörighet att skriva till %s."
 
-#: ../src/Dialogs.vala:124
+#: src/Dialogs.vala:121
 msgid ""
 "Unable to export the following photo due to a file error.\n"
 "\n"
@@ -1502,7 +3181,7 @@ msgstr ""
 "Kunde inte exportera följande bild på grund av ett filfel.\n"
 "\n"
 
-#: ../src/Dialogs.vala:130
+#: src/Dialogs.vala:127
 msgid ""
 "\n"
 "\n"
@@ -1515,60 +3194,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 "Oförändrad"
 
-#: ../src/Dialogs.vala:148
+#: src/Dialogs.vala:145
 msgid "Current"
 msgstr "Aktuellt"
 
 #. layout controls
-#: ../src/Dialogs.vala:215
+#: src/Dialogs.vala:221
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../src/Dialogs.vala:218
+#: src/Dialogs.vala:224
 msgid "_Quality:"
 msgstr "_Kvalitet:"
 
-#: ../src/Dialogs.vala:221
+#: src/Dialogs.vala:227
 msgid "_Scaling constraint:"
 msgstr "_Skalningsbegränsning:"
 
-#: ../src/Dialogs.vala:224
+#: src/Dialogs.vala:230
 msgid "_Pixels:"
 msgstr "_Bildpunkter:"
 
-#: ../src/Dialogs.vala:227
-msgid "Export metadata"
-msgstr "Exportera metadata"
+#: src/Dialogs.vala:234
+msgid "Export _metadata:"
+msgstr "Exportera _metadata:"
 
-#: ../src/Dialogs.vala:461
-msgid "Save Details..."
+#: src/Dialogs.vala:478
+msgid "Save Details…"
 msgstr "Spara detaljer…"
 
-#: ../src/Dialogs.vala:462
+#: src/Dialogs.vala:479
 msgid "Save Details"
 msgstr "Spara detaljer"
 
-#: ../src/Dialogs.vala:477
+#: src/Dialogs.vala:494
 #, c-format
 msgid "(and %d more)\n"
 msgstr "(och ytterligare %d)\n"
 
-#: ../src/Dialogs.vala:530
+#: src/Dialogs.vala:547
 msgid "Import Results Report"
 msgstr "Importera resultatrapport"
 
-#: ../src/Dialogs.vala:534
+#: src/Dialogs.vala:551
 #, c-format
 msgid "Attempted to import %d file."
 msgid_plural "Attempted to import %d files."
 msgstr[0] "Försökte importera %d fil."
 msgstr[1] "Försökte importera %d filer."
 
-#: ../src/Dialogs.vala:537
+#: src/Dialogs.vala:554
 #, c-format
 msgid "Of these, %d file was successfully imported."
 msgid_plural "Of these, %d files were successfully imported."
@@ -1578,31 +3257,31 @@ msgstr[1] "Av dessa importerades %d filer framgångsrikt."
 #.
 #. Duplicates
 #.
-#: ../src/Dialogs.vala:549
+#: src/Dialogs.vala:566
 msgid "Duplicate Photos/Videos Not Imported:"
 msgstr "Dubbletter av bilder/filmer som inte importerades:"
 
-#: ../src/Dialogs.vala:553
+#: src/Dialogs.vala:570
 msgid "duplicates existing media item"
 msgstr "dubblett av befintligt media"
 
 #.
 #. Files Not Imported Due to Camera Errors
 #.
-#: ../src/Dialogs.vala:564
+#: src/Dialogs.vala:581
 msgid "Photos/Videos Not Imported Due to Camera Errors:"
 msgstr "På grund av ett kamerafel importerades inga bilder eller filmer:"
 
-#: ../src/Dialogs.vala:567 ../src/Dialogs.vala:582 ../src/Dialogs.vala:597
-#: ../src/Dialogs.vala:613 ../src/Dialogs.vala:628 ../src/Dialogs.vala:642
+#: src/Dialogs.vala:584 src/Dialogs.vala:599 src/Dialogs.vala:614
+#: src/Dialogs.vala:630 src/Dialogs.vala:645 src/Dialogs.vala:659
 msgid "error message:"
 msgstr "felmeddelande:"
 
 #.
 #. Files Not Imported Because They Weren't Recognized as Photos or Videos
 #.
-#: ../src/Dialogs.vala:578
-msgid "Files Not Imported Because They Weren't Recognized as Photos or Videos:"
+#: src/Dialogs.vala:595
+msgid "Files Not Imported Because They Weren’t Recognized as Photos or Videos:"
 msgstr ""
 "Filerna importerades inte på grund av att de inte kändes igen som bild- "
 "eller filmfiler:"
@@ -1610,9 +3289,9 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because They Weren't in a Format Shotwell Understands
 #.
-#: ../src/Dialogs.vala:593
+#: 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 ""
 "Bilderna eller filmerna importerades inte på grund av att de var i ett "
@@ -1621,18 +3300,18 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because Shotwell Couldn't Copy Them into its Library
 #.
-#: ../src/Dialogs.vala:608
+#: 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 ""
 "Bilderna eller filmerna importerades inte på grund av att det inte gick att "
 "kopiera dem till biblioteket:"
 
-#: ../src/Dialogs.vala:612
+#: src/Dialogs.vala:629
 #, c-format
 msgid ""
-"couldn't copy %s\n"
+"couldn’t copy %s\n"
 "\tto %s"
 msgstr ""
 "det gick inte att kopiera %s\n"
@@ -1641,39 +3320,39 @@ msgstr ""
 #.
 #. Photos/Videos Not Imported Because GDK Pixbuf Library Identified them as Corrupt
 #.
-#: ../src/Dialogs.vala:624
+#: src/Dialogs.vala:641
 msgid "Photos/Videos Not Imported Because Files Are Corrupt:"
 msgstr "Bilder/filmer importerades inte eftersom filer är korrupta:"
 
 #.
 #. Photos/Videos Not Imported for Other Reasons
 #.
-#: ../src/Dialogs.vala:639
+#: src/Dialogs.vala:656
 msgid "Photos/Videos Not Imported for Other Reasons:"
 msgstr "Bilder/filmer importerades inte på grund av andra anledningar:"
 
-#: ../src/Dialogs.vala:659
+#: src/Dialogs.vala:676
 #, c-format
 msgid "1 duplicate photo was not imported:\n"
 msgid_plural "%d duplicate photos were not imported:\n"
 msgstr[0] "1 bilddubblett importerades inte:\n"
 msgstr[1] "%d bilddubbletter importerades inte:\n"
 
-#: ../src/Dialogs.vala:662
+#: src/Dialogs.vala:679
 #, c-format
 msgid "1 duplicate video was not imported:\n"
 msgid_plural "%d duplicate videos were not imported:\n"
 msgstr[0] "1 filmdubblett importerades inte:\n"
 msgstr[1] "%d filmdubbletter importerades inte:\n"
 
-#: ../src/Dialogs.vala:665
+#: src/Dialogs.vala:682
 #, c-format
 msgid "1 duplicate photo/video was not imported:\n"
 msgid_plural "%d duplicate photos/videos were not imported:\n"
 msgstr[0] "1 film-/bilddubblett importerades inte:\n"
 msgstr[1] "%d bild- och filmdubbletter importerades inte:\n"
 
-#: ../src/Dialogs.vala:679
+#: src/Dialogs.vala:696
 #, c-format
 msgid "1 photo failed to import due to a file or hardware error:\n"
 msgid_plural "%d photos failed to import due to a file or hardware error:\n"
@@ -1682,7 +3361,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Import av %d bilder misslyckades på grund av ett fil- eller hårdvarufel:\n"
 
-#: ../src/Dialogs.vala:682
+#: src/Dialogs.vala:699
 #, c-format
 msgid "1 video failed to import due to a file or hardware error:\n"
 msgid_plural "%d videos failed to import due to a file or hardware error:\n"
@@ -1691,7 +3370,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d filmer gick inte att importera på grund av ett fil- eller hårdvarufel:\n"
 
-#: ../src/Dialogs.vala:685
+#: src/Dialogs.vala:702
 #, c-format
 msgid "1 photo/video failed to import due to a file or hardware error:\n"
 msgid_plural ""
@@ -1702,7 +3381,7 @@ msgstr[1] ""
 "%d bilder och filmer gick inte att importera på grund av ett fil- eller "
 "hårdvarufel:\n"
 
-#: ../src/Dialogs.vala:688
+#: src/Dialogs.vala:705
 #, c-format
 msgid "1 file failed to import due to a file or hardware error:\n"
 msgid_plural "%d files failed to import due to a file or hardware error:\n"
@@ -1711,7 +3390,7 @@ msgstr[0] ""
 msgstr[1] ""
 "%d filer gick inte att importera på grund av ett fil- eller hårdvarufel:\n"
 
-#: ../src/Dialogs.vala:702
+#: src/Dialogs.vala:719
 #, c-format
 msgid ""
 "1 photo failed to import because the photo library folder was not writable:\n"
@@ -1725,7 +3404,7 @@ msgstr[1] ""
 "%d bilder gick inte att importera därför att bildbiblioteksmappen inte var "
 "skrivbar:\n"
 
-#: ../src/Dialogs.vala:705
+#: src/Dialogs.vala:722
 #, c-format
 msgid ""
 "1 video failed to import because the photo library folder was not writable:\n"
@@ -1739,7 +3418,7 @@ msgstr[1] ""
 "%d filmer gick inte att importera därför att bildbiblioteksmappen inte var "
 "skrivbar:\n"
 
-#: ../src/Dialogs.vala:708
+#: src/Dialogs.vala:725
 #, c-format
 msgid ""
 "1 photo/video failed to import because the photo library folder was not "
@@ -1754,7 +3433,7 @@ msgstr[1] ""
 "%d bilder och filmer gick inte att importera därför att bildbiblioteksmappen "
 "inte var skrivbar:\n"
 
-#: ../src/Dialogs.vala:711
+#: src/Dialogs.vala:728
 #, c-format
 msgid ""
 "1 file failed to import because the photo library folder was not writable:\n"
@@ -1768,21 +3447,21 @@ msgstr[1] ""
 "%d filer gick inte att importera på grund av att bildbibliotekets mapp inte "
 "var skrivbar:\n"
 
-#: ../src/Dialogs.vala:725
+#: src/Dialogs.vala:742
 #, c-format
 msgid "1 photo failed to import due to a camera error:\n"
 msgid_plural "%d photos failed to import due to a camera error:\n"
 msgstr[0] "Import av ett bild misslyckades på grund av ett kamerafel:\n"
 msgstr[1] "%d bilder gick inte att importera på grund av ett kamerafel:\n"
 
-#: ../src/Dialogs.vala:728
+#: src/Dialogs.vala:745
 #, c-format
 msgid "1 video failed to import due to a camera error:\n"
 msgid_plural "%d videos failed to import due to a camera error:\n"
 msgstr[0] "1 video gick inte att importera på grund av ett kamerafel:\n"
 msgstr[1] "%d filmer gick inte att importera på grund av ett kamerafel:\n"
 
-#: ../src/Dialogs.vala:731
+#: src/Dialogs.vala:748
 #, c-format
 msgid "1 photo/video failed to import due to a camera error:\n"
 msgid_plural "%d photos/videos failed to import due to a camera error:\n"
@@ -1790,14 +3469,14 @@ msgstr[0] "1 bild/film gick inte att importera på grund av ett kamerafel:\n"
 msgstr[1] ""
 "%d bilder och filmer gick inte att importera på grund av ett kamerafel:\n"
 
-#: ../src/Dialogs.vala:734
+#: src/Dialogs.vala:751
 #, c-format
 msgid "1 file failed to import due to a camera error:\n"
 msgid_plural "%d files failed to import due to a camera error:\n"
 msgstr[0] "En fil gick inte att importera på grund av ett kamerafel:\n"
 msgstr[1] "%d filer gick inte att importera på grund av ett kamerafel:\n"
 
-#: ../src/Dialogs.vala:748
+#: src/Dialogs.vala:765
 #, c-format
 msgid "1 photo failed to import because it was corrupt:\n"
 msgid_plural "%d photos failed to import because they were corrupt:\n"
@@ -1805,7 +3484,7 @@ msgstr[0] "Misslyckades med att importera en bild eftersom den var korrupt:\n"
 msgstr[1] ""
 "Misslyckades med att importera %d bilder eftersom de var korrupta:\n"
 
-#: ../src/Dialogs.vala:751
+#: src/Dialogs.vala:768
 #, c-format
 msgid "1 video failed to import because it was corrupt:\n"
 msgid_plural "%d videos failed to import because they were corrupt:\n"
@@ -1813,7 +3492,7 @@ msgstr[0] "Misslyckades med att importera en film eftersom den var korrupt:\n"
 msgstr[1] ""
 "Misslyckades med att importera %d filmer eftersom de var korrupta:\n"
 
-#: ../src/Dialogs.vala:754
+#: src/Dialogs.vala:771
 #, c-format
 msgid "1 photo/video failed to import because it was corrupt:\n"
 msgid_plural "%d photos/videos failed to import because they were corrupt:\n"
@@ -1822,7 +3501,7 @@ msgstr[0] ""
 msgstr[1] ""
 "Misslyckades med att importera %d bilder/filmer eftersom de var korrupta:\n"
 
-#: ../src/Dialogs.vala:757
+#: src/Dialogs.vala:774
 #, c-format
 msgid "1 file failed to import because it was corrupt:\n"
 msgid_plural "%d files failed to import because it was corrupt:\n"
@@ -1833,7 +3512,7 @@ msgstr[1] "Misslyckades med att importera %d filer eftersom de var korrupta:\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:774
+#: src/Dialogs.vala:791
 #, c-format
 msgid "1 unsupported photo skipped:\n"
 msgid_plural "%d unsupported photos skipped:\n"
@@ -1842,56 +3521,56 @@ msgstr[1] "%d bilder som inte stöds hoppades över:\n"
 
 #. we have no notion of "non-video" video files right now in Shotwell, so this
 #. message doesn't need to be media specific
-#: ../src/Dialogs.vala:789
+#: src/Dialogs.vala:806
 #, c-format
 msgid "1 non-image file skipped.\n"
 msgid_plural "%d non-image files skipped.\n"
 msgstr[0] "En icke-bildfil hoppades över.\n"
 msgstr[1] "%d icke-bildfiler hoppades över.\n"
 
-#: ../src/Dialogs.vala:800
+#: src/Dialogs.vala:817
 #, c-format
 msgid "1 photo skipped due to user cancel:\n"
 msgid_plural "%d photos skipped due to user cancel:\n"
 msgstr[0] "En bild hoppades över därför att användaren avbröt:\n"
 msgstr[1] "%d bilder hoppades över därför att användaren avbröt:\n"
 
-#: ../src/Dialogs.vala:803
+#: src/Dialogs.vala:820
 #, c-format
 msgid "1 video skipped due to user cancel:\n"
 msgid_plural "%d videos skipped due to user cancel:\n"
 msgstr[0] "1 film hoppades över därför att användaren avbröt:\n"
 msgstr[1] "%d filmer hoppades över därför att användaren avbröt:\n"
 
-#: ../src/Dialogs.vala:806
+#: src/Dialogs.vala:823
 #, c-format
 msgid "1 photo/video skipped due to user cancel:\n"
 msgid_plural "%d photos/videos skipped due to user cancel:\n"
 msgstr[0] "1 bild/film hoppades över därför att användaren avbröt:\n"
 msgstr[1] "%d bilder och filmer hoppades över därför att användaren avbröt:\n"
 
-#: ../src/Dialogs.vala:809
+#: src/Dialogs.vala:826
 #, c-format
 msgid "1 file skipped due to user cancel:\n"
 msgid_plural "%d file skipped due to user cancel:\n"
 msgstr[0] "En fil hoppades över därför att användaren avbröt:\n"
 msgstr[1] "%d filer hoppades över därför att användaren avbröt:\n"
 
-#: ../src/Dialogs.vala:823
+#: src/Dialogs.vala:840
 #, c-format
 msgid "1 photo successfully imported.\n"
 msgid_plural "%d photos successfully imported.\n"
 msgstr[0] "En bild importerades.\n"
 msgstr[1] "%d bilder importerades.\n"
 
-#: ../src/Dialogs.vala:826
+#: src/Dialogs.vala:843
 #, c-format
 msgid "1 video successfully imported.\n"
 msgid_plural "%d videos successfully imported.\n"
 msgstr[0] "En film importerades.\n"
 msgstr[1] "%d filmer importerades.\n"
 
-#: ../src/Dialogs.vala:829
+#: src/Dialogs.vala:846
 #, c-format
 msgid "1 photo/video successfully imported.\n"
 msgid_plural "%d photos/videos successfully imported.\n"
@@ -1900,187 +3579,179 @@ msgstr[1] "%d bilder och filmer importerades.\n"
 
 #. if no media items were imported at all (i.e. an empty directory attempted), need to at least
 #. report that nothing was imported
-#: ../src/Dialogs.vala:845
+#: src/Dialogs.vala:862
 msgid "No photos or videos imported.\n"
 msgstr "Inga bilder eller filmer importerades.\n"
 
-#: ../src/Dialogs.vala:852 ../src/Dialogs.vala:871
+#: src/Dialogs.vala:869 src/Dialogs.vala:888
 msgid "Import Complete"
 msgstr "Importen är färdig"
 
-#: ../src/Dialogs.vala:1157
+#: src/Dialogs.vala:1160
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: ../src/Dialogs.vala:1160
+#: src/Dialogs.vala:1163
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: ../src/Dialogs.vala:1164
+#: src/Dialogs.vala:1167
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: ../src/Dialogs.vala:1167
+#: src/Dialogs.vala:1170
 msgid "1 day"
 msgstr "Ett dygn"
 
-#: ../src/Dialogs.vala:1321 ../src/Resources.vala:231
+#: src/Dialogs.vala:1317 src/Resources.vala:231
 msgid "Rename Event"
 msgstr "Byt namn på händelse"
 
-#: ../src/Dialogs.vala:1321
+#: src/Dialogs.vala:1317
 msgid "Name:"
 msgstr "Namn:"
 
 #. Dialog title
-#. Button label
-#: ../src/Dialogs.vala:1332 ../src/Resources.vala:303
+#: src/Dialogs.vala:1328
+msgctxt "Dialog Title"
 msgid "Edit Title"
 msgstr "Redigera titel"
 
-#: ../src/Dialogs.vala:1333 ../src/Properties.vala:340
+#: src/Dialogs.vala:1329 src/Properties.vala:343
 msgid "Title:"
 msgstr "Titel:"
 
 #. Dialog title
-#: ../src/Dialogs.vala:1349 ../src/Resources.vala:310
+#: src/Dialogs.vala:1345 src/Resources.vala:307
 msgid "Edit Event Comment"
 msgstr "Redigera händelsekommentar"
 
-#: ../src/Dialogs.vala:1350
+#: src/Dialogs.vala:1346
 msgid "Edit Photo/Video Comment"
 msgstr "Redigera bild/filmkommentar"
 
-#: ../src/Dialogs.vala:1351 ../src/Properties.vala:628
+#: src/Dialogs.vala:1347 src/Properties.vala:631
 msgid "Comment:"
 msgstr "Kommentar:"
 
-#: ../src/Dialogs.vala:1367
+#: src/Dialogs.vala:1363
 msgid "Remove and _Trash File"
 msgid_plural "Remove and _Trash Files"
 msgstr[0] "_Flytta filen till papperskorgen"
 msgstr[1] "_Flytta filerna till papperskorgen"
 
-#: ../src/Dialogs.vala:1371
+#: src/Dialogs.vala:1367
 msgid "_Remove From Library"
 msgstr "_Ta bort från bibliotek"
 
-#: ../src/Dialogs.vala:1391 ../src/camera/ImportPage.vala:1740
-msgid "_Keep"
-msgstr "_Behåll"
-
-#: ../src/Dialogs.vala:1414
+#: src/Dialogs.vala:1410
 msgid "Revert External Edit?"
 msgstr "Återställ extern redigering?"
 
-#: ../src/Dialogs.vala:1414
+#: src/Dialogs.vala:1410
 msgid "Revert External Edits?"
 msgstr "Återställ externa redigeringar?"
 
-#: ../src/Dialogs.vala:1416
+#: 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] ""
-"Det här kommer att förstöra alla ändringar som gjorts i den externa filen.  "
+"Det här kommer att förstöra alla ändringar som gjorts i den externa filen. "
 "Vill du fortsätta?"
 msgstr[1] ""
 "Det här kommer att förstöra alla ändringar som gjorts i de %d externa "
-"filerna.  Vill du fortsätta?"
+"filerna. Vill du fortsätta?"
 
-#: ../src/Dialogs.vala:1420
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edit"
 msgstr "Åters_täll externa redigeringar"
 
-#: ../src/Dialogs.vala:1420
+#: src/Dialogs.vala:1416
 msgid "Re_vert External Edits"
 msgstr "Åt_erställ externa redigeringar"
 
-#: ../src/Dialogs.vala:1441
+#: 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] ""
 "Det här kommer att ta bort bilden från biblioteket. Vill du fortsätta?"
 msgstr[1] ""
 "Det här kommer att ta bort %d bilder från biblioteket. Vill du fortsätta?"
 
-#: ../src/Dialogs.vala:1448 ../src/Resources.vala:173
+#: src/Dialogs.vala:1444 src/Resources.vala:173
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../src/Dialogs.vala:1449
+#: src/Dialogs.vala:1445
 msgid "Remove Photo From Library"
 msgstr "Ta bort bild från biblioteket"
 
-#: ../src/Dialogs.vala:1449
+#: src/Dialogs.vala:1445
 msgid "Remove Photos From Library"
 msgstr "Ta bort bilder från bibliotek"
 
-#: ../src/Dialogs.vala:1542
+#: src/Dialogs.vala:1543
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/Dialogs.vala:1696
+#: src/Dialogs.vala:1697
 msgid "AM"
 msgstr "AM"
 
-#: ../src/Dialogs.vala:1697
+#: src/Dialogs.vala:1698
 msgid "PM"
 msgstr "PM"
 
-#: ../src/Dialogs.vala:1698
+#: src/Dialogs.vala:1699
 msgid "24 Hr"
 msgstr "24 timmar"
 
-#: ../src/Dialogs.vala:1713
+#: src/Dialogs.vala:1714
 msgid "_Shift photos/videos by the same amount"
 msgstr "_Förskjut bilder/filmer med samma värde"
 
-#: ../src/Dialogs.vala:1718
+#: src/Dialogs.vala:1719
 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:1725
 msgid "_Modify original photo file"
-msgstr "_Modifiera originalbilden"
+msgid_plural "_Modify original photo files"
+msgstr[0] "_Modifiera originalbilden"
+msgstr[1] "_Modifiera originalbilderna"
 
-#: ../src/Dialogs.vala:1725
-msgid "_Modify original photo files"
-msgstr "_Modifiera originalbilderna"
-
-#: ../src/Dialogs.vala:1728
+#: src/Dialogs.vala:1729
 msgid "_Modify original file"
-msgstr "Än_dra originalfil"
-
-#: ../src/Dialogs.vala:1728
-msgid "_Modify original files"
-msgstr "Än_dra originalfiler"
+msgid_plural "_Modify original files"
+msgstr[0] "Än_dra originalfil"
+msgstr[1] "Än_dra originalfilerna"
 
-#: ../src/Dialogs.vala:1814
+#: src/Dialogs.vala:1817
 msgid "Original: "
 msgstr "Original: "
 
-#: ../src/Dialogs.vala:1815
+#: src/Dialogs.vala:1818
 msgid "%m/%d/%Y, %H:%M:%S"
 msgstr "%Y-%m-%d, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1816
+#: src/Dialogs.vala:1819
 msgid "%m/%d/%Y, %I:%M:%S %p"
 msgstr "%Y-%m-%d, %H:%M:%S"
 
-#: ../src/Dialogs.vala:1905
+#: src/Dialogs.vala:1908
 #, c-format
 msgid ""
 "Exposure time will be shifted forward by\n"
@@ -2089,7 +3760,7 @@ msgstr ""
 "Exponeringsögonblicket kommer att flyttas framåt med\n"
 "%d %s, %d %s, %d %s och %d %s."
 
-#: ../src/Dialogs.vala:1906
+#: src/Dialogs.vala:1909
 #, c-format
 msgid ""
 "Exposure time will be shifted backward by\n"
@@ -2098,31 +3769,31 @@ msgstr ""
 "Exponeringsögonblicket kommer att flyttas bakåt med\n"
 "%d %s, %d %s, %d %s och %d %s."
 
-#: ../src/Dialogs.vala:1908
+#: src/Dialogs.vala:1911
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dag"
 msgstr[1] "dagar"
 
-#: ../src/Dialogs.vala:1909
+#: src/Dialogs.vala:1912
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "timme"
 msgstr[1] "timmar"
 
-#: ../src/Dialogs.vala:1910
+#: src/Dialogs.vala:1913
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuter"
 
-#: ../src/Dialogs.vala:1911
+#: src/Dialogs.vala:1914
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "sekund"
 msgstr[1] "sekunder"
 
-#: ../src/Dialogs.vala:1955
+#: src/Dialogs.vala:1958
 #, c-format
 msgid ""
 "\n"
@@ -2141,91 +3812,91 @@ msgstr[1] ""
 "\n"
 "och %d andra."
 
-#: ../src/Dialogs.vala:1977 ../src/Dialogs.vala:2004
+#: src/Dialogs.vala:1982 src/Dialogs.vala:2009
 msgid "Tags (separated by commas):"
 msgstr "Taggar (separerade med kommatecken):"
 
-#: ../src/Dialogs.vala:2084
+#: src/Dialogs.vala:2089
 msgid "Welcome!"
 msgstr "Välkommen!"
 
-#: ../src/Dialogs.vala:2091
+#: src/Dialogs.vala:2096
 msgid "Welcome to Shotwell!"
 msgstr "Välkommen till Shotwell!"
 
-#: ../src/Dialogs.vala:2095
+#: src/Dialogs.vala:2101
 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:2114
+#: src/Dialogs.vala:2121
 #, 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:2115
+#: src/Dialogs.vala:2122
 msgid "Drag and drop photos onto the Shotwell window"
 msgstr "Dra och släpp bilder till Shotwell-fönstret"
 
-#: ../src/Dialogs.vala:2116
+#: src/Dialogs.vala:2123
 msgid "Connect a camera to your computer and import"
 msgstr "Anslut en kamera till din dator och importera"
 
-#: ../src/Dialogs.vala:2126
+#: src/Dialogs.vala:2134
 #, c-format
 msgid "_Import photos from your %s folder"
 msgstr "_Importera bilder från din %s-mapp"
 
-#: ../src/Dialogs.vala:2133
+#: src/Dialogs.vala:2141
 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:2143
-msgid "_Don't show this message again"
+#: src/Dialogs.vala:2152
+msgid "_Don’t show this message again"
 msgstr "Visa _inte detta meddelande igen"
 
-#: ../src/Dialogs.vala:2178
+#: src/Dialogs.vala:2189
 #, c-format
 msgid "Import photos from your %s library"
 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 ghelp: URIs.
-#: ../src/Dialogs.vala:2325 ../src/Dialogs.vala:2329
+#. 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:2338
+#: src/Dialogs.vala:2346
 #, c-format
 msgid "Year%sMonth%sDay"
 msgstr "År%sMånad%sDag"
 
-#: ../src/Dialogs.vala:2340
+#: src/Dialogs.vala:2348
 #, c-format
 msgid "Year%sMonth"
 msgstr "År%sMånad"
 
-#: ../src/Dialogs.vala:2342
+#: src/Dialogs.vala:2350
 #, c-format
 msgid "Year%sMonth-Day"
 msgstr "År%sMånad-Dag"
 
-#: ../src/Dialogs.vala:2344
+#: src/Dialogs.vala:2352
 msgid "Year-Month-Day"
 msgstr "År-Månad-Dag"
 
-#: ../src/Dialogs.vala:2345 ../src/editing_tools/EditingTools.vala:781
+#: src/Dialogs.vala:2353 src/editing_tools/EditingTools.vala:782
 msgid "Custom"
 msgstr "Anpassad"
 
 #. Invalid pattern.
-#: ../src/Dialogs.vala:2582
+#: src/Dialogs.vala:2590
 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:2684
+#: src/Dialogs.vala:2692
 msgid ""
 "Shotwell can copy the photos into your library folder or it can import them "
 "without copying."
@@ -2233,292 +3904,679 @@ msgstr ""
 "Shotwell kan kopiera bilderna till din biblioteksmapp eller importera dem "
 "utan att kopiera dem."
 
-#: ../src/Dialogs.vala:2689
+#: src/Dialogs.vala:2697
 msgid "Co_py Photos"
 msgstr "Ko_piera bilder"
 
-#: ../src/Dialogs.vala:2690
+#: src/Dialogs.vala:2698
 msgid "_Import in Place"
 msgstr "_Importera på plats"
 
-#: ../src/Dialogs.vala:2691
+#: src/Dialogs.vala:2699
 msgid "Import to Library"
 msgstr "Importera till biblioteket"
 
-#: ../src/Dialogs.vala:2701 ../src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2709 src/PhotoPage.vala:2874
 msgid "Remove From Library"
 msgstr "Ta bort från biblioteket"
 
-#: ../src/Dialogs.vala:2702 ../src/PhotoPage.vala:3085
+#: src/Dialogs.vala:2710 src/PhotoPage.vala:2874
 msgid "Removing Photo From Library"
 msgstr "Tar bort bild från bibliotek"
 
-#: ../src/Dialogs.vala:2702
+#: src/Dialogs.vala:2710
 msgid "Removing Photos From Library"
 msgstr "Tar bort bilder från bibliotek"
 
-#: ../src/Dialogs.vala:2716
+#: src/Dialogs.vala:2724
 #, 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] ""
-"Det här kommer att ta bort bilden eller filmen från ditt Shotwell-"
-"bibliotek.  Vill du även flytta filen till papperskorgen?\n"
+"Det här kommer att ta bort bilden eller filmen från ditt Shotwell-bibliotek. "
+"Vill du även flytta filen till papperskorgen?\n"
 "\n"
 "Den här åtgärden kan inte ångras."
 msgstr[1] ""
 "Det här kommer att ta bort %d bilder eller filmer från ditt Shotwell-"
-"bibliotek.  Vill du även flytta filerna till papperskorgen?\n"
+"bibliotek. Vill du även flytta filerna till papperskorgen?\n"
 "\n"
 "Den här åtgärden kan inte ångras."
 
-#: ../src/Dialogs.vala:2720
+#: src/Dialogs.vala:2728
 #, 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] ""
-"Det här kommer att ta bort filmen från ditt Shotwell-bibliotek.  Vill du "
-"även flytta filmen till papperskorgen?\n"
+"Det här kommer att ta bort filmen från ditt Shotwell-bibliotek. Vill du även "
+"flytta filmen till papperskorgen?\n"
 "\n"
 "Den här åtgärden kan inte ångras."
 msgstr[1] ""
-"Det här kommer att ta bort %d filmer från ditt Shotwell-bibliotek.  Vill du "
+"Det här kommer att ta bort %d filmer från ditt Shotwell-bibliotek. Vill du "
 "även flytta filmerna till papperskorgen?\n"
 "\n"
 "Den här åtgärd kan inte ångras."
 
-#: ../src/Dialogs.vala:2724
+#: src/Dialogs.vala:2732
 #, 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] ""
-"Det här kommer att ta bort bilden från ditt Shotwell-bibliotek.  Vill du "
-"även flytta bilden till papperskorgen?\n"
+"Det här kommer att ta bort bilden från ditt Shotwell-bibliotek. Vill du även "
+"flytta bilden till papperskorgen?\n"
 "\n"
 "Den här åtgärden kan inte ångras."
 msgstr[1] ""
-"Det här kommer att ta bort %d bilder från ditt Shotwell-bibliotek.  Vill du "
+"Det här kommer att ta bort %d bilder från ditt Shotwell-bibliotek. Vill du "
 "även flytta bilderna till papperskorgen?\n"
 "\n"
 "Den här åtgärden kan inte ångras."
 
-#: ../src/Dialogs.vala:2756
+#: src/Dialogs.vala:2764
 #, 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] ""
-"Bilden eller filmen kan inte flyttas till papperskorgen.  Vill du radera "
+"Bilden eller filmen kan inte flyttas till papperskorgen. Vill du radera "
 "denna fil direkt?"
 msgstr[1] ""
-"%d bilder eller filmer kan inte flyttas till papperskorgen.  Vill du radera "
+"%d bilder eller filmer kan inte flyttas till papperskorgen. Vill du radera "
 "dessa filer direkt?"
 
 #. Alert the user that the files were not removed.
-#: ../src/Dialogs.vala:2773
+#: src/Dialogs.vala:2781
 #, c-format
 msgid "The photo or video cannot be deleted."
 msgid_plural "%d photos/videos cannot be deleted."
 msgstr[0] "Bilden eller filmen kan inte raderas."
 msgstr[1] "%d bilder eller filmer kan inte raderas."
 
-#: ../src/Dimensions.vala:23
+#: src/Dimensions.vala:23
 msgid "Width"
 msgstr "Bredd"
 
-#: ../src/Dimensions.vala:26
+#: src/Dimensions.vala:26
 msgid "Height"
 msgstr "Höjd"
 
+#: src/direct/DirectPhotoPage.vala:99
+#, c-format
+msgid "%s does not exist."
+msgstr "%s finns inte."
+
+#: src/direct/DirectPhotoPage.vala:101
+#, c-format
+msgid "%s is not a file."
+msgstr "%s är inte en fil."
+
+#: src/direct/DirectPhotoPage.vala:103
+#, c-format
+msgid ""
+"%s does not support the file format of\n"
+"%s."
+msgstr ""
+"%s saknar stöd för filformatet för\n"
+"%s."
+
+#: src/direct/DirectPhotoPage.vala:120
+#, c-format
+msgid "Unable open photo %s. Sorry."
+msgstr "Kunde inte öppna bilden %s."
+
+#: src/direct/DirectPhotoPage.vala:316 src/Resources.vala:175 ui/direct.ui:8
+msgid "_Save"
+msgstr "_Spara"
+
+#: src/direct/DirectPhotoPage.vala:316
+msgid "_Save a Copy"
+msgstr "_Spara en kopia"
+
+#: src/direct/DirectPhotoPage.vala:319
+#, c-format
+msgid "Lose changes to %s?"
+msgstr "Förkasta ändringarna i %s?"
+
+#: src/direct/DirectPhotoPage.vala:320
+msgid "Close _without Saving"
+msgstr "_Stäng utan att spara"
+
+#: src/direct/DirectPhotoPage.vala:353
+#, c-format
+msgid "Error while saving to %s: %s"
+msgstr "Fel vid sparande till %s: %s"
+
+#: src/direct/DirectPhotoPage.vala:383 src/direct/DirectPhotoPage.vala:404
+msgid "Save As"
+msgstr "Spara som"
+
 #. verify this is a directory
-#: ../src/DirectoryMonitor.vala:889
+#: src/DirectoryMonitor.vala:889
 #, c-format
 msgid "Unable to monitor %s: Not a directory (%s)"
 msgstr "Kunde inte övervaka %s: Det är inte en mapp (%s)"
 
+#: src/editing_tools/EditingTools.vala:666
+msgid "Return to current photo dimensions"
+msgstr "Återgå till befintliga bilddimensioner"
+
+#: src/editing_tools/EditingTools.vala:669
+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
+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
+msgid "Unconstrained"
+msgstr "Obegränsad"
+
+#: src/editing_tools/EditingTools.vala:755
+msgid "Square"
+msgstr "Kvadrat"
+
+#: src/editing_tools/EditingTools.vala:756
+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
+msgid "-"
+msgstr "-"
+
+#: src/editing_tools/EditingTools.vala:759
+msgid "SD Video (4 ∶ 3)"
+msgstr "SD-video (4 ∶ 3)"
+
+#: src/editing_tools/EditingTools.vala:760
+msgid "HD Video (16 ∶ 9)"
+msgstr "HD-video (16 ∶ 9)"
+
+#: src/editing_tools/EditingTools.vala:762 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
+msgid "Notecard (3 × 5 in.)"
+msgstr "Anteckningskort (3 × 5 tum)"
+
+#: src/editing_tools/EditingTools.vala:764 src/Printing.vala:798
+msgid "4 × 6 in."
+msgstr "4 × 6 tum"
+
+#: src/editing_tools/EditingTools.vala:765 src/Printing.vala:801
+msgid "5 × 7 in."
+msgstr "5 × 7 tum"
+
+#: src/editing_tools/EditingTools.vala:766 src/Printing.vala:804
+msgid "8 × 10 in."
+msgstr "8 × 10 tum"
+
+#: src/editing_tools/EditingTools.vala:767
+msgid "Letter (8.5 × 11 in.)"
+msgstr "Letter (8,5 × 11 tum)"
+
+#: src/editing_tools/EditingTools.vala:768 src/Printing.vala:807
+msgid "11 × 14 in."
+msgstr "11 × 14 tum"
+
+#: src/editing_tools/EditingTools.vala:769
+msgid "Tabloid (11 × 17 in.)"
+msgstr "Tabloid (11 × 17 tum)"
+
+#: src/editing_tools/EditingTools.vala:770 src/Printing.vala:810
+msgid "16 × 20 in."
+msgstr "16 × 20 tum"
+
+#: src/editing_tools/EditingTools.vala:772 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
+msgid "Postcard (10 × 15 cm)"
+msgstr "Vykortsstorlek (10 × 15 cm)"
+
+#: src/editing_tools/EditingTools.vala:774 src/Printing.vala:822
+msgid "13 × 18 cm"
+msgstr "13 × 18 cm"
+
+#: src/editing_tools/EditingTools.vala:775 src/Printing.vala:825
+msgid "18 × 24 cm"
+msgstr "18 × 24 cm"
+
+#: src/editing_tools/EditingTools.vala:776
+msgid "A4 (210 × 297 mm)"
+msgstr "A4 (210 × 297 mm)"
+
+#: src/editing_tools/EditingTools.vala:777 src/Printing.vala:828
+msgid "20 × 30 cm"
+msgstr "20 × 30 cm"
+
+#: src/editing_tools/EditingTools.vala:778 src/Printing.vala:831
+msgid "24 × 40 cm"
+msgstr "24 × 40 cm"
+
+#: src/editing_tools/EditingTools.vala:779 src/Printing.vala:834
+msgid "30 × 40 cm"
+msgstr "30 × 40 cm"
+
+#: src/editing_tools/EditingTools.vala:780
+msgid "A3 (297 × 420 mm)"
+msgstr "A3 (297 × 420 mm)"
+
+#: src/editing_tools/EditingTools.vala:1880 src/Properties.vala:398
+msgid "Size:"
+msgstr "Storlek:"
+
+#: src/editing_tools/EditingTools.vala:1895
+msgid "Close the red-eye tool"
+msgstr "Stäng röda ögon-verktyget"
+
+#: src/editing_tools/EditingTools.vala:1898
+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/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/Properties.vala:443 src/Properties.vala:450
+msgid "Exposure:"
+msgstr "Exponering:"
+
+#: src/editing_tools/EditingTools.vala:2261
+msgid "Contrast:"
+msgstr "Kontrast:"
+
+#: src/editing_tools/EditingTools.vala:2270
+msgid "Saturation:"
+msgstr "Mättnad:"
+
+#: src/editing_tools/EditingTools.vala:2279
+msgid "Tint:"
+msgstr "Färgton:"
+
+#: src/editing_tools/EditingTools.vala:2289
+msgid "Temperature:"
+msgstr "Färgtemperatur:"
+
+#: src/editing_tools/EditingTools.vala:2298
+msgid "Shadows:"
+msgstr "Skuggor:"
+
+#: src/editing_tools/EditingTools.vala:2307
+msgid "Highlights:"
+msgstr "Höjdpunkter:"
+
+#: src/editing_tools/EditingTools.vala:2363
+msgid "Reset Colors"
+msgstr "Återställ färger"
+
+#: src/editing_tools/EditingTools.vala:2363
+msgid "Reset all color adjustments to original"
+msgstr "Återställ alla färgjusteringar till de ursprungliga värdena"
+
+#: src/editing_tools/EditingTools.vala:2722
+msgid "Temperature"
+msgstr "Färgtemperatur"
+
+#: src/editing_tools/EditingTools.vala:2734
+msgid "Tint"
+msgstr "Färgton"
+
+#: src/editing_tools/EditingTools.vala:2746
+msgid "Contrast"
+msgstr "Kontrast"
+
+#: src/editing_tools/EditingTools.vala:2760
+msgid "Saturation"
+msgstr "Mättnad"
+
+#: src/editing_tools/EditingTools.vala:2773
+msgid "Exposure"
+msgstr "Exponering"
+
+#: src/editing_tools/EditingTools.vala:2786
+msgid "Shadows"
+msgstr "Skuggor"
+
+#: src/editing_tools/EditingTools.vala:2799
+msgid "Highlights"
+msgstr "Höjdpunkter"
+
+#: src/editing_tools/EditingTools.vala:2809
+msgid "Contrast Expansion"
+msgstr "Kontrastökning"
+
+#: src/editing_tools/StraightenTool.vala:99
+msgid "Angle:"
+msgstr "Vinkel:"
+
+#: src/editing_tools/StraightenTool.vala:100 src/Resources.vala:202
+#: ui/direct.ui:144 ui/photo.ui:233
+msgid "_Straighten"
+msgstr "_Räta ut"
+
+#: src/events/Branch.vala:25
+msgid "Events"
+msgstr "Händelser"
+
+#: src/events/EventDirectoryItem.vala:83
+#, 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
+#, 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
+#, c-format
+msgid "%d Photo"
+msgid_plural "%d Photos"
+msgstr[0] "%d bild"
+msgstr[1] "%d bilder"
+
+#: src/events/EventPage.vala:128
+msgid "No Event"
+msgstr "Ingen händelse"
+
+#: src/events/EventsDirectoryPage.vala:150
+msgid "No events"
+msgstr "Inga händelser"
+
+#: src/events/EventsDirectoryPage.vala:154
+msgid "No events found"
+msgstr "Inga händelser hittades"
+
+#: src/events/EventsDirectoryPage.vala:227
+msgid "All Events"
+msgstr "Alla händelser"
+
+#: src/events/EventsDirectoryPage.vala:241
+msgid "Undated"
+msgstr "Odaterade"
+
+#: src/events/EventsDirectoryPage.vala:242
+msgid "%Y"
+msgstr "%Y"
+
+#: src/events/EventsDirectoryPage.vala:243
+msgid "%B"
+msgstr "%B"
+
 #. if no name, pretty up the start time
-#: ../src/Event.vala:751
+#: src/Event.vala:753
 #, c-format
 msgid "Event %s"
 msgstr "Händelse %s"
 
-#: ../src/Exporter.vala:232
+#: src/Exporter.vala:232
 #, c-format
 msgid "Unable to generate a temporary file for %s: %s"
 msgstr "Kunde inte skapa en temporärfil för %s: %s"
 
-#: ../src/Exporter.vala:299
+#: src/Exporter.vala:299
 msgid "Exporting"
 msgstr "Exporterar"
 
-#: ../src/Exporter.vala:317
+#: src/Exporter.vala:317
 #, c-format
-msgid "File %s already exists.  Replace?"
-msgstr "Filen %s finns redan.  Vill du ersätta den?"
+msgid "File %s already exists. Replace?"
+msgstr "Filen %s finns redan. Vill du ersätta den?"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Skip"
 msgstr "_Hoppa över"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "_Replace"
 msgstr "_Ersätt"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Replace _All"
 msgstr "Ersätt _alla"
 
-#: ../src/Exporter.vala:319
+#: src/Exporter.vala:319
 msgid "Export"
 msgstr "Exportera"
 
-#: ../src/MediaMonitor.vala:400
+#: src/folders/Branch.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/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
+msgid "Flagged"
+msgstr "Flaggade"
+
+#: src/library/ImportQueuePage.vala:8
+msgid "Importing…"
+msgstr "Importerar…"
+
+#: src/library/ImportQueuePage.vala:129
+msgid "Preparing to import…"
+msgstr "Förbereder import…"
+
+#: src/library/ImportQueuePage.vala:156
 #, c-format
-msgid "Unable to process monitoring updates: %s"
-msgstr "Kunde inte behandla övervakningsuppdateringar: %s"
+msgid "Imported %s"
+msgstr "Importerade %s"
 
-#: ../src/MediaPage.vala:158
-msgid "Adjust the size of the thumbnails"
-msgstr "Justera storleken på miniatyrbilderna"
+#: src/library/LastImportPage.vala:8
+msgid "Last Import"
+msgstr "Senaste import"
 
-#: ../src/MediaPage.vala:340 ../src/PhotoPage.vala:2591
-#: ../src/Resources.vala:183 ../src/direct/DirectPhotoPage.vala:174
-msgid "Zoom _In"
-msgstr "_Förstora"
+#: src/library/LibraryWindow.vala:507
+msgid "Import From Folder"
+msgstr "Importera från mapp"
 
-#: ../src/MediaPage.vala:341
-msgid "Increase the magnification of the thumbnails"
-msgstr "Öka förstoringen på miniatyrbilderna"
+#: src/library/LibraryWindow.vala:576 ui/trash.ui:288
+msgid "Empty Trash"
+msgstr "Töm papperskorgen"
 
-#: ../src/MediaPage.vala:346 ../src/PhotoPage.vala:2597
-#: ../src/Resources.vala:184 ../src/direct/DirectPhotoPage.vala:180
-msgid "Zoom _Out"
-msgstr "_Förminska"
+#: src/library/LibraryWindow.vala:576
+msgid "Emptying Trash…"
+msgstr "Tömmer papperskorgen…"
+
+#: 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 är konfigurerat för att importera bilder till din hemkatalog.\n"
+"Vi rekommenderar att du ändrar detta i <span weight=\"bold\">Redigera %s-"
+"inställningar</span>.\n"
+"Vill du fortsätta att importera bilder?"
 
-#: ../src/MediaPage.vala:347
-msgid "Decrease the magnification of the thumbnails"
-msgstr "Minska förstoringen på miniatyrbilderna"
+#: src/library/LibraryWindow.vala:775 ui/shotwell.ui:142
+msgid "Library Location"
+msgstr "Biblioteksplats"
 
-#: ../src/MediaPage.vala:414
-msgid "Sort _Photos"
-msgstr "Sortera _bilder"
+#. TODO: Specify which directory/file.
+#: src/library/LibraryWindow.vala:788
+msgid "Photos cannot be imported from this directory."
+msgstr "Bilder kan inte importeras från denna mapp."
 
-#: ../src/MediaPage.vala:423
-msgid "_Play Video"
-msgstr "Spela _upp film"
+#: src/library/LibraryWindow.vala:1068
+#, c-format
+msgid "%s (%d%%)"
+msgstr "%s (%d%%)"
 
-#: ../src/MediaPage.vala:424
-msgid "Open the selected videos in the system video player"
-msgstr "Öppna markerade filmer i systemets filmspelare"
+#: src/library/LibraryWindow.vala:1112 src/library/LibraryWindow.vala:1123
+msgid "Updating library…"
+msgstr "Uppdaterar biblioteket…"
 
-#: ../src/MediaPage.vala:428 ../src/PhotoPage.vala:2640
-msgid "_Developer"
-msgstr "_Framkallare"
+#: src/library/LibraryWindow.vala:1129
+msgid "Preparing to auto-import photos…"
+msgstr "Förbereder automatisk import av bilder…"
 
-#: ../src/MediaPage.vala:440 ../src/camera/Branch.vala:99
-#: ../src/camera/ImportPage.vala:710 ../src/camera/ImportPage.vala:726
-#: ../src/photos/RawSupport.vala:303
-msgid "Camera"
-msgstr "Kamera"
+#: src/library/LibraryWindow.vala:1134
+msgid "Auto-importing photos…"
+msgstr "Importerar bilder automatiskt…"
 
-#: ../src/MediaPage.vala:451 ../src/camera/ImportPage.vala:873
-msgid "_Titles"
-msgstr "_Titlar"
+#: src/library/LibraryWindow.vala:1142
+msgid "Writing metadata to files…"
+msgstr "Skriver metadata till filer…"
 
-#: ../src/MediaPage.vala:452 ../src/camera/ImportPage.vala:874
-msgid "Display the title of each photo"
-msgstr "Visa titeln för varje bild"
+#: src/library/OfflinePage.vala:8
+msgid "Missing Files"
+msgstr "Saknade filer"
 
-#: ../src/MediaPage.vala:457 ../src/events/EventsDirectoryPage.vala:130
-msgid "_Comments"
-msgstr "_Kommentarer"
+#: src/library/OfflinePage.vala:110
+msgid "Deleting…"
+msgstr "Raderar…"
 
-#: ../src/MediaPage.vala:458
-msgid "Display the comment of each photo"
-msgstr "Visa kommentarer för varje bild"
+#: src/library/TrashPage.vala:8
+msgid "Trash"
+msgstr "Papperskorg"
 
-#: ../src/MediaPage.vala:469 ../src/library/LibraryWindow.vala:359
-msgid "Ta_gs"
-msgstr "_Taggar"
+#: src/library/TrashPage.vala:108
+msgid "Trash is empty"
+msgstr "Papperskorgen är tom"
 
-#: ../src/MediaPage.vala:470
-msgid "Display each photo's tags"
-msgstr "Visa taggar för varje bild"
+#: src/library/TrashPage.vala:112
+msgid "Delete"
+msgstr "Radera"
 
-#: ../src/MediaPage.vala:486
-msgid "By _Title"
-msgstr "Efter _titel"
+#: src/library/TrashPage.vala:113
+msgid "Deleting Photos"
+msgstr "Raderar bilder"
 
-#: ../src/MediaPage.vala:487
-msgid "Sort photos by title"
-msgstr "Sortera bilder efter titel"
+#: 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 ""
+"Ditt bildbibliotek är inte kompatibelt med den här versionen av Shotwell. "
+"Det verkar som det skapades med Shotwell %s (schema %d). Denna version är %s "
+"(schema %d). Använd den senaste versionen av Shotwell."
 
-#: ../src/MediaPage.vala:492
-msgid "By Exposure _Date"
-msgstr "Efter exponerings_ögonblick"
+#: 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 kunde inte uppgradera ditt bildbibliotek från version %s (schema "
+"%d) till %s (schema %d). För ytterligare information, läs Shotwells wiki-"
+"sida på %s"
 
-#: ../src/MediaPage.vala:493
-msgid "Sort photos by exposure date"
-msgstr "Sortera bilder efter exponeringsögonblick"
+#: 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 ""
+"Ditt bildbibliotek är inte kompatibelt med denna version av Shotwell. Det "
+"verkar som om det skapades med Shotwell %s (schema %d). Denna version är %s "
+"(schema %d). Töm ditt bibliotek genom att ta bort %s och importera dina "
+"bilder igen."
 
-#: ../src/MediaPage.vala:498
-msgid "By _Rating"
-msgstr "Efter _betyg"
+#: src/main.vala:71
+#, c-format
+msgid "Unknown error attempting to verify Shotwell’s database: %s"
+msgstr "Okänt fel vid försök att verifiera Shotwells databas: %s"
 
-#: ../src/MediaPage.vala:499
-msgid "Sort photos by rating"
-msgstr "Sortera bilder efter betyg"
+#: src/main.vala:104
+msgid "Loading Shotwell"
+msgstr "Läser in Shotwell"
 
-#: ../src/MediaPage.vala:504
-msgid "By _Filename"
-msgstr "Efter _filnamn"
+#: src/main.vala:293
+msgid "Path to Shotwell’s private data"
+msgstr "Sökväg till Shotwells privata data"
 
-#: ../src/MediaPage.vala:505
-msgid "Sort photos by filename"
-msgstr "Sortera bilder efter filnamn"
+#: src/main.vala:293
+msgid "DIRECTORY"
+msgstr "KATALOG"
 
-#: ../src/MediaPage.vala:515 ../src/library/LibraryWindow.vala:405
-msgid "_Ascending"
-msgstr "_Stigande"
+#: src/main.vala:297
+msgid "Do not monitor library directory at runtime for changes"
+msgstr "Sök inte efter ändringar i biblioteket medan programmet används"
 
-#: ../src/MediaPage.vala:516 ../src/library/LibraryWindow.vala:406
-msgid "Sort photos in an ascending order"
-msgstr "Sortera bilder i stigande ordning"
+#: src/main.vala:301
+msgid "Don’t display startup progress meter"
+msgstr "Visa inte hur uppstarten framskrider"
 
-#: ../src/MediaPage.vala:521 ../src/library/LibraryWindow.vala:412
-msgid "D_escending"
-msgstr "_Fallande"
+#: src/main.vala:305
+msgid "Show the application’s version"
+msgstr "Visa programversion"
 
-#: ../src/MediaPage.vala:522 ../src/library/LibraryWindow.vala:413
-msgid "Sort photos in a descending order"
-msgstr "Sortera bilder i fallande ordning"
+#. init GTK (valac has already called g_threads_init())
+#: src/main.vala:342
+msgid "[FILE]"
+msgstr "[FIL]"
 
-#: ../src/MediaPage.vala:723
+#: src/main.vala:346
+#, c-format
+msgid "Run “%s --help” to see a full list of available command line options.\n"
+msgstr ""
+"Kör ”%s --help” för en komplett lista över tillgängliga "
+"kommandoradsflaggor.\n"
+
+#: src/MediaMonitor.vala:400
+#, c-format
+msgid "Unable to process monitoring updates: %s"
+msgstr "Kunde inte behandla övervakningsuppdateringar: %s"
+
+#: src/MediaPage.vala:158
+msgid "Adjust the size of the thumbnails"
+msgstr "Justera storleken på miniatyrbilderna"
+
+#: src/MediaPage.vala:503
 #, c-format
 msgid ""
 "Shotwell was unable to play the selected video:\n"
@@ -2527,204 +4585,119 @@ msgstr ""
 "Shotwell kunde inte spela upp den markerade filmen:\n"
 "%s"
 
-#: ../src/Page.vala:1266
+#: src/Page.vala:1318
 msgid "No photos/videos"
 msgstr "Inga bilder eller filmer"
 
-#: ../src/Page.vala:1270
-msgid "No photos/videos found"
-msgstr "Inga bilder eller filmer hittades"
+#: src/Page.vala:1322
+msgid "No photos/videos found which match the current filter"
+msgstr "Inga bilder/videor hittades som matchar nuvarande filter"
 
-#: ../src/Page.vala:2568
+#: src/Page.vala:2628
 msgid "Photos cannot be exported to this directory."
 msgstr "Bilderna kan inte exporteras till denna mapp."
 
-#: ../src/Photo.vala:3753
-msgid "modified"
-msgstr "ändrad"
-
 #. previous button
-#: ../src/PhotoPage.vala:533
+#: src/PhotoPage.vala:538
 msgid "Previous photo"
 msgstr "Föregående bild"
 
 #. next button
-#: ../src/PhotoPage.vala:539
+#: src/PhotoPage.vala:544
 msgid "Next photo"
 msgstr "Nästa bild"
 
-#: ../src/PhotoPage.vala:1845
+#: src/PhotoPage.vala:1850
 #, c-format
 msgid "Photo source file missing: %s"
 msgstr "Källfilen för bilden saknas: %s"
 
-#: ../src/PhotoPage.vala:2412 ../src/direct/DirectPhotoPage.vala:165
-#: ../src/library/LibraryWindow.vala:343
-msgid "_View"
-msgstr "_Visa"
-
-#: ../src/PhotoPage.vala:2416 ../src/direct/DirectPhotoPage.vala:81
-msgid "T_ools"
-msgstr "_Verktyg"
-
-#: ../src/PhotoPage.vala:2421 ../src/direct/DirectPhotoPage.vala:86
-msgid "_Previous Photo"
-msgstr "_Föregående bild"
-
-#: ../src/PhotoPage.vala:2422 ../src/direct/DirectPhotoPage.vala:87
-msgid "Previous Photo"
-msgstr "Föregående bild"
-
-#: ../src/PhotoPage.vala:2427 ../src/direct/DirectPhotoPage.vala:92
-msgid "_Next Photo"
-msgstr "_Nästa bild"
+#: src/PhotoPage.vala:3018
+#, c-format
+msgid "Unable to export %s: %s"
+msgstr "Kunde inte exportera %s: %s"
 
-#: ../src/PhotoPage.vala:2428 ../src/direct/DirectPhotoPage.vala:93
-msgid "Next Photo"
-msgstr "Nästa bild"
+#: src/photos/BmpSupport.vala:32
+msgid "BMP"
+msgstr "BMP"
 
-#: ../src/PhotoPage.vala:2592 ../src/direct/DirectPhotoPage.vala:175
-msgid "Increase the magnification of the photo"
-msgstr "Öka förstoringen av bilden"
+#: src/photos/JfifSupport.vala:84
+msgid "JPEG"
+msgstr "JPEG"
 
-#: ../src/PhotoPage.vala:2598 ../src/direct/DirectPhotoPage.vala:181
-msgid "Decrease the magnification of the photo"
-msgstr "Minska förstoringen av bilden"
+#: src/photos/JfifSupport.vala:185
+#, c-format
+msgid "Low (%d%%)"
+msgstr "Låg (%d%%)"
 
-#: ../src/PhotoPage.vala:2603 ../src/direct/DirectPhotoPage.vala:186
-msgid "Fit to _Page"
-msgstr "_Anpassa till sidan"
+#: src/photos/JfifSupport.vala:188
+#, c-format
+msgid "Medium (%d%%)"
+msgstr "Mellan (%d%%)"
 
-#: ../src/PhotoPage.vala:2604 ../src/direct/DirectPhotoPage.vala:187
-msgid "Zoom the photo to fit on the screen"
-msgstr "Zooma bilden för att passa på skärmen"
+#: src/photos/JfifSupport.vala:191
+#, c-format
+msgid "High (%d%%)"
+msgstr "Hög (%d%%)"
 
-#: ../src/PhotoPage.vala:2610 ../src/direct/DirectPhotoPage.vala:193
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "_Visa 100%"
+#: src/photos/JfifSupport.vala:194
+#, c-format
+msgid "Maximum (%d%%)"
+msgstr "Maximal (%d%%)"
 
-#: ../src/PhotoPage.vala:2612 ../src/direct/DirectPhotoPage.vala:195
-#, no-c-format
-msgid "Zoom the photo to 100% magnification"
-msgstr "Zooma bilden till 100% förstoring"
+#: src/photos/PngSupport.vala:30
+msgid "PNG"
+msgstr "PNG"
 
-#: ../src/PhotoPage.vala:2618 ../src/direct/DirectPhotoPage.vala:201
-#, no-c-format
-msgid "Zoom _200%"
-msgstr "_Visa 200%"
+#: src/photos/RawSupport.vala:134
+msgid "RAW"
+msgstr "RAW"
 
-#: ../src/PhotoPage.vala:2620 ../src/direct/DirectPhotoPage.vala:203
-#, no-c-format
-msgid "Zoom the photo to 200% magnification"
-msgstr "Zooma bilden till 200% förstoring"
+#: src/photos/TiffSupport.vala:86
+msgid "TIFF"
+msgstr "TIFF"
 
-#: ../src/PhotoPage.vala:3229
-#, c-format
-msgid "Unable to export %s: %s"
-msgstr "Kunde inte exportera %s: %s"
+#: src/Photo.vala:3755
+msgid "modified"
+msgstr "ändrad"
 
-#: ../src/Printing.vala:255
+#: src/Printing.vala:255
 msgid "Fill the entire page"
 msgstr "Fyll hela sidan"
 
-#: ../src/Printing.vala:256
+#: src/Printing.vala:256
 msgid "2 images per page"
 msgstr "Två bilder per sida"
 
-#: ../src/Printing.vala:257
+#: src/Printing.vala:257
 msgid "4 images per page"
 msgstr "Fyra bilder per sida"
 
-#: ../src/Printing.vala:258
+#: src/Printing.vala:258
 msgid "6 images per page"
 msgstr "Sex bilder per sida"
 
-#: ../src/Printing.vala:259
+#: src/Printing.vala:259
 msgid "8 images per page"
 msgstr "Åtta bilder per sida"
 
-#: ../src/Printing.vala:260
+#: src/Printing.vala:260
 msgid "16 images per page"
 msgstr "16 bilder per sida"
 
-#: ../src/Printing.vala:261
+#: src/Printing.vala:261
 msgid "32 images per page"
 msgstr "32 bilder per sida"
 
-#: ../src/Printing.vala:348
-msgid "in."
-msgstr "tum"
-
-#: ../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 "Plånbokstorlek (2 x 3 tum)"
-
-#: ../src/Printing.vala:820 ../src/editing_tools/EditingTools.vala:762
-msgid "Notecard (3 x 5 in.)"
-msgstr "Anteckningskort (3 x 5 tum)"
-
-#: ../src/Printing.vala:823 ../src/editing_tools/EditingTools.vala:763
-msgid "4 x 6 in."
-msgstr "4 x 6 tum"
-
-#: ../src/Printing.vala:826 ../src/editing_tools/EditingTools.vala:764
-msgid "5 x 7 in."
-msgstr "5 x 7 tum"
-
-#: ../src/Printing.vala:829 ../src/editing_tools/EditingTools.vala:765
-msgid "8 x 10 in."
-msgstr "8 x 10 tum"
-
-#: ../src/Printing.vala:832 ../src/editing_tools/EditingTools.vala:767
-msgid "11 x 14 in."
-msgstr "11 x 14 tum"
-
-#: ../src/Printing.vala:835 ../src/editing_tools/EditingTools.vala:769
-msgid "16 x 20 in."
-msgstr "16 x 20 tum"
-
-#: ../src/Printing.vala:841 ../src/editing_tools/EditingTools.vala:771
-msgid "Metric Wallet (9 x 13 cm)"
-msgstr "Plånboksstorlek i centimeter (9 x 13 cm)"
-
-#: ../src/Printing.vala:844 ../src/editing_tools/EditingTools.vala:772
-msgid "Postcard (10 x 15 cm)"
-msgstr "Vykortsstorlek (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 "Bildinställningar"
 
-#: ../src/Printing.vala:888
-msgid "Printing..."
+#: src/Printing.vala:864
+msgid "Printing…"
 msgstr "Skriver ut…"
 
-#: ../src/Printing.vala:908 ../src/Printing.vala:1111
+#: src/Printing.vala:884 src/Printing.vala:1087
 #, c-format
 msgid ""
 "Unable to print photo:\n"
@@ -2735,911 +4708,947 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/Properties.vala:84
+#: src/Properties.vala:87
 msgid "Today"
 msgstr "Idag"
 
-#: ../src/Properties.vala:86
+#: src/Properties.vala:89
 msgid "Yesterday"
 msgstr "Igår"
 
-#: ../src/Properties.vala:227 ../src/camera/ImportPage.vala:311
-msgid "RAW+JPEG"
-msgstr "RAW+JPEG"
-
-#: ../src/Properties.vala:343
+#: src/Properties.vala:346
 msgid "Items:"
 msgstr "Objekt:"
 
-#: ../src/Properties.vala:346
+#: src/Properties.vala:349
 #, c-format
 msgid "%d Event"
 msgid_plural "%d Events"
 msgstr[0] "%d händelse"
 msgstr[1] "%d händelser"
 
-#: ../src/Properties.vala:353 ../src/events/EventDirectoryItem.vala:87
-#, c-format
-msgid "%d Photo"
-msgid_plural "%d Photos"
-msgstr[0] "%d bild"
-msgstr[1] "%d bilder"
-
-#: ../src/Properties.vala:355 ../src/events/EventDirectoryItem.vala:85
-#, c-format
-msgid "%d Video"
-msgid_plural "%d Videos"
-msgstr[0] "%d film"
-msgstr[1] "%d filmer"
-
 #. display only one date if start and end are the same
-#: ../src/Properties.vala:377
+#: src/Properties.vala:380
 msgid "Date:"
 msgstr "Datum:"
 
 #. display only one time if start and end are the same
-#: ../src/Properties.vala:381
+#: src/Properties.vala:384
 msgid "Time:"
 msgstr "Tid:"
 
 #. 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 "Från:"
 
-#: ../src/Properties.vala:385 ../src/Properties.vala:390
+#: src/Properties.vala:388 src/Properties.vala:393
 msgid "To:"
 msgstr "Till:"
 
-#: ../src/Properties.vala:395 ../src/editing_tools/EditingTools.vala:1872
-msgid "Size:"
-msgstr "Storlek:"
-
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 msgid "Duration:"
 msgstr "Speltid:"
 
-#: ../src/Properties.vala:404
+#: src/Properties.vala:407
 #, c-format
 msgid "%.1f seconds"
 msgstr "%.1f sekunder"
 
-#: ../src/Properties.vala:408
+#: src/Properties.vala:411
 msgid "Developer:"
 msgstr "Framkallare:"
 
-#. 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 "Exponering:"
-
 #. nothing special to be done for now for Events
-#: ../src/Properties.vala:583
+#: src/Properties.vala:586
 msgid "Location:"
 msgstr "Plats:"
 
-#: ../src/Properties.vala:586
+#: src/Properties.vala:589
 msgid "File size:"
 msgstr "Filstorlek:"
 
-#: ../src/Properties.vala:590
+#: src/Properties.vala:593
 msgid "Current Development:"
 msgstr "Nuvarande framkallare:"
 
-#: ../src/Properties.vala:592
+#: src/Properties.vala:595
 msgid "Original dimensions:"
 msgstr "Ursprungsstorlek:"
 
-#: ../src/Properties.vala:595
+#: src/Properties.vala:598
 msgid "Camera make:"
 msgstr "Kameratillverkare:"
 
-#: ../src/Properties.vala:598
+#: src/Properties.vala:601
 msgid "Camera model:"
 msgstr "Kameramodell:"
 
-#: ../src/Properties.vala:601
+#: src/Properties.vala:604
 msgid "Flash:"
 msgstr "Blixt:"
 
-#: ../src/Properties.vala:603
+#: src/Properties.vala:606
 msgid "Focal length:"
 msgstr "Brännvidd:"
 
-#: ../src/Properties.vala:606
+#: src/Properties.vala:609
 msgid "Exposure date:"
 msgstr "Exponeringsögonblick:"
 
-#: ../src/Properties.vala:609
+#: src/Properties.vala:612
 msgid "Exposure time:"
 msgstr "Exponeringstid:"
 
-#: ../src/Properties.vala:612
+#: src/Properties.vala:615
 msgid "Exposure bias:"
 msgstr "Exponeringskompensation:"
 
-#: ../src/Properties.vala:614
+#: src/Properties.vala:617
 msgid "GPS latitude:"
 msgstr "GPS-latitud:"
 
-#: ../src/Properties.vala:617
+#: src/Properties.vala:620
 msgid "GPS longitude:"
 msgstr "GPS-longitud:"
 
-#: ../src/Properties.vala:620
+#: src/Properties.vala:623
 msgid "Artist:"
 msgstr "Konstnär:"
 
-#: ../src/Properties.vala:622
+#: src/Properties.vala:625
 msgid "Copyright:"
 msgstr "Upphovsrätt:"
 
-#: ../src/Properties.vala:624
+#: src/Properties.vala:627
 msgid "Software:"
 msgstr "Program:"
 
-#: ../src/Properties.vala:641
+#: src/Properties.vala:644
 msgid "Extended Information"
 msgstr "Utökad information"
 
-#: ../src/Resources.vala:17
-msgid "Photo Manager"
-msgstr "Bildhanterare"
+#: src/publishing/PublishingPluginHost.vala:11
+msgid "Preparing for upload"
+msgstr "Förbereder att skicka upp"
 
-#: ../src/Resources.vala:18
-msgid "Photo Viewer"
-msgstr "Bildvisare"
+#: src/publishing/PublishingPluginHost.vala:12
+#, c-format
+msgid "Uploading %d of %d"
+msgstr "Skickar upp %d av %d"
 
-#: ../src/Resources.vala:139
-msgid "Rotate _Right"
-msgstr "Rotera åt _höger"
+#: src/publishing/PublishingPluginHost.vala:81
+#, c-format
+msgid "Publishing to %s can’t continue because an error occurred:"
+msgstr ""
+"Publiceringen till %s kan inte fortsätta på grund av att ett fel inträffade:"
+
+#: src/publishing/PublishingPluginHost.vala:84
+msgid "To try publishing to another service, select one from the above menu."
+msgstr ""
+"För att försöka att publicera till en annan tjänst, välj en från ovanstående "
+"meny."
+
+#. 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] "Den markerade filmen publicerades."
+msgstr[1] "De markerade filmerna publicerades."
+
+#: src/publishing/PublishingUI.vala:109
+msgid "The selected photo was successfully published."
+msgid_plural "The selected photos were successfully published."
+msgstr[0] "Den markerade bilden publicerades."
+msgstr[1] "De markerade bilderna publicerades."
+
+#: src/publishing/PublishingUI.vala:115
+msgid "The selected photos/videos were successfully published."
+msgstr "De valda bilderna eller filmerna publicerades."
+
+#: src/publishing/PublishingUI.vala:127
+msgid "Fetching account information…"
+msgstr "Hämtar kontoinformation…"
+
+#: src/publishing/PublishingUI.vala:133
+msgid "Logging in…"
+msgstr "Loggar in…"
+
+#: src/publishing/PublishingUI.vala:193
+msgid "Publish Photos"
+msgstr "Publicera bilder"
+
+#: src/publishing/PublishingUI.vala:194
+msgid "Publish photos _to:"
+msgstr "Publicera bilder _till:"
+
+#: src/publishing/PublishingUI.vala:196
+msgid "Publish Videos"
+msgstr "Publicera filmer"
+
+#: src/publishing/PublishingUI.vala:197
+msgid "Publish videos _to"
+msgstr "Publicera filmer _till"
+
+#: src/publishing/PublishingUI.vala:199
+msgid "Publish Photos and Videos"
+msgstr "Publicera bilder och filmer"
+
+#: src/publishing/PublishingUI.vala:200
+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
+msgid "Unable to publish"
+msgstr "Kunde inte publicera"
+
+#: src/publishing/PublishingUI.vala:411
+#, 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 kan inte publicera de markerade objekten därför att du inte har "
+"aktiverat en kompatibel insticksmodul för publicering. Välj <b>Redigera %s "
+"Inställningar</b> och aktivera en eller flera av de insticksmoduler för "
+"publicering som finns under fliken <b>Insticksmoduler</b>."
 
-#: ../src/Resources.vala:140 ../src/Resources.vala:145
+#: src/publishing/Publishing.vala:16
+msgid "Publishing"
+msgstr "Publicering"
+
+#: src/Resources.vala:140 src/Resources.vala:145 ui/collection.ui:149
 msgid "Rotate"
 msgstr "Rotera"
 
-#: ../src/Resources.vala:141
+#: src/Resources.vala:141
 msgid "Rotate Right"
 msgstr "Rotera åt höger"
 
-#: ../src/Resources.vala:142
+#: src/Resources.vala:142 ui/collection.ui:146
 msgid "Rotate the photos right (press Ctrl to rotate left)"
 msgstr "Rotera bilderna åt höger (tryck Ctrl för att rotera åt vänster)"
 
-#: ../src/Resources.vala:144
-msgid "Rotate _Left"
-msgstr "Rotera åt _vänster"
-
-#: ../src/Resources.vala:146
+#: src/Resources.vala:146
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
-#: ../src/Resources.vala:147
+#: src/Resources.vala:147
 msgid "Rotate the photos left"
 msgstr "Rotera bilderna åt vänster"
 
-#: ../src/Resources.vala:149
-msgid "Flip Hori_zontally"
-msgstr "Vänd hor_isontellt"
-
-#: ../src/Resources.vala:150
+#: src/Resources.vala:150
 msgid "Flip Horizontally"
 msgstr "Vänd horisontellt"
 
-#: ../src/Resources.vala:152
-msgid "Flip Verti_cally"
-msgstr "Vänd verti_kalt"
-
-#: ../src/Resources.vala:153
+#: src/Resources.vala:153
 msgid "Flip Vertically"
 msgstr "Vänd vertikalt"
 
-#: ../src/Resources.vala:155
+#: src/Resources.vala:155 ui/direct.ui:191 ui/events_directory.ui:168
+#: ui/event.ui:436 ui/import_queue.ui:83 ui/import.ui:201 ui/media.ui:419
+#: ui/offline.ui:198 ui/photo.ui:402 ui/tags.ui:438 ui/trash.ui:207
 msgid "_About"
 msgstr "_Om"
 
-#: ../src/Resources.vala:156
+#: src/Resources.vala:156
 msgid "_Apply"
 msgstr "_Verkställ"
 
-#: ../src/Resources.vala:159 ../src/direct/DirectPhotoPage.vala:73
-#: ../src/library/LibraryWindow.vala:339
+#: src/Resources.vala:159 ui/direct.ui:44 ui/events_directory.ui:32
+#: ui/event.ui:47 ui/import.ui:40 ui/media.ui:47 ui/offline.ui:32
+#: ui/photo.ui:55 ui/tags.ui:47 ui/trash.ui:37
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: ../src/Resources.vala:160
+#: src/Resources.vala:160
 msgid "_Forward"
 msgstr "_Framåt"
 
-#: ../src/Resources.vala:161
+#: src/Resources.vala:161 ui/direct.ui:62 ui/events_directory.ui:125
+#: ui/photo.ui:173
 msgid "Fulls_creen"
 msgstr "_Helskärm"
 
-#: ../src/Resources.vala:162 ../src/direct/DirectPhotoPage.vala:169
-#: ../src/library/LibraryWindow.vala:363
+#: 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
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../src/Resources.vala:163
+#: src/Resources.vala:163
 msgid "Leave _Fullscreen"
 msgstr "Avsluta _helskärmsläge"
 
-#: ../src/Resources.vala:164 ../src/Resources.vala:366
+#: src/Resources.vala:164 src/Resources.vala:363 ui/tags.ui:448
 msgid "_New"
 msgstr "_Ny"
 
-#: ../src/Resources.vala:165
+#: src/Resources.vala:165
 msgid "_Next"
 msgstr "_Nästa"
 
-#: ../src/Resources.vala:166
-msgid "_OK"
-msgstr "_OK"
-
-#: ../src/Resources.vala:167
-msgid "_Play"
-msgstr "_Spela"
-
-#: ../src/Resources.vala:168 ../src/Resources.vala:320
+#: src/Resources.vala:168 src/Resources.vala:317 ui/events_directory.ui:65
+#: ui/event.ui:93 ui/import.ui:68 ui/media.ui:93 ui/offline.ui:72
+#: ui/photo.ui:89 ui/tags.ui:93 ui/trash.ui:81
 msgid "_Preferences"
 msgstr "_Inställningar"
 
-#: ../src/Resources.vala:169
+#: src/Resources.vala:169
 msgid "_Previous"
 msgstr "_Föregående"
 
-#: ../src/Resources.vala:170
-msgid "_Print"
-msgstr "Skriv _ut"
-
-#: ../src/Resources.vala:171
+#: src/Resources.vala:171 ui/direct.ui:37 ui/events_directory.ui:25
+#: ui/event.ui:40 ui/import_queue.ui:31 ui/import.ui:33 ui/media.ui:40
+#: ui/offline.ui:25 ui/photo.ui:48 ui/tags.ui:40 ui/trash.ui:30
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../src/Resources.vala:172
+#: src/Resources.vala:172
 msgid "_Refresh"
 msgstr "_Uppdatera"
 
-#: ../src/Resources.vala:174
+#: src/Resources.vala:174
 msgid "_Revert"
 msgstr "_Återställ"
 
-#: ../src/Resources.vala:175 ../src/direct/DirectPhotoPage.vala:51
-#: ../src/direct/DirectPhotoPage.vala:432
-msgid "_Save"
-msgstr "_Spara"
-
-#: ../src/Resources.vala:176
+#: src/Resources.vala:176
 msgid "Save _As"
 msgstr "_Spara som"
 
-#: ../src/Resources.vala:177
+#: src/Resources.vala:177
 msgid "Sort _Ascending"
 msgstr "Sortera _stigande"
 
-#: ../src/Resources.vala:178
+#: src/Resources.vala:178
 msgid "Sort _Descending"
 msgstr "Sortera _fallande"
 
-#: ../src/Resources.vala:179
+#: src/Resources.vala:179
 msgid "_Stop"
 msgstr "_Stoppa"
 
-#: ../src/Resources.vala:180
+#: src/Resources.vala:180
 msgid "_Undelete"
 msgstr "_Ångra radering"
 
-#: ../src/Resources.vala:181
+#: src/Resources.vala:181
 msgid "_Normal Size"
 msgstr "_Normalstorlek"
 
-#: ../src/Resources.vala:182
+#: src/Resources.vala:182
 msgid "Best _Fit"
 msgstr "_Passa"
 
-#: ../src/Resources.vala:186
-msgid "_Enhance"
-msgstr "Förbä_ttra"
+#: src/Resources.vala:183 ui/direct.ui:69 ui/event.ui:260 ui/media.ui:260
+#: ui/photo.ui:144 ui/tags.ui:260
+msgid "Zoom _In"
+msgstr "_Förstora"
 
-#: ../src/Resources.vala:187
+#: src/Resources.vala:184 ui/direct.ui:74 ui/event.ui:265 ui/media.ui:265
+#: ui/photo.ui:149 ui/tags.ui:265
+msgid "Zoom _Out"
+msgstr "_Förminska"
+
+#: src/Resources.vala:187 ui/collection.ui:165
 msgid "Enhance"
 msgstr "Förbättra"
 
-#: ../src/Resources.vala:188
-msgid "Automatically improve the photo's appearance"
+#: src/Resources.vala:188 ui/collection.ui:162
+msgid "Automatically improve the photo’s appearance"
 msgstr "Förbättra visningen av bilden automatiskt"
 
-#: ../src/Resources.vala:190
-msgid "_Copy Color Adjustments"
-msgstr "_Kopiera färgjusteringar"
-
-#: ../src/Resources.vala:191
+#: src/Resources.vala:191
 msgid "Copy Color Adjustments"
 msgstr "Kopiera färgjusteringar"
 
-#: ../src/Resources.vala:192
+#: src/Resources.vala:192
 msgid "Copy the color adjustments applied to the photo"
 msgstr "Kopiera färgjusteringarna verkställda på bilden"
 
-#: ../src/Resources.vala:194
-msgid "_Paste Color Adjustments"
-msgstr "_Klistra in färgjusteringar"
-
-#: ../src/Resources.vala:195
+#: src/Resources.vala:195
 msgid "Paste Color Adjustments"
 msgstr "Klistra in färgjusteringar"
 
-#: ../src/Resources.vala:196
+#: src/Resources.vala:196
 msgid "Apply copied color adjustments to the selected photos"
 msgstr "Verkställ kopierade färgjusteringar till de markerade bilderna"
 
-#: ../src/Resources.vala:198
+#: src/Resources.vala:198 ui/direct.ui:139 ui/photo.ui:228
 msgid "_Crop"
 msgstr "_Beskär"
 
-#: ../src/Resources.vala:199
+#: src/Resources.vala:199
 msgid "Crop"
 msgstr "Beskär"
 
-#: ../src/Resources.vala:200
-msgid "Crop the photo's size"
+#: src/Resources.vala:200
+msgid "Crop the photo’s size"
 msgstr "Beskär bildstorlek"
 
-#: ../src/Resources.vala:202 ../src/editing_tools/StraightenTool.vala:100
-msgid "_Straighten"
-msgstr "_Räta ut"
-
-#: ../src/Resources.vala:203
+#: src/Resources.vala:203
 msgid "Straighten"
 msgstr "Räta ut"
 
-#: ../src/Resources.vala:204
+#: src/Resources.vala:204
 msgid "Straighten the photo"
 msgstr "Räta ut bilden"
 
-#: ../src/Resources.vala:206
+#: src/Resources.vala:206 ui/direct.ui:149 ui/photo.ui:238
 msgid "_Red-eye"
 msgstr "_Röda ögon"
 
-#: ../src/Resources.vala:207
+#: src/Resources.vala:207
 msgid "Red-eye"
 msgstr "Röda ögon"
 
-#: ../src/Resources.vala:208
+#: src/Resources.vala:208
 msgid "Reduce or eliminate any red-eye effects in the photo"
 msgstr "Minska eller ta bort röda ögon i bilden"
 
-#: ../src/Resources.vala:210
+#: src/Resources.vala:210 ui/direct.ui:154 ui/photo.ui:243
 msgid "_Adjust"
 msgstr "_Justera"
 
-#: ../src/Resources.vala:211
+#: src/Resources.vala:211
 msgid "Adjust"
 msgstr "Justera"
 
-#: ../src/Resources.vala:212
-msgid "Adjust the photo's color and tone"
-msgstr "Justera bildfärg och -ton"
-
-#: ../src/Resources.vala:214
-msgid "Re_vert to Original"
-msgstr "_Återställ till original"
+#: src/Resources.vala:212
+msgid "Adjust the photo’s color and tone"
+msgstr "Justera bildens färg och ton"
 
-#: ../src/Resources.vala:215
+#: src/Resources.vala:215
 msgid "Revert to Original"
 msgstr "Återställ till original"
 
-#: ../src/Resources.vala:217
+#: src/Resources.vala:217
 msgid "Revert External E_dits"
 msgstr "Återställ externa r_edigeringar"
 
-#: ../src/Resources.vala:218
+#: src/Resources.vala:218
 msgid "Revert to the master photo"
 msgstr "Återställ till huvudbild"
 
-#: ../src/Resources.vala:220
-msgid "Set as _Desktop Background"
-msgstr "Använd som skrivbords_bakgrund"
-
-#: ../src/Resources.vala:221
+#: src/Resources.vala:221
 msgid "Set selected image to be the new desktop background"
 msgstr "Använd bilden som ny skrivbordsbakgrund"
 
-#: ../src/Resources.vala:222
-msgid "Set as _Desktop Slideshow..."
-msgstr "_Använd som bildspel för skrivbord…"
+#: src/Resources.vala:222
+msgid "Set as _Desktop Slideshow…"
+msgstr "Ange som _skrivbordsbildspel…"
 
-#: ../src/Resources.vala:224
+#: src/Resources.vala:224 ui/direct.ui:47 ui/events_directory.ui:35
+#: ui/event.ui:50 ui/import.ui:43 ui/media.ui:50 ui/offline.ui:35
+#: ui/photo.ui:58 ui/tags.ui:50 ui/trash.ui:40
 msgid "_Undo"
 msgstr "_Ångra"
 
-#: ../src/Resources.vala:225
+#: src/Resources.vala:225
 msgid "Undo"
 msgstr "Ångra"
 
-#: ../src/Resources.vala:227
+#: src/Resources.vala:227 ui/direct.ui:52 ui/events_directory.ui:40
+#: ui/event.ui:55 ui/import.ui:48 ui/media.ui:55 ui/offline.ui:40
+#: ui/photo.ui:63 ui/tags.ui:55 ui/trash.ui:45
 msgid "_Redo"
 msgstr "_Gör om"
 
-#: ../src/Resources.vala:228
+#: src/Resources.vala:228
 msgid "Redo"
 msgstr "Gör om"
 
-#: ../src/Resources.vala:230
-msgid "Re_name Event..."
-msgstr "B_yt namn på händelse…"
+#: src/Resources.vala:230 ui/events_directory.ui:139 ui/events_directory.ui:181
+#: ui/event.ui:391 ui/event.ui:584
+msgid "Re_name Event…"
+msgstr "Byt namn på händelse…"
 
-#: ../src/Resources.vala:233
+#: src/Resources.vala:233 ui/event.ui:371 ui/event.ui:576
 msgid "Make _Key Photo for Event"
 msgstr "Gör till _huvudbild för händelsen"
 
-#: ../src/Resources.vala:234
+#: src/Resources.vala:234
 msgid "Make Key Photo for Event"
 msgstr "Gör till huvudbild för händelsen"
 
-#: ../src/Resources.vala:236
+#: src/Resources.vala:236 ui/event.ui:380 ui/media.ui:374 ui/tags.ui:374
 msgid "_New Event"
 msgstr "_Ny händelse"
 
-#: ../src/Resources.vala:237
+#: src/Resources.vala:237
 msgid "New Event"
 msgstr "Ny händelse"
 
-#: ../src/Resources.vala:239
+#: src/Resources.vala:239
 msgid "Move Photos"
 msgstr "Flytta bilder"
 
-#: ../src/Resources.vala:240
+#: src/Resources.vala:240
 msgid "Move photos to an event"
 msgstr "Flytta bilder till en händelse"
 
-#: ../src/Resources.vala:242
+#: src/Resources.vala:242 ui/events_directory.ui:135 ui/events_directory.ui:177
 msgid "_Merge Events"
 msgstr "Sa_mmanfoga händelser"
 
-#: ../src/Resources.vala:243
+#: src/Resources.vala:243
 msgid "Merge"
 msgstr "Sammanfoga"
 
-#: ../src/Resources.vala:244
+#: src/Resources.vala:244
 msgid "Combine events into a single event"
 msgstr "Lägg samman händelser till en enskild händelse"
 
-#: ../src/Resources.vala:246
+#: src/Resources.vala:246 ui/collection.ui:39 ui/event.ui:286 ui/event.ui:476
+#: ui/media.ui:286 ui/photo_context.ui:35 ui/photo.ui:273 ui/tags.ui:286
 msgid "_Set Rating"
 msgstr "_Betygsätt"
 
-#: ../src/Resources.vala:247
+#: src/Resources.vala:247
 msgid "Set Rating"
 msgstr "Betygsätt"
 
-#: ../src/Resources.vala:248
+#: src/Resources.vala:248
 msgid "Change the rating of your photo"
 msgstr "Ändra betyget för din bild"
 
-#: ../src/Resources.vala:250
+#: src/Resources.vala:250 ui/collection.ui:72 ui/event.ui:326 ui/event.ui:509
+#: ui/media.ui:326 ui/photo_context.ui:75 ui/photo.ui:313 ui/tags.ui:326
 msgid "_Increase"
 msgstr "_Höj"
 
-#: ../src/Resources.vala:251
+#: src/Resources.vala:251
 msgid "Increase Rating"
 msgstr "Höj betyg"
 
-#: ../src/Resources.vala:253
+#: src/Resources.vala:253 ui/collection.ui:76 ui/event.ui:331 ui/event.ui:513
+#: ui/media.ui:331 ui/photo_context.ui:80 ui/photo.ui:318 ui/tags.ui:331
 msgid "_Decrease"
 msgstr "_Sänk"
 
-#: ../src/Resources.vala:254
+#: src/Resources.vala:254
 msgid "Decrease Rating"
 msgstr "Sänk betyg"
 
-#: ../src/Resources.vala:256
+#: src/Resources.vala:256 ui/collection.ui:62 ui/event.ui:314 ui/event.ui:499
+#: ui/media.ui:314 ui/photo_context.ui:63 ui/photo.ui:301 ui/tags.ui:314
 msgid "_Unrated"
 msgstr "_Ej betygsatt"
 
-#: ../src/Resources.vala:257
+#: src/Resources.vala:257
 msgid "Unrated"
 msgstr "Ej betygsatt"
 
-#: ../src/Resources.vala:258
+#: src/Resources.vala:258
 msgid "Rate Unrated"
 msgstr "Ange som ej betygsatt"
 
-#: ../src/Resources.vala:259
+#: src/Resources.vala:259
 msgid "Setting as unrated"
 msgstr "Anger som ej betygsatt"
 
-#: ../src/Resources.vala:260
+#: src/Resources.vala:260
 msgid "Remove any ratings"
 msgstr "Ta bort eventuella betyg"
 
-#: ../src/Resources.vala:262
+#: src/Resources.vala:262 ui/collection.ui:66 ui/event.ui:319 ui/event.ui:503
+#: ui/media.ui:319 ui/photo_context.ui:68 ui/photo.ui:306 ui/tags.ui:319
 msgid "_Rejected"
 msgstr "_Avvisad"
 
-#: ../src/Resources.vala:263
+#: src/Resources.vala:263
 msgid "Rejected"
 msgstr "Avvisad"
 
-#: ../src/Resources.vala:264
+#: src/Resources.vala:264
 msgid "Rate Rejected"
 msgstr "Ange som avvisad"
 
-#: ../src/Resources.vala:265
+#: src/Resources.vala:265
 msgid "Setting as rejected"
 msgstr "Anger som avvisad"
 
-#: ../src/Resources.vala:266
+#: src/Resources.vala:266
 msgid "Set rating to rejected"
 msgstr "Ange som avvisad"
 
-#: ../src/Resources.vala:268
+#: src/Resources.vala:268 ui/event.ui:196 ui/import.ui:156 ui/media.ui:196
+#: ui/offline.ui:153 ui/search_bar.ui:6 ui/tags.ui:196 ui/trash.ui:162
 msgid "Rejected _Only"
 msgstr "_Enbart avvisade"
 
-#: ../src/Resources.vala:269
+#: src/Resources.vala:269
 msgid "Rejected Only"
 msgstr "Enbart avvisade"
 
-#: ../src/Resources.vala:270
+#: src/Resources.vala:270
 msgid "Show only rejected photos"
 msgstr "Visa enbart avvisade bilder"
 
-#: ../src/Resources.vala:272
+#: src/Resources.vala:272 ui/event.ui:190 ui/import.ui:150 ui/media.ui:190
+#: ui/offline.ui:147 ui/search_bar.ui:12 ui/tags.ui:190 ui/trash.ui:156
 msgid "All + _Rejected"
 msgstr "Alla + _avvisade"
 
-#: ../src/Resources.vala:273 ../src/Resources.vala:274
+#: src/Resources.vala:273
+msgctxt "Tooltip"
 msgid "Show all photos, including rejected"
 msgstr "Visa alla bilder, inklusive avvisade"
 
-#: ../src/Resources.vala:276
+#: src/Resources.vala:275 ui/event.ui:184 ui/import.ui:144 ui/media.ui:184
+#: ui/offline.ui:141 ui/search_bar.ui:18 ui/tags.ui:184 ui/trash.ui:150
 msgid "_All Photos"
 msgstr "_Alla bilder"
 
-#. Button label
 #. Button tooltip
-#: ../src/Resources.vala:278 ../src/Resources.vala:280
+#: src/Resources.vala:277
 msgid "Show all photos"
 msgstr "Visa alla bilder"
 
-#: ../src/Resources.vala:282
+#: src/Resources.vala:279 ui/event.ui:144 ui/media.ui:144 ui/photo.ui:120
+#: ui/tags.ui:144
 msgid "_Ratings"
 msgstr "_Betyg"
 
-#: ../src/Resources.vala:283
-msgid "Display each photo's rating"
+#: src/Resources.vala:280
+msgid "Display each photo’s rating"
 msgstr "Visa betyg för varje bild"
 
-#: ../src/Resources.vala:285
+#: src/Resources.vala:282 ui/event.ui:151 ui/import.ui:111 ui/media.ui:151
+#: ui/offline.ui:108 ui/tags.ui:151 ui/trash.ui:117
 msgid "_Filter Photos"
 msgstr "_Filtrera bilder"
 
-#: ../src/Resources.vala:286
+#: src/Resources.vala:283
 msgid "Filter Photos"
 msgstr "Filtrera bilder"
 
-#: ../src/Resources.vala:287
+#: src/Resources.vala:284
 msgid "Limit the number of photos displayed based on a filter"
 msgstr "Begränsa antalet bilder som visas baserat på ett filter"
 
-#: ../src/Resources.vala:289
-msgid "_Duplicate"
-msgstr "_Duplicera"
-
-#: ../src/Resources.vala:290
+#: src/Resources.vala:287
 msgid "Duplicate"
 msgstr "Duplicera"
 
-#: ../src/Resources.vala:291
+#: src/Resources.vala:288
 msgid "Make a duplicate of the photo"
 msgstr "Gör en kopia av bilden"
 
-#: ../src/Resources.vala:293
-msgid "_Export..."
+#: src/Resources.vala:290 ui/event.ui:17 ui/media.ui:17 ui/photo.ui:17
+#: ui/tags.ui:17
+msgid "_Export…"
 msgstr "_Exportera…"
 
-#: ../src/Resources.vala:295
-msgid "_Print..."
-msgstr "Skriv _ut…"
+#: src/Resources.vala:292
+msgid "_Print…"
+msgstr "_Skriv _ut…"
 
-#: ../src/Resources.vala:297
-msgid "Pu_blish..."
-msgstr "Pu_blicera…"
+#: src/Resources.vala:294
+msgid "Pu_blish…"
+msgstr "_Publicera…"
 
-#: ../src/Resources.vala:299
+#: src/Resources.vala:296 ui/collection.ui:187
 msgid "Publish to various websites"
 msgstr "Publicera till olika webbplatser"
 
-#: ../src/Resources.vala:301
-msgid "Edit _Title..."
-msgstr "Redigera _titel…"
+#: src/Resources.vala:298 ui/collection.ui:98 ui/event.ui:340 ui/event.ui:535
+#: ui/media.ui:340 ui/photo_context.ui:105 ui/photo.ui:327 ui/tags.ui:340
+msgid "Edit _Title…"
+msgstr "_Redigera titel…"
 
-#: ../src/Resources.vala:305
-msgid "Edit _Comment..."
+#. Button label
+#: src/Resources.vala:300
+msgctxt "Button Label"
+msgid "Edit Title"
+msgstr "Redigera 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
+msgid "Edit _Comment…"
 msgstr "Redigera _kommentar…"
 
 #. Button label
-#: ../src/Resources.vala:307
+#: src/Resources.vala:304
 msgid "Edit Comment"
 msgstr "Redigera kommentar"
 
-#: ../src/Resources.vala:309
-msgid "Edit Event _Comment..."
+#: src/Resources.vala:306 ui/event.ui:588
+msgid "Edit Event _Comment…"
 msgstr "Redigera _händelsekommentar…"
 
-#: ../src/Resources.vala:312
-msgid "_Adjust Date and Time..."
+#: src/Resources.vala:309 ui/direct.ui:167 ui/photo.ui:335
+msgid "_Adjust Date and Time…"
 msgstr "_Justera datum och tid…"
 
-#: ../src/Resources.vala:313
+#: src/Resources.vala:310
 msgid "Adjust Date and Time"
 msgstr "Justera datum och tid"
 
-#: ../src/Resources.vala:315
-msgid "Add _Tags..."
+#: src/Resources.vala:312 ui/collection.ui:19 ui/event.ui:405 ui/event.ui:456
+#: ui/media.ui:388 ui/photo.ui:372 ui/tags.ui:388
+msgid "Add _Tags…"
 msgstr "Lägg till _taggar…"
 
-#: ../src/Resources.vala:316
-msgid "_Add Tags..."
+#: src/Resources.vala:313 ui/photo_context.ui:17
+msgid "_Add Tags…"
 msgstr "_Lägg till taggar…"
 
 #. Dialog title
-#. Undo/Redo command name (in Edit menu)
-#: ../src/Resources.vala:318 ../src/Resources.vala:351
+#: src/Resources.vala:315
+msgctxt "Dialog Title"
 msgid "Add Tags"
 msgstr "Lägg till taggar"
 
-#: ../src/Resources.vala:322
-msgid "Open With E_xternal Editor"
-msgstr "Öppna med e_xtern redigerare"
-
-#: ../src/Resources.vala:324
-msgid "Open With RA_W Editor"
-msgstr "Öppna i RA_W-redigerare"
-
-#: ../src/Resources.vala:326
-msgid "Send _To..."
-msgstr "Skicka _till…"
+#: src/Resources.vala:324 ui/photo_context.ui:133
+msgid "Send T_o…"
+msgstr "Skicka t_ill…"
 
-#: ../src/Resources.vala:327
-msgid "Send T_o..."
-msgstr "Skicka _till…"
-
-#: ../src/Resources.vala:329
-msgid "_Find..."
+#: src/Resources.vala:326
+msgid "_Find…"
 msgstr "_Sök…"
 
-#: ../src/Resources.vala:330
+#: src/Resources.vala:327 ui/collection.ui:215 ui/offline.ui:239
+#: ui/trash.ui:312
 msgid "Find"
 msgstr "Sök"
 
-#: ../src/Resources.vala:331
+#: src/Resources.vala:328 ui/collection.ui:212 ui/offline.ui:236
+#: ui/trash.ui:309
 msgid "Find an image by typing text that appears in its name or tags"
 msgstr ""
 "Sök efter en bild genom att skriva något som finns i dess namn eller taggar"
 
-#: ../src/Resources.vala:333
+#: src/Resources.vala:330
 msgid "_Flag"
 msgstr "_Flagga"
 
-#: ../src/Resources.vala:335
+#: src/Resources.vala:332
 msgid "Un_flag"
 msgstr "Flagga _av"
 
-#: ../src/Resources.vala:338
+#: src/Resources.vala:335
 #, c-format
 msgid "Unable to launch editor: %s"
 msgstr "Kunde inte starta redigerare: %s"
 
-#: ../src/Resources.vala:343
+#: src/Resources.vala:340
 #, c-format
-msgid "Add Tag \"%s\""
+msgid "Add Tag “%s”"
 msgstr "Lägg till taggen ”%s”"
 
 #. Used when adding two tags to photo(s)
-#: ../src/Resources.vala:346
+#: src/Resources.vala:343
 #, c-format
-msgid "Add Tags \"%s\" and \"%s\""
+msgid "Add Tags “%s” and “%s”"
 msgstr "Lägg till taggarna ”%s” och ”%s”"
 
-#: ../src/Resources.vala:356
+#. Undo/Redo command name (in Edit menu)
+#: src/Resources.vala:348
+msgctxt "UndoRedo menu entry"
+msgid "Add Tags"
+msgstr "Lägg till taggar"
+
+#: src/Resources.vala:353
 #, c-format
-msgid "_Delete Tag \"%s\""
+msgid "_Delete Tag “%s”"
 msgstr "_Ta bort taggen ”%s”"
 
-#: ../src/Resources.vala:360
+#: src/Resources.vala:357
 #, c-format
-msgid "Delete Tag \"%s\""
+msgid "Delete Tag “%s”"
 msgstr "Ta bort taggen ”%s”"
 
-#: ../src/Resources.vala:363
+#: src/Resources.vala:360
 msgid "Delete Tag"
 msgstr "Ta bort tagg"
 
-#: ../src/Resources.vala:369
+#: src/Resources.vala:366
 #, c-format
-msgid "Re_name Tag \"%s\"..."
+msgid "Re_name Tag “%s”…"
 msgstr "B_yt namn på taggen ”%s”…"
 
-#: ../src/Resources.vala:373
+#: src/Resources.vala:370
 #, c-format
-msgid "Rename Tag \"%s\" to \"%s\""
+msgid "Rename Tag “%s” to “%s”"
 msgstr "Byt namn på taggen ”%s” till ”%s”"
 
-#: ../src/Resources.vala:376
-msgid "_Rename..."
+#: src/Resources.vala:373 ui/tags.ui:454
+msgid "_Rename…"
 msgstr "_Byt namn…"
 
-#: ../src/Resources.vala:378
-msgid "Modif_y Tags..."
-msgstr "Än_dra taggar…"
+#: src/Resources.vala:375 ui/collection.ui:24 ui/event.ui:410 ui/event.ui:461
+#: ui/media.ui:393 ui/photo_context.ui:22 ui/photo.ui:377 ui/tags.ui:393
+msgid "Modif_y Tags…"
+msgstr "_Ändra taggar…"
 
-#: ../src/Resources.vala:379
+#: src/Resources.vala:376
 msgid "Modify Tags"
 msgstr "Ändra taggar"
 
-#: ../src/Resources.vala:382
-#, c-format
-msgid "Tag Photo as \"%s\""
-msgstr "Lägg till taggen ”%s” till bilden"
-
-#: ../src/Resources.vala:382
-#, c-format
-msgid "Tag Photos as \"%s\""
-msgstr "Lägg till taggen ”%s” till bilderna"
-
-#: ../src/Resources.vala:386
-#, c-format
-msgid "Tag the selected photo as \"%s\""
-msgstr "Lägg till taggen ”%s” på den markerade bilden"
-
-#: ../src/Resources.vala:387
-#, c-format
-msgid "Tag the selected photos as \"%s\""
-msgstr "Lägg till taggen ”%s” på de markerade bilderna"
-
-#: ../src/Resources.vala:391
+#: src/Resources.vala:379
 #, c-format
-msgid "Remove Tag \"%s\" From _Photo"
-msgstr "_Ta bort taggen ”%s” från bild"
+msgid "Tag Photo as “%s”"
+msgid_plural "Tag Photos as “%s”"
+msgstr[0] "Lägg till taggen ”%s” till bilden"
+msgstr[1] "Lägg till taggen ”%s” till bilderna"
 
-#: ../src/Resources.vala:392
+#: src/Resources.vala:385
 #, c-format
-msgid "Remove Tag \"%s\" From _Photos"
-msgstr "_Ta bort taggen ”%s” från bilderna"
+msgid "Tag the selected photo as “%s”"
+msgid_plural "Tag the selected photos as “%s”"
+msgstr[0] "Lägg till taggen ”%s” på den markerade bilden"
+msgstr[1] "Lägg till taggen ”%s” på de markerade bilderna"
 
-#: ../src/Resources.vala:396
+#: src/Resources.vala:391
 #, c-format
-msgid "Remove Tag \"%s\" From Photo"
-msgstr "Ta bort taggen ”%s” från bilden"
+msgid "Remove Tag “%s” From _Photo"
+msgid_plural "Remove Tag “%s” From _Photos"
+msgstr[0] "_Ta bort taggen ”%s” från bilden"
+msgstr[1] "_Ta bort taggen ”%s” från bilderna"
 
-#: ../src/Resources.vala:397
+#: src/Resources.vala:397
 #, c-format
-msgid "Remove Tag \"%s\" From Photos"
-msgstr "Ta bort taggen ”%s” från bilderna"
+msgid "Remove Tag “%s” From Photo"
+msgid_plural "Remove Tag “%s” From Photos"
+msgstr[0] "Ta bort taggen ”%s” från bilden"
+msgstr[1] "Ta bort taggen ”%s” från bilderna"
 
-#: ../src/Resources.vala:401
+#: src/Resources.vala:403
 #, c-format
-msgid "Unable to rename tag to \"%s\" because the tag already exists."
+msgid "Unable to rename tag to “%s” because the tag already exists."
 msgstr "Kunde inte byta namn på taggen till ”%s” eftersom taggen redan finns."
 
-#: ../src/Resources.vala:405
+#: src/Resources.vala:407
 #, c-format
-msgid "Unable to rename search to \"%s\" because the search already exists."
+msgid "Unable to rename search to “%s” because the search already exists."
 msgstr ""
 "Kunde inte byta namn på sökningen till ”%s” eftersom sökningen redan finns."
 
-#: ../src/Resources.vala:408
+#. Saved search button
+#: src/Resources.vala:410 src/SearchFilter.vala:1124
 msgid "Saved Search"
 msgstr "Sparad sökning"
 
-#: ../src/Resources.vala:410
+#: src/Resources.vala:412
 msgid "Delete Search"
 msgstr "Ta bort sökning"
 
-#: ../src/Resources.vala:413
-msgid "_Edit..."
-msgstr "R_edigera…"
+#: src/Resources.vala:415 ui/savedsearch.ui:11
+msgid "_Edit…"
+msgstr "_Redigera…"
 
-#: ../src/Resources.vala:414
-msgid "Re_name..."
+#: src/Resources.vala:416 ui/savedsearch.ui:7
+msgid "Re_name…"
 msgstr "Byt _namn…"
 
-#: ../src/Resources.vala:417
+#: src/Resources.vala:419
 #, c-format
-msgid "Rename Search \"%s\" to \"%s\""
+msgid "Rename Search “%s” to “%s”"
 msgstr "Byt namn på sökningen ”%s” till ”%s”"
 
-#: ../src/Resources.vala:421
+#: src/Resources.vala:423
 #, c-format
-msgid "Delete Search \"%s\""
+msgid "Delete Search “%s”"
 msgstr "Ta bort sökningen ”%s”"
 
-#: ../src/Resources.vala:579
+#: src/Resources.vala:560
 #, c-format
 msgid "Rate %s"
 msgstr "Betyg %s"
 
-#: ../src/Resources.vala:580
+#: src/Resources.vala:561
 #, c-format
 msgid "Set rating to %s"
 msgstr "Sätt betyget %s"
 
-#: ../src/Resources.vala:581
+#: src/Resources.vala:562
 #, c-format
 msgid "Setting rating to %s"
 msgstr "Sätt betyget till %s"
 
-#: ../src/Resources.vala:583
+#: src/Resources.vala:564
 #, c-format
 msgid "Display %s"
 msgstr "Visa %s"
 
-#: ../src/Resources.vala:584
+#: src/Resources.vala:565
 #, c-format
 msgid "Only show photos with a rating of %s"
 msgstr "Visa endast bilder med betyget %s"
 
-#: ../src/Resources.vala:585
+#: src/Resources.vala:566
 #, c-format
 msgid "%s or Better"
 msgstr "%s eller högre"
 
-#: ../src/Resources.vala:586
+#: src/Resources.vala:567
 #, c-format
 msgid "Display %s or Better"
 msgstr "Visa %s eller högre"
 
-#: ../src/Resources.vala:587
+#: src/Resources.vala:568
 #, c-format
 msgid "Only show photos with a rating of %s or better"
 msgstr "Visa endast bilder med betyget %s eller högre"
 
-#: ../src/Resources.vala:678
+#: src/Resources.vala:659 ui/trash.ui:255
 msgid "Remove the selected photos from the trash"
 msgstr "Ta bort markerade bilder från papperskorgen"
 
-#: ../src/Resources.vala:679
+#: src/Resources.vala:660 ui/offline.ui:221
 msgid "Remove the selected photos from the library"
 msgstr "Ta bort markerade bilder från biblioteket"
 
-#: ../src/Resources.vala:681
+#: src/Resources.vala:662 ui/trash.ui:68 ui/trash.ui:221 ui/trash.ui:273
 msgid "_Restore"
 msgstr "Åt_erställ"
 
-#: ../src/Resources.vala:682
+#: src/Resources.vala:663 ui/trash.ui:270
 msgid "Move the selected photos back into the library"
 msgstr "Flytta tillbaka markerade bilder till biblioteket"
 
-#: ../src/Resources.vala:684
+#: src/Resources.vala:665 ui/collection.ui:121 ui/direct_context.ui:20
+#: ui/direct.ui:30 ui/event.ui:27 ui/event.ui:558 ui/media.ui:27
+#: ui/photo_context.ui:128 ui/photo.ui:35 ui/tags.ui:27 ui/trash.ui:19
+#: ui/trash.ui:227
 msgid "Show in File Mana_ger"
 msgstr "Öppna med _filhanteraren"
 
-#: ../src/Resources.vala:685
-msgid "Open the selected photo's directory in the file manager"
+#: src/Resources.vala:666
+msgid "Open the selected photo’s directory in the file manager"
 msgstr "Öppna mappen för den markerade bilden i filhanteraren"
 
-#: ../src/Resources.vala:688
+#: src/Resources.vala:669
 #, c-format
 msgid "Unable to open in file manager: %s"
 msgstr "Kunde inte öppna i filhanterare: %s"
 
-#: ../src/Resources.vala:691
+#: src/Resources.vala:672 ui/offline.ui:224
 msgid "R_emove From Library"
 msgstr "Ta _bort från biblioteket"
 
-#: ../src/Resources.vala:693
+#: src/Resources.vala:674 ui/collection.ui:132 ui/event.ui:79 ui/event.ui:569
+#: ui/media.ui:79 ui/photo_context.ui:139 ui/photo.ui:82 ui/tags.ui:79
 msgid "_Move to Trash"
 msgstr "_Flytta till papperskorgen"
 
-#: ../src/Resources.vala:695
+#: src/Resources.vala:676 ui/events_directory.ui:58 ui/event.ui:86
+#: ui/import.ui:61 ui/media.ui:86 ui/offline.ui:65 ui/tags.ui:86 ui/trash.ui:74
 msgid "Select _All"
 msgstr "Markera _alla"
 
-#: ../src/Resources.vala:696
+#: src/Resources.vala:677
 msgid "Select all items"
 msgstr "Markera alla objekt"
 
@@ -3647,1422 +5656,1012 @@ msgstr "Markera alla objekt"
 #. / Locale-specific time format for 12-hour time, i.e. 8:31 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:775
-msgid "%-I:%M %p"
-msgstr "%-I:%M %p"
-
 #. / Locale-specific time format for 12-hour time with seconds, i.e. 8:31:42 PM
 #. / Precede modifier with a dash ("-") to pad with spaces, otherwise will pad with zeroes
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:780
-msgid "%-I:%M:%S %p"
-msgstr "%-I:%M:%S %p"
-
 #. / Locale-specific calendar date format, i.e. "Tue Mar 08, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:784
+#: src/Resources.vala:738
 msgid "%a %b %d, %Y"
 msgstr "%a %d %b, %Y"
 
+# Till denna ordning är vi nödda och tvungna så det ser någorlunda ut även då strängarna för dagsintervall trycks ihop.
 #. / Locale-specific starting date format for multi-date strings,
 #. / i.e. the "Tue Mar 08" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#. / Locale-specific calendar date format for multi-month strings,
-#. / i.e. the "Tue Mar 08" in "Tue Mar 08 to Mon Apr 06, 2006"
-#. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:789 ../src/Resources.vala:799
+#: src/Resources.vala:743
+msgctxt "MultidayFormat"
 msgid "%a %b %d"
-msgstr "%a %d %b"
+msgstr "%a %b %d"
 
 #. / Locale-specific ending date format for multi-date strings,
 #. / i.e. the "10, 2006" in "Tue Mar 08 - 10, 2006"
 #. / See http://developer.gnome.org/glib/2.32/glib-GDateTime.html#g-date-time-format
-#: ../src/Resources.vala:794
+#: src/Resources.vala:748
+msgctxt "MultidayFormat"
 msgid "%d, %Y"
 msgstr "%d, %Y"
 
-#: ../src/Screensaver.vala:18 ../src/SlideshowPage.vala:141
-msgid "Slideshow"
-msgstr "Bildspel"
-
-#. Flagged label and toggle
-#: ../src/SearchFilter.vala:587 ../src/SearchFilter.vala:588
-#: ../src/SearchFilter.vala:972 ../src/library/FlaggedPage.vala:8
-msgid "Flagged"
-msgstr "Flaggade"
-
-#: ../src/SearchFilter.vala:593 ../src/SearchFilter.vala:594
-#: ../src/library/Branch.vala:97
-msgid "Photos"
-msgstr "Bilder"
-
-#: ../src/SearchFilter.vala:599 ../src/SearchFilter.vala:600
-msgid "Videos"
-msgstr "Filmer"
-
-#: ../src/SearchFilter.vala:605
-msgid "RAW Photos"
-msgstr "RAW-bilder"
-
-#: ../src/SearchFilter.vala:606
-msgid "RAW photos"
-msgstr "RAW-bilder"
-
-#: ../src/SearchFilter.vala:934
-#, c-format
-msgid "Error loading UI file %s: %s"
-msgstr "Fel vid inläsning av användargränssnittsfilen %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 "Stäng"
-
-#. Type label and toggles
-#: ../src/SearchFilter.vala:951
-msgid "Type"
-msgstr "Typ"
-
-#. Rating label and button
-#: ../src/SearchFilter.vala:985 ../src/searches/SearchBoolean.vala:184
-msgid "Rating"
-msgstr "Betyg"
-
-#: ../src/SlideshowPage.vala:49 ../src/SlideshowPage.vala:183
-msgid "Settings"
-msgstr "Inställningar"
-
-#. Set up toolbar
-#. add toolbar buttons
-#: ../src/SlideshowPage.vala:160
-msgid "Back"
-msgstr "Bakåt"
-
-#: ../src/SlideshowPage.vala:162
-msgid "Go to the previous photo"
-msgstr "Gå till föregående bild"
-
-#: ../src/SlideshowPage.vala:167 ../src/SlideshowPage.vala:274
-msgid "Pause"
-msgstr "Pausa"
-
-#: ../src/SlideshowPage.vala:169 ../src/SlideshowPage.vala:275
-msgid "Pause the slideshow"
-msgstr "Pausa bildspelet"
-
-#: ../src/SlideshowPage.vala:174
-msgid "Next"
-msgstr "Nästa"
-
-#: ../src/SlideshowPage.vala:176
-msgid "Go to the next photo"
-msgstr "Gå till nästa bild"
-
-#: ../src/SlideshowPage.vala:184
-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
-msgid "All photo source files are missing."
-msgstr "Alla källbildfiler saknas."
-
-#: ../src/SlideshowPage.vala:270
-msgid "Play"
-msgstr "Spela upp"
-
-#: ../src/SlideshowPage.vala:271
-msgid "Continue the slideshow"
-msgstr "Fortsätt bildspelet"
-
-#: ../src/Tag.vala:817
-msgid "untitled"
-msgstr "namnlös"
+#. / 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
+msgctxt "MultimonthFormat"
+msgid "%a %b %d"
+msgstr "%a %d %b"
 
-#. multiple videos
-#: ../src/VideoSupport.vala:490
-msgid "Export Videos"
-msgstr "Exportera filmer"
+#. / 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
+msgctxt "MultimonthFormat"
+msgid "%a %b %d, %Y"
+msgstr "%a %d %b, %Y"
 
-#: ../src/camera/Branch.vala:85
-msgid "Cameras"
-msgstr "Kameror"
+#: src/Screensaver.vala:18 src/SlideshowPage.vala:141
+msgid "Slideshow"
+msgstr "Bildspel"
 
-#: ../src/camera/ImportPage.vala:458
-msgid ""
-"Unable to unmount camera.  Try unmounting the camera from the file manager."
-msgstr ""
-"Kunde inte avmontera kameran.  Försök att avmontera kameran från "
-"filhanteraren."
+#: src/searches/Branch.vala:68
+msgid "Saved Searches"
+msgstr "Sparade sökningar"
 
-#. hide duplicates checkbox
-#: ../src/camera/ImportPage.vala:775
-msgid "Hide photos already imported"
-msgstr "Dölj bilder som redan importerats"
+#. Ordering must correspond with SearchConditionText.Context
+#: src/searches/SavedSearchDialog.vala:162
+msgid "contains"
+msgstr "innehåller"
 
-#: ../src/camera/ImportPage.vala:776
-msgid "Only display photos that have not been imported"
-msgstr "Visa enbart bilder som inte har importerats"
+#. Ordering must correspond with Context
+#: src/searches/SavedSearchDialog.vala:163
+#: src/searches/SavedSearchDialog.vala:494
+msgid "is exactly"
+msgstr "är exakt"
 
-#. Ticket #3304 - Import page shouldn't display confusing message
-#. prior to import.
-#. TODO: replace this with approved text for "talking to camera,
-#. please wait" once new strings are being accepted.
-#: ../src/camera/ImportPage.vala:846
-msgid "Starting import, please wait..."
-msgstr "Påbörjar importen, var god vänta…"
+#: src/searches/SavedSearchDialog.vala:164
+msgid "starts with"
+msgstr "börjar med"
 
-#: ../src/camera/ImportPage.vala:885
-msgid "Import _Selected"
-msgstr "Importera _markerade"
+#: src/searches/SavedSearchDialog.vala:165
+msgid "ends with"
+msgstr "slutar med"
 
-#: ../src/camera/ImportPage.vala:886
-msgid "Import the selected photos into your library"
-msgstr "Importera de valda bilderna till ditt bibliotek"
+#: src/searches/SavedSearchDialog.vala:166
+msgid "does not contain"
+msgstr "innehåller inte"
 
-#: ../src/camera/ImportPage.vala:891
-msgid "Import _All"
-msgstr "Importera _alla"
+#: src/searches/SavedSearchDialog.vala:167
+#: src/searches/SavedSearchDialog.vala:498
+msgid "is not set"
+msgstr "är inte inställd"
 
-#: ../src/camera/ImportPage.vala:892
-msgid "Import all the photos into your library"
-msgstr "Importera alla bilder till ditt bibliotek"
+#: src/searches/SavedSearchDialog.vala:168
+msgid "is set"
+msgstr "är satt"
 
-#. it's mounted, offer to unmount for the user
-#: ../src/camera/ImportPage.vala:1013
-msgid ""
-"Shotwell needs to unmount the camera from the filesystem in order to access "
-"it.  Continue?"
-msgstr ""
-"Shotwell behöver avmontera kameran från filsystemet för att kunna komma åt "
-"den. Vill du fortsätta?"
+#. Ordering must correspond with SearchConditionMediaType.Context
+#: src/searches/SavedSearchDialog.vala:242
+#: src/searches/SavedSearchDialog.vala:373
+#: src/searches/SavedSearchDialog.vala:438
+msgid "is"
+msgstr "är"
 
-#: ../src/camera/ImportPage.vala:1019
-msgid "_Unmount"
-msgstr "A_vmontera"
+#: src/searches/SavedSearchDialog.vala:243
+msgid "is not"
+msgstr "är inte"
 
-#: ../src/camera/ImportPage.vala:1024
-msgid "Please unmount the camera."
-msgstr "Avmontera kameran."
+#. Ordering must correspond with SearchConditionMediaType.MediaType
+#: src/searches/SavedSearchDialog.vala:249
+msgid "any photo"
+msgstr "valfri bild"
 
-#: ../src/camera/ImportPage.vala:1029
-msgid ""
-"The camera is locked by another application.  Shotwell can only access the "
-"camera when it's unlocked.  Please close any other application using the "
-"camera and try again."
-msgstr ""
-"Kameran är låst av ett annat program.  Shotwell kan endast komma åt kameran "
-"när den är olåst.  Stäng alla andra program som använder kameran och försök "
-"igen."
+#: src/searches/SavedSearchDialog.vala:250
+msgid "a raw photo"
+msgstr "en råfil"
 
-#: ../src/camera/ImportPage.vala:1039
-msgid "Please close any other application using the camera."
-msgstr "Stäng alla andra program som använder kameran."
+#: src/searches/SavedSearchDialog.vala:251
+msgid "a video"
+msgstr "en film"
 
-#: ../src/camera/ImportPage.vala:1044
-#, c-format
-msgid ""
-"Unable to fetch previews from the camera:\n"
-"%s"
-msgstr ""
-"Kunde inte hämta förhandsvisningar från kameran:\n"
-"%s"
+#: src/searches/SavedSearchDialog.vala:305
+msgid "has"
+msgstr "har"
 
-#: ../src/camera/ImportPage.vala:1061
-msgid "Unmounting..."
-msgstr "Avmonterar…"
+#: src/searches/SavedSearchDialog.vala:306
+msgid "has no"
+msgstr "har inte"
 
-#: ../src/camera/ImportPage.vala:1167
-msgid "Fetching photo information"
-msgstr "Hämtar bildinformation"
+#: src/searches/SavedSearchDialog.vala:311
+msgid "modifications"
+msgstr "ändringar"
 
-#: ../src/camera/ImportPage.vala:1522
-#, c-format
-msgid "Fetching preview for %s"
-msgstr "Hämtar förhandsvisning av %s"
+#: src/searches/SavedSearchDialog.vala:312
+msgid "internal modifications"
+msgstr "interna ändringar"
 
-#: ../src/camera/ImportPage.vala:1638
-#, c-format
-msgid "Unable to lock camera: %s"
-msgstr "Kunde inte låsa kameran: %s"
+#: src/searches/SavedSearchDialog.vala:313
+msgid "external modifications"
+msgstr "externa ändringar"
 
-#: ../src/camera/ImportPage.vala:1723
-#, 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?"
+#. Ordering must correspond with SearchConditionFlagged.State
+#: src/searches/SavedSearchDialog.vala:367
+msgid "flagged"
+msgstr "flaggad"
 
-#: ../src/camera/ImportPage.vala:1726
-#, 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/searches/SavedSearchDialog.vala:368
+msgid "not flagged"
+msgstr "ej flaggad"
 
-#: ../src/camera/ImportPage.vala:1729
-#, 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/searches/SavedSearchDialog.vala:431
+msgid "and higher"
+msgstr "och högre"
 
-#: ../src/camera/ImportPage.vala:1732
-#, 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/searches/SavedSearchDialog.vala:432
+msgid "only"
+msgstr "endast"
 
-#: ../src/camera/ImportPage.vala:1759
-msgid "Removing photos/videos from camera"
-msgstr "Tar bort bilder och filmer från kameran"
+#: src/searches/SavedSearchDialog.vala:433
+msgid "and lower"
+msgstr "och lägre"
 
-#: ../src/camera/ImportPage.vala:1763
-#, 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] ""
-"Kunde inte radera %d bild och film från kameran på grund av ett fel."
-msgstr[1] ""
-"Kunde inte radera %d bilder och filmer från kameran på grund av ett fel."
+#: src/searches/SavedSearchDialog.vala:495
+msgid "is after"
+msgstr "är efter"
 
-#: ../src/data_imports/DataImports.vala:22
-msgid "Data Imports"
-msgstr "Dataimporter"
+#: src/searches/SavedSearchDialog.vala:496
+msgid "is before"
+msgstr "är före"
 
-#. 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-databas"
+#: src/searches/SavedSearchDialog.vala:497
+msgid "is between"
+msgstr "är mellan"
 
-#: ../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 "Importen från %s kan inte fortsätta då ett fel uppstod:"
+#: src/searches/SavedSearchDialog.vala:510
+msgid "and"
+msgstr "och"
 
-#: ../src/data_imports/DataImportsPluginHost.vala:151
-msgid "To try importing from another service, select one from the above menu."
-msgstr ""
-"För att försöka att importera från en annan tjänst, välj en från ovanstående "
-"meny."
+#: src/searches/SavedSearchDialog.vala:691
+msgid "Search"
+msgstr "Sök"
 
-#: ../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 ""
-"Du har inte aktiverat några dataimport-insticksmoduler.\n"
-"\n"
-"För att använda kommandot Importera från program, måste du åtminstone ha en "
-"insticksmodul aktiverad. Insticksmoduler kan aktiveras i programmets "
-"inställningar."
+#: src/searches/SavedSearchDialog.vala:696
+msgid "Cancel"
+msgstr "Avbryt"
 
-#: ../src/data_imports/DataImportsUI.vala:100
-msgid "Database file:"
-msgstr "Databasfil:"
+#: src/searches/SavedSearchDialog.vala:697
+msgid "OK"
+msgstr "OK"
 
-#: ../src/data_imports/DataImportsUI.vala:112
-#: ../src/library/LibraryWindow.vala:882
-msgid "_Import"
-msgstr "_Importera"
+#: src/searches/SavedSearchDialog.vala:716
+msgid "any"
+msgstr "någon"
 
-#: ../src/data_imports/DataImportsUI.vala:220
-msgid "Import From Application"
-msgstr "Importera från program"
+#: src/searches/SavedSearchDialog.vala:717
+msgid "all"
+msgstr "alla"
 
-#: ../src/data_imports/DataImportsUI.vala:221
-msgid "Import media _from:"
-msgstr "Importera mediafiler från:"
+#: src/searches/SavedSearchDialog.vala:718
+msgid "none"
+msgstr "ingen"
 
-#: ../src/data_imports/DataImportsUI.vala:408
-#: ../src/publishing/PublishingUI.vala:507
-msgid "_Close"
-msgstr "S_täng"
+#: src/searches/SearchBoolean.vala:157
+msgid "Any text"
+msgstr "Valfri text"
 
-#: ../src/db/DatabaseTable.vala:37
-#, c-format
-msgid "Unable to open/create photo database %s: error code %d"
-msgstr "Kunde inte öppna eller skapa bilddatabasen %s: felkod %d"
+#: src/searches/SearchBoolean.vala:160
+msgid "Title"
+msgstr "Titel"
 
-#: ../src/db/DatabaseTable.vala:46
-#, c-format
-msgid ""
-"Unable to write to photo database file:\n"
-" %s"
-msgstr ""
-"Kunde inte skriva till bilddatabasfilen:\n"
-" %s"
+#: src/searches/SearchBoolean.vala:163
+msgid "Tag"
+msgstr "Tagg"
 
-#: ../src/db/DatabaseTable.vala:48
-#, c-format
-msgid ""
-"Error accessing database file:\n"
-" %s\n"
-"\n"
-"Error was: \n"
-"%s"
-msgstr ""
-"Fel vid åtkomst till databasfilen:\n"
-" %s\n"
-"\n"
-"Felet var: \n"
-"%s"
+#: src/searches/SearchBoolean.vala:166
+msgid "Comment"
+msgstr "Kommentar"
 
-#: ../src/db/DatabaseTable.vala:81
-#, c-format
-msgid "Unable to restore photo database %s"
-msgstr "Kunde inte återställa bilddatabasen %s"
+#: src/searches/SearchBoolean.vala:169
+msgid "Event name"
+msgstr "Händelsenamn"
 
-#: ../src/direct/DirectPhotoPage.vala:46 ../src/library/LibraryWindow.vala:335
-msgid "_File"
-msgstr "_Arkiv"
+#: src/searches/SearchBoolean.vala:172
+msgid "File name"
+msgstr "Filnamn"
 
-#: ../src/direct/DirectPhotoPage.vala:52
-msgid "Save photo"
-msgstr "Spara bild"
+#: src/searches/SearchBoolean.vala:175
+msgid "Media type"
+msgstr "Mediatyp"
 
-#: ../src/direct/DirectPhotoPage.vala:57
-msgid "Save _As..."
-msgstr "_Spara som…"
+#: src/searches/SearchBoolean.vala:178
+msgid "Flag state"
+msgstr "Tillstånd på flagga"
 
-#: ../src/direct/DirectPhotoPage.vala:58
-msgid "Save photo with a different name"
-msgstr "Spara bilden med ett annat namn"
+#: src/searches/SearchBoolean.vala:181
+msgid "Photo state"
+msgstr "Bildtillstånd"
 
-#: ../src/direct/DirectPhotoPage.vala:69
-msgid "Print the photo to a printer connected to your computer"
-msgstr "Skriv ut bilden till en skrivare ansluten till din dator"
+#: src/searches/SearchBoolean.vala:184 src/SearchFilter.vala:831
+#: src/SearchFilter.vala:1114
+msgid "Rating"
+msgstr "Betyg"
 
-#: ../src/direct/DirectPhotoPage.vala:77 ../src/library/LibraryWindow.vala:347
-msgid "_Photo"
-msgstr "_Bild"
+#: src/searches/SearchBoolean.vala:187
+msgid "Date"
+msgstr "Datum"
 
-#: ../src/direct/DirectPhotoPage.vala:227
-#, c-format
-msgid "%s does not exist."
-msgstr "%s finns inte."
+#: src/SearchFilter.vala:815
+msgid "★+ Rating"
+msgstr "★+ i betyg"
 
-#: ../src/direct/DirectPhotoPage.vala:229
-#, c-format
-msgid "%s is not a file."
-msgstr "%s är inte en fil."
+#: src/SearchFilter.vala:818
+msgid "★★+ Rating"
+msgstr "★★+ i betyg"
 
-#: ../src/direct/DirectPhotoPage.vala:231
-#, c-format
-msgid ""
-"%s does not support the file format of\n"
-"%s."
-msgstr ""
-"%s saknar stöd för filformatet för\n"
-"%s."
+#: src/SearchFilter.vala:821
+msgid "★★★+ Rating"
+msgstr "★★★+ i betyg"
 
-#: ../src/direct/DirectPhotoPage.vala:248
-#, c-format
-msgid "Unable open photo %s. Sorry."
-msgstr "Kunde inte öppna bilden %s."
+#: src/SearchFilter.vala:824
+msgid "★★★★+ Rating"
+msgstr "★★★★+ i betyg"
 
-#: ../src/direct/DirectPhotoPage.vala:432
-msgid "_Save a Copy"
-msgstr "_Spara en kopia"
+#: src/SearchFilter.vala:828
+msgid "★★★★★+ Rating"
+msgstr "★★★★★+ i betyg"
 
-#: ../src/direct/DirectPhotoPage.vala:435
+#: src/SearchFilter.vala:1064
 #, c-format
-msgid "Lose changes to %s?"
-msgstr "Förkasta ändringarna i %s?"
+msgid "Error loading search bar UI: %s"
+msgstr "Fel vid inläsning av sökfältet: %s"
 
-#: ../src/direct/DirectPhotoPage.vala:436
-msgid "Close _without Saving"
-msgstr "_Stäng utan att spara"
-
-#: ../src/direct/DirectPhotoPage.vala:469
-#, c-format
-msgid "Error while saving to %s: %s"
-msgstr "Fel vid sparande till %s: %s"
-
-#: ../src/direct/DirectPhotoPage.vala:497
-#: ../src/direct/DirectPhotoPage.vala:518
-msgid "Save As"
-msgstr "Spara som"
-
-#: ../src/editing_tools/EditingTools.vala:665
-msgid "Return to current photo dimensions"
-msgstr "Återgå till befintliga bilddimensioner"
-
-#: ../src/editing_tools/EditingTools.vala:668
-msgid "Set the crop for this photo"
-msgstr "Ställ in beskärningen för den här bilden"
-
-#: ../src/editing_tools/EditingTools.vala:680
-msgid "Pivot the crop rectangle between portrait and landscape orientations"
-msgstr "Växla mellan porträtt- och landskapsläge"
-
-#: ../src/editing_tools/EditingTools.vala:753
-msgid "Unconstrained"
-msgstr "Obegränsad"
-
-#: ../src/editing_tools/EditingTools.vala:754
-msgid "Square"
-msgstr "Kvadrat"
-
-#: ../src/editing_tools/EditingTools.vala:755
-msgid "Screen"
-msgstr "Skärm"
-
-#: ../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 tum)"
-
-#: ../src/editing_tools/EditingTools.vala:768
-msgid "Tabloid (11 x 17 in.)"
-msgstr "Tabloid (11 x 17 tum)"
+#. 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 "Stäng"
 
-#: ../src/editing_tools/EditingTools.vala:775
-msgid "A4 (210 x 297 mm)"
-msgstr "A4 (210 x 297 mm)"
+#. Type label and toggles
+#: src/SearchFilter.vala:1079
+msgid "Type"
+msgstr "Typ"
 
-#: ../src/editing_tools/EditingTools.vala:779
-msgid "A3 (297 x 420 mm)"
-msgstr "A3 (297 x 420 mm)"
+#: src/SearchFilter.vala:1086
+msgid "Videos"
+msgstr "Filmer"
 
-#: ../src/editing_tools/EditingTools.vala:1887
-msgid "Close the red-eye tool"
-msgstr "Stäng röda ögon-verktyget"
+#: src/SearchFilter.vala:1089
+msgid "RAW Photos"
+msgstr "RAW-bilder"
 
-#: ../src/editing_tools/EditingTools.vala:1890
-msgid "Remove any red-eye effects in the selected region"
-msgstr "Ta bort eventuella röda ögon i det markerade området"
+#: src/SearchFilter.vala:1125
+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/editing_tools/EditingTools.vala:2226
-#: ../src/editing_tools/StraightenTool.vala:102
-msgid "_Reset"
-msgstr "Åt_erställ"
+#: src/SlideshowPage.vala:49 src/SlideshowPage.vala:183
+msgid "Settings"
+msgstr "Inställningar"
 
-#: ../src/editing_tools/EditingTools.vala:2248
-msgid "Saturation:"
-msgstr "Mättnad:"
+#. Set up toolbar
+#. add toolbar buttons
+#: src/SlideshowPage.vala:160
+msgid "Back"
+msgstr "Bakåt"
 
-#: ../src/editing_tools/EditingTools.vala:2256
-msgid "Tint:"
-msgstr "Färgton:"
+#: src/SlideshowPage.vala:162
+msgid "Go to the previous photo"
+msgstr "Gå till föregående bild"
 
-#: ../src/editing_tools/EditingTools.vala:2265
-msgid "Temperature:"
-msgstr "Färgtemperatur:"
+#: src/SlideshowPage.vala:167 src/SlideshowPage.vala:274
+msgid "Pause"
+msgstr "Pausa"
 
-#: ../src/editing_tools/EditingTools.vala:2273
-msgid "Shadows:"
-msgstr "Skuggor:"
+#: src/SlideshowPage.vala:169 src/SlideshowPage.vala:275
+msgid "Pause the slideshow"
+msgstr "Pausa bildspelet"
 
-#: ../src/editing_tools/EditingTools.vala:2281
-msgid "Highlights:"
-msgstr "Höjdpunkter:"
+#: src/SlideshowPage.vala:174
+msgid "Next"
+msgstr "Nästa"
 
-#: ../src/editing_tools/EditingTools.vala:2335
-msgid "Reset Colors"
-msgstr "Återställ färger"
+#: src/SlideshowPage.vala:176
+msgid "Go to the next photo"
+msgstr "Gå till nästa bild"
 
-#: ../src/editing_tools/EditingTools.vala:2335
-msgid "Reset all color adjustments to original"
-msgstr "Återställ alla färgjusteringar till de ursprungliga värdena"
+#: src/SlideshowPage.vala:184
+msgid "Change slideshow settings"
+msgstr "Ändra inställningar för bildspel"
 
-#: ../src/editing_tools/EditingTools.vala:2687
-msgid "Temperature"
-msgstr "Färgtemperatur"
+#. An entire slideshow set might be missing, so check for a loop.
+#: src/SlideshowPage.vala:238
+msgid "All photo source files are missing."
+msgstr "Alla källbildfiler saknas."
 
-#: ../src/editing_tools/EditingTools.vala:2700
-msgid "Tint"
-msgstr "Färgton"
+#: src/SlideshowPage.vala:270
+msgid "Play"
+msgstr "Spela upp"
 
-#: ../src/editing_tools/EditingTools.vala:2713
-msgid "Saturation"
-msgstr "Mättnad"
+#: src/SlideshowPage.vala:271
+msgid "Continue the slideshow"
+msgstr "Fortsätt bildspelet"
 
-#: ../src/editing_tools/EditingTools.vala:2726
-msgid "Exposure"
-msgstr "Exponering"
+#: src/slideshow/Slideshow.vala:22
+msgid "Slideshow Transitions"
+msgstr "Bildspelsövergångar"
 
-#: ../src/editing_tools/EditingTools.vala:2739
-msgid "Shadows"
-msgstr "Skuggor"
+#: src/slideshow/TransitionEffects.vala:98
+msgid "(None)"
+msgstr "(Ingen)"
 
-#: ../src/editing_tools/EditingTools.vala:2752
-msgid "Highlights"
-msgstr "Höjdpunkter"
+#: src/slideshow/TransitionEffects.vala:287
+msgid "None"
+msgstr "Ingen"
 
-#: ../src/editing_tools/EditingTools.vala:2762
-msgid "Contrast Expansion"
-msgstr "Kontrastökning"
+#: src/slideshow/TransitionEffects.vala:339
+msgid "Random"
+msgstr "Slumpmässigt"
 
-#: ../src/editing_tools/StraightenTool.vala:99
-msgid "Angle:"
-msgstr "Vinkel:"
+#: src/tags/Branch.vala:131
+msgid "Tags"
+msgstr "Taggar"
 
-#: ../src/events/Branch.vala:25
-msgid "Events"
-msgstr "Händelser"
+#: src/Tag.vala:830
+msgid "untitled"
+msgstr "namnlös"
 
-#: ../src/events/EventDirectoryItem.vala:83
-#, c-format
-msgid "%d Photo/Video"
-msgid_plural "%d Photos/Videos"
-msgstr[0] "%d bild/film"
-msgstr[1] "%d bilder/filmer"
+#. multiple videos
+#: src/VideoSupport.vala:523
+msgid "Export Videos"
+msgstr "Exportera filmer"
 
-#: ../src/events/EventPage.vala:129
-msgid "No Event"
-msgstr "Ingen händelse"
+#: ui/collection.ui:33 ui/event.ui:281 ui/event.ui:470 ui/media.ui:281
+#: ui/photo_context.ui:30 ui/photo.ui:268 ui/tags.ui:281
+msgid "Toggle _Flag"
+msgstr "_Växla flagga"
 
-#: ../src/events/EventsDirectoryPage.vala:131
-msgid "Display the comment of each event"
-msgstr "Visa kommentaren för varje händelse"
+#: ui/collection.ui:82 ui/event.ui:351 ui/event.ui:519 ui/media.ui:351
+#: ui/photo_context.ui:88 ui/photo.ui:341 ui/tags.ui:351
+msgid "_Developer"
+msgstr "_Framkallare"
 
-#: ../src/events/EventsDirectoryPage.vala:155
-msgid "No events"
-msgstr "Inga händelser"
+#: ui/collection.ui:106 ui/event.ui:543 ui/photo_context.ui:113 ui/photo.ui:358
+msgid "Open with E_xternal Editor"
+msgstr "Öppna med e_xtern redigerare"
 
-#: ../src/events/EventsDirectoryPage.vala:159
-msgid "No events found"
-msgstr "Inga händelser hittades"
+#: ui/collection.ui:117 ui/event.ui:385 ui/event.ui:554 ui/media.ui:379
+#: ui/photo_context.ui:124 ui/tags.ui:379
+msgid "View Eve_nt for Photo"
+msgstr "_Visa bildhändelse"
 
-#: ../src/events/EventsDirectoryPage.vala:230
-msgid "All Events"
-msgstr "Alla händelser"
+#: 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 "_Arkiv"
 
-#: ../src/events/EventsDirectoryPage.vala:244
-msgid "Undated"
-msgstr "Odaterade"
+#: ui/direct.ui:13
+msgid "Save _As…"
+msgstr "_Spara som…"
 
-#: ../src/events/EventsDirectoryPage.vala:245
-msgid "%Y"
-msgstr "%Y"
+#: 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 "_Visa"
 
-#: ../src/events/EventsDirectoryPage.vala:246
-msgid "%B"
-msgstr "%B"
+#: ui/direct.ui:81 ui/photo.ui:156
+msgid "Fit to _Page"
+msgstr "_Anpassa till sidan"
 
-#: ../src/folders/Branch.vala:141
-msgid "Folders"
-msgstr "Mappar"
+#: ui/direct.ui:86 ui/photo.ui:161
+msgid "Zoom _100%"
+msgstr "_Visa 100%"
 
-#: ../src/library/Branch.vala:30 ../src/library/Branch.vala:130
-#: ../ui/shotwell.glade.h:32
-msgid "Library"
-msgstr "Bibliotek"
+#: ui/direct.ui:91 ui/photo.ui:166
+msgid "Zoom _200%"
+msgstr "_Visa 200%"
 
-#: ../src/library/ImportQueuePage.vala:8
-msgid "Importing..."
-msgstr "Importerar…"
+#: ui/direct.ui:98 ui/photo.ui:187
+msgid "_Photo"
+msgstr "_Bild"
 
-#: ../src/library/ImportQueuePage.vala:67
-msgid "_Stop Import"
-msgstr "_Avbryt importen"
+#: ui/direct.ui:101 ui/photo.ui:190
+msgid "_Previous Photo"
+msgstr "_Föregående bild"
 
-#: ../src/library/ImportQueuePage.vala:68
-msgid "Stop importing photos"
-msgstr "Stoppa bildimporten"
+#: ui/direct.ui:105 ui/photo.ui:194
+msgid "_Next Photo"
+msgstr "_Nästa bild"
 
-#: ../src/library/ImportQueuePage.vala:124
-msgid "Preparing to import..."
-msgstr "Förbereder import…"
+#: ui/direct.ui:131 ui/photo.ui:220
+msgid "T_ools"
+msgstr "_Verktyg"
 
-#: ../src/library/ImportQueuePage.vala:151
-#, c-format
-msgid "Imported %s"
-msgstr "Importerade %s"
+#: ui/direct.ui:181 ui/events_directory.ui:158 ui/event.ui:426
+#: ui/import_queue.ui:73 ui/import.ui:191 ui/media.ui:409 ui/offline.ui:188
+#: ui/photo.ui:392 ui/tags.ui:428 ui/trash.ui:197
+msgid "_Frequently Asked Questions"
+msgstr "_Återkommande frågor"
 
-#: ../src/library/LastImportPage.vala:8
-msgid "Last Import"
-msgstr "Senaste import"
+#: ui/direct.ui:185 ui/events_directory.ui:162 ui/event.ui:430
+#: ui/import_queue.ui:77 ui/import.ui:195 ui/media.ui:413 ui/offline.ui:192
+#: ui/photo.ui:396 ui/tags.ui:432 ui/trash.ui:201
+msgid "_Report a Problem…"
+msgstr "_Rapportera ett problem…"
 
-#: ../src/library/LibraryWindow.vala:285
-msgid "_Import From Folder..."
+#: 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 "_Importera från mapp…"
 
-#: ../src/library/LibraryWindow.vala:286
-msgid "Import photos from disk to library"
-msgstr "Importera bilder från hårddisken till biblioteket"
-
-#: ../src/library/LibraryWindow.vala:293
-msgid "Import From _Application..."
+#: 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 "Importera från _program…"
 
-#: ../src/library/LibraryWindow.vala:297
-msgid "Sort _Events"
-msgstr "_Sortera händelser"
-
-#: ../src/library/LibraryWindow.vala:307
+#: 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 "_Töm papperskorgen"
 
-#: ../src/library/LibraryWindow.vala:308
-msgid "Delete all photos in the trash"
-msgstr "Radera alla bilder från papperskorgen"
-
-#: ../src/library/LibraryWindow.vala:313
-msgid "View Eve_nt for Photo"
-msgstr "_Visa bildhändelse"
-
-#: ../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 "_Sök"
 
-#: ../src/library/LibraryWindow.vala:318
-msgid "Find photos and videos by search criteria"
-msgstr "Sök efter bilder och filmer med sökordet"
-
-#: ../src/library/LibraryWindow.vala:329 ../src/searches/Branch.vala:77
-#: ../src/sidebar/Tree.vala:199
-msgid "Ne_w Saved Search..."
+#: 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 "_Ny sparad sökning…"
 
-#: ../src/library/LibraryWindow.vala:351
-msgid "_Photos"
-msgstr "_Bilder"
-
-#: ../src/library/LibraryWindow.vala:355
-msgid "Even_ts"
-msgstr "_Händelser"
-
-#: ../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 "_Grundläggande information"
 
-#: ../src/library/LibraryWindow.vala:375
-msgid "Display basic information for the selection"
-msgstr "Visa grundläggande information för markeringen"
-
-#: ../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 "_Utökad Information"
 
-#: ../src/library/LibraryWindow.vala:381
-msgid "Display extended information for the selection"
-msgstr "Visa utökad information för markeringen"
-
-#: ../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 "_Sökfält"
 
-#: ../src/library/LibraryWindow.vala:387
-msgid "Display the search bar"
-msgstr "Visa sökfältet"
-
-#: ../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 "S_idofält"
 
-#: ../src/library/LibraryWindow.vala:393
-msgid "Display the sidebar"
-msgstr "Visa sidopanelen"
-
-#: ../src/library/LibraryWindow.vala:651
-msgid "Import From Folder"
-msgstr "Importera från mapp"
-
-#: ../src/library/LibraryWindow.vala:720
-msgid "Empty Trash"
-msgstr "Töm papperskorgen"
-
-#: ../src/library/LibraryWindow.vala:720
-msgid "Emptying Trash..."
-msgstr "Tömmer papperskorgen…"
-
-#: ../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 är konfigurerat för att importera bilder till din hemkatalog.\n"
-"Vi rekommenderar att du ändrar detta i <span weight=\"bold\">Redigera %s-"
-"inställningar</span>.\n"
-"Vill du fortsätta att importera bilder?"
-
-#: ../src/library/LibraryWindow.vala:882 ../ui/shotwell.glade.h:18
-msgid "Library Location"
-msgstr "Biblioteksplats"
-
-#. TODO: Specify which directory/file.
-#: ../src/library/LibraryWindow.vala:895
-msgid "Photos cannot be imported from this directory."
-msgstr "Bilder kan inte importeras från denna mapp."
-
-#: ../src/library/LibraryWindow.vala:1181
-#, c-format
-msgid "%s (%d%%)"
-msgstr "%s (%d%%)"
+#: 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 "V_erktygsfält"
 
-#: ../src/library/LibraryWindow.vala:1225
-#: ../src/library/LibraryWindow.vala:1236
-msgid "Updating library..."
-msgstr "Uppdaterar biblioteket…"
-
-#: ../src/library/LibraryWindow.vala:1242
-msgid "Preparing to auto-import photos..."
-msgstr "Förbereder automatisk importer av bilder…"
+#: ui/events_directory.ui:101 ui/event.ui:134 ui/media.ui:134 ui/tags.ui:134
+msgid "_Comments"
+msgstr "_Kommentarer"
 
-#: ../src/library/LibraryWindow.vala:1247
-msgid "Auto-importing photos..."
-msgstr "Importerar bilder automatiskt..."
+#: 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 "_Sortera händelser"
 
-#: ../src/library/LibraryWindow.vala:1255
-msgid "Writing metadata to files..."
-msgstr "Skriver metadata till filer…"
+#: 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 "_Stigande"
 
-#: ../src/library/OfflinePage.vala:8
-msgid "Missing Files"
-msgstr "Saknade filer"
+#: 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 "_Fallande"
 
-#: ../src/library/OfflinePage.vala:106
-msgid "Deleting..."
-msgstr "Raderar…"
+#: ui/events_directory.ui:132 ui/event.ui:377 ui/media.ui:371 ui/tags.ui:371
+msgid "Even_ts"
+msgstr "_Händelser"
 
-#: ../src/library/TrashPage.vala:8
-msgid "Trash"
-msgstr "Papperskorg"
+#: 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"
 
-#: ../src/library/TrashPage.vala:108
-msgid "Trash is empty"
-msgstr "Papperskorgen är tom"
+#: ui/event.ui:129 ui/import.ui:104 ui/media.ui:129 ui/tags.ui:129
+msgid "_Titles"
+msgstr "_Titlar"
 
-#: ../src/library/TrashPage.vala:112
-msgid "Delete"
-msgstr "Radera"
+#: 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
+msgid "Ta_gs"
+msgstr "Ta_ggar"
 
-#: ../src/library/TrashPage.vala:113
-msgid "Deleting Photos"
-msgstr "Raderar bilder"
+#: ui/event.ui:206 ui/media.ui:206 ui/tags.ui:206
+msgid "Sort _Photos"
+msgstr "Sortera _bilder"
 
-#: ../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 ""
-"Ditt bildbibliotek är inte kompatibelt med denna version av Shotwell.  Det "
-"verkar som det skapades med Shotwell %s (schema %d).  Denna version är %s "
-"(schema %d).  Använd den senaste versionen av Shotwell."
+#: ui/event.ui:209 ui/media.ui:209 ui/tags.ui:209
+msgid "By _Title"
+msgstr "Efter _titel"
 
-#: ../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 kunde inte uppgradera ditt bildbibliotek från version %s (schema "
-"%d) till %s (schema %d).  För ytterligare information, läs Shotwells wiki-"
-"sida på %s"
+#: ui/event.ui:214 ui/media.ui:214 ui/tags.ui:214
+msgid "By _Filename"
+msgstr "Efter _filnamn"
 
-#: ../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 ""
-"Ditt bildbibliotek är inte kompatibelt med denna version av Shotwell.  Det "
-"verkar som om det skapades med Shotwell %s (schema %d).  Denna version är %s "
-"(schema %d).  Töm ditt bibliotek genom att ta bort %s och importera dina "
-"bilder igen."
+#: ui/event.ui:219 ui/media.ui:219 ui/tags.ui:219
+msgid "By Exposure _Date"
+msgstr "Efter exponerings_ögonblick"
 
-#: ../src/main.vala:71
-#, c-format
-msgid "Unknown error attempting to verify Shotwell's database: %s"
-msgstr "Okänt fel vid försök att verifiera Shotwells databas: %s"
+#: ui/event.ui:224 ui/media.ui:224 ui/tags.ui:224
+msgid "By _Rating"
+msgstr "Efter _betyg"
 
-#: ../src/main.vala:104
-msgid "Loading Shotwell"
-msgstr "Läser in Shotwell"
+#: ui/event.ui:251 ui/import.ui:174 ui/media.ui:251 ui/photo.ui:135
+#: ui/tags.ui:251
+msgid "_Descending"
+msgstr "_Fallande"
 
-#: ../src/main.vala:294
-msgid "Path to Shotwell's private data"
-msgstr "Sökväg till Shotwells privata data"
+#: ui/event.ui:275 ui/media.ui:275 ui/tags.ui:275
+msgid "_Photos"
+msgstr "_Bilder"
 
-#: ../src/main.vala:294
-msgid "DIRECTORY"
-msgstr "KATALOG"
+#: ui/import_queue.ui:8
+msgid "_Stop Import"
+msgstr "_Avbryt importen"
 
-#: ../src/main.vala:298
-msgid "Do not monitor library directory at runtime for changes"
-msgstr "Sök inte efter ändringar i biblioteket medan programmet används"
+#: ui/printing_widget.ui:19
+msgid "<b>Printed Image Size</b>"
+msgstr "<b>Storlek på utskriften</b>"
 
-#: ../src/main.vala:302
-msgid "Don't display startup progress meter"
-msgstr "Visa inte hur uppstarten framskrider"
+#: ui/printing_widget.ui:36
+msgid "Use a _standard size:"
+msgstr "Använd en _standardstorlek:"
 
-#: ../src/main.vala:306
-msgid "Show the application's version"
-msgstr "Visa programversion"
+#: ui/printing_widget.ui:80
+msgid "Use a c_ustom size:"
+msgstr "Använd en _anpassad storlek:"
 
-#. init GTK (valac has already called g_threads_init())
-#: ../src/main.vala:338
-msgid "[FILE]"
-msgstr "[FIL]"
+#. Abbrevation for "inch"
+#: ui/printing_widget.ui:146
+msgid "in."
+msgstr "tum"
 
-#: ../src/main.vala:342
-#, c-format
-msgid "Run '%s --help' to see a full list of available command line options.\n"
-msgstr ""
-"Kör ”%s --help” för en komplett lista över tillgängliga "
-"kommandoradsflaggor.\n"
+#. Abbrevation for "centimeters"
+#: ui/printing_widget.ui:147
+msgid "cm"
+msgstr "cm"
 
-#: ../src/photos/BmpSupport.vala:32
-msgid "BMP"
-msgstr "BMP"
+#: ui/printing_widget.ui:173
+msgid "_Match photo aspect ratio"
+msgstr "_Matcha bildförhållande"
 
-#: ../src/photos/JfifSupport.vala:84
-msgid "JPEG"
-msgstr "JPEG"
+#: ui/printing_widget.ui:197
+msgid "_Autosize:"
+msgstr "_Automatisk storlek:"
 
-#: ../src/photos/JfifSupport.vala:185
-#, c-format
-msgid "Low (%d%%)"
-msgstr "Låg (%d%%)"
+#: ui/printing_widget.ui:237
+msgid "<b>Titles</b>"
+msgstr "<b>Titlar</b>"
 
-#: ../src/photos/JfifSupport.vala:188
-#, c-format
-msgid "Medium (%d%%)"
-msgstr "Mellan (%d%%)"
+#: ui/printing_widget.ui:254
+msgid "Print image _title"
+msgstr "Skriv ut bild_titel"
 
-#: ../src/photos/JfifSupport.vala:191
-#, c-format
-msgid "High (%d%%)"
-msgstr "Hög (%d%%)"
+#: ui/printing_widget.ui:297
+msgid "<b>Pixel Resolution</b>"
+msgstr "<b>Upplösning</b>"
 
-#: ../src/photos/JfifSupport.vala:194
-#, c-format
-msgid "Maximum (%d%%)"
-msgstr "Maximal (%d%%)"
+#: ui/printing_widget.ui:317
+msgid "_Output photo at:"
+msgstr "_Skriv ut bild till:"
 
-#: ../src/photos/PngSupport.vala:30
-msgid "PNG"
-msgstr "PNG"
+#: ui/printing_widget.ui:351
+msgid "pixels per inch"
+msgstr "pixlar per tum"
 
-#: ../src/photos/RawSupport.vala:134
-msgid "RAW"
-msgstr "RAW"
+#: ui/set_background_dialog.ui:9
+msgid "Set as Desktop Background"
+msgstr "Ange som skrivbordsbakgrund"
 
-#: ../src/photos/TiffSupport.vala:86
-msgid "TIFF"
-msgstr "TIFF"
+#: ui/set_background_dialog.ui:69 ui/set_background_slideshow_dialog.ui:134
+msgid "Use for Desktop"
+msgstr "Använd för skrivbord"
 
-#: ../src/publishing/Publishing.vala:16
-msgid "Publishing"
-msgstr "Publicering"
+#: ui/set_background_dialog.ui:86 ui/set_background_slideshow_dialog.ui:151
+msgid "Use for Lock Screen"
+msgstr "Använd för låsskärm"
 
-#: ../src/publishing/PublishingPluginHost.vala:11
-msgid "Preparing for upload"
-msgstr "Förbereder att skicka upp"
+#: ui/set_background_slideshow_dialog.ui:16
+msgid "Set as Desktop Slideshow"
+msgstr "Ange som skrivbordsbildspel"
 
-#: ../src/publishing/PublishingPluginHost.vala:12
-#, c-format
-msgid "Uploading %d of %d"
-msgstr "Skickar upp %d av %d"
+#: ui/set_background_slideshow_dialog.ui:56
+msgid "Generate desktop background slideshow"
+msgstr "Skapa bildspel för skrivbordsbakgrunden"
 
-#: ../src/publishing/PublishingPluginHost.vala:81
-#, c-format
-msgid "Publishing to %s can't continue because an error occurred:"
-msgstr ""
-"Publiceringen till %s kan inte fortsätta på grund av att ett fel inträffade:"
+#: ui/set_background_slideshow_dialog.ui:82
+msgid "Show each photo for"
+msgstr "Visa varje bild i"
 
-#: ../src/publishing/PublishingPluginHost.vala:84
-msgid "To try publishing to another service, select one from the above menu."
-msgstr ""
-"För att försöka att publicera till en annan tjänst, välj en från ovanstående "
-"meny."
+#: ui/set_background_slideshow_dialog.ui:94
+msgid "period of time"
+msgstr "tidsperiod"
 
-#: ../src/publishing/PublishingUI.vala:105
-msgid "The selected photos/videos were successfully published."
-msgstr "De valda bilderna eller filmerna publicerades."
+#: ui/set_background_slideshow_dialog.ui:116
+msgid "How long each photo is shown on the desktop background"
+msgstr "Hur länge varje bild ska visas på skrivbordsbakgrunden"
 
-#: ../src/publishing/PublishingUI.vala:107
-msgid "The selected videos were successfully published."
-msgstr "De valda filmerna publicerades."
+#: ui/shotwell.ui:65
+msgid "white"
+msgstr "vit"
 
-#: ../src/publishing/PublishingUI.vala:109
-msgid "The selected photos were successfully published."
-msgstr "De valda bilderna publicerades."
+#: ui/shotwell.ui:92
+msgid "black"
+msgstr "svart"
 
-#: ../src/publishing/PublishingUI.vala:112
-msgid "The selected video was successfully published."
-msgstr "Den markerade filmen publicerades."
+#: ui/shotwell.ui:123
+msgid "Display"
+msgstr "Visning"
 
-#: ../src/publishing/PublishingUI.vala:114
-msgid "The selected photo was successfully published."
-msgstr "Den markerade bilden publicerades."
+#: ui/shotwell.ui:160
+msgid "_Background:"
+msgstr "_Bakgrund:"
 
-#: ../src/publishing/PublishingUI.vala:122
-msgid "Fetching account information..."
-msgstr "Hämtar kontoinformation…"
+#: ui/shotwell.ui:175
+msgid "_Import photos to:"
+msgstr "_Importera bilder till:"
 
-#: ../src/publishing/PublishingUI.vala:128
-msgid "Logging in..."
-msgstr "Loggar in…"
+#: ui/shotwell.ui:186
+msgid "_Watch library directory for new files"
+msgstr "_Bevaka bibliotekskatalogen efter nya filer"
 
-#: ../src/publishing/PublishingUI.vala:188
-msgid "Publish Photos"
-msgstr "Publicera bilder"
+#: ui/shotwell.ui:209
+msgid "Importing"
+msgstr "Import"
 
-#: ../src/publishing/PublishingUI.vala:189
-msgid "Publish photos _to:"
-msgstr "Publicera bilder _till:"
+#: ui/shotwell.ui:226
+msgid "_Directory structure:"
+msgstr "_Katalogstruktur:"
 
-#: ../src/publishing/PublishingUI.vala:191
-msgid "Publish Videos"
-msgstr "Publicera filmer"
+#: ui/shotwell.ui:240
+msgid "Example:"
+msgstr "Exempel:"
 
-#: ../src/publishing/PublishingUI.vala:192
-msgid "Publish videos _to"
-msgstr "Publicera filmer _till"
+#: ui/shotwell.ui:249
+msgid "R_ename imported files to lowercase"
+msgstr "B_yt namn på importerade filer till enbart gemener"
 
-#: ../src/publishing/PublishingUI.vala:194
-msgid "Publish Photos and Videos"
-msgstr "Publicera bilder och filmer"
+#: ui/shotwell.ui:271
+msgid "Metadata"
+msgstr "Metadata"
 
-#: ../src/publishing/PublishingUI.vala:195
-msgid "Publish photos and videos _to"
-msgstr "Publicera bilder och filmer _till"
+#: ui/shotwell.ui:284
+msgid "Write tags, titles, and other _metadata to photo files"
+msgstr "Skriv taggar, titlar och annan _metadata till bildfilerna"
 
-#. There are no enabled publishing services that accept this media type,
-#. warn the user.
-#: ../src/publishing/PublishingUI.vala:397
-msgid "Unable to publish"
-msgstr "Kunde inte publicera"
+#: ui/shotwell.ui:306
+msgid "RAW Developer"
+msgstr "RAW-framkallare"
 
-#: ../src/publishing/PublishingUI.vala:398
-#, c-format
-msgid ""
-"Shotwell cannot publish the selected items because you do not have a "
-"compatible publishing plugin enabled. To correct this, choose <b>Edit %s "
-"Preferences</b> and enable one or more of the publishing plugins on the "
-"<b>Plugins</b> tab."
-msgstr ""
-"Shotwell kan inte publicera de markerade objekten därför att du inte har "
-"aktiverat en kompatibel insticksmodul för publicering. Välj <b>Redigera %s "
-"Inställningar</b> och aktivera en eller flera av de insticksmoduler för "
-"publicering som finns under fliken <b>Insticksmoduler</b>."
+#: ui/shotwell.ui:323
+msgid "De_fault:"
+msgstr "_Standard:"
 
-#: ../src/searches/Branch.vala:68
-msgid "Saved Searches"
-msgstr "Sparade sökningar"
+#: ui/shotwell.ui:377
+msgid "_Pattern:"
+msgstr "_Mönster:"
 
-#. Ordering must correspond with SearchConditionText.Context
-#: ../src/searches/SavedSearchDialog.vala:168
-msgid "contains"
-msgstr "innehåller"
+#: ui/shotwell.ui:439
+msgid "E_xternal photo editor:"
+msgstr "E_xtern bildredigerare:"
 
-#. Ordering must correspond with Context
-#: ../src/searches/SavedSearchDialog.vala:169
-#: ../src/searches/SavedSearchDialog.vala:500
-msgid "is exactly"
-msgstr "är exakt"
+#: ui/shotwell.ui:456
+msgid "External _RAW editor:"
+msgstr "Extern _RAW-redigerare:"
 
-#: ../src/searches/SavedSearchDialog.vala:170
-msgid "starts with"
-msgstr "börjar med"
+#: ui/shotwell.ui:517
+msgid "External Editors"
+msgstr "Externa redigerare"
 
-#: ../src/searches/SavedSearchDialog.vala:171
-msgid "ends with"
-msgstr "slutar med"
+#: ui/shotwell.ui:542
+msgid "Plugins"
+msgstr "Insticksmoduler"
 
-#: ../src/searches/SavedSearchDialog.vala:172
-msgid "does not contain"
-msgstr "innehåller inte"
+#: ui/shotwell.ui:590
+msgid "_Name of search:"
+msgstr "_Namn på sökningen:"
 
-#: ../src/searches/SavedSearchDialog.vala:173
-#: ../src/searches/SavedSearchDialog.vala:504
-msgid "is not set"
-msgstr "är inte inställd"
+#: ui/shotwell.ui:644
+msgid "_Match"
+msgstr "_Matcha"
 
-#: ../src/searches/SavedSearchDialog.vala:174
-msgid "is set"
-msgstr "är satt"
+#: ui/shotwell.ui:671
+msgid "of the following:"
+msgstr "följande:"
 
-#. Ordering must correspond with SearchConditionMediaType.Context
-#: ../src/searches/SavedSearchDialog.vala:248
-#: ../src/searches/SavedSearchDialog.vala:379
-#: ../src/searches/SavedSearchDialog.vala:444
-msgid "is"
-msgstr "är"
+#: ui/shotwell.ui:752
+msgid "label"
+msgstr "etikett"
 
-#: ../src/searches/SavedSearchDialog.vala:249
-msgid "is not"
-msgstr "är inte"
+#: ui/shotwell.ui:903
+msgid "_Delay:"
+msgstr "_Fördröjning:"
 
-#. Ordering must correspond with SearchConditionMediaType.MediaType
-#: ../src/searches/SavedSearchDialog.vala:255
-msgid "any photo"
-msgstr "valfri bild"
+#: ui/shotwell.ui:917
+msgid "_Transition effect:"
+msgstr "_Övergångseffekt:"
 
-#: ../src/searches/SavedSearchDialog.vala:256
-msgid "a raw photo"
-msgstr "en råfil"
+#: ui/shotwell.ui:931
+msgid "Transition d_elay:"
+msgstr "_Övergångsfördröjning:"
 
-#: ../src/searches/SavedSearchDialog.vala:257
-msgid "a video"
-msgstr "en film"
+#: ui/shotwell.ui:941
+msgid "Show t_itle"
+msgstr "_Visa titel"
 
-#: ../src/searches/SavedSearchDialog.vala:311
-msgid "has"
-msgstr "har"
+#: ui/shotwell.ui:1016 ui/shotwell.ui:1027
+msgid "seconds"
+msgstr "sekunder"
 
-#: ../src/searches/SavedSearchDialog.vala:312
-msgid "has no"
-msgstr "har inte"
+#: ui/sidebar_default_context.ui:11 ui/tag_sidebar_context.ui:6
+msgid "New _Tag…"
+msgstr "_Ny tagg…"
 
-#: ../src/searches/SavedSearchDialog.vala:317
-msgid "modifications"
-msgstr "ändringar"
+#: ui/trash.ui:285
+msgid "Delete all photos in the trash"
+msgstr "Radera alla bilder från papperskorgen"
 
-#: ../src/searches/SavedSearchDialog.vala:318
-msgid "internal modifications"
-msgstr "interna ändringar"
+#~ msgid "Testing connection to Facebook…"
+#~ msgstr "Testar anslutningen till Facebook…"
 
-#: ../src/searches/SavedSearchDialog.vala:319
-msgid "external modifications"
-msgstr "externa ändringar"
+#~ 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 redan loggat in och ut från Flickr under denna Shotwell-session.\n"
+#~ "För att fortsätta att publicera till Flickr, starta om Shotwell och "
+#~ "försök att publicera igen."
 
-#. Ordering must correspond with SearchConditionFlagged.State
-#: ../src/searches/SavedSearchDialog.vala:373
-msgid "flagged"
-msgstr "flaggad"
+#~ msgid "L_ist album in public gallery"
+#~ msgstr "L_ista album i publikt galleri"
 
-#: ../src/searches/SavedSearchDialog.vala:374
-msgid "not flagged"
-msgstr "ej flaggad"
+#~ msgid "Videos will appear in “%s”"
+#~ msgstr "Filmer kommer att visas i ”%s”"
 
-#: ../src/searches/SavedSearchDialog.vala:437
-msgid "and higher"
-msgstr "och högre"
+#~ msgid "_Contents"
+#~ msgstr "_Innehåll"
 
-#: ../src/searches/SavedSearchDialog.vala:438
-msgid "only"
-msgstr "endast"
+#~ msgid "Display the title of each photo"
+#~ msgstr "Visa titeln för varje bild"
 
-#: ../src/searches/SavedSearchDialog.vala:439
-msgid "and lower"
-msgstr "och lägre"
+#~ msgid "Import the selected photos into your library"
+#~ msgstr "Importera de valda bilderna till ditt bibliotek"
 
-#: ../src/searches/SavedSearchDialog.vala:501
-msgid "is after"
-msgstr "är efter"
+#~ msgid "Import all the photos into your library"
+#~ msgstr "Importera alla bilder till ditt bibliotek"
 
-#: ../src/searches/SavedSearchDialog.vala:502
-msgid "is before"
-msgstr "är före"
+#~ msgid "Play a slideshow"
+#~ msgstr "Spela upp ett bildspel"
 
-#: ../src/searches/SavedSearchDialog.vala:503
-msgid "is between"
-msgstr "är mellan"
+#~ msgid "_Modify original photo files"
+#~ msgstr "_Modifiera originalbilderna"
 
-#: ../src/searches/SavedSearchDialog.vala:516
-msgid "and"
-msgstr "och"
+#~ msgid "_Modify original files"
+#~ msgstr "Än_dra originalfiler"
 
-#: ../src/searches/SavedSearchDialog.vala:697
-msgid "Search"
-msgstr "Sök"
+#~ msgid "Save photo"
+#~ msgstr "Spara bild"
 
-#: ../src/searches/SavedSearchDialog.vala:702
-msgid "Cancel"
-msgstr "Avbryt"
+#~ msgid "Save photo with a different name"
+#~ msgstr "Spara bilden med ett annat namn"
 
-#: ../src/searches/SavedSearchDialog.vala:703
-msgid "OK"
-msgstr "OK"
+#~ msgid "Print the photo to a printer connected to your computer"
+#~ msgstr "Skriv ut bilden till en skrivare ansluten till din dator"
 
-#: ../src/searches/SavedSearchDialog.vala:721
-msgid "any"
-msgstr "någon"
+#~ msgid "Previous Photo"
+#~ msgstr "Föregående bild"
 
-#: ../src/searches/SavedSearchDialog.vala:722
-msgid "all"
-msgstr "alla"
+#~ msgid "Next Photo"
+#~ msgstr "Nästa bild"
 
-#: ../src/searches/SavedSearchDialog.vala:723
-msgid "none"
-msgstr "ingen"
+#~ msgid "Increase the magnification of the photo"
+#~ msgstr "Öka förstoringen av bilden"
 
-#: ../src/searches/SearchBoolean.vala:157
-msgid "Any text"
-msgstr "Valfri text"
+#~ msgid "Decrease the magnification of the photo"
+#~ msgstr "Minska förstoringen av bilden"
 
-#: ../src/searches/SearchBoolean.vala:160
-msgid "Title"
-msgstr "Titel"
+#~ msgid "Zoom the photo to fit on the screen"
+#~ msgstr "Zooma bilden för att passa på skärmen"
 
-#: ../src/searches/SearchBoolean.vala:163
-msgid "Tag"
-msgstr "Tagg"
+#~ msgid "Zoom the photo to 100% magnification"
+#~ msgstr "Zooma bilden till 100% förstoring"
 
-#: ../src/searches/SearchBoolean.vala:166
-msgid "Comment"
-msgstr "Kommentar"
+#~ msgid "Zoom the photo to 200% magnification"
+#~ msgstr "Zooma bilden till 200% förstoring"
 
-#: ../src/searches/SearchBoolean.vala:169
-msgid "Event name"
-msgstr "Händelsenamn"
+#~ msgid "Display the comment of each event"
+#~ msgstr "Visa kommentaren för varje händelse"
 
-#: ../src/searches/SearchBoolean.vala:172
-msgid "File name"
-msgstr "Filnamn"
+#~ msgid "Stop importing photos"
+#~ msgstr "Stoppa bildimporten"
 
-#: ../src/searches/SearchBoolean.vala:175
-msgid "Media type"
-msgstr "Mediatyp"
+#~ msgid "Import photos from disk to library"
+#~ msgstr "Importera bilder från hårddisken till biblioteket"
 
-#: ../src/searches/SearchBoolean.vala:178
-msgid "Flag state"
-msgstr "Tillstånd på flagga"
+#~ msgid "Find photos and videos by search criteria"
+#~ msgstr "Sök efter bilder och filmer med kriterium"
 
-#: ../src/searches/SearchBoolean.vala:181
-msgid "Photo state"
-msgstr "Bildtillstånd"
+#~ msgid "Display basic information for the selection"
+#~ msgstr "Visa grundläggande information för markeringen"
 
-#: ../src/searches/SearchBoolean.vala:187
-msgid "Date"
-msgstr "Datum"
+#~ msgid "Display extended information for the selection"
+#~ msgstr "Visa utökad information för markeringen"
 
-#: ../src/sidebar/Tree.vala:203
-msgid "New _Tag..."
-msgstr "_Ny tagg…"
+#~ msgid "Display the search bar"
+#~ msgstr "Visa sökfältet"
 
-#: ../src/slideshow/Slideshow.vala:22
-msgid "Slideshow Transitions"
-msgstr "Bildspelsövergångar"
+#~ msgid "Display the sidebar"
+#~ msgstr "Visa sidopanelen"
 
-#: ../src/slideshow/TransitionEffects.vala:98
-msgid "(None)"
-msgstr "(Ingen)"
+#~ msgid "Display the tool bar"
+#~ msgstr "Visa verktygsfältet"
 
-#: ../src/slideshow/TransitionEffects.vala:287
-msgid "None"
-msgstr "Ingen"
+#~ msgid "Sort photos in an ascending order"
+#~ msgstr "Sortera bilder i stigande ordning"
 
-#: ../src/slideshow/TransitionEffects.vala:339
-msgid "Random"
-msgstr "Slumpmässigt"
+#~ msgid "Sort photos in a descending order"
+#~ msgstr "Sortera bilder i fallande ordning"
 
-#: ../src/tags/Branch.vala:131
-msgid "Tags"
-msgstr "Taggar"
+#~ msgid "Increase the magnification of the thumbnails"
+#~ msgstr "Öka förstoringen på miniatyrbilderna"
 
-#: ../ui/set_background_dialog.glade.h:1
-msgid "Set as Desktop Background"
-msgstr "Ange som skrivbordsbakgrund"
+#~ msgid "Decrease the magnification of the thumbnails"
+#~ msgstr "Minska förstoringen på miniatyrbilderna"
 
-#: ../ui/set_background_dialog.glade.h:2
-#: ../ui/set_background_slideshow_dialog.glade.h:6
-msgid "Use for Desktop"
-msgstr "Använd för skrivbord"
+#~ msgid "_Play Video"
+#~ msgstr "Spela _upp film"
 
-#: ../ui/set_background_dialog.glade.h:3
-#: ../ui/set_background_slideshow_dialog.glade.h:7
-msgid "Use for Lock Screen"
-msgstr "Använd för låsskärm"
+#~ msgid "Open the selected videos in the system video player"
+#~ msgstr "Öppna markerade filmer i systemets filmspelare"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:1
-msgid "Set as Desktop Slideshow"
-msgstr "Ange som skrivbordsbildspel"
+#~ msgid "Display the comment of each photo"
+#~ msgstr "Visa kommentarer för varje bild"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:2
-msgid "Show each photo for"
-msgstr "Visa varje bild i"
+#~ msgid "Display each photo’s tags"
+#~ msgstr "Visa taggar för varje bild"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:3
-msgid "period of time"
-msgstr "tidsperiod"
+#~ msgid "Sort photos by title"
+#~ msgstr "Sortera bilder efter titel"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:4
-msgid "Generate desktop background slideshow"
-msgstr "Skapa bildspel för skrivbordsbakgrunden"
+#~ msgid "Sort photos by exposure date"
+#~ msgstr "Sortera bilder efter exponeringsögonblick"
 
-#: ../ui/set_background_slideshow_dialog.glade.h:5
-msgid "How long each photo is shown on the desktop background"
-msgstr "Hur länge varje bild ska visas på skrivbordsbakgrunden"
+#~ msgid "Sort photos by rating"
+#~ msgstr "Sortera bilder efter betyg"
 
-#: ../ui/shotwell.glade.h:1
-msgid "_Name of search:"
-msgstr "_Namn på sökningen:"
+#~ msgid "Sort photos by filename"
+#~ msgstr "Sortera bilder efter filnamn"
 
-#: ../ui/shotwell.glade.h:2
-msgid "_Match"
-msgstr "_Matcha"
+#~ msgid "The selected videos were successfully published."
+#~ msgstr "De valda filmerna publicerades."
 
-#: ../ui/shotwell.glade.h:3
-msgid "of the following:"
-msgstr "följande:"
+#~ msgid "The selected photos were successfully published."
+#~ msgstr "De valda bilderna publicerades."
 
-#: ../ui/shotwell.glade.h:4
-msgid "<b>Printed Image Size</b>"
-msgstr "<b>Storlek på utskriften</b>"
+#~ msgid "RAW photos"
+#~ msgstr "RAW-bilder"
 
-#: ../ui/shotwell.glade.h:5
-msgid "Use a _standard size:"
-msgstr "Använd en _standardstorlek:"
+#~ msgid "Shotwell Preferences"
+#~ msgstr "Inställningar för Shotwell"
 
-#: ../ui/shotwell.glade.h:6
-msgid "Use a c_ustom size:"
-msgstr "Använd en _anpassad storlek:"
+#~ msgid "Tag Photos as “%s”"
+#~ msgstr "Lägg till taggen ”%s” till bilderna"
 
-#: ../ui/shotwell.glade.h:7
-msgid "_Match photo aspect ratio"
-msgstr "_Matcha bildförhållande"
+#~ msgid "Tag the selected photos as “%s”"
+#~ msgstr "Lägg till taggen ”%s” på de markerade bilderna"
 
-#: ../ui/shotwell.glade.h:8
-msgid "_Autosize:"
-msgstr "_Automatisk storlek:"
+#~ msgid "Remove Tag “%s” From _Photos"
+#~ msgstr "_Ta bort taggen ”%s” från bilderna"
 
-#: ../ui/shotwell.glade.h:9
-msgid "<b>Titles</b>"
-msgstr "<b>Titlar</b>"
+#~ msgid "Remove Tag “%s” From Photos"
+#~ msgstr "Ta bort taggen ”%s” från bilderna"
 
-#: ../ui/shotwell.glade.h:10
-msgid "Print image _title"
-msgstr "Skriv ut bild _titel"
+#~ msgid "Login"
+#~ msgstr "Logga in"
 
-#: ../ui/shotwell.glade.h:11
-msgid "<b>Pixel Resolution</b>"
-msgstr "<b>Upplösning</b>"
+#~ msgid "Intro message replaced at runtime"
+#~ msgstr "Intromeddelande ersatt vid körtid"
 
-#: ../ui/shotwell.glade.h:12
-msgid "_Output photo at:"
-msgstr "_Skriv ut bild till:"
+#~ msgid "'Publishing to $url as $username' (populated in application code)"
+#~ msgstr "'Publicerar till $url som $username' (populerad i programkod)"
 
-#: ../ui/shotwell.glade.h:13
-msgid "pixels per inch"
-msgstr "pixlar per tum"
+#~ msgid "you are logged in rajce as $name"
+#~ msgstr "Du är inloggad på rajce som $name"
 
-#: ../ui/shotwell.glade.h:15
-msgid "Shotwell Preferences"
-msgstr "Inställningar för Shotwell"
+#~ msgid "$mediatype will appear in"
+#~ msgstr "$mediatype kommer att visas i"
 
-#: ../ui/shotwell.glade.h:16
-msgid "white"
-msgstr "vit"
+#~ msgid "Save Details..."
+#~ msgstr "Spara detaljer…"
 
-#: ../ui/shotwell.glade.h:17
-msgid "black"
-msgstr "svart"
+#~ msgid "Set as _Desktop Slideshow..."
+#~ msgstr "_Använd som bildspel för skrivbord…"
 
-#: ../ui/shotwell.glade.h:19
-msgid "_Watch library directory for new files"
-msgstr "_Bevaka bibliotekskatalogen efter nya filer"
+#~ msgid "Re_name Event..."
+#~ msgstr "B_yt namn på händelse…"
 
-#: ../ui/shotwell.glade.h:20
-msgid "Metadata"
-msgstr "Metadata"
+#~ msgid "_Export..."
+#~ msgstr "_Exportera…"
 
-#: ../ui/shotwell.glade.h:21
-msgid "Write tags, titles, and other _metadata to photo files"
-msgstr "Skriv taggar, titlar och annan _metadata till bildfilerna"
+#~ msgid "_Print..."
+#~ msgstr "Skriv _ut…"
 
-#: ../ui/shotwell.glade.h:22
-msgid "Display"
-msgstr "Visning"
+#~ msgid "Pu_blish..."
+#~ msgstr "Pu_blicera…"
 
-#: ../ui/shotwell.glade.h:23
-msgid "_Import photos to:"
-msgstr "_Importera bilder till:"
+#~ msgid "Edit _Title..."
+#~ msgstr "Redigera _titel…"
 
-#: ../ui/shotwell.glade.h:24
-msgid "_Background:"
-msgstr "_Bakgrund:"
+#~ msgid "Edit _Comment..."
+#~ msgstr "Redigera _kommentar…"
 
-#: ../ui/shotwell.glade.h:25
-msgid "Importing"
-msgstr "Import"
+#~ msgid "Edit Event _Comment..."
+#~ msgstr "Redigera _händelsekommentar…"
 
-#: ../ui/shotwell.glade.h:26
-msgid "_Directory structure:"
-msgstr "_Katalogstruktur:"
+#~ msgid "_Adjust Date and Time..."
+#~ msgstr "_Justera datum och tid…"
 
-#: ../ui/shotwell.glade.h:27
-msgid "_Pattern:"
-msgstr "_Mönster:"
+#~ msgid "Add _Tags..."
+#~ msgstr "Lägg till _taggar…"
 
-#: ../ui/shotwell.glade.h:28
-msgid "Example:"
-msgstr "Exempel:"
+#~ msgid "_Add Tags..."
+#~ msgstr "_Lägg till taggar…"
 
-#: ../ui/shotwell.glade.h:29
-msgid "R_ename imported files to lowercase"
-msgstr "B_yt namn på importerade filer till enbart gemener"
+#~ msgid "Send _To..."
+#~ msgstr "Skicka _till…"
 
-#: ../ui/shotwell.glade.h:30
-msgid "RAW Developer"
-msgstr "RAW-framkallare"
+#~ msgid "Send T_o..."
+#~ msgstr "Skicka _till…"
 
-#: ../ui/shotwell.glade.h:31
-msgid "De_fault:"
-msgstr "_Standard:"
+#~ msgid "_Find..."
+#~ msgstr "_Sök…"
 
-#: ../ui/shotwell.glade.h:33
-msgid "E_xternal photo editor:"
-msgstr "E_xtern bildredigerare:"
+#~ msgid "Modif_y Tags..."
+#~ msgstr "Än_dra taggar…"
 
-#: ../ui/shotwell.glade.h:34
-msgid "External _RAW editor:"
-msgstr "Extern _RAW-redigerare:"
+#~ msgid "_Edit..."
+#~ msgstr "R_edigera…"
 
-#: ../ui/shotwell.glade.h:35
-msgid "External Editors"
-msgstr "Externa redigerare"
+#~ msgid "%-I:%M %p"
+#~ msgstr "%-I:%M %p"
 
-#: ../ui/shotwell.glade.h:36
-msgid "Plugins"
-msgstr "Insticksmoduler"
+#~ msgid "%-I:%M:%S %p"
+#~ msgstr "%-I:%M:%S %p"
 
-#: ../ui/shotwell.glade.h:37
-msgid "_Delay:"
-msgstr "_Fördröjning:"
+#~ msgid "Save _As..."
+#~ msgstr "_Spara som…"
 
-#: ../ui/shotwell.glade.h:38
-msgid "_Transition effect:"
-msgstr "_Övergångseffekt:"
+#~ msgid "Importing..."
+#~ msgstr "Importerar…"
 
-#: ../ui/shotwell.glade.h:39
-msgid "Transition d_elay:"
-msgstr "_Övergångsfördröjning:"
+#~ msgid "Preparing to import..."
+#~ msgstr "Förbereder import…"
 
-#: ../ui/shotwell.glade.h:40
-msgid "Show t_itle"
-msgstr "_Visa titel"
+#~ msgid "_Import From Folder..."
+#~ msgstr "_Importera från mapp…"
 
-#: ../ui/shotwell.glade.h:41
-msgid "seconds"
-msgstr "sekunder"
+#~ msgid "Import From _Application..."
+#~ msgstr "Importera från _program…"
 
 #~ msgid "Copyright 2009-2015 Yorba Foundation"
 #~ msgstr "Copyright 2009-2015 Yorba Foundation"
diff --git a/publish-extra.am b/publish-extra.am
index 7448bf6..801cc9a 100644
--- a/publish-extra.am
+++ b/publish-extra.am
@@ -31,6 +31,7 @@ plugins/shotwell-publishing-extras/resource.c: plugins/shotwell-publishing-extra
 
 plugins_shotwell_publishing_extras_shotwell_publishing_extras_la_VALAFLAGS = \
 	$(COMMON_VALAFLAGS) \
+	@PUBLISHER_VALAFLAGS@ \
 	--pkg gtk+-3.0 \
 	--pkg libsoup-2.4 \
 	--pkg gexiv2 \
diff --git a/publish.am b/publish.am
index 1407713..799765a 100644
--- a/publish.am
+++ b/publish.am
@@ -7,7 +7,6 @@ dist_noinst_DATA += \
 	plugins/shotwell-publishing/piwigo.png \
 	plugins/shotwell-publishing/youtube.png \
 	plugins/shotwell-publishing/facebook_publishing_options_pane.ui \
-	plugins/shotwell-publishing/flickr_pin_entry_pane.ui \
 	plugins/shotwell-publishing/flickr_publishing_options_pane.ui \
 	plugins/shotwell-publishing/picasa_publishing_options_pane.ui \
 	plugins/shotwell-publishing/piwigo_authentication_pane.ui \
@@ -23,7 +22,9 @@ plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
 	plugins/shotwell-publishing/FlickrPublishing.vala \
 	plugins/shotwell-publishing/YouTubePublishing.vala \
 	plugins/shotwell-publishing/PiwigoPublishing.vala \
-	plugins/shotwell-plugin-common.vapi
+	plugins/shotwell-plugin-common.vapi \
+	plugins/authenticator/shotwell-authenticator.vapi \
+	vapi/libgdata.vapi
 
 nodist_plugins_shotwell_publishing_shotwell_publishing_la_SOURCES = \
 	plugins/shotwell-publishing/resource.c
@@ -43,6 +44,7 @@ plugins/shotwell-publishing/resource.c: $(PUBLISHING_RESOURCE_DEPS) $(PUBLISHING
 
 plugins_shotwell_publishing_shotwell_publishing_la_VALAFLAGS = \
 	$(COMMON_VALAFLAGS) \
+	@PUBLISHER_VALAFLAGS@ \
 	--pkg gtk+-3.0 \
 	--pkg libsoup-2.4 \
 	--pkg gexiv2 \
@@ -61,11 +63,13 @@ plugins_shotwell_publishing_shotwell_publishing_la_CFLAGS = \
 	$(COMMON_CFLAGS) \
 	-DGCR_API_SUBJECT_TO_CHANGE \
 	$(PUBLISHING_CFLAGS) \
-	-I $(top_srcdir)/plugins
+	-I $(top_srcdir)/plugins \
+	-I $(top_srcdir)/plugins/authenticator
 
 plugins_shotwell_publishing_shotwell_publishing_la_LDFLAGS = \
 	$(SHOTWELL_PLUGIN_LDFLAGS)
 
 plugins_shotwell_publishing_shotwell_publishing_la_LIBADD = \
 	$(PUBLISHING_LIBS) \
-	$(top_builddir)/plugins/common/libshotwell-plugin-common.la
+	$(top_builddir)/plugins/common/libshotwell-plugin-common.la \
+	$(top_builddir)/plugins/authenticator/libshotwell-authenticator.la
diff --git a/src/AppDirs.c b/src/AppDirs.c
index 7ac7928..6e6c89b 100644
--- a/src/AppDirs.c
+++ b/src/AppDirs.c
@@ -130,7 +130,6 @@ GFile* app_dirs_get_temp_dir (void);
 GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname);
 void app_dirs_ensure_writable (GFile* dir);
 GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname);
-GFile* app_dirs_get_resources_dir (void);
 GFile* app_dirs_get_lib_dir (void);
 #define RESOURCES_LIB _LIB
 GFile* app_dirs_get_system_plugins_dir (void);
@@ -182,7 +181,7 @@ void app_dirs_init (const gchar* arg0) {
 	app_dirs_exec_dir = _tmp7_;
 #line 16 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (exec_file);
-#line 186 "AppDirs.c"
+#line 185 "AppDirs.c"
 }
 
 
@@ -202,14 +201,14 @@ GFile* app_dirs_get_home_dir (void) {
 	result = _tmp1_;
 #line 27 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 206 "AppDirs.c"
+#line 205 "AppDirs.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 213 "AppDirs.c"
+#line 212 "AppDirs.c"
 }
 
 
@@ -221,7 +220,7 @@ GFile* app_dirs_get_cache_dir (void) {
 	_tmp1_ = app_dirs_data_dir;
 #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp1_ == NULL) {
-#line 225 "AppDirs.c"
+#line 224 "AppDirs.c"
 		const gchar* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
@@ -240,7 +239,7 @@ GFile* app_dirs_get_cache_dir (void) {
 		_tmp0_ = _tmp5_;
 #line 32 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp4_);
-#line 244 "AppDirs.c"
+#line 243 "AppDirs.c"
 	} else {
 		GFile* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
@@ -252,13 +251,13 @@ GFile* app_dirs_get_cache_dir (void) {
 		_g_object_unref0 (_tmp0_);
 #line 33 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp0_ = _tmp7_;
-#line 256 "AppDirs.c"
+#line 255 "AppDirs.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp0_;
 #line 31 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 262 "AppDirs.c"
+#line 261 "AppDirs.c"
 }
 
 
@@ -351,7 +350,7 @@ void app_dirs_try_migrate_data (void) {
 	_tmp11_ = g_file_query_exists (_tmp10_, NULL);
 #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp11_) {
-#line 355 "AppDirs.c"
+#line 354 "AppDirs.c"
 		GFile* _tmp12_ = NULL;
 		GFile* _tmp13_ = NULL;
 		GFile* _tmp14_ = NULL;
@@ -368,15 +367,15 @@ void app_dirs_try_migrate_data (void) {
 		_tmp9_ = !_tmp15_;
 #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp14_);
-#line 372 "AppDirs.c"
+#line 371 "AppDirs.c"
 	} else {
 #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = FALSE;
-#line 376 "AppDirs.c"
+#line 375 "AppDirs.c"
 	}
 #line 42 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp9_) {
-#line 380 "AppDirs.c"
+#line 379 "AppDirs.c"
 		{
 			GFile* _tmp16_ = NULL;
 			GFile* _tmp17_ = NULL;
@@ -393,12 +392,12 @@ void app_dirs_try_migrate_data (void) {
 			_g_object_unref0 (_tmp18_);
 #line 44 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 397 "AppDirs.c"
-				goto __catch442_g_error;
+#line 396 "AppDirs.c"
+				goto __catch443_g_error;
 			}
 		}
-		goto __finally442;
-		__catch442_g_error:
+		goto __finally443;
+		__catch443_g_error:
 		{
 			GError* err = NULL;
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -407,9 +406,9 @@ void app_dirs_try_migrate_data (void) {
 			_inner_error_ = NULL;
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 411 "AppDirs.c"
+#line 410 "AppDirs.c"
 		}
-		__finally442:
+		__finally443:
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -422,7 +421,7 @@ void app_dirs_try_migrate_data (void) {
 			g_clear_error (&_inner_error_);
 #line 43 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return;
-#line 426 "AppDirs.c"
+#line 425 "AppDirs.c"
 		}
 	}
 	{
@@ -436,12 +435,12 @@ void app_dirs_try_migrate_data (void) {
 		g_file_move (_tmp19_, _tmp20_, G_FILE_COPY_NONE, NULL, NULL, NULL, &_inner_error_);
 #line 49 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 440 "AppDirs.c"
-			goto __catch443_g_error;
+#line 439 "AppDirs.c"
+			goto __catch444_g_error;
 		}
 	}
-	goto __finally443;
-	__catch443_g_error:
+	goto __finally444;
+	__catch444_g_error:
 	{
 		GError* err = NULL;
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -450,9 +449,9 @@ void app_dirs_try_migrate_data (void) {
 		_inner_error_ = NULL;
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 454 "AppDirs.c"
+#line 453 "AppDirs.c"
 	}
-	__finally443:
+	__finally444:
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -465,7 +464,7 @@ void app_dirs_try_migrate_data (void) {
 		g_clear_error (&_inner_error_);
 #line 48 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return;
-#line 469 "AppDirs.c"
+#line 468 "AppDirs.c"
 	}
 #line 53 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp21_ = app_dirs_get_data_dir ();
@@ -491,7 +490,7 @@ void app_dirs_try_migrate_data (void) {
 	if (_tmp27_) {
 #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp25_ = TRUE;
-#line 495 "AppDirs.c"
+#line 494 "AppDirs.c"
 	} else {
 		GFile* _tmp28_ = NULL;
 		gboolean _tmp29_ = FALSE;
@@ -501,7 +500,7 @@ void app_dirs_try_migrate_data (void) {
 		_tmp29_ = g_file_query_exists (_tmp28_, NULL);
 #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp25_ = !_tmp29_;
-#line 505 "AppDirs.c"
+#line 504 "AppDirs.c"
 	}
 #line 55 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp25_) {
@@ -513,7 +512,7 @@ void app_dirs_try_migrate_data (void) {
 		_g_object_unref0 (user_plugin_dir);
 #line 56 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return;
-#line 517 "AppDirs.c"
+#line 516 "AppDirs.c"
 	}
 #line 58 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp30_ = app_dirs_get_cache_dir ();
@@ -529,7 +528,7 @@ void app_dirs_try_migrate_data (void) {
 	_tmp33_ = g_file_query_exists (_tmp32_, NULL);
 #line 60 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp33_) {
-#line 533 "AppDirs.c"
+#line 532 "AppDirs.c"
 		{
 			GFile* _tmp34_ = NULL;
 #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -538,12 +537,12 @@ void app_dirs_try_migrate_data (void) {
 			g_file_make_directory_with_parents (_tmp34_, NULL, &_inner_error_);
 #line 62 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 542 "AppDirs.c"
-				goto __catch444_g_error;
+#line 541 "AppDirs.c"
+				goto __catch445_g_error;
 			}
 		}
-		goto __finally444;
-		__catch444_g_error:
+		goto __finally445;
+		__catch445_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp35_ = NULL;
@@ -582,9 +581,9 @@ void app_dirs_try_migrate_data (void) {
 			_g_free0 (_tmp38_);
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 586 "AppDirs.c"
+#line 585 "AppDirs.c"
 		}
-		__finally444:
+		__finally445:
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -601,7 +600,7 @@ void app_dirs_try_migrate_data (void) {
 			g_clear_error (&_inner_error_);
 #line 61 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return;
-#line 605 "AppDirs.c"
+#line 604 "AppDirs.c"
 		}
 	}
 #line 68 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -648,7 +647,7 @@ void app_dirs_try_migrate_data (void) {
 	_g_object_unref0 (_tmp55_);
 #line 70 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp57_) {
-#line 652 "AppDirs.c"
+#line 651 "AppDirs.c"
 		{
 			GFile* _tmp58_ = NULL;
 			GFile* _tmp59_ = NULL;
@@ -665,12 +664,12 @@ void app_dirs_try_migrate_data (void) {
 			_g_object_unref0 (_tmp60_);
 #line 72 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 669 "AppDirs.c"
-				goto __catch445_g_error;
+#line 668 "AppDirs.c"
+				goto __catch446_g_error;
 			}
 		}
-		goto __finally445;
-		__catch445_g_error:
+		goto __finally446;
+		__catch446_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp61_ = NULL;
@@ -717,9 +716,9 @@ void app_dirs_try_migrate_data (void) {
 			_g_object_unref0 (_tmp64_);
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 721 "AppDirs.c"
+#line 720 "AppDirs.c"
 		}
-		__finally445:
+		__finally446:
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -736,7 +735,7 @@ void app_dirs_try_migrate_data (void) {
 			g_clear_error (&_inner_error_);
 #line 71 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return;
-#line 740 "AppDirs.c"
+#line 739 "AppDirs.c"
 		}
 	}
 #line 78 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -779,7 +778,7 @@ void app_dirs_try_migrate_data (void) {
 	_g_object_unref0 (old_dir);
 #line 36 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (user_plugin_dir);
-#line 783 "AppDirs.c"
+#line 782 "AppDirs.c"
 }
 
 
@@ -819,7 +818,7 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 	_tmp6_ = g_path_is_absolute (_tmp5_);
 #line 90 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp6_) {
-#line 823 "AppDirs.c"
+#line 822 "AppDirs.c"
 		GFile* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
@@ -838,7 +837,7 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 		app_dirs_data_dir = _tmp10_;
 #line 91 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp8_);
-#line 842 "AppDirs.c"
+#line 841 "AppDirs.c"
 	} else {
 		const gchar* _tmp11_ = NULL;
 		GFile* _tmp12_ = NULL;
@@ -850,7 +849,7 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 		_g_object_unref0 (app_dirs_data_dir);
 #line 93 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		app_dirs_data_dir = _tmp12_;
-#line 854 "AppDirs.c"
+#line 853 "AppDirs.c"
 	}
 #line 95 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp13_ = app_dirs_data_dir;
@@ -864,7 +863,7 @@ void app_dirs_set_data_dir (const gchar* user_data_dir) {
 	_g_free0 (_tmp15_);
 #line 85 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_free0 (path);
-#line 868 "AppDirs.c"
+#line 867 "AppDirs.c"
 }
 
 
@@ -876,7 +875,7 @@ void app_dirs_verify_data_dir (void) {
 	_tmp0_ = app_dirs_get_data_dir ();
 #line 99 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	data_dir = _tmp0_;
-#line 880 "AppDirs.c"
+#line 879 "AppDirs.c"
 	{
 		GFile* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
@@ -886,7 +885,7 @@ void app_dirs_verify_data_dir (void) {
 		_tmp2_ = g_file_query_exists (_tmp1_, NULL);
 #line 101 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp2_) {
-#line 890 "AppDirs.c"
+#line 889 "AppDirs.c"
 			GFile* _tmp3_ = NULL;
 #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp3_ = data_dir;
@@ -894,13 +893,13 @@ void app_dirs_verify_data_dir (void) {
 			g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_);
 #line 102 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 898 "AppDirs.c"
-				goto __catch446_g_error;
+#line 897 "AppDirs.c"
+				goto __catch447_g_error;
 			}
 		}
 	}
-	goto __finally446;
-	__catch446_g_error:
+	goto __finally447;
+	__catch447_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -939,9 +938,9 @@ void app_dirs_verify_data_dir (void) {
 		_g_free0 (_tmp7_);
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 943 "AppDirs.c"
+#line 942 "AppDirs.c"
 	}
-	__finally446:
+	__finally447:
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -952,11 +951,11 @@ void app_dirs_verify_data_dir (void) {
 		g_clear_error (&_inner_error_);
 #line 100 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return;
-#line 956 "AppDirs.c"
+#line 955 "AppDirs.c"
 	}
 #line 98 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (data_dir);
-#line 960 "AppDirs.c"
+#line 959 "AppDirs.c"
 }
 
 
@@ -968,7 +967,7 @@ void app_dirs_verify_cache_dir (void) {
 	_tmp0_ = app_dirs_get_cache_dir ();
 #line 110 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	cache_dir = _tmp0_;
-#line 972 "AppDirs.c"
+#line 971 "AppDirs.c"
 	{
 		GFile* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
@@ -978,7 +977,7 @@ void app_dirs_verify_cache_dir (void) {
 		_tmp2_ = g_file_query_exists (_tmp1_, NULL);
 #line 112 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp2_) {
-#line 982 "AppDirs.c"
+#line 981 "AppDirs.c"
 			GFile* _tmp3_ = NULL;
 #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp3_ = cache_dir;
@@ -986,13 +985,13 @@ void app_dirs_verify_cache_dir (void) {
 			g_file_make_directory_with_parents (_tmp3_, NULL, &_inner_error_);
 #line 113 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 990 "AppDirs.c"
-				goto __catch447_g_error;
+#line 989 "AppDirs.c"
+				goto __catch448_g_error;
 			}
 		}
 	}
-	goto __finally447;
-	__catch447_g_error:
+	goto __finally448;
+	__catch448_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -1031,9 +1030,9 @@ void app_dirs_verify_cache_dir (void) {
 		_g_free0 (_tmp7_);
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 1035 "AppDirs.c"
+#line 1034 "AppDirs.c"
 	}
-	__finally447:
+	__finally448:
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1044,11 +1043,11 @@ void app_dirs_verify_cache_dir (void) {
 		g_clear_error (&_inner_error_);
 #line 111 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return;
-#line 1048 "AppDirs.c"
+#line 1047 "AppDirs.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (cache_dir);
-#line 1052 "AppDirs.c"
+#line 1051 "AppDirs.c"
 }
 
 
@@ -1065,7 +1064,7 @@ GFile* app_dirs_get_libexec_dir (void) {
 	_tmp0_ = app_dirs_libexec_dir;
 #line 125 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp0_ == NULL) {
-#line 1069 "AppDirs.c"
+#line 1068 "AppDirs.c"
 		GFile* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
@@ -1079,7 +1078,7 @@ GFile* app_dirs_get_libexec_dir (void) {
 		_g_object_unref0 (_tmp2_);
 #line 126 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (_tmp3_) {
-#line 1083 "AppDirs.c"
+#line 1082 "AppDirs.c"
 			GFile* _tmp4_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp4_ = app_dirs_get_exec_dir ();
@@ -1087,7 +1086,7 @@ GFile* app_dirs_get_libexec_dir (void) {
 			_g_object_unref0 (app_dirs_libexec_dir);
 #line 128 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			app_dirs_libexec_dir = _tmp4_;
-#line 1091 "AppDirs.c"
+#line 1090 "AppDirs.c"
 		} else {
 			GFile* _tmp5_ = NULL;
 #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1096,7 +1095,7 @@ GFile* app_dirs_get_libexec_dir (void) {
 			_g_object_unref0 (app_dirs_libexec_dir);
 #line 130 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			app_dirs_libexec_dir = _tmp5_;
-#line 1100 "AppDirs.c"
+#line 1099 "AppDirs.c"
 		}
 	}
 #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1107,7 +1106,7 @@ GFile* app_dirs_get_libexec_dir (void) {
 	result = _tmp7_;
 #line 134 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1111 "AppDirs.c"
+#line 1110 "AppDirs.c"
 }
 
 
@@ -1123,7 +1122,7 @@ GFile* app_dirs_get_install_dir (void) {
 	result = _tmp1_;
 #line 139 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1127 "AppDirs.c"
+#line 1126 "AppDirs.c"
 }
 
 
@@ -1135,7 +1134,7 @@ GFile* app_dirs_get_data_dir (void) {
 	_tmp1_ = app_dirs_data_dir;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp1_ == NULL) {
-#line 1139 "AppDirs.c"
+#line 1138 "AppDirs.c"
 		const gchar* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
@@ -1154,7 +1153,7 @@ GFile* app_dirs_get_data_dir (void) {
 		_tmp0_ = _tmp5_;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp4_);
-#line 1158 "AppDirs.c"
+#line 1157 "AppDirs.c"
 	} else {
 		GFile* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
@@ -1166,13 +1165,13 @@ GFile* app_dirs_get_data_dir (void) {
 		_g_object_unref0 (_tmp0_);
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp0_ = _tmp7_;
-#line 1170 "AppDirs.c"
+#line 1169 "AppDirs.c"
 	}
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp0_;
 #line 143 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1176 "AppDirs.c"
+#line 1175 "AppDirs.c"
 }
 
 
@@ -1212,7 +1211,7 @@ GFile* app_dirs_get_import_dir (void) {
 	_tmp5_ = is_string_empty (_tmp4_);
 #line 150 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp5_) {
-#line 1216 "AppDirs.c"
+#line 1215 "AppDirs.c"
 		const gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
@@ -1233,7 +1232,7 @@ GFile* app_dirs_get_import_dir (void) {
 		_tmp9_ = g_path_is_absolute (_tmp8_);
 #line 155 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp9_) {
-#line 1237 "AppDirs.c"
+#line 1236 "AppDirs.c"
 			GFile* _tmp10_ = NULL;
 			GFile* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
@@ -1257,7 +1256,7 @@ GFile* app_dirs_get_import_dir (void) {
 			_g_free0 (path);
 #line 156 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return result;
-#line 1261 "AppDirs.c"
+#line 1260 "AppDirs.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp15_ = path;
@@ -1269,7 +1268,7 @@ GFile* app_dirs_get_import_dir (void) {
 		_g_free0 (path);
 #line 159 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return result;
-#line 1273 "AppDirs.c"
+#line 1272 "AppDirs.c"
 	}
 #line 163 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp17_ = g_get_user_special_dir (G_USER_DIRECTORY_PICTURES);
@@ -1285,7 +1284,7 @@ GFile* app_dirs_get_import_dir (void) {
 	_tmp20_ = is_string_empty (_tmp19_);
 #line 164 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp20_) {
-#line 1289 "AppDirs.c"
+#line 1288 "AppDirs.c"
 		const gchar* _tmp21_ = NULL;
 		GFile* _tmp22_ = NULL;
 #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1298,7 +1297,7 @@ GFile* app_dirs_get_import_dir (void) {
 		_g_free0 (path);
 #line 165 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return result;
-#line 1302 "AppDirs.c"
+#line 1301 "AppDirs.c"
 	}
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp23_ = app_dirs_get_home_dir ();
@@ -1318,7 +1317,7 @@ GFile* app_dirs_get_import_dir (void) {
 	_g_free0 (path);
 #line 168 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1322 "AppDirs.c"
+#line 1321 "AppDirs.c"
 }
 
 
@@ -1367,7 +1366,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 	_tmp5_ = is_string_empty (_tmp4_);
 #line 174 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp5_) {
-#line 1371 "AppDirs.c"
+#line 1370 "AppDirs.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
@@ -1383,7 +1382,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 		pattern = _tmp8_;
 #line 175 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1387 "AppDirs.c"
+#line 1386 "AppDirs.c"
 	}
 #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp9_ = pattern;
@@ -1391,7 +1390,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 	_tmp10_ = is_string_empty (_tmp9_);
 #line 176 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp10_) {
-#line 1395 "AppDirs.c"
+#line 1394 "AppDirs.c"
 		gchar* _tmp11_ = NULL;
 #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp11_ = g_strdup ("%Y" G_DIR_SEPARATOR_S "%m" G_DIR_SEPARATOR_S "%d");
@@ -1399,7 +1398,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 		_g_free0 (pattern);
 #line 177 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		pattern = _tmp11_;
-#line 1403 "AppDirs.c"
+#line 1402 "AppDirs.c"
 	}
 #line 179 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp12_ = tm;
@@ -1451,7 +1450,7 @@ GFile* app_dirs_get_baked_import_dir (time_t tm) {
 	_g_free0 (pattern);
 #line 180 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1455 "AppDirs.c"
+#line 1454 "AppDirs.c"
 }
 
 
@@ -1479,7 +1478,7 @@ gboolean app_dirs_is_in_import_dir (GFile* file) {
 	if (_tmp4_) {
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = TRUE;
-#line 1483 "AppDirs.c"
+#line 1482 "AppDirs.c"
 	} else {
 		GFile* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
@@ -1492,7 +1491,7 @@ gboolean app_dirs_is_in_import_dir (GFile* file) {
 		_tmp7_ = g_file_equal (_tmp5_, _tmp6_);
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = _tmp7_;
-#line 1496 "AppDirs.c"
+#line 1495 "AppDirs.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp1_;
@@ -1500,7 +1499,7 @@ gboolean app_dirs_is_in_import_dir (GFile* file) {
 	_g_object_unref0 (import_dir);
 #line 187 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1504 "AppDirs.c"
+#line 1503 "AppDirs.c"
 }
 
 
@@ -1520,7 +1519,7 @@ void app_dirs_set_import_dir (const gchar* path) {
 	configuration_facade_set_import_dir (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp2_);
 #line 191 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1524 "AppDirs.c"
+#line 1523 "AppDirs.c"
 }
 
 
@@ -1536,7 +1535,7 @@ GFile* app_dirs_get_exec_dir (void) {
 	result = _tmp1_;
 #line 195 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1540 "AppDirs.c"
+#line 1539 "AppDirs.c"
 }
 
 
@@ -1550,7 +1549,7 @@ GFile* app_dirs_get_temp_dir (void) {
 	_tmp0_ = app_dirs_tmp_dir;
 #line 199 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp0_ == NULL) {
-#line 1554 "AppDirs.c"
+#line 1553 "AppDirs.c"
 		const gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -1572,7 +1571,7 @@ GFile* app_dirs_get_temp_dir (void) {
 		app_dirs_tmp_dir = _tmp5_;
 #line 200 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_free0 (_tmp4_);
-#line 1576 "AppDirs.c"
+#line 1575 "AppDirs.c"
 		{
 			GFile* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
@@ -1582,7 +1581,7 @@ GFile* app_dirs_get_temp_dir (void) {
 			_tmp7_ = g_file_query_exists (_tmp6_, NULL);
 #line 203 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (!_tmp7_) {
-#line 1586 "AppDirs.c"
+#line 1585 "AppDirs.c"
 				GFile* _tmp8_ = NULL;
 #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_tmp8_ = app_dirs_tmp_dir;
@@ -1590,13 +1589,13 @@ GFile* app_dirs_get_temp_dir (void) {
 				g_file_make_directory_with_parents (_tmp8_, NULL, &_inner_error_);
 #line 204 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1594 "AppDirs.c"
-					goto __catch448_g_error;
+#line 1593 "AppDirs.c"
+					goto __catch449_g_error;
 				}
 			}
 		}
-		goto __finally448;
-		__catch448_g_error:
+		goto __finally449;
+		__catch449_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp9_ = NULL;
@@ -1635,9 +1634,9 @@ GFile* app_dirs_get_temp_dir (void) {
 			_g_free0 (_tmp12_);
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 1639 "AppDirs.c"
+#line 1638 "AppDirs.c"
 		}
-		__finally448:
+		__finally449:
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1646,7 +1645,7 @@ GFile* app_dirs_get_temp_dir (void) {
 			g_clear_error (&_inner_error_);
 #line 202 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return NULL;
-#line 1650 "AppDirs.c"
+#line 1649 "AppDirs.c"
 		}
 	}
 #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1657,7 +1656,7 @@ GFile* app_dirs_get_temp_dir (void) {
 	result = _tmp18_;
 #line 211 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1661 "AppDirs.c"
+#line 1660 "AppDirs.c"
 }
 
 
@@ -1691,7 +1690,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 	_tmp5_ = subname;
 #line 216 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp5_ != NULL) {
-#line 1695 "AppDirs.c"
+#line 1694 "AppDirs.c"
 		GFile* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
@@ -1705,7 +1704,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		_g_object_unref0 (subdir);
 #line 217 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		subdir = _tmp8_;
-#line 1709 "AppDirs.c"
+#line 1708 "AppDirs.c"
 	}
 	{
 		GFile* _tmp9_ = NULL;
@@ -1716,7 +1715,7 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		_tmp10_ = g_file_query_exists (_tmp9_, NULL);
 #line 220 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp10_) {
-#line 1720 "AppDirs.c"
+#line 1719 "AppDirs.c"
 			GFile* _tmp11_ = NULL;
 #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp11_ = subdir;
@@ -1724,13 +1723,13 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 			g_file_make_directory_with_parents (_tmp11_, NULL, &_inner_error_);
 #line 221 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1728 "AppDirs.c"
-				goto __catch449_g_error;
+#line 1727 "AppDirs.c"
+				goto __catch450_g_error;
 			}
 		}
 	}
-	goto __finally449;
-	__catch449_g_error:
+	goto __finally450;
+	__catch450_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp12_ = NULL;
@@ -1769,9 +1768,9 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		_g_free0 (_tmp15_);
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 1773 "AppDirs.c"
+#line 1772 "AppDirs.c"
 	}
-	__finally449:
+	__finally450:
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1782,13 +1781,13 @@ GFile* app_dirs_get_data_subdir (const gchar* name, const gchar* subname) {
 		g_clear_error (&_inner_error_);
 #line 219 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return NULL;
-#line 1786 "AppDirs.c"
+#line 1785 "AppDirs.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = subdir;
 #line 227 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 1792 "AppDirs.c"
+#line 1791 "AppDirs.c"
 }
 
 
@@ -1804,7 +1803,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 	_tmp1_ = g_file_query_exists (_tmp0_, NULL);
 #line 231 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp1_) {
-#line 1808 "AppDirs.c"
+#line 1807 "AppDirs.c"
 		{
 			GFileInfo* info = NULL;
 			GFile* _tmp2_ = NULL;
@@ -1824,8 +1823,8 @@ void app_dirs_ensure_writable (GFile* dir) {
 			info = _tmp3_;
 #line 233 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1828 "AppDirs.c"
-				goto __catch450_g_error;
+#line 1827 "AppDirs.c"
+				goto __catch451_g_error;
 			}
 #line 234 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp4_ = info;
@@ -1845,12 +1844,12 @@ void app_dirs_ensure_writable (GFile* dir) {
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_g_object_unref0 (info);
-#line 1849 "AppDirs.c"
-				goto __catch450_g_error;
+#line 1848 "AppDirs.c"
+				goto __catch451_g_error;
 			}
 #line 235 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (!_tmp6_) {
-#line 1854 "AppDirs.c"
+#line 1853 "AppDirs.c"
 				const gchar* _tmp10_ = NULL;
 				GFile* _tmp11_ = NULL;
 				gchar* _tmp12_ = NULL;
@@ -1875,14 +1874,14 @@ void app_dirs_ensure_writable (GFile* dir) {
 				_g_free0 (_tmp15_);
 #line 236 "/home/jens/Source/shotwell/src/AppDirs.vala"
 				_g_free0 (_tmp13_);
-#line 1879 "AppDirs.c"
+#line 1878 "AppDirs.c"
 			}
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_object_unref0 (info);
-#line 1883 "AppDirs.c"
+#line 1882 "AppDirs.c"
 		}
-		goto __finally450;
-		__catch450_g_error:
+		goto __finally451;
+		__catch451_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp16_ = NULL;
@@ -1921,9 +1920,9 @@ void app_dirs_ensure_writable (GFile* dir) {
 			_g_free0 (_tmp19_);
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_g_error_free0 (err);
-#line 1925 "AppDirs.c"
+#line 1924 "AppDirs.c"
 		}
-		__finally450:
+		__finally451:
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -1932,7 +1931,7 @@ void app_dirs_ensure_writable (GFile* dir) {
 			g_clear_error (&_inner_error_);
 #line 232 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return;
-#line 1936 "AppDirs.c"
+#line 1935 "AppDirs.c"
 		}
 	}
 }
@@ -1974,7 +1973,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 	_tmp6_ = subname;
 #line 247 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp6_ != NULL) {
-#line 1978 "AppDirs.c"
+#line 1977 "AppDirs.c"
 		GFile* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
@@ -1988,7 +1987,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		_g_object_unref0 (subdir);
 #line 248 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		subdir = _tmp9_;
-#line 1992 "AppDirs.c"
+#line 1991 "AppDirs.c"
 	}
 	{
 		GFile* _tmp10_ = NULL;
@@ -1999,7 +1998,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		_tmp11_ = g_file_query_exists (_tmp10_, NULL);
 #line 251 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (!_tmp11_) {
-#line 2003 "AppDirs.c"
+#line 2002 "AppDirs.c"
 			GFile* _tmp12_ = NULL;
 #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp12_ = subdir;
@@ -2007,13 +2006,13 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 			g_file_make_directory_with_parents (_tmp12_, NULL, &_inner_error_);
 #line 252 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2011 "AppDirs.c"
-				goto __catch451_g_error;
+#line 2010 "AppDirs.c"
+				goto __catch452_g_error;
 			}
 		}
 	}
-	goto __finally451;
-	__catch451_g_error:
+	goto __finally452;
+	__catch452_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp13_ = NULL;
@@ -2052,9 +2051,9 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		_g_free0 (_tmp16_);
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_error_free0 (err);
-#line 2056 "AppDirs.c"
+#line 2055 "AppDirs.c"
 	}
-	__finally451:
+	__finally452:
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2065,7 +2064,7 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 		g_clear_error (&_inner_error_);
 #line 250 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return NULL;
-#line 2069 "AppDirs.c"
+#line 2068 "AppDirs.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp21_ = subdir;
@@ -2075,11 +2074,11 @@ GFile* app_dirs_get_cache_subdir (const gchar* name, const gchar* subname) {
 	result = subdir;
 #line 258 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2079 "AppDirs.c"
+#line 2078 "AppDirs.c"
 }
 
 
-GFile* app_dirs_get_resources_dir (void) {
+GFile* app_dirs_get_lib_dir (void) {
 	GFile* result = NULL;
 	GFile* install_dir = NULL;
 	GFile* _tmp0_ = NULL;
@@ -2093,7 +2092,7 @@ GFile* app_dirs_get_resources_dir (void) {
 	_tmp2_ = install_dir;
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp2_ != NULL) {
-#line 2097 "AppDirs.c"
+#line 2096 "AppDirs.c"
 		GFile* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
@@ -2101,7 +2100,7 @@ GFile* app_dirs_get_resources_dir (void) {
 #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_, "share");
+		_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"
@@ -2112,7 +2111,7 @@ GFile* app_dirs_get_resources_dir (void) {
 		_tmp1_ = _tmp6_;
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp5_);
-#line 2116 "AppDirs.c"
+#line 2115 "AppDirs.c"
 	} else {
 		GFile* _tmp7_ = NULL;
 #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala"
@@ -2121,7 +2120,7 @@ GFile* app_dirs_get_resources_dir (void) {
 		_g_object_unref0 (_tmp1_);
 #line 265 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = _tmp7_;
-#line 2125 "AppDirs.c"
+#line 2124 "AppDirs.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp1_;
@@ -2129,61 +2128,7 @@ GFile* app_dirs_get_resources_dir (void) {
 	_g_object_unref0 (install_dir);
 #line 264 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2133 "AppDirs.c"
-}
-
-
-GFile* app_dirs_get_lib_dir (void) {
-	GFile* result = NULL;
-	GFile* install_dir = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp0_ = app_dirs_get_install_dir ();
-#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	install_dir = _tmp0_;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	_tmp2_ = install_dir;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	if (_tmp2_ != NULL) {
-#line 2151 "AppDirs.c"
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		GFile* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp3_ = install_dir;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp4_ = g_file_get_child (_tmp3_, RESOURCES_LIB);
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp5_ = _tmp4_;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp6_ = g_file_get_child (_tmp5_, "shotwell");
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_object_unref0 (_tmp1_);
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp1_ = _tmp6_;
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_object_unref0 (_tmp5_);
-#line 2170 "AppDirs.c"
-	} else {
-		GFile* _tmp7_ = NULL;
-#line 272 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp7_ = app_dirs_get_exec_dir ();
-#line 272 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_g_object_unref0 (_tmp1_);
-#line 272 "/home/jens/Source/shotwell/src/AppDirs.vala"
-		_tmp1_ = _tmp7_;
-#line 2179 "AppDirs.c"
-	}
-#line 271 "/home/jens/Source/shotwell/src/AppDirs.vala"
-	result = _tmp1_;
-#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 2187 "AppDirs.c"
+#line 2132 "AppDirs.c"
 }
 
 
@@ -2193,21 +2138,21 @@ GFile* app_dirs_get_system_plugins_dir (void) {
 	GFile* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_lib_dir ();
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "plugins");
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp3_;
-#line 276 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 269 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2211 "AppDirs.c"
+#line 2156 "AppDirs.c"
 }
 
 
@@ -2217,54 +2162,54 @@ GFile* app_dirs_get_user_plugins_dir (void) {
 	GFile* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_data_dir ();
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "plugins");
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = _tmp3_;
-#line 280 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 273 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2235 "AppDirs.c"
+#line 2180 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_log_file (void) {
 	GFile* result = NULL;
 	const gchar* _tmp0_ = NULL;
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 277 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = g_getenv ("SHOTWELL_LOG_FILE");
-#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 277 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (_tmp0_ != NULL) {
-#line 2246 "AppDirs.c"
+#line 2191 "AppDirs.c"
 		const gchar* _tmp1_ = NULL;
-#line 285 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp1_ = g_getenv ("SHOTWELL_LOG_FILE");
-#line 285 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 278 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		if (g_strcmp0 (_tmp1_, ":console:") == 0) {
-#line 286 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 279 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			result = NULL;
-#line 286 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 279 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return result;
-#line 2256 "AppDirs.c"
+#line 2201 "AppDirs.c"
 		} else {
 			const gchar* _tmp2_ = NULL;
 			GFile* _tmp3_ = NULL;
-#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp2_ = g_getenv ("SHOTWELL_LOG_FILE");
-#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			_tmp3_ = g_file_new_for_path (_tmp2_);
-#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			result = _tmp3_;
-#line 288 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 281 "/home/jens/Source/shotwell/src/AppDirs.vala"
 			return result;
-#line 2268 "AppDirs.c"
+#line 2213 "AppDirs.c"
 		}
 	} else {
 		const gchar* _tmp4_ = NULL;
@@ -2274,38 +2219,38 @@ GFile* app_dirs_get_log_file (void) {
 		GFile* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp4_ = g_get_user_cache_dir ();
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp5_ = g_file_new_for_path (_tmp4_);
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp6_ = _tmp5_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp7_ = g_file_get_child (_tmp6_, "shotwell");
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp8_ = _tmp7_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = g_file_get_child (_tmp8_, "shotwell.log");
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp10_ = _tmp9_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp8_);
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp6_);
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		result = _tmp10_;
-#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 284 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		return result;
-#line 2300 "AppDirs.c"
+#line 2245 "AppDirs.c"
 	}
 }
 
 
 GFile* app_dirs_get_thumbnailer_bin (void) {
 	GFile* result = NULL;
-#line 297 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 290 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	static const char filename[] = "shotwell-video-thumbnailer";
-#line 2309 "AppDirs.c"
+#line 2254 "AppDirs.c"
 	GFile* f = NULL;
 	GFile* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
@@ -2315,69 +2260,69 @@ GFile* app_dirs_get_thumbnailer_bin (void) {
 	GFile* _tmp5_ = NULL;
 	GFile* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_libexec_dir ();
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "thumbnailer");
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, filename);
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp5_ = _tmp4_;
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp3_);
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 298 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 291 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	f = _tmp5_;
-#line 299 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp6_ = f;
-#line 299 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp7_ = g_file_query_exists (_tmp6_, NULL);
-#line 299 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 292 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp7_) {
-#line 2343 "AppDirs.c"
+#line 2288 "AppDirs.c"
 		GFile* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
 		GFile* _tmp11_ = NULL;
 		GFile* _tmp12_ = NULL;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp8_ = app_dirs_get_libexec_dir ();
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = _tmp8_;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp10_ = g_file_get_child (_tmp9_, "shotwell");
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp11_ = _tmp10_;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp12_ = g_file_get_child (_tmp11_, filename);
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (f);
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		f = _tmp12_;
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp11_);
-#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 294 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2367 "AppDirs.c"
+#line 2312 "AppDirs.c"
 	}
-#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 296 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = f;
-#line 303 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 296 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2373 "AppDirs.c"
+#line 2318 "AppDirs.c"
 }
 
 
 GFile* app_dirs_get_settings_migrator_bin (void) {
 	GFile* result = NULL;
-#line 307 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 300 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	static const char filename[] = "shotwell-settings-migrator";
-#line 2381 "AppDirs.c"
+#line 2326 "AppDirs.c"
 	GFile* f = NULL;
 	GFile* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
@@ -2387,61 +2332,61 @@ GFile* app_dirs_get_settings_migrator_bin (void) {
 	GFile* _tmp5_ = NULL;
 	GFile* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp0_ = app_dirs_get_libexec_dir ();
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp1_ = _tmp0_;
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "settings-migrator");
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp3_ = _tmp2_;
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, filename);
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp5_ = _tmp4_;
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp3_);
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_g_object_unref0 (_tmp1_);
-#line 308 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 301 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	f = _tmp5_;
-#line 309 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp6_ = f;
-#line 309 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	_tmp7_ = g_file_query_exists (_tmp6_, NULL);
-#line 309 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 302 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	if (!_tmp7_) {
-#line 2415 "AppDirs.c"
+#line 2360 "AppDirs.c"
 		GFile* _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
 		GFile* _tmp11_ = NULL;
 		GFile* _tmp12_ = NULL;
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp8_ = app_dirs_get_libexec_dir ();
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp9_ = _tmp8_;
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp10_ = g_file_get_child (_tmp9_, "shotwell");
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp11_ = _tmp10_;
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_tmp12_ = g_file_get_child (_tmp11_, filename);
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (f);
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		f = _tmp12_;
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp11_);
-#line 311 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 304 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2439 "AppDirs.c"
+#line 2384 "AppDirs.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 306 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	result = f;
-#line 313 "/home/jens/Source/shotwell/src/AppDirs.vala"
+#line 306 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return result;
-#line 2445 "AppDirs.c"
+#line 2390 "AppDirs.c"
 }
 
 
@@ -2451,21 +2396,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 2455 "AppDirs.c"
+#line 2400 "AppDirs.c"
 }
 
 
 AppDirs* app_dirs_new (void) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return app_dirs_construct (TYPE_APP_DIRS);
-#line 2462 "AppDirs.c"
+#line 2407 "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 2469 "AppDirs.c"
+#line 2414 "AppDirs.c"
 }
 
 
@@ -2474,7 +2419,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 2478 "AppDirs.c"
+#line 2423 "AppDirs.c"
 	}
 }
 
@@ -2484,11 +2429,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 2488 "AppDirs.c"
+#line 2433 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2492 "AppDirs.c"
+#line 2437 "AppDirs.c"
 	}
 }
 
@@ -2496,37 +2441,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 2500 "AppDirs.c"
+#line 2445 "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 2507 "AppDirs.c"
+#line 2452 "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 2514 "AppDirs.c"
+#line 2459 "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 2518 "AppDirs.c"
+#line 2463 "AppDirs.c"
 		}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = app_dirs_ref (object);
-#line 2522 "AppDirs.c"
+#line 2467 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2526 "AppDirs.c"
+#line 2471 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return NULL;
-#line 2530 "AppDirs.c"
+#line 2475 "AppDirs.c"
 }
 
 
@@ -2537,25 +2482,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 2541 "AppDirs.c"
+#line 2486 "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 2547 "AppDirs.c"
+#line 2492 "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 2551 "AppDirs.c"
+#line 2496 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		*object_p = app_dirs_ref (value->data[0].v_pointer);
-#line 2555 "AppDirs.c"
+#line 2500 "AppDirs.c"
 	}
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	return NULL;
-#line 2559 "AppDirs.c"
+#line 2504 "AppDirs.c"
 }
 
 
@@ -2569,7 +2514,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 2573 "AppDirs.c"
+#line 2518 "AppDirs.c"
 }
 
 
@@ -2578,7 +2523,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 2582 "AppDirs.c"
+#line 2527 "AppDirs.c"
 }
 
 
@@ -2598,17 +2543,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 2602 "AppDirs.c"
+#line 2547 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2606 "AppDirs.c"
+#line 2551 "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 2612 "AppDirs.c"
+#line 2557 "AppDirs.c"
 	}
 }
 
@@ -2627,17 +2572,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 2631 "AppDirs.c"
+#line 2576 "AppDirs.c"
 	} else {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 		value->data[0].v_pointer = NULL;
-#line 2635 "AppDirs.c"
+#line 2580 "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 2641 "AppDirs.c"
+#line 2586 "AppDirs.c"
 	}
 }
 
@@ -2647,14 +2592,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 2651 "AppDirs.c"
+#line 2596 "AppDirs.c"
 }
 
 
 static void app_dirs_instance_init (AppDirs * self) {
 #line 7 "/home/jens/Source/shotwell/src/AppDirs.vala"
 	self->ref_count = 1;
-#line 2658 "AppDirs.c"
+#line 2603 "AppDirs.c"
 }
 
 
@@ -2664,7 +2609,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 2668 "AppDirs.c"
+#line 2613 "AppDirs.c"
 }
 
 
@@ -2689,7 +2634,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 2693 "AppDirs.c"
+#line 2638 "AppDirs.c"
 }
 
 
@@ -2702,7 +2647,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 2706 "AppDirs.c"
+#line 2651 "AppDirs.c"
 	}
 }
 
diff --git a/src/AppDirs.vala b/src/AppDirs.vala
index 94be26b..0c69270 100644
--- a/src/AppDirs.vala
+++ b/src/AppDirs.vala
@@ -258,13 +258,6 @@ class AppDirs {
         return subdir;
     }
     
-    public static File get_resources_dir() {
-        File? install_dir = get_install_dir();
-        
-        return (install_dir != null) ? install_dir.get_child("share").get_child("shotwell")
-            : get_exec_dir();
-    }
-    
     public static File get_lib_dir() {
         File? install_dir = get_install_dir();
         
diff --git a/src/AppWindow.c b/src/AppWindow.c
index b36bbbe..9eab2b4 100644
--- a/src/AppWindow.c
+++ b/src/AppWindow.c
@@ -485,7 +485,7 @@ static void app_window_real_on_fullscreen (AppWindow* self);
 gboolean app_window_has_instance (void);
 FullscreenWindow* app_window_get_fullscreen (void);
 GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user);
-GFile* app_dirs_get_resources_dir (void);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 void app_window_error_message_with_title (const gchar* title, const gchar* message, GtkWindow* parent, gboolean should_escape);
 gchar* build_alert_body_text (const gchar* primary_text, const gchar* secondary_text, gboolean should_escape);
@@ -525,7 +525,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 "shotwell-street.jpg"
+#define RESOURCES_ICON_ABOUT_LOGO "about-aachen.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"
@@ -2513,7 +2513,7 @@ AppWindow* app_window_construct (GType object_type) {
 #line 442 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2488 "AppWindow.c"
-			goto __catch225_g_error;
+			goto __catch226_g_error;
 		}
 #line 443 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = gdk_screen_get_default ();
@@ -2521,8 +2521,8 @@ AppWindow* app_window_construct (GType object_type) {
 		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 2495 "AppWindow.c"
 	}
-	goto __finally225;
-	__catch225_g_error:
+	goto __finally226;
+	__catch226_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
@@ -2541,7 +2541,7 @@ AppWindow* app_window_construct (GType object_type) {
 		_g_error_free0 (err);
 #line 2515 "AppWindow.c"
 	}
-	__finally225:
+	__finally226:
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 441 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2629,7 +2629,7 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 	GtkBuilder* result = NULL;
 	GtkBuilder* builder = NULL;
 	GtkBuilder* _tmp0_ = NULL;
-	void* _tmp12_ = NULL;
+	void* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 477 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (glade_filename != NULL, NULL);
@@ -2639,70 +2639,46 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 	builder = _tmp0_;
 #line 2613 "AppWindow.c"
 	{
-		GFile* _tmp1_ = NULL;
-		GFile* _tmp2_ = NULL;
-		GFile* _tmp3_ = NULL;
-		GFile* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp1_ = app_dirs_get_resources_dir ();
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp2_ = _tmp1_;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp3_ = g_file_get_child (_tmp2_, "ui");
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp4_ = _tmp3_;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp5_ = glade_filename;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp6_ = g_file_get_child (_tmp4_, _tmp5_);
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp7_ = _tmp6_;
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp8_ = g_file_get_path (_tmp7_);
-#line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp9_ = _tmp8_;
+		const gchar* _tmp1_ = NULL;
+		gchar* _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		gtk_builder_add_from_file (builder, _tmp9_, &_inner_error_);
+		_tmp1_ = glade_filename;
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp9_);
+		_tmp2_ = resources_get_ui (_tmp1_);
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (_tmp7_);
+		_tmp3_ = _tmp2_;
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (_tmp4_);
+		gtk_builder_add_from_resource (builder, _tmp3_, &_inner_error_);
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (_tmp2_);
+		_g_free0 (_tmp3_);
 #line 480 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2654 "AppWindow.c"
-			goto __catch226_g_error;
+#line 2630 "AppWindow.c"
+			goto __catch227_g_error;
 		}
 	}
-	goto __finally226;
-	__catch226_g_error:
+	goto __finally227;
+	__catch227_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
+		GError* _tmp4_ = NULL;
+		const gchar* _tmp5_ = NULL;
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_error_ = _inner_error_;
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 483 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp10_ = _error_;
-#line 483 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_tmp11_ = _tmp10_->message;
-#line 483 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		g_warning ("AppWindow.vala:483: Unable to create Gtk.Builder: %s\n", _tmp11_);
+#line 482 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_tmp4_ = _error_;
+#line 482 "/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"
 		_g_error_free0 (_error_);
-#line 2676 "AppWindow.c"
+#line 2652 "AppWindow.c"
 	}
-	__finally226:
+	__finally227:
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
@@ -2713,34 +2689,34 @@ GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user)
 		g_clear_error (&_inner_error_);
 #line 479 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return NULL;
-#line 2689 "AppWindow.c"
+#line 2665 "AppWindow.c"
 	}
-#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	_tmp12_ = user;
-#line 486 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_builder_connect_signals (builder, _tmp12_);
-#line 488 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	_tmp6_ = user;
+#line 485 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_builder_connect_signals (builder, _tmp6_);
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = builder;
-#line 488 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 487 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2699 "AppWindow.c"
+#line 2675 "AppWindow.c"
 }
 
 
 void app_window_error_message (const gchar* message, GtkWindow* parent) {
 	const gchar* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (message != NULL);
-#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 490 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = message;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 492 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 491 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message_with_title (RESOURCES_APP_TITLE, _tmp0_, _tmp1_, TRUE);
-#line 2716 "AppWindow.c"
+#line 2692 "AppWindow.c"
 }
 
 
@@ -2760,83 +2736,83 @@ void app_window_error_message_with_title (const gchar* title, const gchar* messa
 	gboolean _tmp14_ = FALSE;
 	gchar* _tmp15_ = NULL;
 	gchar* _tmp16_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (title != NULL);
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (message != NULL);
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent));
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2746 "AppWindow.c"
+#line 2722 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2757 "AppWindow.c"
+#line 2733 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2766 "AppWindow.c"
+#line 2742 "AppWindow.c"
 	}
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = should_escape;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = build_alert_body_text (_tmp5_, _tmp6_, _tmp7_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", _tmp9_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp10_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp9_);
-#line 499 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 498 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp11_;
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = title;
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = message;
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = should_escape;
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = build_alert_body_text (_tmp12_, _tmp13_, _tmp14_);
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = _tmp15_;
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp16_);
-#line 503 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 502 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp16_);
-#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 504 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (dialog, "use-markup", TRUE, NULL);
-#line 506 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 505 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 507 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 506 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 495 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 494 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 2812 "AppWindow.c"
+#line 2788 "AppWindow.c"
 }
 
 
@@ -2859,93 +2835,93 @@ gboolean app_window_negate_affirm_question (const gchar* message, const gchar* n
 	const gchar* _tmp16_ = NULL;
 	gboolean response = FALSE;
 	gint _tmp17_ = 0;
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, FALSE);
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, FALSE);
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, FALSE);
-#line 510 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 509 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), FALSE);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2847 "AppWindow.c"
+#line 2823 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2858 "AppWindow.c"
+#line 2834 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2867 "AppWindow.c"
+#line 2843 "AppWindow.c"
 	}
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp9_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp8_);
-#line 512 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 511 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp10_;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = title;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = message;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = build_alert_body_text (_tmp11_, _tmp12_, TRUE);
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp14_);
-#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 514 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp14_);
-#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = negative;
-#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = affirmative;
-#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 515 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_NO, _tmp16_, GTK_RESPONSE_YES, NULL);
-#line 517 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 516 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_urgency_hint (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_window_get_type (), GtkWindow), TRUE);
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 519 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 518 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp17_ == ((gint) GTK_RESPONSE_YES);
-#line 521 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 520 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = response;
-#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 523 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 522 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 2921 "AppWindow.c"
+#line 2897 "AppWindow.c"
 }
 
 
@@ -2969,95 +2945,95 @@ GtkResponseType app_window_negate_affirm_cancel_question (const gchar* message,
 	gchar* _tmp17_ = NULL;
 	gint response = 0;
 	gint _tmp18_ = 0;
-#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, 0);
-#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 526 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 525 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 2957 "AppWindow.c"
+#line 2933 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 2968 "AppWindow.c"
+#line 2944 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 2977 "AppWindow.c"
+#line 2953 "AppWindow.c"
 	}
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = title;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = message;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = build_alert_body_text (_tmp5_, _tmp6_, TRUE);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp8_);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp9_);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = _tmp9_;
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp8_);
-#line 528 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 527 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp10_;
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = negative;
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = affirmative;
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _ ("_Cancel");
-#line 531 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 530 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog), _tmp11_, GTK_RESPONSE_NO, _tmp12_, GTK_RESPONSE_YES, _tmp13_, GTK_RESPONSE_CANCEL, NULL);
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = title;
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = message;
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = build_alert_body_text (_tmp14_, _tmp15_, TRUE);
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = _tmp16_;
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (dialog, _tmp17_);
-#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 534 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp17_);
-#line 536 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 535 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (dialog, "use-markup", TRUE, NULL);
-#line 538 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_dialog_get_type (), GtkDialog));
-#line 538 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 537 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp18_;
-#line 540 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 539 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (dialog, gtk_widget_get_type (), GtkWidget));
-#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 542 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 541 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3033 "AppWindow.c"
+#line 3009 "AppWindow.c"
 }
 
 
@@ -3081,103 +3057,103 @@ GtkResponseType app_window_affirm_cancel_question (const gchar* message, const g
 	GtkMessageDialog* _tmp17_ = NULL;
 	gint _tmp18_ = 0;
 	GtkMessageDialog* _tmp19_ = NULL;
-#line 545 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 545 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 545 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 544 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3067 "AppWindow.c"
+#line 3043 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3078 "AppWindow.c"
+#line 3054 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3087 "AppWindow.c"
+#line 3063 "AppWindow.c"
 	}
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new_with_markup (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp6_);
-#line 547 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 546 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp6_;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = dialog;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = message;
-#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 549 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_message_dialog_set_markup (_tmp7_, _tmp8_);
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = dialog;
-#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 550 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_set (_tmp9_, "use-markup", TRUE, NULL);
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = title;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp11_ != NULL) {
-#line 3111 "AppWindow.c"
+#line 3087 "AppWindow.c"
 		const gchar* _tmp12_ = NULL;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = title;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp12_;
-#line 3117 "AppWindow.c"
+#line 3093 "AppWindow.c"
 	} else {
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = RESOURCES_APP_TITLE;
-#line 3121 "AppWindow.c"
+#line 3097 "AppWindow.c"
 	}
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = dialog;
-#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 551 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_window_get_type (), GtkWindow), _tmp10_);
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = dialog;
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = affirmative;
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = _ ("_Cancel");
-#line 553 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 552 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_dialog_get_type (), GtkDialog), _tmp15_, GTK_RESPONSE_YES, _tmp16_, GTK_RESPONSE_CANCEL, NULL);
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = dialog;
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_dialog_get_type (), GtkDialog));
-#line 556 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 555 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp18_;
-#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp19_ = dialog;
-#line 558 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 557 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget));
-#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 560 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 559 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3153 "AppWindow.c"
+#line 3129 "AppWindow.c"
 }
 
 
@@ -3200,101 +3176,101 @@ GtkResponseType app_window_negate_affirm_all_cancel_question (const gchar* messa
 	GtkMessageDialog* _tmp16_ = NULL;
 	gint _tmp17_ = 0;
 	GtkMessageDialog* _tmp18_ = NULL;
-#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (message != NULL, 0);
-#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (negative != NULL, 0);
-#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative != NULL, 0);
-#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (affirmative_all != NULL, 0);
-#line 563 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 562 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail ((parent == NULL) || GTK_IS_WINDOW (parent), 0);
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = parent;
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 3190 "AppWindow.c"
+#line 3166 "AppWindow.c"
 		GtkWindow* _tmp2_ = NULL;
 		GtkWindow* _tmp3_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = parent;
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _tmp3_;
-#line 3201 "AppWindow.c"
+#line 3177 "AppWindow.c"
 	} else {
 		AppWindow* _tmp4_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = app_window_get_instance ();
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow);
-#line 3210 "AppWindow.c"
+#line 3186 "AppWindow.c"
 	}
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = message;
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = (GtkMessageDialog*) gtk_message_dialog_new (_tmp0_, GTK_DIALOG_MODAL, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", _tmp5_);
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp6_);
-#line 566 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 565 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	dialog = _tmp6_;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = title;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_ != NULL) {
-#line 3224 "AppWindow.c"
+#line 3200 "AppWindow.c"
 		const gchar* _tmp9_ = NULL;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = title;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp9_;
-#line 3230 "AppWindow.c"
+#line 3206 "AppWindow.c"
 	} else {
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = RESOURCES_APP_TITLE;
-#line 3234 "AppWindow.c"
+#line 3210 "AppWindow.c"
 	}
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = dialog;
-#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 567 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_set_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_window_get_type (), GtkWindow), _tmp7_);
-#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = dialog;
-#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = negative;
-#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = affirmative;
-#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = affirmative_all;
-#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = _ ("_Cancel");
-#line 569 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 568 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_dialog_add_buttons (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_dialog_get_type (), GtkDialog), _tmp12_, GTK_RESPONSE_NO, _tmp13_, GTK_RESPONSE_YES, _tmp14_, GTK_RESPONSE_APPLY, _tmp15_, GTK_RESPONSE_CANCEL, NULL);
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp16_ = dialog;
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp17_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_dialog_get_type (), GtkDialog));
-#line 572 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 571 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	response = _tmp17_;
-#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = dialog;
-#line 574 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 573 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = (GtkResponseType) response;
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (dialog);
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp0_);
-#line 576 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 575 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 3270 "AppWindow.c"
+#line 3246 "AppWindow.c"
 }
 
 
@@ -3304,24 +3280,24 @@ void app_window_database_error (GError* err) {
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = _ ("A fatal error occurred when accessing Shotwell’s library. Shotwell can" \
 "not continue.\n" \
 "\n" \
 "%s");
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = err;
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _tmp1_->message;
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_panic (_tmp4_);
-#line 580 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 579 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp4_);
-#line 3294 "AppWindow.c"
+#line 3270 "AppWindow.c"
 }
 
 
@@ -3330,54 +3306,58 @@ void app_window_panic (const gchar* msg) {
 	const gchar* _tmp1_ = NULL;
 	Application* _tmp2_ = NULL;
 	Application* _tmp3_ = NULL;
-#line 584 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 583 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (msg != NULL);
-#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 584 "/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"
-	g_critical ("AppWindow.vala:585: %s", _tmp0_);
-#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = msg;
-#line 586 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 585 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_error_message (_tmp1_, NULL);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = application_get_instance ();
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	application_panic (_tmp3_);
-#line 588 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 587 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp3_);
-#line 3321 "AppWindow.c"
+#line 3297 "AppWindow.c"
 }
 
 
 static gchar* app_window_real_get_app_role (AppWindow* self) {
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_critical ("Type `%s' does not implement abstract method `app_window_get_app_role'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return NULL;
-#line 3330 "AppWindow.c"
+#line 3306 "AppWindow.c"
 }
 
 
 gchar* app_window_get_app_role (AppWindow* self) {
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 591 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 590 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return APP_WINDOW_GET_CLASS (self)->get_app_role (self);
-#line 3339 "AppWindow.c"
+#line 3315 "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 3322 "AppWindow.c"
 	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
-#line 593 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 592 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_app_role (self);
@@ -3392,34 +3372,34 @@ void app_window_on_about (AppWindow* self) {
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _ ("translator-credits");
 #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", RESOURCES_APP_VERSION, "comments", _tmp1_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _tmp2_, "authors", RESOURCES_AUTHORS, "logo", _tmp4_, "translator-credits", _tmp5_, NULL, NULL);
+	gtk_show_about_dialog (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), "version", RESOURCES_APP_VERSION " \u2013 \"Aachen\"", "comments", _tmp1_, "copyright", RESOURCES_COPYRIGHT, "website", RESOURCES_HOME_URL, "license", RESOURCES_LICENSE, "website-label", _tmp2_, "authors", RESOURCES_AUTHORS, "logo", _tmp4_, "artists", artists, "translator-credits", _tmp5_, NULL, NULL);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
 #line 594 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 3370 "AppWindow.c"
+#line 3349 "AppWindow.c"
 }
 
 
 static void app_window_on_help_contents (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 608 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3378 "AppWindow.c"
+#line 3357 "AppWindow.c"
 	{
 		GdkScreen* _tmp0_ = NULL;
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = gtk_window_get_screen (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		resources_launch_help (_tmp0_, NULL, &_inner_error_);
-#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 611 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3387 "AppWindow.c"
-			goto __catch227_g_error;
+#line 3366 "AppWindow.c"
+			goto __catch228_g_error;
 		}
 	}
-	goto __finally227;
-	__catch227_g_error:
+	goto __finally228;
+	__catch228_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp1_ = NULL;
@@ -3427,58 +3407,58 @@ static void app_window_on_help_contents (AppWindow* self) {
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = _ ("Unable to display help: %s");
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = err;
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = _tmp2_->message;
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = g_strdup_printf (_tmp1_, _tmp3_);
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp5_, NULL);
-#line 612 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 613 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp5_);
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3420 "AppWindow.c"
+#line 3399 "AppWindow.c"
 	}
-	__finally227:
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally228:
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/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 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 609 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 610 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3431 "AppWindow.c"
+#line 3410 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_report_problem (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 616 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3440 "AppWindow.c"
+#line 3419 "AppWindow.c"
 	{
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_BUG_DB_URL, &_inner_error_);
-#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 619 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3446 "AppWindow.c"
-			goto __catch228_g_error;
+#line 3425 "AppWindow.c"
+			goto __catch229_g_error;
 		}
 	}
-	goto __finally228;
-	__catch228_g_error:
+	goto __finally229;
+	__catch229_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3486,58 +3466,58 @@ static void app_window_on_help_report_problem (AppWindow* self) {
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _ ("Unable to navigate to bug database: %s");
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = err;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_->message;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp4_, NULL);
-#line 620 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 621 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp4_);
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3479 "AppWindow.c"
+#line 3458 "AppWindow.c"
 	}
-	__finally228:
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally229:
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/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 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 617 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 618 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3490 "AppWindow.c"
+#line 3469 "AppWindow.c"
 	}
 }
 
 
 static void app_window_on_help_faq (AppWindow* self) {
 	GError * _inner_error_ = NULL;
-#line 624 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 3499 "AppWindow.c"
+#line 3478 "AppWindow.c"
 	{
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, RESOURCES_FAQ_URL, &_inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 627 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3505 "AppWindow.c"
-			goto __catch229_g_error;
+#line 3484 "AppWindow.c"
+			goto __catch230_g_error;
 		}
 	}
-	goto __finally229;
-	__catch229_g_error:
+	goto __finally230;
+	__catch230_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3545,38 +3525,38 @@ static void app_window_on_help_faq (AppWindow* self) {
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp0_ = _ ("Unable to display FAQ: %s");
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = err;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = _tmp1_->message;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = _tmp3_;
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp4_, NULL);
-#line 628 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 629 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp4_);
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3538 "AppWindow.c"
+#line 3517 "AppWindow.c"
 	}
-	__finally229:
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally230:
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/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 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 625 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 626 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3549 "AppWindow.c"
+#line 3528 "AppWindow.c"
 	}
 }
 
@@ -3584,24 +3564,24 @@ static void app_window_on_help_faq (AppWindow* self) {
 static void app_window_real_on_quit (AppWindow* self) {
 	Application* _tmp0_ = NULL;
 	Application* _tmp1_ = NULL;
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = application_get_instance ();
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	application_exit (_tmp1_);
-#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 634 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_application_unref0 (_tmp1_);
-#line 3565 "AppWindow.c"
+#line 3544 "AppWindow.c"
 }
 
 
 void app_window_on_quit (AppWindow* self) {
-#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 632 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 633 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->on_quit (self);
-#line 3574 "AppWindow.c"
+#line 3553 "AppWindow.c"
 }
 
 
@@ -3624,71 +3604,71 @@ void app_window_on_jump_to_file (AppWindow* self) {
 	MediaSource* _tmp14_ = NULL;
 	MediaSource* _tmp15_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page_get_view (_tmp1_);
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != 1;
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp5_) {
 #line 638 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp5_) {
+#line 639 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3619 "AppWindow.c"
+#line 3598 "AppWindow.c"
 	}
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = page_get_view (_tmp7_);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = _tmp8_;
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = view_collection_get_selected_at (_tmp9_, 0);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp11_ = _tmp10_;
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = data_view_get_source (_tmp11_);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, TYPE_MEDIA_SOURCE) ? ((MediaSource*) _tmp12_) : NULL;
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp13_ == NULL) {
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp12_);
-#line 3641 "AppWindow.c"
+#line 3620 "AppWindow.c"
 	}
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = _tmp13_;
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp11_);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_data_collection_unref0 (_tmp9_);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 640 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 641 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	media = _tmp14_;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 643 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = media;
-#line 642 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp15_ == NULL) {
 #line 643 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp15_ == NULL) {
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (media);
-#line 643 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 644 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3661 "AppWindow.c"
+#line 3640 "AppWindow.c"
 	}
 	{
 		AppWindow* _tmp16_ = NULL;
@@ -3696,79 +3676,79 @@ void app_window_on_jump_to_file (AppWindow* self) {
 		MediaSource* _tmp18_ = NULL;
 		GFile* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = app_window_get_instance ();
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = _tmp16_;
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = media;
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = media_source_get_master_file (_tmp18_);
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = _tmp19_;
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_file_uri (_tmp17_, _tmp20_, &_inner_error_);
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp20_);
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp17_);
-#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 647 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3687 "AppWindow.c"
-			goto __catch230_g_error;
+#line 3666 "AppWindow.c"
+			goto __catch231_g_error;
 		}
 	}
-	goto __finally230;
-	__catch230_g_error:
+	goto __finally231;
+	__catch231_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		err = _inner_error_;
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_inner_error_ = NULL;
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = err;
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = resources_jump_to_file_failed (_tmp21_);
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = _tmp22_;
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_error_message (_tmp23_, NULL);
-#line 648 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 649 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp23_);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_error_free0 (err);
-#line 3714 "AppWindow.c"
+#line 3693 "AppWindow.c"
 	}
-	__finally230:
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	__finally231:
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (media);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/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 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_clear_error (&_inner_error_);
-#line 645 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 646 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3727 "AppWindow.c"
+#line 3706 "AppWindow.c"
 	}
-#line 636 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 637 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (media);
-#line 3731 "AppWindow.c"
+#line 3710 "AppWindow.c"
 }
 
 
 static void app_window_real_destroy (GtkWidget* base) {
 	AppWindow * self;
-#line 652 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
 #line 653 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
+#line 654 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_quit (self);
-#line 3741 "AppWindow.c"
+#line 3720 "AppWindow.c"
 }
 
 
@@ -3781,7 +3761,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 3754 "AppWindow.c"
+#line 3733 "AppWindow.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -3812,8 +3792,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3785 "AppWindow.c"
-				goto __catch231_g_regex_error;
+#line 3764 "AppWindow.c"
+				goto __catch232_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3821,7 +3801,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3794 "AppWindow.c"
+#line 3773 "AppWindow.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -3837,8 +3817,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 3810 "AppWindow.c"
-				goto __catch231_g_regex_error;
+#line 3789 "AppWindow.c"
+				goto __catch232_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -3848,7 +3828,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 3821 "AppWindow.c"
+#line 3800 "AppWindow.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -3862,10 +3842,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 3835 "AppWindow.c"
+#line 3814 "AppWindow.c"
 	}
-	goto __finally231;
-	__catch231_g_regex_error:
+	goto __finally232;
+	__catch232_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3876,9 +3856,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 3849 "AppWindow.c"
+#line 3828 "AppWindow.c"
 	}
-	__finally231:
+	__finally232:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3887,7 +3867,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 3860 "AppWindow.c"
+#line 3839 "AppWindow.c"
 	}
 }
 
@@ -3898,53 +3878,53 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 	gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 657 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 657 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = get_nautilus_install_location ();
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (_tmp1_);
-#line 661 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_) {
-#line 3885 "AppWindow.c"
+#line 3864 "AppWindow.c"
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = file;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = g_file_get_uri (_tmp3_);
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = string_replace (_tmp5_, "'", "\\\'");
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (tmp);
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		tmp = _tmp6_;
-#line 662 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp5_);
 #line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_free0 (_tmp5_);
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = tmp;
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		show_file_in_nautilus (_tmp7_, &_inner_error_);
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 663 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 664 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3917 "AppWindow.c"
+#line 3896 "AppWindow.c"
 		}
 	} else {
 		GFile* _tmp8_ = NULL;
@@ -3954,44 +3934,44 @@ void app_window_show_file_uri (AppWindow* self, GFile* file, GError** error) {
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = file;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = g_file_get_parent (_tmp8_);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = g_file_get_uri (_tmp10_);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = string_replace (_tmp12_, "'", "\\\'");
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (tmp);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		tmp = _tmp13_;
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp12_);
-#line 665 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_object_unref0 (_tmp10_);
 #line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_object_unref0 (_tmp10_);
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp14_ = tmp;
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_show_uri (self, _tmp14_, &_inner_error_);
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			g_propagate_error (error, _inner_error_);
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_g_free0 (tmp);
-#line 666 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 667 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			return;
-#line 3959 "AppWindow.c"
+#line 3938 "AppWindow.c"
 		}
 	}
-#line 656 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 657 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (tmp);
-#line 3964 "AppWindow.c"
+#line 3943 "AppWindow.c"
 }
 
 
@@ -4000,42 +3980,42 @@ void app_window_show_uri (AppWindow* self, const gchar* url, GError** error) {
 	GdkScreen* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 670 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (url != NULL);
 #line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (url != NULL);
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_screen (_tmp0_);
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = url;
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	sys_show_uri (_tmp1_, _tmp2_, &_inner_error_);
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_propagate_error (error, _inner_error_);
-#line 671 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 672 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 3991 "AppWindow.c"
+#line 3970 "AppWindow.c"
 	}
 }
 
 
 static void app_window_real_add_actions (AppWindow* self) {
-#line 675 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 676 "/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 3999 "AppWindow.c"
+#line 3978 "AppWindow.c"
 }
 
 
 void app_window_add_actions (AppWindow* self) {
-#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 674 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 675 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->add_actions (self);
-#line 4008 "AppWindow.c"
+#line 3987 "AppWindow.c"
 }
 
 
@@ -4052,81 +4032,81 @@ void app_window_go_fullscreen (AppWindow* self, Page* page) {
 	FullscreenWindow* _tmp12_ = NULL;
 	FullscreenWindow* _tmp13_ = NULL;
 	FullscreenWindow* _tmp14_ = NULL;
-#line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 680 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp0_ != NULL) {
-#line 4033 "AppWindow.c"
+#line 4012 "AppWindow.c"
 		FullscreenWindow* _tmp1_ = NULL;
-#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = app_window_fullscreen_window;
-#line 681 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 682 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_window_get_type (), GtkWindow));
-#line 683 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 684 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4041 "AppWindow.c"
+#line 4020 "AppWindow.c"
 	}
-#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 687 "/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 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 687 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_x = _tmp2_;
-#line 686 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	self->pos_y = _tmp3_;
 #line 687 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	self->pos_y = _tmp3_;
+#line 688 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = page;
-#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = fullscreen_window_new (_tmp4_);
-#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_object_ref_sink (_tmp5_);
-#line 689 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 690 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	fsw = _tmp5_;
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp7_ = _tmp6_;
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp8_ = _tmp7_ != NULL;
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp7_);
-#line 691 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp8_) {
-#line 4069 "AppWindow.c"
+#line 4048 "AppWindow.c"
 		Page* _tmp9_ = NULL;
 		Page* _tmp10_ = NULL;
 		FullscreenWindow* _tmp11_ = NULL;
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = fsw;
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_switching_to_fullscreen (_tmp10_, _tmp11_);
-#line 692 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 693 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp10_);
-#line 4083 "AppWindow.c"
+#line 4062 "AppWindow.c"
 	}
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp12_ = fsw;
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 694 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_fullscreen_window = _tmp13_;
 #line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_fullscreen_window = _tmp13_;
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp14_ = app_window_fullscreen_window;
-#line 695 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 696 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_window_get_type (), GtkWindow));
-#line 678 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 679 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (fsw);
-#line 4099 "AppWindow.c"
+#line 4078 "AppWindow.c"
 }
 
 
@@ -4139,65 +4119,65 @@ void app_window_end_fullscreen (AppWindow* self) {
 	gboolean _tmp5_ = FALSE;
 	FullscreenWindow* _tmp9_ = NULL;
 	FullscreenWindow* _tmp10_ = NULL;
-#line 698 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_fullscreen_window;
-#line 699 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp0_ == NULL) {
 #line 700 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp0_ == NULL) {
+#line 701 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4120 "AppWindow.c"
+#line 4099 "AppWindow.c"
 	}
-#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = self->pos_x;
-#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->pos_y;
-#line 702 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 703 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp1_, _tmp2_);
-#line 704 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 705 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = _tmp4_ != NULL;
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp4_);
-#line 706 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp5_) {
-#line 4140 "AppWindow.c"
+#line 4119 "AppWindow.c"
 		Page* _tmp6_ = NULL;
 		Page* _tmp7_ = NULL;
 		FullscreenWindow* _tmp8_ = NULL;
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = _tmp6_;
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = app_window_fullscreen_window;
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		page_returning_from_fullscreen (_tmp7_, _tmp8_);
-#line 707 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 708 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp7_);
-#line 4154 "AppWindow.c"
+#line 4133 "AppWindow.c"
 	}
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp9_ = app_window_fullscreen_window;
-#line 709 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
+#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp10_ = app_window_fullscreen_window;
-#line 710 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
 #line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
+#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (app_window_fullscreen_window);
-#line 711 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 712 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_fullscreen_window = NULL;
-#line 713 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 714 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow));
-#line 4170 "AppWindow.c"
+#line 4149 "AppWindow.c"
 }
 
 
@@ -4206,21 +4186,21 @@ GAction* app_window_get_common_action (AppWindow* self, const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_val_if_fail (IS_APP_WINDOW (self), NULL);
-#line 716 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/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 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp2_;
-#line 717 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 718 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 4193 "AppWindow.c"
+#line 4172 "AppWindow.c"
 }
 
 
@@ -4230,42 +4210,42 @@ void app_window_set_common_action_sensitive (AppWindow* self, const gchar* name,
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4217 "AppWindow.c"
+#line 4196 "AppWindow.c"
 	}
-#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 722 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4225 "AppWindow.c"
+#line 4204 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = sensitive;
-#line 723 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 724 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 4234 "AppWindow.c"
+#line 4213 "AppWindow.c"
 	}
-#line 720 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 721 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4238 "AppWindow.c"
+#line 4217 "AppWindow.c"
 }
 
 
@@ -4275,45 +4255,45 @@ void app_window_set_common_action_important (AppWindow* self, const gchar* name,
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4262 "AppWindow.c"
+#line 4241 "AppWindow.c"
 	}
-#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 728 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4270 "AppWindow.c"
+#line 4249 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 729 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 730 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4282 "AppWindow.c"
+#line 4261 "AppWindow.c"
 	}
-#line 726 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 727 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4286 "AppWindow.c"
+#line 4265 "AppWindow.c"
 }
 
 
@@ -4323,66 +4303,66 @@ void app_window_set_common_action_visible (AppWindow* self, const gchar* name, g
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (name != NULL);
 #line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (name != NULL);
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 4310 "AppWindow.c"
+#line 4289 "AppWindow.c"
 	}
-#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 734 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ != NULL) {
-#line 4318 "AppWindow.c"
+#line 4297 "AppWindow.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = action;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = _tmp5_;
-#line 735 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 736 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp6_);
-#line 4330 "AppWindow.c"
+#line 4309 "AppWindow.c"
 	}
-#line 732 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 733 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 4334 "AppWindow.c"
+#line 4313 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4341 "AppWindow.c"
+#line 4320 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4348 "AppWindow.c"
+#line 4327 "AppWindow.c"
 }
 
 
 static void _app_window_on_update_common_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_on_update_common_actions ((AppWindow*) self);
-#line 4355 "AppWindow.c"
+#line 4334 "AppWindow.c"
 }
 
 
@@ -4394,23 +4374,23 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 	Page* _tmp15_ = NULL;
 	Page* _tmp34_ = NULL;
 	Page* _tmp35_ = NULL;
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 738 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = old_page;
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = new_page;
-#line 739 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 740 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_update_common_action_availability (self, _tmp0_, _tmp1_);
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = old_page;
-#line 741 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 4383 "AppWindow.c"
+#line 4362 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
@@ -4423,49 +4403,49 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		guint _tmp14_ = 0U;
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = old_page;
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 743 "/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 742 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp5_);
 #line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp5_);
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = old_page;
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp10_, NULL, FALSE);
-#line 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 744 "/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 743 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp9_);
 #line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp9_);
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = old_page;
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = page_get_view (_tmp11_);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = _tmp12_;
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp14_, NULL, FALSE);
-#line 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/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 744 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 745 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 4432 "AppWindow.c"
+#line 4411 "AppWindow.c"
 	}
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp15_ = new_page;
-#line 747 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp15_ != NULL) {
-#line 4438 "AppWindow.c"
+#line 4417 "AppWindow.c"
 		Page* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
 		ViewCollection* _tmp18_ = NULL;
@@ -4484,135 +4464,135 @@ static void app_window_real_switched_pages (PageWindow* base, Page* old_page, Pa
 		ViewCollection* _tmp31_ = NULL;
 		ViewCollection* _tmp32_ = NULL;
 		gint _tmp33_ = 0;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = new_page;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = page_get_view (_tmp16_);
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp18_ = _tmp17_;
-#line 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 749 "/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 748 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp18_);
 #line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp18_);
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp19_ = new_page;
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp20_ = page_get_view (_tmp19_);
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp21_ = _tmp20_;
-#line 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 750 "/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 749 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_data_collection_unref0 (_tmp21_);
 #line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_data_collection_unref0 (_tmp21_);
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp22_ = new_page;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp23_ = page_get_view (_tmp22_);
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp24_ = _tmp23_;
-#line 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/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 750 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 751 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp24_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp25_ = new_page;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp26_ = new_page;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp27_ = page_get_view (_tmp26_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp28_ = _tmp27_;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp29_ = view_collection_get_selected_count (_tmp28_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp30_ = new_page;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp31_ = page_get_view (_tmp30_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp32_ = _tmp31_;
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp33_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_COLLECTION, DataCollection));
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp25_, _tmp29_, _tmp33_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp32_);
-#line 752 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 753 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp28_);
-#line 4511 "AppWindow.c"
+#line 4490 "AppWindow.c"
 	}
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp34_ = old_page;
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 757 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp35_ = new_page;
-#line 756 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 757 "/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 4519 "AppWindow.c"
+#line 4498 "AppWindow.c"
 }
 
 
 static void app_window_real_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
 	gboolean is_checkerboard = FALSE;
 	Page* _tmp0_ = NULL;
-#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((old_page == NULL) || IS_PAGE (old_page));
-#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
 #line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail ((new_page == NULL) || IS_PAGE (new_page));
+#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = new_page;
-#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 764 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	is_checkerboard = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE);
-#line 765 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard);
 #line 766 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_set_common_action_sensitive (self, "CommonSelectAll", is_checkerboard);
+#line 767 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonSelectNone", is_checkerboard);
-#line 4538 "AppWindow.c"
+#line 4517 "AppWindow.c"
 }
 
 
 void app_window_update_common_action_availability (AppWindow* self, Page* old_page, Page* new_page) {
-#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 762 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 763 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_action_availability (self, old_page, new_page);
-#line 4547 "AppWindow.c"
+#line 4526 "AppWindow.c"
 }
 
 
 static void app_window_real_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
 	Page* _tmp0_ = NULL;
 	gint _tmp2_ = 0;
-#line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_PAGE (page));
 #line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_PAGE (page));
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page;
-#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE)) {
-#line 4560 "AppWindow.c"
+#line 4539 "AppWindow.c"
 		gint _tmp1_ = 0;
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp1_ = count;
-#line 774 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_set_common_action_sensitive (self, "CommonSelectAll", _tmp1_ > 0);
-#line 4566 "AppWindow.c"
+#line 4545 "AppWindow.c"
 	}
-#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = selected_count;
-#line 775 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 776 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_set_common_action_sensitive (self, "CommonJumpToFile", _tmp2_ == 1);
-#line 777 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_decorate_undo_action (self);
 #line 778 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_decorate_undo_action (self);
+#line 779 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 4576 "AppWindow.c"
+#line 4555 "AppWindow.c"
 }
 
 
 void app_window_update_common_actions (AppWindow* self, Page* page, gint selected_count, gint count) {
-#line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 772 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 773 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	APP_WINDOW_GET_CLASS (self)->update_common_actions (self, page, selected_count, count);
-#line 4585 "AppWindow.c"
+#line 4564 "AppWindow.c"
 }
 
 
@@ -4620,17 +4600,17 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 	Page* page = NULL;
 	Page* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 781 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page = _tmp0_;
 #line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	page = _tmp0_;
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = page;
-#line 783 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ != NULL) {
-#line 4603 "AppWindow.c"
+#line 4582 "AppWindow.c"
 		Page* _tmp2_ = NULL;
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -4640,35 +4620,35 @@ static void app_window_on_update_common_actions (AppWindow* self) {
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp2_ = page;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = page;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = _tmp8_;
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection));
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		app_window_update_common_actions (self, _tmp2_, _tmp6_, _tmp10_);
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 784 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 785 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4637 "AppWindow.c"
+#line 4616 "AppWindow.c"
 	}
-#line 781 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 782 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 4641 "AppWindow.c"
+#line 4620 "AppWindow.c"
 }
 
 
@@ -4683,61 +4663,61 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 	gint items = 0;
 	GMenu* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (id != NULL);
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (new_label != NULL);
-#line 789 "/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 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page_get_menubar (_tmp1_);
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_get_type ()) ? ((GMenu*) _tmp2_) : NULL;
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp3_ == NULL) {
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp2_);
-#line 4674 "AppWindow.c"
+#line 4653 "AppWindow.c"
 	}
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = _tmp3_;
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp1_);
-#line 789 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 790 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	bar = _tmp4_;
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = bar;
-#line 791 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp5_ == NULL) {
 #line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp5_ == NULL) {
+#line 793 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (bar);
-#line 792 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 793 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 4690 "AppWindow.c"
+#line 4669 "AppWindow.c"
 	}
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = bar;
-#line 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 796 "/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 795 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	items = _tmp7_;
-#line 4698 "AppWindow.c"
+#line 4677 "AppWindow.c"
 	{
 		gint i = 0;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		i = 0;
-#line 4703 "AppWindow.c"
+#line 4682 "AppWindow.c"
 		{
 			gboolean _tmp8_ = FALSE;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			_tmp8_ = TRUE;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 			while (TRUE) {
-#line 4710 "AppWindow.c"
+#line 4689 "AppWindow.c"
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				GMenuModel* model = NULL;
@@ -4748,65 +4728,65 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 				gint model_items = 0;
 				GMenuModel* _tmp16_ = NULL;
 				gint _tmp17_ = 0;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				if (!_tmp8_) {
-#line 4723 "AppWindow.c"
+#line 4702 "AppWindow.c"
 					gint _tmp9_ = 0;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					_tmp9_ = i;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					i = _tmp9_ + 1;
-#line 4729 "AppWindow.c"
+#line 4708 "AppWindow.c"
 				}
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp8_ = FALSE;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp10_ = i;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp11_ = items;
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				if (!(_tmp10_ < _tmp11_)) {
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					break;
-#line 4741 "AppWindow.c"
+#line 4720 "AppWindow.c"
 				}
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp12_ = bar;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp13_ = i;
-#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 798 "/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 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				model = _tmp14_;
 #line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				model = _tmp14_;
+#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp15_ = bar;
-#line 798 "/home/jens/Source/shotwell/src/AppWindow.vala"
-				if (_tmp15_ == NULL) {
 #line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+				if (_tmp15_ == NULL) {
+#line 800 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					_g_object_unref0 (model);
-#line 799 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 800 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					continue;
-#line 4759 "AppWindow.c"
+#line 4738 "AppWindow.c"
 				}
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp16_ = model;
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_tmp17_ = g_menu_model_get_n_items (_tmp16_);
-#line 802 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				model_items = _tmp17_;
-#line 4767 "AppWindow.c"
+#line 4746 "AppWindow.c"
 				{
 					gint j = 0;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 					j = 0;
-#line 4772 "AppWindow.c"
+#line 4751 "AppWindow.c"
 					{
 						gboolean _tmp18_ = FALSE;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						_tmp18_ = TRUE;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 						while (TRUE) {
-#line 4779 "AppWindow.c"
+#line 4758 "AppWindow.c"
 							gint _tmp20_ = 0;
 							gint _tmp21_ = 0;
 							GMenuModel* subsection = NULL;
@@ -4817,168 +4797,168 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 							gint sub_items = 0;
 							GMenuModel* _tmp26_ = NULL;
 							gint _tmp27_ = 0;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							if (!_tmp18_) {
-#line 4792 "AppWindow.c"
+#line 4771 "AppWindow.c"
 								gint _tmp19_ = 0;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								_tmp19_ = j;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								j = _tmp19_ + 1;
-#line 4798 "AppWindow.c"
+#line 4777 "AppWindow.c"
 							}
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp18_ = FALSE;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp20_ = j;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp21_ = model_items;
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							if (!(_tmp20_ < _tmp21_)) {
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								break;
-#line 4810 "AppWindow.c"
+#line 4789 "AppWindow.c"
 							}
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp22_ = model;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp23_ = j;
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp24_ = g_menu_model_get_item_link (_tmp22_, _tmp23_, G_MENU_LINK_SECTION);
-#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 805 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							subsection = _tmp24_;
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp25_ = subsection;
-#line 806 "/home/jens/Source/shotwell/src/AppWindow.vala"
-							if (_tmp25_ == NULL) {
 #line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
+							if (_tmp25_ == NULL) {
+#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								_g_object_unref0 (subsection);
-#line 807 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 808 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								continue;
-#line 4828 "AppWindow.c"
+#line 4807 "AppWindow.c"
 							}
-#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp26_ = subsection;
-#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_tmp27_ = g_menu_model_get_n_items (_tmp26_);
-#line 810 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							sub_items = _tmp27_;
-#line 4836 "AppWindow.c"
+#line 4815 "AppWindow.c"
 							{
 								gint k = 0;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 								k = 0;
-#line 4841 "AppWindow.c"
+#line 4820 "AppWindow.c"
 								{
 									gboolean _tmp28_ = FALSE;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									_tmp28_ = TRUE;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 									while (TRUE) {
-#line 4848 "AppWindow.c"
+#line 4827 "AppWindow.c"
 										gint _tmp30_ = 0;
 										gint _tmp31_ = 0;
 										GMenuAttributeIter* it = NULL;
 										GMenuModel* _tmp32_ = NULL;
 										gint _tmp33_ = 0;
 										GMenuAttributeIter* _tmp34_ = NULL;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										if (!_tmp28_) {
-#line 4857 "AppWindow.c"
+#line 4836 "AppWindow.c"
 											gint _tmp29_ = 0;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp29_ = k;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											k = _tmp29_ + 1;
-#line 4863 "AppWindow.c"
+#line 4842 "AppWindow.c"
 										}
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp28_ = FALSE;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp30_ = k;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp31_ = sub_items;
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										if (!(_tmp30_ < _tmp31_)) {
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											break;
-#line 4875 "AppWindow.c"
+#line 4854 "AppWindow.c"
 										}
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp32_ = subsection;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp33_ = k;
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_tmp34_ = g_menu_model_iterate_item_attributes (_tmp32_, _tmp33_);
-#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
-										it = _tmp34_;
 #line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+										it = _tmp34_;
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										while (TRUE) {
-#line 4887 "AppWindow.c"
+#line 4866 "AppWindow.c"
 											GMenuAttributeIter* _tmp35_ = NULL;
 											gboolean _tmp36_ = FALSE;
 											gboolean _tmp37_ = FALSE;
 											gboolean _tmp38_ = FALSE;
 											GMenuAttributeIter* _tmp39_ = NULL;
 											const gchar* _tmp40_ = NULL;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp35_ = it;
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp36_ = g_menu_attribute_iter_next (_tmp35_);
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (!_tmp36_) {
-#line 813 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												break;
-#line 4902 "AppWindow.c"
+#line 4881 "AppWindow.c"
 											}
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp39_ = it;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											_tmp40_ = g_menu_attribute_iter_get_name (_tmp39_);
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (g_strcmp0 (_tmp40_, "id") == 0) {
-#line 4910 "AppWindow.c"
+#line 4889 "AppWindow.c"
 												GMenuAttributeIter* _tmp41_ = NULL;
 												GVariant* _tmp42_ = NULL;
 												GVariant* _tmp43_ = NULL;
 												const gchar* _tmp44_ = NULL;
 												const gchar* _tmp45_ = NULL;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp41_ = it;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp42_ = g_menu_attribute_iter_get_value (_tmp41_);
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp43_ = _tmp42_;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp44_ = g_variant_get_string (_tmp43_, NULL);
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp45_ = id;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp38_ = g_strcmp0 (_tmp44_, _tmp45_) == 0;
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_variant_unref0 (_tmp43_);
-#line 4930 "AppWindow.c"
+#line 4909 "AppWindow.c"
 											} else {
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp38_ = FALSE;
-#line 4934 "AppWindow.c"
+#line 4913 "AppWindow.c"
 											}
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp38_) {
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = TRUE;
-#line 4940 "AppWindow.c"
+#line 4919 "AppWindow.c"
 											} else {
 												gboolean _tmp46_ = FALSE;
 												GMenuAttributeIter* _tmp47_ = NULL;
 												const gchar* _tmp48_ = NULL;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp47_ = it;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp48_ = g_menu_attribute_iter_get_name (_tmp47_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												if (g_strcmp0 (_tmp48_, "action") == 0) {
-#line 4951 "AppWindow.c"
+#line 4930 "AppWindow.c"
 													GMenuAttributeIter* _tmp49_ = NULL;
 													GVariant* _tmp50_ = NULL;
 													GVariant* _tmp51_ = NULL;
@@ -4987,41 +4967,41 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 													gchar* _tmp54_ = NULL;
 													gchar* _tmp55_ = NULL;
 													gboolean _tmp56_ = FALSE;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp49_ = it;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp50_ = g_menu_attribute_iter_get_value (_tmp49_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp51_ = _tmp50_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp52_ = g_variant_get_string (_tmp51_, NULL);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp53_ = id;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp54_ = g_strconcat (".", _tmp53_, NULL);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp55_ = _tmp54_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp56_ = g_str_has_suffix (_tmp52_, _tmp55_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp46_ = _tmp56_;
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_g_free0 (_tmp55_);
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_g_variant_unref0 (_tmp51_);
-#line 4982 "AppWindow.c"
+#line 4961 "AppWindow.c"
 												} else {
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 													_tmp46_ = FALSE;
-#line 4986 "AppWindow.c"
+#line 4965 "AppWindow.c"
 												}
-#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp37_ = _tmp46_;
-#line 4990 "AppWindow.c"
+#line 4969 "AppWindow.c"
 											}
-#line 814 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 815 "/home/jens/Source/shotwell/src/AppWindow.vala"
 											if (_tmp37_) {
-#line 4994 "AppWindow.c"
+#line 4973 "AppWindow.c"
 												GMenu* md = NULL;
 												GMenuModel* _tmp57_ = NULL;
 												GMenu* _tmp58_ = NULL;
@@ -5036,85 +5016,85 @@ void app_window_update_menu_item_label (AppWindow* self, const gchar* id, const
 												GMenu* _tmp66_ = NULL;
 												gint _tmp67_ = 0;
 												GMenuItem* _tmp68_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp57_ = subsection;
-#line 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 817 "/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 816 "/home/jens/Source/shotwell/src/AppWindow.vala"
-												md = _tmp58_;
 #line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												md = _tmp58_;
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp59_ = subsection;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp60_ = k;
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp61_ = g_menu_item_new_from_model (_tmp59_, _tmp60_);
-#line 817 "/home/jens/Source/shotwell/src/AppWindow.vala"
-												m = _tmp61_;
 #line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												m = _tmp61_;
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp62_ = m;
-#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp63_ = new_label;
-#line 818 "/home/jens/Source/shotwell/src/AppWindow.vala"
-												g_menu_item_set_label (_tmp62_, _tmp63_);
 #line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												g_menu_item_set_label (_tmp62_, _tmp63_);
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp64_ = md;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp65_ = k;
-#line 819 "/home/jens/Source/shotwell/src/AppWindow.vala"
-												g_menu_remove (_tmp64_, _tmp65_);
 #line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+												g_menu_remove (_tmp64_, _tmp65_);
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp66_ = md;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp67_ = k;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_tmp68_ = m;
-#line 820 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 821 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												g_menu_insert_item (_tmp66_, _tmp67_, _tmp68_);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (m);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (md);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (it);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (subsection);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (model);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												_g_object_unref0 (bar);
-#line 822 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 823 "/home/jens/Source/shotwell/src/AppWindow.vala"
 												return;
-#line 5057 "AppWindow.c"
+#line 5036 "AppWindow.c"
 											}
 										}
-#line 811 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 812 "/home/jens/Source/shotwell/src/AppWindow.vala"
 										_g_object_unref0 (it);
-#line 5062 "AppWindow.c"
+#line 5041 "AppWindow.c"
 									}
 								}
 							}
-#line 803 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 804 "/home/jens/Source/shotwell/src/AppWindow.vala"
 							_g_object_unref0 (subsection);
-#line 5068 "AppWindow.c"
+#line 5047 "AppWindow.c"
 						}
 					}
 				}
-#line 796 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 797 "/home/jens/Source/shotwell/src/AppWindow.vala"
 				_g_object_unref0 (model);
-#line 5074 "AppWindow.c"
+#line 5053 "AppWindow.c"
 			}
 		}
 	}
-#line 787 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 788 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (bar);
-#line 5080 "AppWindow.c"
+#line 5059 "AppWindow.c"
 }
 
 
 static gpointer _command_manager_ref0 (gpointer self) {
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return self ? command_manager_ref (self) : NULL;
-#line 5087 "AppWindow.c"
+#line 5066 "AppWindow.c"
 }
 
 
@@ -5122,26 +5102,26 @@ CommandManager* app_window_get_command_manager (void) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _command_manager_ref0 (_tmp0_);
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp1_;
-#line 833 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 834 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5103 "AppWindow.c"
+#line 5082 "AppWindow.c"
 }
 
 
 static void app_window_on_command_manager_altered (AppWindow* self) {
-#line 836 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 837 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	app_window_decorate_undo_action (self);
+	g_return_if_fail (IS_APP_WINDOW (self));
 #line 838 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	app_window_decorate_undo_action (self);
+#line 839 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_redo_action (self);
-#line 5114 "AppWindow.c"
+#line 5093 "AppWindow.c"
 }
 
 
@@ -5157,51 +5137,51 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 	CommandDescription* _tmp6_ = NULL;
 	const gchar* _tmp18_ = NULL;
 	const gchar* _tmp19_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (IS_APP_WINDOW (self));
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (name != NULL);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (prefix != NULL);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail (default_explanation != NULL);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	g_return_if_fail ((desc == NULL) || IS_COMMAND_DESCRIPTION (desc));
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = name;
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = app_window_get_common_action (self, _tmp0_);
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ == NULL) {
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp1_);
-#line 5150 "AppWindow.c"
+#line 5129 "AppWindow.c"
 	}
-#line 843 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	action = _tmp2_;
 #line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	action = _tmp2_;
+#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = action;
-#line 844 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	if (_tmp3_ == NULL) {
 #line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	if (_tmp3_ == NULL) {
+#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (action);
-#line 845 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 846 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		return;
-#line 5162 "AppWindow.c"
+#line 5141 "AppWindow.c"
 	}
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp4_ = prefix;
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = g_strdup (_tmp4_);
-#line 848 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 849 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	label = _tmp5_;
-#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp6_ = desc;
-#line 850 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp6_ != NULL) {
-#line 5174 "AppWindow.c"
+#line 5153 "AppWindow.c"
 		const gchar* _tmp7_ = NULL;
 		CommandDescription* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
@@ -5210,62 +5190,62 @@ static void app_window_decorate_command_manager_action (AppWindow* self, const g
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		GSimpleAction* _tmp14_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp7_ = label;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp8_ = desc;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp9_ = command_description_get_name (_tmp8_);
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp10_ = _tmp9_;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp11_ = g_strconcat (" ", _tmp10_, NULL);
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp12_ = _tmp11_;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp13_ = g_strconcat (_tmp7_, _tmp12_, NULL);
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (label);
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		label = _tmp13_;
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (_tmp12_);
-#line 851 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		_g_free0 (_tmp10_);
 #line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		_g_free0 (_tmp10_);
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp14_ = action;
-#line 852 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 853 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp14_, TRUE);
-#line 5209 "AppWindow.c"
+#line 5188 "AppWindow.c"
 	} else {
 		const gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
 		GSimpleAction* _tmp17_ = NULL;
-#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp15_ = prefix;
-#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp16_ = g_strdup (_tmp15_);
-#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_free0 (label);
-#line 854 "/home/jens/Source/shotwell/src/AppWindow.vala"
-		label = _tmp16_;
 #line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+		label = _tmp16_;
+#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp17_ = action;
-#line 855 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 856 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		g_simple_action_set_enabled (_tmp17_, FALSE);
-#line 5226 "AppWindow.c"
+#line 5205 "AppWindow.c"
 	}
-#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp18_ = name;
-#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp19_ = label;
-#line 857 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 858 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_update_menu_item_label (self, _tmp18_, _tmp19_);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_free0 (label);
-#line 841 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 842 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (action);
-#line 5238 "AppWindow.c"
+#line 5217 "AppWindow.c"
 }
 
 
@@ -5274,23 +5254,23 @@ void app_window_decorate_undo_action (AppWindow* self) {
 	CommandManager* _tmp1_ = NULL;
 	CommandDescription* _tmp2_ = NULL;
 	CommandDescription* _tmp3_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_undo_description (_tmp1_);
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonUndo", RESOURCES_UNDO_MENU, "", _tmp3_);
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 861 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 862 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5263 "AppWindow.c"
+#line 5242 "AppWindow.c"
 }
 
 
@@ -5299,47 +5279,47 @@ void app_window_decorate_redo_action (AppWindow* self) {
 	CommandManager* _tmp1_ = NULL;
 	CommandDescription* _tmp2_ = NULL;
 	CommandDescription* _tmp3_ = NULL;
-#line 865 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = _tmp0_;
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = command_manager_get_redo_description (_tmp1_);
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp3_ = _tmp2_;
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	app_window_decorate_command_manager_action (self, "CommonRedo", RESOURCES_REDO_MENU, "", _tmp3_);
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (_tmp3_);
-#line 866 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 867 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 5288 "AppWindow.c"
+#line 5267 "AppWindow.c"
 }
 
 
 static void app_window_on_undo (AppWindow* self) {
 	CommandManager* _tmp0_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 872 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 871 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 872 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_undo (_tmp0_);
-#line 5300 "AppWindow.c"
+#line 5279 "AppWindow.c"
 }
 
 
 static void app_window_on_redo (AppWindow* self) {
 	CommandManager* _tmp0_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 875 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 876 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = app_window_command_manager;
-#line 875 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 876 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	command_manager_redo (_tmp0_);
-#line 5312 "AppWindow.c"
+#line 5291 "AppWindow.c"
 }
 
 
@@ -5348,43 +5328,43 @@ static void app_window_on_select_all (AppWindow* self) {
 	Page* _tmp0_ = NULL;
 	CheckerboardPage* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5331 "AppWindow.c"
+#line 5310 "AppWindow.c"
 	}
-#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 880 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5339 "AppWindow.c"
+#line 5318 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_select_all (_tmp5_);
-#line 881 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 882 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5353 "AppWindow.c"
+#line 5332 "AppWindow.c"
 	}
-#line 878 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 879 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5357 "AppWindow.c"
+#line 5336 "AppWindow.c"
 }
 
 
@@ -5393,43 +5373,43 @@ static void app_window_on_select_none (AppWindow* self) {
 	Page* _tmp0_ = NULL;
 	CheckerboardPage* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_if_fail (IS_APP_WINDOW (self));
 #line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_if_fail (IS_APP_WINDOW (self));
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE_WINDOW, PageWindow));
-#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_CHECKERBOARD_PAGE) ? ((CheckerboardPage*) _tmp0_) : NULL;
-#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp1_ == NULL) {
-#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_g_object_unref0 (_tmp0_);
-#line 5376 "AppWindow.c"
+#line 5355 "AppWindow.c"
 	}
-#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
 #line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	page = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = page;
-#line 886 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (_tmp2_ != NULL) {
-#line 5384 "AppWindow.c"
+#line 5363 "AppWindow.c"
 		Page* _tmp3_ = NULL;
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp3_ = page;
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp4_ = page_get_view (_tmp3_);
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_tmp5_ = _tmp4_;
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 887 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 888 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 5398 "AppWindow.c"
+#line 5377 "AppWindow.c"
 	}
-#line 884 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 885 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_g_object_unref0 (page);
-#line 5402 "AppWindow.c"
+#line 5381 "AppWindow.c"
 }
 
 
@@ -5441,40 +5421,40 @@ static gboolean app_window_real_configure_event (GtkWidget* base, GdkEventConfig
 	gboolean _tmp2_ = FALSE;
 	GdkEventConfigure* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 890 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_APP_WINDOW, AppWindow);
-#line 890 "/home/jens/Source/shotwell/src/AppWindow.vala"
-	g_return_val_if_fail (event != NULL, FALSE);
 #line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
+	g_return_val_if_fail (event != NULL, FALSE);
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp1_ = gdk_window_get_state (_tmp0_);
-#line 891 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 892 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->maximized = _tmp1_ == GDK_WINDOW_STATE_MAXIMIZED;
-#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp2_ = self->maximized;
-#line 893 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	if (!_tmp2_) {
-#line 5428 "AppWindow.c"
+#line 5407 "AppWindow.c"
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/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 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.width = _tmp3_;
-#line 894 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 895 "/home/jens/Source/shotwell/src/AppWindow.vala"
 		self->dimensions.height = _tmp4_;
-#line 5437 "AppWindow.c"
+#line 5416 "AppWindow.c"
 	}
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	_tmp5_ = event;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 897 "/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 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	result = _tmp6_;
-#line 896 "/home/jens/Source/shotwell/src/AppWindow.vala"
+#line 897 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	return result;
-#line 5447 "AppWindow.c"
+#line 5426 "AppWindow.c"
 }
 
 
@@ -5501,7 +5481,7 @@ static void app_window_class_init (AppWindowClass * klass) {
 	((GtkWidgetClass *) klass)->configure_event = app_window_real_configure_event;
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (klass)->finalize = app_window_finalize;
-#line 5474 "AppWindow.c"
+#line 5453 "AppWindow.c"
 }
 
 
@@ -5512,7 +5492,7 @@ static void app_window_instance_init (AppWindow * self) {
 	self->pos_x = 0;
 #line 405 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	self->pos_y = 0;
-#line 5485 "AppWindow.c"
+#line 5464 "AppWindow.c"
 }
 
 
@@ -5522,7 +5502,7 @@ static void app_window_finalize (GObject* obj) {
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_APP_WINDOW, AppWindow);
 #line 392 "/home/jens/Source/shotwell/src/AppWindow.vala"
 	G_OBJECT_CLASS (app_window_parent_class)->finalize (obj);
-#line 5495 "AppWindow.c"
+#line 5474 "AppWindow.c"
 }
 
 
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index 3b69156..a151c9a 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -477,8 +477,7 @@ public abstract class AppWindow : PageWindow {
     public static Gtk.Builder create_builder(string glade_filename = "shotwell.ui", void *user = null) {
         Gtk.Builder builder = new Gtk.Builder();
         try {
-            builder.add_from_file(AppDirs.get_resources_dir().get_child("ui").get_child(
-                glade_filename).get_path());
+            builder.add_from_resource(Resources.get_ui(glade_filename));
         } catch(GLib.Error error) {
             warning("Unable to create Gtk.Builder: %s\n", error.message);
         }
@@ -591,8 +590,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 };
         Gtk.show_about_dialog(this,
-            "version", Resources.APP_VERSION,
+            "version", Resources.APP_VERSION + " \u2013 \"Aachen\"",
             "comments", get_app_role(),
             "copyright", Resources.COPYRIGHT,
             "website", Resources.HOME_URL,
@@ -600,6 +600,7 @@ public abstract class AppWindow : PageWindow {
             "website-label", _("Visit the Shotwell web site"),
             "authors", Resources.AUTHORS,
             "logo", Resources.get_icon(Resources.ICON_ABOUT_LOGO, -1),
+            "artists", artists,
             "translator-credits", _("translator-credits"),
             null
         );
diff --git a/src/Application.c b/src/Application.c
index 9d858e4..edc55d2 100644
--- a/src/Application.c
+++ b/src/Application.c
@@ -265,11 +265,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 268 "Application.c"
-			goto __catch557_g_error;
+			goto __catch559_g_error;
 		}
 	}
-	goto __finally557;
-	__catch557_g_error:
+	goto __finally559;
+	__catch559_g_error:
 	{
 		GError* e = NULL;
 #line 56 "/home/jens/Source/shotwell/src/Application.vala"
@@ -282,7 +282,7 @@ static Application* application_construct (GType object_type, gboolean is_direct
 		_g_error_free0 (e);
 #line 284 "Application.c"
 	}
-	__finally557:
+	__finally559:
 #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 032c624..5904344 100644
--- a/src/BatchImport.c
+++ b/src/BatchImport.c
@@ -5770,14 +5770,14 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5773 "BatchImport.c"
-					goto __catch409_g_error;
+					goto __catch410_g_error;
 				}
 #line 557 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				filesize = _tmp11_;
 #line 5778 "BatchImport.c"
 			}
-			goto __finally409;
-			__catch409_g_error:
+			goto __finally410;
+			__catch410_g_error:
 			{
 				GError* err = NULL;
 				BatchImportResult* _tmp15_ = NULL;
@@ -5810,7 +5810,7 @@ static gboolean batch_import_report_failure (BatchImport* self, BatchImportResul
 				_g_error_free0 (err);
 #line 5812 "BatchImport.c"
 			}
-			__finally409:
+			__finally410:
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 555 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -8899,11 +8899,11 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 #line 1043 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8898 "BatchImport.c"
-						goto __catch410_g_error;
+						goto __catch411_g_error;
 					}
 				}
-				goto __finally410;
-				__catch410_g_error:
+				goto __finally411;
+				__catch411_g_error:
 				{
 					GError* e = NULL;
 					BackingPhotoRow* _tmp68_ = NULL;
@@ -8929,7 +8929,7 @@ static void batch_import_on_import_files_completed (BatchImport* self, Backgroun
 					_g_error_free0 (e);
 #line 8926 "BatchImport.c"
 				}
-				__finally410:
+				__finally411:
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1042 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -9894,11 +9894,11 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 #line 1196 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 9891 "BatchImport.c"
-					goto __catch411_g_error;
+					goto __catch412_g_error;
 				}
 			}
-			goto __finally411;
-			__catch411_g_error:
+			goto __finally412;
+			__catch412_g_error:
 			{
 				GError* err = NULL;
 				MediaSource* _tmp65_ = NULL;
@@ -9929,7 +9929,7 @@ static void batch_import_flush_ready_sources (BatchImport* self) {
 				_g_error_free0 (err);
 #line 9924 "BatchImport.c"
 			}
-			__finally411:
+			__finally412:
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1195 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -11931,11 +11931,11 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 #line 1465 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 11927 "BatchImport.c"
-					goto __catch412_g_error;
+					goto __catch413_g_error;
 				}
 			}
-			goto __finally412;
-			__catch412_g_error:
+			goto __finally413;
+			__catch413_g_error:
 			{
 				GError* err = NULL;
 				BatchImportJob* _tmp17_ = NULL;
@@ -11976,7 +11976,7 @@ static void work_sniffer_real_execute (BackgroundJob* base) {
 				_g_error_free0 (err);
 #line 11971 "BatchImport.c"
 			}
-			__finally412:
+			__finally413:
 #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1464 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -12676,11 +12676,11 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 #line 1556 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12672 "BatchImport.c"
-				goto __catch413_g_error;
+				goto __catch414_g_error;
 			}
 		}
-		goto __finally413;
-		__catch413_g_error:
+		goto __finally414;
+		__catch414_g_error:
 		{
 			GError* err = NULL;
 			BatchImportJob* _tmp26_ = NULL;
@@ -12724,7 +12724,7 @@ static void work_sniffer_sniff_job (WorkSniffer* self, BatchImportJob* job, GErr
 			_g_error_free0 (err);
 #line 12719 "BatchImport.c"
 		}
-		__finally413:
+		__finally414:
 #line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1555 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -13013,11 +13013,11 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 #line 1593 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 13009 "BatchImport.c"
-					goto __catch414_g_error;
+					goto __catch415_g_error;
 				}
 			}
-			goto __finally414;
-			__catch414_g_error:
+			goto __finally415;
+			__catch415_g_error:
 			{
 				GError* err = NULL;
 				BatchImportJob* _tmp24_ = NULL;
@@ -13061,7 +13061,7 @@ void work_sniffer_search_dir (WorkSniffer* self, BatchImportJob* job, GFile* dir
 				_g_error_free0 (err);
 #line 13056 "BatchImport.c"
 			}
-			__finally414:
+			__finally415:
 #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1592 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14580,7 +14580,7 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14576 "BatchImport.c"
-			goto __catch415_g_error;
+			goto __catch416_g_error;
 		}
 #line 1762 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (!_tmp0_) {
@@ -14635,8 +14635,8 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 #line 14629 "BatchImport.c"
 		}
 	}
-	goto __finally415;
-	__catch415_g_error:
+	goto __finally416;
+	__catch416_g_error:
 	{
 		GError* err = NULL;
 		BatchImportJob* _tmp12_ = NULL;
@@ -14697,7 +14697,7 @@ static gboolean prepare_files_job_create_file (PrepareFilesJob* self, BatchImpor
 		return result;
 #line 14692 "BatchImport.c"
 	}
-	__finally415:
+	__finally416:
 #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1761 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -14953,7 +14953,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14949 "BatchImport.c"
-			goto __catch416_g_error;
+			goto __catch417_g_error;
 		}
 #line 1808 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp20_ = _tmp17_;
@@ -14967,8 +14967,8 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		_g_free0 (_tmp17_);
 #line 14962 "BatchImport.c"
 	}
-	goto __finally416;
-	__catch416_g_error:
+	goto __finally417;
+	__catch417_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp21_ = NULL;
@@ -15024,7 +15024,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		return result;
 #line 15019 "BatchImport.c"
 	}
-	__finally416:
+	__finally417:
 #line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1807 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15135,7 +15135,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 #line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 15131 "BatchImport.c"
-				goto __catch417_g_error;
+				goto __catch418_g_error;
 			}
 #line 1831 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp44_ = _tmp41_;
@@ -15149,8 +15149,8 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			_media_metadata_unref0 (_tmp41_);
 #line 15144 "BatchImport.c"
 		}
-		goto __finally417;
-		__catch417_g_error:
+		goto __finally418;
+		__catch418_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp45_ = NULL;
@@ -15181,7 +15181,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 			_g_error_free0 (err);
 #line 15175 "BatchImport.c"
 		}
-		__finally417:
+		__finally418:
 #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1830 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15374,14 +15374,14 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 15369 "BatchImport.c"
-			goto __catch418_g_error;
+			goto __catch419_g_error;
 		}
 #line 1850 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		filesize = _tmp69_;
 #line 15374 "BatchImport.c"
 	}
-	goto __finally418;
-	__catch418_g_error:
+	goto __finally419;
+	__catch419_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp75_ = NULL;
@@ -15437,7 +15437,7 @@ static ImportResult prepare_files_job_prepare_file (PrepareFilesJob* self, Batch
 		return result;
 #line 15431 "BatchImport.c"
 	}
-	__finally418:
+	__finally419:
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1849 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -15832,11 +15832,11 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 #line 1898 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 15827 "BatchImport.c"
-				goto __catch419_g_error;
+				goto __catch420_g_error;
 			}
 		}
-		goto __finally419;
-		__catch419_g_error:
+		goto __finally420;
+		__catch420_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp9_ = NULL;
@@ -15867,7 +15867,7 @@ BatchImportResult* ready_for_import_abort (ReadyForImport* self) {
 			_g_error_free0 (err);
 #line 15860 "BatchImport.c"
 		}
-		__finally419:
+		__finally420:
 #line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1897 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16384,7 +16384,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 #line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 16378 "BatchImport.c"
-				goto __catch420_g_error;
+				goto __catch421_g_error;
 			}
 #line 1945 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			_tmp14_ = _tmp10_;
@@ -16481,7 +16481,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 #line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 					_g_object_unref0 (_tmp10_);
 #line 16475 "BatchImport.c"
-					goto __catch420_g_error;
+					goto __catch421_g_error;
 				}
 #line 1956 "/home/jens/Source/shotwell/src/BatchImport.vala"
 				_tmp34_ = _tmp30_;
@@ -16499,8 +16499,8 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_g_object_unref0 (_tmp10_);
 #line 16492 "BatchImport.c"
 		}
-		goto __finally420;
-		__catch420_g_error:
+		goto __finally421;
+		__catch421_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp35_ = NULL;
@@ -16591,7 +16591,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			return;
 #line 16584 "BatchImport.c"
 		}
-		__finally420:
+		__finally421:
 #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1943 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -16778,11 +16778,11 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 #line 1989 "/home/jens/Source/shotwell/src/BatchImport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 16772 "BatchImport.c"
-				goto __catch421_g_error;
+				goto __catch422_g_error;
 			}
 		}
-		goto __finally421;
-		__catch421_g_error:
+		goto __finally422;
+		__catch422_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp91_ = NULL;
@@ -16812,7 +16812,7 @@ static void prepared_file_import_job_real_execute (BackgroundJob* base) {
 			_g_error_free0 (err);
 #line 16805 "BatchImport.c"
 		}
-		__finally421:
+		__finally422:
 #line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1988 "/home/jens/Source/shotwell/src/BatchImport.vala"
@@ -17393,7 +17393,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 #line 2039 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 17387 "BatchImport.c"
-			goto __catch422_g_error;
+			goto __catch423_g_error;
 		}
 #line 2041 "/home/jens/Source/shotwell/src/BatchImport.vala"
 		_tmp4_ = self->completed_import_source;
@@ -17403,8 +17403,8 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		_tmp5_->result = IMPORT_RESULT_SUCCESS;
 #line 17396 "BatchImport.c"
 	}
-	goto __finally422;
-	__catch422_g_error:
+	goto __finally423;
+	__catch423_g_error:
 	{
 		GError* err = NULL;
 		CompletedImportObject* _tmp6_ = NULL;
@@ -17429,7 +17429,7 @@ static void thumbnail_writer_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 17422 "BatchImport.c"
 	}
-	__finally422:
+	__finally423:
 #line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2038 "/home/jens/Source/shotwell/src/BatchImport.vala"
diff --git a/src/BatchImport.vala b/src/BatchImport.vala
index 3febf08..27cf4da 100644
--- a/src/BatchImport.vala
+++ b/src/BatchImport.vala
@@ -1777,7 +1777,7 @@ private class PrepareFilesJob : BackgroundImportJob {
     private ImportResult prepare_file(BatchImportJob job, File file, File? associated_file, 
         bool copy_to_library, out PreparedFile prepared_file) {
         prepared_file = null;
-        
+
         bool is_video = VideoReader.is_supported_video_file(file);
         
         if ((!is_video) && (!Photo.is_file_image(file)))
diff --git a/src/CheckerboardLayout.c b/src/CheckerboardLayout.c
index b5d30e5..bf8c368 100644
--- a/src/CheckerboardLayout.c
+++ b/src/CheckerboardLayout.c
@@ -1422,7 +1422,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1425 "CheckerboardLayout.c"
-				goto __catch241_g_regex_error;
+				goto __catch242_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1447,7 +1447,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1450 "CheckerboardLayout.c"
-				goto __catch241_g_regex_error;
+				goto __catch242_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1473,8 +1473,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 1475 "CheckerboardLayout.c"
 	}
-	goto __finally241;
-	__catch241_g_regex_error:
+	goto __finally242;
+	__catch242_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1487,7 +1487,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 1489 "CheckerboardLayout.c"
 	}
-	__finally241:
+	__finally242:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/src/CollectionPage.c b/src/CollectionPage.c
index afd1659..991dadb 100644
--- a/src/CollectionPage.c
+++ b/src/CollectionPage.c
@@ -1488,112 +1488,112 @@ GType collection_view_manager_get_type (void) {
 
 
 static void _collection_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_print ((CollectionPage*) self);
 #line 1494 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_publish ((CollectionPage*) self);
 #line 1501 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_rotate_clockwise ((CollectionPage*) self);
 #line 1508 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_rotate_counterclockwise ((CollectionPage*) self);
 #line 1515 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_flip_horizontally ((CollectionPage*) self);
 #line 1522 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_flip_vertically ((CollectionPage*) self);
 #line 1529 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_enhance ((CollectionPage*) self);
 #line 1536 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_copy_adjustments ((CollectionPage*) self);
 #line 1543 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_paste_adjustments ((CollectionPage*) self);
 #line 1550 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_revert ((CollectionPage*) self);
 #line 1557 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_set_background ((CollectionPage*) self);
 #line 1564 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_duplicate_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_duplicate_photo ((CollectionPage*) self);
 #line 1571 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_adjust_date_time ((CollectionPage*) self);
 #line 1578 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_external_edit ((CollectionPage*) self);
 #line 1585 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_external_edit_raw ((CollectionPage*) self);
 #line 1592 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 160 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_slideshow ((CollectionPage*) self);
 #line 1599 "CollectionPage.c"
 }
@@ -1658,8 +1658,8 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 	CollectionPage * self;
 	GtkToolbar* result = NULL;
 	GtkToolbar* _tmp0_ = NULL;
-	GtkToolbar* _tmp20_ = NULL;
-	GtkToolbar* _tmp21_ = NULL;
+	GtkToolbar* _tmp28_ = NULL;
+	GtkToolbar* _tmp29_ = NULL;
 #line 46 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1689,6 +1689,16 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 		GtkToolbar* _tmp17_ = NULL;
 		GtkToolbar* _tmp18_ = NULL;
 		MediaPageZoomSliderAssembly* _tmp19_ = NULL;
+		GtkToolButton* rotate_button = NULL;
+		GtkBuilder* _tmp20_ = NULL;
+		GObject* _tmp21_ = NULL;
+		GtkToolButton* _tmp22_ = NULL;
+		GtkBindingSet* binding_set = NULL;
+		GtkToolButton* _tmp23_ = NULL;
+		GObjectClass* _tmp24_ = NULL;
+		GtkBindingSet* _tmp25_ = NULL;
+		GtkBindingSet* _tmp26_ = NULL;
+		GtkBindingSet* _tmp27_ = NULL;
 #line 48 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = PAGE_CLASS (collection_page_parent_class)->get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page));
 #line 48 "/home/jens/Source/shotwell/src/CollectionPage.vala"
@@ -1761,23 +1771,49 @@ static GtkToolbar* collection_page_real_get_toolbar (Page* base) {
 		gtk_toolbar_insert (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 65 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp18_);
+#line 67 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
+#line 67 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp21_ = gtk_builder_get_object (_tmp20_, "ToolRotate");
+#line 67 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp22_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, gtk_tool_button_get_type ()) ? ((GtkToolButton*) _tmp21_) : NULL);
+#line 67 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		rotate_button = _tmp22_;
+#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp23_ = rotate_button;
+#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp24_ = G_OBJECT_GET_CLASS (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, G_TYPE_OBJECT, GObject));
+#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp25_ = gtk_binding_set_by_class (_tmp24_);
+#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		binding_set = _tmp25_;
+#line 69 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp26_ = binding_set;
+#line 69 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		gtk_binding_entry_add_signal (_tmp26_, (guint) GDK_KEY_KP_Space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL);
+#line 70 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_tmp27_ = binding_set;
+#line 70 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		gtk_binding_entry_add_signal (_tmp27_, (guint) GDK_KEY_space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL);
+#line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		_g_object_unref0 (rotate_button);
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (zoom_slider_assembly);
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (drawn_separator);
 #line 47 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (separator);
-#line 1771 "CollectionPage.c"
+#line 1807 "CollectionPage.c"
 	}
-#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
-#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	_tmp21_ = _g_object_ref0 (_tmp20_);
-#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	result = _tmp21_;
-#line 68 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->toolbar;
+#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	_tmp29_ = _g_object_ref0 (_tmp28_);
+#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	result = _tmp29_;
+#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1781 "CollectionPage.c"
+#line 1817 "CollectionPage.c"
 }
 
 
@@ -1789,33 +1825,33 @@ static InjectionGroup* collection_page_create_file_menu_injectables (void) {
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 72 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("FileExtrasPlaceholder");
-#line 72 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("_Print");
-#line 74 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "Print", "<Primary>p");
-#line 75 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 81 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
-#line 76 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _ ("_Publish");
-#line 76 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 82 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp2_, "Publish", "<Primary><Shift>p");
-#line 77 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _ ("Send _To…");
-#line 77 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 83 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp3_, "SendTo", NULL);
-#line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _ ("Set as _Desktop Background");
-#line 78 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp4_, "SetBackground", "<Primary>b");
-#line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 80 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1819 "CollectionPage.c"
+#line 1855 "CollectionPage.c"
 }
 
 
@@ -1824,19 +1860,19 @@ static InjectionGroup* collection_page_create_edit_menu_injectables (void) {
 	InjectionGroup* group = NULL;
 	InjectionGroup* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("EditExtrasPlaceholder");
-#line 84 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 90 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("_Duplicate");
-#line 86 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "Duplicate", "<Primary>D");
-#line 88 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 88 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1840 "CollectionPage.c"
+#line 1876 "CollectionPage.c"
 }
 
 
@@ -1846,25 +1882,25 @@ static InjectionGroup* collection_page_create_view_menu_fullscreen_injectables (
 	InjectionGroup* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("ViewExtrasFullscreenSlideshowPlaceholder");
-#line 92 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("Fullscreen");
-#line 94 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 100 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "CommonFullscreen", "F11");
-#line 95 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 101 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
-#line 96 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _ ("S_lideshow");
-#line 96 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp2_, "Slideshow", "F5");
-#line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 98 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1868 "CollectionPage.c"
+#line 1904 "CollectionPage.c"
 }
 
 
@@ -1880,51 +1916,51 @@ static InjectionGroup* collection_page_create_photos_menu_edits_injectables (voi
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	const gchar* _tmp8_ = NULL;
-#line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("PhotosExtrasEditsPlaceholder");
-#line 102 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 108 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("Rotate _Right");
-#line 104 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "RotateClockwise", "<Primary>r");
-#line 107 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _ ("Rotate _Left");
-#line 107 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp2_, "RotateCounterclockwise", "<Primary><Shift>r");
-#line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _ ("Flip Hori_zontally");
-#line 110 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp3_, "FlipHorizontally", NULL);
-#line 111 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _ ("Flip Verti_cally");
-#line 111 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 117 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp4_, "FlipVertically", NULL);
-#line 112 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 118 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
-#line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _ ("_Enhance");
-#line 113 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp5_, "Enhance", NULL);
-#line 114 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = _ ("Re_vert to Original");
-#line 114 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 120 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp6_, "Revert", NULL);
-#line 115 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 121 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_separator (group);
-#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 122 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _ ("_Copy Color Adjustments");
-#line 116 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 122 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp7_, "CopyColorAdjustments", "<Primary><Shift>c");
-#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("_Paste Color Adjustments");
-#line 119 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 125 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp8_, "PasteColorAdjustments", "<Primary><Shift>v");
-#line 123 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 123 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1928 "CollectionPage.c"
+#line 1964 "CollectionPage.c"
 }
 
 
@@ -1933,19 +1969,19 @@ static InjectionGroup* collection_page_create_photos_menu_date_injectables (void
 	InjectionGroup* group = NULL;
 	InjectionGroup* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("PhotosExtrasDateTimePlaceholder");
-#line 127 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 133 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("Adjust Date and Time…");
-#line 129 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "AdjustDateTime", NULL);
-#line 131 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 131 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1949 "CollectionPage.c"
+#line 1985 "CollectionPage.c"
 }
 
 
@@ -1956,27 +1992,27 @@ static InjectionGroup* collection_page_create_photos_menu_externals_injectables
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = injection_group_new ("PhotosExtrasExternalsPlaceholder");
-#line 135 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 141 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	group = _tmp0_;
-#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _ ("Open With E_xternal Editor");
-#line 137 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp1_, "ExternalEdit", "<Primary>Return");
-#line 140 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _ ("Open With RA_W Editor");
-#line 140 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 146 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp2_, "ExternalEditRAW", "<Primary><Shift>Return");
-#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _ ("_Play");
-#line 143 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	injection_group_add_menu_item (group, _tmp3_, "PlayVideo", "<Primary>Y");
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = group;
-#line 145 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 1980 "CollectionPage.c"
+#line 2016 "CollectionPage.c"
 }
 
 
@@ -1984,19 +2020,19 @@ static void collection_page_real_init_collect_ui_filenames (Page* base, GeeList*
 	CollectionPage * self;
 	GeeList* _tmp0_ = NULL;
 	GeeList* _tmp1_ = NULL;
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 148 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 154 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 155 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = ui_filenames;
-#line 149 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 155 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	PAGE_CLASS (collection_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_);
-#line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 157 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = ui_filenames;
-#line 151 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 2000 "CollectionPage.c"
+#line 2036 "CollectionPage.c"
 }
 
 
@@ -2004,63 +2040,63 @@ static void collection_page_real_add_actions (Page* base, GActionMap* map) {
 	CollectionPage * self;
 	GActionMap* _tmp0_ = NULL;
 	GActionMap* _tmp1_ = NULL;
-#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 173 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 174 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = map;
-#line 174 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	PAGE_CLASS (collection_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp0_);
-#line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = map;
-#line 176 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 2020 "CollectionPage.c"
+#line 2056 "CollectionPage.c"
 }
 
 
 static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
 	CollectionPage * self;
 	GActionMap* _tmp0_ = NULL;
-#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 179 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = map;
-#line 180 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 2035 "CollectionPage.c"
+#line 2071 "CollectionPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
 		gint _entry_collection_size_ = 0;
 		gint entry_it = 0;
-#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		entry_collection = COLLECTION_PAGE_entries;
-#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		entry_collection_length1 = G_N_ELEMENTS (COLLECTION_PAGE_entries);
-#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 2047 "CollectionPage.c"
+#line 2083 "CollectionPage.c"
 			GActionEntry entry = {0};
-#line 181 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			entry = entry_collection[entry_it];
-#line 2051 "CollectionPage.c"
+#line 2087 "CollectionPage.c"
 			{
 				GActionMap* _tmp1_ = NULL;
 				GActionEntry _tmp2_ = {0};
 				const gchar* _tmp3_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp1_ = map;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp2_ = entry;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp3_ = _tmp2_.name;
-#line 182 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 2064 "CollectionPage.c"
+#line 2100 "CollectionPage.c"
 			}
 		}
 	}
@@ -2068,104 +2104,104 @@ static void collection_page_real_remove_actions (Page* base, GActionMap* map) {
 
 
 static void _vala_array_add76 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2078 "CollectionPage.c"
+#line 2114 "CollectionPage.c"
 	}
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2084 "CollectionPage.c"
+#line 2120 "CollectionPage.c"
 }
 
 
 static void _vala_array_add77 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2095 "CollectionPage.c"
+#line 2131 "CollectionPage.c"
 	}
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2101 "CollectionPage.c"
+#line 2137 "CollectionPage.c"
 }
 
 
 static void _vala_array_add78 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2112 "CollectionPage.c"
+#line 2148 "CollectionPage.c"
 	}
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2118 "CollectionPage.c"
+#line 2154 "CollectionPage.c"
 }
 
 
 static void _vala_array_add79 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2129 "CollectionPage.c"
+#line 2165 "CollectionPage.c"
 	}
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2135 "CollectionPage.c"
+#line 2171 "CollectionPage.c"
 }
 
 
 static void _vala_array_add80 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2146 "CollectionPage.c"
+#line 2182 "CollectionPage.c"
 	}
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2152 "CollectionPage.c"
+#line 2188 "CollectionPage.c"
 }
 
 
 static void _vala_array_add81 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if ((*length) == (*size)) {
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 2163 "CollectionPage.c"
+#line 2199 "CollectionPage.c"
 	}
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[(*length)++] = value;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	(*array)[*length] = NULL;
-#line 2169 "CollectionPage.c"
+#line 2205 "CollectionPage.c"
 }
 
 
@@ -2197,79 +2233,79 @@ static InjectionGroup** collection_page_real_init_collect_injection_groups (Page
 	InjectionGroup* _tmp13_ = NULL;
 	InjectionGroup** _tmp14_ = NULL;
 	gint _tmp14__length1 = 0;
-#line 186 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = PAGE_CLASS (collection_page_parent_class)->init_collect_injection_groups (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), &_tmp0_);
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	groups = _tmp1_;
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	groups_length1 = _tmp0_;
-#line 187 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_groups_size_ = groups_length1;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = groups;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2__length1 = groups_length1;
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = collection_page_create_file_menu_injectables ();
-#line 189 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 195 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add76 (&groups, &groups_length1, &_groups_size_, _tmp3_);
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = groups;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4__length1 = groups_length1;
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = collection_page_create_edit_menu_injectables ();
-#line 190 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add77 (&groups, &groups_length1, &_groups_size_, _tmp5_);
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = groups;
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6__length1 = groups_length1;
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = collection_page_create_view_menu_fullscreen_injectables ();
-#line 191 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add78 (&groups, &groups_length1, &_groups_size_, _tmp7_);
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = groups;
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8__length1 = groups_length1;
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_create_photos_menu_edits_injectables ();
-#line 192 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add79 (&groups, &groups_length1, &_groups_size_, _tmp9_);
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = groups;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10__length1 = groups_length1;
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = collection_page_create_photos_menu_date_injectables ();
-#line 193 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add80 (&groups, &groups_length1, &_groups_size_, _tmp11_);
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = groups;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12__length1 = groups_length1;
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = collection_page_create_photos_menu_externals_injectables ();
-#line 194 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_array_add81 (&groups, &groups_length1, &_groups_size_, _tmp13_);
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = groups;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14__length1 = groups_length1;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (result_length1) {
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 2267 "CollectionPage.c"
+#line 2303 "CollectionPage.c"
 	}
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp14_;
-#line 196 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2273 "CollectionPage.c"
+#line 2309 "CollectionPage.c"
 }
 
 
@@ -2281,29 +2317,29 @@ static gboolean collection_page_selection_has_video (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 199 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_video (_tmp3_);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 200 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 206 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2307 "CollectionPage.c"
+#line 2343 "CollectionPage.c"
 }
 
 
@@ -2315,29 +2351,29 @@ static gboolean collection_page_page_has_photo (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 203 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 209 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_sources (_tmp1_);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_photo (_tmp3_);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 204 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 210 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2341 "CollectionPage.c"
+#line 2377 "CollectionPage.c"
 }
 
 
@@ -2349,29 +2385,29 @@ static gboolean collection_page_selection_has_photo (CollectionPage* self) {
 	GeeCollection* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 207 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 213 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = media_source_collection_has_photo (_tmp3_);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp5_;
-#line 208 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 2375 "CollectionPage.c"
+#line 2411 "CollectionPage.c"
 }
 
 
@@ -2379,29 +2415,29 @@ static void collection_page_real_init_actions (Page* base, gint selected_count,
 	CollectionPage * self;
 	gint _tmp0_ = 0;
 	gint _tmp1_ = 0;
-#line 211 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 212 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = selected_count;
-#line 212 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = count;
-#line 212 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 214 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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);
-#line 215 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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);
-#line 216 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 218 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 219 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 220 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 221 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 2405 "CollectionPage.c"
+#line 2441 "CollectionPage.c"
 }
 
 
@@ -2463,49 +2499,49 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 	gboolean _tmp92_ = FALSE;
 	gboolean _tmp93_ = FALSE;
 	gboolean _tmp95_ = FALSE;
-#line 224 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow));
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _tmp3_ != G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page);
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 226 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 227 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 2487 "CollectionPage.c"
+#line 2523 "CollectionPage.c"
 	}
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = count;
-#line 230 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 236 "/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 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = selected_count;
-#line 232 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	one_selected = _tmp7_ == 1;
-#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = selected_count;
-#line 233 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_selected = _tmp8_ > 0;
-#line 235 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	primary_is_video = FALSE;
-#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = has_selected;
-#line 236 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 2509 "CollectionPage.c"
+#line 2545 "CollectionPage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		DataView* _tmp12_ = NULL;
@@ -2513,116 +2549,116 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		DataSource* _tmp14_ = NULL;
 		DataSource* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = _tmp10_;
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = view_collection_get_selected_at (_tmp11_, 0);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = data_view_get_source (_tmp13_);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = _tmp14_;
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, TYPE_VIDEO);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 237 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp16_) {
-#line 238 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 244 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			primary_is_video = TRUE;
-#line 2541 "CollectionPage.c"
+#line 2577 "CollectionPage.c"
 		}
 	}
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp17_ = collection_page_selection_has_video (self);
-#line 240 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selection_has_videos = _tmp17_;
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp18_ = collection_page_page_has_photo (self);
-#line 241 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_has_photos = _tmp18_;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp20_ = has_selected;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp20_) {
-#line 2556 "CollectionPage.c"
+#line 2592 "CollectionPage.c"
 		gboolean _tmp21_ = FALSE;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = selection_has_videos;
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = !_tmp21_;
-#line 2562 "CollectionPage.c"
+#line 2598 "CollectionPage.c"
 	} else {
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = FALSE;
-#line 2566 "CollectionPage.c"
+#line 2602 "CollectionPage.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Duplicate", _tmp19_);
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = primary_is_video;
-#line 246 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = one_selected;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp24_) {
-#line 2578 "CollectionPage.c"
+#line 2614 "CollectionPage.c"
 		ConfigFacade* _tmp25_ = NULL;
 		ConfigFacade* _tmp26_ = NULL;
 		gchar* _tmp27_ = NULL;
 		gchar* _tmp28_ = NULL;
 		gboolean _tmp29_ = FALSE;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = config_facade_get_instance ();
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp26_ = _tmp25_;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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));
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp28_ = _tmp27_;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp29_ = is_string_empty (_tmp28_);
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = !_tmp29_;
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp28_);
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 2600 "CollectionPage.c"
+#line 2636 "CollectionPage.c"
 	} else {
-#line 248 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = FALSE;
-#line 2604 "CollectionPage.c"
+#line 2640 "CollectionPage.c"
 	}
-#line 247 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = one_selected;
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp33_) {
-#line 2612 "CollectionPage.c"
+#line 2648 "CollectionPage.c"
 		gboolean _tmp34_ = FALSE;
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp34_ = primary_is_video;
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp32_ = !_tmp34_;
-#line 2618 "CollectionPage.c"
+#line 2654 "CollectionPage.c"
 	} else {
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp32_ = FALSE;
-#line 2622 "CollectionPage.c"
+#line 2658 "CollectionPage.c"
 	}
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp32_) {
-#line 2626 "CollectionPage.c"
+#line 2662 "CollectionPage.c"
 		ViewCollection* _tmp35_ = NULL;
 		ViewCollection* _tmp36_ = NULL;
 		DataView* _tmp37_ = NULL;
@@ -2630,121 +2666,121 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		DataSource* _tmp39_ = NULL;
 		Photo* _tmp40_ = NULL;
 		PhotoFileFormat _tmp41_ = 0;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp36_ = _tmp35_;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp37_ = view_collection_get_selected_at (_tmp36_, 0);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp38_ = _tmp37_;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp39_ = data_view_get_source (_tmp38_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp40_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp41_ = photo_get_master_file_format (_tmp40_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp31_ = _tmp41_ == PHOTO_FILE_FORMAT_RAW;
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp40_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp38_);
-#line 251 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp36_);
-#line 2656 "CollectionPage.c"
+#line 2692 "CollectionPage.c"
 	} else {
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp31_ = FALSE;
-#line 2660 "CollectionPage.c"
+#line 2696 "CollectionPage.c"
 	}
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp31_) {
-#line 2664 "CollectionPage.c"
+#line 2700 "CollectionPage.c"
 		ConfigFacade* _tmp42_ = NULL;
 		ConfigFacade* _tmp43_ = NULL;
 		gchar* _tmp44_ = NULL;
 		gchar* _tmp45_ = NULL;
 		gboolean _tmp46_ = FALSE;
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp42_ = config_facade_get_instance ();
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp43_ = _tmp42_;
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp45_ = _tmp44_;
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp46_ = is_string_empty (_tmp45_);
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = !_tmp46_;
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp45_);
-#line 253 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp43_);
-#line 2686 "CollectionPage.c"
+#line 2722 "CollectionPage.c"
 	} else {
-#line 250 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = FALSE;
-#line 2690 "CollectionPage.c"
+#line 2726 "CollectionPage.c"
 	}
-#line 249 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp48_ = selection_has_videos;
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp48_) {
-#line 2698 "CollectionPage.c"
+#line 2734 "CollectionPage.c"
 		gboolean _tmp49_ = FALSE;
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp49_ = collection_page_can_revert_selected (self);
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = _tmp49_;
-#line 2704 "CollectionPage.c"
+#line 2740 "CollectionPage.c"
 	} else {
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp47_ = FALSE;
-#line 2708 "CollectionPage.c"
+#line 2744 "CollectionPage.c"
 	}
-#line 254 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp47_);
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp51_ = selection_has_videos;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp51_) {
-#line 2716 "CollectionPage.c"
+#line 2752 "CollectionPage.c"
 		gboolean _tmp52_ = FALSE;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp52_ = has_selected;
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = _tmp52_;
-#line 2722 "CollectionPage.c"
+#line 2758 "CollectionPage.c"
 	} else {
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = FALSE;
-#line 2726 "CollectionPage.c"
+#line 2762 "CollectionPage.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp50_);
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp55_ = selection_has_videos;
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp55_) {
-#line 2734 "CollectionPage.c"
+#line 2770 "CollectionPage.c"
 		gboolean _tmp56_ = FALSE;
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp56_ = one_selected;
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp54_ = _tmp56_;
-#line 2740 "CollectionPage.c"
+#line 2776 "CollectionPage.c"
 	} else {
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp54_ = FALSE;
-#line 2744 "CollectionPage.c"
+#line 2780 "CollectionPage.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp54_) {
-#line 2748 "CollectionPage.c"
+#line 2784 "CollectionPage.c"
 		ViewCollection* _tmp57_ = NULL;
 		ViewCollection* _tmp58_ = NULL;
 		DataView* _tmp59_ = NULL;
@@ -2752,259 +2788,259 @@ static void collection_page_real_update_actions (Page* base, gint selected_count
 		DataSource* _tmp61_ = NULL;
 		Photo* _tmp62_ = NULL;
 		gboolean _tmp63_ = FALSE;
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp57_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp58_ = _tmp57_;
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp59_ = view_collection_get_selected_at (_tmp58_, 0);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp60_ = _tmp59_;
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp61_ = data_view_get_source (_tmp60_);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp62_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_PHOTO, Photo);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp63_ = photo_has_color_adjustments (_tmp62_);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp53_ = _tmp63_;
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp62_);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp60_);
-#line 257 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp58_);
-#line 2778 "CollectionPage.c"
+#line 2814 "CollectionPage.c"
 	} else {
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp53_ = FALSE;
-#line 2782 "CollectionPage.c"
+#line 2818 "CollectionPage.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp53_);
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp66_ = selection_has_videos;
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp66_) {
-#line 2790 "CollectionPage.c"
+#line 2826 "CollectionPage.c"
 		gboolean _tmp67_ = FALSE;
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp67_ = has_selected;
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp65_ = _tmp67_;
-#line 2796 "CollectionPage.c"
+#line 2832 "CollectionPage.c"
 	} else {
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp65_ = FALSE;
-#line 2800 "CollectionPage.c"
+#line 2836 "CollectionPage.c"
 	}
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp65_) {
-#line 2804 "CollectionPage.c"
+#line 2840 "CollectionPage.c"
 		gboolean _tmp68_ = FALSE;
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp68_ = pixel_transformation_bundle_has_copied_color_adjustments ();
-#line 259 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp64_ = _tmp68_;
-#line 2810 "CollectionPage.c"
+#line 2846 "CollectionPage.c"
 	} else {
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp64_ = FALSE;
-#line 2814 "CollectionPage.c"
+#line 2850 "CollectionPage.c"
 	}
-#line 258 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp70_ = selection_has_videos;
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp70_) {
-#line 2822 "CollectionPage.c"
+#line 2858 "CollectionPage.c"
 		gboolean _tmp71_ = FALSE;
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp71_ = has_selected;
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp69_ = _tmp71_;
-#line 2828 "CollectionPage.c"
+#line 2864 "CollectionPage.c"
 	} else {
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp69_ = FALSE;
-#line 2832 "CollectionPage.c"
+#line 2868 "CollectionPage.c"
 	}
-#line 260 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp73_ = selection_has_videos;
-#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp73_) {
-#line 2840 "CollectionPage.c"
+#line 2876 "CollectionPage.c"
 		gboolean _tmp74_ = FALSE;
-#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp74_ = has_selected;
-#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp72_ = _tmp74_;
-#line 2846 "CollectionPage.c"
+#line 2882 "CollectionPage.c"
 	} else {
-#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp72_ = FALSE;
-#line 2850 "CollectionPage.c"
+#line 2886 "CollectionPage.c"
 	}
-#line 261 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp72_);
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp76_ = selection_has_videos;
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp76_) {
-#line 2858 "CollectionPage.c"
+#line 2894 "CollectionPage.c"
 		gboolean _tmp77_ = FALSE;
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp77_ = has_selected;
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp75_ = _tmp77_;
-#line 2864 "CollectionPage.c"
+#line 2900 "CollectionPage.c"
 	} else {
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp75_ = FALSE;
-#line 2868 "CollectionPage.c"
+#line 2904 "CollectionPage.c"
 	}
-#line 262 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp79_ = selection_has_videos;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp79_) {
-#line 2876 "CollectionPage.c"
+#line 2912 "CollectionPage.c"
 		gboolean _tmp80_ = FALSE;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp80_ = has_selected;
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp78_ = _tmp80_;
-#line 2882 "CollectionPage.c"
+#line 2918 "CollectionPage.c"
 	} else {
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp78_ = FALSE;
-#line 2886 "CollectionPage.c"
+#line 2922 "CollectionPage.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp78_);
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp81_ = has_selected;
-#line 267 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp81_);
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp82_ = has_selected;
-#line 269 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp83_ = has_selected;
-#line 270 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", _tmp83_);
-#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp84_ = one_selected;
-#line 271 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp86_ = page_has_photos;
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp86_) {
-#line 2910 "CollectionPage.c"
+#line 2946 "CollectionPage.c"
 		gboolean _tmp87_ = FALSE;
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp87_ = primary_is_video;
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp85_ = !_tmp87_;
-#line 2916 "CollectionPage.c"
+#line 2952 "CollectionPage.c"
 	} else {
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp85_ = FALSE;
-#line 2920 "CollectionPage.c"
+#line 2956 "CollectionPage.c"
 	}
-#line 272 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp89_ = selection_has_videos;
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp89_) {
-#line 2928 "CollectionPage.c"
+#line 2964 "CollectionPage.c"
 		gboolean _tmp90_ = FALSE;
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp90_ = has_selected;
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp88_ = _tmp90_;
-#line 2934 "CollectionPage.c"
+#line 2970 "CollectionPage.c"
 	} else {
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp88_ = FALSE;
-#line 2938 "CollectionPage.c"
+#line 2974 "CollectionPage.c"
 	}
-#line 273 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp88_);
-#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp91_ = has_selected;
-#line 274 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp93_ = selection_has_videos;
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp93_) {
-#line 2950 "CollectionPage.c"
+#line 2986 "CollectionPage.c"
 		gboolean _tmp94_ = FALSE;
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp94_ = has_selected;
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp92_ = _tmp94_;
-#line 2956 "CollectionPage.c"
+#line 2992 "CollectionPage.c"
 	} else {
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp92_ = FALSE;
-#line 2960 "CollectionPage.c"
+#line 2996 "CollectionPage.c"
 	}
-#line 276 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp95_ = has_selected;
-#line 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp95_) {
-#line 2968 "CollectionPage.c"
+#line 3004 "CollectionPage.c"
 		const gchar* _tmp96_ = NULL;
 		gboolean _tmp97_ = FALSE;
 		gchar* label = NULL;
 		gchar* _tmp98_ = NULL;
 		const gchar* _tmp99_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-		g_debug ("CollectionPage.vala:278: Setting action label for SetBackground...");
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp97_) {
-#line 280 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp96_ = RESOURCES_SET_BACKGROUND_MENU;
-#line 2982 "CollectionPage.c"
+#line 3018 "CollectionPage.c"
 		} else {
-#line 281 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 287 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp96_ = RESOURCES_SET_BACKGROUND_SLIDESHOW_MENU;
-#line 2986 "CollectionPage.c"
+#line 3022 "CollectionPage.c"
 		}
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp98_ = g_strdup (_tmp96_);
-#line 279 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 285 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		label = _tmp98_;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 288 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp99_ = label;
-#line 282 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 277 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (label);
-#line 2998 "CollectionPage.c"
+#line 3034 "CollectionPage.c"
 	}
 }
 
 
 static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* altered) {
-#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 286 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 3008 "CollectionPage.c"
+#line 3044 "CollectionPage.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -3013,25 +3049,25 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 		GeeSet* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = altered;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = _tmp1_;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_object_it = _tmp5_;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 3035 "CollectionPage.c"
+#line 3071 "CollectionPage.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -3051,120 +3087,120 @@ static void collection_page_on_photos_altered (CollectionPage* self, GeeMap* alt
 			gboolean _tmp24_ = FALSE;
 			LibraryPhoto* _tmp25_ = NULL;
 			gboolean _tmp26_ = FALSE;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp6_ = _object_it;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp7_) {
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3063 "CollectionPage.c"
+#line 3099 "CollectionPage.c"
 			}
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _object_it;
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			object = (DataObject*) _tmp9_;
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = object;
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_VIEW, DataView));
-#line 290 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			view = _tmp11_;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = view;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = data_view_is_selected (_tmp13_);
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp14_) {
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = TRUE;
-#line 3085 "CollectionPage.c"
+#line 3121 "CollectionPage.c"
 			} else {
 				GeeMap* _tmp15_ = NULL;
 				DataView* _tmp16_ = NULL;
 				gpointer _tmp17_ = NULL;
 				Alteration* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = altered;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp16_ = view;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = gee_map_get (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = (Alteration*) _tmp17_;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = alteration_has_subject (_tmp18_, "image");
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp12_ = !_tmp19_;
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_alteration_unref0 (_tmp18_);
-#line 3106 "CollectionPage.c"
+#line 3142 "CollectionPage.c"
 			}
-#line 292 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp12_) {
-#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 293 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 299 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3116 "CollectionPage.c"
+#line 3152 "CollectionPage.c"
 			}
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = view;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = data_view_get_source (_tmp20_);
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp21_) : NULL;
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp22_ == NULL) {
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp21_);
-#line 3128 "CollectionPage.c"
+#line 3164 "CollectionPage.c"
 			}
-#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp22_;
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp23_ = photo;
-#line 296 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp23_ == NULL) {
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (view);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 297 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 303 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				continue;
-#line 3144 "CollectionPage.c"
+#line 3180 "CollectionPage.c"
 			}
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = collection_page_can_revert_selected (self);
-#line 301 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp24_);
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp25_ = photo;
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = photo_has_color_adjustments (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
-#line 302 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp26_);
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (view);
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (object);
-#line 304 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			break;
-#line 3164 "CollectionPage.c"
+#line 3200 "CollectionPage.c"
 		}
-#line 289 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_object_it);
-#line 3168 "CollectionPage.c"
+#line 3204 "CollectionPage.c"
 	}
 }
 
@@ -3174,48 +3210,48 @@ static void collection_page_on_print (CollectionPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 308 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 314 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 309 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 3192 "CollectionPage.c"
+#line 3228 "CollectionPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 310 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 3219 "CollectionPage.c"
+#line 3255 "CollectionPage.c"
 	}
 }
 
@@ -3228,52 +3264,52 @@ static void collection_page_on_external_app_changed (CollectionPage* self) {
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	gint _tmp5_ = 0;
-#line 315 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 321 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 316 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_count = _tmp3_;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = selected_count;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_ == 1) {
-#line 3250 "CollectionPage.c"
+#line 3286 "CollectionPage.c"
 		ConfigFacade* _tmp6_ = NULL;
 		ConfigFacade* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = config_facade_get_instance ();
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/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 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = _tmp8_;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = g_strcmp0 (_tmp9_, "") != 0;
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp9_);
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3269 "CollectionPage.c"
+#line 3305 "CollectionPage.c"
 	} else {
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = FALSE;
-#line 3273 "CollectionPage.c"
+#line 3309 "CollectionPage.c"
 	}
-#line 318 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp4_);
-#line 3277 "CollectionPage.c"
+#line 3313 "CollectionPage.c"
 }
 
 
@@ -3295,162 +3331,162 @@ static void collection_page_real_on_item_activated (CheckerboardPage* base, Chec
 	gchar* _tmp11_ = NULL;
 	gchar* _tmp12_ = NULL;
 	CheckerboardPageActivator _tmp13_ = 0;
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = item;
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_THUMBNAIL, Thumbnail));
-#line 329 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp1_;
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = thumbnail;
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = thumbnail_get_media_source (_tmp2_);
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = _tmp3_;
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_VIDEO);
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 334 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 335 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		media_page_on_play_video (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage));
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 336 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3329 "CollectionPage.c"
+#line 3365 "CollectionPage.c"
 	}
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = thumbnail;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = thumbnail_get_media_source (_tmp6_);
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp7_) : NULL;
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == NULL) {
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3341 "CollectionPage.c"
+#line 3377 "CollectionPage.c"
 	}
-#line 339 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 345 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp8_;
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = photo;
-#line 340 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_ == NULL) {
-#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 341 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3355 "CollectionPage.c"
+#line 3391 "CollectionPage.c"
 	}
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
-	g_debug ("CollectionPage.vala:344: activating %s", _tmp12_);
-#line 344 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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"
 	_g_free0 (_tmp12_);
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = activator;
-#line 346 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp13_ == CHECKERBOARD_PAGE_ACTIVATOR_MOUSE) {
-#line 3371 "CollectionPage.c"
+#line 3407 "CollectionPage.c"
 		CheckerboardPageKeyboardModifiers _tmp14_ = {0};
 		gboolean _tmp15_ = FALSE;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = *modifiers;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = _tmp14_.super_pressed;
-#line 347 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp15_) {
-#line 348 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 354 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			collection_page_on_external_edit (self);
-#line 3382 "CollectionPage.c"
+#line 3418 "CollectionPage.c"
 		} else {
 			LibraryWindow* _tmp16_ = NULL;
 			LibraryWindow* _tmp17_ = NULL;
 			LibraryPhoto* _tmp18_ = NULL;
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = library_window_get_app ();
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp16_;
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = photo;
-#line 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 356 "/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 350 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp17_);
-#line 3397 "CollectionPage.c"
+#line 3433 "CollectionPage.c"
 		}
 	} else {
 		CheckerboardPageActivator _tmp19_ = 0;
-#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = activator;
-#line 351 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp19_ == CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD) {
-#line 3405 "CollectionPage.c"
+#line 3441 "CollectionPage.c"
 			gboolean _tmp20_ = FALSE;
 			CheckerboardPageKeyboardModifiers _tmp21_ = {0};
 			gboolean _tmp22_ = FALSE;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = *modifiers;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_.shift_pressed;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!_tmp22_) {
-#line 3415 "CollectionPage.c"
+#line 3451 "CollectionPage.c"
 				CheckerboardPageKeyboardModifiers _tmp23_ = {0};
 				gboolean _tmp24_ = FALSE;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = *modifiers;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _tmp23_.ctrl_pressed;
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = !_tmp24_;
-#line 3424 "CollectionPage.c"
+#line 3460 "CollectionPage.c"
 			} else {
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = FALSE;
-#line 3428 "CollectionPage.c"
+#line 3464 "CollectionPage.c"
 			}
-#line 352 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 3432 "CollectionPage.c"
+#line 3468 "CollectionPage.c"
 				LibraryWindow* _tmp25_ = NULL;
 				LibraryWindow* _tmp26_ = NULL;
 				LibraryPhoto* _tmp27_ = NULL;
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = library_window_get_app ();
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = _tmp25_;
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp27_ = photo;
-#line 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/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 353 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp26_);
-#line 3446 "CollectionPage.c"
+#line 3482 "CollectionPage.c"
 			}
 		}
 	}
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 327 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 333 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 3454 "CollectionPage.c"
+#line 3490 "CollectionPage.c"
 }
 
 
@@ -3463,133 +3499,133 @@ static gboolean collection_page_real_on_app_key_pressed (Page* base, GdkEventKey
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label8 = 0;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	static GQuark _tmp4_label9 = 0;
-#line 3487 "CollectionPage.c"
+#line 3523 "CollectionPage.c"
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 357 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 358 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 364 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	handled = TRUE;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = event;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/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 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3510 "CollectionPage.c"
+#line 3546 "CollectionPage.c"
 			default:
 			{
 				GdkEventKey* _tmp6_ = NULL;
 				gboolean _tmp7_ = FALSE;
-#line 368 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp6_ = event;
-#line 368 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 374 "/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 369 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3521 "CollectionPage.c"
+#line 3557 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("bracketright")))) {
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3527 "CollectionPage.c"
+#line 3563 "CollectionPage.c"
 			default:
 			{
-#line 372 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 373 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 379 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3534 "CollectionPage.c"
+#line 3570 "CollectionPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("bracketleft")))) {
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3540 "CollectionPage.c"
+#line 3576 "CollectionPage.c"
 			default:
 			{
-#line 376 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 377 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3547 "CollectionPage.c"
+#line 3583 "CollectionPage.c"
 			}
 		}
 	} else {
-#line 359 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 365 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		switch (0) {
-#line 3553 "CollectionPage.c"
+#line 3589 "CollectionPage.c"
 			default:
 			{
-#line 380 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 386 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				handled = FALSE;
-#line 381 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3560 "CollectionPage.c"
+#line 3596 "CollectionPage.c"
 			}
 		}
 	}
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = handled;
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp9_) {
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = TRUE;
-#line 3570 "CollectionPage.c"
+#line 3606 "CollectionPage.c"
 	} else {
 		GdkEventKey* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = event;
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/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 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp11_;
-#line 3580 "CollectionPage.c"
+#line 3616 "CollectionPage.c"
 	}
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 384 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 390 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 3586 "CollectionPage.c"
+#line 3622 "CollectionPage.c"
 }
 
 
 static void _collection_page_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	collection_page_on_export_completed ((CollectionPage*) self);
-#line 3593 "CollectionPage.c"
+#line 3629 "CollectionPage.c"
 }
 
 
@@ -3645,233 +3681,233 @@ static void collection_page_real_on_export (MediaPage* base) {
 	ExporterUI* _tmp90_ = NULL;
 	ExporterUI* _tmp91_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->exporter;
-#line 388 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp0_ != NULL) {
-#line 389 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3657 "CollectionPage.c"
+#line 3693 "CollectionPage.c"
 	}
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 391 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_list = _tmp4_;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = export_list;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = gee_collection_get_size (_tmp5_);
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp7_ == 0) {
-#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 394 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3683 "CollectionPage.c"
+#line 3719 "CollectionPage.c"
 	}
-#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = collection_page_selection_has_photo (self);
-#line 396 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_photos = _tmp8_;
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = collection_page_selection_has_video (self);
-#line 397 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	has_some_videos = _tmp9_;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = has_some_photos;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_) {
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = TRUE;
-#line 3699 "CollectionPage.c"
+#line 3735 "CollectionPage.c"
 	} else {
 		gboolean _tmp12_ = FALSE;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = has_some_videos;
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp12_;
-#line 3706 "CollectionPage.c"
+#line 3742 "CollectionPage.c"
 	}
-#line 398 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_vala_assert (_tmp10_, "has_some_photos || has_some_videos");
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = has_some_photos;
-#line 402 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp13_) {
-#line 3714 "CollectionPage.c"
+#line 3750 "CollectionPage.c"
 		GeeCollection* _tmp14_ = NULL;
 		ExporterUI* _tmp15_ = NULL;
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = export_list;
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/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 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 403 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		self->priv->exporter = _tmp15_;
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 404 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3729 "CollectionPage.c"
+#line 3765 "CollectionPage.c"
 	}
-#line 407 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 413 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	title = NULL;
-#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = has_some_videos;
-#line 408 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 3737 "CollectionPage.c"
+#line 3773 "CollectionPage.c"
 		const gchar* _tmp17_ = NULL;
 		GeeCollection* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
 		gchar* _tmp23_ = NULL;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = export_list;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = gee_collection_get_size (_tmp18_);
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = _tmp19_;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp20_ == 1) {
-#line 3751 "CollectionPage.c"
+#line 3787 "CollectionPage.c"
 			const gchar* _tmp21_ = NULL;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = _ ("Export Photo/Video");
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp21_;
-#line 3757 "CollectionPage.c"
+#line 3793 "CollectionPage.c"
 		} else {
 			const gchar* _tmp22_ = NULL;
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _ ("Export Photos/Videos");
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _tmp22_;
-#line 3764 "CollectionPage.c"
+#line 3800 "CollectionPage.c"
 		}
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = g_strdup (_tmp17_);
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 409 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		title = _tmp23_;
-#line 3772 "CollectionPage.c"
+#line 3808 "CollectionPage.c"
 	} else {
 		const gchar* _tmp24_ = NULL;
 		GeeCollection* _tmp25_ = NULL;
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
 		gchar* _tmp30_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = export_list;
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp26_ = gee_collection_get_size (_tmp25_);
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp27_ = _tmp26_;
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp27_ == 1) {
-#line 3787 "CollectionPage.c"
+#line 3823 "CollectionPage.c"
 			const gchar* _tmp28_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp28_ = _ ("Export Photo");
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = _tmp28_;
-#line 3793 "CollectionPage.c"
+#line 3829 "CollectionPage.c"
 		} else {
 			const gchar* _tmp29_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp29_ = _ ("Export Photos");
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp24_ = _tmp29_;
-#line 3800 "CollectionPage.c"
+#line 3836 "CollectionPage.c"
 		}
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp30_ = g_strdup (_tmp24_);
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 411 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 417 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		title = _tmp30_;
-#line 3808 "CollectionPage.c"
+#line 3844 "CollectionPage.c"
 	}
-#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = title;
-#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = export_dialog_new (_tmp31_);
-#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp32_);
-#line 412 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_dialog = _tmp32_;
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = has_some_videos;
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp34_) {
-#line 3822 "CollectionPage.c"
+#line 3858 "CollectionPage.c"
 		ExportFormatParameters _tmp35_ = {0};
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		export_format_parameters_current (&_tmp35_);
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp33_ = _tmp35_;
-#line 3828 "CollectionPage.c"
+#line 3864 "CollectionPage.c"
 	} else {
 		ExportFormatParameters _tmp36_ = {0};
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		export_format_parameters_last (&_tmp36_);
-#line 423 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 429 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp33_ = _tmp36_;
-#line 3835 "CollectionPage.c"
+#line 3871 "CollectionPage.c"
 	}
-#line 422 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_params = _tmp33_;
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp37_ = export_dialog;
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp40_ = export_dialog_execute (_tmp37_, &_tmp38_, &_tmp39_, &export_params);
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scale = _tmp38_;
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	constraint = _tmp39_;
-#line 427 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (!_tmp40_) {
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 428 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 3857 "CollectionPage.c"
+#line 3893 "CollectionPage.c"
 	}
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp41_ = constraint;
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp42_ = scale;
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scaling_for_constraint (_tmp41_, _tmp42_, FALSE, &_tmp43_);
-#line 430 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	scaling = _tmp43_;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp44_ = export_list;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp45_ = gee_collection_get_size (_tmp44_);
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp46_ = _tmp45_;
-#line 433 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 439 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp46_ == 1) {
-#line 3875 "CollectionPage.c"
+#line 3911 "CollectionPage.c"
 		LibraryPhoto* photo = NULL;
 		GFile* save_as = NULL;
 		LibraryPhoto* _tmp55_ = NULL;
@@ -3881,22 +3917,22 @@ static void collection_page_real_on_export (MediaPage* base) {
 		GFile* _tmp59_ = NULL;
 		GFile* _tmp60_ = NULL;
 		GFile* _tmp61_ = NULL;
-#line 434 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo = NULL;
-#line 3887 "CollectionPage.c"
+#line 3923 "CollectionPage.c"
 		{
 			GeeIterator* _p_it = NULL;
 			GeeCollection* _tmp47_ = NULL;
 			GeeIterator* _tmp48_ = NULL;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp47_ = export_list;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp48_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GEE_TYPE_COLLECTION, GeeCollection), GEE_TYPE_ITERABLE, GeeIterable));
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_p_it = _tmp48_;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 3900 "CollectionPage.c"
+#line 3936 "CollectionPage.c"
 				GeeIterator* _tmp49_ = NULL;
 				gboolean _tmp50_ = FALSE;
 				LibraryPhoto* p = NULL;
@@ -3904,73 +3940,73 @@ static void collection_page_real_on_export (MediaPage* base) {
 				gpointer _tmp52_ = NULL;
 				LibraryPhoto* _tmp53_ = NULL;
 				LibraryPhoto* _tmp54_ = NULL;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp49_ = _p_it;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp50_ = gee_iterator_next (_tmp49_);
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (!_tmp50_) {
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 3916 "CollectionPage.c"
+#line 3952 "CollectionPage.c"
 				}
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp51_ = _p_it;
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp52_ = gee_iterator_get (_tmp51_);
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				p = (LibraryPhoto*) _tmp52_;
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp53_ = p;
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp54_ = _g_object_ref0 (_tmp53_);
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 436 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				photo = _tmp54_;
-#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (p);
-#line 437 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 3936 "CollectionPage.c"
+#line 3972 "CollectionPage.c"
 			}
-#line 435 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_p_it);
-#line 3940 "CollectionPage.c"
+#line 3976 "CollectionPage.c"
 		}
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp55_ = photo;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp56_ = export_params;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp57_ = photo_get_export_basename_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo), &_tmp56_);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp58_ = _tmp57_;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp59_ = export_ui_choose_file (_tmp58_);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp60_ = _tmp59_;
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp58_);
-#line 440 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		save_as = _tmp60_;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp61_ = save_as;
-#line 442 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp61_ == NULL) {
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 443 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 3974 "CollectionPage.c"
+#line 4010 "CollectionPage.c"
 		}
 		{
 			AppWindow* _tmp62_ = NULL;
@@ -3989,191 +4025,191 @@ static void collection_page_real_on_export (MediaPage* base) {
 			gboolean _tmp75_ = FALSE;
 			AppWindow* _tmp76_ = NULL;
 			AppWindow* _tmp77_ = NULL;
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp62_ = app_window_get_instance ();
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp63_ = _tmp62_;
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_PAGE_WINDOW, PageWindow));
-#line 446 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp63_);
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp64_ = photo;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp65_ = save_as;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp66_ = scaling;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp67_ = export_params;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp68_ = _tmp67_.quality;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp69_ = photo;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp70_ = export_params;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp71_ = photo_get_export_format_for_parameters (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, TYPE_PHOTO, Photo), &_tmp70_);
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp72_ = export_params;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp73_ = _tmp72_.mode;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp74_ = export_params;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp75_ = _tmp74_.export_metadata;
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo_export (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PHOTO, Photo), _tmp65_, &_tmp66_, _tmp68_, _tmp71_, _tmp73_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp75_, &_inner_error_);
-#line 447 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4029 "CollectionPage.c"
-				goto __catch232_g_error;
+#line 4065 "CollectionPage.c"
+				goto __catch233_g_error;
 			}
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp76_ = app_window_get_instance ();
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp77_ = _tmp76_;
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_PAGE_WINDOW, PageWindow));
-#line 450 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp77_);
-#line 4040 "CollectionPage.c"
+#line 4076 "CollectionPage.c"
 		}
-		goto __finally232;
-		__catch232_g_error:
+		goto __finally233;
+		__catch233_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp78_ = NULL;
 			AppWindow* _tmp79_ = NULL;
 			GFile* _tmp80_ = NULL;
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			err = _inner_error_;
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_inner_error_ = NULL;
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp78_ = app_window_get_instance ();
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp79_ = _tmp78_;
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, TYPE_PAGE_WINDOW, PageWindow));
-#line 452 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 458 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp79_);
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp80_ = save_as;
-#line 453 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 459 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			export_error_dialog (_tmp80_, FALSE);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_error_free0 (err);
-#line 4067 "CollectionPage.c"
+#line 4103 "CollectionPage.c"
 		}
-		__finally232:
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+		__finally233:
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (save_as);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_dialog);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_free0 (title);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (export_list);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/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 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_clear_error (&_inner_error_);
-#line 445 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 451 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4088 "CollectionPage.c"
+#line 4124 "CollectionPage.c"
 		}
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (save_as);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 456 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4102 "CollectionPage.c"
+#line 4138 "CollectionPage.c"
 	}
-#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp81_ = title;
-#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp82_ = export_ui_choose_dir (_tmp81_);
-#line 460 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	export_dir = _tmp82_;
-#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp83_ = export_dir;
-#line 461 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp83_ == NULL) {
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dir);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (title);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (export_list);
-#line 462 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4124 "CollectionPage.c"
+#line 4160 "CollectionPage.c"
 	}
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp84_ = export_list;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp85_ = export_dir;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp86_ = scaling;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp87_ = export_params;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp88_ = exporter_new (_tmp84_, _tmp85_, &_tmp86_, &_tmp87_, FALSE);
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp89_ = _tmp88_;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp90_ = exporter_ui_new (_tmp89_);
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = _tmp90_;
-#line 464 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp89_);
-#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp91_ = self->priv->exporter;
-#line 465 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 471 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	exporter_ui_export (_tmp91_, _collection_page_on_export_completed_exporter_completion_callback, self);
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dir);
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_free0 (title);
-#line 387 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 393 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (export_list);
-#line 4158 "CollectionPage.c"
+#line 4194 "CollectionPage.c"
 }
 
 
 static void collection_page_on_export_completed (CollectionPage* self) {
-#line 468 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 469 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self->priv->exporter = NULL;
-#line 4169 "CollectionPage.c"
+#line 4205 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 472 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4177 "CollectionPage.c"
+#line 4213 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -4185,31 +4221,31 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _source_index = 0;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4213 "CollectionPage.c"
+#line 4249 "CollectionPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -4222,107 +4258,107 @@ static gboolean collection_page_can_revert_selected (CollectionPage* self) {
 			LibraryPhoto* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_ = NULL;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4238 "CollectionPage.c"
+#line 4274 "CollectionPage.c"
 			}
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 474 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4258 "CollectionPage.c"
+#line 4294 "CollectionPage.c"
 				gboolean _tmp17_ = FALSE;
 				LibraryPhoto* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp19_ = photo_has_transformations (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (_tmp19_) {
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = TRUE;
-#line 4270 "CollectionPage.c"
+#line 4306 "CollectionPage.c"
 				} else {
 					LibraryPhoto* _tmp20_ = NULL;
 					gboolean _tmp21_ = FALSE;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp20_ = photo;
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp21_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					_tmp17_ = _tmp21_;
-#line 4280 "CollectionPage.c"
+#line 4316 "CollectionPage.c"
 				}
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp17_;
-#line 4284 "CollectionPage.c"
+#line 4320 "CollectionPage.c"
 			} else {
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4288 "CollectionPage.c"
+#line 4324 "CollectionPage.c"
 			}
-#line 475 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 481 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 476 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4302 "CollectionPage.c"
+#line 4338 "CollectionPage.c"
 			}
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4308 "CollectionPage.c"
+#line 4344 "CollectionPage.c"
 		}
-#line 473 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4312 "CollectionPage.c"
+#line 4348 "CollectionPage.c"
 	}
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 479 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4318 "CollectionPage.c"
+#line 4354 "CollectionPage.c"
 }
 
 
 static gboolean collection_page_can_revert_editable_selected (CollectionPage* self) {
 	gboolean result = FALSE;
-#line 482 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 488 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_val_if_fail (IS_COLLECTION_PAGE (self), FALSE);
-#line 4326 "CollectionPage.c"
+#line 4362 "CollectionPage.c"
 	{
 		GeeList* _source_list = NULL;
 		ViewCollection* _tmp0_ = NULL;
@@ -4334,31 +4370,31 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
 		gint _source_index = 0;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp0_;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp3_ = _tmp2_;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp1_);
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_list = _tmp3_;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _source_list;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_size = _tmp6_;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_source_index = -1;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 4362 "CollectionPage.c"
+#line 4398 "CollectionPage.c"
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
@@ -4371,82 +4407,82 @@ static gboolean collection_page_can_revert_editable_selected (CollectionPage* se
 			LibraryPhoto* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
 			LibraryPhoto* _tmp16_ = NULL;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp7_ = _source_index;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_source_index = _tmp7_ + 1;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp8_ = _source_index;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp9_ = _source_size;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp8_ < _tmp9_)) {
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 4387 "CollectionPage.c"
+#line 4423 "CollectionPage.c"
 			}
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp10_ = _source_list;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _source_index;
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = gee_list_get (_tmp10_, _tmp11_);
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			source = (DataSource*) _tmp12_;
-#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = source;
-#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp13_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp13_) : NULL);
-#line 484 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 490 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			photo = _tmp14_;
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photo;
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp16_ != NULL) {
-#line 4407 "CollectionPage.c"
+#line 4443 "CollectionPage.c"
 				LibraryPhoto* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp17_ = photo;
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp18_ = photo_has_editable (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = _tmp18_;
-#line 4416 "CollectionPage.c"
+#line 4452 "CollectionPage.c"
 			} else {
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp15_ = FALSE;
-#line 4420 "CollectionPage.c"
+#line 4456 "CollectionPage.c"
 			}
-#line 485 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 491 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp15_) {
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				result = TRUE;
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (photo);
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (source);
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_source_list);
-#line 486 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				return result;
-#line 4434 "CollectionPage.c"
+#line 4470 "CollectionPage.c"
 			}
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (photo);
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (source);
-#line 4440 "CollectionPage.c"
+#line 4476 "CollectionPage.c"
 		}
-#line 483 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_source_list);
-#line 4444 "CollectionPage.c"
+#line 4480 "CollectionPage.c"
 	}
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = FALSE;
-#line 489 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 4450 "CollectionPage.c"
+#line 4486 "CollectionPage.c"
 }
 
 
@@ -4467,59 +4503,59 @@ static void collection_page_on_rotate_clockwise (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 493 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 494 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 500 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4487 "CollectionPage.c"
+#line 4523 "CollectionPage.c"
 	}
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Rotating");
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Rotate");
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP, _tmp8_, _tmp9_);
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 496 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 499 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 505 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 492 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 498 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4523 "CollectionPage.c"
+#line 4559 "CollectionPage.c"
 }
 
 
@@ -4528,40 +4564,40 @@ static void collection_page_on_publish (CollectionPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 502 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 503 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 4546 "CollectionPage.c"
+#line 4582 "CollectionPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
 		GeeCollection* _tmp7_ = NULL;
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		publishing_ui_publishing_dialog_go (_tmp7_);
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 504 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 4565 "CollectionPage.c"
+#line 4601 "CollectionPage.c"
 	}
 }
 
@@ -4583,59 +4619,59 @@ static void collection_page_on_rotate_counterclockwise (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 514 "/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 515 "/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 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 509 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 510 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4603 "CollectionPage.c"
+#line 4639 "CollectionPage.c"
 	}
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Rotating");
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Rotate");
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP, _tmp8_, _tmp9_);
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 512 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 515 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 521 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 508 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4639 "CollectionPage.c"
+#line 4675 "CollectionPage.c"
 }
 
 
@@ -4656,59 +4692,59 @@ static void collection_page_on_flip_horizontally (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 519 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 520 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 526 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4676 "CollectionPage.c"
+#line 4712 "CollectionPage.c"
 	}
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Flipping Horizontally");
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Flip Horizontally");
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "", _tmp8_, _tmp9_);
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 522 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 525 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 531 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 518 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 524 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4712 "CollectionPage.c"
+#line 4748 "CollectionPage.c"
 }
 
 
@@ -4729,59 +4765,59 @@ static void collection_page_on_flip_vertically (CollectionPage* self) {
 	CommandManager* _tmp12_ = NULL;
 	CommandManager* _tmp13_ = NULL;
 	RotateMultipleCommand* _tmp14_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 529 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 530 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 536 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4749 "CollectionPage.c"
+#line 4785 "CollectionPage.c"
 	}
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _ ("Flipping Vertically");
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _ ("Undoing Flip Vertically");
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = rotate_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable), ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "", _tmp8_, _tmp9_);
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 532 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp11_;
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = command;
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_COMMAND, Command));
-#line 535 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 541 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp13_);
-#line 528 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 534 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4785 "CollectionPage.c"
+#line 4821 "CollectionPage.c"
 }
 
 
@@ -4801,29 +4837,29 @@ static void collection_page_on_revert (CollectionPage* self) {
 	CommandManager* _tmp33_ = NULL;
 	CommandManager* _tmp34_ = NULL;
 	RevertMultipleCommand* _tmp35_ = NULL;
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 539 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 540 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 546 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 4821 "CollectionPage.c"
+#line 4857 "CollectionPage.c"
 	}
-#line 542 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = collection_page_can_revert_editable_selected (self);
-#line 542 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp4_) {
-#line 4827 "CollectionPage.c"
+#line 4863 "CollectionPage.c"
 		AppWindow* _tmp5_ = NULL;
 		AppWindow* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
@@ -4832,33 +4868,33 @@ static void collection_page_on_revert (CollectionPage* self) {
 		GeeCollection* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = _tmp5_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _tmp7_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = view_collection_get_selected_sources (_tmp8_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp10_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = !_tmp11_;
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 543 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp12_) {
-#line 545 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			return;
-#line 4862 "CollectionPage.c"
+#line 4898 "CollectionPage.c"
 		}
 		{
 			GeeList* _object_list = NULL;
@@ -4871,31 +4907,31 @@ static void collection_page_on_revert (CollectionPage* self) {
 			gint _tmp18_ = 0;
 			gint _tmp19_ = 0;
 			gint _object_index = 0;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _tmp13_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = view_collection_get_selected_sources (_tmp14_);
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = _tmp15_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_data_collection_unref0 (_tmp14_);
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_list = _tmp16_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = _object_list;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_size = _tmp19_;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_object_index = -1;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			while (TRUE) {
-#line 4899 "CollectionPage.c"
+#line 4935 "CollectionPage.c"
 				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
@@ -4904,72 +4940,72 @@ static void collection_page_on_revert (CollectionPage* self) {
 				gint _tmp24_ = 0;
 				gpointer _tmp25_ = NULL;
 				DataObject* _tmp26_ = NULL;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp20_ = _object_index;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_object_index = _tmp20_ + 1;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp21_ = _object_index;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp22_ = _object_size;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				if (!(_tmp21_ < _tmp22_)) {
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 					break;
-#line 4920 "CollectionPage.c"
+#line 4956 "CollectionPage.c"
 				}
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp23_ = _object_list;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp24_ = _object_index;
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp25_ = gee_list_get (_tmp23_, _tmp24_);
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				object = G_TYPE_CHECK_INSTANCE_CAST ((DataSource*) _tmp25_, TYPE_DATA_OBJECT, DataObject);
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp26_ = object;
-#line 549 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 555 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				photo_revert_to_master (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_PHOTO, Photo), TRUE);
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (object);
-#line 4936 "CollectionPage.c"
+#line 4972 "CollectionPage.c"
 			}
-#line 548 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_object_list);
-#line 4940 "CollectionPage.c"
+#line 4976 "CollectionPage.c"
 		}
 	}
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = _tmp27_;
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = view_collection_get_selected (_tmp28_);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = _tmp29_;
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = revert_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = _tmp31_;
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp30_);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp28_);
-#line 552 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp32_;
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = command;
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_COMMAND, Command));
-#line 553 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp34_);
-#line 538 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 544 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 4973 "CollectionPage.c"
+#line 5009 "CollectionPage.c"
 }
 
 
@@ -4988,57 +5024,57 @@ void collection_page_on_copy_adjustments (CollectionPage* self) {
 	Photo* _tmp10_ = NULL;
 	PixelTransformationBundle* _tmp11_ = NULL;
 	PixelTransformationBundle* _tmp12_ = NULL;
-#line 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 557 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 558 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5008 "CollectionPage.c"
+#line 5044 "CollectionPage.c"
 	}
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 559 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_color_adjustments (_tmp10_);
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = _tmp11_;
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	pixel_transformation_bundle_set_copied_color_adjustments (_tmp12_);
-#line 560 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (_tmp12_);
-#line 561 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#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 556 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 562 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5042 "CollectionPage.c"
+#line 5078 "CollectionPage.c"
 }
 
 
@@ -5061,78 +5097,78 @@ void collection_page_on_paste_adjustments (CollectionPage* self) {
 	CommandManager* _tmp14_ = NULL;
 	CommandManager* _tmp15_ = NULL;
 	AdjustColorsMultipleCommand* _tmp16_ = NULL;
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = pixel_transformation_bundle_get_copied_color_adjustments ();
-#line 565 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	copied_adjustments = _tmp0_;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_ == 0;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp5_) {
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = TRUE;
-#line 5085 "CollectionPage.c"
+#line 5121 "CollectionPage.c"
 	} else {
 		PixelTransformationBundle* _tmp6_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = copied_adjustments;
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp1_ = _tmp6_ == NULL;
-#line 5092 "CollectionPage.c"
+#line 5128 "CollectionPage.c"
 	}
-#line 566 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 572 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp1_) {
-#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 567 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 573 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5100 "CollectionPage.c"
+#line 5136 "CollectionPage.c"
 	}
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = view_collection_get_selected (_tmp8_);
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = _tmp9_;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = copied_adjustments;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/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 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp13_ = _tmp12_;
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 569 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp13_;
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp14_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _tmp14_;
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp16_ = command;
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 571 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp15_);
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 564 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 570 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 5136 "CollectionPage.c"
+#line 5172 "CollectionPage.c"
 }
 
 
@@ -5151,55 +5187,55 @@ static void collection_page_on_enhance (CollectionPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	EnhanceMultipleCommand* _tmp12_ = NULL;
-#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 575 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 576 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5171 "CollectionPage.c"
+#line 5207 "CollectionPage.c"
 	}
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = enhance_multiple_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 578 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 579 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 585 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 574 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5203 "CollectionPage.c"
+#line 5239 "CollectionPage.c"
 }
 
 
@@ -5218,55 +5254,55 @@ static void collection_page_on_duplicate_photo (CollectionPage* self) {
 	CommandManager* _tmp10_ = NULL;
 	CommandManager* _tmp11_ = NULL;
 	DuplicateMultiplePhotosCommand* _tmp12_ = NULL;
-#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 583 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 584 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5238 "CollectionPage.c"
+#line 5274 "CollectionPage.c"
 	}
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = duplicate_multiple_photos_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = _tmp8_;
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 586 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command = _tmp9_;
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = _tmp10_;
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp12_ = command;
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 594 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_command_manager_unref0 (_tmp11_);
-#line 582 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 588 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (command);
-#line 5270 "CollectionPage.c"
+#line 5306 "CollectionPage.c"
 }
 
 
@@ -5301,29 +5337,29 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 	gboolean _tmp37_ = FALSE;
 	gboolean _tmp38_ = FALSE;
 	gboolean _tmp39_ = FALSE;
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 592 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 593 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5321 "CollectionPage.c"
+#line 5357 "CollectionPage.c"
 	}
-#line 595 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 601 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	selected_has_videos = FALSE;
-#line 596 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	only_videos_selected = TRUE;
-#line 5327 "CollectionPage.c"
+#line 5363 "CollectionPage.c"
 	{
 		GeeList* _dv_list = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -5335,31 +5371,31 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
 		gint _dv_index = 0;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = _tmp4_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp7_ = _tmp6_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_list = _tmp7_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp8_ = _dv_list;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_size = _tmp10_;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_dv_index = -1;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		while (TRUE) {
-#line 5363 "CollectionPage.c"
+#line 5399 "CollectionPage.c"
 			gint _tmp11_ = 0;
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
@@ -5371,109 +5407,109 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 			DataSource* _tmp18_ = NULL;
 			DataSource* _tmp19_ = NULL;
 			gboolean _tmp20_ = FALSE;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp11_ = _dv_index;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_dv_index = _tmp11_ + 1;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp12_ = _dv_index;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp13_ = _dv_size;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (!(_tmp12_ < _tmp13_)) {
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				break;
-#line 5387 "CollectionPage.c"
+#line 5423 "CollectionPage.c"
 			}
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = _dv_list;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _dv_index;
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = gee_list_get (_tmp14_, _tmp15_);
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dv = (DataView*) _tmp16_;
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp17_ = dv;
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = data_view_get_source (_tmp17_);
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = _tmp18_;
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_VIDEO);
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 599 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp20_) {
-#line 600 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				selected_has_videos = TRUE;
-#line 5411 "CollectionPage.c"
+#line 5447 "CollectionPage.c"
 			} else {
-#line 602 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 608 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				only_videos_selected = FALSE;
-#line 5415 "CollectionPage.c"
+#line 5451 "CollectionPage.c"
 			}
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dv);
-#line 5419 "CollectionPage.c"
+#line 5455 "CollectionPage.c"
 		}
-#line 598 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 604 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_dv_list);
-#line 5423 "CollectionPage.c"
+#line 5459 "CollectionPage.c"
 	}
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = view_collection_get_selected_at (_tmp22_, 0);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = _tmp23_;
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = data_view_get_source (_tmp24_);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATEABLE, Dateable);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp24_);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 605 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo_source = _tmp26_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = photo_source;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = _tmp28_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = view_collection_get_selected_count (_tmp29_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = selected_has_videos;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = only_videos_selected;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = adjust_date_time_dialog_new (_tmp27_, _tmp30_, TRUE, _tmp31_, _tmp32_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp33_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 607 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	dialog = _tmp34_;
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = dialog;
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp39_ = adjust_date_time_dialog_execute (_tmp35_, &_tmp36_, &_tmp37_, &_tmp38_);
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	time_shift = _tmp36_;
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	keep_relativity = _tmp37_;
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	modify_originals = _tmp38_;
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp39_) {
-#line 5477 "CollectionPage.c"
+#line 5513 "CollectionPage.c"
 		AdjustDateTimePhotosCommand* command = NULL;
 		ViewCollection* _tmp40_ = NULL;
 		ViewCollection* _tmp41_ = NULL;
@@ -5487,49 +5523,49 @@ static void collection_page_on_adjust_date_time (CollectionPage* self) {
 		CommandManager* _tmp49_ = NULL;
 		CommandManager* _tmp50_ = NULL;
 		AdjustDateTimePhotosCommand* _tmp51_ = NULL;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp41_ = _tmp40_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp42_ = view_collection_get_selected (_tmp41_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp43_ = _tmp42_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp44_ = time_shift;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp45_ = keep_relativity;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp46_ = modify_originals;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/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 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp48_ = _tmp47_;
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp43_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp41_);
-#line 613 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command = _tmp48_;
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp49_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp50_ = _tmp49_;
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp51_ = command;
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		command_manager_execute (_tmp50_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command));
-#line 615 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_command_manager_unref0 (_tmp50_);
-#line 612 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (command);
-#line 5527 "CollectionPage.c"
+#line 5563 "CollectionPage.c"
 	}
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (dialog);
-#line 591 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo_source);
-#line 5533 "CollectionPage.c"
+#line 5569 "CollectionPage.c"
 }
 
 
@@ -5546,122 +5582,122 @@ static void collection_page_on_external_edit (CollectionPage* self) {
 	DataSource* _tmp8_ = NULL;
 	Photo* _tmp9_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 620 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 621 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5566 "CollectionPage.c"
+#line 5602 "CollectionPage.c"
 	}
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 623 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 5586 "CollectionPage.c"
+#line 5622 "CollectionPage.c"
 	{
 		AppWindow* _tmp10_ = NULL;
 		AppWindow* _tmp11_ = NULL;
 		Photo* _tmp12_ = NULL;
 		AppWindow* _tmp13_ = NULL;
 		AppWindow* _tmp14_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = app_window_get_instance ();
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = _tmp10_;
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PAGE_WINDOW, PageWindow));
-#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = photo;
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_external_editor (_tmp12_, &_inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 632 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5607 "CollectionPage.c"
-			goto __catch233_g_error;
+#line 5643 "CollectionPage.c"
+			goto __catch234_g_error;
 		}
-#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = app_window_get_instance ();
-#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = _tmp13_;
-#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PAGE_WINDOW, PageWindow));
-#line 627 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 5618 "CollectionPage.c"
+#line 5654 "CollectionPage.c"
 	}
-	goto __finally233;
-	__catch233_g_error:
+	goto __finally234;
+	__catch234_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp15_ = NULL;
 		AppWindow* _tmp16_ = NULL;
 		GError* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 629 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = err;
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = photo;
-#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		open_external_editor_error_dialog (_tmp17_, _tmp18_);
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5648 "CollectionPage.c"
+#line 5684 "CollectionPage.c"
 	}
-	__finally233:
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	__finally234:
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/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 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 624 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5661 "CollectionPage.c"
+#line 5697 "CollectionPage.c"
 	}
-#line 619 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5665 "CollectionPage.c"
+#line 5701 "CollectionPage.c"
 }
 
 
@@ -5680,53 +5716,53 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 	Photo* _tmp10_ = NULL;
 	PhotoFileFormat _tmp11_ = 0;
 	GError * _inner_error_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 635 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 641 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 636 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5700 "CollectionPage.c"
+#line 5736 "CollectionPage.c"
 	}
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = _tmp4_;
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = view_collection_get_selected_at (_tmp5_, 0);
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = _tmp6_;
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = data_view_get_source (_tmp7_);
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo);
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 638 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp9_;
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp10_ = photo;
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp11_ = photo_get_master_file_format (_tmp10_);
-#line 639 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp11_ != PHOTO_FILE_FORMAT_RAW) {
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5730 "CollectionPage.c"
+#line 5766 "CollectionPage.c"
 	}
 	{
 		AppWindow* _tmp12_ = NULL;
@@ -5734,35 +5770,35 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		Photo* _tmp14_ = NULL;
 		AppWindow* _tmp15_ = NULL;
 		AppWindow* _tmp16_ = NULL;
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = app_window_get_instance ();
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
-#line 643 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = photo;
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		photo_open_with_raw_external_editor (_tmp14_, &_inner_error_);
-#line 644 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5752 "CollectionPage.c"
-			goto __catch234_g_error;
+#line 5788 "CollectionPage.c"
+			goto __catch235_g_error;
 		}
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp15_ = app_window_get_instance ();
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp15_;
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PAGE_WINDOW, PageWindow));
-#line 645 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 651 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 5763 "CollectionPage.c"
+#line 5799 "CollectionPage.c"
 	}
-	goto __finally234;
-	__catch234_g_error:
+	goto __finally235;
+	__catch235_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp17_ = NULL;
@@ -5770,48 +5806,48 @@ static void collection_page_on_external_edit_raw (CollectionPage* self) {
 		GError* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		err = _inner_error_;
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_inner_error_ = NULL;
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp17_ = app_window_get_instance ();
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = _tmp17_;
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PAGE_WINDOW, PageWindow));
-#line 647 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = err;
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = resources_launch_editor_failed (_tmp19_);
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp21_ = _tmp20_;
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		app_window_error_message (_tmp21_, NULL);
-#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_free0 (_tmp21_);
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_error_free0 (err);
-#line 5798 "CollectionPage.c"
+#line 5834 "CollectionPage.c"
 	}
-	__finally234:
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+	__finally235:
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/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 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_clear_error (&_inner_error_);
-#line 642 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 5811 "CollectionPage.c"
+#line 5847 "CollectionPage.c"
 	}
-#line 634 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 5815 "CollectionPage.c"
+#line 5851 "CollectionPage.c"
 }
 
 
@@ -5828,60 +5864,60 @@ void collection_page_on_set_background (CollectionPage* self) {
 	GeeArrayList* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
 	gint _tmp8_ = 0;
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 653 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photos = _tmp0_;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _tmp1_;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = photos;
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/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 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 654 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = photos;
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_;
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_ == 1) {
-#line 5862 "CollectionPage.c"
+#line 5898 "CollectionPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp9_ = NULL;
 		SetBackgroundPhotoDialog* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		gboolean _tmp12_ = FALSE;
 		gboolean _tmp13_ = FALSE;
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = set_background_photo_dialog_new ();
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		g_object_ref_sink (_tmp9_);
-#line 659 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		dialog = _tmp9_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = dialog;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = set_background_photo_dialog_execute (_tmp10_, &_tmp11_, &_tmp12_);
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		desktop = _tmp11_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		screensaver = _tmp12_;
-#line 660 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp13_) {
-#line 5885 "CollectionPage.c"
+#line 5921 "CollectionPage.c"
 			AppWindow* _tmp14_ = NULL;
 			AppWindow* _tmp15_ = NULL;
 			GeeArrayList* _tmp16_ = NULL;
@@ -5891,54 +5927,54 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp20_ = FALSE;
 			AppWindow* _tmp21_ = NULL;
 			AppWindow* _tmp22_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp14_ = app_window_get_instance ();
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp15_ = _tmp14_;
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_PAGE_WINDOW, PageWindow));
-#line 661 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp15_);
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp16_ = photos;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/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 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp18_ = (LibraryPhoto*) _tmp17_;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp19_ = desktop;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp20_ = screensaver;
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop_integration_set_background (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo), _tmp19_, _tmp20_);
-#line 662 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp18_);
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp21_ = app_window_get_instance ();
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp22_ = _tmp21_;
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_PAGE_WINDOW, PageWindow));
-#line 663 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (_tmp22_);
-#line 5925 "CollectionPage.c"
+#line 5961 "CollectionPage.c"
 		}
-#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (dialog);
-#line 5929 "CollectionPage.c"
+#line 5965 "CollectionPage.c"
 	} else {
 		GeeArrayList* _tmp23_ = NULL;
 		gint _tmp24_ = 0;
 		gint _tmp25_ = 0;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp23_ = photos;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp24_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp25_ = _tmp24_;
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		if (_tmp25_ > 1) {
-#line 5942 "CollectionPage.c"
+#line 5978 "CollectionPage.c"
 			SetBackgroundSlideshowDialog* dialog = NULL;
 			SetBackgroundSlideshowDialog* _tmp26_ = NULL;
 			gint delay = 0;
@@ -5947,25 +5983,25 @@ void collection_page_on_set_background (CollectionPage* self) {
 			gboolean _tmp29_ = FALSE;
 			gboolean _tmp30_ = FALSE;
 			gboolean _tmp31_ = FALSE;
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp26_ = set_background_slideshow_dialog_new ();
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			g_object_ref_sink (_tmp26_);
-#line 666 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			dialog = _tmp26_;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp27_ = dialog;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_tmp31_ = set_background_slideshow_dialog_execute (_tmp27_, &_tmp28_, &_tmp29_, &_tmp30_);
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			delay = _tmp28_;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			desktop = _tmp29_;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			screensaver = _tmp30_;
-#line 668 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			if (_tmp31_) {
-#line 5969 "CollectionPage.c"
+#line 6005 "CollectionPage.c"
 				AppWindow* _tmp32_ = NULL;
 				AppWindow* _tmp33_ = NULL;
 				GeeArrayList* _tmp34_ = NULL;
@@ -5974,42 +6010,42 @@ void collection_page_on_set_background (CollectionPage* self) {
 				gboolean _tmp37_ = FALSE;
 				AppWindow* _tmp38_ = NULL;
 				AppWindow* _tmp39_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp32_ = app_window_get_instance ();
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp33_ = _tmp32_;
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PAGE_WINDOW, PageWindow));
-#line 669 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp34_ = photos;
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp35_ = delay;
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp36_ = desktop;
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp37_ = screensaver;
-#line 670 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 676 "/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 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp38_ = app_window_get_instance ();
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_tmp39_ = _tmp38_;
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PAGE_WINDOW, PageWindow));
-#line 672 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 				_g_object_unref0 (_tmp39_);
-#line 6004 "CollectionPage.c"
+#line 6040 "CollectionPage.c"
 			}
-#line 665 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 			_g_object_unref0 (dialog);
-#line 6008 "CollectionPage.c"
+#line 6044 "CollectionPage.c"
 		}
 	}
-#line 652 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 658 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photos);
-#line 6013 "CollectionPage.c"
+#line 6049 "CollectionPage.c"
 }
 
 
@@ -6049,205 +6085,205 @@ static void collection_page_on_slideshow (CollectionPage* self) {
 	LibraryPhoto* _tmp38_ = NULL;
 	SlideshowPage* _tmp39_ = NULL;
 	SlideshowPage* _tmp40_ = NULL;
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (self));
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _tmp0_;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 678 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_) {
-#line 679 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6069 "CollectionPage.c"
+#line 6105 "CollectionPage.c"
 	}
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp6_ = _tmp5_;
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = view_collection_get_selected_count (_tmp6_);
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = _tmp7_ > 0;
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp8_) {
-#line 6083 "CollectionPage.c"
+#line 6119 "CollectionPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
 		GeeList* _tmp11_ = NULL;
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp10_ = _tmp9_;
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp11_ = view_collection_get_selected_sources_of_type (_tmp10_, TYPE_LIBRARY_PHOTO);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp11_;
-#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 6099 "CollectionPage.c"
+#line 6135 "CollectionPage.c"
 	} else {
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
 		GeeList* _tmp14_ = NULL;
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp13_ = _tmp12_;
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp14_ = view_collection_get_sources_of_type (_tmp13_, TYPE_LIBRARY_PHOTO);
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = _tmp14_;
-#line 684 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_data_collection_unref0 (_tmp13_);
-#line 6116 "CollectionPage.c"
+#line 6152 "CollectionPage.c"
 	}
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp15_ = _g_object_ref0 (_tmp4_);
-#line 682 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	sources = _tmp15_;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp17_ = sources;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp17_ == NULL) {
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = TRUE;
-#line 6128 "CollectionPage.c"
+#line 6164 "CollectionPage.c"
 	} else {
 		GeeList* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp18_ = sources;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp20_ = _tmp19_;
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp16_ = _tmp20_ == 0;
-#line 6141 "CollectionPage.c"
+#line 6177 "CollectionPage.c"
 	}
-#line 685 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 691 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp16_) {
-#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 686 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6151 "CollectionPage.c"
+#line 6187 "CollectionPage.c"
 	}
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp22_ = _tmp21_;
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp23_ = sources;
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp24_ = gee_list_get (_tmp23_, 0);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp25_ = (DataSource*) _tmp24_;
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp26_ = view_collection_get_view_for_source (_tmp22_, _tmp25_);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_THUMBNAIL, Thumbnail);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp25_);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 688 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	thumbnail = _tmp27_;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp28_ = thumbnail;
-#line 689 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 695 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp28_ == NULL) {
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 690 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6185 "CollectionPage.c"
+#line 6221 "CollectionPage.c"
 	}
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp29_ = thumbnail;
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp30_ = thumbnail_get_media_source (_tmp29_);
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp31_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp30_) : NULL;
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp31_ == NULL) {
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp30_);
-#line 6197 "CollectionPage.c"
+#line 6233 "CollectionPage.c"
 	}
-#line 692 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	photo = _tmp31_;
-#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp32_ = photo;
-#line 693 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 699 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp32_ == NULL) {
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (photo);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (thumbnail);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (sources);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 694 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		return;
-#line 6215 "CollectionPage.c"
+#line 6251 "CollectionPage.c"
 	}
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp33_ = app_window_get_instance ();
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp34_ = _tmp33_;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp35_ = library_photo_global;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp36_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp37_ = _tmp36_;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp38_ = photo;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/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 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	g_object_ref_sink (_tmp39_);
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp40_ = _tmp39_;
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	app_window_go_fullscreen (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PAGE, Page));
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp40_);
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_data_collection_unref0 (_tmp37_);
-#line 696 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp34_);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (photo);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (thumbnail);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (sources);
-#line 677 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 683 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 6251 "CollectionPage.c"
+#line 6287 "CollectionPage.c"
 }
 
 
@@ -6261,49 +6297,49 @@ static gboolean collection_page_real_on_ctrl_pressed (Page* base, GdkEventKey* e
 	GtkToolButton* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 700 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, gtk_tool_button_get_type ()) ? ((GtkToolButton*) _tmp1_) : NULL);
-#line 701 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 702 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6279 "CollectionPage.c"
+#line 6315 "CollectionPage.c"
 		GtkToolButton* _tmp4_ = NULL;
 		GtkToolButton* _tmp5_ = NULL;
 		GtkToolButton* _tmp6_ = NULL;
-#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 703 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 709 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_actionable_set_action_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GTK_TYPE_ACTIONABLE, GtkActionable), "win.RotateCounterclockwise");
-#line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = rotate_button;
-#line 704 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 710 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-left");
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = rotate_button;
-#line 705 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 6295 "CollectionPage.c"
+#line 6331 "CollectionPage.c"
 	}
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp8_ = PAGE_CLASS (collection_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_PAGE, MediaPage), TYPE_PAGE, Page), _tmp7_);
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 708 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6307 "CollectionPage.c"
+#line 6343 "CollectionPage.c"
 }
 
 
@@ -6317,56 +6353,56 @@ static gboolean collection_page_real_on_ctrl_released (Page* base, GdkEventKey*
 	GtkToolButton* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 711 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = gtk_builder_get_object (_tmp0_, "ToolRotate");
-#line 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/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 712 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	rotate_button = _tmp2_;
-#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp3_ = rotate_button;
-#line 713 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6335 "CollectionPage.c"
+#line 6371 "CollectionPage.c"
 		GtkToolButton* _tmp4_ = NULL;
 		GtkToolButton* _tmp5_ = NULL;
 		GtkToolButton* _tmp6_ = NULL;
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 720 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp4_ = rotate_button;
-#line 714 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 720 "/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 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp5_ = rotate_button;
-#line 715 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		gtk_tool_button_set_icon_name (_tmp5_, "object-rotate-right");
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 		_tmp6_ = rotate_button;
-#line 716 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 722 "/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 6351 "CollectionPage.c"
+#line 6387 "CollectionPage.c"
 	}
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp7_ = event;
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 725 "/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 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp8_;
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_g_object_unref0 (rotate_button);
-#line 719 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6363 "CollectionPage.c"
+#line 6399 "CollectionPage.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
-#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 6370 "CollectionPage.c"
+#line 6406 "CollectionPage.c"
 }
 
 
@@ -6375,17 +6411,17 @@ static SearchViewFilter* collection_page_real_get_search_view_filter (Checkerboa
 	SearchViewFilter* result = NULL;
 	CollectionPageCollectionSearchViewFilter* _tmp0_ = NULL;
 	SearchViewFilter* _tmp1_ = NULL;
-#line 722 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 728 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_COLLECTION_PAGE, CollectionPage);
-#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp0_ = self->priv->search_filter;
-#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	_tmp1_ = _view_filter_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
-#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	result = _tmp1_;
-#line 723 "/home/jens/Source/shotwell/src/CollectionPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	return result;
-#line 6389 "CollectionPage.c"
+#line 6425 "CollectionPage.c"
 }
 
 
@@ -6398,7 +6434,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 6402 "CollectionPage.c"
+#line 6438 "CollectionPage.c"
 }
 
 
@@ -6408,14 +6444,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 6412 "CollectionPage.c"
+#line 6448 "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 6419 "CollectionPage.c"
+#line 6455 "CollectionPage.c"
 }
 
 
@@ -6424,7 +6460,7 @@ static void collection_page_collection_search_view_filter_class_init (Collection
 	collection_page_collection_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 22 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = collection_page_collection_search_view_filter_real_get_criteria;
-#line 6428 "CollectionPage.c"
+#line 6464 "CollectionPage.c"
 }
 
 
@@ -6477,7 +6513,7 @@ static void collection_page_class_init (CollectionPageClass * klass) {
 	((CheckerboardPageClass *) klass)->get_search_view_filter = collection_page_real_get_search_view_filter;
 #line 19 "/home/jens/Source/shotwell/src/CollectionPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = collection_page_finalize;
-#line 6481 "CollectionPage.c"
+#line 6517 "CollectionPage.c"
 }
 
 
@@ -6491,7 +6527,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 6495 "CollectionPage.c"
+#line 6531 "CollectionPage.c"
 }
 
 
@@ -6505,7 +6541,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 6509 "CollectionPage.c"
+#line 6545 "CollectionPage.c"
 }
 
 
diff --git a/src/CollectionPage.vala b/src/CollectionPage.vala
index df39f64..3434b13 100644
--- a/src/CollectionPage.vala
+++ b/src/CollectionPage.vala
@@ -63,6 +63,12 @@ public abstract class CollectionPage : MediaPage {
             MediaPage.ZoomSliderAssembly zoom_slider_assembly = create_zoom_slider_assembly();
             connect_slider(zoom_slider_assembly);
             get_toolbar().insert(zoom_slider_assembly, -1);
+
+            Gtk.ToolButton? rotate_button = this.builder.get_object ("ToolRotate") as Gtk.ToolButton;
+            unowned Gtk.BindingSet binding_set = Gtk.BindingSet.by_class(rotate_button.get_class());
+            Gtk.BindingEntry.add_signal(binding_set, Gdk.Key.KP_Space, Gdk.ModifierType.CONTROL_MASK, "clicked", 0);
+            Gtk.BindingEntry.add_signal(binding_set, Gdk.Key.space, Gdk.ModifierType.CONTROL_MASK, "clicked", 0);
+
         }
         
         return toolbar;
diff --git a/src/Commands.c b/src/Commands.c
index 704c577..e07a9de 100644
--- a/src/Commands.c
+++ b/src/Commands.c
@@ -5446,7 +5446,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 #line 448 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5449 "Commands.c"
-				goto __catch454_database_error;
+				goto __catch455_database_error;
 			}
 			{
 				AppWindow* _tmp7_ = NULL;
@@ -5470,8 +5470,8 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 #line 5471 "Commands.c"
 		}
 	}
-	goto __finally454;
-	__catch454_database_error:
+	goto __finally455;
+	__catch455_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -5487,7 +5487,7 @@ static void multiple_data_source_at_once_command_real_execute (Command* base) {
 		_g_error_free0 (err);
 #line 5489 "Commands.c"
 	}
-	__finally454:
+	__finally455:
 	{
 		AppWindow* _tmp10_ = NULL;
 		AppWindow* _tmp11_ = NULL;
@@ -5583,7 +5583,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 #line 468 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5586 "Commands.c"
-				goto __catch455_database_error;
+				goto __catch456_database_error;
 			}
 			{
 				AppWindow* _tmp7_ = NULL;
@@ -5607,8 +5607,8 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 #line 5608 "Commands.c"
 		}
 	}
-	goto __finally455;
-	__catch455_database_error:
+	goto __finally456;
+	__catch456_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -5624,7 +5624,7 @@ static void multiple_data_source_at_once_command_real_undo (Command* base) {
 		_g_error_free0 (err);
 #line 5626 "Commands.c"
 	}
-	__finally455:
+	__finally456:
 	{
 		AppWindow* _tmp10_ = NULL;
 		AppWindow* _tmp11_ = NULL;
@@ -10094,7 +10094,7 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 #line 1118 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10097 "Commands.c"
-			goto __catch456_g_error;
+			goto __catch457_g_error;
 		}
 #line 1119 "/home/jens/Source/shotwell/src/Commands.vala"
 		_tmp3_ = self->priv->dupes;
@@ -10104,8 +10104,8 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		_g_object_unref0 (dupe);
 #line 10106 "Commands.c"
 	}
-	goto __finally456;
-	__catch456_g_error:
+	goto __finally457;
+	__catch457_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp4_ = NULL;
@@ -10145,7 +10145,7 @@ static void duplicate_multiple_photos_command_real_execute_on_source (MultipleDa
 		_g_error_free0 (err);
 #line 10147 "Commands.c"
 	}
-	__finally456:
+	__finally457:
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1117 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -11543,11 +11543,11 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 #line 1345 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 11546 "Commands.c"
-				goto __catch457_g_error;
+				goto __catch458_g_error;
 			}
 		}
-		goto __finally457;
-		__catch457_g_error:
+		goto __finally458;
+		__catch458_g_error:
 		{
 			GError* err = NULL;
 			const gchar* _tmp5_ = NULL;
@@ -11563,7 +11563,7 @@ static void adjust_date_time_photo_command_set_time (AdjustDateTimePhotoCommand*
 			_g_error_free0 (err);
 #line 11565 "Commands.c"
 		}
-		__finally457:
+		__finally458:
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1344 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -12149,11 +12149,11 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 #line 1435 "/home/jens/Source/shotwell/src/Commands.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12152 "Commands.c"
-				goto __catch458_g_error;
+				goto __catch459_g_error;
 			}
 		}
-		goto __finally458;
-		__catch458_g_error:
+		goto __finally459;
+		__catch459_g_error:
 		{
 			GError* err = NULL;
 			GeeArrayList* _tmp5_ = NULL;
@@ -12172,7 +12172,7 @@ static void adjust_date_time_photos_command_set_time (AdjustDateTimePhotosComman
 			_g_error_free0 (err);
 #line 12174 "Commands.c"
 		}
-		__finally458:
+		__finally459:
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1434 "/home/jens/Source/shotwell/src/Commands.vala"
@@ -14608,7 +14608,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 14611 "Commands.c"
-				goto __catch459_g_regex_error;
+				goto __catch460_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -14633,7 +14633,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 14636 "Commands.c"
-				goto __catch459_g_regex_error;
+				goto __catch460_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -14659,8 +14659,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 14661 "Commands.c"
 	}
-	goto __finally459;
-	__catch459_g_regex_error:
+	goto __finally460;
+	__catch460_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -14673,7 +14673,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 14675 "Commands.c"
 	}
-	__finally459:
+	__finally460:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/src/Debug.c b/src/Debug.c
index 3edfcd9..0b2c7f4 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 __catch431_g_error;
+					goto __catch432_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 __finally431;
-		__catch431_g_error:
+		goto __finally432;
+		__catch432_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp20_ = NULL;
@@ -250,7 +250,7 @@ void debug_init (const gchar* app_version_prefix) {
 			_g_error_free0 (err);
 #line 252 "Debug.c"
 		}
-		__finally431:
+		__finally432:
 #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 0c25115..2edfc90 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 __catch564_g_error;
+			goto __catch566_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 __finally564;
-	__catch564_g_error:
+	goto __finally566;
+	__catch566_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp23_ = NULL;
@@ -1226,7 +1226,7 @@ void desktop_integration_files_send_to (GFile** files, int files_length1) {
 		_g_error_free0 (err);
 #line 1228 "DesktopIntegration.c"
 	}
-	__finally564:
+	__finally566:
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -1568,11 +1568,11 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 #line 172 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1571 "DesktopIntegration.c"
-			goto __catch565_g_error;
+			goto __catch567_g_error;
 		}
 	}
-	goto __finally565;
-	__catch565_g_error:
+	goto __finally567;
+	__catch567_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp27_ = NULL;
@@ -1617,7 +1617,7 @@ void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolea
 		return;
 #line 1619 "DesktopIntegration.c"
 	}
-	__finally565:
+	__finally567:
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 171 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2588,11 +2588,11 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 #line 278 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2591 "DesktopIntegration.c"
-			goto __catch566_g_error;
+			goto __catch568_g_error;
 		}
 	}
-	goto __finally566;
-	__catch566_g_error:
+	goto __finally568;
+	__catch568_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp8_ = NULL;
@@ -2612,7 +2612,7 @@ void desktop_integration_set_background_slideshow (GeeCollection* photos, gdoubl
 		_g_error_free0 (err);
 #line 2613 "DesktopIntegration.c"
 	}
-	__finally566:
+	__finally568:
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 277 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
@@ -2747,7 +2747,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 304 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2749 "DesktopIntegration.c"
-			goto __catch567_g_error;
+			goto __catch569_g_error;
 		}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp10_ = exporter;
@@ -2789,7 +2789,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 307 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 						file_collection = (_vala_array_free (file_collection, file_collection_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 2791 "DesktopIntegration.c"
-						goto __catch567_g_error;
+						goto __catch569_g_error;
 					}
 #line 306 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 					_g_object_unref0 (file);
@@ -2809,7 +2809,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2811 "DesktopIntegration.c"
-			goto __catch567_g_error;
+			goto __catch569_g_error;
 		}
 #line 309 "/home/jens/Source/shotwell/src/DesktopIntegration.vala"
 		_tmp19_ = _tmp16_;
@@ -2823,8 +2823,8 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		_g_object_unref0 (_tmp16_);
 #line 2824 "DesktopIntegration.c"
 	}
-	goto __finally567;
-	__catch567_g_error:
+	goto __finally569;
+	__catch569_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp20_ = NULL;
@@ -2860,7 +2860,7 @@ void desktop_integration_on_desktop_slideshow_exported (Exporter* exporter, gboo
 		return;
 #line 2861 "DesktopIntegration.c"
 	}
-	__finally567:
+	__finally569:
 #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 fdd6e47..6ebebf4 100644
--- a/src/Dialogs.c
+++ b/src/Dialogs.c
@@ -8921,7 +8921,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 #line 925 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8909 "Dialogs.c"
-				goto __catch423_g_error;
+				goto __catch424_g_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp18_ = outstream;
@@ -8940,7 +8940,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 #line 926 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
 #line 8928 "Dialogs.c"
-				goto __catch423_g_error;
+				goto __catch424_g_error;
 			}
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_tmp22_ = outstream;
@@ -8951,14 +8951,14 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 #line 927 "/home/jens/Source/shotwell/src/Dialogs.vala"
 				_g_object_unref0 (outstream);
 #line 8939 "Dialogs.c"
-				goto __catch423_g_error;
+				goto __catch424_g_error;
 			}
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (outstream);
 #line 8944 "Dialogs.c"
 		}
-		goto __finally423;
-		__catch423_g_error:
+		goto __finally424;
+		__catch424_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp23_ = NULL;
@@ -8988,7 +8988,7 @@ void import_ui_save_import_results (GtkWindow* chooser_dialog_parent, const gcha
 			_g_error_free0 (err);
 #line 8975 "Dialogs.c"
 		}
-		__finally423:
+		__finally424:
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 924 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -14259,7 +14259,7 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 14247 "Dialogs.c"
-			goto __catch424_g_error;
+			goto __catch425_g_error;
 		}
 #line 1753 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp116_ = _tmp113_;
@@ -14273,8 +14273,8 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		_g_object_unref0 (_tmp113_);
 #line 14260 "Dialogs.c"
 	}
-	goto __finally424;
-	__catch424_g_error:
+	goto __finally425;
+	__catch425_g_error:
 	{
 		GError* err = NULL;
 		Dateable* _tmp117_ = NULL;
@@ -14298,7 +14298,7 @@ AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Date
 		_g_error_free0 (err);
 #line 14285 "Dialogs.c"
 	}
-	__finally424:
+	__finally425:
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1750 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17580,7 +17580,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 #line 2255 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 17566 "Dialogs.c"
-			goto __catch425_g_error;
+			goto __catch426_g_error;
 		}
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp8_ = syspics_child_enum;
@@ -17593,7 +17593,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			_g_object_unref0 (syspics_child_enum);
 #line 17579 "Dialogs.c"
-			goto __catch425_g_error;
+			goto __catch426_g_error;
 		}
 #line 2257 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		_tmp10_ = _tmp7_;
@@ -17617,8 +17617,8 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		return result;
 #line 17602 "Dialogs.c"
 	}
-	goto __finally425;
-	__catch425_g_error:
+	goto __finally426;
+	__catch426_g_error:
 	{
 		GError* e = NULL;
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -17635,7 +17635,7 @@ static gboolean welcome_dialog_is_system_pictures_import_possible (void) {
 		return result;
 #line 17620 "Dialogs.c"
 	}
-	__finally425:
+	__finally426:
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	_g_object_unref0 (system_pictures);
 #line 2254 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18527,11 +18527,11 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 #line 2401 "/home/jens/Source/shotwell/src/Dialogs.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 18513 "Dialogs.c"
-			goto __catch426_g_error;
+			goto __catch427_g_error;
 		}
 	}
-	goto __finally426;
-	__catch426_g_error:
+	goto __finally427;
+	__catch427_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
@@ -18550,7 +18550,7 @@ static gboolean preferences_dialog_on_local_pattern_help (PreferencesDialog* sel
 		_g_error_free0 (e);
 #line 18535 "Dialogs.c"
 	}
-	__finally426:
+	__finally427:
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2400 "/home/jens/Source/shotwell/src/Dialogs.vala"
@@ -18791,7 +18791,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 18777 "Dialogs.c"
-						goto __catch427_g_error;
+						goto __catch428_g_error;
 					}
 #line 2438 "/home/jens/Source/shotwell/src/Dialogs.vala"
 					_tmp37_ = combo_store;
@@ -18843,7 +18843,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 #line 2442 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 18829 "Dialogs.c"
-							goto __catch427_g_error;
+							goto __catch428_g_error;
 						}
 #line 2446 "/home/jens/Source/shotwell/src/Dialogs.vala"
 						_tmp48_ = combo_store;
@@ -18865,8 +18865,8 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 					}
 				}
 			}
-			goto __finally427;
-			__catch427_g_error:
+			goto __finally428;
+			__catch428_g_error:
 			{
 				GError* _error_ = NULL;
 				GError* _tmp52_ = NULL;
@@ -18893,7 +18893,7 @@ static void preferences_dialog_populate_app_combo_box (PreferencesDialog* self,
 				_g_error_free0 (_error_);
 #line 18878 "Dialogs.c"
 			}
-			__finally427:
+			__finally428:
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2436 "/home/jens/Source/shotwell/src/Dialogs.vala"
diff --git a/src/DirectoryMonitor.c b/src/DirectoryMonitor.c
index b99f323..2762dfe 100644
--- a/src/DirectoryMonitor.c
+++ b/src/DirectoryMonitor.c
@@ -3785,7 +3785,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 3784 "DirectoryMonitor.c"
-				goto __catch479_g_error;
+				goto __catch480_g_error;
 			}
 #line 857 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->_tmp15_ = NULL;
@@ -3801,8 +3801,8 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			_g_object_unref0 (_data_->_tmp11_);
 #line 3799 "DirectoryMonitor.c"
 		}
-		goto __finally479;
-		__catch479_g_error:
+		goto __finally480;
+		__catch480_g_error:
 		{
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 			_data_->err = _data_->_inner_error_;
@@ -3858,7 +3858,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 			return FALSE;
 #line 3856 "DirectoryMonitor.c"
 		}
-		__finally479:
+		__finally480:
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 856 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4089,7 +4089,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 905 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 4088 "DirectoryMonitor.c"
-			goto __catch480_g_error;
+			goto __catch481_g_error;
 		}
 		{
 #line 907 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -4129,7 +4129,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 #line 908 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 					_g_object_unref0 (_data_->enumerator);
 #line 4128 "DirectoryMonitor.c"
-					goto __catch480_g_error;
+					goto __catch481_g_error;
 				}
 #line 910 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 				_data_->_tmp55_ = NULL;
@@ -4371,8 +4371,8 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 		_g_object_unref0 (_data_->enumerator);
 #line 4369 "DirectoryMonitor.c"
 	}
-	goto __finally480;
-	__catch480_g_error:
+	goto __finally481;
+	__catch481_g_error:
 	{
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_data_->err2 = _data_->_inner_error_;
@@ -4432,7 +4432,7 @@ static gboolean directory_monitor_explore_async_co (DirectoryMonitorExploreAsync
 		return FALSE;
 #line 4430 "DirectoryMonitor.c"
 	}
-	__finally480:
+	__finally481:
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 904 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -5058,7 +5058,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 #line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5057 "DirectoryMonitor.c"
-			goto __catch481_g_error;
+			goto __catch482_g_error;
 		}
 #line 1022 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp12_ = _tmp9_;
@@ -5072,8 +5072,8 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		_g_object_unref0 (_tmp9_);
 #line 5070 "DirectoryMonitor.c"
 	}
-	goto __finally481;
-	__catch481_g_error:
+	goto __finally482;
+	__catch482_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp13_ = NULL;
@@ -5111,7 +5111,7 @@ static gboolean directory_monitor_add_monitor (DirectoryMonitor* self, GFile* di
 		return result;
 #line 5109 "DirectoryMonitor.c"
 	}
-	__finally481:
+	__finally482:
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1021 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -7557,7 +7557,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7554 "DirectoryMonitor.c"
-			goto __catch482_g_error;
+			goto __catch483_g_error;
 		}
 #line 111 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp5_ = _tmp2_;
@@ -7571,8 +7571,8 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_g_object_unref0 (_tmp2_);
 #line 7567 "DirectoryMonitor.c"
 	}
-	goto __finally482;
-	__catch482_g_error:
+	goto __finally483;
+	__catch483_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -7593,7 +7593,7 @@ static void directory_monitor_query_info_queue_element_on_completed (DirectoryMo
 		_g_error_free0 (err);
 #line 7589 "DirectoryMonitor.c"
 	}
-	__finally482:
+	__finally483:
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 110 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
@@ -8696,7 +8696,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8693 "DirectoryMonitor.c"
-			goto __catch483_g_error;
+			goto __catch484_g_error;
 		}
 #line 259 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 		_tmp7_ = _tmp3_;
@@ -8710,8 +8710,8 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		_g_object_unref0 (_tmp3_);
 #line 8706 "DirectoryMonitor.c"
 	}
-	goto __finally483;
-	__catch483_g_error:
+	goto __finally484;
+	__catch484_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp8_ = NULL;
@@ -8747,7 +8747,7 @@ static GFileInfo* directory_monitor_file_info_map_query_info (DirectoryMonitorFi
 		return result;
 #line 8743 "DirectoryMonitor.c"
 	}
-	__finally483:
+	__finally484:
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 258 "/home/jens/Source/shotwell/src/DirectoryMonitor.vala"
diff --git a/src/Event.c b/src/Event.c
index 3544857..af882ab 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -3752,7 +3752,7 @@ Event* event_create_empty_event (MediaSource* source) {
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3755 "Event.c"
-				goto __catch434_database_error;
+				goto __catch435_database_error;
 			}
 #line 476 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3790,8 +3790,8 @@ Event* event_create_empty_event (MediaSource* source) {
 		return result;
 #line 3792 "Event.c"
 	}
-	goto __finally434;
-	__catch434_database_error:
+	goto __finally435;
+	__catch435_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp14_ = NULL;
@@ -3811,7 +3811,7 @@ Event* event_create_empty_event (MediaSource* source) {
 		return result;
 #line 3813 "Event.c"
 	}
-	__finally434:
+	__finally435:
 #line 475 "/home/jens/Source/shotwell/src/Event.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 475 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4020,11 +4020,11 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 #line 526 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4023 "Event.c"
-			goto __catch435_g_error;
+			goto __catch436_g_error;
 		}
 	}
-	goto __finally435;
-	__catch435_g_error:
+	goto __finally436;
+	__catch436_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -4051,7 +4051,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		_g_error_free0 (err);
 #line 4053 "Event.c"
 	}
-	__finally435:
+	__finally436:
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 525 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4081,11 +4081,11 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 #line 532 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4084 "Event.c"
-			goto __catch436_g_error;
+			goto __catch437_g_error;
 		}
 	}
-	goto __finally436;
-	__catch436_g_error:
+	goto __finally437;
+	__catch437_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
@@ -4112,7 +4112,7 @@ static void event_real_break_link_many (ContainerSource* base, GeeCollection* so
 		_g_error_free0 (err);
 #line 4114 "Event.c"
 	}
-	__finally436:
+	__finally437:
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 531 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4198,11 +4198,11 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 #line 556 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4201 "Event.c"
-			goto __catch437_g_error;
+			goto __catch438_g_error;
 		}
 	}
-	goto __finally437;
-	__catch437_g_error:
+	goto __finally438;
+	__catch438_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -4229,7 +4229,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		_g_error_free0 (err);
 #line 4231 "Event.c"
 	}
-	__finally437:
+	__finally438:
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 555 "/home/jens/Source/shotwell/src/Event.vala"
@@ -4259,11 +4259,11 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 #line 562 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4262 "Event.c"
-			goto __catch438_g_error;
+			goto __catch439_g_error;
 		}
 	}
-	goto __finally438;
-	__catch438_g_error:
+	goto __finally439;
+	__catch439_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
@@ -4290,7 +4290,7 @@ static void event_real_establish_link_many (ContainerSource* base, GeeCollection
 		_g_error_free0 (err);
 #line 4292 "Event.c"
 	}
-	__finally438:
+	__finally439:
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 561 "/home/jens/Source/shotwell/src/Event.vala"
@@ -5324,7 +5324,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5326 "Event.c"
-				goto __catch439_database_error;
+				goto __catch440_database_error;
 			}
 #line 658 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5381,8 +5381,8 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		return result;
 #line 5382 "Event.c"
 	}
-	goto __finally439;
-	__catch439_database_error:
+	goto __finally440;
+	__catch440_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp49_ = NULL;
@@ -5398,7 +5398,7 @@ static Event* event_generate_event (MediaSource* media, ViewCollection* events_s
 		_g_error_free0 (err);
 #line 5399 "Event.c"
 	}
-	__finally439:
+	__finally440:
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 657 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6904,7 +6904,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6906 "Event.c"
-			goto __catch440_g_error;
+			goto __catch441_g_error;
 		}
 #line 903 "/home/jens/Source/shotwell/src/Event.vala"
 		_tmp6_ = _tmp0_;
@@ -6918,8 +6918,8 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 		return result;
 #line 6919 "Event.c"
 	}
-	goto __finally440;
-	__catch440_g_error:
+	goto __finally441;
+	__catch441_g_error:
 	{
 		GError* err = NULL;
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6934,7 +6934,7 @@ GdkPixbuf* event_get_preview_pixbuf (Event* self, Scaling* scaling) {
 		return result;
 #line 6935 "Event.c"
 	}
-	__finally440:
+	__finally441:
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 902 "/home/jens/Source/shotwell/src/Event.vala"
@@ -6976,7 +6976,7 @@ static void event_real_destroy (DataSource* base) {
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6978 "Event.c"
-				goto __catch441_database_error;
+				goto __catch442_database_error;
 			}
 #line 915 "/home/jens/Source/shotwell/src/Event.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6987,8 +6987,8 @@ static void event_real_destroy (DataSource* base) {
 #line 6987 "Event.c"
 		}
 	}
-	goto __finally441;
-	__catch441_database_error:
+	goto __finally442;
+	__catch442_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7004,7 +7004,7 @@ static void event_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 7005 "Event.c"
 	}
-	__finally441:
+	__finally442:
 #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 3f7a625..bc4c3b1 100644
--- a/src/Exporter.c
+++ b/src/Exporter.c
@@ -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 __catch477_g_error;
+						goto __catch478_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 __finally477;
-				__catch477_g_error:
+				goto __finally478;
+				__catch478_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp44_ = NULL;
@@ -1556,7 +1556,7 @@ static gboolean exporter_process_queue (Exporter* self) {
 					break;
 #line 1558 "Exporter.c"
 				}
-				__finally477:
+				__finally478:
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 228 "/home/jens/Source/shotwell/src/Exporter.vala"
@@ -2054,7 +2054,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 #line 97 "/home/jens/Source/shotwell/src/Exporter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2057 "Exporter.c"
-				goto __catch478_g_error;
+				goto __catch479_g_error;
 			}
 		} else {
 			MediaSource* _tmp9_ = NULL;
@@ -2074,13 +2074,13 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 #line 99 "/home/jens/Source/shotwell/src/Exporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2077 "Exporter.c"
-					goto __catch478_g_error;
+					goto __catch479_g_error;
 				}
 			}
 		}
 	}
-	goto __finally478;
-	__catch478_g_error:
+	goto __finally479;
+	__catch479_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_ = NULL;
@@ -2101,7 +2101,7 @@ static void exporter_export_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2103 "Exporter.c"
 	}
-	__finally478:
+	__finally479:
 #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 48f84e9..12b77b8 100644
--- a/src/LibraryFiles.c
+++ b/src/LibraryFiles.c
@@ -282,11 +282,11 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 #line 30 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 285 "LibraryFiles.c"
-			goto __catch461_g_error;
+			goto __catch462_g_error;
 		}
 	}
-	goto __finally461;
-	__catch461_g_error:
+	goto __finally462;
+	__catch462_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_ = NULL;
@@ -310,13 +310,13 @@ GFile* library_files_generate_unique_file (const gchar* basename, MediaMetadata*
 #line 33 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_error_free0 (err);
 #line 313 "LibraryFiles.c"
-			goto __finally461;
+			goto __finally462;
 		}
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_g_error_free0 (err);
 #line 318 "LibraryFiles.c"
 	}
-	__finally461:
+	__finally462:
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 29 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -441,14 +441,14 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 444 "LibraryFiles.c"
-			goto __catch462_g_error;
+			goto __catch463_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		timestamp = _tmp0_;
 #line 449 "LibraryFiles.c"
 	}
-	goto __finally462;
-	__catch462_g_error:
+	goto __finally463;
+	__catch463_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp3_ = NULL;
@@ -478,7 +478,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_error_free0 (err);
 #line 480 "LibraryFiles.c"
 	}
-	__finally462:
+	__finally463:
 #line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 49 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -520,7 +520,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 523 "LibraryFiles.c"
-				goto __catch463_g_error;
+				goto __catch464_g_error;
 			}
 #line 59 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp15_ = _tmp12_;
@@ -534,8 +534,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_media_metadata_unref0 (_tmp12_);
 #line 536 "LibraryFiles.c"
 		}
-		goto __finally463;
-		__catch463_g_error:
+		goto __finally464;
+		__catch464_g_error:
 		{
 			GError* err = NULL;
 #line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -546,7 +546,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_g_error_free0 (err);
 #line 548 "LibraryFiles.c"
 		}
-		__finally463:
+		__finally464:
 #line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 58 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -604,7 +604,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 607 "LibraryFiles.c"
-				goto __catch464_g_error;
+				goto __catch465_g_error;
 			}
 #line 67 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp26_ = _tmp23_;
@@ -618,8 +618,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_media_metadata_unref0 (_tmp23_);
 #line 620 "LibraryFiles.c"
 		}
-		goto __finally464;
-		__catch464_g_error:
+		goto __finally465;
+		__catch465_g_error:
 		{
 			GError* err = NULL;
 #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -630,7 +630,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 			_g_error_free0 (err);
 #line 632 "LibraryFiles.c"
 		}
-		__finally464:
+		__finally465:
 #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 66 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -728,7 +728,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 82 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 731 "LibraryFiles.c"
-			goto __catch465_g_error;
+			goto __catch466_g_error;
 		}
 #line 83 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp42_ = blacklist;
@@ -743,8 +743,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 744 "LibraryFiles.c"
 		}
 	}
-	goto __finally465;
-	__catch465_g_error:
+	goto __finally466;
+	__catch466_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp44_ = NULL;
@@ -798,7 +798,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
 #line 801 "LibraryFiles.c"
-				goto __finally465;
+				goto __finally466;
 			}
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp55_ = dest;
@@ -813,7 +813,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 				_g_error_free0 (err);
 #line 816 "LibraryFiles.c"
-				goto __finally465;
+				goto __finally466;
 			}
 #line 87 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_tmp57_ = _tmp51_;
@@ -857,7 +857,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_error_free0 (err);
 #line 859 "LibraryFiles.c"
 	}
-	__finally465:
+	__finally466:
 #line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 81 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
@@ -890,7 +890,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 93 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 893 "LibraryFiles.c"
-			goto __catch466_g_error;
+			goto __catch467_g_error;
 		}
 #line 94 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		_tmp64_ = info;
@@ -911,7 +911,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 #line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 			_g_object_unref0 (info);
 #line 914 "LibraryFiles.c"
-			goto __catch466_g_error;
+			goto __catch467_g_error;
 		}
 #line 95 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 		if (!_tmp66_) {
@@ -923,8 +923,8 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_object_unref0 (info);
 #line 925 "LibraryFiles.c"
 	}
-	goto __finally466;
-	__catch466_g_error:
+	goto __finally467;
+	__catch467_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp70_ = NULL;
@@ -943,7 +943,7 @@ GFile* library_files_duplicate (GFile* src, GFileProgressCallback progress_callb
 		_g_error_free0 (err);
 #line 945 "LibraryFiles.c"
 	}
-	__finally466:
+	__finally467:
 #line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 92 "/home/jens/Source/shotwell/src/LibraryFiles.vala"
diff --git a/src/LibraryMonitor.c b/src/LibraryMonitor.c
index ea83be6..8f36753 100644
--- a/src/LibraryMonitor.c
+++ b/src/LibraryMonitor.c
@@ -4123,7 +4123,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 4126 "LibraryMonitor.c"
-							goto __catch484_g_error;
+							goto __catch485_g_error;
 						}
 #line 509 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->_tmp31_ = NULL;
@@ -4139,8 +4139,8 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_g_object_unref0 (_data_->_tmp27_);
 #line 4141 "LibraryMonitor.c"
 					}
-					goto __finally484;
-					__catch484_g_error:
+					goto __finally485;
+					__catch485_g_error:
 					{
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 						_data_->err = _data_->_inner_error_;
@@ -4150,7 +4150,7 @@ static gboolean library_monitor_verify_monitorable_co (LibraryMonitorVerifyMonit
 						_g_error_free0 (_data_->err);
 #line 4152 "LibraryMonitor.c"
 					}
-					__finally484:
+					__finally485:
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 					if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 508 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5384,7 +5384,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5387 "LibraryMonitor.c"
-					goto __catch485_database_error;
+					goto __catch486_database_error;
 				}
 #line 700 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 				_g_object_unref0 (to_tombstone);
@@ -5397,8 +5397,8 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 #line 5398 "LibraryMonitor.c"
 			}
 		}
-		goto __finally485;
-		__catch485_database_error:
+		goto __finally486;
+		__catch486_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp58_ = NULL;
@@ -5414,7 +5414,7 @@ static void library_monitor_on_import_complete (LibraryMonitor* self, BatchImpor
 			_g_error_free0 (err);
 #line 5416 "LibraryMonitor.c"
 		}
-		__finally485:
+		__finally486:
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 699 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5502,7 +5502,7 @@ void library_monitor_blacklist_file (GFile* file, const gchar* reason) {
 			gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp8_);
 #line 5504 "LibraryMonitor.c"
 		}
-		__finally486:
+		__finally487:
 		{
 			GeeHashSet* _tmp9_ = NULL;
 #line 727 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5582,7 +5582,7 @@ void library_monitor_unblacklist_file (GFile* file) {
 #line 5583 "LibraryMonitor.c"
 			}
 		}
-		__finally487:
+		__finally488:
 		{
 			GeeHashSet* _tmp10_ = NULL;
 #line 735 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5632,7 +5632,7 @@ static void library_monitor_on_unblacklist_file (GFile* file) {
 			removed = _tmp3_;
 #line 5634 "LibraryMonitor.c"
 		}
-		__finally488:
+		__finally489:
 		{
 			GeeHashSet* _tmp4_ = NULL;
 #line 743 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -5734,7 +5734,7 @@ gboolean library_monitor_is_blacklisted (GFile* file) {
 			return result;
 #line 5736 "LibraryMonitor.c"
 		}
-		__finally489:
+		__finally490:
 		{
 			GeeHashSet* _tmp5_ = NULL;
 #line 754 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -7858,7 +7858,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7860 "LibraryMonitor.c"
-			goto __catch490_g_error;
+			goto __catch491_g_error;
 		}
 #line 133 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp18_ = _tmp15_;
@@ -7872,8 +7872,8 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		_g_free0 (_tmp15_);
 #line 7873 "LibraryMonitor.c"
 	}
-	goto __finally490;
-	__catch490_g_error:
+	goto __finally491;
+	__catch491_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
@@ -7900,7 +7900,7 @@ static void library_monitor_find_move_job_real_execute (BackgroundJob* base) {
 		return;
 #line 7901 "LibraryMonitor.c"
 	}
-	__finally490:
+	__finally491:
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 132 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
@@ -8212,7 +8212,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8213 "LibraryMonitor.c"
-			goto __catch491_g_error;
+			goto __catch492_g_error;
 		}
 #line 179 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 		_tmp3_ = _tmp0_;
@@ -8226,8 +8226,8 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		_g_free0 (_tmp0_);
 #line 8226 "LibraryMonitor.c"
 	}
-	goto __finally491;
-	__catch491_g_error:
+	goto __finally492;
+	__catch492_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8252,7 +8252,7 @@ static void library_monitor_runtime_find_move_job_real_execute (BackgroundJob* b
 		return;
 #line 8252 "LibraryMonitor.c"
 	}
-	__finally491:
+	__finally492:
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/LibraryMonitor.vala"
diff --git a/src/MediaDataRepresentation.c b/src/MediaDataRepresentation.c
index 30783d9..f122b3e 100644
--- a/src/MediaDataRepresentation.c
+++ b/src/MediaDataRepresentation.c
@@ -2081,14 +2081,14 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2084 "MediaDataRepresentation.c"
-			goto __catch559_g_error;
+			goto __catch561_g_error;
 		}
 #line 102 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		ret = _tmp1_;
 #line 2089 "MediaDataRepresentation.c"
 	}
-	goto __finally559;
-	__catch559_g_error:
+	goto __finally561;
+	__catch561_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp4_ = NULL;
@@ -2119,7 +2119,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 		_g_error_free0 (err);
 #line 2120 "MediaDataRepresentation.c"
 	}
-	__finally559:
+	__finally561:
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 101 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2239,7 +2239,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2241 "MediaDataRepresentation.c"
-					goto __catch560_g_error;
+					goto __catch562_g_error;
 				}
 #line 119 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (!_tmp29_) {
@@ -2248,8 +2248,8 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 2248 "MediaDataRepresentation.c"
 				}
 			}
-			goto __finally560;
-			__catch560_g_error:
+			goto __finally562;
+			__catch562_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp32_ = NULL;
@@ -2281,7 +2281,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				break;
 #line 2282 "MediaDataRepresentation.c"
 			}
-			__finally560:
+			__finally562:
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 118 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -2308,7 +2308,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 #line 128 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2310 "MediaDataRepresentation.c"
-					goto __catch561_g_error;
+					goto __catch563_g_error;
 				}
 #line 129 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_tmp38_ = parent;
@@ -2322,8 +2322,8 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				_g_free0 (_tmp40_);
 #line 2323 "MediaDataRepresentation.c"
 			}
-			goto __finally561;
-			__catch561_g_error:
+			goto __finally563;
+			__catch563_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp41_ = NULL;
@@ -2354,7 +2354,7 @@ gboolean media_source_delete_original_file (MediaSource* self) {
 				_g_error_free0 (err);
 #line 2354 "MediaDataRepresentation.c"
 			}
-			__finally561:
+			__finally563:
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 127 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6399,7 +6399,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6400 "MediaDataRepresentation.c"
-					goto __catch562_database_error;
+					goto __catch564_database_error;
 				}
 #line 704 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				_aggregate_progress_monitor_unref0 (agg_monitor);
@@ -6422,8 +6422,8 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 #line 6421 "MediaDataRepresentation.c"
 			}
 		}
-		goto __finally562;
-		__catch562_database_error:
+		goto __finally564;
+		__catch564_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp78_ = NULL;
@@ -6439,7 +6439,7 @@ void media_source_collection_remove_from_app (MediaSourceCollection* self, GeeCo
 			_g_error_free0 (err);
 #line 6439 "MediaDataRepresentation.c"
 		}
-		__finally562:
+		__finally564:
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 703 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
@@ -6564,11 +6564,11 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 #line 721 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6565 "MediaDataRepresentation.c"
-					goto __catch563_g_error;
+					goto __catch565_g_error;
 				}
 			}
-			goto __finally563;
-			__catch563_g_error:
+			goto __finally565;
+			__catch565_g_error:
 			{
 				GError* err = NULL;
 				GFile* _tmp12_ = NULL;
@@ -6598,7 +6598,7 @@ void media_source_collection_delete_backing_files (MediaSourceCollection* self,
 				_g_error_free0 (err);
 #line 6598 "MediaDataRepresentation.c"
 			}
-			__finally563:
+			__finally565:
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 720 "/home/jens/Source/shotwell/src/MediaDataRepresentation.vala"
diff --git a/src/MediaInterfaces.c b/src/MediaInterfaces.c
index c81acbf..a755c56 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 __catch570_g_error;
+					goto __catch572_g_error;
 				}
 			}
-			goto __finally570;
-			__catch570_g_error:
+			goto __finally572;
+			__catch572_g_error:
 			{
 				GError* err = NULL;
 				gint _tmp3_ = 0;
@@ -344,7 +344,7 @@ void transaction_controller_begin (TransactionController* self) {
 				_g_error_free0 (err);
 #line 346 "MediaInterfaces.c"
 			}
-			__finally570:
+			__finally572:
 #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"
 			}
 		}
-		__finally569:
+		__finally571:
 		{
 			gint _tmp11_ = 0;
 #line 64 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -453,11 +453,11 @@ void transaction_controller_commit (TransactionController* self) {
 #line 93 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 456 "MediaInterfaces.c"
-					goto __catch572_g_error;
+					goto __catch574_g_error;
 				}
 			}
-			goto __finally572;
-			__catch572_g_error:
+			goto __finally574;
+			__catch574_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp5_ = NULL;
@@ -499,7 +499,7 @@ void transaction_controller_commit (TransactionController* self) {
 				_g_error_free0 (err);
 #line 501 "MediaInterfaces.c"
 			}
-			__finally572:
+			__finally574:
 #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"
 			}
 		}
-		__finally571:
+		__finally573:
 		{
 			gint _tmp12_ = 0;
 #line 86 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
@@ -792,7 +792,7 @@ static void transaction_controller_finalize (TransactionController* obj) {
 			_vala_assert (_tmp1_ == 0, "count == 0");
 #line 794 "MediaInterfaces.c"
 		}
-		__finally568:
+		__finally570:
 		{
 			gint _tmp2_ = 0;
 #line 58 "/home/jens/Source/shotwell/src/MediaInterfaces.vala"
diff --git a/src/MediaMonitor.c b/src/MediaMonitor.c
index f741331..f723c0f 100644
--- a/src/MediaMonitor.c
+++ b/src/MediaMonitor.c
@@ -2853,7 +2853,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 #line 394 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2856 "MediaMonitor.c"
-				goto __catch581_g_error;
+				goto __catch583_g_error;
 			}
 #line 395 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 			_tmp39_ = controller;
@@ -2861,8 +2861,8 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			transaction_controller_commit (_tmp39_);
 #line 2863 "MediaMonitor.c"
 		}
-		goto __finally581;
-		__catch581_g_error:
+		goto __finally583;
+		__catch583_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp40_ = NULL;
@@ -2907,7 +2907,7 @@ static gboolean media_monitor_on_flush_pending_updates (MediaMonitor* self) {
 			_g_error_free0 (err);
 #line 2909 "MediaMonitor.c"
 		}
-		__finally581:
+		__finally583:
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 392 "/home/jens/Source/shotwell/src/MediaMonitor.vala"
diff --git a/src/MediaPage.c b/src/MediaPage.c
index 90f8ac6..b62ca6f 100644
--- a/src/MediaPage.c
+++ b/src/MediaPage.c
@@ -4068,11 +4068,11 @@ void media_page_on_play_video (MediaPage* self) {
 #line 501 "/home/jens/Source/shotwell/src/MediaPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4071 "MediaPage.c"
-			goto __catch558_g_error;
+			goto __catch560_g_error;
 		}
 	}
-	goto __finally558;
-	__catch558_g_error:
+	goto __finally560;
+	__catch560_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -4102,7 +4102,7 @@ void media_page_on_play_video (MediaPage* self) {
 		_g_error_free0 (e);
 #line 4104 "MediaPage.c"
 	}
-	__finally558:
+	__finally560:
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 500 "/home/jens/Source/shotwell/src/MediaPage.vala"
diff --git a/src/MetadataWriter.c b/src/MetadataWriter.c
index 46ac165..a19ad01 100644
--- a/src/MetadataWriter.c
+++ b/src/MetadataWriter.c
@@ -2958,7 +2958,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 #line 538 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 						_g_object_unref0 (_photo_it);
 #line 2961 "MetadataWriter.c"
-						goto __catch551_g_error;
+						goto __catch553_g_error;
 					}
 #line 537 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					_g_object_unref0 (photo);
@@ -2978,8 +2978,8 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			transaction_controller_commit (_tmp23_);
 #line 2980 "MetadataWriter.c"
 		}
-		goto __finally551;
-		__catch551_g_error:
+		goto __finally553;
+		__catch553_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp24_ = NULL;
@@ -3013,7 +3013,7 @@ static void metadata_writer_photos_are_dirty (MetadataWriter* self, GeeCollectio
 			_g_error_free0 (err);
 #line 3015 "MetadataWriter.c"
 		}
-		__finally551:
+		__finally553:
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 534 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -3796,7 +3796,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 664 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3799 "MetadataWriter.c"
-						goto __catch552_database_error;
+						goto __catch554_database_error;
 					}
 					{
 						LibraryPhoto* _tmp67_ = NULL;
@@ -3853,7 +3853,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 667 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3856 "MetadataWriter.c"
-						goto __catch552_database_error;
+						goto __catch554_database_error;
 					}
 					{
 						LibraryPhoto* _tmp76_ = NULL;
@@ -3885,8 +3885,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 				}
 			}
 		}
-		goto __finally552;
-		__catch552_database_error:
+		goto __finally554;
+		__catch554_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp79_ = NULL;
@@ -3902,7 +3902,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 			_g_error_free0 (err);
 #line 3904 "MetadataWriter.c"
 		}
-		__finally552:
+		__finally554:
 		{
 			LibraryPhoto* _tmp80_ = NULL;
 			MetadataWriterCommitJob* _tmp81_ = NULL;
@@ -3949,7 +3949,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3952 "MetadataWriter.c"
-				goto __catch553_database_error;
+				goto __catch555_database_error;
 			}
 #line 683 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			_background_job_unref0 (job);
@@ -3962,8 +3962,8 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 #line 3963 "MetadataWriter.c"
 		}
 	}
-	goto __finally553;
-	__catch553_database_error:
+	goto __finally555;
+	__catch555_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp85_ = NULL;
@@ -3979,7 +3979,7 @@ static void metadata_writer_on_update_completed (MetadataWriter* self, Backgroun
 		_g_error_free0 (err);
 #line 3981 "MetadataWriter.c"
 	}
-	__finally553:
+	__finally555:
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 682 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4157,18 +4157,18 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
 #line 38 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4160 "MetadataWriter.c"
-			goto __catch554_g_error;
+			goto __catch556_g_error;
 		}
 #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		metadata_writer_commit_job_commit_editable (self, &_inner_error_);
 #line 39 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4167 "MetadataWriter.c"
-			goto __catch554_g_error;
+			goto __catch556_g_error;
 		}
 	}
-	goto __finally554;
-	__catch554_g_error:
+	goto __finally556;
+	__catch556_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp0_ = NULL;
@@ -4189,7 +4189,7 @@ static void metadata_writer_commit_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 4191 "MetadataWriter.c"
 	}
-	__finally554:
+	__finally556:
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 37 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
@@ -4291,10 +4291,10 @@ static void metadata_writer_commit_job_commit_master (MetadataWriterCommitJob* s
 #line 58 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4294 "MetadataWriter.c"
-				goto __finally555;
+				goto __finally557;
 			}
 		}
-		__finally555:
+		__finally557:
 		{
 			LibraryPhoto* _tmp16_ = NULL;
 			GFile* _tmp17_ = NULL;
@@ -4433,10 +4433,10 @@ static void metadata_writer_commit_job_commit_editable (MetadataWriterCommitJob*
 #line 77 "/home/jens/Source/shotwell/src/MetadataWriter.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4436 "MetadataWriter.c"
-				goto __finally556;
+				goto __finally558;
 			}
 		}
-		__finally556:
+		__finally558:
 		{
 			LibraryPhoto* _tmp18_ = NULL;
 			GFile* _tmp19_ = NULL;
diff --git a/src/Page.c b/src/Page.c
index 5729233..68114ac 100644
--- a/src/Page.c
+++ b/src/Page.c
@@ -975,8 +975,6 @@ static GtkMenu* page_real_get_page_context_menu (Page* self);
 void page_switching_from (Page* self);
 static void page_real_switching_from (Page* self);
 void page_remove_actions (Page* self, GActionMap* map);
-GType app_window_get_type (void) G_GNUC_CONST;
-AppWindow* app_window_get_instance (void);
 void page_switched_to (Page* self);
 static void page_real_switched_to (Page* self);
 static void page_add_ui (Page* self);
@@ -994,6 +992,8 @@ static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw
 void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw);
 static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* fsw);
 GAction* page_get_action (Page* self, const gchar* name);
+GType app_window_get_type (void) G_GNUC_CONST;
+AppWindow* app_window_get_instance (void);
 void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
 void page_set_action_important (Page* self, const gchar* name, gboolean important);
 void page_set_action_visible (Page* self, const gchar* name, gboolean visible);
@@ -1052,7 +1052,7 @@ static void _page_on_update_actions_on_idle_one_shot_callback (gpointer self);
 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_at_priority_idle (OneShotScheduler* self, gint priority);
-GFile* resources_get_ui (const gchar* filename);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -3213,29 +3213,50 @@ GtkMenu* page_get_page_context_menu (Page* self) {
 
 
 static void page_real_switching_from (Page* self) {
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
+	GActionMap* map = NULL;
+	GtkWindow* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp2_ = NULL;
+	const gchar* _tmp4_ = NULL;
 #line 270 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = FALSE;
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = app_window_get_instance ();
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = _tmp0_;
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
-	page_remove_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap));
-#line 271 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (_tmp1_);
 #line 272 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = self->priv->toolbar_path;
+	_tmp0_ = page_get_container (self);
 #line 272 "/home/jens/Source/shotwell/src/Page.vala"
-	if (_tmp2_ != NULL) {
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_action_map_get_type ()) ? ((GActionMap*) _tmp0_) : NULL;
+#line 272 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp1_ == NULL) {
+#line 272 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (_tmp0_);
+#line 3232 "Page.c"
+	}
+#line 272 "/home/jens/Source/shotwell/src/Page.vala"
+	map = _tmp1_;
 #line 273 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_object_unref0 (self->toolbar);
+	_tmp2_ = map;
 #line 273 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp2_ != NULL) {
+#line 3240 "Page.c"
+		GActionMap* _tmp3_ = NULL;
+#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 276 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp4_ = self->priv->toolbar_path;
+#line 276 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp4_ != NULL) {
+#line 277 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (self->toolbar);
+#line 277 "/home/jens/Source/shotwell/src/Page.vala"
 		self->toolbar = NULL;
-#line 3238 "Page.c"
+#line 3256 "Page.c"
 	}
+#line 269 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (map);
+#line 3260 "Page.c"
 }
 
 
@@ -3244,75 +3265,95 @@ 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 3248 "Page.c"
+#line 3269 "Page.c"
 }
 
 
 static void page_real_switched_to (Page* self) {
-	AppWindow* _tmp0_ = NULL;
-	AppWindow* _tmp1_ = NULL;
+	GActionMap* map = NULL;
+	GtkWindow* _tmp0_ = NULL;
+	GActionMap* _tmp1_ = NULL;
+	GActionMap* _tmp2_ = NULL;
 	gint selected_count = 0;
-	ViewCollection* _tmp2_ = NULL;
-	ViewCollection* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
+	ViewCollection* _tmp4_ = NULL;
+	ViewCollection* _tmp5_ = NULL;
+	gint _tmp6_ = 0;
+	gint _tmp7_ = 0;
 	gint count = 0;
-	ViewCollection* _tmp6_ = NULL;
-	ViewCollection* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-#line 277 "/home/jens/Source/shotwell/src/Page.vala"
+	ViewCollection* _tmp8_ = NULL;
+	ViewCollection* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
+	gint _tmp11_ = 0;
+#line 281 "/home/jens/Source/shotwell/src/Page.vala"
 	self->in_view = TRUE;
-#line 278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 282 "/home/jens/Source/shotwell/src/Page.vala"
 	page_add_ui (self);
-#line 279 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp0_ = app_window_get_instance ();
-#line 279 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp1_ = _tmp0_;
-#line 279 "/home/jens/Source/shotwell/src/Page.vala"
-	page_add_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap));
-#line 279 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (_tmp1_);
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp2_ = page_get_view (self);
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp3_ = _tmp2_;
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp0_ = page_get_container (self);
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_action_map_get_type ()) ? ((GActionMap*) _tmp0_) : NULL;
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp1_ == NULL) {
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_object_unref0 (_tmp0_);
+#line 3300 "Page.c"
+	}
+#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+	map = _tmp1_;
+#line 284 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp2_ = map;
+#line 284 "/home/jens/Source/shotwell/src/Page.vala"
+	if (_tmp2_ != NULL) {
+#line 3308 "Page.c"
+		GActionMap* _tmp3_ = NULL;
+#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 287 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp4_ = page_get_view (self);
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
-	_data_collection_unref0 (_tmp3_);
-#line 280 "/home/jens/Source/shotwell/src/Page.vala"
-	selected_count = _tmp5_;
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp6_ = page_get_view (self);
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp6_ = view_collection_get_selected_count (_tmp5_);
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
-	_tmp8_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+	_data_collection_unref0 (_tmp5_);
+#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+	selected_count = _tmp7_;
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp8_ = page_get_view (self);
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _tmp8_;
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
-	_data_collection_unref0 (_tmp7_);
-#line 281 "/home/jens/Source/shotwell/src/Page.vala"
-	count = _tmp9_;
-#line 282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp10_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection));
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+	_tmp11_ = _tmp10_;
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+	_data_collection_unref0 (_tmp9_);
+#line 288 "/home/jens/Source/shotwell/src/Page.vala"
+	count = _tmp11_;
+#line 289 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_actions (self, selected_count, count);
-#line 283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 290 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, selected_count, count);
-#line 284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 291 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_modifiers (self);
-#line 3307 "Page.c"
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_object_unref0 (map);
+#line 3348 "Page.c"
 }
 
 
 void page_switched_to (Page* self) {
-#line 276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 280 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switched_to (self);
-#line 3316 "Page.c"
+#line 3357 "Page.c"
 }
 
 
@@ -3321,70 +3362,70 @@ static void page_real_ready (Page* self) {
 
 
 void page_ready (Page* self) {
-#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 294 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 294 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->ready (self);
-#line 3329 "Page.c"
+#line 3370 "Page.c"
 }
 
 
 gboolean page_is_in_view (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 297 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->in_view;
-#line 291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 298 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3344 "Page.c"
+#line 3385 "Page.c"
 }
 
 
 static void page_real_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
 	FullscreenWindow* _tmp0_ = NULL;
-#line 294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 301 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 302 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = fsw;
-#line 295 "/home/jens/Source/shotwell/src/Page.vala"
+#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 3356 "Page.c"
+#line 3397 "Page.c"
 }
 
 
 void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 301 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 301 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->switching_to_fullscreen (self, fsw);
-#line 3365 "Page.c"
+#line 3406 "Page.c"
 }
 
 
 static void page_real_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
 	FullscreenWindow* _tmp0_ = NULL;
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = fsw;
-#line 299 "/home/jens/Source/shotwell/src/Page.vala"
+#line 306 "/home/jens/Source/shotwell/src/Page.vala"
 	page_remove_actions (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_action_map_get_type (), GActionMap));
-#line 300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 307 "/home/jens/Source/shotwell/src/Page.vala"
 	page_switched_to (self);
-#line 3379 "Page.c"
+#line 3420 "Page.c"
 }
 
 
 void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw) {
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 305 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->returning_from_fullscreen (self, fsw);
-#line 3388 "Page.c"
+#line 3429 "Page.c"
 }
 
 
@@ -3393,79 +3434,79 @@ GAction* page_get_action (Page* self, const gchar* name) {
 	GActionMap* map = NULL;
 	GtkWindow* _tmp0_ = NULL;
 	GActionMap* _tmp5_ = NULL;
-#line 303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 310 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 303 "/home/jens/Source/shotwell/src/Page.vala"
+#line 310 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 311 "/home/jens/Source/shotwell/src/Page.vala"
 	map = NULL;
-#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->container;
-#line 305 "/home/jens/Source/shotwell/src/Page.vala"
+#line 312 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW)) {
-#line 3407 "Page.c"
+#line 3448 "Page.c"
 		GtkWindow* _tmp1_ = NULL;
 		GActionMap* _tmp2_ = NULL;
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 313 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->container;
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 313 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_action_map_get_type ()) ? ((GActionMap*) _tmp1_) : NULL);
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 313 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (map);
-#line 306 "/home/jens/Source/shotwell/src/Page.vala"
+#line 313 "/home/jens/Source/shotwell/src/Page.vala"
 		map = _tmp2_;
-#line 3418 "Page.c"
+#line 3459 "Page.c"
 	} else {
 		AppWindow* _tmp3_ = NULL;
 		GActionMap* _tmp4_ = NULL;
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = app_window_get_instance ();
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_action_map_get_type ()) ? ((GActionMap*) _tmp3_) : NULL;
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp4_ == NULL) {
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp3_);
-#line 3430 "Page.c"
+#line 3471 "Page.c"
 		}
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (map);
-#line 308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 315 "/home/jens/Source/shotwell/src/Page.vala"
 		map = _tmp4_;
-#line 3436 "Page.c"
+#line 3477 "Page.c"
 	}
-#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = map;
-#line 311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 318 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_ != NULL) {
-#line 3442 "Page.c"
+#line 3483 "Page.c"
 		GActionMap* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
 		GAction* _tmp8_ = NULL;
 		GAction* _tmp9_ = NULL;
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = map;
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = name;
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = g_action_map_lookup_action (_tmp6_, _tmp7_);
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		result = _tmp9_;
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (map);
-#line 312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 319 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3461 "Page.c"
+#line 3502 "Page.c"
 	}
-#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 322 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 322 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (map);
-#line 315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 322 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3469 "Page.c"
+#line 3510 "Page.c"
 }
 
 
@@ -3475,92 +3516,92 @@ void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitiv
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3493 "Page.c"
+#line 3534 "Page.c"
 	}
-#line 319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 326 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 327 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 327 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3501 "Page.c"
+#line 3542 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = sensitive;
-#line 321 "/home/jens/Source/shotwell/src/Page.vala"
+#line 328 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3510 "Page.c"
+#line 3551 "Page.c"
 	}
-#line 318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 325 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3514 "Page.c"
+#line 3555 "Page.c"
 }
 
 
 void page_set_action_important (Page* self, const gchar* name, gboolean important) {
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 331 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = important;
-#line 325 "/home/jens/Source/shotwell/src/Page.vala"
+#line 332 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_action_sensitive (self, _tmp0_, _tmp1_);
-#line 3531 "Page.c"
+#line 3572 "Page.c"
 }
 
 
 void page_set_action_visible (Page* self, const gchar* name, gboolean visible) {
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 335 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 335 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = visible;
-#line 329 "/home/jens/Source/shotwell/src/Page.vala"
+#line 336 "/home/jens/Source/shotwell/src/Page.vala"
 	page_set_action_sensitive (self, _tmp0_, _tmp1_);
-#line 3548 "Page.c"
+#line 3589 "Page.c"
 }
 
 
 void page_set_action_short_label (Page* self, const gchar* name, const gchar* short_label) {
 	const gchar* _tmp0_ = NULL;
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 339 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 339 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 339 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (short_label != NULL);
-#line 333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 340 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 333 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:333: => Set action short_label called for %s", _tmp0_);
-#line 3564 "Page.c"
+#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"
 }
 
 
@@ -3573,58 +3614,58 @@ void page_set_action_details (Page* self, const gchar* name, const gchar* label,
 	const gchar* _tmp4_ = NULL;
 	GSimpleAction* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3591 "Page.c"
+#line 3632 "Page.c"
 	}
-#line 337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 344 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 346 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 346 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 347 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (action);
-#line 340 "/home/jens/Source/shotwell/src/Page.vala"
+#line 347 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 3603 "Page.c"
+#line 3644 "Page.c"
 	}
-#line 342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 349 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = label;
-#line 342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 349 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 3609 "Page.c"
+#line 3650 "Page.c"
 		const gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = name;
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = label;
-#line 343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 350 "/home/jens/Source/shotwell/src/Page.vala"
 		page_update_menu_item_label (self, _tmp5_, _tmp6_);
-#line 3618 "Page.c"
+#line 3659 "Page.c"
 	}
-#line 345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 352 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = action;
-#line 345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 352 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = sensitive;
-#line 345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 352 "/home/jens/Source/shotwell/src/Page.vala"
 	g_simple_action_set_enabled (_tmp7_, _tmp8_);
-#line 336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 343 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3628 "Page.c"
+#line 3669 "Page.c"
 }
 
 
@@ -3633,31 +3674,31 @@ void page_activate_action (Page* self, const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 356 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp1_;
-#line 351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 358 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 351 "/home/jens/Source/shotwell/src/Page.vala"
+#line 358 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 3651 "Page.c"
+#line 3692 "Page.c"
 		GAction* _tmp3_ = NULL;
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = action;
-#line 352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 359 "/home/jens/Source/shotwell/src/Page.vala"
 		g_action_activate (_tmp3_, NULL);
-#line 3657 "Page.c"
+#line 3698 "Page.c"
 	}
-#line 348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 355 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3661 "Page.c"
+#line 3702 "Page.c"
 }
 
 
@@ -3668,53 +3709,53 @@ GAction* page_get_common_action (Page* self, const gchar* name, gboolean log_war
 	GAction* _tmp1_ = NULL;
 	GAction* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 362 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 356 "/home/jens/Source/shotwell/src/Page.vala"
+#line 363 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp1_;
-#line 358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 365 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = action;
-#line 358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 365 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != NULL) {
-#line 359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 366 "/home/jens/Source/shotwell/src/Page.vala"
 		result = action;
-#line 359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 366 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 3690 "Page.c"
+#line 3731 "Page.c"
 	}
-#line 361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = log_warning;
-#line 361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 368 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 3696 "Page.c"
+#line 3737 "Page.c"
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_page_name (self);
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 369 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = name;
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:362: Page %s: Unable to locate common action %s", _tmp5_, _tmp6_);
-#line 362 "/home/jens/Source/shotwell/src/Page.vala"
+#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"
 		_g_free0 (_tmp5_);
-#line 3710 "Page.c"
+#line 3751 "Page.c"
 	}
-#line 364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 371 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 371 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 371 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3718 "Page.c"
+#line 3759 "Page.c"
 }
 
 
@@ -3724,72 +3765,72 @@ void page_set_common_action_sensitive (Page* self, const gchar* name, gboolean s
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 374 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 374 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 375 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 375 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 375 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 375 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 375 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3742 "Page.c"
+#line 3783 "Page.c"
 	}
-#line 368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 375 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 376 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 369 "/home/jens/Source/shotwell/src/Page.vala"
+#line 376 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3750 "Page.c"
+#line 3791 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = sensitive;
-#line 370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 377 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3759 "Page.c"
+#line 3800 "Page.c"
 	}
-#line 367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 374 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3763 "Page.c"
+#line 3804 "Page.c"
 }
 
 
 void page_set_common_action_label (Page* self, const gchar* name, const gchar* label) {
 	const gchar* _tmp0_ = NULL;
-#line 373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 380 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 380 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 373 "/home/jens/Source/shotwell/src/Page.vala"
+#line 380 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (label != NULL);
-#line 374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 381 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 374 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:374: Trying to set common action label for %s", _tmp0_);
-#line 3779 "Page.c"
+#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"
 }
 
 
 void page_set_common_action_important (Page* self, const gchar* name, gboolean important) {
 	const gchar* _tmp0_ = NULL;
-#line 377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 384 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 384 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
+#line 385 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 378 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:378: Setting action to important: %s", _tmp0_);
-#line 3793 "Page.c"
+#line 385 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:385: Setting action to important: %s", _tmp0_);
+#line 3834 "Page.c"
 }
 
 
@@ -3799,106 +3840,106 @@ void page_activate_common_action (Page* self, const gchar* name) {
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_common_action (self, _tmp0_, TRUE);
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3817 "Page.c"
+#line 3858 "Page.c"
 	}
-#line 382 "/home/jens/Source/shotwell/src/Page.vala"
+#line 389 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 390 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 390 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3825 "Page.c"
+#line 3866 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
-#line 384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 391 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_emit_by_name (_tmp4_, "activate", NULL);
-#line 3831 "Page.c"
+#line 3872 "Page.c"
 	}
-#line 381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 388 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3835 "Page.c"
+#line 3876 "Page.c"
 }
 
 
 gboolean page_get_ctrl_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 387 "/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 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 395 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->ctrl_pressed;
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 395 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 395 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3850 "Page.c"
+#line 3891 "Page.c"
 }
 
 
 gboolean page_get_alt_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 398 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->alt_pressed;
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 399 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3865 "Page.c"
+#line 3906 "Page.c"
 }
 
 
 gboolean page_get_shift_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 402 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->shift_pressed;
-#line 396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 403 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3880 "Page.c"
+#line 3921 "Page.c"
 }
 
 
 gboolean page_get_super_pressed (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 399 "/home/jens/Source/shotwell/src/Page.vala"
+#line 406 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 407 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->super_pressed;
-#line 400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 407 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 407 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 3895 "Page.c"
+#line 3936 "Page.c"
 }
 
 
 static GVariant* _variant_new20 (gboolean value) {
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3902 "Page.c"
+#line 3943 "Page.c"
 }
 
 
@@ -3908,47 +3949,47 @@ void page_set_action_active (Page* self, const gchar* name, gboolean active) {
 	GAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
 	GSimpleAction* _tmp3_ = NULL;
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_action (self, _tmp0_);
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp1_) : NULL;
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3926 "Page.c"
+#line 3967 "Page.c"
 	}
-#line 404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 411 "/home/jens/Source/shotwell/src/Page.vala"
 	action = _tmp2_;
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = action;
-#line 405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 412 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ != NULL) {
-#line 3934 "Page.c"
+#line 3975 "Page.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		GVariant* _tmp6_ = NULL;
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = action;
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = active;
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _variant_new20 (_tmp5_);
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		g_simple_action_set_state (_tmp4_, _tmp6_);
-#line 406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 413 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_variant_unref0 (_tmp6_);
-#line 3948 "Page.c"
+#line 3989 "Page.c"
 	}
-#line 403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 410 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (action);
-#line 3952 "Page.c"
+#line 3993 "Page.c"
 }
 
 
@@ -3978,125 +4019,125 @@ static gboolean page_get_modifiers (Page* self, gboolean* ctrl, gboolean* alt, g
 	GdkModifierType _tmp14_ = 0;
 	GdkModifierType _tmp15_ = 0;
 	GdkModifierType _tmp16_ = 0;
-#line 410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 417 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == NULL;
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 418 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 419 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_ctrl = FALSE;
-#line 413 "/home/jens/Source/shotwell/src/Page.vala"
+#line 420 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_alt = FALSE;
-#line 414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 421 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_shift = FALSE;
-#line 415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 422 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_super = FALSE;
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		if (ctrl) {
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 			*ctrl = _vala_ctrl;
-#line 4010 "Page.c"
+#line 4051 "Page.c"
 		}
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		if (alt) {
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 			*alt = _vala_alt;
-#line 4016 "Page.c"
+#line 4057 "Page.c"
 		}
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		if (shift) {
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 			*shift = _vala_shift;
-#line 4022 "Page.c"
+#line 4063 "Page.c"
 		}
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		if (super) {
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 			*super = _vala_super;
-#line 4028 "Page.c"
+#line 4069 "Page.c"
 		}
-#line 417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 424 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 4032 "Page.c"
+#line 4073 "Page.c"
 	}
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = app_window_get_instance ();
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = gdk_display_get_default ();
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gdk_display_get_device_manager (_tmp7_);
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = gdk_device_manager_get_client_pointer (_tmp8_);
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp6_, _tmp9_, &_tmp10_, &_tmp11_, &_tmp12_);
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp10_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp11_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp12_;
-#line 422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 429 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp5_);
-#line 425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 432 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = mask;
-#line 425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 432 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_ctrl = (_tmp13_ & GDK_CONTROL_MASK) != 0;
-#line 426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 433 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 433 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_alt = (_tmp14_ & GDK_MOD1_MASK) != 0;
-#line 427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = mask;
-#line 427 "/home/jens/Source/shotwell/src/Page.vala"
+#line 434 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_shift = (_tmp15_ & GDK_SHIFT_MASK) != 0;
-#line 428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 435 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = mask;
-#line 428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 435 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_super = (_tmp16_ & GDK_MOD4_MASK) != 0;
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	if (ctrl) {
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		*ctrl = _vala_ctrl;
-#line 4078 "Page.c"
+#line 4119 "Page.c"
 	}
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	if (alt) {
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		*alt = _vala_alt;
-#line 4084 "Page.c"
+#line 4125 "Page.c"
 	}
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	if (shift) {
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		*shift = _vala_shift;
-#line 4090 "Page.c"
+#line 4131 "Page.c"
 	}
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	if (super) {
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 		*super = _vala_super;
-#line 4096 "Page.c"
+#line 4137 "Page.c"
 	}
-#line 430 "/home/jens/Source/shotwell/src/Page.vala"
+#line 437 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4100 "Page.c"
+#line 4141 "Page.c"
 }
 
 
@@ -4122,229 +4163,229 @@ static void page_update_modifiers (Page* self) {
 	gboolean _tmp30_ = FALSE;
 	gboolean _tmp31_ = FALSE;
 	gboolean _tmp32_ = FALSE;
-#line 433 "/home/jens/Source/shotwell/src/Page.vala"
+#line 440 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 443 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp4_) {
-#line 438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 445 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4142 "Page.c"
+#line 4183 "Page.c"
 	}
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->ctrl_pressed;
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 4148 "Page.c"
+#line 4189 "Page.c"
 		gboolean _tmp7_ = FALSE;
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ctrl_currently_pressed;
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = !_tmp7_;
-#line 4154 "Page.c"
+#line 4195 "Page.c"
 	} else {
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 4158 "Page.c"
+#line 4199 "Page.c"
 	}
-#line 441 "/home/jens/Source/shotwell/src/Page.vala"
+#line 448 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 442 "/home/jens/Source/shotwell/src/Page.vala"
+#line 449 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_ctrl_released (self, NULL);
-#line 4164 "Page.c"
+#line 4205 "Page.c"
 	} else {
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->ctrl_pressed;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp9_) {
-#line 4172 "Page.c"
+#line 4213 "Page.c"
 			gboolean _tmp10_ = FALSE;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = ctrl_currently_pressed;
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp10_;
-#line 4178 "Page.c"
+#line 4219 "Page.c"
 		} else {
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = FALSE;
-#line 4182 "Page.c"
+#line 4223 "Page.c"
 		}
-#line 443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 450 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp8_) {
-#line 444 "/home/jens/Source/shotwell/src/Page.vala"
+#line 451 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_ctrl_pressed (self, NULL);
-#line 4188 "Page.c"
+#line 4229 "Page.c"
 		}
 	}
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->alt_pressed;
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_) {
-#line 4195 "Page.c"
+#line 4236 "Page.c"
 		gboolean _tmp13_ = FALSE;
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = alt_currently_pressed;
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = !_tmp13_;
-#line 4201 "Page.c"
+#line 4242 "Page.c"
 	} else {
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = FALSE;
-#line 4205 "Page.c"
+#line 4246 "Page.c"
 	}
-#line 446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 453 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 454 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_alt_released (self, NULL);
-#line 4211 "Page.c"
+#line 4252 "Page.c"
 	} else {
 		gboolean _tmp14_ = FALSE;
 		gboolean _tmp15_ = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = self->priv->alt_pressed;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp15_) {
-#line 4219 "Page.c"
+#line 4260 "Page.c"
 			gboolean _tmp16_ = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = alt_currently_pressed;
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _tmp16_;
-#line 4225 "Page.c"
+#line 4266 "Page.c"
 		} else {
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = FALSE;
-#line 4229 "Page.c"
+#line 4270 "Page.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 455 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp14_) {
-#line 449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 456 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_alt_pressed (self, NULL);
-#line 4235 "Page.c"
+#line 4276 "Page.c"
 		}
 	}
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->shift_pressed;
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 4242 "Page.c"
+#line 4283 "Page.c"
 		gboolean _tmp19_ = FALSE;
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = shift_currently_pressed;
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = !_tmp19_;
-#line 4248 "Page.c"
+#line 4289 "Page.c"
 	} else {
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = FALSE;
-#line 4252 "Page.c"
+#line 4293 "Page.c"
 	}
-#line 451 "/home/jens/Source/shotwell/src/Page.vala"
+#line 458 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_) {
-#line 452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 459 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_shift_released (self, NULL);
-#line 4258 "Page.c"
+#line 4299 "Page.c"
 	} else {
 		gboolean _tmp20_ = FALSE;
 		gboolean _tmp21_ = FALSE;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = self->priv->shift_pressed;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp21_) {
-#line 4266 "Page.c"
+#line 4307 "Page.c"
 			gboolean _tmp22_ = FALSE;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = shift_currently_pressed;
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = _tmp22_;
-#line 4272 "Page.c"
+#line 4313 "Page.c"
 		} else {
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = FALSE;
-#line 4276 "Page.c"
+#line 4317 "Page.c"
 		}
-#line 453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 460 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp20_) {
-#line 454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 461 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_shift_pressed (self, NULL);
-#line 4282 "Page.c"
+#line 4323 "Page.c"
 		}
 	}
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = self->priv->super_pressed;
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp24_) {
-#line 4289 "Page.c"
+#line 4330 "Page.c"
 		gboolean _tmp25_ = FALSE;
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = super_currently_pressed;
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = !_tmp25_;
-#line 4295 "Page.c"
+#line 4336 "Page.c"
 	} else {
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = FALSE;
-#line 4299 "Page.c"
+#line 4340 "Page.c"
 	}
-#line 456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 463 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp23_) {
-#line 457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 464 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_super_released (self, NULL);
-#line 4305 "Page.c"
+#line 4346 "Page.c"
 	} else {
 		gboolean _tmp26_ = FALSE;
 		gboolean _tmp27_ = FALSE;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = self->priv->super_pressed;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp27_) {
-#line 4313 "Page.c"
+#line 4354 "Page.c"
 			gboolean _tmp28_ = FALSE;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = super_currently_pressed;
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = _tmp28_;
-#line 4319 "Page.c"
+#line 4360 "Page.c"
 		} else {
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = FALSE;
-#line 4323 "Page.c"
+#line 4364 "Page.c"
 		}
-#line 458 "/home/jens/Source/shotwell/src/Page.vala"
+#line 465 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp26_) {
-#line 459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 466 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_super_pressed (self, NULL);
-#line 4329 "Page.c"
+#line 4370 "Page.c"
 		}
 	}
-#line 461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = ctrl_currently_pressed;
-#line 461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 468 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->ctrl_pressed = _tmp29_;
-#line 462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 469 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = alt_currently_pressed;
-#line 462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 469 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->alt_pressed = _tmp30_;
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 470 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = shift_currently_pressed;
-#line 463 "/home/jens/Source/shotwell/src/Page.vala"
+#line 470 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->shift_pressed = _tmp31_;
-#line 464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = super_currently_pressed;
-#line 464 "/home/jens/Source/shotwell/src/Page.vala"
+#line 471 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->super_pressed = _tmp32_;
-#line 4348 "Page.c"
+#line 4389 "Page.c"
 }
 
 
@@ -4354,134 +4395,134 @@ PageWindow* page_get_page_window (Page* self) {
 	GtkContainer* _tmp0_ = NULL;
 	GtkContainer* _tmp1_ = NULL;
 	GtkWidget* _tmp2_ = NULL;
-#line 467 "/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 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gtk_widget_get_parent (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 475 "/home/jens/Source/shotwell/src/Page.vala"
 	p = _tmp2_;
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
 	while (TRUE) {
-#line 4370 "Page.c"
+#line 4411 "Page.c"
 		GtkWidget* _tmp3_ = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GtkWidget* _tmp7_ = NULL;
 		GtkContainer* _tmp8_ = NULL;
 		GtkContainer* _tmp9_ = NULL;
 		GtkWidget* _tmp10_ = NULL;
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = p;
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!(_tmp3_ != NULL)) {
-#line 469 "/home/jens/Source/shotwell/src/Page.vala"
+#line 476 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 4383 "Page.c"
+#line 4424 "Page.c"
 		}
-#line 470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 477 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = p;
-#line 470 "/home/jens/Source/shotwell/src/Page.vala"
+#line 477 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, TYPE_PAGE_WINDOW)) {
-#line 4389 "Page.c"
+#line 4430 "Page.c"
 			GtkWidget* _tmp5_ = NULL;
 			PageWindow* _tmp6_ = NULL;
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = p;
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow));
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (p);
-#line 471 "/home/jens/Source/shotwell/src/Page.vala"
+#line 478 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 4402 "Page.c"
+#line 4443 "Page.c"
 		}
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = p;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gtk_widget_get_parent (_tmp7_);
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (p);
-#line 473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 480 "/home/jens/Source/shotwell/src/Page.vala"
 		p = _tmp10_;
-#line 4416 "Page.c"
+#line 4457 "Page.c"
 	}
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (p);
-#line 476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 483 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4424 "Page.c"
+#line 4465 "Page.c"
 }
 
 
 CommandManager* page_get_command_manager (Page* self) {
 	CommandManager* result = NULL;
 	CommandManager* _tmp0_ = NULL;
-#line 479 "/home/jens/Source/shotwell/src/Page.vala"
+#line 486 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 487 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 4439 "Page.c"
+#line 4480 "Page.c"
 }
 
 
 static void page_real_add_actions (Page* self, GActionMap* map) {
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 4446 "Page.c"
+#line 4487 "Page.c"
 }
 
 
 void page_add_actions (Page* self, GActionMap* map) {
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 490 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->add_actions (self, map);
-#line 4455 "Page.c"
+#line 4496 "Page.c"
 }
 
 
 static void page_real_remove_actions (Page* self, GActionMap* map) {
-#line 484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 4462 "Page.c"
+#line 4503 "Page.c"
 }
 
 
 void page_remove_actions (Page* self, GActionMap* map) {
-#line 484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 491 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->remove_actions (self, map);
-#line 4471 "Page.c"
+#line 4512 "Page.c"
 }
 
 
 static gboolean _variant_get21 (GVariant* value) {
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_get_boolean (value);
-#line 4478 "Page.c"
+#line 4519 "Page.c"
 }
 
 
 static GVariant* _variant_new22 (gboolean value) {
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4485 "Page.c"
+#line 4526 "Page.c"
 }
 
 
@@ -4494,50 +4535,50 @@ void page_on_action_toggle (Page* self, GAction* action, GVariant* value) {
 	GVariant* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
 	GAction* _tmp6_ = NULL;
-#line 486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = action;
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_action_get_state (_tmp0_);
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _variant_get21 (_tmp2_);
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _variant_new22 (!_tmp3_);
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_variant_unref0 (_tmp2_);
-#line 487 "/home/jens/Source/shotwell/src/Page.vala"
+#line 494 "/home/jens/Source/shotwell/src/Page.vala"
 	new_state = _tmp5_;
-#line 488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 495 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = action;
-#line 488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 495 "/home/jens/Source/shotwell/src/Page.vala"
 	g_action_change_state (_tmp6_, new_state);
-#line 486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 493 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_variant_unref0 (new_state);
-#line 4524 "Page.c"
+#line 4565 "Page.c"
 }
 
 
 void page_on_action_radio (Page* self, GAction* action, GVariant* value) {
 	GAction* _tmp0_ = NULL;
 	GVariant* _tmp1_ = NULL;
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 498 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_IS_ACTION (action));
-#line 492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = action;
-#line 492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = value;
-#line 492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 499 "/home/jens/Source/shotwell/src/Page.vala"
 	g_action_change_state (_tmp0_, _tmp1_);
-#line 4541 "Page.c"
+#line 4582 "Page.c"
 }
 
 
@@ -4548,36 +4589,36 @@ static void page_add_ui (Page* self) {
 	GeeList* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gint _tmp4_ = 0;
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 504 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 504 "/home/jens/Source/shotwell/src/Page.vala"
 	ui_filenames = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList);
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 505 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = ui_filenames;
-#line 498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 505 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_collect_ui_filenames (self, _tmp1_);
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 506 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = ui_filenames;
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 506 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 506 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 506 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == 0) {
-#line 4570 "Page.c"
+#line 4611 "Page.c"
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_page_name (self);
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
+#line 507 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
-		g_message ("Page.vala:500: No UI file specified for %s", _tmp6_);
-#line 500 "/home/jens/Source/shotwell/src/Page.vala"
+#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"
 		_g_free0 (_tmp6_);
-#line 4581 "Page.c"
+#line 4622 "Page.c"
 	}
 	{
 		GeeList* _ui_filename_list = NULL;
@@ -4588,25 +4629,25 @@ static void page_add_ui (Page* self) {
 		gint _tmp10_ = 0;
 		gint _tmp11_ = 0;
 		gint _ui_filename_index = 0;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = ui_filenames;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_list = _tmp8_;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _ui_filename_list;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_size = _tmp11_;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_ui_filename_index = -1;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 4610 "Page.c"
+#line 4651 "Page.c"
 			gint _tmp12_ = 0;
 			gint _tmp13_ = 0;
 			gint _tmp14_ = 0;
@@ -4615,90 +4656,90 @@ static void page_add_ui (Page* self) {
 			gint _tmp16_ = 0;
 			gpointer _tmp17_ = NULL;
 			const gchar* _tmp18_ = NULL;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _ui_filename_index;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_ui_filename_index = _tmp12_ + 1;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _ui_filename_index;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = _ui_filename_size;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp13_ < _tmp14_)) {
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 4631 "Page.c"
+#line 4672 "Page.c"
 			}
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _ui_filename_list;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = _ui_filename_index;
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = gee_list_get (_tmp15_, _tmp16_);
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			ui_filename = (gchar*) _tmp17_;
-#line 503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ui_filename;
-#line 503 "/home/jens/Source/shotwell/src/Page.vala"
+#line 510 "/home/jens/Source/shotwell/src/Page.vala"
 			page_init_load_ui (self, _tmp18_);
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (ui_filename);
-#line 4647 "Page.c"
+#line 4688 "Page.c"
 		}
-#line 502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 509 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_ui_filename_list);
-#line 4651 "Page.c"
+#line 4692 "Page.c"
 	}
-#line 495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 502 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (ui_filenames);
-#line 4655 "Page.c"
+#line 4696 "Page.c"
 }
 
 
 void page_init_toolbar (Page* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 515 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->toolbar_path);
-#line 509 "/home/jens/Source/shotwell/src/Page.vala"
+#line 516 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->toolbar_path = _tmp1_;
-#line 4674 "Page.c"
+#line 4715 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4681 "Page.c"
+#line 4722 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4688 "Page.c"
+#line 4729 "Page.c"
 }
 
 
 static void _page_on_update_actions_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4695 "Page.c"
+#line 4736 "Page.c"
 }
 
 
 static void _page_on_update_actions_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions ((Page*) self);
-#line 4702 "Page.c"
+#line 4743 "Page.c"
 }
 
 
@@ -4726,87 +4767,87 @@ static void page_attach_view_signals (Page* self) {
 	ViewCollection* _tmp18_ = NULL;
 	ViewCollection* _tmp19_ = NULL;
 	ViewCollection* _tmp20_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 520 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 521 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 515 "/home/jens/Source/shotwell/src/Page.vala"
+#line 522 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4738 "Page.c"
+#line 4779 "Page.c"
 	}
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 525 "/home/jens/Source/shotwell/src/Page.vala"
 	selected_count = _tmp4_;
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (self);
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 526 "/home/jens/Source/shotwell/src/Page.vala"
 	count = _tmp8_;
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = selected_count;
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = count;
-#line 520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 527 "/home/jens/Source/shotwell/src/Page.vala"
 	page_init_actions (self, _tmp9_, _tmp10_);
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = selected_count;
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = count;
-#line 521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 528 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, _tmp11_, _tmp12_);
-#line 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = page_get_view (self);
-#line 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _tmp13_;
-#line 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/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 524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 531 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (self);
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/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 525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 532 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (self);
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/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 526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 533 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (self);
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/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 527 "/home/jens/Source/shotwell/src/Page.vala"
+#line 534 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 536 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = TRUE;
-#line 4810 "Page.c"
+#line 4851 "Page.c"
 }
 
 
@@ -4824,109 +4865,109 @@ static void page_detach_view_signals (Page* self) {
 	ViewCollection* _tmp10_ = NULL;
 	ViewCollection* _tmp11_ = NULL;
 	guint _tmp12_ = 0U;
-#line 533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 540 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 541 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->are_actions_attached;
-#line 534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 541 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 542 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4836 "Page.c"
+#line 4877 "Page.c"
 	}
-#line 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 544 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (self);
-#line 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 544 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 544 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-state-changed", TYPE_VIEW_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 544 "/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 537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 544 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (self);
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("selection-group-altered", TYPE_VIEW_COLLECTION, &_tmp6_, NULL, FALSE);
-#line 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/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 538 "/home/jens/Source/shotwell/src/Page.vala"
+#line 545 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_view (self);
-#line 539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("items-visibility-changed", TYPE_VIEW_COLLECTION, &_tmp9_, NULL, FALSE);
-#line 539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/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 539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 546 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = page_get_view (self);
-#line 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_;
-#line 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp12_, NULL, FALSE);
-#line 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/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 540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 547 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp11_);
-#line 542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 549 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->are_actions_attached = FALSE;
-#line 4880 "Page.c"
+#line 4921 "Page.c"
 }
 
 
 static void _page_on_update_actions_on_idle_one_shot_callback (gpointer self) {
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_update_actions_on_idle ((Page*) self);
-#line 4887 "Page.c"
+#line 4928 "Page.c"
 }
 
 
 static void page_on_update_actions (Page* self) {
 	OneShotScheduler* _tmp0_ = NULL;
 	OneShotScheduler* _tmp6_ = NULL;
-#line 545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 552 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 553 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->update_actions_scheduler;
-#line 546 "/home/jens/Source/shotwell/src/Page.vala"
+#line 553 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 4900 "Page.c"
+#line 4941 "Page.c"
 		gchar* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		OneShotScheduler* _tmp5_ = NULL;
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = page_get_page_name (self);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = _tmp1_;
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = g_strdup_printf ("Update actions scheduler for %s", _tmp2_);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_;
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = one_shot_scheduler_new (_tmp4_, _page_on_update_actions_on_idle_one_shot_callback, self);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_one_shot_scheduler_unref0 (self->priv->update_actions_scheduler);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->update_actions_scheduler = _tmp5_;
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp4_);
-#line 547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 554 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp2_);
-#line 4924 "Page.c"
+#line 4965 "Page.c"
 	}
-#line 552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->update_actions_scheduler;
-#line 552 "/home/jens/Source/shotwell/src/Page.vala"
+#line 559 "/home/jens/Source/shotwell/src/Page.vala"
 	one_shot_scheduler_at_priority_idle (_tmp6_, G_PRIORITY_LOW);
-#line 4930 "Page.c"
+#line 4971 "Page.c"
 }
 
 
@@ -4939,160 +4980,144 @@ static void page_on_update_actions_on_idle (Page* self) {
 	ViewCollection* _tmp5_ = NULL;
 	ViewCollection* _tmp6_ = NULL;
 	gint _tmp7_ = 0;
-#line 555 "/home/jens/Source/shotwell/src/Page.vala"
+#line 562 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 563 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 556 "/home/jens/Source/shotwell/src/Page.vala"
+#line 563 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 564 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4951 "Page.c"
+#line 4992 "Page.c"
 	}
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->in_view;
-#line 559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 566 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp1_) {
-#line 560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 567 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 4959 "Page.c"
+#line 5000 "Page.c"
 	}
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (self);
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = view_collection_get_selected_count (_tmp3_);
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (self);
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_actions (self, _tmp4_, _tmp7_);
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 569 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 4979 "Page.c"
+#line 5020 "Page.c"
 }
 
 
 static void page_init_load_ui (Page* self, const gchar* ui_filename) {
-	GFile* ui_file = NULL;
+	gchar* ui_resource = NULL;
 	const gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 565 "/home/jens/Source/shotwell/src/Page.vala"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ui_filename != NULL);
-#line 566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = ui_filename;
-#line 566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = resources_get_ui (_tmp0_);
-#line 566 "/home/jens/Source/shotwell/src/Page.vala"
-	ui_file = _tmp1_;
-#line 4998 "Page.c"
+#line 573 "/home/jens/Source/shotwell/src/Page.vala"
+	ui_resource = _tmp1_;
+#line 5039 "Page.c"
 	{
 		GtkBuilder* _tmp2_ = NULL;
-		gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 575 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->builder;
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp3_ = g_file_get_path (ui_file);
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp4_ = _tmp3_;
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
-		gtk_builder_add_from_file (_tmp2_, _tmp4_, &_inner_error_);
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_free0 (_tmp4_);
-#line 569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 575 "/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"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5015 "Page.c"
-			goto __catch253_g_error;
+#line 5048 "Page.c"
+			goto __catch254_g_error;
 		}
 	}
-	goto __finally253;
-	__catch253_g_error:
+	goto __finally254;
+	__catch254_g_error:
 	{
 		GError* err = NULL;
+		GError* _tmp3_ = NULL;
+		const gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		Application* _tmp11_ = NULL;
-		Application* _tmp12_ = NULL;
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+		Application* _tmp7_ = NULL;
+		Application* _tmp8_ = NULL;
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp5_ = g_file_get_path (ui_file);
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp3_ = err;
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp4_ = _tmp3_->message;
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp5_ = g_strdup_printf ("Error loading UI resource %s: %s", ui_resource, _tmp4_);
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp7_ = err;
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp8_ = _tmp7_->message;
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp9_ = g_strdup_printf ("Error loading UI file %s: %s", _tmp6_, _tmp8_);
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp10_ = _tmp9_;
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		app_window_error_message (_tmp10_, NULL);
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_free0 (_tmp10_);
-#line 571 "/home/jens/Source/shotwell/src/Page.vala"
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
+		app_window_error_message (_tmp6_, NULL);
+#line 577 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp6_);
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp11_ = application_get_instance ();
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
-		_tmp12_ = _tmp11_;
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
-		application_panic (_tmp12_);
-#line 573 "/home/jens/Source/shotwell/src/Page.vala"
-		_application_unref0 (_tmp12_);
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 579 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp7_ = application_get_instance ();
+#line 579 "/home/jens/Source/shotwell/src/Page.vala"
+		_tmp8_ = _tmp7_;
+#line 579 "/home/jens/Source/shotwell/src/Page.vala"
+		application_panic (_tmp8_);
+#line 579 "/home/jens/Source/shotwell/src/Page.vala"
+		_application_unref0 (_tmp8_);
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 5063 "Page.c"
+#line 5088 "Page.c"
 	}
-	__finally253:
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+	__finally254:
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
-		_g_object_unref0 (ui_file);
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
+		_g_free0 (ui_resource);
+#line 574 "/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 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 568 "/home/jens/Source/shotwell/src/Page.vala"
+#line 574 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5076 "Page.c"
+#line 5101 "Page.c"
 	}
-#line 565 "/home/jens/Source/shotwell/src/Page.vala"
-	_g_object_unref0 (ui_file);
-#line 5080 "Page.c"
+#line 572 "/home/jens/Source/shotwell/src/Page.vala"
+	_g_free0 (ui_resource);
+#line 5105 "Page.c"
 }
 
 
 static void page_real_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 5087 "Page.c"
+#line 5112 "Page.c"
 }
 
 
 void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames) {
-#line 580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 580 "/home/jens/Source/shotwell/src/Page.vala"
+#line 586 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_collect_ui_filenames (self, ui_filenames);
-#line 5096 "Page.c"
+#line 5121 "Page.c"
 }
 
 
@@ -5101,32 +5126,32 @@ static InjectionGroup** page_real_init_collect_injection_groups (Page* self, int
 	InjectionGroup** _tmp0_ = NULL;
 	InjectionGroup** _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = g_new0 (InjectionGroup*, 0 + 1);
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1__length1 = 0;
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	if (result_length1) {
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 		*result_length1 = _tmp1__length1;
-#line 5115 "Page.c"
+#line 5140 "Page.c"
 	}
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 586 "/home/jens/Source/shotwell/src/Page.vala"
+#line 592 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5121 "Page.c"
+#line 5146 "Page.c"
 }
 
 
 InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1) {
-#line 585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 591 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 591 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->init_collect_injection_groups (self, result_length1);
-#line 5130 "Page.c"
+#line 5155 "Page.c"
 }
 
 
@@ -5135,11 +5160,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 591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 597 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 591 "/home/jens/Source/shotwell/src/Page.vala"
+#line 597 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->init_actions (self, selected_count, count);
-#line 5143 "Page.c"
+#line 5168 "Page.c"
 }
 
 
@@ -5148,48 +5173,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 597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 603 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->update_actions (self, selected_count, count);
-#line 5156 "Page.c"
+#line 5181 "Page.c"
 }
 
 
 static void _page_on_drag_begin_gtk_widget_drag_begin (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_begin ((Page*) self, context);
-#line 5163 "Page.c"
+#line 5188 "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 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 619 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_get ((Page*) self, context, selection_data, info, time_);
-#line 5170 "Page.c"
+#line 5195 "Page.c"
 }
 
 
 static void _page_on_drag_data_delete_gtk_widget_drag_data_delete (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 620 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_data_delete ((Page*) self, context);
-#line 5177 "Page.c"
+#line 5202 "Page.c"
 }
 
 
 static void _page_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 621 "/home/jens/Source/shotwell/src/Page.vala"
 	page_on_drag_end ((Page*) self, context);
-#line 5184 "Page.c"
+#line 5209 "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 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 622 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5193 "Page.c"
+#line 5218 "Page.c"
 }
 
 
@@ -5205,53 +5230,53 @@ void page_enable_drag_source (Page* self, GdkDragAction actions, GtkTargetEntry*
 	GtkWidget* _tmp7_ = NULL;
 	GtkWidget* _tmp8_ = NULL;
 	GtkWidget* _tmp9_ = NULL;
-#line 602 "/home/jens/Source/shotwell/src/Page.vala"
+#line 608 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 609 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 609 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 610 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5217 "Page.c"
+#line 5242 "Page.c"
 	}
-#line 606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 612 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 612 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source != null");
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = source_target_entries;
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3__length1 = source_target_entries_length1;
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = actions;
-#line 608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 614 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_set (_tmp2_, GDK_BUTTON1_MASK, _tmp3_, _tmp3__length1, _tmp4_);
-#line 612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->event_source;
-#line 612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 618 "/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 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 619 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 619 "/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 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 620 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->event_source;
-#line 614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 620 "/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 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 621 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 615 "/home/jens/Source/shotwell/src/Page.vala"
+#line 621 "/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 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 622 "/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 618 "/home/jens/Source/shotwell/src/Page.vala"
+#line 624 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = TRUE;
-#line 5255 "Page.c"
+#line 5280 "Page.c"
 }
 
 
@@ -5269,86 +5294,86 @@ void page_disable_drag_source (Page* self) {
 	GtkWidget* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
 	GtkWidget* _tmp12_ = NULL;
-#line 621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 627 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 628 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 628 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 623 "/home/jens/Source/shotwell/src/Page.vala"
+#line 629 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 5281 "Page.c"
+#line 5306 "Page.c"
 	}
-#line 625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 631 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 631 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source != null");
-#line 627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp3_, NULL, FALSE);
-#line 627 "/home/jens/Source/shotwell/src/Page.vala"
+#line 633 "/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 628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 634 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 634 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp5_, NULL, FALSE);
-#line 628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 634 "/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 629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->event_source;
-#line 629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 635 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-data-delete", gtk_widget_get_type (), &_tmp7_, NULL, FALSE);
-#line 629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 635 "/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 630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 636 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->event_source;
-#line 630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 636 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp9_, NULL, FALSE);
-#line 630 "/home/jens/Source/shotwell/src/Page.vala"
+#line 636 "/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 631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->event_source;
-#line 631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 637 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp11_, NULL, FALSE);
-#line 631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 637 "/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 632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->event_source;
-#line 632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 638 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_drag_source_unset (_tmp12_);
-#line 634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 640 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->dnd_enabled = FALSE;
-#line 5323 "Page.c"
+#line 5348 "Page.c"
 }
 
 
 gboolean page_is_dnd_enabled (Page* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 643 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 644 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->dnd_enabled;
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 644 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 638 "/home/jens/Source/shotwell/src/Page.vala"
+#line 644 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5338 "Page.c"
+#line 5363 "Page.c"
 }
 
 
 static void page_on_drag_begin (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 647 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 641 "/home/jens/Source/shotwell/src/Page.vala"
+#line 647 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 648 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 642 "/home/jens/Source/shotwell/src/Page.vala"
+#line 648 "/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 5352 "Page.c"
+#line 5377 "Page.c"
 }
 
 
@@ -5357,72 +5382,72 @@ static void page_on_drag_data_get (Page* self, GdkDragContext* context, GtkSelec
 	GtkSelectionData* _tmp1_ = NULL;
 	guint _tmp2_ = 0U;
 	guint _tmp3_ = 0U;
-#line 645 "/home/jens/Source/shotwell/src/Page.vala"
+#line 651 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 645 "/home/jens/Source/shotwell/src/Page.vala"
+#line 651 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 645 "/home/jens/Source/shotwell/src/Page.vala"
+#line 651 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = selection_data;
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = info;
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = time;
-#line 647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 653 "/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 5377 "Page.c"
+#line 5402 "Page.c"
 }
 
 
 static void page_on_drag_data_delete (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 656 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 656 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 657 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 651 "/home/jens/Source/shotwell/src/Page.vala"
+#line 657 "/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 5391 "Page.c"
+#line 5416 "Page.c"
 }
 
 
 static void page_on_drag_end (Page* self, GdkDragContext* context) {
 	GdkDragContext* _tmp0_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 660 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 654 "/home/jens/Source/shotwell/src/Page.vala"
+#line 660 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 661 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 661 "/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 5405 "Page.c"
+#line 5430 "Page.c"
 }
 
 
 static gboolean page_real_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
 	gboolean result = FALSE;
-#line 662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 663 "/home/jens/Source/shotwell/src/Page.vala"
+#line 669 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5417 "Page.c"
+#line 5442 "Page.c"
 }
 
 
 gboolean page_source_drag_failed (Page* self, GdkDragContext* context, GtkDragResult drag_result) {
-#line 662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 668 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->source_drag_failed (self, context, drag_result);
-#line 5426 "Page.c"
+#line 5451 "Page.c"
 }
 
 
@@ -5431,21 +5456,21 @@ static gboolean page_on_drag_failed (Page* self, GdkDragContext* context, GtkDra
 	GdkDragContext* _tmp0_ = NULL;
 	GtkDragResult _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 672 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = context;
-#line 667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = drag_result;
-#line 667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_source_drag_failed (self, _tmp0_, _tmp1_);
-#line 667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp2_;
-#line 667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 673 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5449 "Page.c"
+#line 5474 "Page.c"
 }
 
 
@@ -5474,291 +5499,291 @@ gboolean page_get_event_source_pointer (Page* self, gint* x, gint* y, GdkModifie
 	GdkPoint _tmp20_ = {0};
 	gint _tmp21_ = 0;
 	gint _tmp22_ = 0;
-#line 674 "/home/jens/Source/shotwell/src/Page.vala"
+#line 680 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 681 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 676 "/home/jens/Source/shotwell/src/Page.vala"
+#line 682 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = 0;
-#line 677 "/home/jens/Source/shotwell/src/Page.vala"
+#line 683 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = 0;
-#line 678 "/home/jens/Source/shotwell/src/Page.vala"
+#line 684 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_mask = 0;
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5496 "Page.c"
+#line 5521 "Page.c"
 		}
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5502 "Page.c"
+#line 5527 "Page.c"
 		}
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5508 "Page.c"
+#line 5533 "Page.c"
 		}
-#line 680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 686 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5512 "Page.c"
+#line 5537 "Page.c"
 	}
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->event_source;
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gdk_display_get_default ();
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_display_get_device_manager (_tmp3_);
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_device_manager_get_client_pointer (_tmp4_);
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_window_get_device_position (_tmp2_, _tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_x = _tmp6_;
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_y = _tmp7_;
-#line 683 "/home/jens/Source/shotwell/src/Page.vala"
+#line 689 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_mask = _tmp8_;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->last_down;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_.x;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_ < 0) {
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = TRUE;
-#line 5540 "Page.c"
+#line 5565 "Page.c"
 	} else {
 		GdkPoint _tmp12_ = {0};
 		gint _tmp13_ = 0;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->last_down;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.y;
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp13_ < 0;
-#line 5550 "Page.c"
+#line 5575 "Page.c"
 	}
-#line 686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 692 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 		if (x) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 			*x = _vala_x;
-#line 5560 "Page.c"
+#line 5585 "Page.c"
 		}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 		if (y) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 			*y = _vala_y;
-#line 5566 "Page.c"
+#line 5591 "Page.c"
 		}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 		if (mask) {
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 			*mask = _vala_mask;
-#line 5572 "Page.c"
+#line 5597 "Page.c"
 		}
-#line 687 "/home/jens/Source/shotwell/src/Page.vala"
+#line 693 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 5576 "Page.c"
+#line 5601 "Page.c"
 	}
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = _vala_x;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->last_down;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_.x;
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = abs (_tmp14_ - _tmp16_);
-#line 693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 699 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp17_ >= 0x7FFF) {
-#line 5588 "Page.c"
+#line 5613 "Page.c"
 		gint _tmp18_ = 0;
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 700 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _vala_x;
-#line 694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 700 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_x = _tmp18_ + 0xFFFF;
-#line 5594 "Page.c"
+#line 5619 "Page.c"
 	}
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _vala_y;
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->last_down;
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = _tmp20_.y;
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = abs (_tmp19_ - _tmp21_);
-#line 696 "/home/jens/Source/shotwell/src/Page.vala"
+#line 702 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp22_ >= 0x7FFF) {
-#line 5606 "Page.c"
+#line 5631 "Page.c"
 		gint _tmp23_ = 0;
-#line 697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 703 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _vala_y;
-#line 697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 703 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_y = _tmp23_ + 0xFFFF;
-#line 5612 "Page.c"
+#line 5637 "Page.c"
 	}
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	if (x) {
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 		*x = _vala_x;
-#line 5620 "Page.c"
+#line 5645 "Page.c"
 	}
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	if (y) {
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 		*y = _vala_y;
-#line 5626 "Page.c"
+#line 5651 "Page.c"
 	}
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	if (mask) {
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 		*mask = _vala_mask;
-#line 5632 "Page.c"
+#line 5657 "Page.c"
 	}
-#line 699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 705 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5636 "Page.c"
+#line 5661 "Page.c"
 }
 
 
 static gboolean page_real_on_left_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 708 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 709 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 709 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5648 "Page.c"
+#line 5673 "Page.c"
 }
 
 
 gboolean page_on_left_click (Page* self, GdkEventButton* event) {
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 708 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 702 "/home/jens/Source/shotwell/src/Page.vala"
+#line 708 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_click (self, event);
-#line 5657 "Page.c"
+#line 5682 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 712 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 713 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5669 "Page.c"
+#line 5694 "Page.c"
 }
 
 
 gboolean page_on_middle_click (Page* self, GdkEventButton* event) {
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 712 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 706 "/home/jens/Source/shotwell/src/Page.vala"
+#line 712 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_click (self, event);
-#line 5678 "Page.c"
+#line 5703 "Page.c"
 }
 
 
 static gboolean page_real_on_right_click (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 716 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 717 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 711 "/home/jens/Source/shotwell/src/Page.vala"
+#line 717 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5690 "Page.c"
+#line 5715 "Page.c"
 }
 
 
 gboolean page_on_right_click (Page* self, GdkEventButton* event) {
-#line 710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 716 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 710 "/home/jens/Source/shotwell/src/Page.vala"
+#line 716 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_click (self, event);
-#line 5699 "Page.c"
+#line 5724 "Page.c"
 }
 
 
 static gboolean page_real_on_left_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 720 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 721 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 715 "/home/jens/Source/shotwell/src/Page.vala"
+#line 721 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5711 "Page.c"
+#line 5736 "Page.c"
 }
 
 
 gboolean page_on_left_released (Page* self, GdkEventButton* event) {
-#line 714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 720 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 720 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_left_released (self, event);
-#line 5720 "Page.c"
+#line 5745 "Page.c"
 }
 
 
 static gboolean page_real_on_middle_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 725 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 719 "/home/jens/Source/shotwell/src/Page.vala"
+#line 725 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5732 "Page.c"
+#line 5757 "Page.c"
 }
 
 
 gboolean page_on_middle_released (Page* self, GdkEventButton* event) {
-#line 718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 724 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_middle_released (self, event);
-#line 5741 "Page.c"
+#line 5766 "Page.c"
 }
 
 
 static gboolean page_real_on_right_released (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 729 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 729 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5753 "Page.c"
+#line 5778 "Page.c"
 }
 
 
 gboolean page_on_right_released (Page* self, GdkEventButton* event) {
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 722 "/home/jens/Source/shotwell/src/Page.vala"
+#line 728 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_right_released (self, event);
-#line 5762 "Page.c"
+#line 5787 "Page.c"
 }
 
 
@@ -5766,19 +5791,19 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 732 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 732 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 5782 "Page.c"
+#line 5807 "Page.c"
 		{
 			GtkWidget* _tmp2_ = NULL;
 			GdkEventButton* _tmp4_ = NULL;
@@ -5787,79 +5812,79 @@ static gboolean page_on_button_pressed_internal (Page* self, GdkEventButton* eve
 			gdouble _tmp7_ = 0.0;
 			GdkEventButton* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 735 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = self->priv->event_source;
-#line 729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 735 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp2_ != NULL) {
-#line 5795 "Page.c"
+#line 5820 "Page.c"
 				GtkWidget* _tmp3_ = NULL;
-#line 730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp3_ = self->priv->event_source;
-#line 730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 736 "/home/jens/Source/shotwell/src/Page.vala"
 				gtk_widget_grab_focus (_tmp3_);
-#line 5801 "Page.c"
+#line 5826 "Page.c"
 			}
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp4_->x;
-#line 733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 739 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down.x = (gint) _tmp5_;
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 740 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 740 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _tmp6_->y;
-#line 734 "/home/jens/Source/shotwell/src/Page.vala"
+#line 740 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down.y = (gint) _tmp7_;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_left_click (self, _tmp8_);
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 736 "/home/jens/Source/shotwell/src/Page.vala"
+#line 742 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5823 "Page.c"
+#line 5848 "Page.c"
 		}
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 5827 "Page.c"
+#line 5852 "Page.c"
 		{
 			GdkEventButton* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = event;
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = page_on_middle_click (self, _tmp10_);
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp11_;
-#line 739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 745 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5839 "Page.c"
+#line 5864 "Page.c"
 		}
-#line 727 "/home/jens/Source/shotwell/src/Page.vala"
+#line 733 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 5843 "Page.c"
+#line 5868 "Page.c"
 		{
 			GdkEventButton* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 748 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = event;
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 748 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = page_on_right_click (self, _tmp12_);
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 748 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp13_;
-#line 742 "/home/jens/Source/shotwell/src/Page.vala"
+#line 748 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5855 "Page.c"
+#line 5880 "Page.c"
 		}
 		default:
 		{
-#line 745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 751 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 751 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5863 "Page.c"
+#line 5888 "Page.c"
 		}
 	}
 }
@@ -5869,78 +5894,78 @@ static gboolean page_on_button_released_internal (Page* self, GdkEventButton* ev
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 755 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 755 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->button;
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 		case 1:
-#line 5885 "Page.c"
+#line 5910 "Page.c"
 		{
 			GdkPoint _tmp2_ = {0};
 			GdkEventButton* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
-#line 753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 759 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.x = -1;
-#line 753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 759 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_.y = -1;
-#line 753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 759 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->last_down = _tmp2_;
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = event;
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = page_on_left_released (self, _tmp3_);
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp4_;
-#line 755 "/home/jens/Source/shotwell/src/Page.vala"
+#line 761 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5904 "Page.c"
+#line 5929 "Page.c"
 		}
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 		case 2:
-#line 5908 "Page.c"
+#line 5933 "Page.c"
 		{
 			GdkEventButton* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = event;
-#line 758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = page_on_middle_released (self, _tmp5_);
-#line 758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp6_;
-#line 758 "/home/jens/Source/shotwell/src/Page.vala"
+#line 764 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5920 "Page.c"
+#line 5945 "Page.c"
 		}
-#line 750 "/home/jens/Source/shotwell/src/Page.vala"
+#line 756 "/home/jens/Source/shotwell/src/Page.vala"
 		case 3:
-#line 5924 "Page.c"
+#line 5949 "Page.c"
 		{
 			GdkEventButton* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = event;
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = page_on_right_released (self, _tmp7_);
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp8_;
-#line 761 "/home/jens/Source/shotwell/src/Page.vala"
+#line 767 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5936 "Page.c"
+#line 5961 "Page.c"
 		}
 		default:
 		{
-#line 764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 770 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 770 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 5944 "Page.c"
+#line 5969 "Page.c"
 		}
 	}
 }
@@ -5948,195 +5973,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 769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 775 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 769 "/home/jens/Source/shotwell/src/Page.vala"
+#line 775 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5956 "Page.c"
+#line 5981 "Page.c"
 }
 
 
 gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event) {
-#line 768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 774 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 774 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_pressed (self, event);
-#line 5965 "Page.c"
+#line 5990 "Page.c"
 }
 
 
 static gboolean page_real_on_ctrl_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 773 "/home/jens/Source/shotwell/src/Page.vala"
+#line 779 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 773 "/home/jens/Source/shotwell/src/Page.vala"
+#line 779 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5975 "Page.c"
+#line 6000 "Page.c"
 }
 
 
 gboolean page_on_ctrl_released (Page* self, GdkEventKey* event) {
-#line 772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 778 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 778 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_ctrl_released (self, event);
-#line 5984 "Page.c"
+#line 6009 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 783 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 783 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 5994 "Page.c"
+#line 6019 "Page.c"
 }
 
 
 gboolean page_on_alt_pressed (Page* self, GdkEventKey* event) {
-#line 776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 782 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 782 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_pressed (self, event);
-#line 6003 "Page.c"
+#line 6028 "Page.c"
 }
 
 
 static gboolean page_real_on_alt_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 787 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 787 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6013 "Page.c"
+#line 6038 "Page.c"
 }
 
 
 gboolean page_on_alt_released (Page* self, GdkEventKey* event) {
-#line 780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 786 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 786 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_alt_released (self, event);
-#line 6022 "Page.c"
+#line 6047 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 791 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 791 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6032 "Page.c"
+#line 6057 "Page.c"
 }
 
 
 gboolean page_on_shift_pressed (Page* self, GdkEventKey* event) {
-#line 784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 790 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 790 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_pressed (self, event);
-#line 6041 "Page.c"
+#line 6066 "Page.c"
 }
 
 
 static gboolean page_real_on_shift_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 789 "/home/jens/Source/shotwell/src/Page.vala"
+#line 795 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 789 "/home/jens/Source/shotwell/src/Page.vala"
+#line 795 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6051 "Page.c"
+#line 6076 "Page.c"
 }
 
 
 gboolean page_on_shift_released (Page* self, GdkEventKey* event) {
-#line 788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 794 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 794 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_shift_released (self, event);
-#line 6060 "Page.c"
+#line 6085 "Page.c"
 }
 
 
 static gboolean page_real_on_super_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 793 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 793 "/home/jens/Source/shotwell/src/Page.vala"
+#line 799 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6070 "Page.c"
+#line 6095 "Page.c"
 }
 
 
 gboolean page_on_super_pressed (Page* self, GdkEventKey* event) {
-#line 792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 798 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 798 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_pressed (self, event);
-#line 6079 "Page.c"
+#line 6104 "Page.c"
 }
 
 
 static gboolean page_real_on_super_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 797 "/home/jens/Source/shotwell/src/Page.vala"
+#line 803 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6089 "Page.c"
+#line 6114 "Page.c"
 }
 
 
 gboolean page_on_super_released (Page* self, GdkEventKey* event) {
-#line 796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 802 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_super_released (self, event);
-#line 6098 "Page.c"
+#line 6123 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_pressed (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 807 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 801 "/home/jens/Source/shotwell/src/Page.vala"
+#line 807 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6110 "Page.c"
+#line 6135 "Page.c"
 }
 
 
 gboolean page_on_app_key_pressed (Page* self, GdkEventKey* event) {
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 800 "/home/jens/Source/shotwell/src/Page.vala"
+#line 806 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_pressed (self, event);
-#line 6119 "Page.c"
+#line 6144 "Page.c"
 }
 
 
 static gboolean page_real_on_app_key_released (Page* self, GdkEventKey* event) {
 	gboolean result = FALSE;
-#line 804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 810 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 811 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 805 "/home/jens/Source/shotwell/src/Page.vala"
+#line 811 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6131 "Page.c"
+#line 6156 "Page.c"
 }
 
 
 gboolean page_on_app_key_released (Page* self, GdkEventKey* event) {
-#line 804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 810 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 810 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_app_key_released (self, event);
-#line 6140 "Page.c"
+#line 6165 "Page.c"
 }
 
 
@@ -6155,248 +6180,248 @@ gboolean page_notify_app_key_pressed (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	GQuark _tmp9_ = 0U;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6179 "Page.c"
+#line 6204 "Page.c"
 	GdkEventKey* _tmp30_ = NULL;
 	gboolean _tmp31_ = FALSE;
-#line 808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 814 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 811 "/home/jens/Source/shotwell/src/Page.vala"
+#line 817 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/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 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6210 "Page.c"
+#line 6235 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_ = FALSE;
 				GdkEventKey* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp11_) {
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6223 "Page.c"
+#line 6248 "Page.c"
 				} else {
 					gboolean _tmp12_ = FALSE;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = _tmp12_;
-#line 6230 "Page.c"
+#line 6255 "Page.c"
 				}
-#line 817 "/home/jens/Source/shotwell/src/Page.vala"
+#line 823 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 824 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 824 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6238 "Page.c"
+#line 6263 "Page.c"
 				}
-#line 820 "/home/jens/Source/shotwell/src/Page.vala"
+#line 826 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->ctrl_pressed = TRUE;
-#line 822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_pressed (self, _tmp13_);
-#line 822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 822 "/home/jens/Source/shotwell/src/Page.vala"
+#line 828 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6250 "Page.c"
+#line 6275 "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 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6256 "Page.c"
+#line 6281 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_ = FALSE;
 				GdkEventKey* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp16_) {
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6269 "Page.c"
+#line 6294 "Page.c"
 				} else {
 					gboolean _tmp17_ = FALSE;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = _tmp17_;
-#line 6276 "Page.c"
+#line 6301 "Page.c"
 				}
-#line 828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 834 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 835 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 829 "/home/jens/Source/shotwell/src/Page.vala"
+#line 835 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6284 "Page.c"
+#line 6309 "Page.c"
 				}
-#line 831 "/home/jens/Source/shotwell/src/Page.vala"
+#line 837 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->alt_pressed = TRUE;
-#line 833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_pressed (self, _tmp18_);
-#line 833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 839 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6296 "Page.c"
+#line 6321 "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 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6302 "Page.c"
+#line 6327 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_ = FALSE;
 				GdkEventKey* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp21_) {
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6315 "Page.c"
+#line 6340 "Page.c"
 				} else {
 					gboolean _tmp22_ = FALSE;
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = _tmp22_;
-#line 6322 "Page.c"
+#line 6347 "Page.c"
 				}
-#line 837 "/home/jens/Source/shotwell/src/Page.vala"
+#line 843 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 838 "/home/jens/Source/shotwell/src/Page.vala"
+#line 844 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 838 "/home/jens/Source/shotwell/src/Page.vala"
+#line 844 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6330 "Page.c"
+#line 6355 "Page.c"
 				}
-#line 840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 846 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->shift_pressed = TRUE;
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_pressed (self, _tmp23_);
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 842 "/home/jens/Source/shotwell/src/Page.vala"
+#line 848 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6342 "Page.c"
+#line 6367 "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 814 "/home/jens/Source/shotwell/src/Page.vala"
+#line 820 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6348 "Page.c"
+#line 6373 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_ = FALSE;
 				GdkEventKey* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp26_) {
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6361 "Page.c"
+#line 6386 "Page.c"
 				} else {
 					gboolean _tmp27_ = FALSE;
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = _tmp27_;
-#line 6368 "Page.c"
+#line 6393 "Page.c"
 				}
-#line 846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 852 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 853 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 853 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6376 "Page.c"
+#line 6401 "Page.c"
 				}
-#line 849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 855 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->super_pressed = TRUE;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_pressed (self, _tmp28_);
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 851 "/home/jens/Source/shotwell/src/Page.vala"
+#line 857 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6388 "Page.c"
+#line 6413 "Page.c"
 			}
 		}
 	}
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_pressed (self, _tmp30_);
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 860 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6400 "Page.c"
+#line 6425 "Page.c"
 }
 
 
@@ -6415,406 +6440,406 @@ gboolean page_notify_app_key_released (Page* self, GdkEventKey* event) {
 	const gchar* _tmp6_ = NULL;
 	const gchar* _tmp7_ = NULL;
 	GQuark _tmp9_ = 0U;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label0 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label1 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label2 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label3 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label4 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label5 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label6 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label7 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label8 = 0;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp8_label9 = 0;
-#line 6439 "Page.c"
+#line 6464 "Page.c"
 	GdkEventKey* _tmp30_ = NULL;
 	gboolean _tmp31_ = FALSE;
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 863 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 	page_get_modifiers (self, &_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_);
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 	ctrl_currently_pressed = _tmp0_;
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 	alt_currently_pressed = _tmp1_;
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 	shift_currently_pressed = _tmp2_;
-#line 860 "/home/jens/Source/shotwell/src/Page.vala"
+#line 866 "/home/jens/Source/shotwell/src/Page.vala"
 	super_currently_pressed = _tmp3_;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->keyval;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = gdk_keyval_name (_tmp5_);
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = (NULL == _tmp7_) ? 0 : g_quark_from_string (_tmp7_);
-#line 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/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 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6470 "Page.c"
+#line 6495 "Page.c"
 			default:
 			{
 				gboolean _tmp10_ = FALSE;
 				gboolean _tmp11_ = FALSE;
 				GdkEventKey* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = ctrl_currently_pressed;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp11_) {
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = TRUE;
-#line 6483 "Page.c"
+#line 6508 "Page.c"
 				} else {
 					gboolean _tmp12_ = FALSE;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = self->priv->ctrl_pressed;
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = !_tmp12_;
-#line 6490 "Page.c"
+#line 6515 "Page.c"
 				}
-#line 866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 872 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp10_) {
-#line 867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 873 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 873 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6498 "Page.c"
+#line 6523 "Page.c"
 				}
-#line 869 "/home/jens/Source/shotwell/src/Page.vala"
+#line 875 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->ctrl_pressed = FALSE;
-#line 871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = event;
-#line 871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = page_on_ctrl_released (self, _tmp13_);
-#line 871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp14_;
-#line 871 "/home/jens/Source/shotwell/src/Page.vala"
+#line 877 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6510 "Page.c"
+#line 6535 "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 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6516 "Page.c"
+#line 6541 "Page.c"
 			default:
 			{
 				gboolean _tmp15_ = FALSE;
 				gboolean _tmp16_ = FALSE;
 				GdkEventKey* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = alt_currently_pressed;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_) {
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = TRUE;
-#line 6529 "Page.c"
+#line 6554 "Page.c"
 				} else {
 					gboolean _tmp17_ = FALSE;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = self->priv->alt_pressed;
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = !_tmp17_;
-#line 6536 "Page.c"
+#line 6561 "Page.c"
 				}
-#line 877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 883 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp15_) {
-#line 878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 884 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 878 "/home/jens/Source/shotwell/src/Page.vala"
+#line 884 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6544 "Page.c"
+#line 6569 "Page.c"
 				}
-#line 880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 886 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->alt_pressed = FALSE;
-#line 882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = event;
-#line 882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_on_alt_released (self, _tmp18_);
-#line 882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp19_;
-#line 882 "/home/jens/Source/shotwell/src/Page.vala"
+#line 888 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6556 "Page.c"
+#line 6581 "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 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6562 "Page.c"
+#line 6587 "Page.c"
 			default:
 			{
 				gboolean _tmp20_ = FALSE;
 				gboolean _tmp21_ = FALSE;
 				GdkEventKey* _tmp23_ = NULL;
 				gboolean _tmp24_ = FALSE;
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = shift_currently_pressed;
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp21_) {
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = TRUE;
-#line 6575 "Page.c"
+#line 6600 "Page.c"
 				} else {
 					gboolean _tmp22_ = FALSE;
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = self->priv->shift_pressed;
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = !_tmp22_;
-#line 6582 "Page.c"
+#line 6607 "Page.c"
 				}
-#line 886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 892 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp20_) {
-#line 887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 893 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 893 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6590 "Page.c"
+#line 6615 "Page.c"
 				}
-#line 889 "/home/jens/Source/shotwell/src/Page.vala"
+#line 895 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->shift_pressed = FALSE;
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 897 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = event;
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 897 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = page_on_shift_released (self, _tmp23_);
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 897 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp24_;
-#line 891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 897 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6602 "Page.c"
+#line 6627 "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 863 "/home/jens/Source/shotwell/src/Page.vala"
+#line 869 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 6608 "Page.c"
+#line 6633 "Page.c"
 			default:
 			{
 				gboolean _tmp25_ = FALSE;
 				gboolean _tmp26_ = FALSE;
 				GdkEventKey* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = super_currently_pressed;
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp26_) {
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = TRUE;
-#line 6621 "Page.c"
+#line 6646 "Page.c"
 				} else {
 					gboolean _tmp27_ = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = self->priv->super_pressed;
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = !_tmp27_;
-#line 6628 "Page.c"
+#line 6653 "Page.c"
 				}
-#line 895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 901 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp25_) {
-#line 896 "/home/jens/Source/shotwell/src/Page.vala"
+#line 902 "/home/jens/Source/shotwell/src/Page.vala"
 					result = FALSE;
-#line 896 "/home/jens/Source/shotwell/src/Page.vala"
+#line 902 "/home/jens/Source/shotwell/src/Page.vala"
 					return result;
-#line 6636 "Page.c"
+#line 6661 "Page.c"
 				}
-#line 898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 904 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->super_pressed = FALSE;
-#line 900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 906 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = event;
-#line 900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 906 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = page_on_super_released (self, _tmp28_);
-#line 900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 906 "/home/jens/Source/shotwell/src/Page.vala"
 				result = _tmp29_;
-#line 900 "/home/jens/Source/shotwell/src/Page.vala"
+#line 906 "/home/jens/Source/shotwell/src/Page.vala"
 				return result;
-#line 6648 "Page.c"
+#line 6673 "Page.c"
 			}
 		}
 	}
-#line 903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 909 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = event;
-#line 903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 909 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = page_on_app_key_released (self, _tmp30_);
-#line 903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 909 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp31_;
-#line 903 "/home/jens/Source/shotwell/src/Page.vala"
+#line 909 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6660 "Page.c"
+#line 6685 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_in (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 912 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 906 "/home/jens/Source/shotwell/src/Page.vala"
+#line 912 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 913 "/home/jens/Source/shotwell/src/Page.vala"
 	page_update_modifiers (self);
-#line 909 "/home/jens/Source/shotwell/src/Page.vala"
+#line 915 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 909 "/home/jens/Source/shotwell/src/Page.vala"
+#line 915 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6676 "Page.c"
+#line 6701 "Page.c"
 }
 
 
 gboolean page_notify_app_focus_out (Page* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 918 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 912 "/home/jens/Source/shotwell/src/Page.vala"
+#line 918 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 919 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 919 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6690 "Page.c"
+#line 6715 "Page.c"
 }
 
 
 static void page_real_on_move (Page* self, GdkRectangle* rect) {
-#line 916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6697 "Page.c"
+#line 6722 "Page.c"
 }
 
 
 void page_on_move (Page* self, GdkRectangle* rect) {
-#line 916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 922 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move (self, rect);
-#line 6706 "Page.c"
+#line 6731 "Page.c"
 }
 
 
 static void page_real_on_move_start (Page* self, GdkRectangle* rect) {
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 925 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6713 "Page.c"
+#line 6738 "Page.c"
 }
 
 
 void page_on_move_start (Page* self, GdkRectangle* rect) {
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 925 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 919 "/home/jens/Source/shotwell/src/Page.vala"
+#line 925 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_start (self, rect);
-#line 6722 "Page.c"
+#line 6747 "Page.c"
 }
 
 
 static void page_real_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6729 "Page.c"
+#line 6754 "Page.c"
 }
 
 
 void page_on_move_finished (Page* self, GdkRectangle* rect) {
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 922 "/home/jens/Source/shotwell/src/Page.vala"
+#line 928 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_move_finished (self, rect);
-#line 6738 "Page.c"
+#line 6763 "Page.c"
 }
 
 
 static void page_real_on_resize (Page* self, GdkRectangle* rect) {
-#line 925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6745 "Page.c"
+#line 6770 "Page.c"
 }
 
 
 void page_on_resize (Page* self, GdkRectangle* rect) {
-#line 925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 931 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize (self, rect);
-#line 6754 "Page.c"
+#line 6779 "Page.c"
 }
 
 
 static void page_real_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6761 "Page.c"
+#line 6786 "Page.c"
 }
 
 
 void page_on_resize_start (Page* self, GdkRectangle* rect) {
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 934 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_start (self, rect);
-#line 6770 "Page.c"
+#line 6795 "Page.c"
 }
 
 
 static void page_real_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 937 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 6777 "Page.c"
+#line 6802 "Page.c"
 }
 
 
 void page_on_resize_finished (Page* self, GdkRectangle* rect) {
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 937 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 937 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->on_resize_finished (self, rect);
-#line 6786 "Page.c"
+#line 6811 "Page.c"
 }
 
 
 static gboolean page_real_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
 	gboolean result = FALSE;
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (rect != NULL, FALSE);
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 941 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 941 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6800 "Page.c"
+#line 6825 "Page.c"
 }
 
 
 gboolean page_on_configure (Page* self, GdkEventConfigure* event, GdkRectangle* rect) {
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 934 "/home/jens/Source/shotwell/src/Page.vala"
+#line 940 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_configure (self, event, rect);
-#line 6809 "Page.c"
+#line 6834 "Page.c"
 }
 
 
 static gboolean _page_check_configure_halted_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_check_configure_halted ((Page*) self);
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 6818 "Page.c"
+#line 6843 "Page.c"
 }
 
 
@@ -6845,41 +6870,41 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 	GdkEventConfigure* _tmp51_ = NULL;
 	GdkRectangle _tmp52_ = {0};
 	gboolean _tmp53_ = FALSE;
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 944 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 944 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 939 "/home/jens/Source/shotwell/src/Page.vala"
+#line 945 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&rect, 0, sizeof (GdkRectangle));
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 946 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 946 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->x;
-#line 940 "/home/jens/Source/shotwell/src/Page.vala"
+#line 946 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.x = _tmp1_;
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->y;
-#line 941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 947 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.y = _tmp3_;
-#line 942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->width;
-#line 942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 948 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.width = _tmp5_;
-#line 943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 949 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = event;
-#line 943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 949 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_->height;
-#line 943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 949 "/home/jens/Source/shotwell/src/Page.vala"
 	rect.height = _tmp7_;
-#line 946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->last_configure_ms;
-#line 946 "/home/jens/Source/shotwell/src/Page.vala"
+#line 952 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ == ((gulong) 0)) {
-#line 6883 "Page.c"
+#line 6908 "Page.c"
 		gboolean _tmp9_ = FALSE;
 		GdkRectangle _tmp10_ = {0};
 		gint _tmp11_ = 0;
@@ -6890,193 +6915,193 @@ gboolean page_notify_configure_event (Page* self, GdkEventConfigure* event) {
 		gint _tmp21_ = 0;
 		GdkRectangle _tmp22_ = {0};
 		gint _tmp23_ = 0;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->last_position;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_.x;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = rect;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_.x;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != _tmp13_) {
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = TRUE;
-#line 6906 "Page.c"
+#line 6931 "Page.c"
 		} else {
 			GdkRectangle _tmp14_ = {0};
 			gint _tmp15_ = 0;
 			GdkRectangle _tmp16_ = {0};
 			gint _tmp17_ = 0;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->priv->last_position;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_.y;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = rect;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = _tmp16_.y;
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = _tmp15_ != _tmp17_;
-#line 6922 "Page.c"
+#line 6947 "Page.c"
 		}
-#line 947 "/home/jens/Source/shotwell/src/Page.vala"
+#line 953 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp9_) {
-#line 6926 "Page.c"
+#line 6951 "Page.c"
 			GdkRectangle _tmp18_ = {0};
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 954 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = rect;
-#line 948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 954 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_move_start (self, &_tmp18_);
-#line 949 "/home/jens/Source/shotwell/src/Page.vala"
+#line 955 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_move_finished = TRUE;
-#line 6934 "Page.c"
+#line 6959 "Page.c"
 		}
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->last_position;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp20_.width;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = rect;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.width;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_ != _tmp23_) {
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = TRUE;
-#line 6948 "Page.c"
+#line 6973 "Page.c"
 		} else {
 			GdkRectangle _tmp24_ = {0};
 			gint _tmp25_ = 0;
 			GdkRectangle _tmp26_ = {0};
 			gint _tmp27_ = 0;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = self->priv->last_position;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = rect;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = _tmp26_.height;
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _tmp25_ != _tmp27_;
-#line 6964 "Page.c"
+#line 6989 "Page.c"
 		}
-#line 952 "/home/jens/Source/shotwell/src/Page.vala"
+#line 958 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp19_) {
-#line 6968 "Page.c"
+#line 6993 "Page.c"
 			GdkRectangle _tmp28_ = {0};
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 959 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = rect;
-#line 953 "/home/jens/Source/shotwell/src/Page.vala"
+#line 959 "/home/jens/Source/shotwell/src/Page.vala"
 			page_on_resize_start (self, &_tmp28_);
-#line 954 "/home/jens/Source/shotwell/src/Page.vala"
+#line 960 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->report_resize_finished = TRUE;
-#line 6976 "Page.c"
+#line 7001 "Page.c"
 		}
-#line 959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 965 "/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 6980 "Page.c"
+#line 7005 "Page.c"
 	}
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = self->priv->last_position;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = _tmp30_.x;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp32_ = rect;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp33_ = _tmp32_.x;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp31_ != _tmp33_) {
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = TRUE;
-#line 6994 "Page.c"
+#line 7019 "Page.c"
 	} else {
 		GdkRectangle _tmp34_ = {0};
 		gint _tmp35_ = 0;
 		GdkRectangle _tmp36_ = {0};
 		gint _tmp37_ = 0;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = self->priv->last_position;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp35_ = _tmp34_.y;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = rect;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = _tmp36_.y;
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp35_ != _tmp37_;
-#line 7010 "Page.c"
+#line 7035 "Page.c"
 	}
-#line 962 "/home/jens/Source/shotwell/src/Page.vala"
+#line 968 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 7014 "Page.c"
+#line 7039 "Page.c"
 		GdkRectangle _tmp38_ = {0};
-#line 963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 969 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = rect;
-#line 963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 969 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move (self, &_tmp38_);
-#line 7020 "Page.c"
+#line 7045 "Page.c"
 	}
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = self->priv->last_position;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = _tmp40_.width;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = rect;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = _tmp42_.width;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp41_ != _tmp43_) {
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = TRUE;
-#line 7034 "Page.c"
+#line 7059 "Page.c"
 	} else {
 		GdkRectangle _tmp44_ = {0};
 		gint _tmp45_ = 0;
 		GdkRectangle _tmp46_ = {0};
 		gint _tmp47_ = 0;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = self->priv->last_position;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_.height;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = rect;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = _tmp46_.height;
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp39_ = _tmp45_ != _tmp47_;
-#line 7050 "Page.c"
+#line 7075 "Page.c"
 	}
-#line 965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 971 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp39_) {
-#line 7054 "Page.c"
+#line 7079 "Page.c"
 		GdkRectangle _tmp48_ = {0};
-#line 966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 972 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = rect;
-#line 966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 972 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize (self, &_tmp48_);
-#line 7060 "Page.c"
+#line 7085 "Page.c"
 	}
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 974 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = rect;
-#line 968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 974 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_position = _tmp49_;
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 975 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = now_ms ();
-#line 969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 975 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = _tmp50_;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = event;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp52_ = rect;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = page_on_configure (self, _tmp51_, &_tmp52_);
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp53_;
-#line 971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 977 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7080 "Page.c"
+#line 7105 "Page.c"
 }
 
 
@@ -7089,117 +7114,117 @@ static gboolean page_check_configure_halted (Page* self) {
 	GtkAllocation _tmp3_ = {0};
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 974 "/home/jens/Source/shotwell/src/Page.vala"
+#line 980 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 981 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->is_destroyed;
-#line 975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 981 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 982 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 976 "/home/jens/Source/shotwell/src/Page.vala"
+#line 982 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7103 "Page.c"
+#line 7128 "Page.c"
 	}
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 984 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = now_ms ();
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 984 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_configure_ms;
-#line 978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 984 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp1_ - _tmp2_) < ((gulong) PAGE_CONSIDER_CONFIGURE_HALTED_MSEC)) {
-#line 979 "/home/jens/Source/shotwell/src/Page.vala"
+#line 985 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 979 "/home/jens/Source/shotwell/src/Page.vala"
+#line 985 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7115 "Page.c"
+#line 7140 "Page.c"
 	}
-#line 982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 988 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp3_);
-#line 982 "/home/jens/Source/shotwell/src/Page.vala"
+#line 988 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp3_;
-#line 984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 990 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->report_move_finished;
-#line 984 "/home/jens/Source/shotwell/src/Page.vala"
+#line 990 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 7125 "Page.c"
+#line 7150 "Page.c"
 		GtkAllocation _tmp5_ = {0};
 		GdkRectangle _tmp6_ = {0};
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 991 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = allocation;
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 991 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GdkRectangle) _tmp5_;
-#line 985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 991 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_move_finished (self, &_tmp6_);
-#line 7134 "Page.c"
+#line 7159 "Page.c"
 	}
-#line 987 "/home/jens/Source/shotwell/src/Page.vala"
+#line 993 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->report_resize_finished;
-#line 987 "/home/jens/Source/shotwell/src/Page.vala"
+#line 993 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_) {
-#line 7140 "Page.c"
+#line 7165 "Page.c"
 		GtkAllocation _tmp8_ = {0};
 		GdkRectangle _tmp9_ = {0};
-#line 988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 994 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = allocation;
-#line 988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 994 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = (GdkRectangle) _tmp8_;
-#line 988 "/home/jens/Source/shotwell/src/Page.vala"
+#line 994 "/home/jens/Source/shotwell/src/Page.vala"
 		page_on_resize_finished (self, &_tmp9_);
-#line 7149 "Page.c"
+#line 7174 "Page.c"
 	}
-#line 990 "/home/jens/Source/shotwell/src/Page.vala"
+#line 996 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_configure_ms = (gulong) 0;
-#line 991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 997 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_move_finished = FALSE;
-#line 992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 998 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->report_resize_finished = FALSE;
-#line 994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7161 "Page.c"
+#line 7186 "Page.c"
 }
 
 
 static gboolean page_real_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
 	gboolean result = FALSE;
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7175 "Page.c"
+#line 7200 "Page.c"
 }
 
 
 gboolean page_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 997 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_motion (self, event, x, y, mask);
-#line 7184 "Page.c"
+#line 7209 "Page.c"
 }
 
 
 static gboolean page_real_on_leave_notify_event (Page* self) {
 	gboolean result = FALSE;
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7194 "Page.c"
+#line 7219 "Page.c"
 }
 
 
 gboolean page_on_leave_notify_event (Page* self) {
-#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_leave_notify_event (self);
-#line 7203 "Page.c"
+#line 7228 "Page.c"
 }
 
 
@@ -7215,29 +7240,29 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 	gint _tmp13_ = 0;
 	GdkModifierType _tmp14_ = 0;
 	gboolean _tmp15_ = FALSE;
-#line 1007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1007 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->is_hint;
-#line 1010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1016 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gint) _tmp1_) == 1) {
-#line 7229 "Page.c"
+#line 7254 "Page.c"
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		GdkModifierType _tmp4_ = 0;
-#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		page_get_event_source_pointer (self, &_tmp2_, &_tmp3_, &_tmp4_);
-#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		x = _tmp2_;
-#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		y = _tmp3_;
-#line 1011 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1017 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp4_;
-#line 7241 "Page.c"
+#line 7266 "Page.c"
 	} else {
 		GdkEventMotion* _tmp5_ = NULL;
 		gdouble _tmp6_ = 0.0;
@@ -7245,41 +7270,41 @@ static gboolean page_on_motion_internal (Page* self, GdkEventMotion* event) {
 		gdouble _tmp8_ = 0.0;
 		GdkEventMotion* _tmp9_ = NULL;
 		GdkModifierType _tmp10_ = 0;
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = event;
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_->x;
-#line 1013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Page.vala"
 		x = (gint) _tmp6_;
-#line 1014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->y;
-#line 1014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Page.vala"
 		y = (gint) _tmp8_;
-#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->state;
-#line 1015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
 		mask = _tmp10_;
-#line 7267 "Page.c"
+#line 7292 "Page.c"
 	}
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = event;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = mask;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_on_motion (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_);
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp15_;
-#line 1018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7283 "Page.c"
+#line 7308 "Page.c"
 }
 
 
@@ -7287,87 +7312,87 @@ static gboolean page_on_mousewheel_internal (Page* self, GdkEventScroll* event)
 	gboolean result = FALSE;
 	GdkEventScroll* _tmp0_ = NULL;
 	GdkScrollDirection _tmp1_ = 0;
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->direction;
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp1_) {
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_UP:
-#line 7303 "Page.c"
+#line 7328 "Page.c"
 		{
 			GdkEventScroll* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = event;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = page_on_mousewheel_up (self, _tmp2_);
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp3_;
-#line 1024 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7315 "Page.c"
+#line 7340 "Page.c"
 		}
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_DOWN:
-#line 7319 "Page.c"
+#line 7344 "Page.c"
 		{
 			GdkEventScroll* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = event;
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = page_on_mousewheel_down (self, _tmp4_);
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp5_;
-#line 1027 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7331 "Page.c"
+#line 7356 "Page.c"
 		}
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_LEFT:
-#line 7335 "Page.c"
+#line 7360 "Page.c"
 		{
 			GdkEventScroll* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = event;
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = page_on_mousewheel_left (self, _tmp6_);
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp7_;
-#line 1030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7347 "Page.c"
+#line 7372 "Page.c"
 		}
-#line 1022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Page.vala"
 		case GDK_SCROLL_RIGHT:
-#line 7351 "Page.c"
+#line 7376 "Page.c"
 		{
 			GdkEventScroll* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = event;
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = page_on_mousewheel_right (self, _tmp8_);
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 			result = _tmp9_;
-#line 1033 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1039 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7363 "Page.c"
+#line 7388 "Page.c"
 		}
 		default:
 		{
-#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 7371 "Page.c"
+#line 7396 "Page.c"
 		}
 	}
 }
@@ -7375,144 +7400,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 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1047 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7385 "Page.c"
+#line 7410 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_up (Page* self, GdkEventScroll* event) {
-#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1040 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_up (self, event);
-#line 7394 "Page.c"
+#line 7419 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_down (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1045 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7406 "Page.c"
+#line 7431 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_down (Page* self, GdkEventScroll* event) {
-#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1050 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_down (self, event);
-#line 7415 "Page.c"
+#line 7440 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_left (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7427 "Page.c"
+#line 7452 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_left (Page* self, GdkEventScroll* event) {
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_left (self, event);
-#line 7436 "Page.c"
+#line 7461 "Page.c"
 }
 
 
 static gboolean page_real_on_mousewheel_right (Page* self, GdkEventScroll* event) {
 	gboolean result = FALSE;
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7448 "Page.c"
+#line 7473 "Page.c"
 }
 
 
 gboolean page_on_mousewheel_right (Page* self, GdkEventScroll* event) {
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_mousewheel_right (self, event);
-#line 7457 "Page.c"
+#line 7482 "Page.c"
 }
 
 
 static gboolean page_real_on_context_keypress (Page* self) {
 	gboolean result = FALSE;
-#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1057 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7467 "Page.c"
+#line 7492 "Page.c"
 }
 
 
 gboolean page_on_context_keypress (Page* self) {
-#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_keypress (self);
-#line 7476 "Page.c"
+#line 7501 "Page.c"
 }
 
 
 static gboolean page_real_on_context_buttonpress (Page* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1061 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7488 "Page.c"
+#line 7513 "Page.c"
 }
 
 
 gboolean page_on_context_buttonpress (Page* self, GdkEventButton* event) {
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1060 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_buttonpress (self, event);
-#line 7497 "Page.c"
+#line 7522 "Page.c"
 }
 
 
 static gboolean page_real_on_context_invoked (Page* self) {
 	gboolean result = FALSE;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7507 "Page.c"
+#line 7532 "Page.c"
 }
 
 
 gboolean page_on_context_invoked (Page* self) {
-#line 1064 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1070 "/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 1070 "/home/jens/Source/shotwell/src/Page.vala"
 	return PAGE_GET_CLASS (self)->on_context_invoked (self);
-#line 7516 "Page.c"
+#line 7541 "Page.c"
 }
 
 
@@ -7521,72 +7546,72 @@ gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventBut
 	gboolean _tmp0_ = FALSE;
 	GtkMenu* _tmp1_ = NULL;
 	GdkEventButton* _tmp3_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1074 "/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 1074 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((context_menu == NULL) || GTK_IS_MENU (context_menu), FALSE);
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = context_menu;
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 7535 "Page.c"
+#line 7560 "Page.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = page_on_context_invoked (self);
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 7542 "Page.c"
+#line 7567 "Page.c"
 	}
-#line 1071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1072 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 7550 "Page.c"
+#line 7575 "Page.c"
 	}
-#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 1074 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == NULL) {
-#line 7556 "Page.c"
+#line 7581 "Page.c"
 		GtkMenu* _tmp4_ = NULL;
 		guint32 _tmp5_ = 0U;
-#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = context_menu;
-#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_get_current_event_time ();
-#line 1075 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp4_, NULL, NULL, NULL, NULL, (guint) 0, _tmp5_);
-#line 7565 "Page.c"
+#line 7590 "Page.c"
 	} else {
 		GtkMenu* _tmp6_ = NULL;
 		GdkEventButton* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
 		GdkEventButton* _tmp9_ = NULL;
 		guint32 _tmp10_ = 0U;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = context_menu;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = event;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_->button;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = event;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_->time;
-#line 1077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_popup (_tmp6_, NULL, NULL, NULL, NULL, _tmp8_, _tmp10_);
-#line 7584 "Page.c"
+#line 7609 "Page.c"
 	}
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7590 "Page.c"
+#line 7615 "Page.c"
 }
 
 
@@ -7601,166 +7626,166 @@ void page_on_event_source_realize (Page* self) {
 	GdkWindow* _tmp10_ = NULL;
 	GdkWindow* _tmp11_ = NULL;
 	GdkWindow* _tmp20_ = NULL;
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (_tmp0_);
-#line 1083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_ != NULL, "event_source.get_window() != null");
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->event_source;
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = gtk_widget_get_window (_tmp2_);
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_window_get_cursor (_tmp3_);
-#line 1085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ != NULL) {
-#line 7621 "Page.c"
+#line 7646 "Page.c"
 		GtkWidget* _tmp5_ = NULL;
 		GdkWindow* _tmp6_ = NULL;
 		GdkCursor* _tmp7_ = NULL;
 		GdkCursorType _tmp8_ = 0;
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_window_get_cursor (_tmp6_);
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_get_cursor_type (_tmp7_);
-#line 1086 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp8_;
-#line 1087 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 7638 "Page.c"
+#line 7663 "Page.c"
 	}
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->event_source;
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = gtk_widget_get_window (_tmp9_);
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 1091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
 	parent_window = _tmp11_;
-#line 7648 "Page.c"
+#line 7673 "Page.c"
 	{
 		gboolean _tmp12_ = FALSE;
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = TRUE;
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 7655 "Page.c"
+#line 7680 "Page.c"
 			GdkWindow* _tmp17_ = NULL;
 			GdkWindow* _tmp18_ = NULL;
 			GdkWindow* _tmp19_ = NULL;
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp12_) {
-#line 7661 "Page.c"
+#line 7686 "Page.c"
 				gboolean _tmp13_ = FALSE;
 				GdkWindow* _tmp14_ = NULL;
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = parent_window;
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp14_ != NULL) {
-#line 7668 "Page.c"
+#line 7693 "Page.c"
 					GdkWindow* _tmp15_ = NULL;
 					GdkCursor* _tmp16_ = NULL;
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = parent_window;
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = gdk_window_get_cursor (_tmp15_);
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = _tmp16_ == NULL;
-#line 7677 "Page.c"
+#line 7702 "Page.c"
 				} else {
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = FALSE;
-#line 7681 "Page.c"
+#line 7706 "Page.c"
 				}
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp13_) {
-#line 1094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 7687 "Page.c"
+#line 7712 "Page.c"
 				}
 			}
-#line 1092 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = FALSE;
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = parent_window;
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = gdk_window_get_parent (_tmp17_);
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = _g_object_ref0 (_tmp18_);
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (parent_window);
-#line 1093 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Page.vala"
 			parent_window = _tmp19_;
-#line 7702 "Page.c"
+#line 7727 "Page.c"
 		}
 	}
-#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = parent_window;
-#line 1096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != NULL) {
-#line 7709 "Page.c"
+#line 7734 "Page.c"
 		GdkWindow* _tmp21_ = NULL;
 		GdkCursor* _tmp22_ = NULL;
 		GdkCursorType _tmp23_ = 0;
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = parent_window;
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = gdk_window_get_cursor (_tmp21_);
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = gdk_cursor_get_cursor_type (_tmp22_);
-#line 1097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_cursor = _tmp23_;
-#line 7721 "Page.c"
+#line 7746 "Page.c"
 	}
-#line 1082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (parent_window);
-#line 7725 "Page.c"
+#line 7750 "Page.c"
 }
 
 
 void page_set_cursor_hide_time (Page* self, gint hide_time) {
 	gint _tmp0_ = 0;
-#line 1100 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1106 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = hide_time;
-#line 1101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 7737 "Page.c"
+#line 7762 "Page.c"
 }
 
 
 void page_start_cursor_hiding (Page* self) {
-#line 1104 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1105 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7746 "Page.c"
+#line 7771 "Page.c"
 }
 
 
 void page_stop_cursor_hiding (Page* self) {
 	guint _tmp0_ = 0U;
-#line 1108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->last_timeout_id;
-#line 1109 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != ((guint) 0)) {
-#line 7758 "Page.c"
+#line 7783 "Page.c"
 		guint _tmp1_ = 0U;
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_timeout_id;
-#line 1110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp1_);
-#line 7764 "Page.c"
+#line 7789 "Page.c"
 	}
 }
 
@@ -7768,41 +7793,41 @@ void page_stop_cursor_hiding (Page* self) {
 void page_suspend_cursor_hiding (Page* self) {
 	gint _tmp0_ = 0;
 	guint _tmp1_ = 0U;
-#line 1113 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_msec;
-#line 1114 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_time_cached = _tmp0_;
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1122 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->last_timeout_id;
-#line 1116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1122 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != ((guint) 0)) {
-#line 7782 "Page.c"
+#line 7807 "Page.c"
 		guint _tmp2_ = 0U;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->last_timeout_id;
-#line 1117 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
 		g_source_remove (_tmp2_);
-#line 7788 "Page.c"
+#line 7813 "Page.c"
 	}
-#line 1119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = 0;
-#line 7792 "Page.c"
+#line 7817 "Page.c"
 }
 
 
 void page_restore_cursor_hiding (Page* self) {
 	gint _tmp0_ = 0;
-#line 1122 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hide_time_cached;
-#line 1123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hide_msec = _tmp0_;
-#line 1124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Page.vala"
 	page_check_cursor_hiding (self);
-#line 7806 "Page.c"
+#line 7831 "Page.c"
 }
 
 
@@ -7810,29 +7835,29 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
 	GdkCursorType _tmp0_ = 0;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = cursor_type;
-#line 1129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1135 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_cursor = _tmp0_;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hidden;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp2_) {
-#line 7822 "Page.c"
+#line 7847 "Page.c"
 		GtkWidget* _tmp3_ = NULL;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 7828 "Page.c"
+#line 7853 "Page.c"
 	} else {
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = FALSE;
-#line 7832 "Page.c"
+#line 7857 "Page.c"
 	}
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 7836 "Page.c"
+#line 7861 "Page.c"
 		GdkDisplay* display = NULL;
 		GtkWidget* _tmp4_ = NULL;
 		GdkWindow* _tmp5_ = NULL;
@@ -7844,103 +7869,103 @@ static void page_real_set_page_cursor (Page* self, GdkCursorType cursor_type) {
 		GdkCursorType _tmp11_ = 0;
 		GdkCursor* _tmp12_ = NULL;
 		GdkCursor* _tmp13_ = NULL;
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = self->priv->event_source;
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = gtk_widget_get_window (_tmp4_);
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gdk_window_get_display (_tmp5_);
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 1132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp7_;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->event_source;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = gtk_widget_get_window (_tmp8_);
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = display;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = cursor_type;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = gdk_cursor_new_for_display (_tmp10_, _tmp11_);
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp9_, _tmp13_);
-#line 1133 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1131 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 7876 "Page.c"
+#line 7901 "Page.c"
 	}
 }
 
 
 void page_set_page_cursor (Page* self, GdkCursorType cursor_type) {
-#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1128 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1134 "/home/jens/Source/shotwell/src/Page.vala"
 	PAGE_GET_CLASS (self)->set_page_cursor (self, cursor_type);
-#line 7886 "Page.c"
+#line 7911 "Page.c"
 }
 
 
 static gboolean _page_on_hide_cursor_gsource_func (gpointer self) {
 	gboolean result;
 	result = page_on_hide_cursor ((Page*) self);
-#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 7895 "Page.c"
+#line 7920 "Page.c"
 }
 
 
 static void page_check_cursor_hiding (Page* self) {
 	gboolean _tmp0_ = FALSE;
 	gint _tmp2_ = 0;
-#line 1137 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->cursor_hidden;
-#line 1138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 7908 "Page.c"
+#line 7933 "Page.c"
 		GdkCursorType _tmp1_ = 0;
-#line 1139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->cursor_hidden = FALSE;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->last_cursor;
-#line 1140 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
 		page_set_page_cursor (self, _tmp1_);
-#line 7916 "Page.c"
+#line 7941 "Page.c"
 	}
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->cursor_hide_msec;
-#line 1143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != 0) {
-#line 7922 "Page.c"
+#line 7947 "Page.c"
 		guint _tmp3_ = 0U;
 		gint _tmp5_ = 0;
 		guint _tmp6_ = 0U;
-#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->last_timeout_id;
-#line 1144 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp3_ != ((guint) 0)) {
-#line 7930 "Page.c"
+#line 7955 "Page.c"
 			guint _tmp4_ = 0U;
-#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = self->priv->last_timeout_id;
-#line 1145 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Page.vala"
 			g_source_remove (_tmp4_);
-#line 7936 "Page.c"
+#line 7961 "Page.c"
 		}
-#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->cursor_hide_msec;
-#line 1146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/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 1146 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1152 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->last_timeout_id = _tmp6_;
-#line 7944 "Page.c"
+#line 7969 "Page.c"
 	}
 }
 
@@ -7948,15 +7973,15 @@ static void page_check_cursor_hiding (Page* self) {
 static gboolean page_on_hide_cursor (Page* self) {
 	gboolean result = FALSE;
 	GtkWidget* _tmp0_ = NULL;
-#line 1150 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1156 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), FALSE);
-#line 1151 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->cursor_hidden = TRUE;
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 7960 "Page.c"
+#line 7985 "Page.c"
 		GdkDisplay* display = NULL;
 		GtkWidget* _tmp1_ = NULL;
 		GdkWindow* _tmp2_ = NULL;
@@ -7967,41 +7992,41 @@ static gboolean page_on_hide_cursor (Page* self) {
 		GdkDisplay* _tmp7_ = NULL;
 		GdkCursor* _tmp8_ = NULL;
 		GdkCursor* _tmp9_ = NULL;
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = gtk_widget_get_window (_tmp1_);
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gdk_window_get_display (_tmp2_);
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1154 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Page.vala"
 		display = _tmp4_;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = gtk_widget_get_window (_tmp5_);
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = display;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gdk_cursor_new_for_display (_tmp7_, GDK_BLANK_CURSOR);
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_set_cursor (_tmp6_, _tmp9_);
-#line 1155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 1153 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (display);
-#line 7997 "Page.c"
+#line 8022 "Page.c"
 	}
-#line 1159 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1165 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_timeout_id = (guint) 0;
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 1161 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8005 "Page.c"
+#line 8030 "Page.c"
 }
 
 
@@ -8010,25 +8035,25 @@ void page_update_menu_item_label (Page* self, const gchar* id, const gchar* new_
 	AppWindow* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (self));
-#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (id != NULL);
-#line 1164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1170 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (new_label != NULL);
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = app_window_get_instance ();
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = id;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = new_label;
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	app_window_update_menu_item_label (_tmp1_, _tmp2_, _tmp3_);
-#line 1166 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 8032 "Page.c"
+#line 8057 "Page.c"
 }
 
 
@@ -8038,33 +8063,33 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 	GMenuModel* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	GMenuModel* section = NULL;
-#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (self), NULL);
-#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (G_IS_MENU_MODEL (model), NULL);
-#line 1169 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (extension_point != NULL, NULL);
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = model;
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_menu_model_get_n_items (_tmp0_);
-#line 1171 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
 	items = _tmp1_;
-#line 1172 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
 	section = NULL;
-#line 8056 "Page.c"
+#line 8081 "Page.c"
 	{
 		gint i = 0;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 		i = 0;
-#line 8061 "Page.c"
+#line 8086 "Page.c"
 		{
 			gboolean _tmp2_ = FALSE;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = TRUE;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 8068 "Page.c"
+#line 8093 "Page.c"
 				gboolean _tmp4_ = FALSE;
 				gint _tmp5_ = 0;
 				gint _tmp6_ = 0;
@@ -8073,71 +8098,71 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 				gint _tmp9_ = 0;
 				const gchar* _tmp10_ = NULL;
 				const gchar* _tmp11_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp2_) {
-#line 8079 "Page.c"
+#line 8104 "Page.c"
 					gint _tmp3_ = 0;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp3_ = i;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					i = _tmp3_ + 1;
-#line 8085 "Page.c"
+#line 8110 "Page.c"
 				}
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp2_ = FALSE;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp5_ = i;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp6_ = items;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp5_ < _tmp6_) {
-#line 8095 "Page.c"
+#line 8120 "Page.c"
 					GMenuModel* _tmp7_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp7_ = section;
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = _tmp7_ == NULL;
-#line 8101 "Page.c"
+#line 8126 "Page.c"
 				} else {
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp4_ = FALSE;
-#line 8105 "Page.c"
+#line 8130 "Page.c"
 				}
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp4_) {
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 8111 "Page.c"
+#line 8136 "Page.c"
 				}
-#line 1175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Page.vala"
 				name = NULL;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = model;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = i;
-#line 1176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
 				g_menu_model_get_item_attribute (_tmp8_, _tmp9_, "id", "s", &name, NULL);
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = name;
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = extension_point;
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 				if (g_strcmp0 (_tmp10_, _tmp11_) == 0) {
-#line 8127 "Page.c"
+#line 8152 "Page.c"
 					GMenuModel* _tmp12_ = NULL;
 					gint _tmp13_ = 0;
 					GMenuModel* _tmp14_ = NULL;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp12_ = model;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = i;
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = g_menu_model_get_item_link (_tmp12_, _tmp13_, G_MENU_LINK_SECTION);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (section);
-#line 1178 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1184 "/home/jens/Source/shotwell/src/Page.vala"
 					section = _tmp14_;
-#line 8141 "Page.c"
+#line 8166 "Page.c"
 				} else {
 					GMenuModel* subsection = NULL;
 					GMenuModel* _tmp15_ = NULL;
@@ -8147,45 +8172,45 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 					gint sub_items = 0;
 					GMenuModel* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp15_ = model;
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp16_ = i;
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = g_menu_model_get_item_link (_tmp15_, _tmp16_, G_MENU_LINK_SECTION);
-#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
 					subsection = _tmp17_;
-#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp18_ = subsection;
-#line 1182 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
 					if (_tmp18_ == NULL) {
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (subsection);
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_free0 (name);
-#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Page.vala"
 						continue;
-#line 8169 "Page.c"
+#line 8194 "Page.c"
 					}
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp19_ = subsection;
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = g_menu_model_get_n_items (_tmp19_);
-#line 1186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Page.vala"
 					sub_items = _tmp20_;
-#line 8177 "Page.c"
+#line 8202 "Page.c"
 					{
 						gint j = 0;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 						j = 0;
-#line 8182 "Page.c"
+#line 8207 "Page.c"
 						{
 							gboolean _tmp21_ = FALSE;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 							_tmp21_ = TRUE;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 							while (TRUE) {
-#line 8189 "Page.c"
+#line 8214 "Page.c"
 								gboolean _tmp23_ = FALSE;
 								gint _tmp24_ = 0;
 								gint _tmp25_ = 0;
@@ -8194,91 +8219,91 @@ GMenuModel* page_find_extension_point (Page* self, GMenuModel* model, const gcha
 								gint _tmp28_ = 0;
 								GMenuModel* _tmp29_ = NULL;
 								GMenuModel* _tmp30_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp21_) {
-#line 8200 "Page.c"
+#line 8225 "Page.c"
 									gint _tmp22_ = 0;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp22_ = j;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									j = _tmp22_ + 1;
-#line 8206 "Page.c"
+#line 8231 "Page.c"
 								}
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp21_ = FALSE;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp24_ = j;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp25_ = sub_items;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp24_ < _tmp25_) {
-#line 8216 "Page.c"
+#line 8241 "Page.c"
 									GMenuModel* _tmp26_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp26_ = section;
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = _tmp26_ == NULL;
-#line 8222 "Page.c"
+#line 8247 "Page.c"
 								} else {
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp23_ = FALSE;
-#line 8226 "Page.c"
+#line 8251 "Page.c"
 								}
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								if (!_tmp23_) {
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 									break;
-#line 8232 "Page.c"
+#line 8257 "Page.c"
 								}
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp27_ = subsection;
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp28_ = j;
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp29_ = g_menu_model_get_item_link (_tmp27_, _tmp28_, G_MENU_LINK_SUBMENU);
-#line 1188 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Page.vala"
 								submenu = _tmp29_;
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1196 "/home/jens/Source/shotwell/src/Page.vala"
 								_tmp30_ = submenu;
-#line 1190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1196 "/home/jens/Source/shotwell/src/Page.vala"
 								if (_tmp30_ != NULL) {
-#line 8246 "Page.c"
+#line 8271 "Page.c"
 									GMenuModel* _tmp31_ = NULL;
 									const gchar* _tmp32_ = NULL;
 									GMenuModel* _tmp33_ = NULL;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp31_ = submenu;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp32_ = extension_point;
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 									_tmp33_ = page_find_extension_point (self, _tmp31_, _tmp32_);
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 									_g_object_unref0 (section);
-#line 1191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Page.vala"
 									section = _tmp33_;
-#line 8260 "Page.c"
+#line 8285 "Page.c"
 								}
-#line 1187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Page.vala"
 								_g_object_unref0 (submenu);
-#line 8264 "Page.c"
+#line 8289 "Page.c"
 							}
 						}
 					}
-#line 1177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (subsection);
-#line 8270 "Page.c"
+#line 8295 "Page.c"
 				}
-#line 1174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (name);
-#line 8274 "Page.c"
+#line 8299 "Page.c"
 			}
 		}
 	}
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
 	result = section;
-#line 1198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1204 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8282 "Page.c"
+#line 8307 "Page.c"
 }
 
 
@@ -8391,7 +8416,7 @@ static void page_class_init (PageClass * klass) {
 	((PageClass *) klass)->set_page_cursor = page_real_set_page_cursor;
 #line 58 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = page_finalize;
-#line 8395 "Page.c"
+#line 8420 "Page.c"
 }
 
 
@@ -8449,7 +8474,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 8453 "Page.c"
+#line 8478 "Page.c"
 }
 
 
@@ -8475,7 +8500,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 8479 "Page.c"
+#line 8504 "Page.c"
 }
 
 
@@ -8504,30 +8529,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 1260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_hidden ((CheckerboardPage*) self, hidden);
-#line 8510 "Page.c"
+#line 8535 "Page.c"
 }
 
 
 static void _checkerboard_page_on_contents_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_contents_altered ((CheckerboardPage*) self, added, removed);
-#line 8517 "Page.c"
+#line 8542 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_state_changed_view_collection_items_state_changed (ViewCollection* _sender, GeeIterable* changed, gpointer self) {
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_state_changed ((CheckerboardPage*) self, changed);
-#line 8524 "Page.c"
+#line 8549 "Page.c"
 }
 
 
 static void _checkerboard_page_on_items_visibility_changed_view_collection_items_visibility_changed (ViewCollection* _sender, GeeCollection* changed, gpointer self) {
-#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_items_visibility_changed ((CheckerboardPage*) self, changed);
-#line 8531 "Page.c"
+#line 8556 "Page.c"
 }
 
 
@@ -8556,141 +8581,141 @@ CheckerboardPage* checkerboard_page_construct (GType object_type, const gchar* p
 	ViewCollection* _tmp20_ = NULL;
 	ViewCollection* _tmp21_ = NULL;
 	ViewCollection* _tmp22_ = NULL;
-#line 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1238 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (CheckerboardPage*) page_construct (object_type, _tmp0_);
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_new (_tmp2_);
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->layout = _tmp3_;
-#line 1240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->layout;
-#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_name;
-#line 1241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp4_, _tmp5_);
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->layout;
-#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1249 "/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 1245 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1251 "/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 1246 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1252 "/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 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->viewport;
-#line 1248 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1254 "/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 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->viewport;
-#line 1249 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp8_, GTK_SHADOW_NONE);
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->viewport;
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->layout;
-#line 1251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1257 "/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 1255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/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 1255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/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 1255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_adjustments (_tmp11_, _tmp12_, _tmp13_);
-#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->viewport;
-#line 1257 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1263 "/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 1260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = _tmp15_;
-#line 1260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/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 1260 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp16_);
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/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 1261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp18_);
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_;
-#line 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/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 1262 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1268 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp20_);
-#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = _tmp21_;
-#line 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/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 1263 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp22_);
-#line 1266 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1272 "/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 1237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 8656 "Page.c"
+#line 8681 "Page.c"
 }
 
 
 void checkerboard_page_init_item_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1275 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1276 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = _tmp1_;
-#line 8675 "Page.c"
+#line 8700 "Page.c"
 }
 
 
 void checkerboard_page_init_page_context_menu (CheckerboardPage* self, const gchar* path) {
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (path != NULL);
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = path;
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = _tmp1_;
-#line 8694 "Page.c"
+#line 8719 "Page.c"
 }
 
 
@@ -8701,44 +8726,44 @@ GtkMenu* checkerboard_page_get_context_menu (CheckerboardPage* self) {
 	ViewCollection* _tmp2_ = NULL;
 	gint _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
-#line 1277 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_get_selected_count (_tmp2_);
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != 0;
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 8719 "Page.c"
+#line 8744 "Page.c"
 		GtkMenu* _tmp5_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = checkerboard_page_get_item_context_menu (self);
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp5_;
-#line 8727 "Page.c"
+#line 8752 "Page.c"
 	} else {
 		GtkMenu* _tmp6_ = NULL;
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp0_);
-#line 1280 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp6_;
-#line 8736 "Page.c"
+#line 8761 "Page.c"
 	}
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp0_;
-#line 1279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8742 "Page.c"
+#line 8767 "Page.c"
 }
 
 
@@ -8747,11 +8772,11 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage*
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
 	GtkMenu* _tmp9_ = NULL;
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->item_context_menu;
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 8755 "Page.c"
+#line 8780 "Page.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -8760,52 +8785,52 @@ static GtkMenu* checkerboard_page_real_get_item_context_menu (CheckerboardPage*
 		GMenuModel* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
 		GtkMenu* _tmp7_ = NULL;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->item_context_menu_path;
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
-#line 1286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
 		model = _tmp4_;
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = model;
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 		g_object_ref_sink (_tmp6_);
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->item_context_menu);
-#line 1288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->item_context_menu = _tmp6_;
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->item_context_menu;
-#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_menu_attach_to_widget (_tmp7_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 1285 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 8790 "Page.c"
+#line 8815 "Page.c"
 	}
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->item_context_menu;
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp9_;
-#line 1292 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8800 "Page.c"
+#line 8825 "Page.c"
 }
 
 
 GtkMenu* checkerboard_page_get_item_context_menu (CheckerboardPage* self) {
-#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1284 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_item_context_menu (self);
-#line 8809 "Page.c"
+#line 8834 "Page.c"
 }
 
 
@@ -8815,13 +8840,13 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
 	GtkMenu* _tmp9_ = NULL;
-#line 1296 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page_context_menu;
-#line 1297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 8825 "Page.c"
+#line 8850 "Page.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
@@ -8830,43 +8855,43 @@ static GtkMenu* checkerboard_page_real_get_page_context_menu (Page* base) {
 		GMenuModel* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
 		GtkMenu* _tmp7_ = NULL;
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->page_context_menu_path;
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_builder_get_object (_tmp1_, _tmp2_);
-#line 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/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 1298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
 		model = _tmp4_;
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = model;
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		g_object_ref_sink (_tmp6_);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->page_context_menu);
-#line 1300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1306 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->page_context_menu = _tmp6_;
-#line 1301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->page_context_menu;
-#line 1301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1307 "/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 1297 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (model);
-#line 8860 "Page.c"
+#line 8885 "Page.c"
 	}
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->page_context_menu;
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp9_;
-#line 1304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1310 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8870 "Page.c"
+#line 8895 "Page.c"
 }
 
 
@@ -8877,23 +8902,23 @@ static gboolean checkerboard_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 1307 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1313 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = checkerboard_page_get_context_menu (self);
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1314 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8897 "Page.c"
+#line 8922 "Page.c"
 }
 
 
@@ -8901,24 +8926,24 @@ static gchar* checkerboard_page_real_get_view_empty_message (CheckerboardPage* s
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = _ ("No photos/videos");
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8913 "Page.c"
+#line 8938 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_view_empty_message (CheckerboardPage* self) {
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1311 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1317 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_empty_message (self);
-#line 8922 "Page.c"
+#line 8947 "Page.c"
 }
 
 
@@ -8926,42 +8951,42 @@ static gchar* checkerboard_page_real_get_filter_no_match_message (CheckerboardPa
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = _ ("No photos/videos found which match the current filter");
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1316 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8938 "Page.c"
+#line 8963 "Page.c"
 }
 
 
 gchar* checkerboard_page_get_filter_no_match_message (CheckerboardPage* self) {
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1321 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_filter_no_match_message (self);
-#line 8947 "Page.c"
+#line 8972 "Page.c"
 }
 
 
 static void checkerboard_page_real_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (modifiers != NULL);
-#line 8956 "Page.c"
+#line 8981 "Page.c"
 }
 
 
 void checkerboard_page_on_item_activated (CheckerboardPage* self, CheckerboardItem* item, CheckerboardPageActivator activator, CheckerboardPageKeyboardModifiers* modifiers) {
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1319 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1325 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->on_item_activated (self, item, activator, modifiers);
-#line 8965 "Page.c"
+#line 8990 "Page.c"
 }
 
 
@@ -8969,61 +8994,61 @@ CheckerboardLayout* checkerboard_page_get_checkerboard_layout (CheckerboardPage*
 	CheckerboardLayout* result = NULL;
 	CheckerboardLayout* _tmp0_ = NULL;
 	CheckerboardLayout* _tmp1_ = NULL;
-#line 1323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 1324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 8983 "Page.c"
+#line 9008 "Page.c"
 }
 
 
 static SearchViewFilter* checkerboard_page_real_get_search_view_filter (CheckerboardPage* self) {
-#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/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 1328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 8992 "Page.c"
+#line 9017 "Page.c"
 }
 
 
 SearchViewFilter* checkerboard_page_get_search_view_filter (CheckerboardPage* self) {
-#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_search_view_filter (self);
-#line 9001 "Page.c"
+#line 9026 "Page.c"
 }
 
 
 static CoreViewTracker* checkerboard_page_real_get_view_tracker (CheckerboardPage* self) {
 	CoreViewTracker* result = NULL;
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 1331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9011 "Page.c"
+#line 9036 "Page.c"
 }
 
 
 CoreViewTracker* checkerboard_page_get_view_tracker (CheckerboardPage* self) {
-#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1330 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->get_view_tracker (self);
-#line 9020 "Page.c"
+#line 9045 "Page.c"
 }
 
 
 static void _checkerboard_page_on_view_filter_refresh_view_filter_refresh (ViewFilter* _sender, gpointer self) {
-#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh ((CheckerboardPage*) self);
-#line 9027 "Page.c"
+#line 9052 "Page.c"
 }
 
 
@@ -9035,33 +9060,33 @@ static void checkerboard_page_real_switching_from (Page* base) {
 	guint _tmp3_ = 0U;
 	ViewCollection* _tmp4_ = NULL;
 	ViewCollection* _tmp5_ = NULL;
-#line 1334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1340 "/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 1341 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1335 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, FALSE);
-#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_parse_name ("refresh", TYPE_VIEW_FILTER, &_tmp3_, NULL, FALSE);
-#line 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/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 1336 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_all (_tmp5_);
-#line 1339 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 1341 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1347 "/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 9065 "Page.c"
+#line 9090 "Page.c"
 }
 
 
@@ -9074,35 +9099,35 @@ static void checkerboard_page_real_switched_to (Page* base) {
 	ViewCollection* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
 	gboolean _tmp6_ = FALSE;
-#line 1344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1345 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1351 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_in_view (_tmp0_, TRUE);
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_page_get_search_view_filter (self);
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1352 "/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 1346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1352 "/home/jens/Source/shotwell/src/Page.vala"
 	_view_filter_unref0 (_tmp2_);
-#line 1347 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_on_view_filter_refresh (self);
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = view_collection_get_selected_count (_tmp4_);
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_ > 0;
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp4_);
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_) {
-#line 9106 "Page.c"
+#line 9131 "Page.c"
 		CheckerboardItem* item = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
@@ -9117,37 +9142,37 @@ static void checkerboard_page_real_switched_to (Page* base) {
 		GdkRectangle _tmp16_ = {0};
 		gint _tmp17_ = 0;
 		AdjustmentRelation _tmp18_ = 0;
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_at (_tmp8_, 0);
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1350 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp10_;
-#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/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 1353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 1353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
 		vadj = _tmp12_;
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = vadj;
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = item;
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->allocation;
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = _tmp16_.y;
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp14_, _tmp17_);
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp18_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 9151 "Page.c"
+#line 9176 "Page.c"
 			GtkAdjustment* _tmp19_ = NULL;
 			CheckerboardItem* _tmp20_ = NULL;
 			GdkRectangle _tmp21_ = {0};
@@ -9156,33 +9181,33 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			GdkRectangle _tmp24_ = {0};
 			gint _tmp25_ = 0;
 			AdjustmentRelation _tmp26_ = 0;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = vadj;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = item;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_->allocation;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = _tmp21_.y;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = item;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = _tmp23_->allocation;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = _tmp24_.height;
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = get_adjustment_relation (_tmp19_, _tmp22_ + _tmp25_);
-#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp26_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 9178 "Page.c"
+#line 9203 "Page.c"
 		} else {
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = FALSE;
-#line 9182 "Page.c"
+#line 9207 "Page.c"
 		}
-#line 1354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp13_) {
-#line 9186 "Page.c"
+#line 9211 "Page.c"
 			gint top = 0;
 			CheckerboardItem* _tmp27_ = NULL;
 			GdkRectangle _tmp28_ = {0};
@@ -9191,38 +9216,38 @@ static void checkerboard_page_real_switched_to (Page* base) {
 			gdouble _tmp31_ = 0.0;
 			GtkAdjustment* _tmp45_ = NULL;
 			gint _tmp46_ = 0;
-#line 1358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
 			top = 0;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = item;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_->allocation;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _tmp28_.y;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = vadj;
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = gtk_adjustment_get_value (_tmp30_);
-#line 1359 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1365 "/home/jens/Source/shotwell/src/Page.vala"
 			if (((gdouble) _tmp29_) < _tmp31_) {
-#line 9209 "Page.c"
+#line 9234 "Page.c"
 				CheckerboardItem* _tmp32_ = NULL;
 				GdkRectangle _tmp33_ = {0};
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = item;
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp33_ = _tmp32_->allocation;
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = _tmp33_.y;
-#line 1360 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp34_;
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = top;
-#line 1361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp35_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9226 "Page.c"
+#line 9251 "Page.c"
 			} else {
 				CheckerboardItem* _tmp36_ = NULL;
 				GdkRectangle _tmp37_ = {0};
@@ -9233,91 +9258,91 @@ static void checkerboard_page_real_switched_to (Page* base) {
 				GtkAdjustment* _tmp42_ = NULL;
 				gdouble _tmp43_ = 0.0;
 				gint _tmp44_ = 0;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = item;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = _tmp36_->allocation;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_.y;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = item;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = _tmp39_->allocation;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_.height;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = vadj;
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = gtk_adjustment_get_page_size (_tmp42_);
-#line 1363 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Page.vala"
 				top = (_tmp38_ + _tmp41_) - ((gint) _tmp43_);
-#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = top;
-#line 1364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Page.vala"
 				top = _tmp44_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 9259 "Page.c"
+#line 9284 "Page.c"
 			}
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = vadj;
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = top;
-#line 1367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1373 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_adjustment_set_value (_tmp45_, (gdouble) _tmp46_);
-#line 9267 "Page.c"
+#line 9292 "Page.c"
 		}
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 9273 "Page.c"
+#line 9298 "Page.c"
 	}
-#line 1372 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1378 "/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 9277 "Page.c"
+#line 9302 "Page.c"
 }
 
 
 static void checkerboard_page_on_view_filter_refresh (CheckerboardPage* self) {
-#line 1375 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1376 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1382 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9286 "Page.c"
+#line 9311 "Page.c"
 }
 
 
 static void checkerboard_page_on_contents_altered (CheckerboardPage* self, GeeIterable* added, GeeIterable* removed) {
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1381 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1387 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9299 "Page.c"
+#line 9324 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_state_changed (CheckerboardPage* self, GeeIterable* changed) {
-#line 1384 "/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 1384 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (changed));
-#line 1385 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1391 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9310 "Page.c"
+#line 9335 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_visibility_changed (CheckerboardPage* self, GeeCollection* changed) {
-#line 1388 "/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 1388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (changed));
-#line 1389 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_update_view_filter_message (self);
-#line 9321 "Page.c"
+#line 9346 "Page.c"
 }
 
 
@@ -9327,87 +9352,87 @@ static void checkerboard_page_update_view_filter_message (CheckerboardPage* self
 	ViewCollection* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 1392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1398 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = view_collection_are_items_filtered_out (_tmp2_);
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 9345 "Page.c"
+#line 9370 "Page.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		gint _tmp7_ = 0;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_ == 0;
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 9359 "Page.c"
+#line 9384 "Page.c"
 	} else {
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 9363 "Page.c"
+#line 9388 "Page.c"
 	}
-#line 1393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1399 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 9367 "Page.c"
+#line 9392 "Page.c"
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_page_get_filter_no_match_message (self);
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_set_page_message (self, _tmp9_);
-#line 1394 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp9_);
-#line 9378 "Page.c"
+#line 9403 "Page.c"
 	} else {
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		gint _tmp12_ = 0;
 		gboolean _tmp13_ = FALSE;
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp10_;
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_ == 0;
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1395 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp13_) {
-#line 9396 "Page.c"
+#line 9421 "Page.c"
 			gchar* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = checkerboard_page_get_view_empty_message (self);
-#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _tmp14_;
-#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_set_page_message (self, _tmp15_);
-#line 1396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp15_);
-#line 9407 "Page.c"
+#line 9432 "Page.c"
 		} else {
-#line 1398 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_page_unset_page_message (self);
-#line 9411 "Page.c"
+#line 9436 "Page.c"
 		}
 	}
 }
@@ -9417,27 +9442,27 @@ void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* me
 	CheckerboardLayout* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1402 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (message != NULL);
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = message;
-#line 1403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_message (_tmp0_, _tmp1_);
-#line 1404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1404 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_) {
-#line 9435 "Page.c"
+#line 9460 "Page.c"
 		CheckerboardLayout* _tmp3_ = NULL;
-#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->layout;
-#line 1405 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 9441 "Page.c"
+#line 9466 "Page.c"
 	}
 }
 
@@ -9445,23 +9470,23 @@ void checkerboard_page_set_page_message (CheckerboardPage* self, const gchar* me
 void checkerboard_page_unset_page_message (CheckerboardPage* self) {
 	CheckerboardLayout* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1408 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1409 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_unset_message (_tmp0_);
-#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1410 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1416 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 9459 "Page.c"
+#line 9484 "Page.c"
 		CheckerboardLayout* _tmp2_ = NULL;
-#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1411 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 9465 "Page.c"
+#line 9490 "Page.c"
 	}
 }
 
@@ -9471,21 +9496,21 @@ static void checkerboard_page_real_set_page_name (Page* base, const gchar* name)
 	const gchar* _tmp0_ = NULL;
 	CheckerboardLayout* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
-#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1414 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (name != NULL);
-#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = name;
-#line 1415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1421 "/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 1417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->layout;
-#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = name;
-#line 1417 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1423 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_name (_tmp1_, _tmp2_);
-#line 9489 "Page.c"
+#line 9514 "Page.c"
 }
 
 
@@ -9495,43 +9520,43 @@ CheckerboardItem* checkerboard_page_get_item_at_pixel (CheckerboardPage* self, g
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	CheckerboardItem* _tmp3_ = NULL;
-#line 1420 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), NULL);
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_get_item_at_pixel (_tmp0_, _tmp1_, _tmp2_);
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 1421 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 9513 "Page.c"
+#line 9538 "Page.c"
 }
 
 
 static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterable* hidden) {
-#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1424 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (hidden));
-#line 9522 "Page.c"
+#line 9547 "Page.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = hidden;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		_view_it = _tmp1_;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 9535 "Page.c"
+#line 9560 "Page.c"
 			GeeIterator* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
 			DataView* view = NULL;
@@ -9546,73 +9571,73 @@ static void checkerboard_page_on_items_hidden (CheckerboardPage* self, GeeIterab
 			CheckerboardItem* _tmp11_ = NULL;
 			CheckerboardItem* _tmp12_ = NULL;
 			CheckerboardItem* _tmp13_ = NULL;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp2_ = _view_it;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp3_ = gee_iterator_next (_tmp2_);
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp3_) {
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9558 "Page.c"
+#line 9583 "Page.c"
 			}
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp4_ = _view_it;
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = gee_iterator_get (_tmp4_);
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			view = (DataView*) _tmp5_;
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp6_ = view;
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1426 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp7_;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = self->anchor;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = item;
-#line 1428 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp8_ == _tmp9_) {
-#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = NULL;
-#line 9582 "Page.c"
+#line 9607 "Page.c"
 			}
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = self->cursor;
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = item;
-#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1437 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp10_ == _tmp11_) {
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1438 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = NULL;
-#line 9594 "Page.c"
+#line 9619 "Page.c"
 			}
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = self->priv->highlighted;
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = item;
-#line 1434 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp12_ == _tmp13_) {
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->highlighted);
-#line 1435 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1441 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->highlighted = NULL;
-#line 9606 "Page.c"
+#line 9631 "Page.c"
 			}
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (view);
-#line 9612 "Page.c"
+#line 9637 "Page.c"
 		}
-#line 1425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1431 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_view_it);
-#line 9616 "Page.c"
+#line 9641 "Page.c"
 	}
 }
 
@@ -9629,138 +9654,138 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	GQuark _tmp7_ = 0U;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label0 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label1 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label2 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label3 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label4 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label5 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label6 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label7 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label8 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label9 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label10 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label12 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label13 = 0;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp6_label14 = 0;
-#line 9663 "Page.c"
+#line 9688 "Page.c"
 	gboolean _tmp45_ = FALSE;
 	gboolean _tmp46_ = FALSE;
-#line 1439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1439 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->state;
-#line 1443 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp1_ & GDK_SHIFT_MASK);
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_;
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9692 "Page.c"
+#line 9717 "Page.c"
 			default:
 			{
 				guint _tmp8_ = 0U;
-#line 1448 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_NORTH);
-#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp8_ = state;
-#line 1449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp8_);
-#line 1450 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9704 "Page.c"
+#line 9729 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9710 "Page.c"
+#line 9735 "Page.c"
 			default:
 			{
 				guint _tmp9_ = 0U;
-#line 1454 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_SOUTH);
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = state;
-#line 1455 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp9_);
-#line 1456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9722 "Page.c"
+#line 9747 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9728 "Page.c"
+#line 9753 "Page.c"
 			default:
 			{
 				guint _tmp10_ = 0U;
-#line 1460 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_WEST);
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = state;
-#line 1461 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp10_);
-#line 1462 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9740 "Page.c"
+#line 9765 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9746 "Page.c"
+#line 9771 "Page.c"
 			default:
 			{
 				guint _tmp11_ = 0U;
-#line 1466 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_move_cursor (self, COMPASS_POINT_EAST);
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1473 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = state;
-#line 1467 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1473 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp11_);
-#line 1468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9758 "Page.c"
+#line 9783 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9764 "Page.c"
+#line 9789 "Page.c"
 			default:
 			{
 				CheckerboardItem* first = NULL;
@@ -9770,45 +9795,45 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp15_ = NULL;
 				CheckerboardItem* _tmp16_ = NULL;
 				guint _tmp18_ = 0U;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp13_ = _tmp12_;
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = view_collection_get_first (_tmp13_);
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp13_);
-#line 1472 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Page.vala"
 				first = _tmp15_;
-#line 1473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = first;
-#line 1473 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp16_ != NULL) {
-#line 9790 "Page.c"
+#line 9815 "Page.c"
 					CheckerboardItem* _tmp17_ = NULL;
-#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp17_ = first;
-#line 1474 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp17_);
-#line 9796 "Page.c"
+#line 9821 "Page.c"
 				}
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = state;
-#line 1475 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp18_);
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (first);
-#line 1476 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9806 "Page.c"
+#line 9831 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9812 "Page.c"
+#line 9837 "Page.c"
 			default:
 			{
 				CheckerboardItem* last = NULL;
@@ -9818,100 +9843,100 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				CheckerboardItem* _tmp22_ = NULL;
 				CheckerboardItem* _tmp23_ = NULL;
 				guint _tmp25_ = 0U;
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp19_;
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = view_collection_get_last (_tmp20_);
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp20_);
-#line 1480 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1486 "/home/jens/Source/shotwell/src/Page.vala"
 				last = _tmp22_;
-#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = last;
-#line 1481 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1487 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp23_ != NULL) {
-#line 9838 "Page.c"
+#line 9863 "Page.c"
 					CheckerboardItem* _tmp24_ = NULL;
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = last;
-#line 1482 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_cursor_to_item (self, _tmp24_);
-#line 9844 "Page.c"
+#line 9869 "Page.c"
 				}
-#line 1483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = state;
-#line 1483 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_anchor_to_cursor (self, _tmp25_);
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (last);
-#line 1484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1490 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9854 "Page.c"
+#line 9879 "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 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9860 "Page.c"
+#line 9885 "Page.c"
 			default:
 			{
 				ViewCollection* _tmp26_ = NULL;
 				ViewCollection* _tmp27_ = NULL;
 				gint _tmp28_ = 0;
 				gboolean _tmp29_ = FALSE;
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = view_collection_get_selected_count (_tmp27_);
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_ == 1;
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp27_);
-#line 1488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp29_) {
-#line 9879 "Page.c"
+#line 9904 "Page.c"
 					ViewCollection* _tmp30_ = NULL;
 					ViewCollection* _tmp31_ = NULL;
 					DataView* _tmp32_ = NULL;
 					CheckerboardItem* _tmp33_ = NULL;
 					CheckerboardPageKeyboardModifiers _tmp34_ = {0};
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = _tmp30_;
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = view_collection_get_selected_at (_tmp31_, 0);
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem);
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_keyboard_modifiers_init (&_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					checkerboard_page_on_item_activated (self, _tmp33_, CHECKERBOARD_PAGE_ACTIVATOR_KEYBOARD, &_tmp34_);
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp33_);
-#line 1489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1495 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp31_);
-#line 9901 "Page.c"
+#line 9926 "Page.c"
 				} else {
-#line 1492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
 					handled = FALSE;
-#line 9905 "Page.c"
+#line 9930 "Page.c"
 				}
-#line 1493 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9909 "Page.c"
+#line 9934 "Page.c"
 			}
 		}
 	} else if (_tmp7_ == ((0 != _tmp6_label14) ? _tmp6_label14 : (_tmp6_label14 = g_quark_from_static_string ("space")))) {
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9915 "Page.c"
+#line 9940 "Page.c"
 			default:
 			{
 				Marker* marker = NULL;
@@ -9925,89 +9950,89 @@ static gboolean checkerboard_page_real_key_press_event (GtkWidget* base, GdkEven
 				ViewCollection* _tmp42_ = NULL;
 				ViewCollection* _tmp43_ = NULL;
 				Marker* _tmp44_ = NULL;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = _tmp35_;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = self->priv->layout;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = checkerboard_layout_get_cursor (_tmp37_);
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = _tmp38_;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/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 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp41_ = _tmp40_;
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp39_);
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp36_);
-#line 1496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp41_;
-#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _tmp42_;
-#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = marker;
-#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp43_, _tmp44_);
-#line 1497 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp43_);
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1504 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9963 "Page.c"
+#line 9988 "Page.c"
 			}
 		}
 	} else {
-#line 1445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 9969 "Page.c"
+#line 9994 "Page.c"
 			default:
 			{
-#line 1501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 1502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 9976 "Page.c"
+#line 10001 "Page.c"
 			}
 		}
 	}
-#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = handled;
-#line 1505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp45_) {
-#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1506 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 9988 "Page.c"
+#line 10013 "Page.c"
 	}
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (checkerboard_page_parent_class)->key_press_event != NULL) {
-#line 9992 "Page.c"
+#line 10017 "Page.c"
 		GdkEventKey* _tmp47_ = NULL;
 		gboolean _tmp48_ = FALSE;
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = event;
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/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 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp48_;
-#line 10001 "Page.c"
+#line 10026 "Page.c"
 	} else {
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = TRUE;
-#line 10005 "Page.c"
+#line 10030 "Page.c"
 	}
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp46_;
-#line 1508 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10011 "Page.c"
+#line 10036 "Page.c"
 }
 
 
@@ -10031,62 +10056,62 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 	ViewCollection* _tmp107_ = NULL;
 	gint _tmp108_ = 0;
 	gboolean _tmp109_ = FALSE;
-#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = event;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_->type;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ != GDK_BUTTON_PRESS) {
-#line 10045 "Page.c"
+#line 10070 "Page.c"
 		GdkEventButton* _tmp3_ = NULL;
 		GdkEventType _tmp4_ = 0;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = event;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp3_->type;
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp4_ != GDK_2BUTTON_PRESS;
-#line 10054 "Page.c"
+#line 10079 "Page.c"
 	} else {
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 10058 "Page.c"
+#line 10083 "Page.c"
 	}
-#line 1513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1519 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1514 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10066 "Page.c"
+#line 10091 "Page.c"
 	}
-#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Page.vala"
 	state = (guint) (_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK));
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = event;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_->x;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = event;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_->y;
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = checkerboard_page_get_item_at_pixel (self, _tmp8_, _tmp10_);
-#line 1521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1527 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp11_;
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1522 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ != NULL) {
-#line 10090 "Page.c"
+#line 10115 "Page.c"
 		CheckerboardLayout* _tmp13_ = NULL;
 		CheckerboardItem* _tmp14_ = NULL;
 		GdkEventButton* _tmp15_ = NULL;
@@ -10099,41 +10124,41 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		guint _tmp22_ = 0U;
 		CheckerboardLayout* _tmp80_ = NULL;
 		CheckerboardItem* _tmp81_ = NULL;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = self->priv->layout;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = item;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = event;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_->x;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp17_->y;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = event;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_->state;
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = checkerboard_layout_handle_left_click (_tmp13_, _tmp14_, _tmp16_, _tmp18_, _tmp20_);
-#line 1525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1531 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 1526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 			result = TRUE;
-#line 1526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1526 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 10129 "Page.c"
+#line 10154 "Page.c"
 		}
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = state;
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp22_) {
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10137 "Page.c"
+#line 10162 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp23_ = NULL;
@@ -10146,68 +10171,68 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				Marker* _tmp30_ = NULL;
 				CheckerboardItem* _tmp31_ = NULL;
 				gboolean _tmp32_ = FALSE;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = _tmp23_;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = item;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/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 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = _tmp26_;
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp24_);
-#line 1532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp27_;
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = _tmp28_;
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = marker;
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp29_, _tmp30_);
-#line 1533 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp29_);
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = item;
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_VIEW, DataView));
-#line 1535 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1541 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp32_) {
-#line 10180 "Page.c"
+#line 10205 "Page.c"
 					CheckerboardItem* _tmp33_ = NULL;
 					CheckerboardItem* _tmp34_ = NULL;
 					CheckerboardItem* _tmp35_ = NULL;
 					CheckerboardItem* _tmp36_ = NULL;
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = item;
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1536 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp34_;
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp35_ = item;
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _g_object_ref0 (_tmp35_);
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->cursor);
-#line 1537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1543 "/home/jens/Source/shotwell/src/Page.vala"
 					self->cursor = _tmp36_;
-#line 10201 "Page.c"
+#line 10226 "Page.c"
 				}
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10207 "Page.c"
+#line 10232 "Page.c"
 			}
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 10211 "Page.c"
+#line 10236 "Page.c"
 			{
 				ViewCollection* _tmp37_ = NULL;
 				ViewCollection* _tmp38_ = NULL;
@@ -10216,92 +10241,92 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp43_ = NULL;
 				CheckerboardItem* _tmp44_ = NULL;
 				CheckerboardItem* _tmp45_ = NULL;
-#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = _tmp37_;
-#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_unselect_all (_tmp38_);
-#line 1542 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1548 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp38_);
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = self->anchor;
-#line 1544 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp39_ == NULL) {
-#line 10232 "Page.c"
+#line 10257 "Page.c"
 					CheckerboardItem* _tmp40_ = NULL;
 					CheckerboardItem* _tmp41_ = NULL;
-#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp40_ = item;
-#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp41_ = _g_object_ref0 (_tmp40_);
-#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1545 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1551 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp41_;
-#line 10243 "Page.c"
+#line 10268 "Page.c"
 				}
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = self->anchor;
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = item;
-#line 1547 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp42_, _tmp43_);
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp44_ = item;
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp45_ = _g_object_ref0 (_tmp44_);
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1555 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp45_;
-#line 1550 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1556 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10261 "Page.c"
+#line 10286 "Page.c"
 			}
-#line 1528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1534 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10265 "Page.c"
+#line 10290 "Page.c"
 			{
 				CheckerboardItem* _tmp46_ = NULL;
 				CheckerboardItem* _tmp49_ = NULL;
 				CheckerboardItem* _tmp50_ = NULL;
 				CheckerboardItem* _tmp51_ = NULL;
 				CheckerboardItem* _tmp52_ = NULL;
-#line 1557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp46_ = self->anchor;
-#line 1557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp46_ == NULL) {
-#line 10276 "Page.c"
+#line 10301 "Page.c"
 					CheckerboardItem* _tmp47_ = NULL;
 					CheckerboardItem* _tmp48_ = NULL;
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp47_ = item;
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp48_ = _g_object_ref0 (_tmp47_);
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->anchor);
-#line 1558 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1564 "/home/jens/Source/shotwell/src/Page.vala"
 					self->anchor = _tmp48_;
-#line 10287 "Page.c"
+#line 10312 "Page.c"
 				}
-#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp49_ = self->anchor;
-#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp50_ = item;
-#line 1560 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
 				checkerboard_page_select_between_items (self, _tmp49_, _tmp50_);
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp51_ = item;
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp52_ = _g_object_ref0 (_tmp51_);
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp52_;
-#line 1563 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10305 "Page.c"
+#line 10330 "Page.c"
 			}
 			default:
 			{
@@ -10311,34 +10336,34 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				CheckerboardItem* _tmp77_ = NULL;
 				CheckerboardItem* _tmp78_ = NULL;
 				CheckerboardItem* _tmp79_ = NULL;
-#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp53_ = event;
-#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp54_ = _tmp53_->type;
-#line 1566 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp54_ == GDK_2BUTTON_PRESS) {
-#line 10321 "Page.c"
+#line 10346 "Page.c"
 					CheckerboardItem* _tmp55_ = NULL;
 					CheckerboardItem* _tmp56_ = NULL;
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp55_ = item;
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp56_ = _g_object_ref0 (_tmp55_);
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (self->priv->activated_item);
-#line 1567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->activated_item = _tmp56_;
-#line 10332 "Page.c"
+#line 10357 "Page.c"
 				} else {
 					CheckerboardItem* _tmp57_ = NULL;
 					gboolean _tmp58_ = FALSE;
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp57_ = item;
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp58_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, TYPE_DATA_VIEW, DataView));
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Page.vala"
 					if (!_tmp58_) {
-#line 10342 "Page.c"
+#line 10367 "Page.c"
 						Marker* all = NULL;
 						ViewCollection* _tmp59_ = NULL;
 						ViewCollection* _tmp60_ = NULL;
@@ -10357,91 +10382,91 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 						CheckerboardItem* _tmp73_ = NULL;
 						Marker* _tmp74_ = NULL;
 						Marker* _tmp75_ = NULL;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp59_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp60_ = _tmp59_;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp61_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp62_ = _tmp61_;
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp60_);
-#line 1574 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Page.vala"
 						all = _tmp62_;
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp63_ = all;
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp64_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp65_ = _tmp64_;
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp66_ = view_collection_get_selected (_tmp65_);
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp67_ = _tmp66_;
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						marker_mark_many (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp67_);
-#line 1575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp65_);
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp68_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp69_ = _tmp68_;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp70_ = all;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp71_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp72_ = _tmp71_;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp73_ = item;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/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 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_tmp75_ = _tmp74_;
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						view_collection_unselect_and_select_marked (_tmp69_, _tmp70_, _tmp75_);
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (_tmp75_);
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp72_);
-#line 1577 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
 						_data_collection_unref0 (_tmp69_);
-#line 1573 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Page.vala"
 						_g_object_unref0 (all);
-#line 10415 "Page.c"
+#line 10440 "Page.c"
 					}
 				}
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp76_ = item;
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp77_ = _g_object_ref0 (_tmp76_);
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->anchor);
-#line 1581 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Page.vala"
 				self->anchor = _tmp77_;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp78_ = item;
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp79_ = _g_object_ref0 (_tmp78_);
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp79_;
-#line 1583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10436 "Page.c"
+#line 10461 "Page.c"
 			}
 		}
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = self->priv->layout;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = item;
-#line 1585 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1591 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_cursor (_tmp80_, _tmp81_);
-#line 10445 "Page.c"
+#line 10470 "Page.c"
 	} else {
 		guint _tmp82_ = 0U;
 		GeeArrayList* _tmp85_ = NULL;
@@ -10450,30 +10475,30 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 		gdouble _tmp103_ = 0.0;
 		GdkEventButton* _tmp104_ = NULL;
 		gdouble _tmp105_ = 0.0;
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp82_ = state;
-#line 1589 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp82_ != ((guint) GDK_CONTROL_MASK)) {
-#line 10458 "Page.c"
+#line 10483 "Page.c"
 			ViewCollection* _tmp83_ = NULL;
 			ViewCollection* _tmp84_ = NULL;
-#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp83_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp84_ = _tmp83_;
-#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all (_tmp84_);
-#line 1590 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1596 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp84_);
-#line 10469 "Page.c"
+#line 10494 "Page.c"
 		}
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = gee_array_list_new (TYPE_CHECKERBOARD_ITEM, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->previously_selected);
-#line 1593 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->previously_selected = _tmp85_;
-#line 10477 "Page.c"
+#line 10502 "Page.c"
 		{
 			GeeList* _view_list = NULL;
 			ViewCollection* _tmp86_ = NULL;
@@ -10485,31 +10510,31 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 			gint _tmp91_ = 0;
 			gint _tmp92_ = 0;
 			gint _view_index = 0;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp86_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp87_ = _tmp86_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp88_ = view_collection_get_selected (_tmp87_);
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp89_ = _tmp88_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp87_);
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_list = _tmp89_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp90_ = _view_list;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp91_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp92_ = _tmp91_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_size = _tmp92_;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_view_index = -1;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			while (TRUE) {
-#line 10513 "Page.c"
+#line 10538 "Page.c"
 				gint _tmp93_ = 0;
 				gint _tmp94_ = 0;
 				gint _tmp95_ = 0;
@@ -10519,79 +10544,79 @@ static gboolean checkerboard_page_real_on_left_click (Page* base, GdkEventButton
 				gpointer _tmp98_ = NULL;
 				GeeArrayList* _tmp99_ = NULL;
 				DataView* _tmp100_ = NULL;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp93_ = _view_index;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_view_index = _tmp93_ + 1;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp94_ = _view_index;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp95_ = _view_size;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!(_tmp94_ < _tmp95_)) {
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 					break;
-#line 10535 "Page.c"
+#line 10560 "Page.c"
 				}
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp96_ = _view_list;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp97_ = _view_index;
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp98_ = gee_list_get (_tmp96_, _tmp97_);
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				view = (DataView*) _tmp98_;
-#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp99_ = self->priv->previously_selected;
-#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp100_ = view;
-#line 1595 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1601 "/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 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (view);
-#line 10553 "Page.c"
+#line 10578 "Page.c"
 			}
-#line 1594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1600 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_view_list);
-#line 10557 "Page.c"
+#line 10582 "Page.c"
 		}
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp101_ = self->priv->layout;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp102_ = event;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp103_ = _tmp102_->x;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp104_ = event;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp105_ = _tmp104_->y;
-#line 1597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1603 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_set_drag_select_origin (_tmp101_, (gint) _tmp103_, (gint) _tmp105_);
-#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10577 "Page.c"
+#line 10602 "Page.c"
 	}
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp106_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp107_ = _tmp106_;
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp108_ = view_collection_get_selected_count (_tmp107_);
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp109_ = _tmp108_ == 0;
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp107_);
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp109_;
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1605 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1611 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10595 "Page.c"
+#line 10620 "Page.c"
 }
 
 
@@ -10612,152 +10637,152 @@ static gboolean checkerboard_page_real_on_left_released (Page* base, GdkEventBut
 	CheckerboardItem* _tmp15_ = NULL;
 	CheckerboardItem* _tmp16_ = NULL;
 	CheckerboardItem* _tmp17_ = NULL;
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1615 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1609 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1615 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1612 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 10630 "Page.c"
+#line 10655 "Page.c"
 		CheckerboardLayout* _tmp2_ = NULL;
 		CheckerboardItem* _tmp3_ = NULL;
 		CheckerboardItem* _tmp4_ = NULL;
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->layout;
-#line 1613 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1619 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_clear_drag_select (_tmp2_);
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->cursor;
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1614 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp4_;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10650 "Page.c"
+#line 10675 "Page.c"
 	}
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = event;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_->state;
-#line 1620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
 	if ((_tmp6_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0) {
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1621 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10662 "Page.c"
+#line 10687 "Page.c"
 	}
-#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1630 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->activated_item;
-#line 1624 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1630 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10668 "Page.c"
+#line 10693 "Page.c"
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardPageKeyboardModifiers _tmp9_ = {0};
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->priv->activated_item;
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_keyboard_modifiers_init (&_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_on_item_activated (self, _tmp8_, CHECKERBOARD_PAGE_ACTIVATOR_MOUSE, &_tmp9_);
-#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->activated_item);
-#line 1626 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->activated_item = NULL;
-#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10685 "Page.c"
+#line 10710 "Page.c"
 	}
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = event;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = _tmp10_->x;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = event;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_->y;
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = checkerboard_page_get_item_at_pixel (self, _tmp11_, _tmp13_);
-#line 1631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp14_;
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = item;
-#line 1632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_ == NULL) {
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10709 "Page.c"
+#line 10734 "Page.c"
 	}
-#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->cursor;
-#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = item;
-#line 1637 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1643 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp16_ != _tmp17_) {
-#line 10717 "Page.c"
+#line 10742 "Page.c"
 		ViewCollection* _tmp18_ = NULL;
 		ViewCollection* _tmp19_ = NULL;
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = _tmp18_;
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp19_);
-#line 1640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp19_);
-#line 10728 "Page.c"
+#line 10753 "Page.c"
 	} else {
 		CheckerboardItem* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = item;
-#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_DATA_VIEW, DataView));
-#line 1646 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1652 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp21_) {
-#line 10738 "Page.c"
+#line 10763 "Page.c"
 			ViewCollection* _tmp22_ = NULL;
 			ViewCollection* _tmp23_ = NULL;
 			CheckerboardItem* _tmp24_ = NULL;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = item;
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 			view_collection_unselect_all_but (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_VIEW, DataView));
-#line 1647 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp23_);
-#line 10752 "Page.c"
+#line 10777 "Page.c"
 		}
 	}
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1650 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 10761 "Page.c"
+#line 10786 "Page.c"
 }
 
 
@@ -10778,50 +10803,50 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 	GtkMenu* _tmp40_ = NULL;
 	GdkEventButton* _tmp41_ = NULL;
 	gboolean _tmp42_ = FALSE;
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1653 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->type;
-#line 1655 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1661 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != GDK_BUTTON_PRESS) {
-#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1656 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 10796 "Page.c"
+#line 10821 "Page.c"
 	}
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = event;
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_->x;
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = event;
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _tmp4_->y;
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = checkerboard_page_get_item_at_pixel (self, _tmp3_, _tmp5_);
-#line 1659 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp6_;
-#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1660 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp7_ != NULL) {
-#line 10814 "Page.c"
+#line 10839 "Page.c"
 		GdkEventButton* _tmp8_ = NULL;
 		GdkModifierType _tmp9_ = 0;
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = event;
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_->state;
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (_tmp9_ & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) {
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK:
-#line 10825 "Page.c"
+#line 10850 "Page.c"
 			{
 				Marker* marker = NULL;
 				ViewCollection* _tmp10_ = NULL;
@@ -10832,63 +10857,63 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 				ViewCollection* _tmp15_ = NULL;
 				ViewCollection* _tmp16_ = NULL;
 				Marker* _tmp17_ = NULL;
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp11_ = _tmp10_;
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = item;
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/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 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp14_ = _tmp13_;
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp11_);
-#line 1665 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
 				marker = _tmp14_;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp15_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp16_ = _tmp15_;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp17_ = marker;
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 				view_collection_toggle_marked (_tmp16_, _tmp17_);
-#line 1666 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1672 "/home/jens/Source/shotwell/src/Page.vala"
 				_data_collection_unref0 (_tmp16_);
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (marker);
-#line 1667 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10864 "Page.c"
+#line 10889 "Page.c"
 			}
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_SHIFT_MASK:
-#line 10868 "Page.c"
+#line 10893 "Page.c"
 			{
-#line 1671 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10872 "Page.c"
+#line 10897 "Page.c"
 			}
-#line 1662 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1668 "/home/jens/Source/shotwell/src/Page.vala"
 			case GDK_CONTROL_MASK | GDK_SHIFT_MASK:
-#line 10876 "Page.c"
+#line 10901 "Page.c"
 			{
-#line 1675 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10880 "Page.c"
+#line 10905 "Page.c"
 			}
 			default:
 			{
 				CheckerboardItem* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp18_ = item;
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp19_ = data_view_is_selected (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_DATA_VIEW, DataView));
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 				if (!_tmp19_) {
-#line 10892 "Page.c"
+#line 10917 "Page.c"
 					Marker* all = NULL;
 					ViewCollection* _tmp20_ = NULL;
 					ViewCollection* _tmp21_ = NULL;
@@ -10907,99 +10932,99 @@ static gboolean checkerboard_page_real_on_right_click (Page* base, GdkEventButto
 					CheckerboardItem* _tmp34_ = NULL;
 					Marker* _tmp35_ = NULL;
 					Marker* _tmp36_ = NULL;
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp20_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp21_ = _tmp20_;
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp22_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp23_ = _tmp22_;
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp21_);
-#line 1681 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Page.vala"
 					all = _tmp23_;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp24_ = all;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp25_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp26_ = _tmp25_;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp27_ = view_collection_get_selected (_tmp26_);
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp28_ = _tmp27_;
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					marker_mark_many (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp28_);
-#line 1682 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1688 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp26_);
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp29_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp30_ = _tmp29_;
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp31_ = all;
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp32_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp33_ = _tmp32_;
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp34_ = item;
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/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 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp36_ = _tmp35_;
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					view_collection_unselect_and_select_marked (_tmp30_, _tmp31_, _tmp36_);
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (_tmp36_);
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp33_);
-#line 1684 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
 					_data_collection_unref0 (_tmp30_);
-#line 1680 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
 					_g_object_unref0 (all);
-#line 10965 "Page.c"
+#line 10990 "Page.c"
 				}
-#line 1686 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1692 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 10969 "Page.c"
+#line 10994 "Page.c"
 			}
 		}
 	} else {
 		ViewCollection* _tmp37_ = NULL;
 		ViewCollection* _tmp38_ = NULL;
-#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp38_ = _tmp37_;
-#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp38_);
-#line 1690 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1696 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 10983 "Page.c"
+#line 11008 "Page.c"
 	}
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = checkerboard_page_get_context_menu (self);
-#line 1693 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
 	context_menu = _tmp39_;
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = context_menu;
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = event;
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp40_, _tmp41_);
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp42_;
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (context_menu);
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 1694 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1700 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11003 "Page.c"
+#line 11028 "Page.c"
 }
 
 
@@ -11013,105 +11038,105 @@ static gboolean checkerboard_page_real_on_mouse_over (CheckerboardPage* self, Ch
 	CheckerboardItem* _tmp11_ = NULL;
 	CheckerboardItem* _tmp12_ = NULL;
 	CheckerboardItem* _tmp13_ = NULL;
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail ((item == NULL) || IS_CHECKERBOARD_ITEM (item), FALSE);
-#line 1698 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = item;
-#line 1698 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 11023 "Page.c"
+#line 11048 "Page.c"
 		CheckerboardLayout* _tmp1_ = NULL;
 		CheckerboardItem* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
 		GdkModifierType _tmp5_ = 0;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->layout;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = item;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = x;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = y;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = mask;
-#line 1699 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_layout_handle_mouse_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 11041 "Page.c"
+#line 11066 "Page.c"
 	}
-#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = item;
-#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->highlighted;
-#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == _tmp7_) {
-#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1704 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11053 "Page.c"
+#line 11078 "Page.c"
 	}
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->highlighted;
-#line 1707 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_ != NULL) {
-#line 11059 "Page.c"
+#line 11084 "Page.c"
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->highlighted;
-#line 1708 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_item_unbrighten (_tmp9_);
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->highlighted);
-#line 1709 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1715 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->highlighted = NULL;
-#line 11069 "Page.c"
+#line 11094 "Page.c"
 	}
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = item;
-#line 1713 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp10_ == NULL) {
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 1714 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11079 "Page.c"
+#line 11104 "Page.c"
 	}
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = item;
-#line 1717 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_item_brighten (_tmp11_);
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = item;
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _g_object_ref0 (_tmp12_);
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1718 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1724 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = _tmp13_;
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1720 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11097 "Page.c"
+#line 11122 "Page.c"
 }
 
 
 gboolean checkerboard_page_on_mouse_over (CheckerboardPage* self, CheckerboardItem* item, gint x, gint y, GdkModifierType mask) {
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1697 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1703 "/home/jens/Source/shotwell/src/Page.vala"
 	return CHECKERBOARD_PAGE_GET_CLASS (self)->on_mouse_over (self, item, x, y, mask);
-#line 11106 "Page.c"
+#line 11131 "Page.c"
 }
 
 
 static gboolean _checkerboard_page_selection_autoscroll_gsource_func (gpointer self) {
 	gboolean result;
 	result = checkerboard_page_selection_autoscroll ((CheckerboardPage*) self);
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1746 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11115 "Page.c"
+#line 11140 "Page.c"
 }
 
 
@@ -11134,95 +11159,95 @@ static gboolean checkerboard_page_real_on_motion (Page* base, GdkEventMotion* ev
 	gint _tmp13_ = 0;
 	gboolean _tmp14_ = FALSE;
 	gboolean _tmp15_ = FALSE;
-#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1723 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = checkerboard_page_get_item_at_pixel (self, (gdouble) _tmp0_, (gdouble) _tmp1_);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = x;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = y;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = mask;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = checkerboard_page_on_mouse_over (self, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = !_tmp7_;
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1725 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp8_) {
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1726 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11168 "Page.c"
+#line 11193 "Page.c"
 	}
-#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->priv->layout;
-#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = checkerboard_layout_is_drag_select_active (_tmp9_);
-#line 1729 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp10_) {
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1730 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11180 "Page.c"
+#line 11205 "Page.c"
 	}
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->layout;
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = x;
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = y;
-#line 1733 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_drag_select_endpoint (_tmp11_, _tmp12_, _tmp13_);
-#line 1735 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1741 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->autoscroll_scheduled;
-#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp15_) {
-#line 11196 "Page.c"
+#line 11221 "Page.c"
 		GtkAdjustment* _tmp16_ = NULL;
 		gint _tmp17_ = 0;
 		AdjustmentRelation _tmp18_ = 0;
-#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/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 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = y;
-#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = get_adjustment_relation (_tmp16_, _tmp17_);
-#line 1739 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp18_ != ADJUSTMENT_RELATION_IN_RANGE;
-#line 11208 "Page.c"
+#line 11233 "Page.c"
 	} else {
-#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = FALSE;
-#line 11212 "Page.c"
+#line 11237 "Page.c"
 	}
-#line 1738 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp14_) {
-#line 1740 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1746 "/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 1741 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1747 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = TRUE;
-#line 11220 "Page.c"
+#line 11245 "Page.c"
 	}
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1745 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11226 "Page.c"
+#line 11251 "Page.c"
 }
 
 
@@ -11259,91 +11284,91 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 	ViewCollection* _tmp47_ = NULL;
 	ViewCollection* _tmp48_ = NULL;
 	Marker* _tmp49_ = NULL;
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1749 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp1_, "layout.is_drag_select_active()");
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->layout;
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = checkerboard_layout_items_in_selection_band (_tmp2_);
-#line 1752 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Page.vala"
 	intersection = _tmp3_;
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = intersection;
-#line 1753 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (intersection);
-#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11285 "Page.c"
+#line 11310 "Page.c"
 	}
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_;
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1756 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1762 "/home/jens/Source/shotwell/src/Page.vala"
 	to_unselect = _tmp8_;
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_;
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = _tmp11_;
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 1757 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
 	to_select = _tmp12_;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = to_unselect;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = view_collection_get_selected (_tmp15_);
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = _tmp16_;
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp13_, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp17_);
-#line 1760 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1766 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp15_);
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->previously_selected;
-#line 1763 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp18_ != NULL, "previously_selected != null");
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = to_unselect;
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = self->priv->previously_selected;
-#line 1764 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_unmark_many (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = to_select;
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = self->priv->previously_selected;
-#line 1765 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
 	marker_mark_many (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1768 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 11347 "Page.c"
+#line 11372 "Page.c"
 	{
 		GeeList* _item_list = NULL;
 		GeeList* _tmp23_ = NULL;
@@ -11353,25 +11378,25 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
 		gint _item_index = 0;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = intersection;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_list = _tmp24_;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = _item_list;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = _tmp26_;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_size = _tmp27_;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_item_index = -1;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 11375 "Page.c"
+#line 11400 "Page.c"
 			gint _tmp28_ = 0;
 			gint _tmp29_ = 0;
 			gint _tmp30_ = 0;
@@ -11383,109 +11408,109 @@ static void checkerboard_page_updated_selection_band (CheckerboardPage* self) {
 			CheckerboardItem* _tmp35_ = NULL;
 			gboolean _tmp36_ = FALSE;
 			CheckerboardItem* _tmp41_ = NULL;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _item_index;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_item_index = _tmp28_ + 1;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = _item_index;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _item_size;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!(_tmp29_ < _tmp30_)) {
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 11399 "Page.c"
+#line 11424 "Page.c"
 			}
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = _item_list;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp32_ = _item_index;
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = gee_list_get (_tmp31_, _tmp32_);
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			item = (CheckerboardItem*) _tmp33_;
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = to_select;
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = item;
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp36_ = marker_toggle (_tmp34_, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_DATA_OBJECT, DataObject));
-#line 1771 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp36_) {
-#line 11417 "Page.c"
+#line 11442 "Page.c"
 				Marker* _tmp37_ = NULL;
 				CheckerboardItem* _tmp38_ = NULL;
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp37_ = to_unselect;
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp38_ = item;
-#line 1772 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_unmark (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_DATA_OBJECT, DataObject));
-#line 11426 "Page.c"
+#line 11451 "Page.c"
 			} else {
 				Marker* _tmp39_ = NULL;
 				CheckerboardItem* _tmp40_ = NULL;
-#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp39_ = to_unselect;
-#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = item;
-#line 1774 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
 				marker_mark (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_DATA_OBJECT, DataObject));
-#line 11436 "Page.c"
+#line 11461 "Page.c"
 			}
-#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->cursor;
-#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1782 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ == NULL) {
-#line 11442 "Page.c"
+#line 11467 "Page.c"
 				CheckerboardItem* _tmp42_ = NULL;
 				CheckerboardItem* _tmp43_ = NULL;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp42_ = item;
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp43_ = _g_object_ref0 (_tmp42_);
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->cursor);
-#line 1777 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1783 "/home/jens/Source/shotwell/src/Page.vala"
 				self->cursor = _tmp43_;
-#line 11453 "Page.c"
+#line 11478 "Page.c"
 			}
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 11457 "Page.c"
+#line 11482 "Page.c"
 		}
-#line 1770 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1776 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_item_list);
-#line 11461 "Page.c"
+#line 11486 "Page.c"
 	}
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = _tmp44_;
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = to_select;
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp45_, _tmp46_);
-#line 1780 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp45_);
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = _tmp47_;
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = to_unselect;
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_unselect_marked (_tmp48_, _tmp49_);
-#line 1781 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1787 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp48_);
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_select);
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (to_unselect);
-#line 1748 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1754 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (intersection);
-#line 11489 "Page.c"
+#line 11514 "Page.c"
 }
 
 
@@ -11517,77 +11542,77 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 	GtkAdjustment* _tmp28_ = NULL;
 	gdouble _tmp29_ = 0.0;
 	gint _tmp30_ = 0;
-#line 1784 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1790 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_CHECKERBOARD_PAGE (self), FALSE);
-#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->layout;
-#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = checkerboard_layout_is_drag_select_active (_tmp0_);
-#line 1785 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1791 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp1_) {
-#line 1786 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->autoscroll_scheduled = FALSE;
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 1788 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1794 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 11535 "Page.c"
+#line 11560 "Page.c"
 	}
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/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 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 1792 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp3_;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/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 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
 	x = _tmp4_;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
 	y = _tmp5_;
-#line 1796 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
 	mask = _tmp6_;
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = vadj;
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = gtk_adjustment_get_value (_tmp7_);
-#line 1798 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
 	new_value = (gint) _tmp8_;
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = vadj;
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = y;
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = get_adjustment_relation (_tmp9_, _tmp10_);
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp11_) {
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_BELOW:
-#line 11567 "Page.c"
+#line 11592 "Page.c"
 		{
 			gint _tmp12_ = 0;
 			CheckerboardLayout* _tmp13_ = NULL;
 			gint _tmp14_ = 0;
 			gint _tmp15_ = 0;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = new_value;
-#line 1802 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp12_ - CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = self->priv->layout;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = x;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = new_value;
-#line 1803 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp13_, _tmp14_, _tmp15_);
-#line 1804 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1810 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11587 "Page.c"
+#line 11612 "Page.c"
 		}
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_ABOVE:
-#line 11591 "Page.c"
+#line 11616 "Page.c"
 		{
 			gint _tmp16_ = 0;
 			CheckerboardLayout* _tmp17_ = NULL;
@@ -11595,78 +11620,78 @@ static gboolean checkerboard_page_selection_autoscroll (CheckerboardPage* self)
 			gint _tmp19_ = 0;
 			GtkAdjustment* _tmp20_ = NULL;
 			gdouble _tmp21_ = 0.0;
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = new_value;
-#line 1808 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Page.vala"
 			new_value = _tmp16_ + CHECKERBOARD_PAGE_AUTOSCROLL_PIXELS;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = self->priv->layout;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = x;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = new_value;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = vadj;
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = gtk_adjustment_get_page_size (_tmp20_);
-#line 1809 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
 			checkerboard_layout_set_drag_select_endpoint (_tmp17_, _tmp18_, _tmp19_ + ((gint) _tmp21_));
-#line 1810 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1816 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11617 "Page.c"
+#line 11642 "Page.c"
 		}
-#line 1799 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1805 "/home/jens/Source/shotwell/src/Page.vala"
 		case ADJUSTMENT_RELATION_IN_RANGE:
-#line 11621 "Page.c"
+#line 11646 "Page.c"
 		{
-#line 1813 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Page.vala"
 			self->priv->autoscroll_scheduled = FALSE;
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
 			result = FALSE;
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (vadj);
-#line 1815 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Page.vala"
 			return result;
-#line 11631 "Page.c"
+#line 11656 "Page.c"
 		}
 		default:
 		{
-#line 1818 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Page.vala"
 			g_warn_if_reached ();
-#line 1819 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 11639 "Page.c"
+#line 11664 "Page.c"
 		}
 	}
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = new_value;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = vadj;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = gtk_adjustment_get_lower (_tmp24_);
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = vadj;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = gtk_adjustment_get_upper (_tmp26_);
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = vadj;
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = gtk_adjustment_get_page_size (_tmp28_);
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = CLAMP (_tmp23_, (gint) _tmp25_, ((gint) _tmp27_) - ((gint) _tmp29_));
-#line 1825 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1831 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp22_, (gdouble) _tmp30_);
-#line 1828 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_updated_selection_band (self);
-#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 1830 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 11670 "Page.c"
+#line 11695 "Page.c"
 }
 
 
@@ -11697,35 +11722,35 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 	gdouble _tmp39_ = 0.0;
 	GtkAdjustment* _tmp53_ = NULL;
 	gint _tmp54_ = 0;
-#line 1833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/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 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_, "get_view().contains(item)");
-#line 1834 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = item;
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1836 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1842 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp5_;
-#line 1838 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1838 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp6_) {
-#line 11729 "Page.c"
+#line 11754 "Page.c"
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		Marker* marker = NULL;
@@ -11737,67 +11762,67 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		ViewCollection* _tmp14_ = NULL;
 		ViewCollection* _tmp15_ = NULL;
 		Marker* _tmp16_ = NULL;
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp8_);
-#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = _tmp9_;
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = item;
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/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 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = _tmp12_;
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 1840 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
 		marker = _tmp13_;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _tmp14_;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = marker;
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_select_marked (_tmp15_, _tmp16_);
-#line 1841 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp15_);
-#line 1838 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (marker);
-#line 11775 "Page.c"
+#line 11800 "Page.c"
 	}
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->layout;
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = item;
-#line 1843 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_layout_set_cursor (_tmp17_, _tmp18_);
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/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 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1846 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
 	vadj = _tmp20_;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp22_ = vadj;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp23_ = item;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp24_ = _tmp23_->allocation;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = _tmp24_.y;
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = get_adjustment_relation (_tmp22_, _tmp25_);
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp26_ == ADJUSTMENT_RELATION_IN_RANGE) {
-#line 11801 "Page.c"
+#line 11826 "Page.c"
 		GtkAdjustment* _tmp27_ = NULL;
 		CheckerboardItem* _tmp28_ = NULL;
 		GdkRectangle _tmp29_ = {0};
@@ -11806,70 +11831,70 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GdkRectangle _tmp32_ = {0};
 		gint _tmp33_ = 0;
 		AdjustmentRelation _tmp34_ = 0;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = vadj;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = item;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_->allocation;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.y;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = item;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_->allocation;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = _tmp32_.height;
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp34_ = get_adjustment_relation (_tmp27_, _tmp30_ + _tmp33_);
-#line 1848 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = _tmp34_ == ADJUSTMENT_RELATION_IN_RANGE;
-#line 11828 "Page.c"
+#line 11853 "Page.c"
 	} else {
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = FALSE;
-#line 11832 "Page.c"
+#line 11857 "Page.c"
 	}
-#line 1847 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_) {
-#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (vadj);
-#line 1849 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11840 "Page.c"
+#line 11865 "Page.c"
 	}
-#line 1852 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
 	top = 0;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = item;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_->allocation;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = _tmp36_.y;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = vadj;
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = gtk_adjustment_get_value (_tmp38_);
-#line 1853 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Page.vala"
 	if (((gdouble) _tmp37_) < _tmp39_) {
-#line 11856 "Page.c"
+#line 11881 "Page.c"
 		CheckerboardItem* _tmp40_ = NULL;
 		GdkRectangle _tmp41_ = {0};
 		gint _tmp42_ = 0;
 		gint _tmp43_ = 0;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp40_ = item;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp41_ = _tmp40_->allocation;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp42_ = _tmp41_.y;
-#line 1854 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1860 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp42_;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp43_ = top;
-#line 1855 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp43_ - (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 11873 "Page.c"
+#line 11898 "Page.c"
 	} else {
 		CheckerboardItem* _tmp44_ = NULL;
 		GdkRectangle _tmp45_ = {0};
@@ -11880,39 +11905,39 @@ void checkerboard_page_cursor_to_item (CheckerboardPage* self, CheckerboardItem*
 		GtkAdjustment* _tmp50_ = NULL;
 		gdouble _tmp51_ = 0.0;
 		gint _tmp52_ = 0;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp44_ = item;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp45_ = _tmp44_->allocation;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp46_ = _tmp45_.y;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = item;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = _tmp47_->allocation;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.height;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = vadj;
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = gtk_adjustment_get_page_size (_tmp50_);
-#line 1857 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1863 "/home/jens/Source/shotwell/src/Page.vala"
 		top = (_tmp46_ + _tmp49_) - ((gint) _tmp51_);
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = top;
-#line 1858 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
 		top = _tmp52_ + (CHECKERBOARD_LAYOUT_ROW_GUTTER_PADDING / 2);
-#line 11906 "Page.c"
+#line 11931 "Page.c"
 	}
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp53_ = vadj;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp54_ = top;
-#line 1861 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_adjustment_set_value (_tmp53_, (gdouble) _tmp54_);
-#line 1833 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1839 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (vadj);
-#line 11916 "Page.c"
+#line 11941 "Page.c"
 }
 
 
@@ -11931,171 +11956,171 @@ void checkerboard_page_move_cursor (CheckerboardPage* self, CompassPoint point)
 	CompassPoint _tmp27_ = 0;
 	CheckerboardItem* _tmp28_ = NULL;
 	CheckerboardItem* _tmp29_ = NULL;
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1866 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 1867 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 11951 "Page.c"
+#line 11976 "Page.c"
 	}
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->cursor;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 11957 "Page.c"
+#line 11982 "Page.c"
 		CheckerboardLayout* _tmp7_ = NULL;
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->layout;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = checkerboard_layout_get_cursor (_tmp7_);
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp9_ == NULL;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp9_);
-#line 11971 "Page.c"
+#line 11996 "Page.c"
 	} else {
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = FALSE;
-#line 11975 "Page.c"
+#line 12000 "Page.c"
 	}
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 11981 "Page.c"
+#line 12006 "Page.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
 		CheckerboardItem* _tmp11_ = NULL;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->cursor;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp11_ != NULL) {
-#line 11989 "Page.c"
+#line 12014 "Page.c"
 			ViewCollection* _tmp12_ = NULL;
 			ViewCollection* _tmp13_ = NULL;
 			CheckerboardItem* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = _tmp12_;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = self->cursor;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/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 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = !_tmp15_;
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp13_);
-#line 12006 "Page.c"
+#line 12031 "Page.c"
 		} else {
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = FALSE;
-#line 12010 "Page.c"
+#line 12035 "Page.c"
 		}
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp10_;
-#line 12014 "Page.c"
+#line 12039 "Page.c"
 	}
-#line 1872 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 12018 "Page.c"
+#line 12043 "Page.c"
 		CheckerboardItem* item = NULL;
 		CheckerboardLayout* _tmp16_ = NULL;
 		CheckerboardItem* _tmp17_ = NULL;
 		CheckerboardItem* _tmp18_ = NULL;
 		CheckerboardItem* _tmp19_ = NULL;
 		CheckerboardItem* _tmp20_ = NULL;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->layout;
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = checkerboard_layout_get_item_at_coordinate (_tmp16_, 0, 0);
-#line 1873 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Page.vala"
 		item = _tmp17_;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = item;
-#line 1874 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp18_);
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = item;
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _g_object_ref0 (_tmp19_);
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1875 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp20_;
-#line 1877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (item);
-#line 1877 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1883 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12047 "Page.c"
+#line 12072 "Page.c"
 	}
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = self->cursor;
-#line 1880 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp21_ == NULL) {
-#line 12053 "Page.c"
+#line 12078 "Page.c"
 		CheckerboardLayout* _tmp22_ = NULL;
 		CheckerboardItem* _tmp23_ = NULL;
 		CheckerboardItem* _tmp24_ = NULL;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->layout;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = checkerboard_layout_get_cursor (_tmp22_);
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp23_, TYPE_CHECKERBOARD_ITEM) ? ((CheckerboardItem*) _tmp23_) : NULL;
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp24_ == NULL) {
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp23_);
-#line 12067 "Page.c"
+#line 12092 "Page.c"
 		}
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->cursor);
-#line 1881 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
 		self->cursor = _tmp24_;
-#line 12073 "Page.c"
+#line 12098 "Page.c"
 	}
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->layout;
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp26_ = self->cursor;
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = point;
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = checkerboard_layout_get_item_relative_to (_tmp25_, _tmp26_, _tmp27_);
-#line 1885 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
 	item = _tmp28_;
-#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = item;
-#line 1886 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_ != NULL) {
-#line 12089 "Page.c"
+#line 12114 "Page.c"
 		CheckerboardItem* _tmp30_ = NULL;
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = item;
-#line 1887 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1893 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_cursor_to_item (self, _tmp30_);
-#line 12095 "Page.c"
+#line 12120 "Page.c"
 	}
-#line 1864 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (item);
-#line 12099 "Page.c"
+#line 12124 "Page.c"
 }
 
 
@@ -12112,51 +12137,51 @@ void checkerboard_page_set_cursor (CheckerboardPage* self, CheckerboardItem* ite
 	CheckerboardItem* _tmp8_ = NULL;
 	CheckerboardItem* _tmp9_ = NULL;
 	CheckerboardItem* _tmp10_ = NULL;
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item));
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = item;
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/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 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_;
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1891 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp4_;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp6_, marker);
-#line 1892 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = item;
-#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1894 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = _tmp8_;
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = item;
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _g_object_ref0 (_tmp9_);
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1895 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = _tmp10_;
-#line 1890 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1896 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12160 "Page.c"
+#line 12185 "Page.c"
 }
 
 
@@ -12171,29 +12196,29 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 	ViewCollection* _tmp28_ = NULL;
 	ViewCollection* _tmp29_ = NULL;
 	Marker* _tmp30_ = NULL;
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_start));
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_ITEM (item_end));
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = data_collection_start_marking (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1899 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
 	marker = _tmp3_;
-#line 1901 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_start = FALSE;
-#line 1902 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
 	passed_end = FALSE;
-#line 12197 "Page.c"
+#line 12222 "Page.c"
 	{
 		GeeIterator* _object_it = NULL;
 		ViewCollection* _tmp4_ = NULL;
@@ -12202,27 +12227,27 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 		GeeCollection* _tmp7_ = NULL;
 		GeeIterator* _tmp8_ = NULL;
 		GeeIterator* _tmp9_ = NULL;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp7_);
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_object_it = _tmp9_;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		while (TRUE) {
-#line 12226 "Page.c"
+#line 12251 "Page.c"
 			GeeIterator* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
 			DataObject* object = NULL;
@@ -12239,125 +12264,125 @@ void checkerboard_page_select_between_items (CheckerboardPage* self, Checkerboar
 			gboolean _tmp21_ = FALSE;
 			gboolean _tmp25_ = FALSE;
 			gboolean _tmp26_ = FALSE;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = _object_it;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = gee_iterator_next (_tmp10_);
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp11_) {
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12251 "Page.c"
+#line 12276 "Page.c"
 			}
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _object_it;
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = gee_iterator_get (_tmp12_);
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			object = (DataObject*) _tmp13_;
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = object;
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_CHECKERBOARD_ITEM, CheckerboardItem));
-#line 1905 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
 			item = _tmp15_;
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp16_ = item_start;
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp17_ = item;
-#line 1907 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp16_ == _tmp17_) {
-#line 1908 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_start = TRUE;
-#line 12273 "Page.c"
+#line 12298 "Page.c"
 			}
-#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = item_end;
-#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = item;
-#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp18_ == _tmp19_) {
-#line 1911 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
 				passed_end = TRUE;
-#line 12283 "Page.c"
+#line 12308 "Page.c"
 			}
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = passed_start;
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = TRUE;
-#line 12291 "Page.c"
+#line 12316 "Page.c"
 			} else {
 				gboolean _tmp22_ = FALSE;
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = passed_end;
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp20_ = _tmp22_;
-#line 12298 "Page.c"
+#line 12323 "Page.c"
 			}
-#line 1913 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1919 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp20_) {
-#line 12302 "Page.c"
+#line 12327 "Page.c"
 				Marker* _tmp23_ = NULL;
 				DataObject* _tmp24_ = NULL;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp23_ = marker;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = object;
-#line 1914 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1920 "/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 12311 "Page.c"
+#line 12336 "Page.c"
 			}
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = passed_start;
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp26_) {
-#line 12317 "Page.c"
+#line 12342 "Page.c"
 				gboolean _tmp27_ = FALSE;
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = passed_end;
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = _tmp27_;
-#line 12323 "Page.c"
+#line 12348 "Page.c"
 			} else {
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = FALSE;
-#line 12327 "Page.c"
+#line 12352 "Page.c"
 			}
-#line 1916 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp25_) {
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (item);
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (object);
-#line 1917 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 12337 "Page.c"
+#line 12362 "Page.c"
 			}
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (item);
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (object);
-#line 12343 "Page.c"
+#line 12368 "Page.c"
 		}
-#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_object_it);
-#line 12347 "Page.c"
+#line 12372 "Page.c"
 	}
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = _tmp28_;
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = marker;
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	view_collection_select_marked (_tmp29_, _tmp30_);
-#line 1920 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1926 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp29_);
-#line 1898 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (marker);
-#line 12361 "Page.c"
+#line 12386 "Page.c"
 }
 
 
@@ -12365,65 +12390,65 @@ void checkerboard_page_select_anchor_to_cursor (CheckerboardPage* self, guint st
 	gboolean _tmp0_ = FALSE;
 	CheckerboardItem* _tmp1_ = NULL;
 	guint _tmp3_ = 0U;
-#line 1923 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->cursor;
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ == NULL) {
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = TRUE;
-#line 12377 "Page.c"
+#line 12402 "Page.c"
 	} else {
 		CheckerboardItem* _tmp2_ = NULL;
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->anchor;
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 12384 "Page.c"
+#line 12409 "Page.c"
 	}
-#line 1924 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 1925 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 12390 "Page.c"
+#line 12415 "Page.c"
 	}
-#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = state;
-#line 1927 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_ == ((guint) GDK_SHIFT_MASK)) {
-#line 12396 "Page.c"
+#line 12421 "Page.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		CheckerboardItem* _tmp6_ = NULL;
 		CheckerboardItem* _tmp7_ = NULL;
-#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 		view_collection_unselect_all (_tmp5_);
-#line 1928 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->anchor;
-#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->cursor;
-#line 1929 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
 		checkerboard_page_select_between_items (self, _tmp6_, _tmp7_);
-#line 12415 "Page.c"
+#line 12440 "Page.c"
 	} else {
 		CheckerboardItem* _tmp8_ = NULL;
 		CheckerboardItem* _tmp9_ = NULL;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->cursor;
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->anchor);
-#line 1931 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
 		self->anchor = _tmp9_;
-#line 12427 "Page.c"
+#line 12452 "Page.c"
 	}
 }
 
@@ -12437,48 +12462,48 @@ static void checkerboard_page_real_set_display_titles (CheckerboardPage* self, g
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1936 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_set_property (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), CHECKERBOARD_ITEM_PROP_SHOW_TITLES, &_tmp5_, NULL, NULL);
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1937 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1938 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12473 "Page.c"
+#line 12498 "Page.c"
 }
 
 
 void checkerboard_page_set_display_titles (CheckerboardPage* self, gboolean display) {
-#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1935 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_titles (self, display);
-#line 12482 "Page.c"
+#line 12507 "Page.c"
 }
 
 
@@ -12491,48 +12516,48 @@ static void checkerboard_page_real_set_display_comments (CheckerboardPage* self,
 	GValue _tmp5_ = {0};
 	ViewCollection* _tmp6_ = NULL;
 	ViewCollection* _tmp7_ = NULL;
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_freeze_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1942 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = display;
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_init (&_tmp5_, G_TYPE_BOOLEAN);
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	g_value_set_boolean (&_tmp5_, _tmp4_);
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/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 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	G_IS_VALUE (&_tmp5_) ? (g_value_unset (&_tmp5_), NULL) : NULL;
-#line 1943 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = _tmp6_;
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	data_collection_thaw_notifications (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1944 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 12527 "Page.c"
+#line 12552 "Page.c"
 }
 
 
 void checkerboard_page_set_display_comments (CheckerboardPage* self, gboolean display) {
-#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_CHECKERBOARD_PAGE (self));
-#line 1941 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Page.vala"
 	CHECKERBOARD_PAGE_GET_CLASS (self)->set_display_comments (self, display);
-#line 12536 "Page.c"
+#line 12561 "Page.c"
 }
 
 
@@ -12545,54 +12570,54 @@ void checkerboard_page_keyboard_modifiers_init (CheckerboardPageKeyboardModifier
 	gboolean _tmp5_ = FALSE;
 	Page* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
-#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 1224 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (self, 0, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_ctrl_pressed (_tmp0_);
-#line 1225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1231 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).ctrl_pressed = _tmp1_;
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page;
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = page_get_alt_pressed (_tmp2_);
-#line 1226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).alt_pressed = _tmp3_;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = page;
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = page_get_shift_pressed (_tmp4_);
-#line 1227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1233 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).shift_pressed = _tmp5_;
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = page;
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = page_get_super_pressed (_tmp6_);
-#line 1228 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1234 "/home/jens/Source/shotwell/src/Page.vala"
 	(*self).super_pressed = _tmp7_;
-#line 12577 "Page.c"
+#line 12602 "Page.c"
 }
 
 
 CheckerboardPageKeyboardModifiers* checkerboard_page_keyboard_modifiers_dup (const CheckerboardPageKeyboardModifiers* self) {
 	CheckerboardPageKeyboardModifiers* dup;
-#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (CheckerboardPageKeyboardModifiers, 1);
-#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (CheckerboardPageKeyboardModifiers));
-#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 12589 "Page.c"
+#line 12614 "Page.c"
 }
 
 
 void checkerboard_page_keyboard_modifiers_free (CheckerboardPageKeyboardModifiers* self) {
-#line 1223 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Page.vala"
 	g_free (self);
-#line 12596 "Page.c"
+#line 12621 "Page.c"
 }
 
 
@@ -12608,113 +12633,113 @@ GType checkerboard_page_keyboard_modifiers_get_type (void) {
 
 
 static void checkerboard_page_class_init (CheckerboardPageClass * klass) {
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	checkerboard_page_parent_class = g_type_class_peek_parent (klass);
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (CheckerboardPagePrivate));
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_item_context_menu = checkerboard_page_real_get_item_context_menu;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->get_page_context_menu = checkerboard_page_real_get_page_context_menu;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = checkerboard_page_real_on_context_keypress;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_empty_message = checkerboard_page_real_get_view_empty_message;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_filter_no_match_message = checkerboard_page_real_get_filter_no_match_message;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_item_activated = checkerboard_page_real_on_item_activated;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_search_view_filter = checkerboard_page_real_get_search_view_filter;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->get_view_tracker = checkerboard_page_real_get_view_tracker;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switching_from = checkerboard_page_real_switching_from;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = checkerboard_page_real_switched_to;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_page_name = checkerboard_page_real_set_page_name;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = checkerboard_page_real_key_press_event;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_click = checkerboard_page_real_on_left_click;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_left_released = checkerboard_page_real_on_left_released;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_right_click = checkerboard_page_real_on_right_click;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->on_mouse_over = checkerboard_page_real_on_mouse_over;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_motion = checkerboard_page_real_on_motion;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_titles = checkerboard_page_real_set_display_titles;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	((CheckerboardPageClass *) klass)->set_display_comments = checkerboard_page_real_set_display_comments;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = checkerboard_page_finalize;
-#line 12656 "Page.c"
+#line 12681 "Page.c"
 }
 
 
 static void checkerboard_page_instance_init (CheckerboardPage * self) {
 	GtkViewport* _tmp0_ = NULL;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = CHECKERBOARD_PAGE_GET_PRIVATE (self);
-#line 1208 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->item_context_menu_path = NULL;
-#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page_context_menu_path = NULL;
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->viewport = _tmp0_;
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
 	self->anchor = NULL;
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Page.vala"
 	self->cursor = NULL;
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->highlighted = NULL;
-#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->autoscroll_scheduled = FALSE;
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->activated_item = NULL;
-#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->previously_selected = NULL;
-#line 12686 "Page.c"
+#line 12711 "Page.c"
 }
 
 
 static void checkerboard_page_finalize (GObject* obj) {
 	CheckerboardPage * self;
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CHECKERBOARD_PAGE, CheckerboardPage);
-#line 1207 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->layout);
-#line 1208 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->item_context_menu_path);
-#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (self->priv->page_context_menu_path);
-#line 1210 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->viewport);
-#line 1211 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->anchor);
-#line 1212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1218 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->cursor);
-#line 1213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->highlighted);
-#line 1215 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->activated_item);
-#line 1216 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->previously_selected);
-#line 1283 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->item_context_menu);
-#line 1295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->page_context_menu);
-#line 1203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1209 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (checkerboard_page_parent_class)->finalize (obj);
-#line 12718 "Page.c"
+#line 12743 "Page.c"
 }
 
 
@@ -12743,18 +12768,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 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_on_viewport_resize ((SinglePhotoPage*) self);
-#line 12749 "Page.c"
+#line 12774 "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 2004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12758 "Page.c"
+#line 12783 "Page.c"
 }
 
 
@@ -12774,71 +12799,71 @@ SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* pa
 	GtkViewport* _tmp11_ = NULL;
 	GtkDrawingArea* _tmp12_ = NULL;
 	GtkDrawingArea* _tmp13_ = NULL;
-#line 1980 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (page_name != NULL, NULL);
-#line 1981 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_name;
-#line 1981 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (SinglePhotoPage*) page_construct (object_type, _tmp0_);
-#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = scale_up_to_viewport;
-#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scale_up_to_viewport = _tmp1_;
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = transition_effects_manager_get_instance ();
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = transition_effects_manager_create_null_transition_clock (_tmp3_);
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp4_;
-#line 1985 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1991 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp3_);
-#line 1989 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1995 "/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 1991 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1997 "/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 1992 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1998 "/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 1994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 1994 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_viewport_set_shadow_type (_tmp5_, GTK_SHADOW_NONE);
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2001 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->viewport;
-#line 1995 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2001 "/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 1996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->viewport;
-#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->canvas;
-#line 1996 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2002 "/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 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->viewport;
-#line 1998 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2004 "/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 2000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->canvas;
-#line 2000 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2006 "/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 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->viewport;
-#line 2003 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2009 "/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 2004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->canvas;
-#line 2004 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2010 "/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 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2012 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->canvas;
-#line 2006 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2012 "/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 1980 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 12842 "Page.c"
+#line 12867 "Page.c"
 }
 
 
@@ -12846,38 +12871,38 @@ gboolean single_photo_page_is_transition_in_progress (SinglePhotoPage* self) {
 	gboolean result = FALSE;
 	TransitionClock* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 2009 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2010 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 12860 "Page.c"
+#line 12885 "Page.c"
 }
 
 
 void single_photo_page_cancel_transition (SinglePhotoPage* self) {
 	TransitionClock* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 2013 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2019 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->transition_clock;
-#line 2014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = transition_clock_is_in_progress (_tmp0_);
-#line 2014 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2020 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 12875 "Page.c"
+#line 12900 "Page.c"
 		TransitionClock* _tmp2_ = NULL;
-#line 2015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->transition_clock;
-#line 2015 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
 		transition_clock_cancel (_tmp2_);
-#line 12881 "Page.c"
+#line 12906 "Page.c"
 	}
 }
 
@@ -12889,53 +12914,53 @@ void single_photo_page_set_transition (SinglePhotoPage* self, const gchar* effec
 	TransitionClock* _tmp3_ = NULL;
 	TransitionClock* _tmp4_ = NULL;
 	gint _tmp8_ = 0;
-#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2018 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (effect_id != NULL);
-#line 2019 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = transition_effects_manager_get_instance ();
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = effect_id;
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = transition_effects_manager_create_transition_clock (_tmp1_, _tmp2_);
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_clock = _tmp3_;
-#line 2021 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2027 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_effects_manager_unref0 (_tmp1_);
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->transition_clock;
-#line 2022 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 12917 "Page.c"
+#line 12942 "Page.c"
 		TransitionEffectsManager* _tmp5_ = NULL;
 		TransitionEffectsManager* _tmp6_ = NULL;
 		TransitionClock* _tmp7_ = NULL;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = transition_effects_manager_get_instance ();
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = transition_effects_manager_create_null_transition_clock (_tmp6_);
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_clock_unref0 (self->priv->transition_clock);
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->transition_clock = _tmp7_;
-#line 2023 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
 		_transition_effects_manager_unref0 (_tmp6_);
-#line 12933 "Page.c"
+#line 12958 "Page.c"
 	}
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = duration_msec;
-#line 2025 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = _tmp8_;
-#line 12939 "Page.c"
+#line 12964 "Page.c"
 }
 
 
@@ -12967,86 +12992,86 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 	gint _tmp49_ = 0;
 	gint _tmp50_ = 0;
 	cairo_t* _tmp51_ = NULL;
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2030 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp1_);
-#line 2032 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Page.vala"
 	view_rect = _tmp1_;
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = single_photo_page_get_zoom_buffer (self);
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_ != NULL;
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 12993 "Page.c"
+#line 13018 "Page.c"
 		GdkPixbuf* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 		GdkPixbuf* _tmp15_ = NULL;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->zoom_high_quality;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp6_) {
-#line 13001 "Page.c"
+#line 13026 "Page.c"
 			ZoomBuffer* _tmp7_ = NULL;
 			ZoomBuffer* _tmp8_ = NULL;
 			ZoomState _tmp9_ = {0};
 			GdkPixbuf* _tmp10_ = NULL;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp7_ = single_photo_page_get_zoom_buffer (self);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp8_ = _tmp7_;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp9_ = *zoom_state;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = zoom_buffer_get_zoomed_image (_tmp8_, &_tmp9_);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp10_;
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp8_);
-#line 13020 "Page.c"
+#line 13045 "Page.c"
 		} else {
 			ZoomBuffer* _tmp11_ = NULL;
 			ZoomBuffer* _tmp12_ = NULL;
 			ZoomState _tmp13_ = {0};
 			GdkPixbuf* _tmp14_ = NULL;
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = single_photo_page_get_zoom_buffer (self);
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = _tmp11_;
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = *zoom_state;
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = zoom_buffer_get_zoom_preview_image (_tmp12_, &_tmp13_);
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp5_);
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp5_ = _tmp14_;
-#line 2037 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2043 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (_tmp12_);
-#line 13040 "Page.c"
+#line 13065 "Page.c"
 		}
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = _g_object_ref0 (_tmp5_);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2036 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2042 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp15_;
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13050 "Page.c"
+#line 13075 "Page.c"
 	} else {
 		GdkRectangle view_rect_proj = {0};
 		GdkPixbuf* _tmp16_ = NULL;
@@ -13068,113 +13093,113 @@ static void single_photo_page_render_zoomed_to_pixmap (SinglePhotoPage* self, Zo
 		GdkRectangle _tmp31_ = {0};
 		gint _tmp32_ = 0;
 		GdkPixbuf* _tmp33_ = NULL;
-#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = self->priv->unscaled;
-#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewing_rectangle_projection (zoom_state, _tmp16_, &_tmp17_);
-#line 2039 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Page.vala"
 		view_rect_proj = _tmp17_;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = self->priv->unscaled;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = view_rect_proj;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = _tmp19_.x;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = view_rect_proj;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_.y;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_rect_proj;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_.width;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = view_rect_proj;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_.height;
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = gdk_pixbuf_new_subpixbuf (_tmp18_, _tmp20_, _tmp22_, _tmp24_, _tmp26_);
-#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Page.vala"
 		proj_subpixbuf = _tmp27_;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = proj_subpixbuf;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = view_rect;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = _tmp29_.width;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = view_rect;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _tmp31_.height;
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp33_ = gdk_pixbuf_scale_simple (_tmp28_, _tmp30_, _tmp32_, GDK_INTERP_BILINEAR);
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2044 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Page.vala"
 		zoomed = _tmp33_;
-#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (proj_subpixbuf);
-#line 13118 "Page.c"
+#line 13143 "Page.c"
 	}
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp34_ = zoomed;
-#line 2048 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2054 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp34_ == NULL) {
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (zoomed);
-#line 2049 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13128 "Page.c"
+#line 13153 "Page.c"
 	}
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp35_ = self->priv->pixmap_dim;
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp36_ = _tmp35_.width;
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp37_ = view_rect;
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp38_ = _tmp37_.width;
-#line 2052 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = (_tmp36_ - _tmp38_) / 2;
-#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp39_ = draw_x;
-#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp40_ = CLAMP (_tmp39_, 0, G_MAXINT);
-#line 2053 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_x = _tmp40_;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp41_ = self->priv->pixmap_dim;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp42_ = _tmp41_.height;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp43_ = view_rect;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp44_ = _tmp43_.height;
-#line 2055 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = (_tmp42_ - _tmp44_) / 2;
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp45_ = draw_y;
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp46_ = CLAMP (_tmp45_, 0, G_MAXINT);
-#line 2056 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
 	draw_y = _tmp46_;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp47_ = self->priv->pixmap_ctx;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp48_ = zoomed;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp49_ = draw_x;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp50_ = draw_y;
-#line 2058 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_cairo_set_source_pixbuf (_tmp47_, _tmp48_, (gdouble) _tmp49_, (gdouble) _tmp50_);
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp51_ = self->priv->pixmap_ctx;
-#line 2059 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp51_);
-#line 2029 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2035 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (zoomed);
-#line 13178 "Page.c"
+#line 13203 "Page.c"
 }
 
 
@@ -13186,39 +13211,39 @@ void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* in
 	gboolean _tmp3_ = FALSE;
 	ZoomState _tmp4_ = {0};
 	GtkDrawingArea* _tmp5_ = NULL;
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2062 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2063 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2065 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2066 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2068 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2074 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2069 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2075 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = FALSE;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2070 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2071 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2073 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13222 "Page.c"
+#line 13247 "Page.c"
 }
 
 
@@ -13230,230 +13255,230 @@ void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* int
 	gboolean _tmp3_ = FALSE;
 	ZoomState _tmp4_ = {0};
 	GtkDrawingArea* _tmp5_ = NULL;
-#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2076 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (interactive_zoom_state != NULL);
-#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2077 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2079 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp1_, "#000");
-#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_ctx;
-#line 2080 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2086 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp2_);
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->zoom_high_quality;
-#line 2082 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Page.vala"
 	old_quality_setting = _tmp3_;
-#line 2083 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = *interactive_zoom_state;
-#line 2084 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_render_zoomed_to_pixmap (self, &_tmp4_);
-#line 2085 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = old_quality_setting;
-#line 2087 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2093 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->canvas;
-#line 2087 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2093 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 13266 "Page.c"
+#line 13291 "Page.c"
 }
 
 
 static gboolean single_photo_page_real_is_zoom_supported (SinglePhotoPage* self) {
 	gboolean result = FALSE;
-#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2091 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13276 "Page.c"
+#line 13301 "Page.c"
 }
 
 
 gboolean single_photo_page_is_zoom_supported (SinglePhotoPage* self) {
-#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2090 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->is_zoom_supported (self);
-#line 13285 "Page.c"
+#line 13310 "Page.c"
 }
 
 
 static void single_photo_page_real_cancel_zoom (SinglePhotoPage* self) {
 	cairo_surface_t* _tmp0_ = NULL;
-#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2095 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13295 "Page.c"
+#line 13320 "Page.c"
 		cairo_t* _tmp1_ = NULL;
 		cairo_t* _tmp2_ = NULL;
-#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->pixmap_ctx;
-#line 2096 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp1_, "#000");
-#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap_ctx;
-#line 2097 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_paint (_tmp2_);
-#line 13306 "Page.c"
+#line 13331 "Page.c"
 	}
 }
 
 
 void single_photo_page_cancel_zoom (SinglePhotoPage* self) {
-#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2094 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->cancel_zoom (self);
-#line 13316 "Page.c"
+#line 13341 "Page.c"
 }
 
 
 static void single_photo_page_real_save_zoom_state (SinglePhotoPage* self) {
 	ZoomState _tmp0_ = {0};
-#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->static_zoom_state;
-#line 2102 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->saved_zoom_state = _tmp0_;
-#line 2103 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2109 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = TRUE;
-#line 13328 "Page.c"
+#line 13353 "Page.c"
 }
 
 
 void single_photo_page_save_zoom_state (SinglePhotoPage* self) {
-#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2101 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->save_zoom_state (self);
-#line 13337 "Page.c"
+#line 13362 "Page.c"
 }
 
 
 static void single_photo_page_real_restore_zoom_state (SinglePhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->has_saved_zoom_state;
-#line 2107 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2108 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2114 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 13350 "Page.c"
+#line 13375 "Page.c"
 	}
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->saved_zoom_state;
-#line 2110 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 2111 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2117 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 13360 "Page.c"
+#line 13385 "Page.c"
 }
 
 
 void single_photo_page_restore_zoom_state (SinglePhotoPage* self) {
-#line 2106 "/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 2106 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2112 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->restore_zoom_state (self);
-#line 13369 "Page.c"
+#line 13394 "Page.c"
 }
 
 
 static ZoomBuffer* single_photo_page_real_get_zoom_buffer (SinglePhotoPage* self) {
 	ZoomBuffer* result = NULL;
-#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
 	result = NULL;
-#line 2116 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2122 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13379 "Page.c"
+#line 13404 "Page.c"
 }
 
 
 ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self) {
-#line 2115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2115 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2121 "/home/jens/Source/shotwell/src/Page.vala"
 	return SINGLE_PHOTO_PAGE_GET_CLASS (self)->get_zoom_buffer (self);
-#line 13388 "Page.c"
+#line 13413 "Page.c"
 }
 
 
 void single_photo_page_get_saved_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	ZoomState _tmp0_ = {0};
-#line 2119 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->saved_zoom_state;
-#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2120 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13402 "Page.c"
+#line 13427 "Page.c"
 }
 
 
 void single_photo_page_set_zoom_state (SinglePhotoPage* self, ZoomState* zoom_state) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2123 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (zoom_state != NULL);
-#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2124 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = *zoom_state;
-#line 2126 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->static_zoom_state = _tmp1_;
-#line 13421 "Page.c"
+#line 13446 "Page.c"
 }
 
 
 void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result) {
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-#line 2129 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = single_photo_page_is_zoom_supported (self);
-#line 2130 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_, "is_zoom_supported()");
-#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->static_zoom_state;
-#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp1_;
-#line 2132 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13440 "Page.c"
+#line 13465 "Page.c"
 }
 
 
 static void single_photo_page_real_switched_to (Page* base) {
 	SinglePhotoPage * self;
 	GdkPixbuf* _tmp0_ = NULL;
-#line 2135 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2141 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2136 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2142 "/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 2138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2138 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 2139 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2145 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint (self, NULL);
-#line 13457 "Page.c"
+#line 13482 "Page.c"
 	}
 }
 
@@ -13462,21 +13487,21 @@ static void single_photo_page_real_set_container (Page* base, GtkWindow* contain
 	SinglePhotoPage * self;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2142 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2148 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2149 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = container;
-#line 2143 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2149 "/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 2147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = container;
-#line 2147 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2153 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 2148 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2154 "/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 13480 "Page.c"
+#line 13505 "Page.c"
 	}
 }
 
@@ -13493,92 +13518,92 @@ void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, D
 	GdkPixbuf* _tmp8_ = NULL;
 	GtkDrawingArea* _tmp9_ = NULL;
 	Direction* _tmp10_ = NULL;
-#line 2155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (unscaled));
-#line 2155 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (max_dim != NULL);
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *max_dim;
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_dim;
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp3_);
-#line 2156 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
 	zoom_state_init (&self->priv->static_zoom_state, &_tmp0_, &_tmp1_, _tmp2_, &_tmp3_);
-#line 2160 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_cancel_transition (self);
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = unscaled;
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2162 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = _tmp5_;
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = *max_dim;
-#line 2163 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2169 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->max_dim = _tmp6_;
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = self->priv->scaled;
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 2164 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = _tmp8_;
-#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2165 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = self->canvas;
-#line 2168 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
-#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = direction;
-#line 2170 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, _tmp10_);
-#line 13547 "Page.c"
+#line 13572 "Page.c"
 }
 
 
 void single_photo_page_blank_display (SinglePhotoPage* self) {
 	GtkDrawingArea* _tmp0_ = NULL;
-#line 2173 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 2174 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 2175 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2176 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2177 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2180 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_realize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2183 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2189 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 13575 "Page.c"
+#line 13600 "Page.c"
 }
 
 
 static gpointer _cairo_surface_reference0 (gpointer self) {
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 13582 "Page.c"
+#line 13607 "Page.c"
 }
 
 
@@ -13586,38 +13611,38 @@ cairo_surface_t* single_photo_page_get_surface (SinglePhotoPage* self) {
 	cairo_surface_t* result = NULL;
 	cairo_surface_t* _tmp0_ = NULL;
 	cairo_surface_t* _tmp1_ = NULL;
-#line 2186 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_surface_reference0 (_tmp0_);
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2187 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13600 "Page.c"
+#line 13625 "Page.c"
 }
 
 
 void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* result) {
 	Dimensions _tmp0_ = {0};
-#line 2190 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2196 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_dim;
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2191 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13614 "Page.c"
+#line 13639 "Page.c"
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 13621 "Page.c"
+#line 13646 "Page.c"
 }
 
 
@@ -13625,17 +13650,17 @@ cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self) {
 	cairo_t* result = NULL;
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
-#line 2194 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _cairo_reference0 (_tmp0_);
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2195 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2201 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13639 "Page.c"
+#line 13664 "Page.c"
 }
 
 
@@ -13645,25 +13670,25 @@ void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_lay
 	gint _tmp2_ = 0;
 	cairo_t* _tmp3_ = NULL;
 	PangoLayout* _tmp4_ = NULL;
-#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2198 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (PANGO_IS_LAYOUT (pango_layout));
-#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->text_ctx;
-#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = x;
-#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = y;
-#line 2199 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_move_to (_tmp0_, (gdouble) _tmp1_, (gdouble) _tmp2_);
-#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->text_ctx;
-#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = pango_layout;
-#line 2200 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2206 "/home/jens/Source/shotwell/src/Page.vala"
 	pango_cairo_show_layout (_tmp3_, _tmp4_);
-#line 13667 "Page.c"
+#line 13692 "Page.c"
 }
 
 
@@ -13672,55 +13697,55 @@ void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* resul
 	GtkWindow* _tmp1_ = NULL;
 	GtkWindow* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 2203 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, TYPE_FULLSCREEN_WINDOW);
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 13688 "Page.c"
+#line 13713 "Page.c"
 		GtkWindow* _tmp4_ = NULL;
 		GtkWindow* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
 		Scaling _tmp7_ = {0};
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp4_;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->scale_up_to_viewport;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_screen (_tmp5_, _tmp6_, &_tmp7_);
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp7_;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp5_);
-#line 13705 "Page.c"
+#line 13730 "Page.c"
 	} else {
 		GtkViewport* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		Scaling _tmp10_ = {0};
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = self->viewport;
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = self->priv->scale_up_to_viewport;
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_widget (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), _tmp9_, &_tmp10_);
-#line 2205 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2211 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = _tmp10_;
-#line 13718 "Page.c"
+#line 13743 "Page.c"
 	}
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2204 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13724 "Page.c"
+#line 13749 "Page.c"
 }
 
 
@@ -13728,17 +13753,17 @@ GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 2208 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2214 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2209 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2215 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13742 "Page.c"
+#line 13767 "Page.c"
 }
 
 
@@ -13746,31 +13771,31 @@ GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 2212 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), NULL);
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled;
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp1_;
-#line 2213 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2219 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13760 "Page.c"
+#line 13785 "Page.c"
 }
 
 
 void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRectangle* result) {
 	GdkRectangle _tmp0_ = {0};
-#line 2217 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2223 "/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 2224 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->scaled_pos;
-#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
 	*result = _tmp0_;
-#line 2218 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2224 "/home/jens/Source/shotwell/src/Page.vala"
 	return;
-#line 13774 "Page.c"
+#line 13799 "Page.c"
 }
 
 
@@ -13780,50 +13805,50 @@ gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, gint x, gint
 	gint _tmp1_ = 0;
 	GdkRectangle _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 2221 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = x;
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = y;
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->scaled_pos;
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = coord_in_rectangle (_tmp0_, _tmp1_, &_tmp2_);
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2222 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13798 "Page.c"
+#line 13823 "Page.c"
 }
 
 
 void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
-#line 2225 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2231 "/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 2231 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2226 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13815 "Page.c"
+#line 13840 "Page.c"
 		GtkDrawingArea* _tmp2_ = NULL;
 		GdkWindow* _tmp3_ = NULL;
 		GdkRectangle _tmp4_ = {0};
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = *rect;
-#line 2227 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, &_tmp4_, FALSE);
-#line 13827 "Page.c"
+#line 13852 "Page.c"
 	}
 }
 
@@ -13831,51 +13856,51 @@ void single_photo_page_invalidate (SinglePhotoPage* self, GdkRectangle* rect) {
 void single_photo_page_invalidate_all (SinglePhotoPage* self) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GdkWindow* _tmp1_ = NULL;
-#line 2230 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2236 "/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 2237 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->canvas;
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 2231 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_ != NULL) {
-#line 13843 "Page.c"
+#line 13868 "Page.c"
 		GtkDrawingArea* _tmp2_ = NULL;
 		GdkWindow* _tmp3_ = NULL;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->canvas;
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
-#line 2232 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2238 "/home/jens/Source/shotwell/src/Page.vala"
 		gdk_window_invalidate_rect (_tmp3_, NULL, FALSE);
-#line 13852 "Page.c"
+#line 13877 "Page.c"
 	}
 }
 
 
 static void single_photo_page_on_viewport_resize (SinglePhotoPage* self) {
-#line 2235 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2237 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2243 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, TRUE, NULL);
-#line 13862 "Page.c"
+#line 13887 "Page.c"
 }
 
 
 static void single_photo_page_real_on_resize_finished (Page* base, GdkRectangle* rect) {
 	SinglePhotoPage * self;
 	GdkRectangle _tmp0_ = {0};
-#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2246 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2240 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2246 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (rect != NULL);
-#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2247 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = *rect;
-#line 2241 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2247 "/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 2244 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2250 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint (self, NULL);
-#line 13879 "Page.c"
+#line 13904 "Page.c"
 }
 
 
@@ -13886,114 +13911,114 @@ static gboolean single_photo_page_on_canvas_exposed (SinglePhotoPage* self, cair
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	cairo_t* _tmp7_ = NULL;
-#line 2247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (self), FALSE);
-#line 2247 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (exposed_ctx != NULL, FALSE);
-#line 2250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap;
-#line 2250 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 13898 "Page.c"
+#line 13923 "Page.c"
 		cairo_t* _tmp1_ = NULL;
 		cairo_surface_t* _tmp2_ = NULL;
-#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = exposed_ctx;
-#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = self->priv->pixmap;
-#line 2251 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_set_source_surface (_tmp1_, _tmp2_, (gdouble) 0, (gdouble) 0);
-#line 13907 "Page.c"
+#line 13932 "Page.c"
 	} else {
 		cairo_t* _tmp3_ = NULL;
-#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = exposed_ctx;
-#line 2253 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2259 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 13914 "Page.c"
+#line 13939 "Page.c"
 	}
-#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = exposed_ctx;
-#line 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/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 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/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 2255 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_);
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = exposed_ctx;
-#line 2256 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2262 "/home/jens/Source/shotwell/src/Page.vala"
 	cairo_paint (_tmp7_);
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
 	result = TRUE;
-#line 2258 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 13932 "Page.c"
+#line 13957 "Page.c"
 }
 
 
 static void single_photo_page_real_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 13941 "Page.c"
+#line 13966 "Page.c"
 }
 
 
 void single_photo_page_new_surface (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2261 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->new_surface (self, ctx, ctx_dim);
-#line 13950 "Page.c"
+#line 13975 "Page.c"
 }
 
 
 static void single_photo_page_real_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 13959 "Page.c"
+#line 13984 "Page.c"
 }
 
 
 void single_photo_page_updated_pixbuf (SinglePhotoPage* self, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
-#line 2264 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2270 "/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 2270 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->updated_pixbuf (self, pixbuf, reason, old_dim);
-#line 13968 "Page.c"
+#line 13993 "Page.c"
 }
 
 
 static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx != NULL);
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = single_photo_page_is_zoom_supported (self);
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 13983 "Page.c"
+#line 14008 "Page.c"
 		gboolean _tmp2_ = FALSE;
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp2_ = zoom_state_is_default (&self->priv->static_zoom_state);
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = !_tmp2_;
-#line 13989 "Page.c"
+#line 14014 "Page.c"
 	} else {
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp0_ = FALSE;
-#line 13993 "Page.c"
+#line 14018 "Page.c"
 	}
-#line 2268 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_) {
-#line 13997 "Page.c"
+#line 14022 "Page.c"
 		cairo_t* _tmp3_ = NULL;
 		cairo_t* _tmp4_ = NULL;
 		Dimensions _tmp5_ = {0};
@@ -14002,31 +14027,31 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 		gint _tmp8_ = 0;
 		cairo_t* _tmp9_ = NULL;
 		ZoomState _tmp10_ = {0};
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = ctx;
-#line 2269 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Page.vala"
 		set_source_color_from_string (_tmp3_, "#000");
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = ctx;
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->pixmap_dim;
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = _tmp5_.width;
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->pixmap_dim;
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_.height;
-#line 2270 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp6_, (gdouble) _tmp8_);
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = ctx;
-#line 2271 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2277 "/home/jens/Source/shotwell/src/Page.vala"
 		cairo_fill (_tmp9_);
-#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->static_zoom_state;
-#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_render_zoomed_to_pixmap (self, &_tmp10_);
-#line 14030 "Page.c"
+#line 14055 "Page.c"
 	} else {
 		TransitionClock* _tmp11_ = NULL;
 		cairo_t* _tmp12_ = NULL;
@@ -14035,23 +14060,23 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 		Dimensions _tmp15_ = {0};
 		gint _tmp16_ = 0;
 		gboolean _tmp17_ = FALSE;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->transition_clock;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = ctx;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = *ctx_dim;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp15_ = *ctx_dim;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp15_.height;
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = transition_clock_paint (_tmp11_, _tmp12_, _tmp14_, _tmp16_);
-#line 2274 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2280 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp17_) {
-#line 14055 "Page.c"
+#line 14080 "Page.c"
 			cairo_t* _tmp18_ = NULL;
 			cairo_t* _tmp19_ = NULL;
 			Dimensions _tmp20_ = {0};
@@ -14066,56 +14091,56 @@ static void single_photo_page_real_paint (SinglePhotoPage* self, cairo_t* ctx, D
 			GdkRectangle _tmp29_ = {0};
 			gint _tmp30_ = 0;
 			cairo_t* _tmp31_ = NULL;
-#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp18_ = ctx;
-#line 2276 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
 			set_source_color_from_string (_tmp18_, "#000");
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp19_ = ctx;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp20_ = self->priv->pixmap_dim;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp21_ = _tmp20_.width;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp22_ = self->priv->pixmap_dim;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = _tmp22_.height;
-#line 2278 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2284 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_rectangle (_tmp19_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp21_, (gdouble) _tmp23_);
-#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp24_ = ctx;
-#line 2279 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2285 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_fill (_tmp24_);
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp25_ = ctx;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp26_ = self->priv->scaled;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp27_ = self->priv->scaled_pos;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp28_ = _tmp27_.x;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp29_ = self->priv->scaled_pos;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp30_ = _tmp29_.y;
-#line 2281 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
 			gdk_cairo_set_source_pixbuf (_tmp25_, _tmp26_, (gdouble) _tmp28_, (gdouble) _tmp30_);
-#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp31_ = ctx;
-#line 2282 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
 			cairo_paint (_tmp31_);
-#line 14108 "Page.c"
+#line 14133 "Page.c"
 		}
 	}
 }
 
 
 void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim) {
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2267 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2273 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->paint (self, ctx, ctx_dim);
-#line 14119 "Page.c"
+#line 14144 "Page.c"
 }
 
 
@@ -14123,44 +14148,44 @@ static void single_photo_page_repaint_pixmap (SinglePhotoPage* self) {
 	cairo_t* _tmp0_ = NULL;
 	cairo_t* _tmp1_ = NULL;
 	Dimensions _tmp2_ = {0};
-#line 2286 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2292 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->pixmap_ctx;
-#line 2287 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ == NULL) {
-#line 2288 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14135 "Page.c"
+#line 14160 "Page.c"
 	}
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->priv->pixmap_ctx;
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->pixmap_dim;
-#line 2290 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2296 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_paint (self, _tmp1_, &_tmp2_);
-#line 2291 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2297 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_invalidate_all (self);
-#line 14145 "Page.c"
+#line 14170 "Page.c"
 }
 
 
 void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction) {
 	Direction* _tmp0_ = NULL;
-#line 2294 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = direction;
-#line 2295 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_internal_repaint (self, FALSE, _tmp0_);
-#line 14157 "Page.c"
+#line 14182 "Page.c"
 }
 
 
 static void _single_photo_page_repaint_pixmap_transition_clock_repaint_callback (gpointer self) {
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_repaint_pixmap ((SinglePhotoPage*) self);
-#line 14164 "Page.c"
+#line 14189 "Page.c"
 }
 
 
@@ -14203,171 +14228,171 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 	Direction* _tmp84_ = NULL;
 	TransitionClock* _tmp98_ = NULL;
 	gboolean _tmp99_ = FALSE;
-#line 2298 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_is_in_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2300 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp0_) {
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2301 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2302 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = NULL;
-#line 2304 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2310 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14223 "Page.c"
+#line 14248 "Page.c"
 	}
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->unscaled;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp2_ == NULL) {
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = TRUE;
-#line 14231 "Page.c"
+#line 14256 "Page.c"
 	} else {
 		GtkDrawingArea* _tmp3_ = NULL;
 		GdkWindow* _tmp4_ = NULL;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->canvas;
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = _tmp4_ == NULL;
-#line 14241 "Page.c"
+#line 14266 "Page.c"
 	}
-#line 2308 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp1_) {
-#line 2309 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14247 "Page.c"
+#line 14272 "Page.c"
 	}
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->viewport;
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), &_tmp6_);
-#line 2312 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
 	allocation = _tmp6_;
-#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = allocation;
-#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = _tmp7_.width;
-#line 2314 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
 	width = _tmp8_;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = allocation;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = _tmp9_.height;
-#line 2315 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Page.vala"
 	height = _tmp10_;
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = width;
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ <= 0) {
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = TRUE;
-#line 14273 "Page.c"
+#line 14298 "Page.c"
 	} else {
 		gint _tmp13_ = 0;
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp13_ = height;
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = _tmp13_ <= 0;
-#line 14280 "Page.c"
+#line 14305 "Page.c"
 	}
-#line 2317 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp11_) {
-#line 2318 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 14286 "Page.c"
+#line 14311 "Page.c"
 	}
-#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->scaled;
-#line 2320 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2326 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixbuf = _tmp14_ == NULL;
-#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->scaled_pos;
-#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_for_rectangle (&_tmp15_, &_tmp16_);
-#line 2323 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_dim = _tmp16_;
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->scaled_pos;
-#line 2324 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2330 "/home/jens/Source/shotwell/src/Page.vala"
 	old_scaled_pos = _tmp17_;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->pixmap_dim;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp20_ = _tmp19_.width;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp21_ = width;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp20_ != _tmp21_) {
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = TRUE;
-#line 14312 "Page.c"
+#line 14337 "Page.c"
 	} else {
 		Dimensions _tmp22_ = {0};
 		gint _tmp23_ = 0;
 		gint _tmp24_ = 0;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = self->priv->pixmap_dim;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = _tmp22_.height;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = height;
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = _tmp23_ != _tmp24_;
-#line 14325 "Page.c"
+#line 14350 "Page.c"
 	}
-#line 2327 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp18_) {
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2328 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->pixmap = NULL;
-#line 14333 "Page.c"
+#line 14358 "Page.c"
 	}
-#line 2331 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
 	new_pixmap = FALSE;
-#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp25_ = self->priv->pixmap;
-#line 2332 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp25_ == NULL) {
-#line 14341 "Page.c"
+#line 14366 "Page.c"
 		gint _tmp26_ = 0;
 		gint _tmp27_ = 0;
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = width;
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp27_ = height;
-#line 2333 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_init_pixmap (self, _tmp26_, _tmp27_);
-#line 2334 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2340 "/home/jens/Source/shotwell/src/Page.vala"
 		new_pixmap = TRUE;
-#line 14352 "Page.c"
+#line 14377 "Page.c"
 	}
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = new_pixbuf;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp29_) {
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = TRUE;
-#line 14360 "Page.c"
+#line 14385 "Page.c"
 	} else {
 		gboolean _tmp30_ = FALSE;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = new_pixmap;
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = _tmp30_;
-#line 14367 "Page.c"
+#line 14392 "Page.c"
 	}
-#line 2337 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp28_) {
-#line 14371 "Page.c"
+#line 14396 "Page.c"
 		Dimensions unscaled_dim = {0};
 		GdkPixbuf* _tmp31_ = NULL;
 		Dimensions _tmp32_ = {0};
@@ -14392,155 +14417,155 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		gint _tmp60_ = 0;
 		Dimensions _tmp61_ = {0};
 		gint _tmp62_ = 0;
-#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->unscaled;
-#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_pixbuf (_tmp31_, &_tmp32_);
-#line 2338 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
 		unscaled_dim = _tmp32_;
-#line 2342 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_init (&scaled_dim, 0, 0);
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp36_ = self->priv->scale_up_to_viewport;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		if (!_tmp36_) {
-#line 14408 "Page.c"
+#line 14433 "Page.c"
 			gboolean _tmp37_ = FALSE;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = dimensions_has_area (&self->priv->max_dim);
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = _tmp37_;
-#line 14414 "Page.c"
+#line 14439 "Page.c"
 		} else {
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp35_ = FALSE;
-#line 14418 "Page.c"
+#line 14443 "Page.c"
 		}
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp35_) {
-#line 14422 "Page.c"
+#line 14447 "Page.c"
 			Dimensions _tmp38_ = {0};
 			gint _tmp39_ = 0;
 			gint _tmp40_ = 0;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = self->priv->max_dim;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_.width;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp40_ = width;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = _tmp39_ < _tmp40_;
-#line 14434 "Page.c"
+#line 14459 "Page.c"
 		} else {
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp34_ = FALSE;
-#line 14438 "Page.c"
+#line 14463 "Page.c"
 		}
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp34_) {
-#line 14442 "Page.c"
+#line 14467 "Page.c"
 			Dimensions _tmp41_ = {0};
 			gint _tmp42_ = 0;
 			gint _tmp43_ = 0;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->max_dim;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = _tmp41_.height;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = height;
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = _tmp42_ < _tmp43_;
-#line 14454 "Page.c"
+#line 14479 "Page.c"
 		} else {
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = FALSE;
-#line 14458 "Page.c"
+#line 14483 "Page.c"
 		}
-#line 2343 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp33_) {
-#line 14462 "Page.c"
+#line 14487 "Page.c"
 			Dimensions _tmp44_ = {0};
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp44_ = self->priv->max_dim;
-#line 2344 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp44_;
-#line 14468 "Page.c"
+#line 14493 "Page.c"
 		} else {
 			Dimensions _tmp45_ = {0};
 			Dimensions _tmp46_ = {0};
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = self->priv->pixmap_dim;
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
 			dimensions_get_scaled_proportional (&unscaled_dim, &_tmp45_, &_tmp46_);
-#line 2346 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
 			scaled_dim = _tmp46_;
-#line 14478 "Page.c"
+#line 14503 "Page.c"
 		}
-#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp47_ = width;
-#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp48_ = scaled_dim;
-#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp49_ = _tmp48_.width;
-#line 2348 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp47_ >= _tmp49_, "width >= scaled_dim.width");
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp50_ = height;
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp51_ = scaled_dim;
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp52_ = _tmp51_.height;
-#line 2349 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
 		_vala_assert (_tmp50_ >= _tmp52_, "height >= scaled_dim.height");
-#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp53_ = width;
-#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp54_ = scaled_dim;
-#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp55_ = _tmp54_.width;
-#line 2352 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.x = (_tmp53_ - _tmp55_) / 2;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp56_ = height;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp57_ = scaled_dim;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp58_ = _tmp57_.height;
-#line 2353 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.y = (_tmp56_ - _tmp58_) / 2;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp59_ = scaled_dim;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp60_ = _tmp59_.width;
-#line 2354 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.width = _tmp60_;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp61_ = scaled_dim;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp62_ = _tmp61_.height;
-#line 2355 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled_pos.height = _tmp62_;
-#line 14524 "Page.c"
+#line 14549 "Page.c"
 	}
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp64_ = fast;
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp64_) {
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_FAST_INTERP;
-#line 14532 "Page.c"
+#line 14557 "Page.c"
 	} else {
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp63_ = SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14536 "Page.c"
+#line 14561 "Page.c"
 	}
-#line 2358 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
 	interp = _tmp63_;
-#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp65_ = self->priv->scaled;
-#line 2361 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp65_ == NULL) {
-#line 14544 "Page.c"
+#line 14569 "Page.c"
 		GdkPixbuf* _tmp66_ = NULL;
 		GdkRectangle _tmp67_ = {0};
 		Dimensions _tmp68_ = {0};
@@ -14555,101 +14580,101 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		GdkPixbuf* _tmp79_ = NULL;
 		SinglePhotoPageUpdateReason _tmp80_ = 0;
 		Dimensions _tmp81_ = {0};
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp66_ = self->priv->unscaled;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp67_ = self->priv->scaled_pos;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		dimensions_for_rectangle (&_tmp67_, &_tmp68_);
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp69_ = interp;
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp70_ = resize_pixbuf (_tmp66_, &_tmp68_, _tmp69_);
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (self->priv->scaled);
-#line 2362 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->scaled = _tmp70_;
-#line 2364 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
 		reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_RESIZED_CANVAS;
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp71_ = new_pixbuf;
-#line 2365 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Page.vala"
 		if (_tmp71_) {
-#line 2366 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Page.vala"
 			reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_NEW_PIXBUF;
-#line 14581 "Page.c"
+#line 14606 "Page.c"
 		} else {
 			gboolean _tmp72_ = FALSE;
 			gboolean _tmp73_ = FALSE;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp73_ = new_pixmap;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 			if (!_tmp73_) {
-#line 14589 "Page.c"
+#line 14614 "Page.c"
 				GdkInterpType _tmp74_ = 0;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp74_ = interp;
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = _tmp74_ == SINGLE_PHOTO_PAGE_QUALITY_INTERP;
-#line 14595 "Page.c"
+#line 14620 "Page.c"
 			} else {
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp72_ = FALSE;
-#line 14599 "Page.c"
+#line 14624 "Page.c"
 			}
-#line 2367 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp72_) {
-#line 2368 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
 				reason = SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 14605 "Page.c"
+#line 14630 "Page.c"
 			}
 		}
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp75_ = self->priv->max_dim;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp76_ = self->priv->pixmap_dim;
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp77_ = zoom_state_get_interpolation_factor (&self->priv->static_zoom_state);
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_get_viewport_center (&self->priv->static_zoom_state, &_tmp78_);
-#line 2370 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Page.vala"
 		zoom_state_init (&self->priv->static_zoom_state, &_tmp75_, &_tmp76_, _tmp77_, &_tmp78_);
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp79_ = self->priv->scaled;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp80_ = reason;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp81_ = old_scaled_dim;
-#line 2374 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_updated_pixbuf (self, _tmp79_, _tmp80_, &_tmp81_);
-#line 14626 "Page.c"
+#line 14651 "Page.c"
 	}
-#line 2377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp82_ = fast;
-#line 2377 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = !_tmp82_;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp84_ = direction;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp84_ != NULL) {
-#line 14636 "Page.c"
+#line 14661 "Page.c"
 		TransitionClock* _tmp85_ = NULL;
 		gboolean _tmp86_ = FALSE;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp85_ = self->priv->transition_clock;
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp86_ = transition_clock_is_in_progress (_tmp85_);
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = !_tmp86_;
-#line 14645 "Page.c"
+#line 14670 "Page.c"
 	} else {
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp83_ = FALSE;
-#line 14649 "Page.c"
+#line 14674 "Page.c"
 	}
-#line 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp83_) {
-#line 14653 "Page.c"
+#line 14678 "Page.c"
 		SpitTransitionsVisuals* visuals = NULL;
 		GdkPixbuf* _tmp87_ = NULL;
 		GdkRectangle _tmp88_ = {0};
@@ -14662,45 +14687,45 @@ static void single_photo_page_internal_repaint (SinglePhotoPage* self, gboolean
 		Direction* _tmp95_ = NULL;
 		SpitTransitionsDirection _tmp96_ = 0;
 		gint _tmp97_ = 0;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp87_ = self->priv->old_scaled;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp88_ = old_scaled_pos;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp89_ = self->priv->scaled;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp90_ = self->priv->scaled_pos;
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		parse_color ("#000", &_tmp91_);
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp92_ = spit_transitions_visuals_new (_tmp87_, &_tmp88_, _tmp89_, &_tmp90_, &_tmp91_);
-#line 2380 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Page.vala"
 		visuals = _tmp92_;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp93_ = self->priv->transition_clock;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp94_ = visuals;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp95_ = direction;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp96_ = direction_to_transition_direction (*_tmp95_);
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp97_ = self->priv->transition_duration_msec;
-#line 2383 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2389 "/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 2379 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2385 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (visuals);
-#line 14694 "Page.c"
+#line 14719 "Page.c"
 	}
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp98_ = self->priv->transition_clock;
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp99_ = transition_clock_is_in_progress (_tmp98_);
-#line 2387 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!_tmp99_) {
-#line 2388 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2394 "/home/jens/Source/shotwell/src/Page.vala"
 		single_photo_page_repaint_pixmap (self);
-#line 14704 "Page.c"
+#line 14729 "Page.c"
 	}
 }
 
@@ -14721,65 +14746,65 @@ static void single_photo_page_init_pixmap (SinglePhotoPage* self, gint width, gi
 	cairo_t* _tmp12_ = NULL;
 	cairo_t* _tmp13_ = NULL;
 	Dimensions _tmp14_ = {0};
-#line 2391 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->unscaled;
-#line 2392 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp0_ != NULL, "unscaled != null");
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = self->canvas;
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget));
-#line 2393 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp2_ != NULL, "canvas.get_window() != null");
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = width;
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = height;
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp3_, _tmp4_);
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 2396 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = _tmp5_;
-#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = width;
-#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp7_ = height;
-#line 2397 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, _tmp6_, _tmp7_);
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = self->priv->pixmap;
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = cairo_create (_tmp8_);
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 2400 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = _tmp9_;
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 2403 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp10_ = self->priv->pixmap;
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = cairo_create (_tmp10_);
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 2406 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = _tmp11_;
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = self->priv->text_ctx;
-#line 2407 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2413 "/home/jens/Source/shotwell/src/Page.vala"
 	set_source_color_from_string (_tmp12_, "#fff");
-#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->pixmap_ctx;
-#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = self->priv->pixmap_dim;
-#line 2412 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_new_surface (self, _tmp13_, &_tmp14_);
-#line 14783 "Page.c"
+#line 14808 "Page.c"
 }
 
 
@@ -14790,23 +14815,23 @@ static gboolean single_photo_page_real_on_context_keypress (Page* base) {
 	GtkMenu* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 2415 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2421 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page_get_page_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_;
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = _tmp2_;
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp3_;
-#line 2416 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14810 "Page.c"
+#line 14835 "Page.c"
 }
 
 
@@ -14815,11 +14840,11 @@ static void single_photo_page_real_on_previous_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_previous_photo (SinglePhotoPage* self) {
-#line 2419 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2425 "/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 2425 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_previous_photo (self);
-#line 14823 "Page.c"
+#line 14848 "Page.c"
 }
 
 
@@ -14828,11 +14853,11 @@ static void single_photo_page_real_on_next_photo (SinglePhotoPage* self) {
 
 
 void single_photo_page_on_next_photo (SinglePhotoPage* self) {
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2428 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_SINGLE_PHOTO_PAGE (self));
-#line 2422 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2428 "/home/jens/Source/shotwell/src/Page.vala"
 	SINGLE_PHOTO_PAGE_GET_CLASS (self)->on_next_photo (self);
-#line 14836 "Page.c"
+#line 14861 "Page.c"
 }
 
 
@@ -14849,266 +14874,266 @@ static gboolean single_photo_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	GQuark _tmp8_ = 0U;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 14865 "Page.c"
+#line 14890 "Page.c"
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 2425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 2425 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = event;
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = _tmp0_->time;
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = self->priv->last_nav_key;
-#line 2429 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2435 "/home/jens/Source/shotwell/src/Page.vala"
 	nav_ok = (_tmp1_ - _tmp2_) > ((guint32) SINGLE_PHOTO_PAGE_KEY_REPEAT_INTERVAL_MSEC);
-#line 2431 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Page.vala"
 	handled = TRUE;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = event;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = _tmp5_;
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/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 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14896 "Page.c"
+#line 14921 "Page.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
-#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp9_ = nav_ok;
-#line 2436 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp9_) {
-#line 14904 "Page.c"
+#line 14929 "Page.c"
 					GdkEventKey* _tmp10_ = NULL;
 					guint32 _tmp11_ = 0U;
-#line 2437 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2443 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_previous_photo (self);
-#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp10_ = event;
-#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp11_ = _tmp10_->time;
-#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp11_;
-#line 14915 "Page.c"
+#line 14940 "Page.c"
 				}
-#line 2440 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14919 "Page.c"
+#line 14944 "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 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14925 "Page.c"
+#line 14950 "Page.c"
 			default:
 			{
 				gboolean _tmp12_ = FALSE;
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp12_ = nav_ok;
-#line 2445 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2451 "/home/jens/Source/shotwell/src/Page.vala"
 				if (_tmp12_) {
-#line 14933 "Page.c"
+#line 14958 "Page.c"
 					GdkEventKey* _tmp13_ = NULL;
 					guint32 _tmp14_ = 0U;
-#line 2446 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
 					single_photo_page_on_next_photo (self);
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp13_ = event;
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
 					_tmp14_ = _tmp13_->time;
-#line 2447 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
 					self->priv->last_nav_key = _tmp14_;
-#line 14944 "Page.c"
+#line 14969 "Page.c"
 				}
-#line 2449 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2455 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14948 "Page.c"
+#line 14973 "Page.c"
 			}
 		}
 	} else {
-#line 2432 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2438 "/home/jens/Source/shotwell/src/Page.vala"
 		switch (0) {
-#line 14954 "Page.c"
+#line 14979 "Page.c"
 			default:
 			{
-#line 2452 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2458 "/home/jens/Source/shotwell/src/Page.vala"
 				handled = FALSE;
-#line 2453 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
 				break;
-#line 14961 "Page.c"
+#line 14986 "Page.c"
 			}
 		}
 	}
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = handled;
-#line 2456 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2462 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp15_) {
-#line 2457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
 		result = TRUE;
-#line 2457 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2463 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 14973 "Page.c"
+#line 14998 "Page.c"
 	}
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 	if (GTK_WIDGET_CLASS (single_photo_page_parent_class)->key_press_event != NULL) {
-#line 14977 "Page.c"
+#line 15002 "Page.c"
 		GdkEventKey* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp17_ = event;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/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 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = _tmp18_;
-#line 14986 "Page.c"
+#line 15011 "Page.c"
 	} else {
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp16_ = TRUE;
-#line 14990 "Page.c"
+#line 15015 "Page.c"
 	}
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 	result = _tmp16_;
-#line 2459 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2465 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 14996 "Page.c"
+#line 15021 "Page.c"
 }
 
 
 static void single_photo_page_class_init (SinglePhotoPageClass * klass) {
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	single_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (SinglePhotoPagePrivate));
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->is_zoom_supported = single_photo_page_real_is_zoom_supported;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->cancel_zoom = single_photo_page_real_cancel_zoom;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->save_zoom_state = single_photo_page_real_save_zoom_state;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->restore_zoom_state = single_photo_page_real_restore_zoom_state;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->get_zoom_buffer = single_photo_page_real_get_zoom_buffer;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->switched_to = single_photo_page_real_switched_to;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->set_container = single_photo_page_real_set_container;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_resize_finished = single_photo_page_real_on_resize_finished;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->new_surface = single_photo_page_real_new_surface;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->updated_pixbuf = single_photo_page_real_updated_pixbuf;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->paint = single_photo_page_real_paint;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((PageClass *) klass)->on_context_keypress = single_photo_page_real_on_context_keypress;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_previous_photo = single_photo_page_real_on_previous_photo;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((SinglePhotoPageClass *) klass)->on_next_photo = single_photo_page_real_on_next_photo;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	((GtkWidgetClass *) klass)->key_press_event = single_photo_page_real_key_press_event;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (klass)->finalize = single_photo_page_finalize;
-#line 15037 "Page.c"
+#line 15062 "Page.c"
 }
 
 
 static void single_photo_page_instance_init (SinglePhotoPage * self) {
 	GtkDrawingArea* _tmp0_ = NULL;
 	GtkViewport* _tmp1_ = NULL;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = SINGLE_PHOTO_PAGE_GET_PRIVATE (self);
-#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = (GtkDrawingArea*) gtk_drawing_area_new ();
-#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp0_);
-#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	self->canvas = _tmp0_;
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = (GtkViewport*) gtk_viewport_new (NULL, NULL);
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
 	self->viewport = _tmp1_;
-#line 1964 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->transition_duration_msec = 0;
-#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap = NULL;
-#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->pixmap_ctx = NULL;
-#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->text_ctx = NULL;
-#line 1968 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->pixmap_dim, 0, 0);
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->unscaled = NULL;
-#line 1970 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Page.vala"
 	dimensions_init (&self->priv->max_dim, 0, 0);
-#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->scaled = NULL;
-#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1978 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->old_scaled = NULL;
-#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1979 "/home/jens/Source/shotwell/src/Page.vala"
 	memset (&self->priv->scaled_pos, 0, sizeof (GdkRectangle));
-#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->zoom_high_quality = TRUE;
-#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1983 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->has_saved_zoom_state = FALSE;
-#line 1978 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1984 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->last_nav_key = (guint32) 0;
-#line 15084 "Page.c"
+#line 15109 "Page.c"
 }
 
 
 static void single_photo_page_finalize (GObject* obj) {
 	SinglePhotoPage * self;
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage);
-#line 1959 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->canvas);
-#line 1960 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->viewport);
-#line 1963 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
 	_transition_clock_unref0 (self->priv->transition_clock);
-#line 1965 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_surface_destroy0 (self->priv->pixmap);
-#line 1966 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->pixmap_ctx);
-#line 1967 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1973 "/home/jens/Source/shotwell/src/Page.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
-#line 1969 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->unscaled);
-#line 1971 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1977 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->scaled);
-#line 1972 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1978 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->old_scaled);
-#line 1948 "/home/jens/Source/shotwell/src/Page.vala"
+#line 1954 "/home/jens/Source/shotwell/src/Page.vala"
 	G_OBJECT_CLASS (single_photo_page_parent_class)->finalize (obj);
-#line 15112 "Page.c"
+#line 15137 "Page.c"
 }
 
 
@@ -15125,32 +15150,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 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_begin ((DragAndDropHandler*) self, context);
-#line 15131 "Page.c"
+#line 15156 "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 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_data_get ((DragAndDropHandler*) self, context, selection_data, info, time_);
-#line 15138 "Page.c"
+#line 15163 "Page.c"
 }
 
 
 static void _drag_and_drop_handler_on_drag_end_gtk_widget_drag_end (GtkWidget* _sender, GdkDragContext* context, gpointer self) {
-#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_drag_end ((DragAndDropHandler*) self);
-#line 15145 "Page.c"
+#line 15170 "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 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 15154 "Page.c"
+#line 15179 "Page.c"
 }
 
 
@@ -15168,20 +15193,20 @@ static GType drag_and_drop_handler_target_type_get_type (void) {
 
 static GdkAtom* _gdk_atom_dup (GdkAtom* self) {
 	GdkAtom* dup;
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 	dup = g_new0 (GdkAtom, 1);
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 	memcpy (dup, self, sizeof (GdkAtom));
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 	return dup;
-#line 15178 "Page.c"
+#line 15203 "Page.c"
 }
 
 
 static gpointer __gdk_atom_dup0 (gpointer self) {
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 	return self ? _gdk_atom_dup (self) : NULL;
-#line 15185 "Page.c"
+#line 15210 "Page.c"
 }
 
 
@@ -15202,117 +15227,117 @@ DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* pa
 	GtkWidget* _tmp17_ = NULL;
 	GtkWidget* _tmp18_ = NULL;
 	GtkWidget* _tmp19_ = NULL;
-#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_PAGE (page), NULL);
-#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	self = (DragAndDropHandler*) g_type_create_instance (object_type);
-#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = page;
-#line 2489 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = _tmp0_;
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page;
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = page_get_event_source (_tmp1_);
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = _tmp2_;
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = self->priv->event_source;
-#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2497 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp3_ != NULL, "event_source != null");
-#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->event_source;
-#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = gtk_widget_get_has_window (_tmp4_);
-#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
 	_vala_assert (_tmp5_, "event_source.get_has_window()");
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = drag_and_drop_handler_XDS_ATOM;
-#line 2495 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 15236 "Page.c"
+#line 15261 "Page.c"
 		GdkAtom _tmp7_ = 0U;
 		GdkAtom* _tmp8_ = NULL;
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = gdk_atom_intern_static_string ("XdndDirectSave0");
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = __gdk_atom_dup0 (&_tmp7_);
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_XDS_ATOM);
-#line 2496 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_ATOM = _tmp8_;
-#line 15247 "Page.c"
+#line 15272 "Page.c"
 	}
-#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2504 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2498 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2504 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp9_ == NULL) {
-#line 15253 "Page.c"
+#line 15278 "Page.c"
 		GdkAtom _tmp10_ = 0U;
 		GdkAtom* _tmp11_ = NULL;
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = gdk_atom_intern_static_string ("text/plain");
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = __gdk_atom_dup0 (&_tmp10_);
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (drag_and_drop_handler_TEXT_ATOM);
-#line 2499 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_TEXT_ATOM = _tmp11_;
-#line 15264 "Page.c"
+#line 15289 "Page.c"
 	}
-#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2501 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2507 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp12_ == NULL) {
-#line 15272 "Page.c"
+#line 15297 "Page.c"
 		gint _tmp13_ = 0;
 		guchar* _tmp14_ = NULL;
-#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp14_ = string_to_uchar_array ("shotwell.txt", &_tmp13_);
-#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/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 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET = _tmp14_;
-#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_XDS_FAKE_TARGET_length1 = _tmp13_;
-#line 2502 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2508 "/home/jens/Source/shotwell/src/Page.vala"
 		_drag_and_drop_handler_XDS_FAKE_TARGET_size_ = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 15285 "Page.c"
+#line 15310 "Page.c"
 	}
-#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = self->priv->event_source;
-#line 2505 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2511 "/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 2510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->event_source;
-#line 2510 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2516 "/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 2511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = self->priv->event_source;
-#line 2511 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2517 "/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 2512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = self->priv->event_source;
-#line 2512 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2518 "/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 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = self->priv->event_source;
-#line 2513 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2519 "/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 2488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	return self;
-#line 15309 "Page.c"
+#line 15334 "Page.c"
 }
 
 
 DragAndDropHandler* drag_and_drop_handler_new (Page* page) {
-#line 2488 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2494 "/home/jens/Source/shotwell/src/Page.vala"
 	return drag_and_drop_handler_construct (TYPE_DRAG_AND_DROP_HANDLER, page);
-#line 15316 "Page.c"
+#line 15341 "Page.c"
 }
 
 
@@ -15338,119 +15363,119 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 	guint8* _tmp31_ = NULL;
 	gint _tmp31__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2529: on_drag_begin (%s)", _tmp2_);
-#line 2529 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2535: on_drag_begin (%s)", _tmp2_);
+#line 2535 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp5_ = self->priv->page;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_ == NULL) {
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15362 "Page.c"
+#line 15387 "Page.c"
 	} else {
 		Page* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		gint _tmp9_ = 0;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = self->priv->page;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = page_get_view (_tmp6_);
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = _tmp7_;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = view_collection_get_selected_count (_tmp8_);
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp9_ == 0;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp8_);
-#line 15380 "Page.c"
+#line 15405 "Page.c"
 	}
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15386 "Page.c"
+#line 15411 "Page.c"
 	} else {
 		ExporterUI* _tmp10_ = NULL;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = self->priv->exporter;
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp10_ != NULL;
-#line 15393 "Page.c"
+#line 15418 "Page.c"
 	}
-#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2532 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15399 "Page.c"
+#line 15424 "Page.c"
 	}
-#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp11_ = self->priv->page;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp12_ = page_get_view (_tmp11_);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = _tmp12_;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = view_collection_get_selected_at (_tmp13_, 0);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = data_view_get_source (_tmp15_);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (_tmp15_);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	_data_collection_unref0 (_tmp13_);
-#line 2537 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
 	thumb = _tmp17_;
-#line 15425 "Page.c"
+#line 15450 "Page.c"
 	{
 		GdkPixbuf* icon = NULL;
 		ThumbnailSource* _tmp18_ = NULL;
 		GdkPixbuf* _tmp19_ = NULL;
 		GtkWidget* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
-#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp18_ = thumb;
-#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp19_ = thumbnail_source_get_thumbnail (_tmp18_, APP_WINDOW_DND_ICON_SCALE, &_inner_error_);
-#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		icon = _tmp19_;
-#line 2540 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2546 "/home/jens/Source/shotwell/src/Page.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 15440 "Page.c"
-			goto __catch254_g_error;
+#line 15465 "Page.c"
+			goto __catch255_g_error;
 		}
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->event_source;
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = icon;
-#line 2541 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2547 "/home/jens/Source/shotwell/src/Page.vala"
 		gtk_drag_source_set_icon_pixbuf (_tmp20_, _tmp21_);
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (icon);
-#line 15451 "Page.c"
+#line 15476 "Page.c"
 	}
-	goto __finally254;
-	__catch254_g_error:
+	goto __finally255;
+	__catch255_g_error:
 	{
 		GError* err = NULL;
 		ThumbnailSource* _tmp22_ = NULL;
@@ -15458,58 +15483,58 @@ static void drag_and_drop_handler_on_drag_begin (DragAndDropHandler* self, GdkDr
 		gchar* _tmp24_ = NULL;
 		GError* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		err = _inner_error_;
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		_inner_error_ = NULL;
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = thumb;
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_OBJECT, DataObject));
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = _tmp23_;
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = err;
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp26_ = _tmp25_->message;
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
-		g_warning ("Page.vala:2543: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
-#line 2543 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+		g_warning ("Page.vala:2549: Unable to fetch icon for drag-and-drop from %s: %s", _tmp24_, _tmp26_);
+#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_free0 (_tmp24_);
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_error_free0 (err);
-#line 15482 "Page.c"
+#line 15507 "Page.c"
 	}
-	__finally254:
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+	__finally255:
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (thumb);
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/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 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		g_clear_error (&_inner_error_);
-#line 2539 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2545 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15495 "Page.c"
+#line 15520 "Page.c"
 	}
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp27_ = context;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp28_ = gdk_drag_context_get_source_window (_tmp27_);
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp29_ = drag_and_drop_handler_XDS_ATOM;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp30_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31_ = drag_and_drop_handler_XDS_FAKE_TARGET;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp31__length1 = drag_and_drop_handler_XDS_FAKE_TARGET_length1;
-#line 2549 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Page.vala"
 	gdk_property_change (_tmp28_, *_tmp29_, *_tmp30_, 8, GDK_PROP_MODE_REPLACE, (const guchar*) _tmp31_, 1);
-#line 2528 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (thumb);
-#line 15513 "Page.c"
+#line 15538 "Page.c"
 }
 
 
@@ -15520,61 +15545,61 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 	gboolean _tmp3_ = FALSE;
 	Page* _tmp4_ = NULL;
 	guint _tmp9_ = 0U;
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 2557 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2559: on_drag_data_get (%s)", _tmp2_);
-#line 2559 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2565: on_drag_data_get (%s)", _tmp2_);
+#line 2565 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15546 "Page.c"
+#line 15571 "Page.c"
 	} else {
 		Page* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		gint _tmp8_ = 0;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->page;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp6_ = page_get_view (_tmp5_);
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = _tmp6_;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = view_collection_get_selected_count (_tmp7_);
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp8_ == 0;
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 15564 "Page.c"
+#line 15589 "Page.c"
 	}
-#line 2561 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2562 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2568 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15570 "Page.c"
+#line 15595 "Page.c"
 	}
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp9_ = target_type;
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 	switch (_tmp9_) {
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_XDS:
-#line 15578 "Page.c"
+#line 15603 "Page.c"
 		{
 			guchar* data = NULL;
 			guchar* _tmp10_ = NULL;
@@ -15610,83 +15635,83 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			guchar* _tmp45_ = NULL;
 			guchar* _tmp46_ = NULL;
 			gint _tmp46__length1 = 0;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp10_ = g_new0 (guchar, 4096);
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp10_;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = 4096;
-#line 2567 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2569 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = 0;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp11_ = context;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp12_ = gdk_drag_context_get_source_window (_tmp11_);
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp13_ = drag_and_drop_handler_XDS_ATOM;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp14_ = drag_and_drop_handler_TEXT_ATOM;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15_ = data;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp15__length1 = data_length1;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/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 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_type = _tmp16_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			actual_format = _tmp17_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			data = _tmp18_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			data_length1 = _tmp19_;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_size_ = data_length1;
-#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
 			fetched = _tmp20_;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp23_ = fetched;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp23_) {
-#line 15656 "Page.c"
+#line 15681 "Page.c"
 				guchar* _tmp24_ = NULL;
 				gint _tmp24__length1 = 0;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24_ = data;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp24__length1 = data_length1;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = _tmp24_ != NULL;
-#line 15665 "Page.c"
+#line 15690 "Page.c"
 			} else {
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp22_ = FALSE;
-#line 15669 "Page.c"
+#line 15694 "Page.c"
 			}
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp22_) {
-#line 15673 "Page.c"
+#line 15698 "Page.c"
 				guchar* _tmp25_ = NULL;
 				gint _tmp25__length1 = 0;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25_ = data;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp25__length1 = data_length1;
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = _tmp25__length1 > 0;
-#line 15682 "Page.c"
+#line 15707 "Page.c"
 			} else {
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp21_ = FALSE;
-#line 15686 "Page.c"
+#line 15711 "Page.c"
 			}
-#line 2575 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2581 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp21_) {
-#line 15690 "Page.c"
+#line 15715 "Page.c"
 				guchar* _tmp26_ = NULL;
 				gint _tmp26__length1 = 0;
 				gchar* _tmp27_ = NULL;
@@ -15694,103 +15719,103 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 				GFile* _tmp29_ = NULL;
 				GFile* _tmp30_ = NULL;
 				GFile* _tmp31_ = NULL;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26_ = data;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp26__length1 = data_length1;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp27_ = uchar_array_to_string (_tmp26_, _tmp26__length1, -1);
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp28_ = _tmp27_;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp29_ = g_file_new_for_uri (_tmp28_);
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp30_ = _tmp29_;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp31_ = g_file_get_parent (_tmp30_);
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (self->priv->drag_destination);
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				self->priv->drag_destination = _tmp31_;
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_object_unref0 (_tmp30_);
-#line 2576 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp28_);
-#line 15720 "Page.c"
+#line 15745 "Page.c"
 			}
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp33_ = self->priv->drag_destination;
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp33_ != NULL) {
-#line 15726 "Page.c"
+#line 15751 "Page.c"
 				GFile* _tmp34_ = NULL;
 				gchar* _tmp35_ = NULL;
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp34_ = self->priv->drag_destination;
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp35_ = g_file_get_path (_tmp34_);
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp35_;
-#line 15737 "Page.c"
+#line 15762 "Page.c"
 			} else {
 				gchar* _tmp36_ = NULL;
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp36_ = g_strdup ("(no path)");
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_g_free0 (_tmp32_);
-#line 2579 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2585 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp32_ = _tmp36_;
-#line 15746 "Page.c"
+#line 15771 "Page.c"
 			}
-#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp37_ = self->priv->page;
-#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp38_ = page_get_page_name (_tmp37_);
-#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp39_ = _tmp38_;
-#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
-			g_debug ("Page.vala:2578: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
-#line 2578 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
+			g_debug ("Page.vala:2584: on_drag_data_get (%s): %s", _tmp39_, _tmp32_);
+#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp39_);
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp41_ = self->priv->drag_destination;
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 			if (_tmp41_ != NULL) {
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "S";
-#line 15764 "Page.c"
+#line 15789 "Page.c"
 			} else {
-#line 2583 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2589 "/home/jens/Source/shotwell/src/Page.vala"
 				_tmp40_ = "E";
-#line 15768 "Page.c"
+#line 15793 "Page.c"
 			}
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp42_ = selection_data;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp43_ = drag_and_drop_handler_XDS_ATOM;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp45_ = string_to_uchar_array (_tmp40_, &_tmp44_);
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = _tmp45_;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46__length1 = _tmp44_;
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp42_, *_tmp43_, 8, _tmp46_, _tmp44_);
-#line 2582 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2588 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp46_ = (g_free (_tmp46_), NULL);
-#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp32_);
-#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
 			data = (g_free (data), NULL);
-#line 2584 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15790 "Page.c"
+#line 15815 "Page.c"
 		}
-#line 2564 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Page.vala"
 		case DRAG_AND_DROP_HANDLER_TARGET_TYPE_MEDIA_LIST:
-#line 15794 "Page.c"
+#line 15819 "Page.c"
 		{
 			GeeCollection* sources = NULL;
 			Page* _tmp47_ = NULL;
@@ -15805,41 +15830,41 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			guchar* _tmp56_ = NULL;
 			guchar* _tmp57_ = NULL;
 			gint _tmp57__length1 = 0;
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp47_ = self->priv->page;
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp48_ = page_get_view (_tmp47_);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp49_ = _tmp48_;
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp50_ = view_collection_get_selected_sources (_tmp49_);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			_data_collection_unref0 (_tmp49_);
-#line 2587 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Page.vala"
 			sources = _tmp51_;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp52_ = selection_data;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp53_ = gdk_atom_intern_static_string ("SourceIDAtom");
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp54_ = sources;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp56_ = serialize_media_sources (_tmp54_, &_tmp55_);
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = _tmp56_;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57__length1 = _tmp55_;
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			gtk_selection_data_set (_tmp52_, _tmp53_, (gint) sizeof (GdkAtom), _tmp57_, _tmp55_);
-#line 2592 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp57_ = (g_free (_tmp57_), NULL);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2600 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_object_unref0 (sources);
-#line 2594 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2600 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15843 "Page.c"
+#line 15868 "Page.c"
 		}
 		default:
 		{
@@ -15847,30 +15872,30 @@ static void drag_and_drop_handler_on_drag_data_get (DragAndDropHandler* self, Gd
 			gchar* _tmp59_ = NULL;
 			gchar* _tmp60_ = NULL;
 			guint _tmp61_ = 0U;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp58_ = self->priv->page;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp59_ = page_get_page_name (_tmp58_);
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp60_ = _tmp59_;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 			_tmp61_ = target_type;
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
-			g_warning ("Page.vala:2597: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
-#line 2597 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+			g_warning ("Page.vala:2603: on_drag_data_get (%s): unknown target type %u", _tmp60_, _tmp61_);
+#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
 			_g_free0 (_tmp60_);
-#line 2599 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Page.vala"
 			break;
-#line 15865 "Page.c"
+#line 15890 "Page.c"
 		}
 	}
 }
 
 
 static void _drag_and_drop_handler_on_export_completed_exporter_completion_callback (Exporter* exporter, gboolean is_cancelled, gpointer self) {
-#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_on_export_completed ((DragAndDropHandler*) self);
-#line 15874 "Page.c"
+#line 15899 "Page.c"
 }
 
 
@@ -15889,99 +15914,99 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 	gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
 	gboolean _tmp19_ = FALSE;
-#line 2603 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2604: on_drag_end (%s)", _tmp2_);
-#line 2604 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2610: on_drag_end (%s)", _tmp2_);
+#line 2610 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp6_ = self->priv->page;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp6_ == NULL) {
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = TRUE;
-#line 15911 "Page.c"
+#line 15936 "Page.c"
 	} else {
 		Page* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
 		gint _tmp10_ = 0;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->page;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp8_ = page_get_view (_tmp7_);
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp9_ = _tmp8_;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp10_ = view_collection_get_selected_count (_tmp9_);
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = _tmp10_ == 0;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp9_);
-#line 15929 "Page.c"
+#line 15954 "Page.c"
 	}
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp5_) {
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = TRUE;
-#line 15935 "Page.c"
+#line 15960 "Page.c"
 	} else {
 		GFile* _tmp11_ = NULL;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp11_ = self->priv->drag_destination;
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp4_ = _tmp11_ == NULL;
-#line 15942 "Page.c"
+#line 15967 "Page.c"
 	}
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_) {
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = TRUE;
-#line 15948 "Page.c"
+#line 15973 "Page.c"
 	} else {
 		ExporterUI* _tmp12_ = NULL;
-#line 2607 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp12_ = self->priv->exporter;
-#line 2607 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2613 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = _tmp12_ != NULL;
-#line 15955 "Page.c"
+#line 15980 "Page.c"
 	}
-#line 2606 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp3_) {
-#line 2608 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2614 "/home/jens/Source/shotwell/src/Page.vala"
 		return;
-#line 15961 "Page.c"
+#line 15986 "Page.c"
 	}
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp13_ = self->priv->drag_destination;
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp14_ = g_file_get_path (_tmp13_);
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp15_ = _tmp14_;
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2611: Exporting to %s", _tmp15_);
-#line 2611 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2617: Exporting to %s", _tmp15_);
+#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp15_);
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp16_ = self->priv->drag_destination;
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp17_ = g_file_get_path (_tmp16_);
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp18_ = _tmp17_;
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp19_ = _tmp18_ != NULL;
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp18_);
-#line 2616 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp19_) {
-#line 15985 "Page.c"
+#line 16010 "Page.c"
 		Page* _tmp20_ = NULL;
 		ViewCollection* _tmp21_ = NULL;
 		ViewCollection* _tmp22_ = NULL;
@@ -15994,56 +16019,56 @@ static void drag_and_drop_handler_on_drag_end (DragAndDropHandler* self) {
 		Exporter* _tmp29_ = NULL;
 		ExporterUI* _tmp30_ = NULL;
 		ExporterUI* _tmp31_ = NULL;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp20_ = self->priv->page;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp21_ = page_get_view (_tmp20_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp22_ = _tmp21_;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp23_ = view_collection_get_selected_sources (_tmp22_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp25_ = self->priv->drag_destination;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		scaling_for_original (&_tmp26_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		export_format_parameters_current (&_tmp27_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp28_ = exporter_new (_tmp24_, _tmp25_, &_tmp26_, &_tmp27_, FALSE);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp29_ = _tmp28_;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp30_ = exporter_ui_new (_tmp29_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_exporter_ui_unref0 (self->priv->exporter);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		self->priv->exporter = _tmp30_;
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp29_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_g_object_unref0 (_tmp24_);
-#line 2617 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2623 "/home/jens/Source/shotwell/src/Page.vala"
 		_data_collection_unref0 (_tmp22_);
-#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp31_ = self->priv->exporter;
-#line 2620 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2626 "/home/jens/Source/shotwell/src/Page.vala"
 		exporter_ui_export (_tmp31_, _drag_and_drop_handler_on_export_completed_exporter_completion_callback, self);
-#line 16034 "Page.c"
+#line 16059 "Page.c"
 	} else {
 		const gchar* _tmp32_ = NULL;
-#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp32_ = _ ("Photos cannot be exported to this directory.");
-#line 2622 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
 		app_window_error_message (_tmp32_, NULL);
-#line 16041 "Page.c"
+#line 16066 "Page.c"
 	}
-#line 2625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2625 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 16047 "Page.c"
+#line 16072 "Page.c"
 }
 
 
@@ -16054,271 +16079,271 @@ static gboolean drag_and_drop_handler_on_drag_failed (DragAndDropHandler* self,
 	gchar* _tmp2_ = NULL;
 	GtkDragResult _tmp3_ = 0;
 	Page* _tmp4_ = NULL;
-#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (IS_DRAG_AND_DROP_HANDLER (self), FALSE);
-#line 2628 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->page;
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp1_ = page_get_page_name (_tmp0_);
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp2_ = _tmp1_;
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp3_ = drag_result;
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
-	g_debug ("Page.vala:2629: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
-#line 2629 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
+	g_debug ("Page.vala:2635: on_drag_failed (%s): %d", _tmp2_, (gint) _tmp3_);
+#line 2635 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_free0 (_tmp2_);
-#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp4_ = self->priv->page;
-#line 2631 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2637 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp4_ == NULL) {
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 		result = FALSE;
-#line 2632 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Page.vala"
 		return result;
-#line 16082 "Page.c"
+#line 16107 "Page.c"
 	}
-#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2634 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2640 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 	result = FALSE;
-#line 2636 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Page.vala"
 	return result;
-#line 16092 "Page.c"
+#line 16117 "Page.c"
 }
 
 
 static void drag_and_drop_handler_on_export_completed (DragAndDropHandler* self) {
-#line 2639 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2645 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (IS_DRAG_AND_DROP_HANDLER (self));
-#line 2640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2646 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 2640 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2646 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 16103 "Page.c"
+#line 16128 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_init (GValue* value) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	value->data[0].v_pointer = NULL;
-#line 16110 "Page.c"
+#line 16135 "Page.c"
 }
 
 
 static void value_drag_and_drop_handler_free_value (GValue* value) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (value->data[0].v_pointer) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (value->data[0].v_pointer);
-#line 16119 "Page.c"
+#line 16144 "Page.c"
 	}
 }
 
 
 static void value_drag_and_drop_handler_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (src_value->data[0].v_pointer) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 16129 "Page.c"
+#line 16154 "Page.c"
 	} else {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 16133 "Page.c"
+#line 16158 "Page.c"
 	}
 }
 
 
 static gpointer value_drag_and_drop_handler_peek_pointer (const GValue* value) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16141 "Page.c"
+#line 16166 "Page.c"
 }
 
 
 static gchar* value_drag_and_drop_handler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (collect_values[0].v_pointer) {
-#line 16148 "Page.c"
+#line 16173 "Page.c"
 		DragAndDropHandler* object;
 		object = collect_values[0].v_pointer;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 16155 "Page.c"
+#line 16180 "Page.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 16159 "Page.c"
+#line 16184 "Page.c"
 		}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = drag_and_drop_handler_ref (object);
-#line 16163 "Page.c"
+#line 16188 "Page.c"
 	} else {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16167 "Page.c"
+#line 16192 "Page.c"
 	}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16171 "Page.c"
+#line 16196 "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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!object_p) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 16182 "Page.c"
+#line 16207 "Page.c"
 	}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (!value->data[0].v_pointer) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = NULL;
-#line 16188 "Page.c"
+#line 16213 "Page.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = value->data[0].v_pointer;
-#line 16192 "Page.c"
+#line 16217 "Page.c"
 	} else {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		*object_p = drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16196 "Page.c"
+#line 16221 "Page.c"
 	}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return NULL;
-#line 16200 "Page.c"
+#line 16225 "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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return G_PARAM_SPEC (spec);
-#line 16214 "Page.c"
+#line 16239 "Page.c"
 }
 
 
 gpointer value_get_drag_and_drop_handler (const GValue* value) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return value->data[0].v_pointer;
-#line 16223 "Page.c"
+#line 16248 "Page.c"
 }
 
 
 void value_set_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler* old;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_ref (value->data[0].v_pointer);
-#line 16243 "Page.c"
+#line 16268 "Page.c"
 	} else {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16247 "Page.c"
+#line 16272 "Page.c"
 	}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16253 "Page.c"
+#line 16278 "Page.c"
 	}
 }
 
 
 void value_take_drag_and_drop_handler (GValue* value, gpointer v_object) {
 	DragAndDropHandler* old;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	old = value->data[0].v_pointer;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (v_object) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_DRAG_AND_DROP_HANDLER));
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/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 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = v_object;
-#line 16272 "Page.c"
+#line 16297 "Page.c"
 	} else {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		value->data[0].v_pointer = NULL;
-#line 16276 "Page.c"
+#line 16301 "Page.c"
 	}
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (old) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		drag_and_drop_handler_unref (old);
-#line 16282 "Page.c"
+#line 16307 "Page.c"
 	}
 }
 
 
 static void drag_and_drop_handler_class_init (DragAndDropHandlerClass * klass) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	drag_and_drop_handler_parent_class = g_type_class_peek_parent (klass);
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	((DragAndDropHandlerClass *) klass)->finalize = drag_and_drop_handler_finalize;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_type_class_add_private (klass, sizeof (DragAndDropHandlerPrivate));
-#line 16294 "Page.c"
+#line 16319 "Page.c"
 }
 
 
 static void drag_and_drop_handler_instance_init (DragAndDropHandler * self) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv = DRAG_AND_DROP_HANDLER_GET_PRIVATE (self);
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->drag_destination = NULL;
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->exporter = NULL;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	self->ref_count = 1;
-#line 16307 "Page.c"
+#line 16332 "Page.c"
 }
 
 
 static void drag_and_drop_handler_finalize (DragAndDropHandler* obj) {
 	DragAndDropHandler * self;
 	GtkWidget* _tmp0_ = NULL;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DRAG_AND_DROP_HANDLER, DragAndDropHandler);
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_signal_handlers_destroy (self);
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 	_tmp0_ = self->priv->event_source;
-#line 2517 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2523 "/home/jens/Source/shotwell/src/Page.vala"
 	if (_tmp0_ != NULL) {
-#line 16322 "Page.c"
+#line 16347 "Page.c"
 		GtkWidget* _tmp1_ = NULL;
 		guint _tmp2_ = 0U;
 		GtkWidget* _tmp3_ = NULL;
@@ -16327,45 +16352,45 @@ static void drag_and_drop_handler_finalize (DragAndDropHandler* obj) {
 		guint _tmp6_ = 0U;
 		GtkWidget* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp1_ = self->priv->event_source;
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-begin", gtk_widget_get_type (), &_tmp2_, NULL, FALSE);
-#line 2518 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2524 "/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 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp3_ = self->priv->event_source;
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-data-get", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 2519 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2525 "/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 2520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp5_ = self->priv->event_source;
-#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2526 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-end", gtk_widget_get_type (), &_tmp6_, NULL, FALSE);
-#line 2520 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2526 "/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 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		_tmp7_ = self->priv->event_source;
-#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/home/jens/Source/shotwell/src/Page.vala"
 		g_signal_parse_name ("drag-failed", gtk_widget_get_type (), &_tmp8_, NULL, FALSE);
-#line 2521 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2527 "/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 16355 "Page.c"
+#line 16380 "Page.c"
 	}
-#line 2524 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2530 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->page = NULL;
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2525 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Page.vala"
 	self->priv->event_source = NULL;
-#line 2484 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2490 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->event_source);
-#line 2485 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2491 "/home/jens/Source/shotwell/src/Page.vala"
 	_g_object_unref0 (self->priv->drag_destination);
-#line 2486 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2492 "/home/jens/Source/shotwell/src/Page.vala"
 	_exporter_ui_unref0 (self->priv->exporter);
-#line 16369 "Page.c"
+#line 16394 "Page.c"
 }
 
 
@@ -16386,24 +16411,24 @@ GType drag_and_drop_handler_get_type (void) {
 gpointer drag_and_drop_handler_ref (gpointer instance) {
 	DragAndDropHandler* self;
 	self = instance;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	return instance;
-#line 16394 "Page.c"
+#line 16419 "Page.c"
 }
 
 
 void drag_and_drop_handler_unref (gpointer instance) {
 	DragAndDropHandler* self;
 	self = instance;
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		DRAG_AND_DROP_HANDLER_GET_CLASS (self)->finalize (self);
-#line 2468 "/home/jens/Source/shotwell/src/Page.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Page.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 16407 "Page.c"
+#line 16432 "Page.c"
 	}
 }
 
diff --git a/src/Page.vala b/src/Page.vala
index 06454d8..bdeee6b 100644
--- a/src/Page.vala
+++ b/src/Page.vala
@@ -268,7 +268,11 @@ public abstract class Page : Gtk.ScrolledWindow {
     
     public virtual void switching_from() {
         in_view = false;
-        remove_actions(AppWindow.get_instance());
+        //remove_actions(AppWindow.get_instance());
+        var map = get_container() as GLib.ActionMap;
+        if (map != null) {
+            remove_actions(map);
+        }
         if (toolbar_path != null)
             toolbar = null;
     }
@@ -276,7 +280,10 @@ public abstract class Page : Gtk.ScrolledWindow {
     public virtual void switched_to() {
         in_view = true;
         add_ui();
-        add_actions(AppWindow.get_instance());
+        var map = get_container() as GLib.ActionMap;
+        if (map != null) {
+            add_actions(map);
+        }
         int selected_count = get_view().get_selected_count();
         int count = get_view().get_count();
         init_actions(selected_count, count);
@@ -563,13 +570,12 @@ public abstract class Page : Gtk.ScrolledWindow {
     }
     
     private void init_load_ui(string ui_filename) {
-        File ui_file = Resources.get_ui(ui_filename);
-        
+        var ui_resource = Resources.get_ui(ui_filename);
         try {
-            builder.add_from_file(ui_file.get_path());
+            builder.add_from_resource(ui_resource);
         } catch (Error err) {
-            AppWindow.error_message("Error loading UI file %s: %s".printf(
-                ui_file.get_path(), err.message));
+            AppWindow.error_message("Error loading UI resource %s: %s".printf(
+                ui_resource, err.message));
             Application.get_instance().panic();
         }
     }
diff --git a/src/Photo.c b/src/Photo.c
index 17e0e5d..b890199 100644
--- a/src/Photo.c
+++ b/src/Photo.c
@@ -483,6 +483,8 @@ 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 PHOTO_FILE_READER_TYPE_ROLE (photo_file_reader_role_get_type ())
+
 #define PHOTO_TYPE_REIMPORT_MASTER_STATE (photo_reimport_master_state_get_type ())
 #define PHOTO_REIMPORT_MASTER_STATE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState))
 #define PHOTO_REIMPORT_MASTER_STATE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterStateClass))
@@ -1317,6 +1319,11 @@ typedef enum  {
 	IMPORT_RESULT_PIXBUF_CORRUPT_IMAGE
 } ImportResult;
 
+typedef enum  {
+	PHOTO_FILE_READER_ROLE_DEFAULT,
+	PHOTO_FILE_READER_ROLE_THUMBNAIL
+} PhotoFileReaderRole;
+
 struct _PhotoReimportMasterState {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
@@ -2069,8 +2076,8 @@ void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, P
 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);
-GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error);
 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);
 void photo_discard_prefetched (Photo* self);
 RawDeveloper photo_get_raw_developer (Photo* self);
@@ -2138,6 +2145,8 @@ Rating photo_metadata_get_rating (PhotoMetadata* self);
 void photo_id_init (PhotoID *self, gint64 id);
 #define EVENT_ID_INVALID ((gint64) -1)
 void event_id_init (EventID *self, gint64 id);
+GType photo_file_reader_role_get_type (void) G_GNUC_CONST;
+void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role);
 void thumbnail_cache_generate_for_photo (Thumbnails* thumbnails, PhotoFileReader* reader, Orientation orientation, Dimensions* original_dim, GError** error);
 ImportResult import_result_convert_error (GError* err, ImportResult default_result);
 void photo_create_pre_import (PhotoImportParams* params);
@@ -2875,14 +2884,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 2879 "Photo.c"
+#line 2888 "Photo.c"
 }
 
 
 static gpointer _thumbnails_ref0 (gpointer self) {
 #line 48 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? thumbnails_ref (self) : NULL;
-#line 2886 "Photo.c"
+#line 2895 "Photo.c"
 }
 
 
@@ -2970,14 +2979,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 2974 "Photo.c"
+#line 2983 "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 2981 "Photo.c"
+#line 2990 "Photo.c"
 }
 
 
@@ -3024,21 +3033,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 3028 "Photo.c"
+#line 3037 "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 3035 "Photo.c"
+#line 3044 "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 3042 "Photo.c"
+#line 3051 "Photo.c"
 }
 
 
@@ -3047,7 +3056,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 3051 "Photo.c"
+#line 3060 "Photo.c"
 	}
 }
 
@@ -3057,11 +3066,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 3061 "Photo.c"
+#line 3070 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3065 "Photo.c"
+#line 3074 "Photo.c"
 	}
 }
 
@@ -3069,37 +3078,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 3073 "Photo.c"
+#line 3082 "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 3080 "Photo.c"
+#line 3089 "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 3087 "Photo.c"
+#line 3096 "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 3091 "Photo.c"
+#line 3100 "Photo.c"
 		}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_import_params_ref (object);
-#line 3095 "Photo.c"
+#line 3104 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3099 "Photo.c"
+#line 3108 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 3103 "Photo.c"
+#line 3112 "Photo.c"
 }
 
 
@@ -3110,25 +3119,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 3114 "Photo.c"
+#line 3123 "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 3120 "Photo.c"
+#line 3129 "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 3124 "Photo.c"
+#line 3133 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_import_params_ref (value->data[0].v_pointer);
-#line 3128 "Photo.c"
+#line 3137 "Photo.c"
 	}
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 3132 "Photo.c"
+#line 3141 "Photo.c"
 }
 
 
@@ -3142,7 +3151,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 3146 "Photo.c"
+#line 3155 "Photo.c"
 }
 
 
@@ -3151,7 +3160,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 3155 "Photo.c"
+#line 3164 "Photo.c"
 }
 
 
@@ -3171,17 +3180,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 3175 "Photo.c"
+#line 3184 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3179 "Photo.c"
+#line 3188 "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 3185 "Photo.c"
+#line 3194 "Photo.c"
 	}
 }
 
@@ -3200,17 +3209,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 3204 "Photo.c"
+#line 3213 "Photo.c"
 	} else {
 #line 21 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 3208 "Photo.c"
+#line 3217 "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 3214 "Photo.c"
+#line 3223 "Photo.c"
 	}
 }
 
@@ -3220,7 +3229,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 3224 "Photo.c"
+#line 3233 "Photo.c"
 }
 
 
@@ -3236,7 +3245,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 3240 "Photo.c"
+#line 3249 "Photo.c"
 }
 
 
@@ -3262,7 +3271,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 3266 "Photo.c"
+#line 3275 "Photo.c"
 }
 
 
@@ -3287,7 +3296,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 3291 "Photo.c"
+#line 3300 "Photo.c"
 }
 
 
@@ -3300,7 +3309,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 3304 "Photo.c"
+#line 3313 "Photo.c"
 	}
 }
 
@@ -3311,7 +3320,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 3315 "Photo.c"
+#line 3324 "Photo.c"
 }
 
 
@@ -3326,14 +3335,14 @@ gboolean photo_transformation_state_is_broken (PhotoTransformationState* self) {
 	result = _tmp0_;
 #line 76 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3330 "Photo.c"
+#line 3339 "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 3337 "Photo.c"
+#line 3346 "Photo.c"
 }
 
 
@@ -3348,7 +3357,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"
 	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 3352 "Photo.c"
+#line 3361 "Photo.c"
 }
 
 
@@ -3357,7 +3366,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 3361 "Photo.c"
+#line 3370 "Photo.c"
 }
 
 
@@ -3367,7 +3376,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 3371 "Photo.c"
+#line 3380 "Photo.c"
 }
 
 
@@ -3389,7 +3398,7 @@ gboolean rating_can_increase (Rating self) {
 	result = self < RATING_FIVE;
 #line 90 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3393 "Photo.c"
+#line 3402 "Photo.c"
 }
 
 
@@ -3399,7 +3408,7 @@ gboolean rating_can_decrease (Rating self) {
 	result = self > RATING_REJECTED;
 #line 94 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 3403 "Photo.c"
+#line 3412 "Photo.c"
 }
 
 
@@ -3410,17 +3419,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 3414 "Photo.c"
+#line 3423 "Photo.c"
 	} else {
 #line 98 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 3418 "Photo.c"
+#line 3427 "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 3424 "Photo.c"
+#line 3433 "Photo.c"
 }
 
 
@@ -3434,17 +3443,17 @@ Rating rating_increase (Rating self) {
 	if (_tmp1_) {
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self + 1;
-#line 3438 "Photo.c"
+#line 3447 "Photo.c"
 	} else {
 #line 102 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self;
-#line 3442 "Photo.c"
+#line 3451 "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 3448 "Photo.c"
+#line 3457 "Photo.c"
 }
 
 
@@ -3458,17 +3467,17 @@ Rating rating_decrease (Rating self) {
 	if (_tmp1_) {
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self - 1;
-#line 3462 "Photo.c"
+#line 3471 "Photo.c"
 	} else {
 #line 106 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self;
-#line 3466 "Photo.c"
+#line 3475 "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 3472 "Photo.c"
+#line 3481 "Photo.c"
 }
 
 
@@ -3478,73 +3487,73 @@ gint rating_serialize (Rating self) {
 	switch (self) {
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_REJECTED:
-#line 3482 "Photo.c"
+#line 3491 "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 3488 "Photo.c"
+#line 3497 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_UNRATED:
-#line 3492 "Photo.c"
+#line 3501 "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 3498 "Photo.c"
+#line 3507 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_ONE:
-#line 3502 "Photo.c"
+#line 3511 "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 3508 "Photo.c"
+#line 3517 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_TWO:
-#line 3512 "Photo.c"
+#line 3521 "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 3518 "Photo.c"
+#line 3527 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_THREE:
-#line 3522 "Photo.c"
+#line 3531 "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 3528 "Photo.c"
+#line 3537 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_FOUR:
-#line 3532 "Photo.c"
+#line 3541 "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 3538 "Photo.c"
+#line 3547 "Photo.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RATING_FIVE:
-#line 3542 "Photo.c"
+#line 3551 "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 3548 "Photo.c"
+#line 3557 "Photo.c"
 		}
 		default:
 		{
@@ -3552,7 +3561,7 @@ gint rating_serialize (Rating self) {
 			result = 0;
 #line 126 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3556 "Photo.c"
+#line 3565 "Photo.c"
 		}
 	}
 }
@@ -3570,7 +3579,7 @@ Rating rating_unserialize (gint value) {
 		result = RATING_FIVE;
 #line 132 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 3574 "Photo.c"
+#line 3583 "Photo.c"
 	} else {
 		gint _tmp1_ = 0;
 #line 133 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3581,7 +3590,7 @@ Rating rating_unserialize (gint value) {
 			result = RATING_REJECTED;
 #line 134 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3585 "Photo.c"
+#line 3594 "Photo.c"
 		}
 	}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3590,73 +3599,73 @@ Rating rating_unserialize (gint value) {
 	switch (_tmp2_) {
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case -1:
-#line 3594 "Photo.c"
+#line 3603 "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 3600 "Photo.c"
+#line 3609 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 0:
-#line 3604 "Photo.c"
+#line 3613 "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 3610 "Photo.c"
+#line 3619 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 1:
-#line 3614 "Photo.c"
+#line 3623 "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 3620 "Photo.c"
+#line 3629 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 2:
-#line 3624 "Photo.c"
+#line 3633 "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 3630 "Photo.c"
+#line 3639 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 3:
-#line 3634 "Photo.c"
+#line 3643 "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 3640 "Photo.c"
+#line 3649 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 4:
-#line 3644 "Photo.c"
+#line 3653 "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 3650 "Photo.c"
+#line 3659 "Photo.c"
 		}
 #line 136 "/home/jens/Source/shotwell/src/Photo.vala"
 		case 5:
-#line 3654 "Photo.c"
+#line 3663 "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 3660 "Photo.c"
+#line 3669 "Photo.c"
 		}
 		default:
 		{
@@ -3664,7 +3673,7 @@ Rating rating_unserialize (gint value) {
 			result = RATING_UNRATED;
 #line 152 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 3668 "Photo.c"
+#line 3677 "Photo.c"
 		}
 	}
 }
@@ -3691,7 +3700,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 3695 "Photo.c"
+#line 3704 "Photo.c"
 }
 
 
@@ -3704,7 +3713,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 3708 "Photo.c"
+#line 3717 "Photo.c"
 }
 
 
@@ -3723,14 +3732,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 3727 "Photo.c"
+#line 3736 "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 3734 "Photo.c"
+#line 3743 "Photo.c"
 }
 
 
@@ -3847,7 +3856,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_tmp22_ = basename;
 #line 412 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 3851 "Photo.c"
+#line 3860 "Photo.c"
 		const gchar* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
 #line 413 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3858,7 +3867,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 3862 "Photo.c"
+#line 3871 "Photo.c"
 	}
 #line 415 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = self->priv->file_title;
@@ -3866,7 +3875,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 3870 "Photo.c"
+#line 3879 "Photo.c"
 		PhotoRow* _tmp27_ = NULL;
 		BackingPhotoRow* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
@@ -3883,7 +3892,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 3887 "Photo.c"
+#line 3896 "Photo.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = row;
@@ -3893,7 +3902,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 3897 "Photo.c"
+#line 3906 "Photo.c"
 		BackingPhotoRow* e = NULL;
 		PhotoRow* _tmp34_ = NULL;
 		BackingPhotoID _tmp35_ = {0};
@@ -3911,7 +3920,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 		_tmp37_ = e;
 #line 420 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp37_ != NULL) {
-#line 3915 "Photo.c"
+#line 3924 "Photo.c"
 			BackingPhotoRow* _tmp38_ = NULL;
 			BackingPhotoRow* _tmp39_ = NULL;
 			PhotoBackingReaders* _tmp40_ = NULL;
@@ -3944,7 +3953,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 3948 "Photo.c"
+#line 3957 "Photo.c"
 		} else {
 			{
 				PhotoTable* _tmp46_ = NULL;
@@ -3964,8 +3973,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 3968 "Photo.c"
-						goto __catch255_database_error;
+#line 3977 "Photo.c"
+						goto __catch256_database_error;
 					}
 #line 425 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (e);
@@ -3977,11 +3986,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 3981 "Photo.c"
+#line 3990 "Photo.c"
 				}
 			}
-			goto __finally255;
-			__catch255_database_error:
+			goto __finally256;
+			__catch256_database_error:
 			{
 				GError* err = NULL;
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -3990,9 +3999,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 3994 "Photo.c"
+#line 4003 "Photo.c"
 			}
-			__finally255:
+			__finally256:
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 424 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4005,15 +4014,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 4009 "Photo.c"
+#line 4018 "Photo.c"
 			}
 #line 432 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_internal_remove_all_transformations (self, FALSE);
-#line 4013 "Photo.c"
+#line 4022 "Photo.c"
 		}
 #line 418 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (e);
-#line 4017 "Photo.c"
+#line 4026 "Photo.c"
 	}
 #line 436 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = row;
@@ -4023,7 +4032,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 4027 "Photo.c"
+#line 4036 "Photo.c"
 		GeeHashMap* _tmp52_ = NULL;
 		gint _tmp53_ = 0;
 		RawDeveloper* _tmp54_ = NULL;
@@ -4035,7 +4044,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 4039 "Photo.c"
+#line 4048 "Photo.c"
 		{
 			RawDeveloper* d_collection = NULL;
 			gint d_collection_length1 = 0;
@@ -4047,11 +4056,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 4051 "Photo.c"
+#line 4060 "Photo.c"
 				RawDeveloper d = 0;
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 				d = d_collection[d_it];
-#line 4055 "Photo.c"
+#line 4064 "Photo.c"
 				{
 					BackingPhotoID id = {0};
 					PhotoRow* _tmp55_ = NULL;
@@ -4079,7 +4088,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 4083 "Photo.c"
+#line 4092 "Photo.c"
 						BackingPhotoRow* bpr = NULL;
 						BackingPhotoID _tmp61_ = {0};
 						BackingPhotoRow* _tmp62_ = NULL;
@@ -4094,7 +4103,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 						_tmp63_ = bpr;
 #line 443 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp63_ != NULL) {
-#line 4098 "Photo.c"
+#line 4107 "Photo.c"
 							GeeHashMap* _tmp64_ = NULL;
 							RawDeveloper _tmp65_ = 0;
 							BackingPhotoRow* _tmp66_ = NULL;
@@ -4106,17 +4115,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 4110 "Photo.c"
+#line 4119 "Photo.c"
 						}
 #line 441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (bpr);
-#line 4114 "Photo.c"
+#line 4123 "Photo.c"
 					}
 				}
 			}
 #line 439 "/home/jens/Source/shotwell/src/Photo.vala"
 			d_collection = (g_free (d_collection), NULL);
-#line 4120 "Photo.c"
+#line 4129 "Photo.c"
 		}
 	}
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4127,7 +4136,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 4131 "Photo.c"
+#line 4140 "Photo.c"
 		GeeHashMap* _tmp71_ = NULL;
 		PhotoRow* _tmp72_ = NULL;
 		RawDeveloper _tmp73_ = 0;
@@ -4142,15 +4151,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 4146 "Photo.c"
+#line 4155 "Photo.c"
 	} else {
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = FALSE;
-#line 4150 "Photo.c"
+#line 4159 "Photo.c"
 	}
 #line 450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_) {
-#line 4154 "Photo.c"
+#line 4163 "Photo.c"
 		BackingPhotoRow* r = NULL;
 		GeeHashMap* _tmp75_ = NULL;
 		PhotoRow* _tmp76_ = NULL;
@@ -4190,7 +4199,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 4194 "Photo.c"
+#line 4203 "Photo.c"
 	}
 #line 456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = self->priv->readers;
@@ -4198,7 +4207,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 4202 "Photo.c"
+#line 4211 "Photo.c"
 		BackingPhotoRow* _tmp87_ = NULL;
 		BackingPhotoRow* _tmp88_ = NULL;
 #line 457 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4209,7 +4218,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 4213 "Photo.c"
+#line 4222 "Photo.c"
 	} else {
 		PhotoRow* _tmp89_ = NULL;
 		BackingPhotoRow* _tmp90_ = NULL;
@@ -4222,7 +4231,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 4226 "Photo.c"
+#line 4235 "Photo.c"
 			PhotoRow* _tmp92_ = NULL;
 			BackingPhotoRow* _tmp93_ = NULL;
 			BackingPhotoRow* _tmp94_ = NULL;
@@ -4236,7 +4245,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 4240 "Photo.c"
+#line 4249 "Photo.c"
 		} else {
 			GeeHashMap* _tmp95_ = NULL;
 			PhotoRow* _tmp96_ = NULL;
@@ -4252,7 +4261,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 4256 "Photo.c"
+#line 4265 "Photo.c"
 				GeeHashMap* _tmp99_ = NULL;
 				PhotoRow* _tmp100_ = NULL;
 				RawDeveloper _tmp101_ = 0;
@@ -4269,7 +4278,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 4273 "Photo.c"
+#line 4282 "Photo.c"
 			} else {
 				PhotoRow* _tmp103_ = NULL;
 				BackingPhotoRow* _tmp104_ = NULL;
@@ -4284,7 +4293,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 4288 "Photo.c"
+#line 4297 "Photo.c"
 			}
 		}
 	}
@@ -4298,7 +4307,7 @@ Photo* photo_construct (GType object_type, PhotoRow* row) {
 	_g_free0 (basename);
 #line 399 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 4302 "Photo.c"
+#line 4311 "Photo.c"
 }
 
 
@@ -4310,7 +4319,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 4314 "Photo.c"
+#line 4323 "Photo.c"
 }
 
 
@@ -4324,7 +4333,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 4328 "Photo.c"
+#line 4337 "Photo.c"
 		guint _tmp1_ = 0U;
 #line 482 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_discard_source_id;
@@ -4332,7 +4341,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 4336 "Photo.c"
+#line 4345 "Photo.c"
 	}
 }
 
@@ -4350,7 +4359,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_by_name (self, "editable-replaced", _tmp0_, _tmp1_);
-#line 4354 "Photo.c"
+#line 4363 "Photo.c"
 }
 
 
@@ -4359,14 +4368,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 4363 "Photo.c"
+#line 4372 "Photo.c"
 }
 
 
 static void photo_real_notify_raw_development_modified (Photo* self) {
 #line 492 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "raw-development-modified");
-#line 4370 "Photo.c"
+#line 4379 "Photo.c"
 }
 
 
@@ -4375,14 +4384,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 4379 "Photo.c"
+#line 4388 "Photo.c"
 }
 
 
 static void photo_real_notify_baseline_replaced (Photo* self) {
 #line 496 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "baseline-replaced");
-#line 4386 "Photo.c"
+#line 4395 "Photo.c"
 }
 
 
@@ -4391,7 +4400,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 4395 "Photo.c"
+#line 4404 "Photo.c"
 }
 
 
@@ -4403,7 +4412,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_by_name (self, "master-reimported", _tmp0_);
-#line 4407 "Photo.c"
+#line 4416 "Photo.c"
 }
 
 
@@ -4412,7 +4421,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 4416 "Photo.c"
+#line 4425 "Photo.c"
 }
 
 
@@ -4424,7 +4433,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_by_name (self, "editable-reimported", _tmp0_);
-#line 4428 "Photo.c"
+#line 4437 "Photo.c"
 }
 
 
@@ -4433,7 +4442,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 4437 "Photo.c"
+#line 4446 "Photo.c"
 }
 
 
@@ -4445,7 +4454,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_by_name (self, "source-reimported", _tmp0_);
-#line 4449 "Photo.c"
+#line 4458 "Photo.c"
 }
 
 
@@ -4454,7 +4463,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 4458 "Photo.c"
+#line 4467 "Photo.c"
 }
 
 
@@ -4466,7 +4475,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_by_name (self, "baseline-reimported", _tmp0_);
-#line 4470 "Photo.c"
+#line 4479 "Photo.c"
 }
 
 
@@ -4475,7 +4484,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 4479 "Photo.c"
+#line 4488 "Photo.c"
 }
 
 
@@ -4496,14 +4505,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 4500 "Photo.c"
+#line 4509 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
 #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 4507 "Photo.c"
+#line 4516 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -4513,7 +4522,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 4517 "Photo.c"
+#line 4526 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				GFile* _tmp5_ = NULL;
@@ -4527,17 +4536,17 @@ 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 4531 "Photo.c"
+#line 4540 "Photo.c"
 			}
 		}
-		__finally256:
+		__finally257:
 		{
 			PhotoBackingReaders* _tmp6_ = NULL;
 #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 4541 "Photo.c"
+#line 4550 "Photo.c"
 		}
 #line 518 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -4547,7 +4556,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 FALSE;
-#line 4551 "Photo.c"
+#line 4560 "Photo.c"
 		}
 	}
 #line 523 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4556,12 +4565,12 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 	_tmp7_ = photo_get_master_file_format (self);
 #line 525 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_ == PHOTO_FILE_FORMAT_RAW) {
-#line 4560 "Photo.c"
+#line 4569 "Photo.c"
 		gint _tmp8_ = 0;
 		RawDeveloper* _tmp9_ = NULL;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = raw_developer_as_array (&_tmp8_);
-#line 4565 "Photo.c"
+#line 4574 "Photo.c"
 		{
 			RawDeveloper* d_collection = NULL;
 			gint d_collection_length1 = 0;
@@ -4573,30 +4582,30 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			d_collection_length1 = _tmp8_;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (d_it = 0; d_it < _tmp8_; d_it = d_it + 1) {
-#line 4577 "Photo.c"
+#line 4586 "Photo.c"
 				RawDeveloper d = 0;
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 				d = d_collection[d_it];
-#line 4581 "Photo.c"
+#line 4590 "Photo.c"
 				{
 					RawDeveloper _tmp10_ = 0;
 #line 527 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = d;
 #line 527 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_delete_raw_development (self, _tmp10_);
-#line 4588 "Photo.c"
+#line 4597 "Photo.c"
 				}
 			}
 #line 526 "/home/jens/Source/shotwell/src/Photo.vala"
 			d_collection = (g_free (d_collection), NULL);
-#line 4593 "Photo.c"
+#line 4602 "Photo.c"
 		}
 	}
 #line 531 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = file;
 #line 531 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ != NULL) {
-#line 4600 "Photo.c"
+#line 4609 "Photo.c"
 		{
 			gboolean _tmp12_ = FALSE;
 			GFile* _tmp13_ = NULL;
@@ -4609,15 +4618,15 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_tmp12_ = _tmp14_;
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4613 "Photo.c"
-				goto __catch257_g_error;
+#line 4622 "Photo.c"
+				goto __catch258_g_error;
 			}
 #line 533 "/home/jens/Source/shotwell/src/Photo.vala"
 			ret = _tmp12_;
-#line 4618 "Photo.c"
+#line 4627 "Photo.c"
 		}
-		goto __finally257;
-		__catch257_g_error:
+		goto __finally258;
+		__catch258_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp15_ = NULL;
@@ -4655,9 +4664,9 @@ static gboolean photo_real_internal_delete_backing (DataSource* base, GError** e
 			_g_free0 (_tmp17_);
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 4659 "Photo.c"
+#line 4668 "Photo.c"
 		}
-		__finally257:
+		__finally258:
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 532 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4666,7 +4675,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 FALSE;
-#line 4670 "Photo.c"
+#line 4679 "Photo.c"
 		}
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4681,21 +4690,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 FALSE;
-#line 4685 "Photo.c"
+#line 4694 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 4689 "Photo.c"
+#line 4698 "Photo.c"
 		gboolean _tmp25_ = FALSE;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = ret;
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp25_;
-#line 4695 "Photo.c"
+#line 4704 "Photo.c"
 	} else {
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = FALSE;
-#line 4699 "Photo.c"
+#line 4708 "Photo.c"
 	}
 #line 542 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp22_;
@@ -4703,7 +4712,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 4707 "Photo.c"
+#line 4716 "Photo.c"
 }
 
 
@@ -4728,11 +4737,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 4732 "Photo.c"
+#line 4741 "Photo.c"
 	}
 #line 551 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_row = NULL;
-#line 4736 "Photo.c"
+#line 4745 "Photo.c"
 	{
 		BackingPhotoRow* _tmp2_ = NULL;
 		BackingPhotoTable* _tmp3_ = NULL;
@@ -4759,8 +4768,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 4763 "Photo.c"
-				goto __catch258_database_error;
+#line 4772 "Photo.c"
+				goto __catch259_database_error;
 			}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing_row);
@@ -4770,7 +4779,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 4774 "Photo.c"
+#line 4783 "Photo.c"
 		}
 #line 553 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp2_;
@@ -4782,10 +4791,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 4786 "Photo.c"
+#line 4795 "Photo.c"
 	}
-	goto __finally258;
-	__catch258_database_error:
+	goto __finally259;
+	__catch259_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
@@ -4810,9 +4819,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 4814 "Photo.c"
+#line 4823 "Photo.c"
 	}
-	__finally258:
+	__finally259:
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 552 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4823,13 +4832,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 4827 "Photo.c"
+#line 4836 "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 4833 "Photo.c"
+#line 4842 "Photo.c"
 		{
 			BackingPhotoTable* _tmp14_ = NULL;
 			BackingPhotoTable* _tmp15_ = NULL;
@@ -4848,8 +4857,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 4852 "Photo.c"
-					goto __catch259_database_error;
+#line 4861 "Photo.c"
+					goto __catch260_database_error;
 				}
 #line 560 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing_row);
@@ -4859,11 +4868,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 4863 "Photo.c"
+#line 4872 "Photo.c"
 			}
 		}
-		goto __finally259;
-		__catch259_database_error:
+		goto __finally260;
+		__catch260_database_error:
 		{
 			GError* err = NULL;
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4872,9 +4881,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 4876 "Photo.c"
+#line 4885 "Photo.c"
 		}
-		__finally259:
+		__finally260:
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 559 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -4885,7 +4894,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 4889 "Photo.c"
+#line 4898 "Photo.c"
 		}
 #line 564 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
@@ -4893,13 +4902,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 4897 "Photo.c"
+#line 4906 "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 4903 "Photo.c"
+#line 4912 "Photo.c"
 }
 
 
@@ -4908,14 +4917,14 @@ 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 4912 "Photo.c"
+#line 4921 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
 #line 573 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 4919 "Photo.c"
+#line 4928 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			GeeHashMap* _tmp2_ = NULL;
@@ -4929,7 +4938,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 4933 "Photo.c"
+#line 4942 "Photo.c"
 				GeeHashMap* _tmp5_ = NULL;
 				RawDeveloper _tmp6_ = 0;
 				gpointer _tmp7_ = NULL;
@@ -4952,35 +4961,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 4956 "Photo.c"
+#line 4965 "Photo.c"
 			} else {
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 4960 "Photo.c"
+#line 4969 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 4964 "Photo.c"
+#line 4973 "Photo.c"
 			{
 				GeeHashMap* _tmp11_ = NULL;
 #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 4971 "Photo.c"
+#line 4980 "Photo.c"
 			}
 #line 574 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 4975 "Photo.c"
+#line 4984 "Photo.c"
 		}
-		__finally260:
+		__finally261:
 		{
 			GeeHashMap* _tmp12_ = NULL;
 #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 4984 "Photo.c"
+#line 4993 "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);
@@ -4988,7 +4997,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 FALSE;
-#line 4992 "Photo.c"
+#line 5001 "Photo.c"
 	}
 }
 
@@ -4999,14 +5008,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 5003 "Photo.c"
+#line 5012 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
 #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 5010 "Photo.c"
+#line 5019 "Photo.c"
 		{
 			GeeHashMap* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -5021,28 +5030,28 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 			if (_tmp3_) {
 #line 583 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = TRUE;
-#line 5025 "Photo.c"
+#line 5034 "Photo.c"
 				{
 					GeeHashMap* _tmp4_ = NULL;
 #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 5032 "Photo.c"
+#line 5041 "Photo.c"
 				}
 #line 583 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 5036 "Photo.c"
+#line 5045 "Photo.c"
 			}
 		}
-		__finally261:
+		__finally262:
 		{
 			GeeHashMap* _tmp5_ = NULL;
 #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 5046 "Photo.c"
+#line 5055 "Photo.c"
 		}
 #line 581 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5052,7 +5061,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 FALSE;
-#line 5056 "Photo.c"
+#line 5065 "Photo.c"
 		}
 	}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5061,27 +5070,27 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 	switch (_tmp6_) {
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 5065 "Photo.c"
+#line 5074 "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 5071 "Photo.c"
+#line 5080 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 5075 "Photo.c"
+#line 5084 "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 5081 "Photo.c"
+#line 5090 "Photo.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 5085 "Photo.c"
+#line 5094 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
@@ -5096,8 +5105,8 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				meta = _tmp7_;
 #line 595 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5100 "Photo.c"
-					goto __catch262_g_error;
+#line 5109 "Photo.c"
+					goto __catch263_g_error;
 				}
 #line 596 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = meta;
@@ -5109,7 +5118,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				_tmp10_ = num_previews;
 #line 598 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_ > ((guint) 0)) {
-#line 5113 "Photo.c"
+#line 5122 "Photo.c"
 					PhotoPreview* prev = NULL;
 					PhotoMetadata* _tmp11_ = NULL;
 					guint _tmp12_ = 0U;
@@ -5145,7 +5154,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 5149 "Photo.c"
+#line 5158 "Photo.c"
 					}
 #line 605 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = prev;
@@ -5163,7 +5172,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 					_tmp21_ = _tmp20_.height;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp19_ > _tmp21_) {
-#line 5167 "Photo.c"
+#line 5176 "Photo.c"
 						Dimensions _tmp22_ = {0};
 						gint _tmp23_ = 0;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5172,7 +5181,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_tmp23_ = _tmp22_.width;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp17_ = _tmp23_;
-#line 5176 "Photo.c"
+#line 5185 "Photo.c"
 					} else {
 						Dimensions _tmp24_ = {0};
 						gint _tmp25_ = 0;
@@ -5182,7 +5191,7 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 						_tmp25_ = _tmp24_.height;
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp17_ = _tmp25_;
-#line 5186 "Photo.c"
+#line 5195 "Photo.c"
 					}
 #line 608 "/home/jens/Source/shotwell/src/Photo.vala"
 					preview_major_axis = _tmp17_;
@@ -5198,7 +5207,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 5202 "Photo.c"
+#line 5211 "Photo.c"
 					}
 #line 613 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
@@ -5208,7 +5217,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 5212 "Photo.c"
+#line 5221 "Photo.c"
 				}
 #line 617 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
@@ -5216,10 +5225,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 5220 "Photo.c"
+#line 5229 "Photo.c"
 			}
-			goto __finally262;
-			__catch262_g_error:
+			goto __finally263;
+			__catch263_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp27_ = NULL;
@@ -5236,9 +5245,9 @@ gboolean photo_is_raw_developer_available (Photo* self, RawDeveloper d) {
 				g_debug ("Photo.vala:619: Error accessing embedded preview. Message: %s", _tmp28_);
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 5240 "Photo.c"
+#line 5249 "Photo.c"
 			}
-			__finally262:
+			__finally263:
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 594 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5247,19 +5256,19 @@ 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 FALSE;
-#line 5251 "Photo.c"
+#line 5260 "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 5257 "Photo.c"
+#line 5266 "Photo.c"
 		}
 		default:
 		{
 #line 624 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 5263 "Photo.c"
+#line 5272 "Photo.c"
 		}
 	}
 }
@@ -5290,7 +5299,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 5294 "Photo.c"
+#line 5303 "Photo.c"
 	}
 	{
 		GeeHashMap* _tmp3_ = NULL;
@@ -5298,7 +5307,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 5302 "Photo.c"
+#line 5311 "Photo.c"
 		{
 			GeeHashMap* _tmp4_ = NULL;
 			RawDeveloper _tmp5_ = 0;
@@ -5311,16 +5320,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 5315 "Photo.c"
+#line 5324 "Photo.c"
 		}
-		__finally263:
+		__finally264:
 		{
 			GeeHashMap* _tmp7_ = NULL;
 #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 5324 "Photo.c"
+#line 5333 "Photo.c"
 		}
 #line 633 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5328,7 +5337,7 @@ 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 5332 "Photo.c"
+#line 5341 "Photo.c"
 		}
 	}
 #line 636 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5339,7 +5348,7 @@ void photo_add_backing_photo_for_development (Photo* self, RawDeveloper d, Backi
 	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 5343 "Photo.c"
+#line 5352 "Photo.c"
 }
 
 
@@ -5412,7 +5421,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 642 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5416 "Photo.c"
+#line 5425 "Photo.c"
 	}
 #line 644 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = info;
@@ -5442,7 +5451,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 648 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5446 "Photo.c"
+#line 5455 "Photo.c"
 	}
 #line 650 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = interrogator;
@@ -5456,7 +5465,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 	if (_tmp13_ == NULL) {
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 5460 "Photo.c"
+#line 5469 "Photo.c"
 	} else {
 		PhotoFileInterrogator* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
@@ -5466,7 +5475,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_tmp15_ = photo_file_interrogator_get_is_photo_corrupted (_tmp14_);
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp15_;
-#line 5470 "Photo.c"
+#line 5479 "Photo.c"
 	}
 #line 651 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
@@ -5480,7 +5489,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 654 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5484 "Photo.c"
+#line 5493 "Photo.c"
 	}
 #line 657 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = bpr;
@@ -5512,7 +5521,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 	_tmp27_ = _tmp26_->metadata;
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp27_ != NULL) {
-#line 5516 "Photo.c"
+#line 5525 "Photo.c"
 		DetectedPhotoInformation* _tmp28_ = NULL;
 		PhotoMetadata* _tmp29_ = NULL;
 		Orientation _tmp30_ = 0;
@@ -5524,11 +5533,11 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_tmp30_ = photo_metadata_get_orientation (_tmp29_);
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp30_;
-#line 5528 "Photo.c"
+#line 5537 "Photo.c"
 	} else {
 #line 661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = ORIENTATION_TOP_LEFT;
-#line 5532 "Photo.c"
+#line 5541 "Photo.c"
 	}
 #line 660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = bpr;
@@ -5558,7 +5567,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 664 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5562 "Photo.c"
+#line 5571 "Photo.c"
 	}
 #line 665 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_table_get_instance ();
@@ -5590,7 +5599,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 		_g_object_unref0 (file);
 #line 665 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 5594 "Photo.c"
+#line 5603 "Photo.c"
 	}
 #line 639 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
@@ -5600,7 +5609,7 @@ void photo_import_developed_backing_photo (PhotoRow* row, RawDeveloper d, Backin
 	_g_object_unref0 (info);
 #line 639 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 5604 "Photo.c"
+#line 5613 "Photo.c"
 }
 
 
@@ -5621,7 +5630,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 	switch (_tmp0_) {
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 5625 "Photo.c"
+#line 5634 "Photo.c"
 		{
 			{
 				BackingPhotoRow* _tmp1_ = NULL;
@@ -5661,8 +5670,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_tmp1_ = _tmp6_;
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5665 "Photo.c"
-					goto __catch264_g_error;
+#line 5674 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 678 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp1_;
@@ -5674,14 +5683,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				bps = _tmp7_;
 #line 679 "/home/jens/Source/shotwell/src/Photo.vala"
 				pix = NULL;
-#line 5678 "Photo.c"
+#line 5687 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp8_ = NULL;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = self->priv->readers;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 5685 "Photo.c"
+#line 5694 "Photo.c"
 					{
 						GdkPixbuf* _tmp9_ = NULL;
 						Scaling _tmp10_ = {0};
@@ -5695,8 +5704,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						_tmp9_ = _tmp11_;
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5699 "Photo.c"
-							goto __finally265;
+#line 5708 "Photo.c"
+							goto __finally266;
 						}
 #line 685 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp12_ = _tmp9_;
@@ -5708,16 +5717,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						pix = _tmp12_;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_tmp9_);
-#line 5712 "Photo.c"
+#line 5721 "Photo.c"
 					}
-					__finally265:
+					__finally266:
 					{
 						PhotoBackingReaders* _tmp13_ = NULL;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = self->priv->readers;
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 5721 "Photo.c"
+#line 5730 "Photo.c"
 					}
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -5725,8 +5734,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						_g_object_unref0 (pix);
 #line 680 "/home/jens/Source/shotwell/src/Photo.vala"
 						_backing_photo_row_unref0 (_tmp1_);
-#line 5729 "Photo.c"
-						goto __catch264_g_error;
+#line 5738 "Photo.c"
+						goto __catch265_g_error;
 					}
 				}
 #line 688 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5739,14 +5748,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 690 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5743 "Photo.c"
+#line 5752 "Photo.c"
 					{
 						gboolean _tmp15_ = FALSE;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = wrote_img_to_disk;
 #line 714 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp15_) {
-#line 5750 "Photo.c"
+#line 5759 "Photo.c"
 							{
 								RawDeveloper _tmp16_ = 0;
 								BackingPhotoRow* _tmp17_ = NULL;
@@ -5758,15 +5767,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp16_, _tmp17_, &_inner_error_);
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5762 "Photo.c"
-									goto __catch266_g_error;
+#line 5771 "Photo.c"
+									goto __catch267_g_error;
 								}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 5767 "Photo.c"
+#line 5776 "Photo.c"
 							}
-							goto __finally266;
-							__catch266_g_error:
+							goto __finally267;
+							__catch267_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp18_ = NULL;
@@ -5783,13 +5792,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp19_);
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 5787 "Photo.c"
+#line 5796 "Photo.c"
 							}
-							__finally266:
+							__finally267:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5792 "Photo.c"
-								goto __catch264_g_error;
+#line 5801 "Photo.c"
+								goto __catch265_g_error;
 							}
 						}
 					}
@@ -5797,7 +5806,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 690 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 5801 "Photo.c"
+#line 5810 "Photo.c"
 				}
 #line 694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = bps;
@@ -5813,8 +5822,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 694 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5817 "Photo.c"
-					goto __catch264_g_error;
+#line 5826 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 695 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = writer;
@@ -5830,8 +5839,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 695 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5834 "Photo.c"
-					goto __catch264_g_error;
+#line 5843 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 703 "/home/jens/Source/shotwell/src/Photo.vala"
 				wrote_img_to_disk = TRUE;
@@ -5847,8 +5856,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 708 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5851 "Photo.c"
-					goto __catch264_g_error;
+#line 5860 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 709 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = bps;
@@ -5868,8 +5877,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 709 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5872 "Photo.c"
-					goto __catch264_g_error;
+#line 5881 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = mwriter;
@@ -5889,8 +5898,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_g_object_unref0 (pix);
 #line 710 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp1_);
-#line 5893 "Photo.c"
-					goto __catch264_g_error;
+#line 5902 "Photo.c"
+					goto __catch265_g_error;
 				}
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
@@ -5902,10 +5911,10 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_g_object_unref0 (pix);
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
-#line 5906 "Photo.c"
+#line 5915 "Photo.c"
 			}
-			goto __finally264;
-			__catch264_g_error:
+			goto __finally265;
+			__catch265_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp31_ = NULL;
@@ -5922,16 +5931,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_debug ("Photo.vala:712: Error developing photo: %s", _tmp32_);
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 5926 "Photo.c"
+#line 5935 "Photo.c"
 			}
-			__finally264:
+			__finally265:
 			{
 				gboolean _tmp33_ = FALSE;
 #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 5935 "Photo.c"
+#line 5944 "Photo.c"
 					{
 						RawDeveloper _tmp34_ = 0;
 						BackingPhotoRow* _tmp35_ = NULL;
@@ -5943,15 +5952,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						photo_add_backing_photo_for_development (self, _tmp34_, _tmp35_, &_inner_error_);
 #line 717 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5947 "Photo.c"
-							goto __catch267_g_error;
+#line 5956 "Photo.c"
+							goto __catch268_g_error;
 						}
 #line 719 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 5952 "Photo.c"
+#line 5961 "Photo.c"
 					}
-					goto __finally267;
-					__catch267_g_error:
+					goto __finally268;
+					__catch268_g_error:
 					{
 						GError* e = NULL;
 						GError* _tmp36_ = NULL;
@@ -5968,9 +5977,9 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_debug ("Photo.vala:721: Error adding backing photo as development. Message: %s", _tmp37_);
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_error_free0 (e);
-#line 5972 "Photo.c"
+#line 5981 "Photo.c"
 					}
-					__finally267:
+					__finally268:
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -5981,7 +5990,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_clear_error (&_inner_error_);
 #line 715 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 5985 "Photo.c"
+#line 5994 "Photo.c"
 					}
 				}
 			}
@@ -5995,23 +6004,23 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 676 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 5999 "Photo.c"
+#line 6008 "Photo.c"
 			}
 #line 727 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6003 "Photo.c"
+#line 6012 "Photo.c"
 		}
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 6007 "Photo.c"
+#line 6016 "Photo.c"
 		{
 #line 731 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6011 "Photo.c"
+#line 6020 "Photo.c"
 		}
 #line 674 "/home/jens/Source/shotwell/src/Photo.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 6015 "Photo.c"
+#line 6024 "Photo.c"
 		{
 			{
 				PhotoMetadata* meta = NULL;
@@ -6054,8 +6063,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				meta = _tmp38_;
 #line 736 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6058 "Photo.c"
-					goto __catch268_g_error;
+#line 6067 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 737 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = meta;
@@ -6069,14 +6078,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				if (_tmp41_ <= ((guint) 0)) {
 #line 739 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6073 "Photo.c"
+#line 6082 "Photo.c"
 					{
 						gboolean _tmp42_ = FALSE;
 #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 6080 "Photo.c"
+#line 6089 "Photo.c"
 							{
 								RawDeveloper _tmp43_ = 0;
 								BackingPhotoRow* _tmp44_ = NULL;
@@ -6088,15 +6097,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp43_, _tmp44_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6092 "Photo.c"
-									goto __catch269_g_error;
+#line 6101 "Photo.c"
+									goto __catch270_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6097 "Photo.c"
+#line 6106 "Photo.c"
 							}
-							goto __finally269;
-							__catch269_g_error:
+							goto __finally270;
+							__catch270_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp45_ = NULL;
@@ -6113,13 +6122,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp46_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6117 "Photo.c"
+#line 6126 "Photo.c"
 							}
-							__finally269:
+							__finally270:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6122 "Photo.c"
-								goto __catch268_g_error;
+#line 6131 "Photo.c"
+								goto __catch269_g_error;
 							}
 						}
 					}
@@ -6127,7 +6136,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 739 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6131 "Photo.c"
+#line 6140 "Photo.c"
 				}
 #line 740 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = meta;
@@ -6147,14 +6156,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 743 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6151 "Photo.c"
+#line 6160 "Photo.c"
 					{
 						gboolean _tmp51_ = FALSE;
 #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 6158 "Photo.c"
+#line 6167 "Photo.c"
 							{
 								RawDeveloper _tmp52_ = 0;
 								BackingPhotoRow* _tmp53_ = NULL;
@@ -6166,15 +6175,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp52_, _tmp53_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6170 "Photo.c"
-									goto __catch270_g_error;
+#line 6179 "Photo.c"
+									goto __catch271_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6175 "Photo.c"
+#line 6184 "Photo.c"
 							}
-							goto __finally270;
-							__catch270_g_error:
+							goto __finally271;
+							__catch271_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp54_ = NULL;
@@ -6191,13 +6200,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp55_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6195 "Photo.c"
+#line 6204 "Photo.c"
 							}
-							__finally270:
+							__finally271:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6200 "Photo.c"
-								goto __catch268_g_error;
+#line 6209 "Photo.c"
+								goto __catch269_g_error;
 							}
 						}
 					}
@@ -6205,7 +6214,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 743 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6209 "Photo.c"
+#line 6218 "Photo.c"
 				}
 #line 746 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = prev;
@@ -6219,8 +6228,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 746 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6223 "Photo.c"
-					goto __catch268_g_error;
+#line 6232 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 747 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = pix;
@@ -6234,14 +6243,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 749 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6238 "Photo.c"
+#line 6247 "Photo.c"
 					{
 						gboolean _tmp59_ = FALSE;
 #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 6245 "Photo.c"
+#line 6254 "Photo.c"
 							{
 								RawDeveloper _tmp60_ = 0;
 								BackingPhotoRow* _tmp61_ = NULL;
@@ -6253,15 +6262,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								photo_add_backing_photo_for_development (self, _tmp60_, _tmp61_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6257 "Photo.c"
-									goto __catch271_g_error;
+#line 6266 "Photo.c"
+									goto __catch272_g_error;
 								}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 								photo_notify_raw_development_modified (self);
-#line 6262 "Photo.c"
+#line 6271 "Photo.c"
 							}
-							goto __finally271;
-							__catch271_g_error:
+							goto __finally272;
+							__catch272_g_error:
 							{
 								GError* e = NULL;
 								GError* _tmp62_ = NULL;
@@ -6278,13 +6287,13 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 								g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp63_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_error_free0 (e);
-#line 6282 "Photo.c"
+#line 6291 "Photo.c"
 							}
-							__finally271:
+							__finally272:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6287 "Photo.c"
-								goto __catch268_g_error;
+#line 6296 "Photo.c"
+								goto __catch269_g_error;
 							}
 						}
 					}
@@ -6292,7 +6301,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_backing_photo_row_unref0 (bps);
 #line 749 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 6296 "Photo.c"
+#line 6305 "Photo.c"
 				}
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = d;
@@ -6314,8 +6323,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6318 "Photo.c"
-					goto __catch268_g_error;
+#line 6327 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 753 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp70_ = _tmp64_;
@@ -6343,8 +6352,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 754 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6347 "Photo.c"
-					goto __catch268_g_error;
+#line 6356 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = writer;
@@ -6364,8 +6373,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 755 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6368 "Photo.c"
-					goto __catch268_g_error;
+#line 6377 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 759 "/home/jens/Source/shotwell/src/Photo.vala"
 				wrote_img_to_disk = TRUE;
@@ -6389,8 +6398,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 762 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6393 "Photo.c"
-					goto __catch268_g_error;
+#line 6402 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 763 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp79_ = mwriter;
@@ -6412,8 +6421,8 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 					_photo_preview_unref0 (prev);
 #line 763 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (meta);
-#line 6416 "Photo.c"
-					goto __catch268_g_error;
+#line 6425 "Photo.c"
+					goto __catch269_g_error;
 				}
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (mwriter);
@@ -6427,10 +6436,10 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_photo_preview_unref0 (prev);
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				_media_metadata_unref0 (meta);
-#line 6431 "Photo.c"
+#line 6440 "Photo.c"
 			}
-			goto __finally268;
-			__catch268_g_error:
+			goto __finally269;
+			__catch269_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp81_ = NULL;
@@ -6447,14 +6456,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_debug ("Photo.vala:765: Error accessing embedded preview. Message: %s", _tmp82_);
 #line 766 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 6451 "Photo.c"
+#line 6460 "Photo.c"
 				{
 					gboolean _tmp83_ = FALSE;
 #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 6458 "Photo.c"
+#line 6467 "Photo.c"
 						{
 							RawDeveloper _tmp84_ = 0;
 							BackingPhotoRow* _tmp85_ = NULL;
@@ -6466,15 +6475,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 							photo_add_backing_photo_for_development (self, _tmp84_, _tmp85_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6470 "Photo.c"
-								goto __catch272_g_error;
+#line 6479 "Photo.c"
+								goto __catch273_g_error;
 							}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_notify_raw_development_modified (self);
-#line 6475 "Photo.c"
+#line 6484 "Photo.c"
 						}
-						goto __finally272;
-						__catch272_g_error:
+						goto __finally273;
+						__catch273_g_error:
 						{
 							GError* e = NULL;
 							GError* _tmp86_ = NULL;
@@ -6491,14 +6500,14 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 							g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp87_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_error_free0 (e);
-#line 6495 "Photo.c"
+#line 6504 "Photo.c"
 						}
-						__finally272:
+						__finally273:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (bps);
-#line 6502 "Photo.c"
+#line 6511 "Photo.c"
 						}
 					}
 				}
@@ -6506,16 +6515,16 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				_backing_photo_row_unref0 (bps);
 #line 766 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6510 "Photo.c"
+#line 6519 "Photo.c"
 			}
-			__finally268:
+			__finally269:
 			{
 				gboolean _tmp88_ = FALSE;
 #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 6519 "Photo.c"
+#line 6528 "Photo.c"
 					{
 						RawDeveloper _tmp89_ = 0;
 						BackingPhotoRow* _tmp90_ = NULL;
@@ -6527,15 +6536,15 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						photo_add_backing_photo_for_development (self, _tmp89_, _tmp90_, &_inner_error_);
 #line 771 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6531 "Photo.c"
-							goto __catch273_g_error;
+#line 6540 "Photo.c"
+							goto __catch274_g_error;
 						}
 #line 773 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_notify_raw_development_modified (self);
-#line 6536 "Photo.c"
+#line 6545 "Photo.c"
 					}
-					goto __finally273;
-					__catch273_g_error:
+					goto __finally274;
+					__catch274_g_error:
 					{
 						GError* e = NULL;
 						GError* _tmp91_ = NULL;
@@ -6552,9 +6561,9 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_debug ("Photo.vala:775: Error adding backing photo as development. Message: %s", _tmp92_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_error_free0 (e);
-#line 6556 "Photo.c"
+#line 6565 "Photo.c"
 					}
-					__finally273:
+					__finally274:
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -6565,7 +6574,7 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 						g_clear_error (&_inner_error_);
 #line 769 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 6569 "Photo.c"
+#line 6578 "Photo.c"
 					}
 				}
 			}
@@ -6579,22 +6588,22 @@ static void photo_develop_photo (Photo* self, RawDeveloper d) {
 				g_clear_error (&_inner_error_);
 #line 734 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6583 "Photo.c"
+#line 6592 "Photo.c"
 			}
 #line 780 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 6587 "Photo.c"
+#line 6596 "Photo.c"
 		}
 		default:
 		{
 #line 783 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_assert_not_reached ();
-#line 6593 "Photo.c"
+#line 6602 "Photo.c"
 		}
 	}
 #line 670 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (bps);
-#line 6598 "Photo.c"
+#line 6607 "Photo.c"
 }
 
 
@@ -6602,14 +6611,14 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
 #line 788 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 6606 "Photo.c"
+#line 6615 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 6613 "Photo.c"
+#line 6622 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -6619,16 +6628,16 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp2_ = d;
 #line 790 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_->developer = _tmp2_;
-#line 6623 "Photo.c"
+#line 6632 "Photo.c"
 		}
-		__finally274:
+		__finally275:
 		{
 			PhotoRow* _tmp3_ = NULL;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 6632 "Photo.c"
+#line 6641 "Photo.c"
 		}
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6638,7 +6647,7 @@ void photo_set_default_raw_developer (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 789 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 6642 "Photo.c"
+#line 6651 "Photo.c"
 		}
 	}
 }
@@ -6660,29 +6669,29 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
 #line 797 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 6664 "Photo.c"
+#line 6673 "Photo.c"
 	}
 #line 802 "/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"
 	if (_tmp2_) {
-#line 6670 "Photo.c"
+#line 6679 "Photo.c"
 		RawDeveloper _tmp3_ = 0;
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = d;
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED;
-#line 6676 "Photo.c"
+#line 6685 "Photo.c"
 	} else {
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 6680 "Photo.c"
+#line 6689 "Photo.c"
 	}
 #line 802 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
 #line 803 "/home/jens/Source/shotwell/src/Photo.vala"
 		d = RAW_DEVELOPER_CAMERA;
-#line 6686 "Photo.c"
+#line 6695 "Photo.c"
 	}
 #line 807 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_is_raw_developer_available (self, RAW_DEVELOPER_EMBEDDED);
@@ -6690,7 +6699,7 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 	if (!_tmp4_) {
 #line 808 "/home/jens/Source/shotwell/src/Photo.vala"
 		d = RAW_DEVELOPER_SHOTWELL;
-#line 6694 "Photo.c"
+#line 6703 "Photo.c"
 	}
 	{
 		GeeHashMap* _tmp5_ = NULL;
@@ -6698,27 +6707,27 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 		_tmp5_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 6702 "Photo.c"
+#line 6711 "Photo.c"
 		{
 			RawDeveloper stale_raw_developer = 0;
 			PhotoRow* _tmp6_ = NULL;
 			RawDeveloper _tmp7_ = 0;
 			RawDeveloper _tmp8_ = 0;
 			gboolean _tmp9_ = FALSE;
-			GeeHashMap* _tmp15_ = NULL;
+			GeeHashMap* _tmp11_ = NULL;
+			RawDeveloper _tmp12_ = 0;
+			gboolean _tmp13_ = FALSE;
+			PhotoRow* _tmp15_ = NULL;
 			RawDeveloper _tmp16_ = 0;
-			gboolean _tmp17_ = FALSE;
-			PhotoRow* _tmp19_ = NULL;
-			RawDeveloper _tmp20_ = 0;
-			GeeHashMap* _tmp21_ = NULL;
-			RawDeveloper _tmp22_ = 0;
-			gpointer _tmp23_ = NULL;
-			PhotoBackingReaders* _tmp24_ = NULL;
-			BackingPhotoRow* _tmp25_ = NULL;
-			PhotoFileFormat _tmp26_ = 0;
-			BackingPhotoRow* _tmp27_ = NULL;
-			const gchar* _tmp28_ = NULL;
-			PhotoFileReader* _tmp29_ = NULL;
+			GeeHashMap* _tmp17_ = NULL;
+			RawDeveloper _tmp18_ = 0;
+			gpointer _tmp19_ = NULL;
+			PhotoBackingReaders* _tmp20_ = NULL;
+			BackingPhotoRow* _tmp21_ = NULL;
+			PhotoFileFormat _tmp22_ = 0;
+			BackingPhotoRow* _tmp23_ = NULL;
+			const gchar* _tmp24_ = NULL;
+			PhotoFileReader* _tmp25_ = NULL;
 			BackingPhotoRow* _tmp30_ = NULL;
 			Orientation _tmp31_ = 0;
 			gboolean _tmp41_ = FALSE;
@@ -6735,134 +6744,135 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			_tmp9_ = photo_is_raw_developer_complete (self, _tmp8_);
 #line 814 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp9_) {
-#line 6739 "Photo.c"
+#line 6748 "Photo.c"
 				RawDeveloper _tmp10_ = 0;
 #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 6745 "Photo.c"
-				{
-					GdkPixbuf* _tmp11_ = NULL;
-					GdkPixbuf* _tmp12_ = NULL;
+#line 6754 "Photo.c"
+			}
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp11_ = photo_get_prefetched_copy (self, &_inner_error_);
+			_tmp11_ = self->priv->developments;
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp12_ = _tmp11_;
+			_tmp12_ = d;
 #line 817 "/home/jens/Source/shotwell/src/Photo.vala"
-					_g_object_unref0 (_tmp12_);
+			_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 (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6757 "Photo.c"
-						goto __catch276_g_error;
-					}
-				}
-				goto __finally276;
-				__catch276_g_error:
+			if (!_tmp13_) {
+#line 6764 "Photo.c"
 				{
-					GError* e = NULL;
-#line 816 "/home/jens/Source/shotwell/src/Photo.vala"
-					e = _inner_error_;
-#line 816 "/home/jens/Source/shotwell/src/Photo.vala"
-					_inner_error_ = NULL;
-#line 820 "/home/jens/Source/shotwell/src/Photo.vala"
-					_g_error_free0 (e);
-#line 6771 "Photo.c"
-					{
-						GeeHashMap* _tmp13_ = NULL;
+					GeeHashMap* _tmp14_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp13_ = self->priv->developments;
+					_tmp14_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-						g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6778 "Photo.c"
-					}
-#line 820 "/home/jens/Source/shotwell/src/Photo.vala"
-					return;
-#line 6782 "Photo.c"
+					g_rec_mutex_unlock (&self->priv->__lock_developments);
+#line 6771 "Photo.c"
 				}
-				__finally276:
-#line 816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 818 "/home/jens/Source/shotwell/src/Photo.vala"
+				return;
+#line 6775 "Photo.c"
+			}
+#line 821 "/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"
+			_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 6811 "Photo.c"
+			{
+				GdkPixbuf* _tmp26_ = NULL;
+				GdkPixbuf* _tmp27_ = NULL;
+#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"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6787 "Photo.c"
-					{
-						GeeHashMap* _tmp14_ = NULL;
+#line 6823 "Photo.c"
+					goto __catch277_g_error;
+				}
+			}
+			goto __finally277;
+			__catch277_g_error:
+			{
+				GError* e = NULL;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+				e = _inner_error_;
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+				_inner_error_ = NULL;
+#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
+				_g_error_free0 (e);
+#line 6837 "Photo.c"
+				{
+					GeeHashMap* _tmp28_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-						_tmp14_ = self->priv->developments;
+					_tmp28_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-						g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6794 "Photo.c"
-					}
-#line 816 "/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 816 "/home/jens/Source/shotwell/src/Photo.vala"
-					g_clear_error (&_inner_error_);
-#line 816 "/home/jens/Source/shotwell/src/Photo.vala"
-					return;
-#line 6802 "Photo.c"
+					g_rec_mutex_unlock (&self->priv->__lock_developments);
+#line 6844 "Photo.c"
 				}
+#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
+				return;
+#line 6848 "Photo.c"
 			}
-#line 823 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp15_ = self->priv->developments;
-#line 823 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp16_ = d;
-#line 823 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp17_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp16_));
-#line 823 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (!_tmp17_) {
-#line 6813 "Photo.c"
+			__finally277:
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 6853 "Photo.c"
 				{
-					GeeHashMap* _tmp18_ = NULL;
+					GeeHashMap* _tmp29_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
-					_tmp18_ = self->priv->developments;
+					_tmp29_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6820 "Photo.c"
+#line 6860 "Photo.c"
 				}
-#line 824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 828 "/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"
+				g_clear_error (&_inner_error_);
+#line 828 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6824 "Photo.c"
+#line 6868 "Photo.c"
 			}
-#line 827 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo_revert_to_master (self, FALSE);
-#line 830 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp19_ = self->row;
-#line 830 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp20_ = d;
-#line 830 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp19_->developer = _tmp20_;
-#line 831 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp21_ = self->priv->developments;
-#line 831 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp22_ = d;
-#line 831 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp23_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp22_));
-#line 831 "/home/jens/Source/shotwell/src/Photo.vala"
-			_backing_photo_row_unref0 (self->backing_photo_row);
-#line 831 "/home/jens/Source/shotwell/src/Photo.vala"
-			self->backing_photo_row = (BackingPhotoRow*) _tmp23_;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp24_ = self->priv->readers;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp25_ = self->backing_photo_row;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp26_ = _tmp25_->file_format;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp27_ = self->backing_photo_row;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp28_ = _tmp27_->filepath;
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp29_ = photo_file_format_create_reader (_tmp26_, _tmp28_);
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_photo_file_adapter_unref0 (_tmp24_->developer);
-#line 832 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp24_->developer = _tmp29_;
-#line 834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp30_ = self->backing_photo_row;
-#line 834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = _tmp30_->original_orientation;
-#line 834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 835 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_orientation (self, _tmp31_);
-#line 6866 "Photo.c"
+#line 6876 "Photo.c"
 			{
 				PhotoTable* _tmp32_ = NULL;
 				PhotoTable* _tmp33_ = NULL;
@@ -6870,109 +6880,109 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 				RawDeveloper _tmp35_ = 0;
 				BackingPhotoRow* _tmp36_ = NULL;
 				BackingPhotoID _tmp37_ = {0};
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = photo_table_get_instance ();
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = _tmp32_;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = self->row;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = d;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = self->backing_photo_row;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_->id;
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_update_raw_development (_tmp33_, _tmp34_, _tmp35_, &_tmp37_, &_inner_error_);
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp33_);
-#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 838 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6892 "Photo.c"
-					goto __catch277_g_error;
+#line 6902 "Photo.c"
+					goto __catch278_g_error;
 				}
 			}
-			goto __finally277;
-			__catch277_g_error:
+			goto __finally278;
+			__catch278_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp38_ = NULL;
 				const gchar* _tmp39_ = NULL;
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 840 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = e;
-#line 839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 840 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = _tmp38_->message;
-#line 839 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_warning ("Photo.vala:839: Error updating database: %s", _tmp39_);
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 				_g_error_free0 (e);
-#line 6914 "Photo.c"
+#line 6924 "Photo.c"
 			}
-			__finally277:
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally278:
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6919 "Photo.c"
+#line 6929 "Photo.c"
 				{
 					GeeHashMap* _tmp40_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp40_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6926 "Photo.c"
+#line 6936 "Photo.c"
 				}
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 837 "/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 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 837 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 6934 "Photo.c"
+#line 6944 "Photo.c"
 			}
-#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = stale_raw_developer;
-#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp42_ != RAW_DEVELOPER_CAMERA) {
-#line 6940 "Photo.c"
+#line 6950 "Photo.c"
 				RawDeveloper _tmp43_ = 0;
 				PhotoRow* _tmp44_ = NULL;
 				RawDeveloper _tmp45_ = 0;
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = stale_raw_developer;
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = self->row;
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _tmp44_->developer;
-#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 848 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = _tmp43_ != _tmp45_;
-#line 6952 "Photo.c"
+#line 6962 "Photo.c"
 			} else {
-#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = FALSE;
-#line 6956 "Photo.c"
+#line 6966 "Photo.c"
 			}
-#line 846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 847 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp41_) {
-#line 6960 "Photo.c"
+#line 6970 "Photo.c"
 				RawDeveloper _tmp46_ = 0;
-#line 850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 851 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = stale_raw_developer;
-#line 850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 851 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_delete_raw_development (self, _tmp46_);
-#line 6966 "Photo.c"
+#line 6976 "Photo.c"
 			}
 		}
-		__finally275:
+		__finally276:
 		{
 			GeeHashMap* _tmp47_ = NULL;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp47_ = self->priv->developments;
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 6976 "Photo.c"
+#line 6986 "Photo.c"
 		}
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -6982,20 +6992,20 @@ void photo_set_raw_developer (Photo* self, RawDeveloper d) {
 			g_clear_error (&_inner_error_);
 #line 810 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 6986 "Photo.c"
+#line 6996 "Photo.c"
 		}
 	}
-#line 857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = alteration_new ("image", "developer");
-#line 857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 858 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = _tmp48_;
-#line 857 "/home/jens/Source/shotwell/src/Photo.vala"
+#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 857 "/home/jens/Source/shotwell/src/Photo.vala"
-	_alteration_unref0 (_tmp49_);
 #line 858 "/home/jens/Source/shotwell/src/Photo.vala"
+	_alteration_unref0 (_tmp49_);
+#line 859 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 6999 "Photo.c"
+#line 7009 "Photo.c"
 }
 
 
@@ -7003,17 +7013,17 @@ RawDeveloper photo_get_raw_developer (Photo* self) {
 	RawDeveloper result = 0;
 	PhotoRow* _tmp0_ = NULL;
 	RawDeveloper _tmp1_ = 0;
-#line 861 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), 0);
 #line 862 "/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"
 	_tmp0_ = self->row;
-#line 862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->developer;
-#line 862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 863 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7017 "Photo.c"
+#line 7027 "Photo.c"
 }
 
 
@@ -7021,18 +7031,18 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 	gboolean result = FALSE;
 	gboolean ret = FALSE;
 	GError * _inner_error_ = NULL;
-#line 867 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 868 "/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"
 	ret = FALSE;
-#line 7029 "Photo.c"
+#line 7039 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7036 "Photo.c"
+#line 7046 "Photo.c"
 		{
 			GeeHashMap* _tmp1_ = NULL;
 			RawDeveloper _tmp2_ = 0;
@@ -7051,160 +7061,160 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 			GeeHashMap* _tmp37_ = NULL;
 			RawDeveloper _tmp38_ = 0;
 			gboolean _tmp39_ = FALSE;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->developments;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = d;
-#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 872 "/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 871 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (!_tmp3_) {
 #line 872 "/home/jens/Source/shotwell/src/Photo.vala"
+			if (!_tmp3_) {
+#line 873 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
-#line 7065 "Photo.c"
+#line 7075 "Photo.c"
 				{
 					GeeHashMap* _tmp4_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp4_ = self->priv->developments;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7072 "Photo.c"
+#line 7082 "Photo.c"
 				}
-#line 872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 873 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7076 "Photo.c"
+#line 7086 "Photo.c"
 			}
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_;
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = d;
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = raw_developer_to_string (_tmp7_);
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_debug ("Photo.vala:876: Delete raw development: %s %s", _tmp6_, _tmp9_);
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 			_g_free0 (_tmp9_);
-#line 876 "/home/jens/Source/shotwell/src/Photo.vala"
-			_g_free0 (_tmp6_);
 #line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+			_g_free0 (_tmp6_);
+#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->priv->developments;
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = d;
-#line 877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 878 "/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 877 "/home/jens/Source/shotwell/src/Photo.vala"
-			bpr = (BackingPhotoRow*) _tmp12_;
 #line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+			bpr = (BackingPhotoRow*) _tmp12_;
+#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = bpr;
-#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->filepath;
-#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp14_ != NULL) {
-#line 7108 "Photo.c"
+#line 7118 "Photo.c"
 				GFile* f = NULL;
 				BackingPhotoRow* _tmp15_ = NULL;
 				const gchar* _tmp16_ = NULL;
 				GFile* _tmp17_ = NULL;
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = bpr;
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->filepath;
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = g_file_new_for_path (_tmp16_);
-#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = _tmp17_;
-#line 7121 "Photo.c"
+#line 7131 "Photo.c"
 				{
 					RawDeveloper _tmp18_ = 0;
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = d;
-#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp18_ == RAW_DEVELOPER_CAMERA) {
-#line 7128 "Photo.c"
+#line 7138 "Photo.c"
 						GFile* _tmp19_ = NULL;
-#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp19_ = f;
-#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_file_trash (_tmp19_, NULL, &_inner_error_);
-#line 882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 883 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7136 "Photo.c"
-							goto __catch279_g_error;
+#line 7146 "Photo.c"
+							goto __catch280_g_error;
 						}
 					} else {
 						GFile* _tmp20_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp20_ = f;
-#line 884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_file_delete (_tmp20_, NULL, &_inner_error_);
-#line 884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 885 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7147 "Photo.c"
-							goto __catch279_g_error;
+#line 7157 "Photo.c"
+							goto __catch280_g_error;
 						}
 					}
 				}
-				goto __finally279;
-				__catch279_g_error:
+				goto __finally280;
+				__catch280_g_error:
 				{
 					GError* e = NULL;
 					BackingPhotoRow* _tmp21_ = NULL;
 					const gchar* _tmp22_ = NULL;
 					GError* _tmp23_ = NULL;
 					const gchar* _tmp24_ = NULL;
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					e = _inner_error_;
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_inner_error_ = NULL;
-#line 886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = bpr;
-#line 886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_->filepath;
-#line 886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = e;
-#line 886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 887 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = _tmp23_->message;
-#line 886 "/home/jens/Source/shotwell/src/Photo.vala"
-					g_warning ("Photo.vala:886: Unable to delete RAW development: %s error: %s", _tmp22_, _tmp24_);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 					_g_error_free0 (e);
-#line 7176 "Photo.c"
+#line 7186 "Photo.c"
 				}
-				__finally279:
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+				__finally280:
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (f);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bpr);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (f);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (bpr);
-#line 7189 "Photo.c"
+#line 7199 "Photo.c"
 					{
 						GeeHashMap* _tmp25_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = self->priv->developments;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7196 "Photo.c"
+#line 7206 "Photo.c"
 					}
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/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 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 881 "/home/jens/Source/shotwell/src/Photo.vala"
 					return FALSE;
-#line 7204 "Photo.c"
+#line 7214 "Photo.c"
 				}
-#line 878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 879 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 7208 "Photo.c"
+#line 7218 "Photo.c"
 			}
 			{
 				PhotoTable* _tmp26_ = NULL;
@@ -7215,238 +7225,238 @@ static gboolean photo_delete_raw_development (Photo* self, RawDeveloper d) {
 				BackingPhotoTable* _tmp31_ = NULL;
 				BackingPhotoRow* _tmp32_ = NULL;
 				BackingPhotoID _tmp33_ = {0};
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = photo_table_get_instance ();
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _tmp26_;
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = self->row;
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = d;
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_remove_development (_tmp27_, _tmp28_, _tmp29_, &_inner_error_);
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp27_);
-#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7233 "Photo.c"
-					goto __catch280_g_error;
+#line 7243 "Photo.c"
+					goto __catch281_g_error;
 				}
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = backing_photo_table_get_instance ();
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = _tmp30_;
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = bpr;
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = _tmp32_->id;
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_remove (_tmp31_, &_tmp33_, &_inner_error_);
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp31_);
-#line 893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 894 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7250 "Photo.c"
-					goto __catch280_g_error;
+#line 7260 "Photo.c"
+					goto __catch281_g_error;
 				}
 			}
-			goto __finally280;
-			__catch280_g_error:
+			goto __finally281;
+			__catch281_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp34_ = NULL;
 				const gchar* _tmp35_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				e = _inner_error_;
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = e;
-#line 895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = _tmp34_->message;
-#line 895 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_warning ("Photo.vala:895: Database error while deleting RAW development: %s", _tmp35_);
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 896 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_warning ("Photo.vala:896: Database error while deleting RAW development: %s", _tmp35_);
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (e);
-#line 7272 "Photo.c"
+#line 7282 "Photo.c"
 			}
-			__finally280:
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally281:
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (bpr);
-#line 7281 "Photo.c"
+#line 7291 "Photo.c"
 				{
 					GeeHashMap* _tmp36_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp36_ = self->priv->developments;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7288 "Photo.c"
+#line 7298 "Photo.c"
 				}
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/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 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 891 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 892 "/home/jens/Source/shotwell/src/Photo.vala"
 				return FALSE;
-#line 7296 "Photo.c"
+#line 7306 "Photo.c"
 			}
-#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = self->priv->developments;
-#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = d;
-#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), (gpointer) ((gintptr) _tmp38_), NULL);
-#line 898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 899 "/home/jens/Source/shotwell/src/Photo.vala"
 			ret = _tmp39_;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (bpr);
-#line 7308 "Photo.c"
+#line 7318 "Photo.c"
 		}
-		__finally278:
+		__finally279:
 		{
 			GeeHashMap* _tmp40_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = self->priv->developments;
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7317 "Photo.c"
+#line 7327 "Photo.c"
 		}
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/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 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 871 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 7327 "Photo.c"
+#line 7337 "Photo.c"
 		}
 	}
-#line 901 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_notify_raw_development_modified (self);
 #line 902 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_notify_raw_development_modified (self);
+#line 903 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = ret;
-#line 902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 903 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7336 "Photo.c"
+#line 7346 "Photo.c"
 }
 
 
 void photo_redevelop_raw (Photo* self, RawDeveloper d) {
 	GError * _inner_error_ = NULL;
-#line 906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 7344 "Photo.c"
+#line 7354 "Photo.c"
 	{
 		GeeHashMap* _tmp0_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->developments;
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_developments);
-#line 7351 "Photo.c"
+#line 7361 "Photo.c"
 		{
 			RawDeveloper _tmp1_ = 0;
 			RawDeveloper dev = 0;
 			RawDeveloper _tmp2_ = 0;
 			RawDeveloper _tmp3_ = 0;
 			RawDeveloper _tmp4_ = 0;
-#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 909 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = d;
-#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo_delete_raw_development (self, _tmp1_);
 #line 909 "/home/jens/Source/shotwell/src/Photo.vala"
+			photo_delete_raw_development (self, _tmp1_);
+#line 910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = d;
-#line 909 "/home/jens/Source/shotwell/src/Photo.vala"
-			dev = _tmp2_;
 #line 910 "/home/jens/Source/shotwell/src/Photo.vala"
+			dev = _tmp2_;
+#line 911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = dev;
-#line 910 "/home/jens/Source/shotwell/src/Photo.vala"
-			if (_tmp3_ == RAW_DEVELOPER_CAMERA) {
 #line 911 "/home/jens/Source/shotwell/src/Photo.vala"
+			if (_tmp3_ == RAW_DEVELOPER_CAMERA) {
+#line 912 "/home/jens/Source/shotwell/src/Photo.vala"
 				dev = RAW_DEVELOPER_EMBEDDED;
-#line 7372 "Photo.c"
+#line 7382 "Photo.c"
 			}
-#line 913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 914 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = dev;
-#line 913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 914 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_raw_developer (self, _tmp4_);
-#line 7378 "Photo.c"
+#line 7388 "Photo.c"
 		}
-		__finally281:
+		__finally282:
 		{
 			GeeHashMap* _tmp5_ = NULL;
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->developments;
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_developments);
-#line 7387 "Photo.c"
+#line 7397 "Photo.c"
 		}
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/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 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 908 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 7397 "Photo.c"
+#line 7407 "Photo.c"
 		}
 	}
 }
 
 
 static void _vala_array_add85 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7410 "Photo.c"
+#line 7420 "Photo.c"
 	}
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7416 "Photo.c"
+#line 7426 "Photo.c"
 }
 
 
 static void _vala_array_add86 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7427 "Photo.c"
+#line 7437 "Photo.c"
 	}
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7433 "Photo.c"
+#line 7443 "Photo.c"
 }
 
 
 static void _vala_array_add87 (BackingFileState*** array, int* length, int* size, BackingFileState* value) {
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (BackingFileState*, *array, (*size) + 1);
-#line 7444 "Photo.c"
+#line 7454 "Photo.c"
 	}
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 7450 "Photo.c"
+#line 7460 "Photo.c"
 }
 
 
@@ -7460,24 +7470,24 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 	BackingFileState** _tmp27_ = NULL;
 	gint _tmp27__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 917 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 918 "/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"
 	_tmp0_ = g_new0 (BackingFileState*, 0 + 1);
-#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp0_;
-#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_length1 = 0;
-#line 918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_size_ = backing_length1;
-#line 7474 "Photo.c"
+#line 7484 "Photo.c"
 	{
 		PhotoRow* _tmp1_ = NULL;
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = self->row;
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 7481 "Photo.c"
+#line 7491 "Photo.c"
 		{
 			BackingFileState** _tmp2_ = NULL;
 			gint _tmp2__length1 = 0;
@@ -7488,73 +7498,73 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 			BackingFileState* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			gboolean _tmp12_ = FALSE;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = backing;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2__length1 = backing_length1;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->master;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->md5;
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = backing_file_state_new_from_photo_row (_tmp4_, _tmp6_);
-#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_array_add85 (&backing, &backing_length1, &_backing_size_, _tmp7_);
 #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"
 			_tmp8_ = photo_has_editable (self);
-#line 921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_) {
-#line 7512 "Photo.c"
+#line 7522 "Photo.c"
 				BackingFileState** _tmp9_ = NULL;
 				gint _tmp9__length1 = 0;
 				BackingPhotoRow* _tmp10_ = NULL;
 				BackingFileState* _tmp11_ = NULL;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = backing;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9__length1 = backing_length1;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = self->priv->editable;
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = backing_file_state_new_from_photo_row (_tmp10_, NULL);
-#line 922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 923 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_array_add86 (&backing, &backing_length1, &_backing_size_, _tmp11_);
-#line 7527 "Photo.c"
+#line 7537 "Photo.c"
 			}
-#line 924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_is_developed (self);
-#line 924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp12_) {
-#line 7533 "Photo.c"
+#line 7543 "Photo.c"
 				GeeCollection* dev_rows = NULL;
 				GeeCollection* _tmp13_ = NULL;
 				GeeCollection* _tmp14_ = NULL;
-#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 926 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = photo_get_raw_development_photo_rows (self);
-#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
-				dev_rows = _tmp13_;
 #line 926 "/home/jens/Source/shotwell/src/Photo.vala"
+				dev_rows = _tmp13_;
+#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = dev_rows;
-#line 926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp14_ != NULL) {
-#line 7545 "Photo.c"
+#line 7555 "Photo.c"
 					{
 						GeeIterator* _r_it = NULL;
 						GeeCollection* _tmp15_ = NULL;
 						GeeIterator* _tmp16_ = NULL;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = dev_rows;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp16_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						_r_it = _tmp16_;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 7558 "Photo.c"
+#line 7568 "Photo.c"
 							GeeIterator* _tmp17_ = NULL;
 							gboolean _tmp18_ = FALSE;
 							BackingPhotoRow* r = NULL;
@@ -7566,246 +7576,246 @@ static BackingFileState** photo_real_get_backing_files_state (MediaSource* base,
 							gint _tmp23__length1 = 0;
 							BackingPhotoRow* _tmp24_ = NULL;
 							BackingFileState* _tmp25_ = NULL;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp17_ = _r_it;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp18_ = gee_iterator_next (_tmp17_);
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp18_) {
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 7578 "Photo.c"
+#line 7588 "Photo.c"
 							}
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = _r_it;
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp20_ = gee_iterator_get (_tmp19_);
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
-							r = (BackingPhotoRow*) _tmp20_;
 #line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+							r = (BackingPhotoRow*) _tmp20_;
+#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = r;
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = _tmp21_->filepath;
-#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
-							g_debug ("Photo.vala:928: adding: %s", _tmp22_);
 #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"
 							_tmp23_ = backing;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23__length1 = backing_length1;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = r;
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = backing_file_state_new_from_photo_row (_tmp24_, NULL);
-#line 929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 930 "/home/jens/Source/shotwell/src/Photo.vala"
 							_vala_array_add87 (&backing, &backing_length1, &_backing_size_, _tmp25_);
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (r);
-#line 7604 "Photo.c"
+#line 7614 "Photo.c"
 						}
-#line 927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 928 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_r_it);
-#line 7608 "Photo.c"
+#line 7618 "Photo.c"
 					}
 				}
-#line 924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 925 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (dev_rows);
-#line 7613 "Photo.c"
+#line 7623 "Photo.c"
 			}
 		}
-		__finally282:
+		__finally283:
 		{
 			PhotoRow* _tmp26_ = NULL;
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->row;
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 7623 "Photo.c"
+#line 7633 "Photo.c"
 		}
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing = (_vala_array_free (backing, backing_length1, (GDestroyNotify) backing_file_state_unref), NULL);
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/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 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 920 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 7635 "Photo.c"
+#line 7645 "Photo.c"
 		}
 	}
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = backing;
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27__length1 = backing_length1;
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (result_length1) {
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp27__length1;
-#line 7646 "Photo.c"
+#line 7656 "Photo.c"
 	}
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp27_;
-#line 935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 936 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 7652 "Photo.c"
+#line 7662 "Photo.c"
 }
 
 
 static PhotoFileReader* photo_get_backing_reader (Photo* self, BackingFetchMode mode) {
 	PhotoFileReader* result = NULL;
 	BackingFetchMode _tmp0_ = 0;
-#line 938 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 939 "/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"
 	_tmp0_ = mode;
-#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp0_) {
-#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_MASTER:
-#line 7667 "Photo.c"
+#line 7677 "Photo.c"
 		{
 			PhotoFileReader* _tmp1_ = NULL;
-#line 941 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_master_reader (self);
-#line 941 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 941 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 942 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7676 "Photo.c"
+#line 7686 "Photo.c"
 		}
-#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_BASELINE:
-#line 7680 "Photo.c"
+#line 7690 "Photo.c"
 		{
 			PhotoFileReader* _tmp2_ = NULL;
-#line 944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = photo_get_baseline_reader (self);
-#line 944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 945 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7689 "Photo.c"
+#line 7699 "Photo.c"
 		}
-#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_SOURCE:
-#line 7693 "Photo.c"
+#line 7703 "Photo.c"
 		{
 			PhotoFileReader* _tmp3_ = NULL;
-#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_get_source_reader (self);
-#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 948 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7702 "Photo.c"
+#line 7712 "Photo.c"
 		}
-#line 939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 940 "/home/jens/Source/shotwell/src/Photo.vala"
 		case BACKING_FETCH_MODE_UNMODIFIED:
-#line 7706 "Photo.c"
+#line 7716 "Photo.c"
 		{
 			PhotoFileFormat _tmp4_ = 0;
-#line 950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_master_file_format (self);
-#line 950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) {
-#line 7713 "Photo.c"
+#line 7723 "Photo.c"
 				PhotoFileReader* _tmp5_ = NULL;
-#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = photo_get_raw_developer_reader (self);
-#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 952 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7721 "Photo.c"
+#line 7731 "Photo.c"
 			} else {
 				PhotoFileReader* _tmp6_ = NULL;
-#line 953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = photo_get_master_reader (self);
-#line 953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp6_;
-#line 953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 954 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7730 "Photo.c"
+#line 7740 "Photo.c"
 			}
 		}
 		default:
 		{
 			BackingFetchMode _tmp7_ = 0;
 			GEnumValue* _tmp8_;
-#line 956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 957 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = mode;
-#line 956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 957 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = g_enum_get_value (g_type_class_ref (TYPE_BACKING_FETCH_MODE), _tmp7_);
-#line 956 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_error ("Photo.vala:956: Unknown backing fetch mode %s", (_tmp8_ != NULL) ? _tmp8_->value_name : NULL);
-#line 7743 "Photo.c"
+#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 7753 "Photo.c"
 		}
 	}
 }
 
 
 static gpointer _photo_file_adapter_ref0 (gpointer self) {
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_file_adapter_ref (self) : NULL;
-#line 7752 "Photo.c"
+#line 7762 "Photo.c"
 }
 
 
 static PhotoFileReader* photo_get_master_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7761 "Photo.c"
+#line 7771 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7768 "Photo.c"
+#line 7778 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			PhotoFileReader* _tmp3_ = NULL;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 7781 "Photo.c"
+#line 7791 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7788 "Photo.c"
+#line 7798 "Photo.c"
 			}
-#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 963 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7792 "Photo.c"
+#line 7802 "Photo.c"
 		}
-		__finally283:
+		__finally284:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7801 "Photo.c"
+#line 7811 "Photo.c"
 		}
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/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 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 962 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7809 "Photo.c"
+#line 7819 "Photo.c"
 	}
 }
 
@@ -7813,57 +7823,57 @@ static PhotoFileReader* photo_get_master_reader (Photo* self) {
 PhotoFileReader* photo_get_editable_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7819 "Photo.c"
+#line 7829 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7826 "Photo.c"
+#line 7836 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			PhotoFileReader* _tmp3_ = NULL;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 7839 "Photo.c"
+#line 7849 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7846 "Photo.c"
+#line 7856 "Photo.c"
 			}
-#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 969 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7850 "Photo.c"
+#line 7860 "Photo.c"
 		}
-		__finally284:
+		__finally285:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7859 "Photo.c"
+#line 7869 "Photo.c"
 		}
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/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 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 968 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7867 "Photo.c"
+#line 7877 "Photo.c"
 	}
 }
 
@@ -7871,16 +7881,16 @@ PhotoFileReader* photo_get_editable_reader (Photo* self) {
 static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 	PhotoFileReader* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 7877 "Photo.c"
+#line 7887 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 7884 "Photo.c"
+#line 7894 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -7889,105 +7899,105 @@ static PhotoFileReader* photo_get_baseline_reader (Photo* self) {
 			PhotoBackingReaders* _tmp13_ = NULL;
 			PhotoFileReader* _tmp14_ = NULL;
 			PhotoFileReader* _tmp15_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 7899 "Photo.c"
+#line 7909 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 7911 "Photo.c"
+#line 7921 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp6_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->priv->readers;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7918 "Photo.c"
+#line 7928 "Photo.c"
 				}
-#line 976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 977 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7922 "Photo.c"
+#line 7932 "Photo.c"
 			}
-#line 978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
-#line 978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_->developer;
-#line 978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 7930 "Photo.c"
+#line 7940 "Photo.c"
 				PhotoBackingReaders* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
 				PhotoFileReader* _tmp11_ = NULL;
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->priv->readers;
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_->developer;
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp11_;
-#line 7942 "Photo.c"
+#line 7952 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp12_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->readers;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7949 "Photo.c"
+#line 7959 "Photo.c"
 				}
-#line 979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 980 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 7953 "Photo.c"
+#line 7963 "Photo.c"
 			}
-#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
-#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->master;
-#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
-#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp15_;
-#line 7963 "Photo.c"
+#line 7973 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp16_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->readers;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7970 "Photo.c"
+#line 7980 "Photo.c"
 			}
-#line 981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 982 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 7974 "Photo.c"
+#line 7984 "Photo.c"
 		}
-		__finally285:
+		__finally286:
 		{
 			PhotoBackingReaders* _tmp17_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->priv->readers;
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 7983 "Photo.c"
+#line 7993 "Photo.c"
 		}
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/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 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 975 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 7991 "Photo.c"
+#line 8001 "Photo.c"
 	}
 }
 
@@ -7995,16 +8005,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 986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8001 "Photo.c"
+#line 8011 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8008 "Photo.c"
+#line 8018 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -8013,105 +8023,105 @@ static PhotoFileReader* photo_get_source_reader (Photo* self) {
 			PhotoBackingReaders* _tmp13_ = NULL;
 			PhotoFileReader* _tmp14_ = NULL;
 			PhotoFileReader* _tmp15_ = NULL;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8023 "Photo.c"
+#line 8033 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_file_adapter_ref0 (_tmp4_);
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp5_;
-#line 8035 "Photo.c"
+#line 8045 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp6_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->priv->readers;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8042 "Photo.c"
+#line 8052 "Photo.c"
 				}
-#line 989 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 990 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8046 "Photo.c"
+#line 8056 "Photo.c"
 			}
-#line 991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
-#line 991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_->developer;
-#line 991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != NULL) {
-#line 8054 "Photo.c"
+#line 8064 "Photo.c"
 				PhotoBackingReaders* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
 				PhotoFileReader* _tmp11_ = NULL;
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->priv->readers;
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_->developer;
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _photo_file_adapter_ref0 (_tmp10_);
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp11_;
-#line 8066 "Photo.c"
+#line 8076 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp12_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->readers;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8073 "Photo.c"
+#line 8083 "Photo.c"
 				}
-#line 992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 993 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8077 "Photo.c"
+#line 8087 "Photo.c"
 			}
-#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->priv->readers;
-#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->master;
-#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _photo_file_adapter_ref0 (_tmp14_);
-#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp15_;
-#line 8087 "Photo.c"
+#line 8097 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp16_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->readers;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8094 "Photo.c"
+#line 8104 "Photo.c"
 			}
-#line 994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 995 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8098 "Photo.c"
+#line 8108 "Photo.c"
 		}
-		__finally286:
+		__finally287:
 		{
 			PhotoBackingReaders* _tmp17_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->priv->readers;
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8107 "Photo.c"
+#line 8117 "Photo.c"
 		}
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/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 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 988 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8115 "Photo.c"
+#line 8125 "Photo.c"
 	}
 }
 
@@ -8119,57 +8129,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 999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8125 "Photo.c"
+#line 8135 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8132 "Photo.c"
+#line 8142 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			PhotoFileReader* _tmp3_ = NULL;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->developer;
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _photo_file_adapter_ref0 (_tmp2_);
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8145 "Photo.c"
+#line 8155 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8152 "Photo.c"
+#line 8162 "Photo.c"
 			}
-#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8156 "Photo.c"
+#line 8166 "Photo.c"
 		}
-		__finally287:
+		__finally288:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8165 "Photo.c"
+#line 8175 "Photo.c"
 		}
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/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 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1001 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8173 "Photo.c"
+#line 8183 "Photo.c"
 	}
 }
 
@@ -8177,54 +8187,54 @@ static PhotoFileReader* photo_get_raw_developer_reader (Photo* self) {
 gboolean photo_is_developed (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8183 "Photo.c"
+#line 8193 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1006 "/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 8190 "Photo.c"
+#line 8200 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->developer;
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8200 "Photo.c"
+#line 8210 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1006 "/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 8207 "Photo.c"
+#line 8217 "Photo.c"
 			}
-#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8211 "Photo.c"
+#line 8221 "Photo.c"
 		}
-		__finally288:
+		__finally289:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1006 "/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 8220 "Photo.c"
+#line 8230 "Photo.c"
 		}
-#line 1006 "/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 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8228 "Photo.c"
+#line 8238 "Photo.c"
 	}
 }
 
@@ -8232,54 +8242,54 @@ gboolean photo_is_developed (Photo* self) {
 gboolean photo_has_editable (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8238 "Photo.c"
+#line 8248 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8245 "Photo.c"
+#line 8255 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8255 "Photo.c"
+#line 8265 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8262 "Photo.c"
+#line 8272 "Photo.c"
 			}
-#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1014 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8266 "Photo.c"
+#line 8276 "Photo.c"
 		}
-		__finally289:
+		__finally290:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8275 "Photo.c"
+#line 8285 "Photo.c"
 		}
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/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 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1013 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8283 "Photo.c"
+#line 8293 "Photo.c"
 	}
 }
 
@@ -8287,57 +8297,57 @@ gboolean photo_has_editable (Photo* self) {
 gboolean photo_does_master_exist (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8293 "Photo.c"
+#line 8303 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8300 "Photo.c"
+#line 8310 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			gboolean _tmp3_ = FALSE;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/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 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8313 "Photo.c"
+#line 8323 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp4_ = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8320 "Photo.c"
+#line 8330 "Photo.c"
 			}
-#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8324 "Photo.c"
+#line 8334 "Photo.c"
 		}
-		__finally290:
+		__finally291:
 		{
 			PhotoBackingReaders* _tmp5_ = NULL;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->priv->readers;
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8333 "Photo.c"
+#line 8343 "Photo.c"
 		}
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/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 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8341 "Photo.c"
+#line 8351 "Photo.c"
 	}
 }
 
@@ -8345,75 +8355,75 @@ gboolean photo_does_master_exist (Photo* self) {
 gboolean photo_does_editable_exist (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1024 "/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 8351 "Photo.c"
+#line 8361 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1025 "/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 8358 "Photo.c"
+#line 8368 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoBackingReaders* _tmp2_ = NULL;
 			PhotoFileReader* _tmp3_ = NULL;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->readers;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->editable;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 8369 "Photo.c"
+#line 8379 "Photo.c"
 				PhotoBackingReaders* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
 				gboolean _tmp6_ = FALSE;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->editable;
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/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 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 8381 "Photo.c"
+#line 8391 "Photo.c"
 			} else {
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 8385 "Photo.c"
+#line 8395 "Photo.c"
 			}
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8389 "Photo.c"
+#line 8399 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp7_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->priv->readers;
-#line 1025 "/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 8396 "Photo.c"
+#line 8406 "Photo.c"
 			}
-#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8400 "Photo.c"
+#line 8410 "Photo.c"
 		}
-		__finally291:
+		__finally292:
 		{
 			PhotoBackingReaders* _tmp8_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = self->priv->readers;
-#line 1025 "/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 8409 "Photo.c"
+#line 8419 "Photo.c"
 		}
-#line 1025 "/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 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8417 "Photo.c"
+#line 8427 "Photo.c"
 	}
 }
 
@@ -8421,54 +8431,54 @@ gboolean photo_does_editable_exist (Photo* self) {
 gboolean photo_is_master_baseline (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1030 "/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 8427 "Photo.c"
+#line 8437 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1031 "/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 8434 "Photo.c"
+#line 8444 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ == NULL;
-#line 8444 "Photo.c"
+#line 8454 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1031 "/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 8451 "Photo.c"
+#line 8461 "Photo.c"
 			}
-#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8455 "Photo.c"
+#line 8465 "Photo.c"
 		}
-		__finally292:
+		__finally293:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1031 "/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 8464 "Photo.c"
+#line 8474 "Photo.c"
 		}
-#line 1031 "/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 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8472 "Photo.c"
+#line 8482 "Photo.c"
 	}
 }
 
@@ -8476,69 +8486,69 @@ gboolean photo_is_master_baseline (Photo* self) {
 gboolean photo_is_master_source (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1036 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 1037 "/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"
 	_tmp0_ = photo_has_editable (self);
-#line 1037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = !_tmp0_;
-#line 1037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8488 "Photo.c"
+#line 8498 "Photo.c"
 }
 
 
 gboolean photo_is_editable_baseline (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 8497 "Photo.c"
+#line 8507 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 8504 "Photo.c"
+#line 8514 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_ != NULL;
-#line 8514 "Photo.c"
+#line 8524 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp3_ = NULL;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8521 "Photo.c"
+#line 8531 "Photo.c"
 			}
-#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8525 "Photo.c"
+#line 8535 "Photo.c"
 		}
-		__finally293:
+		__finally294:
 		{
 			PhotoBackingReaders* _tmp4_ = NULL;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 8534 "Photo.c"
+#line 8544 "Photo.c"
 		}
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/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 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 8542 "Photo.c"
+#line 8552 "Photo.c"
 	}
 }
 
@@ -8546,72 +8556,72 @@ gboolean photo_is_editable_baseline (Photo* self) {
 gboolean photo_is_editable_source (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1046 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 1047 "/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"
 	_tmp0_ = photo_has_editable (self);
-#line 1047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8558 "Photo.c"
+#line 8568 "Photo.c"
 }
 
 
 BackingPhotoRow* photo_get_master_photo_row (Photo* self) {
 	BackingPhotoRow* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8567 "Photo.c"
+#line 8577 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8574 "Photo.c"
+#line 8584 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoRow* _tmp2_ = NULL;
 			BackingPhotoRow* _tmp3_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _backing_photo_row_ref0 (_tmp2_);
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 8587 "Photo.c"
+#line 8597 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8594 "Photo.c"
+#line 8604 "Photo.c"
 			}
-#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8598 "Photo.c"
+#line 8608 "Photo.c"
 		}
-		__finally294:
+		__finally295:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8607 "Photo.c"
+#line 8617 "Photo.c"
 		}
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/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 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8615 "Photo.c"
+#line 8625 "Photo.c"
 	}
 }
 
@@ -8619,79 +8629,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 1056 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8625 "Photo.c"
+#line 8635 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8632 "Photo.c"
+#line 8642 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
-#line 1059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 1059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = backing_photo_id_is_valid (&_tmp1_->editable_id);
-#line 1059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_) {
-#line 8642 "Photo.c"
+#line 8652 "Photo.c"
 				BackingPhotoRow* _tmp3_ = NULL;
 				BackingPhotoRow* _tmp4_ = NULL;
-#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->editable;
-#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _backing_photo_row_ref0 (_tmp3_);
-#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = _tmp4_;
-#line 8651 "Photo.c"
+#line 8661 "Photo.c"
 				{
 					PhotoRow* _tmp5_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp5_ = self->row;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8658 "Photo.c"
+#line 8668 "Photo.c"
 				}
-#line 1060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8662 "Photo.c"
+#line 8672 "Photo.c"
 			} else {
-#line 1062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = NULL;
-#line 8666 "Photo.c"
+#line 8676 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8673 "Photo.c"
+#line 8683 "Photo.c"
 				}
-#line 1062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 8677 "Photo.c"
+#line 8687 "Photo.c"
 			}
 		}
-		__finally295:
+		__finally296:
 		{
 			PhotoRow* _tmp7_ = NULL;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8687 "Photo.c"
+#line 8697 "Photo.c"
 		}
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/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 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1057 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8695 "Photo.c"
+#line 8705 "Photo.c"
 	}
 }
 
@@ -8699,76 +8709,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 1066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8705 "Photo.c"
+#line 8715 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8712 "Photo.c"
+#line 8722 "Photo.c"
 		{
 			GeeCollection* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->developments;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8720 "Photo.c"
+#line 8730 "Photo.c"
 				GeeHashMap* _tmp3_ = NULL;
 				GeeCollection* _tmp4_ = NULL;
 				GeeCollection* _tmp5_ = NULL;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MAP, GeeMap));
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp1_);
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp5_;
-#line 8734 "Photo.c"
+#line 8744 "Photo.c"
 			} else {
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp1_);
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 8740 "Photo.c"
+#line 8750 "Photo.c"
 			}
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8744 "Photo.c"
+#line 8754 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8751 "Photo.c"
+#line 8761 "Photo.c"
 			}
-#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8755 "Photo.c"
+#line 8765 "Photo.c"
 		}
-		__finally296:
+		__finally297:
 		{
 			PhotoRow* _tmp7_ = NULL;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8764 "Photo.c"
+#line 8774 "Photo.c"
 		}
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/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 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8772 "Photo.c"
+#line 8782 "Photo.c"
 	}
 }
 
@@ -8776,96 +8786,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 1072 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 8782 "Photo.c"
+#line 8792 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 8789 "Photo.c"
+#line 8799 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->developments;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 8797 "Photo.c"
+#line 8807 "Photo.c"
 				GeeHashMap* _tmp3_ = NULL;
 				RawDeveloper _tmp4_ = 0;
 				gpointer _tmp5_ = NULL;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = d;
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/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 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = (BackingPhotoRow*) _tmp5_;
-#line 8811 "Photo.c"
+#line 8821 "Photo.c"
 			} else {
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp1_);
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 8817 "Photo.c"
+#line 8827 "Photo.c"
 			}
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 8821 "Photo.c"
+#line 8831 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8828 "Photo.c"
+#line 8838 "Photo.c"
 			}
-#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 8832 "Photo.c"
+#line 8842 "Photo.c"
 		}
-		__finally297:
+		__finally298:
 		{
 			PhotoRow* _tmp7_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 8841 "Photo.c"
+#line 8851 "Photo.c"
 		}
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/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 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1074 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 8849 "Photo.c"
+#line 8859 "Photo.c"
 	}
 }
 
 
 static PhotoFileFormat* _photo_file_format_dup (PhotoFileFormat* self) {
 	PhotoFileFormat* dup;
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	dup = g_new0 (PhotoFileFormat, 1);
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	memcpy (dup, self, sizeof (PhotoFileFormat));
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	return dup;
-#line 8862 "Photo.c"
+#line 8872 "Photo.c"
 }
 
 
 static gpointer __photo_file_format_dup0 (gpointer self) {
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? _photo_file_format_dup (self) : NULL;
-#line 8869 "Photo.c"
+#line 8879 "Photo.c"
 }
 
 
@@ -8877,37 +8887,37 @@ PhotoFileFormat* photo_get_editable_file_format (Photo* self) {
 	PhotoFileReader* _tmp2_ = NULL;
 	PhotoFileFormat _tmp3_ = 0;
 	PhotoFileFormat* _tmp4_ = NULL;
-#line 1078 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), NULL);
 #line 1079 "/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"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 1079 "/home/jens/Source/shotwell/src/Photo.vala"
-	reader = _tmp0_;
 #line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
+	reader = _tmp0_;
+#line 1081 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = reader;
-#line 1080 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp1_ == NULL) {
 #line 1081 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp1_ == NULL) {
+#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 1081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 1081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1082 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 8897 "Photo.c"
+#line 8907 "Photo.c"
 	}
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/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 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = __photo_file_format_dup0 (&_tmp3_);
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 1084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1085 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8911 "Photo.c"
+#line 8921 "Photo.c"
 }
 
 
@@ -8917,75 +8927,75 @@ PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportForma
 	PhotoFileFormat _tmp0_ = 0;
 	ExportFormatParameters _tmp1_ = {0};
 	ExportFormatMode _tmp2_ = 0;
-#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 1087 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (params != NULL, 0);
 #line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (params != NULL, 0);
+#line 1089 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
-#line 1088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Photo.vala"
 	_result_ = _tmp0_;
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *params;
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_.mode;
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp2_) {
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 8937 "Photo.c"
+#line 8947 "Photo.c"
 		{
 			PhotoFileFormat _tmp3_ = 0;
-#line 1092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = photo_get_master_file_format (self);
-#line 1092 "/home/jens/Source/shotwell/src/Photo.vala"
-			_result_ = _tmp3_;
 #line 1093 "/home/jens/Source/shotwell/src/Photo.vala"
+			_result_ = _tmp3_;
+#line 1094 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8946 "Photo.c"
+#line 8956 "Photo.c"
 		}
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 8950 "Photo.c"
+#line 8960 "Photo.c"
 		{
 			PhotoFileFormat _tmp4_ = 0;
-#line 1096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_best_export_file_format (self);
-#line 1096 "/home/jens/Source/shotwell/src/Photo.vala"
-			_result_ = _tmp4_;
 #line 1097 "/home/jens/Source/shotwell/src/Photo.vala"
+			_result_ = _tmp4_;
+#line 1098 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8959 "Photo.c"
+#line 8969 "Photo.c"
 		}
-#line 1090 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1091 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 8963 "Photo.c"
+#line 8973 "Photo.c"
 		{
 			ExportFormatParameters _tmp5_ = {0};
 			PhotoFileFormat _tmp6_ = 0;
-#line 1100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = *params;
-#line 1100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_.specified_format;
-#line 1100 "/home/jens/Source/shotwell/src/Photo.vala"
-			_result_ = _tmp6_;
 #line 1101 "/home/jens/Source/shotwell/src/Photo.vala"
+			_result_ = _tmp6_;
+#line 1102 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 8975 "Photo.c"
+#line 8985 "Photo.c"
 		}
 		default:
 		{
-#line 1104 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_error ("Photo.vala:1104: get_export_format_for_parameters: unsupported export " \
+#line 1105 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_error ("Photo.vala:1105: get_export_format_for_parameters: unsupported export " \
 "format mode");
-#line 8981 "Photo.c"
+#line 8991 "Photo.c"
 		}
 	}
-#line 1107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _result_;
-#line 1107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 8988 "Photo.c"
+#line 8998 "Photo.c"
 }
 
 
@@ -8995,81 +9005,81 @@ gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParame
 	ExportFormatParameters _tmp0_ = {0};
 	ExportFormatMode _tmp1_ = 0;
 	const gchar* _tmp8_ = NULL;
-#line 1110 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1110 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (params != NULL, NULL);
 #line 1111 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (params != NULL, NULL);
+#line 1112 "/home/jens/Source/shotwell/src/Photo.vala"
 	_result_ = NULL;
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = *params;
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.mode;
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp1_) {
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_UNMODIFIED:
-#line 9012 "Photo.c"
+#line 9022 "Photo.c"
 		{
 			GFile* _tmp2_ = NULL;
 			GFile* _tmp3_ = NULL;
 			gchar* _tmp4_ = NULL;
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_;
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = g_file_get_basename (_tmp3_);
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_result_);
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
 			_result_ = _tmp4_;
-#line 1115 "/home/jens/Source/shotwell/src/Photo.vala"
-			_g_object_unref0 (_tmp3_);
 #line 1116 "/home/jens/Source/shotwell/src/Photo.vala"
+			_g_object_unref0 (_tmp3_);
+#line 1117 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 9031 "Photo.c"
+#line 9041 "Photo.c"
 		}
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_CURRENT:
-#line 1113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1114 "/home/jens/Source/shotwell/src/Photo.vala"
 		case EXPORT_FORMAT_MODE_SPECIFIED:
-#line 9037 "Photo.c"
+#line 9047 "Photo.c"
 		{
 			ExportFormatParameters _tmp5_ = {0};
 			PhotoFileFormat _tmp6_ = 0;
 			gchar* _tmp7_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = *params;
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = photo_get_export_format_for_parameters (self, &_tmp5_);
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_get_export_basename (self, &_tmp6_);
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp7_;
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_result_);
-#line 1120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 9054 "Photo.c"
+#line 9064 "Photo.c"
 		}
 		default:
 		{
-#line 1123 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_error ("Photo.vala:1123: get_export_basename_for_parameters: unsupported expor" \
+#line 1124 "/home/jens/Source/shotwell/src/Photo.vala"
+			g_error ("Photo.vala:1124: get_export_basename_for_parameters: unsupported expor" \
 "t format mode");
-#line 9060 "Photo.c"
+#line 9070 "Photo.c"
 		}
 	}
-#line 1126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _result_;
-#line 1126 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp8_ != NULL, "result != null");
 #line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp8_ != NULL, "result != null");
+#line 1128 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _result_;
-#line 1127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 9071 "Photo.c"
+#line 9081 "Photo.c"
 }
 
 
@@ -9198,243 +9208,243 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 	PhotoImportParams* _tmp176_ = NULL;
 	Thumbnails* _tmp177_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1143 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0);
-#line 1146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = params;
-#line 1146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->file;
-#line 1146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1146 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1147 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp2_;
-#line 1148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 9212 "Photo.c"
+#line 9222 "Photo.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		GFileInfo* _tmp5_ = NULL;
 		GFileInfo* _tmp6_ = NULL;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = file;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/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 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp5_;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9226 "Photo.c"
-			goto __catch298_g_error;
+#line 9236 "Photo.c"
+			goto __catch299_g_error;
 		}
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = NULL;
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1151 "/home/jens/Source/shotwell/src/Photo.vala"
 		info = _tmp6_;
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 9239 "Photo.c"
+#line 9249 "Photo.c"
 	}
-	goto __finally298;
-	__catch298_g_error:
+	goto __finally299;
+	__catch299_g_error:
 	{
 		GError* err = NULL;
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_FILE_ERROR;
-#line 1153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1154 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9259 "Photo.c"
+#line 9269 "Photo.c"
 	}
-	__finally298:
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally299:
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/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 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1150 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 9274 "Photo.c"
+#line 9284 "Photo.c"
 	}
-#line 1156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
-#line 1156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_file_info_get_file_type (_tmp7_);
-#line 1156 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp8_ != G_FILE_TYPE_REGULAR) {
 #line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp8_ != G_FILE_TYPE_REGULAR) {
+#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_NOT_A_FILE;
-#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1158 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9290 "Photo.c"
+#line 9300 "Photo.c"
 	}
-#line 1159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
-#line 1159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = photo_is_file_image (_tmp9_);
-#line 1159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp10_) {
-#line 9298 "Photo.c"
+#line 9308 "Photo.c"
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = file;
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp12_;
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_message ("Photo.vala:1160: Not importing %s: Not an image file", _tmp13_);
-#line 1160 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_free0 (_tmp13_);
-#line 1162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_NOT_AN_IMAGE;
-#line 1162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1163 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9320 "Photo.c"
+#line 9330 "Photo.c"
 	}
-#line 1165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
-#line 1165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_format_is_file_supported (_tmp14_);
-#line 1165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp15_) {
-#line 9328 "Photo.c"
+#line 9338 "Photo.c"
 		GFile* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = file;
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = g_file_get_path (_tmp16_);
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_;
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_message ("Photo.vala:1166: Not importing %s: Unsupported extension", _tmp18_);
-#line 1166 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_free0 (_tmp18_);
-#line 1168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1169 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9350 "Photo.c"
+#line 9360 "Photo.c"
 	}
-#line 1171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = info;
-#line 1171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp19_, &_tmp20_);
-#line 1171 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1172 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp = _tmp20_;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = params;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = _tmp23_->exif_md5;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp24_ != NULL) {
-#line 9364 "Photo.c"
+#line 9374 "Photo.c"
 		PhotoImportParams* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = params;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = _tmp25_->thumbnail_md5;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp26_ != NULL;
-#line 9373 "Photo.c"
+#line 9383 "Photo.c"
 	} else {
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = FALSE;
-#line 9377 "Photo.c"
+#line 9387 "Photo.c"
 	}
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_) {
-#line 9381 "Photo.c"
+#line 9391 "Photo.c"
 		PhotoImportParams* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = params;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp27_->full_md5;
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp28_ != NULL;
-#line 9390 "Photo.c"
+#line 9400 "Photo.c"
 	} else {
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 9394 "Photo.c"
+#line 9404 "Photo.c"
 	}
-#line 1174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 9398 "Photo.c"
+#line 9408 "Photo.c"
 		PhotoImportParams* _tmp29_ = NULL;
 		PhotoImportParams* _tmp30_ = NULL;
 		PhotoFileSnifferOptions _tmp31_ = 0;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = params;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = params;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = _tmp30_->sniffer_options;
-#line 1175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1176 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_->sniffer_options = _tmp31_ | PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5;
-#line 9410 "Photo.c"
+#line 9420 "Photo.c"
 	}
-#line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = file;
-#line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = params;
-#line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_->sniffer_options;
-#line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_file_interrogator_new (_tmp32_, _tmp34_);
-#line 1178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp35_;
-#line 9422 "Photo.c"
+#line 9432 "Photo.c"
 	{
 		PhotoFileInterrogator* _tmp36_ = NULL;
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = interrogator;
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (_tmp36_, &_inner_error_);
-#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1181 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9431 "Photo.c"
-			goto __catch299_g_error;
+#line 9441 "Photo.c"
+			goto __catch300_g_error;
 		}
 	}
-	goto __finally299;
-	__catch299_g_error:
+	goto __finally300;
+	__catch300_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp37_ = NULL;
@@ -9442,120 +9452,120 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		gchar* _tmp39_ = NULL;
 		GError* _tmp40_ = NULL;
 		const gchar* _tmp41_ = NULL;
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = file;
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = g_file_get_path (_tmp37_);
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = _tmp38_;
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = err;
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1183 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = _tmp40_->message;
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1182: Unable to interrogate photo file %s: %s", _tmp39_, _tmp41_);
-#line 1182 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_free0 (_tmp39_);
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_DECODE_ERROR;
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1185 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9474 "Photo.c"
+#line 9484 "Photo.c"
 	}
-	__finally299:
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally300:
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/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 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1180 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 9491 "Photo.c"
+#line 9501 "Photo.c"
 	}
-#line 1187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = interrogator;
-#line 1187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = photo_file_interrogator_get_is_photo_corrupted (_tmp42_);
-#line 1187 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp43_) {
 #line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp43_) {
+#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_NOT_AN_IMAGE;
-#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1189 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9509 "Photo.c"
+#line 9519 "Photo.c"
 	}
-#line 1191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = interrogator;
-#line 1191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = photo_file_interrogator_get_detected_photo_information (_tmp44_);
-#line 1191 "/home/jens/Source/shotwell/src/Photo.vala"
-	detected = _tmp45_;
 #line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+	detected = _tmp45_;
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = detected;
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp47_ == NULL) {
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = TRUE;
-#line 9523 "Photo.c"
+#line 9533 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp48_ = NULL;
 		PhotoFileFormat _tmp49_ = 0;
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = detected;
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = _tmp48_->file_format;
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = _tmp49_ == PHOTO_FILE_FORMAT_UNKNOWN;
-#line 9533 "Photo.c"
+#line 9543 "Photo.c"
 	}
-#line 1192 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp46_) {
 #line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp46_) {
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1194 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9549 "Photo.c"
+#line 9559 "Photo.c"
 	}
-#line 1196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = params;
-#line 1196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = _tmp50_->sniffer_options;
-#line 1196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp51_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) != 0) {
-#line 9557 "Photo.c"
+#line 9567 "Photo.c"
 		DetectedPhotoInformation* _tmp52_ = NULL;
 		PhotoImportParams* _tmp53_ = NULL;
 		const gchar* _tmp54_ = NULL;
@@ -9568,65 +9578,65 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		PhotoImportParams* _tmp61_ = NULL;
 		const gchar* _tmp62_ = NULL;
 		gchar* _tmp63_ = NULL;
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = detected;
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = params;
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = _tmp53_->exif_md5;
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = g_strdup (_tmp54_);
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp52_->exif_md5);
-#line 1197 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp52_->exif_md5 = _tmp55_;
 #line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp52_->exif_md5 = _tmp55_;
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = detected;
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = params;
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = _tmp57_->thumbnail_md5;
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = g_strdup (_tmp58_);
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp56_->thumbnail_md5);
-#line 1198 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp56_->thumbnail_md5 = _tmp59_;
 #line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+		_tmp56_->thumbnail_md5 = _tmp59_;
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = detected;
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = params;
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = _tmp61_->full_md5;
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = g_strdup (_tmp62_);
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp60_->md5);
-#line 1199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1200 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_->md5 = _tmp63_;
-#line 9606 "Photo.c"
+#line 9616 "Photo.c"
 	}
-#line 1202 "/home/jens/Source/shotwell/src/Photo.vala"
-	orientation = ORIENTATION_TOP_LEFT;
 #line 1203 "/home/jens/Source/shotwell/src/Photo.vala"
-	exposure_time = (time_t) 0;
+	orientation = ORIENTATION_TOP_LEFT;
 #line 1204 "/home/jens/Source/shotwell/src/Photo.vala"
+	exposure_time = (time_t) 0;
+#line 1205 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp64_ = g_strdup ("");
-#line 1204 "/home/jens/Source/shotwell/src/Photo.vala"
-	title = _tmp64_;
 #line 1205 "/home/jens/Source/shotwell/src/Photo.vala"
+	title = _tmp64_;
+#line 1206 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp65_ = g_strdup ("");
-#line 1205 "/home/jens/Source/shotwell/src/Photo.vala"
-	comment = _tmp65_;
 #line 1206 "/home/jens/Source/shotwell/src/Photo.vala"
+	comment = _tmp65_;
+#line 1207 "/home/jens/Source/shotwell/src/Photo.vala"
 	rating = RATING_UNRATED;
-#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp66_ = detected;
-#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp67_ = _tmp66_->metadata;
-#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_ != NULL) {
-#line 9628 "Photo.c"
+#line 9638 "Photo.c"
 		MetadataDateTime* date_time = NULL;
 		DetectedPhotoInformation* _tmp68_ = NULL;
 		PhotoMetadata* _tmp69_ = NULL;
@@ -9648,362 +9658,362 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		DetectedPhotoInformation* _tmp87_ = NULL;
 		PhotoMetadata* _tmp88_ = NULL;
 		Rating _tmp89_ = 0;
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp68_ = detected;
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = _tmp68_->metadata;
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = photo_metadata_get_exposure_date_time (_tmp69_);
-#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
-		date_time = _tmp70_;
 #line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
+		date_time = _tmp70_;
+#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = date_time;
-#line 1215 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_ != NULL) {
-#line 9662 "Photo.c"
+#line 9672 "Photo.c"
 			MetadataDateTime* _tmp72_ = NULL;
 			time_t _tmp73_ = 0;
-#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = date_time;
-#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = metadata_date_time_get_timestamp (_tmp72_);
-#line 1216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1217 "/home/jens/Source/shotwell/src/Photo.vala"
 			exposure_time = _tmp73_;
-#line 9671 "Photo.c"
+#line 9681 "Photo.c"
 		}
-#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = detected;
-#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = _tmp74_->metadata;
-#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp76_ = photo_metadata_get_orientation (_tmp75_);
-#line 1218 "/home/jens/Source/shotwell/src/Photo.vala"
-		orientation = _tmp76_;
 #line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+		orientation = _tmp76_;
+#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = detected;
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = _tmp77_->metadata;
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp79_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 1219 "/home/jens/Source/shotwell/src/Photo.vala"
-		title = _tmp79_;
 #line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+		title = _tmp79_;
+#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp80_ = detected;
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp81_ = _tmp80_->metadata;
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp82_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 1220 "/home/jens/Source/shotwell/src/Photo.vala"
-		comment = _tmp82_;
 #line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+		comment = _tmp82_;
+#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = params;
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp84_ = detected;
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = _tmp84_->metadata;
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp86_ = photo_metadata_get_keywords (_tmp85_, NULL, NULL, NULL);
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp83_->keywords);
-#line 1221 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp83_->keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp86_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 1222 "/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"
 		_tmp87_ = detected;
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp88_ = _tmp87_->metadata;
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp89_ = photo_metadata_get_rating (_tmp88_);
-#line 1222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1223 "/home/jens/Source/shotwell/src/Photo.vala"
 		rating = _tmp89_;
-#line 1213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1214 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 9723 "Photo.c"
+#line 9733 "Photo.c"
 	}
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = detected;
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = _tmp92_->colorspace;
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp93_ != GDK_COLORSPACE_RGB) {
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = TRUE;
-#line 9733 "Photo.c"
+#line 9743 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp94_ = NULL;
 		gint _tmp95_ = 0;
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp94_ = detected;
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp95_ = _tmp94_->channels;
-#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = _tmp95_ < 3;
-#line 9743 "Photo.c"
+#line 9753 "Photo.c"
 	}
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp91_) {
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = TRUE;
-#line 9749 "Photo.c"
+#line 9759 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp96_ = NULL;
 		gint _tmp97_ = 0;
-#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp96_ = detected;
-#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp97_ = _tmp96_->bits_per_channel;
-#line 1228 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = _tmp97_ != 8;
-#line 9759 "Photo.c"
+#line 9769 "Photo.c"
 	}
-#line 1226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1227 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp90_) {
-#line 9763 "Photo.c"
+#line 9773 "Photo.c"
 		GFile* _tmp98_ = NULL;
 		gchar* _tmp99_ = NULL;
 		gchar* _tmp100_ = NULL;
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp98_ = file;
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp99_ = g_file_get_path (_tmp98_);
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1230 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = _tmp99_;
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_message ("Photo.vala:1229: Not importing %s: Unsupported color format", _tmp100_);
-#line 1229 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_free0 (_tmp100_);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1232 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 9793 "Photo.c"
+#line 9803 "Photo.c"
 	}
-#line 1237 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = params;
-#line 1237 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp102_ = _tmp101_->row;
-#line 1237 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_id_init (&_tmp102_->photo_id, PHOTO_ID_INVALID);
 #line 1238 "/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"
 	_tmp103_ = params;
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp104_ = _tmp103_->row;
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp105_ = _tmp104_->master;
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp106_ = file;
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp107_ = g_file_get_path (_tmp106_);
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp105_->filepath);
-#line 1238 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp105_->filepath = _tmp107_;
 #line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp105_->filepath = _tmp107_;
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp108_ = params;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp109_ = _tmp108_->row;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp110_ = _tmp109_->master;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp111_ = detected;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp112_ = _tmp111_->image_dim;
-#line 1239 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp110_->dim = _tmp112_;
 #line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp110_->dim = _tmp112_;
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp113_ = params;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp114_ = _tmp113_->row;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp115_ = _tmp114_->master;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp116_ = info;
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp117_ = g_file_info_get_size (_tmp116_);
-#line 1240 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp115_->filesize = _tmp117_;
 #line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp115_->filesize = _tmp117_;
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp118_ = params;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp119_ = _tmp118_->row;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp120_ = _tmp119_->master;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp121_ = timestamp;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp122_ = _tmp121_.tv_sec;
-#line 1241 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp120_->timestamp = (time_t) _tmp122_;
 #line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp120_->timestamp = (time_t) _tmp122_;
+#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp123_ = params;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp124_ = _tmp123_->row;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp125_ = exposure_time;
-#line 1242 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp124_->exposure_time = _tmp125_;
 #line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp124_->exposure_time = _tmp125_;
+#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp126_ = params;
-#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp127_ = _tmp126_->row;
-#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp128_ = orientation;
-#line 1243 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp127_->orientation = _tmp128_;
 #line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp127_->orientation = _tmp128_;
+#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp129_ = params;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp130_ = _tmp129_->row;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp131_ = _tmp130_->master;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp132_ = orientation;
-#line 1244 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp131_->original_orientation = _tmp132_;
 #line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp131_->original_orientation = _tmp132_;
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp133_ = params;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp134_ = _tmp133_->row;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp135_ = params;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp136_ = _tmp135_->import_id;
-#line 1245 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp134_->import_id = _tmp136_;
 #line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp134_->import_id = _tmp136_;
+#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp137_ = params;
-#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp138_ = _tmp137_->row;
-#line 1246 "/home/jens/Source/shotwell/src/Photo.vala"
-	event_id_init (&_tmp138_->event_id, EVENT_ID_INVALID);
 #line 1247 "/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"
 	_tmp139_ = params;
-#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp140_ = _tmp139_->row;
-#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp140_->transformations);
-#line 1247 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp140_->transformations = NULL;
 #line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp140_->transformations = NULL;
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp141_ = params;
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp142_ = _tmp141_->row;
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp143_ = detected;
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp144_ = _tmp143_->md5;
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp145_ = g_strdup (_tmp144_);
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp142_->md5);
-#line 1248 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp142_->md5 = _tmp145_;
 #line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp142_->md5 = _tmp145_;
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp146_ = params;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp147_ = _tmp146_->row;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp148_ = detected;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp149_ = _tmp148_->thumbnail_md5;
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp150_ = g_strdup (_tmp149_);
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp147_->thumbnail_md5);
-#line 1249 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp147_->thumbnail_md5 = _tmp150_;
 #line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp147_->thumbnail_md5 = _tmp150_;
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp151_ = params;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp152_ = _tmp151_->row;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp153_ = detected;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp154_ = _tmp153_->exif_md5;
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp155_ = g_strdup (_tmp154_);
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp152_->exif_md5);
-#line 1250 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp152_->exif_md5 = _tmp155_;
 #line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp152_->exif_md5 = _tmp155_;
+#line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp156_ = params;
-#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp157_ = _tmp156_->row;
-#line 1251 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp157_->time_created = (time_t) 0;
 #line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp157_->time_created = (time_t) 0;
+#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp158_ = params;
-#line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp159_ = _tmp158_->row;
-#line 1252 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp159_->flags = (guint64) 0;
 #line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp159_->flags = (guint64) 0;
+#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp160_ = params;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp161_ = _tmp160_->row;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp162_ = _tmp161_->master;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp163_ = detected;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp164_ = _tmp163_->file_format;
-#line 1253 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp162_->file_format = _tmp164_;
 #line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp162_->file_format = _tmp164_;
+#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp165_ = params;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp166_ = _tmp165_->row;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp167_ = title;
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp168_ = g_strdup (_tmp167_);
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp166_->title);
-#line 1254 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp166_->title = _tmp168_;
 #line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp166_->title = _tmp168_;
+#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp169_ = params;
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp170_ = _tmp169_->row;
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp171_ = comment;
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp172_ = g_strdup (_tmp171_);
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp170_->comment);
-#line 1255 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp170_->comment = _tmp172_;
 #line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp170_->comment = _tmp172_;
+#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp173_ = params;
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp174_ = _tmp173_->row;
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp175_ = rating;
-#line 1256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1257 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp174_->rating = _tmp175_;
-#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp176_ = params;
-#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp177_ = _tmp176_->thumbnails;
-#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp177_ != NULL) {
-#line 10005 "Photo.c"
+#line 10015 "Photo.c"
 		PhotoFileReader* reader = NULL;
 		PhotoImportParams* _tmp178_ = NULL;
 		PhotoRow* _tmp179_ = NULL;
@@ -10014,148 +10024,153 @@ ImportResult photo_prepare_for_import (PhotoImportParams* params) {
 		BackingPhotoRow* _tmp184_ = NULL;
 		const gchar* _tmp185_ = NULL;
 		PhotoFileReader* _tmp186_ = NULL;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+		PhotoFileReader* _tmp187_ = NULL;
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp178_ = params;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp179_ = _tmp178_->row;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp180_ = _tmp179_->master;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp181_ = _tmp180_->file_format;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp182_ = params;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp183_ = _tmp182_->row;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp184_ = _tmp183_->master;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp185_ = _tmp184_->filepath;
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp186_ = photo_file_format_create_reader (_tmp181_, _tmp185_);
-#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1260 "/home/jens/Source/shotwell/src/Photo.vala"
 		reader = _tmp186_;
-#line 10036 "Photo.c"
-		{
-			PhotoImportParams* _tmp187_ = NULL;
-			Thumbnails* _tmp188_ = NULL;
-			PhotoFileReader* _tmp189_ = NULL;
-			PhotoImportParams* _tmp190_ = NULL;
-			PhotoRow* _tmp191_ = NULL;
-			Orientation _tmp192_ = 0;
-			PhotoImportParams* _tmp193_ = NULL;
-			PhotoRow* _tmp194_ = NULL;
-			BackingPhotoRow* _tmp195_ = NULL;
-			Dimensions _tmp196_ = {0};
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp187_ = params;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp188_ = _tmp187_->thumbnails;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp189_ = reader;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp190_ = params;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp191_ = _tmp190_->row;
 #line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp192_ = _tmp191_->orientation;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp193_ = params;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp194_ = _tmp193_->row;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp195_ = _tmp194_->master;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp196_ = _tmp195_->dim;
-#line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
-			thumbnail_cache_generate_for_photo (_tmp188_, _tmp189_, _tmp192_, &_tmp196_, &_inner_error_);
+		_tmp187_ = reader;
 #line 1262 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_file_reader_set_role (_tmp187_, PHOTO_FILE_READER_ROLE_THUMBNAIL);
+#line 10051 "Photo.c"
+		{
+			PhotoImportParams* _tmp188_ = NULL;
+			Thumbnails* _tmp189_ = NULL;
+			PhotoFileReader* _tmp190_ = NULL;
+			PhotoImportParams* _tmp191_ = NULL;
+			PhotoRow* _tmp192_ = NULL;
+			Orientation _tmp193_ = 0;
+			PhotoImportParams* _tmp194_ = NULL;
+			PhotoRow* _tmp195_ = NULL;
+			BackingPhotoRow* _tmp196_ = NULL;
+			Dimensions _tmp197_ = {0};
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp188_ = params;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp189_ = _tmp188_->thumbnails;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp190_ = reader;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp191_ = params;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp192_ = _tmp191_->row;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp193_ = _tmp192_->orientation;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp194_ = params;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp195_ = _tmp194_->row;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp196_ = _tmp195_->master;
+#line 1264 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp197_ = _tmp196_->dim;
+#line 1264 "/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"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10072 "Photo.c"
-				goto __catch300_g_error;
+#line 10087 "Photo.c"
+				goto __catch301_g_error;
 			}
 		}
-		goto __finally300;
-		__catch300_g_error:
+		goto __finally301;
+		__catch301_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp197_ = NULL;
-			ImportResult _tmp198_ = 0;
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+			GError* _tmp198_ = NULL;
+			ImportResult _tmp199_ = 0;
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp197_ = err;
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp198_ = import_result_convert_error (_tmp197_, IMPORT_RESULT_FILE_ERROR);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
-			result = _tmp198_;
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp198_ = err;
+#line 1267 "/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"
+			result = _tmp199_;
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (comment);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (title);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_interrogator_unref0 (interrogator);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 1265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1267 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 10110 "Photo.c"
+#line 10125 "Photo.c"
 		}
-		__finally300:
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally301:
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (comment);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (title);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_interrogator_unref0 (interrogator);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/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 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1263 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0;
-#line 10135 "Photo.c"
+#line 10150 "Photo.c"
 		}
-#line 1258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1259 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 10139 "Photo.c"
+#line 10154 "Photo.c"
 	}
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (comment);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (title);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (info);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 1272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1274 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10157 "Photo.c"
+#line 10172 "Photo.c"
 }
 
 
@@ -10220,305 +10235,305 @@ void photo_create_pre_import (PhotoImportParams* params) {
 	PhotoFileSnifferOptions _tmp55_ = 0;
 	PhotoFileInterrogator* _tmp56_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_IMPORT_PARAMS (params));
-#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = params;
-#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->file;
-#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp2_;
-#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = params;
-#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_->row;
-#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp4_->photo_id, PHOTO_ID_INVALID);
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = params;
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_->row;
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_->master;
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_file_get_path (file);
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp7_->filepath);
-#line 1278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_->filepath = _tmp8_;
-#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = params;
-#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp9_->row;
-#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_->master;
-#line 1279 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&_tmp11_->dim, 0, 0);
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = params;
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_->row;
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _tmp13_->master;
-#line 1280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_->filesize = (gint64) 0;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = params;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_->row;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _tmp16_->master;
-#line 1281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_->timestamp = (time_t) 0;
-#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = params;
-#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_->row;
-#line 1282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_->exposure_time = (time_t) 0;
-#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = params;
-#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = _tmp20_->row;
-#line 1283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_->orientation = ORIENTATION_TOP_LEFT;
-#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = params;
-#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = _tmp22_->row;
-#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = _tmp23_->master;
-#line 1284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_->original_orientation = ORIENTATION_TOP_LEFT;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = params;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = _tmp25_->row;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = params;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_->import_id;
-#line 1285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_->import_id = _tmp28_;
-#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = params;
-#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp29_->row;
-#line 1286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
 	event_id_init (&_tmp30_->event_id, EVENT_ID_INVALID);
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = params;
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = _tmp31_->row;
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp32_->transformations);
-#line 1287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_->transformations = NULL;
-#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = params;
-#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_->row;
-#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp34_->md5);
-#line 1288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_->md5 = NULL;
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = params;
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_->row;
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp36_->thumbnail_md5);
-#line 1289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_->thumbnail_md5 = NULL;
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = params;
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->row;
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp38_->exif_md5);
-#line 1290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_->exif_md5 = NULL;
-#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = params;
-#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = _tmp39_->row;
-#line 1291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_->time_created = (time_t) 0;
-#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = params;
-#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = _tmp41_->row;
-#line 1292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_->flags = (guint64) 0;
-#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = params;
-#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = _tmp43_->row;
-#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_->master;
-#line 1293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_->file_format = PHOTO_FILE_FORMAT_JFIF;
-#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = params;
-#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = _tmp46_->row;
-#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp47_->title);
-#line 1294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_->title = NULL;
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = params;
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = _tmp48_->row;
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp49_->comment);
-#line 1295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1297 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_->comment = NULL;
-#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = params;
-#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = _tmp50_->row;
-#line 1296 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp51_->rating = RATING_UNRATED;
 #line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp51_->rating = RATING_UNRATED;
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = params;
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp53_ = _tmp52_->file;
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp54_ = params;
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp55_ = _tmp54_->sniffer_options;
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp56_ = photo_file_interrogator_new (_tmp53_, _tmp55_);
-#line 1298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp56_;
-#line 10396 "Photo.c"
+#line 10411 "Photo.c"
 	{
 		DetectedPhotoInformation* detected = NULL;
 		DetectedPhotoInformation* _tmp57_ = NULL;
 		gboolean _tmp58_ = FALSE;
 		gboolean _tmp59_ = FALSE;
 		DetectedPhotoInformation* _tmp60_ = NULL;
-#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (interrogator, &_inner_error_);
-#line 1300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10407 "Photo.c"
-			goto __catch301_g_error;
+#line 10422 "Photo.c"
+			goto __catch302_g_error;
 		}
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = photo_file_interrogator_get_detected_photo_information (interrogator);
-#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
 		detected = _tmp57_;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = detected;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp60_ != NULL) {
-#line 10418 "Photo.c"
+#line 10433 "Photo.c"
 			gboolean _tmp61_ = FALSE;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = photo_file_interrogator_get_is_photo_corrupted (interrogator);
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = !_tmp61_;
-#line 10424 "Photo.c"
+#line 10439 "Photo.c"
 		} else {
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = FALSE;
-#line 10428 "Photo.c"
+#line 10443 "Photo.c"
 		}
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp59_) {
-#line 10432 "Photo.c"
+#line 10447 "Photo.c"
 			DetectedPhotoInformation* _tmp62_ = NULL;
 			PhotoFileFormat _tmp63_ = 0;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp62_ = detected;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp63_ = _tmp62_->file_format;
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = _tmp63_ != PHOTO_FILE_FORMAT_UNKNOWN;
-#line 10441 "Photo.c"
+#line 10456 "Photo.c"
 		} else {
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = FALSE;
-#line 10445 "Photo.c"
+#line 10460 "Photo.c"
 		}
-#line 1302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1304 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp58_) {
-#line 10449 "Photo.c"
+#line 10464 "Photo.c"
 			PhotoImportParams* _tmp64_ = NULL;
 			PhotoRow* _tmp65_ = NULL;
 			BackingPhotoRow* _tmp66_ = NULL;
 			DetectedPhotoInformation* _tmp67_ = NULL;
 			PhotoFileFormat _tmp68_ = 0;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp64_ = params;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65_ = _tmp64_->row;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = _tmp65_->master;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = detected;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = _tmp67_->file_format;
-#line 1303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_->file_format = _tmp68_;
-#line 10467 "Photo.c"
+#line 10482 "Photo.c"
 		}
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 10471 "Photo.c"
+#line 10486 "Photo.c"
 	}
-	goto __finally301;
-	__catch301_g_error:
+	goto __finally302;
+	__catch302_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp69_ = NULL;
 		gchar* _tmp70_ = NULL;
 		GError* _tmp71_ = NULL;
 		const gchar* _tmp72_ = NULL;
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = g_file_get_path (file);
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = _tmp69_;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = err;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1307 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp72_ = _tmp71_->message;
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_debug ("Photo.vala:1305: Unable to interrogate photo file %s: %s", _tmp70_, _tmp72_);
-#line 1305 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_free0 (_tmp70_);
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 10499 "Photo.c"
+#line 10514 "Photo.c"
 	}
-	__finally301:
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally302:
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/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 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1301 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 10514 "Photo.c"
+#line 10529 "Photo.c"
 	}
-#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 1275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1277 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 10520 "Photo.c"
+#line 10535 "Photo.c"
 }
 
 
@@ -10560,51 +10575,51 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 	PhotoMetadata* _tmp41_ = NULL;
 	BackingPhotoRow* _tmp45_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1309 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (G_IS_FILE (file), NULL);
 #line 1311 "/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"
 	_detected_photo_information_unref0 (_vala_detected);
-#line 1311 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_detected = NULL;
 #line 1313 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_detected = NULL;
+#line 1315 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 1313 "/home/jens/Source/shotwell/src/Photo.vala"
-	backing = _tmp0_;
 #line 1315 "/home/jens/Source/shotwell/src/Photo.vala"
+	backing = _tmp0_;
+#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 10576 "Photo.c"
+#line 10591 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		GFileInfo* _tmp3_ = NULL;
 		GFileInfo* _tmp4_ = NULL;
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = file;
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/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 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_;
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 10590 "Photo.c"
-			goto __catch302_g_error;
+#line 10605 "Photo.c"
+			goto __catch303_g_error;
 		}
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp1_;
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1319 "/home/jens/Source/shotwell/src/Photo.vala"
 		info = _tmp4_;
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 10603 "Photo.c"
+#line 10618 "Photo.c"
 	}
-	goto __finally302;
-	__catch302_g_error:
+	goto __finally303;
+	__catch303_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp5_ = NULL;
@@ -10612,350 +10627,350 @@ BackingPhotoRow* photo_query_backing_photo_row (Photo* self, GFile* file, PhotoF
 		gchar* _tmp7_ = NULL;
 		GError* _tmp8_ = NULL;
 		const gchar* _tmp9_ = NULL;
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = file;
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = g_file_get_path (_tmp5_);
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = err;
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_->message;
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_critical ("Photo.vala:1320: Unable to read file information for %s: %s", _tmp7_, _tmp9_);
-#line 1320 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp7_);
 #line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
-		result = NULL;
+		g_critical ("Photo.vala:1322: Unable to read file information for %s: %s", _tmp7_, _tmp9_);
 #line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp7_);
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
+		result = NULL;
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 10644 "Photo.c"
+#line 10659 "Photo.c"
 		} else {
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10648 "Photo.c"
+#line 10663 "Photo.c"
 		}
-#line 1322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1324 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10652 "Photo.c"
+#line 10667 "Photo.c"
 	}
-	__finally302:
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally303:
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1318 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 10665 "Photo.c"
+#line 10680 "Photo.c"
 	}
-#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = file;
-#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = options;
-#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo_file_interrogator_new (_tmp10_, _tmp11_);
-#line 1326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp12_;
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = interrogator;
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_interrogator_interrogate (_tmp13_, &_inner_error_);
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 10691 "Photo.c"
+#line 10706 "Photo.c"
 	}
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = interrogator;
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_interrogator_get_detected_photo_information (_tmp14_);
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (_vala_detected);
-#line 1328 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_detected = _tmp15_;
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _vala_detected;
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ == NULL) {
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = TRUE;
-#line 10707 "Photo.c"
+#line 10722 "Photo.c"
 	} else {
 		PhotoFileInterrogator* _tmp18_ = NULL;
 		gboolean _tmp19_ = FALSE;
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = interrogator;
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = photo_file_interrogator_get_is_photo_corrupted (_tmp18_);
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp19_;
-#line 10717 "Photo.c"
+#line 10732 "Photo.c"
 	}
-#line 1329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1331 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 10721 "Photo.c"
+#line 10736 "Photo.c"
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_critical ("Photo.vala:1330: Photo update: %s no longer a recognized image", _tmp21_);
-#line 1330 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp21_);
 #line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
-		result = NULL;
+		g_critical ("Photo.vala:1332: Photo update: %s no longer a recognized image", _tmp21_);
 #line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp21_);
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
+		result = NULL;
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 10744 "Photo.c"
+#line 10759 "Photo.c"
 		} else {
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 10748 "Photo.c"
+#line 10763 "Photo.c"
 		}
-#line 1332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1334 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 10752 "Photo.c"
+#line 10767 "Photo.c"
 	}
-#line 1335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = info;
-#line 1335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp22_, &_tmp23_);
-#line 1335 "/home/jens/Source/shotwell/src/Photo.vala"
-	modification_time = _tmp23_;
 #line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+	modification_time = _tmp23_;
+#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = backing;
-#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = file;
-#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = g_file_get_path (_tmp25_);
-#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp24_->filepath);
-#line 1337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_->filepath = _tmp26_;
-#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = backing;
-#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = modification_time;
-#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = _tmp28_.tv_sec;
-#line 1338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_->timestamp = (time_t) _tmp29_;
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = backing;
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = info;
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = g_file_info_get_size (_tmp31_);
-#line 1339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_->filesize = _tmp32_;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = backing;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _vala_detected;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = _tmp34_->file_format;
-#line 1340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_->file_format = _tmp35_;
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = backing;
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = _vala_detected;
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->image_dim;
-#line 1341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_->dim = _tmp38_;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = _vala_detected;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = _tmp40_->metadata;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_ != NULL) {
-#line 10808 "Photo.c"
+#line 10823 "Photo.c"
 		DetectedPhotoInformation* _tmp42_ = NULL;
 		PhotoMetadata* _tmp43_ = NULL;
 		Orientation _tmp44_ = 0;
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _vala_detected;
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp42_->metadata;
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = photo_metadata_get_orientation (_tmp43_);
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = _tmp44_;
-#line 10820 "Photo.c"
+#line 10835 "Photo.c"
 	} else {
-#line 1343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ORIENTATION_TOP_LEFT;
-#line 10824 "Photo.c"
+#line 10839 "Photo.c"
 	}
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = backing;
-#line 1342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1344 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_->original_orientation = _tmp39_;
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = backing;
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (info);
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (detected) {
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 		*detected = _vala_detected;
-#line 10840 "Photo.c"
+#line 10855 "Photo.c"
 	} else {
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 10844 "Photo.c"
+#line 10859 "Photo.c"
 	}
-#line 1345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1347 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 10848 "Photo.c"
+#line 10863 "Photo.c"
 }
 
 
 static void _vala_array_add88 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10859 "Photo.c"
+#line 10874 "Photo.c"
 	}
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10865 "Photo.c"
+#line 10880 "Photo.c"
 }
 
 
 static void _vala_array_add89 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10876 "Photo.c"
+#line 10891 "Photo.c"
 	}
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10882 "Photo.c"
+#line 10897 "Photo.c"
 }
 
 
 static void _vala_array_add90 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10893 "Photo.c"
+#line 10908 "Photo.c"
 	}
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10899 "Photo.c"
+#line 10914 "Photo.c"
 }
 
 
 static void _vala_array_add91 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10910 "Photo.c"
+#line 10925 "Photo.c"
 	}
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10916 "Photo.c"
+#line 10931 "Photo.c"
 }
 
 
 static void _vala_array_add92 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10927 "Photo.c"
+#line 10942 "Photo.c"
 	}
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10933 "Photo.c"
+#line 10948 "Photo.c"
 }
 
 
 static void _vala_array_add93 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 10944 "Photo.c"
+#line 10959 "Photo.c"
 	}
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 10950 "Photo.c"
+#line 10965 "Photo.c"
 }
 
 
 static gpointer _media_metadata_ref0 (gpointer self) {
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? media_metadata_ref (self) : NULL;
-#line 10957 "Photo.c"
+#line 10972 "Photo.c"
 }
 
 
@@ -11018,256 +11033,256 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 	gint _tmp124__length1 = 0;
 	PhotoReimportMasterStateImpl* _tmp125_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1411 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 1410 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_reimport_state = NULL;
 #line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_reimport_state = NULL;
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_reader (self);
-#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1414 "/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 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1414 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp3_;
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = file;
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/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 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp5_;
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp6_;
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 11058 "Photo.c"
+#line 11073 "Photo.c"
 	}
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = backing;
-#line 1417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_ == NULL) {
-#line 11064 "Photo.c"
+#line 11079 "Photo.c"
 		GFile* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 1418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = file;
-#line 1418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = g_file_get_path (_tmp8_);
-#line 1418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp9_;
-#line 1418 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1418: Unable to retrieve photo state from %s for reimport", _tmp10_);
-#line 1418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:1420: Unable to retrieve photo state from %s for reimport", _tmp10_);
+#line 1420 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp10_);
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (reimport_state) {
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 			*reimport_state = _vala_reimport_state;
-#line 11090 "Photo.c"
+#line 11105 "Photo.c"
 		} else {
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11094 "Photo.c"
+#line 11109 "Photo.c"
 		}
-#line 1419 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1421 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11098 "Photo.c"
+#line 11113 "Photo.c"
 	}
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = detected;
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _tmp13_->colorspace;
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp14_ != GDK_COLORSPACE_RGB) {
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 11108 "Photo.c"
+#line 11123 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp15_ = NULL;
 		gint _tmp16_ = 0;
-#line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = detected;
-#line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_->channels;
-#line 1424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp16_ < 3;
-#line 11118 "Photo.c"
+#line 11133 "Photo.c"
 	}
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 11124 "Photo.c"
+#line 11139 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp17_ = NULL;
 		gint _tmp18_ = 0;
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = detected;
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_->bits_per_channel;
-#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1427 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp18_ != 8;
-#line 11134 "Photo.c"
+#line 11149 "Photo.c"
 	}
-#line 1423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1425 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 11138 "Photo.c"
+#line 11153 "Photo.c"
 		GFile* _tmp19_ = NULL;
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = file;
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = g_file_get_path (_tmp19_);
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1426: Not re-importing %s: Unsupported color format", _tmp21_);
-#line 1426 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp21_);
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
-		result = FALSE;
+		g_warning ("Photo.vala:1428: Not re-importing %s: Unsupported color format", _tmp21_);
 #line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp21_);
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
+		result = FALSE;
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (reimport_state) {
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 			*reimport_state = _vala_reimport_state;
-#line 11164 "Photo.c"
+#line 11179 "Photo.c"
 		} else {
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11168 "Photo.c"
+#line 11183 "Photo.c"
 		}
-#line 1428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1430 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 11172 "Photo.c"
+#line 11187 "Photo.c"
 	}
-#line 1432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = photo_row_new ();
-#line 1432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
 	updated_row = _tmp22_;
-#line 11178 "Photo.c"
+#line 11193 "Photo.c"
 	{
 		PhotoRow* _tmp23_ = NULL;
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = self->row;
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11185 "Photo.c"
+#line 11200 "Photo.c"
 		{
 			PhotoRow* _tmp24_ = NULL;
 			PhotoRow* _tmp25_ = NULL;
-#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = self->row;
-#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = _photo_row_ref0 (_tmp24_);
-#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_row_unref0 (updated_row);
-#line 1434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1436 "/home/jens/Source/shotwell/src/Photo.vala"
 			updated_row = _tmp25_;
-#line 11197 "Photo.c"
+#line 11212 "Photo.c"
 		}
-		__finally303:
+		__finally304:
 		{
 			PhotoRow* _tmp26_ = NULL;
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->row;
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11206 "Photo.c"
+#line 11221 "Photo.c"
 		}
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_row_unref0 (updated_row);
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 1433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1435 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 11222 "Photo.c"
+#line 11237 "Photo.c"
 		}
 	}
-#line 1438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = g_new0 (gchar*, 0 + 1);
-#line 1438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = _tmp27_;
-#line 1438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
 	list_length1 = 0;
-#line 1438 "/home/jens/Source/shotwell/src/Photo.vala"
-	_list_size_ = list_length1;
 #line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+	_list_size_ = list_length1;
+#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = updated_row;
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = _tmp28_->md5;
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = detected;
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp30_->md5;
-#line 1440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1442 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_strcmp0 (_tmp29_, _tmp31_) != 0) {
-#line 11243 "Photo.c"
+#line 11258 "Photo.c"
 		gchar** _tmp32_ = NULL;
 		gint _tmp32__length1 = 0;
 		gchar* _tmp33_ = NULL;
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = list;
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32__length1 = list_length1;
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = g_strdup ("metadata:md5");
-#line 1441 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add88 (&list, &list_length1, &_list_size_, _tmp33_);
-#line 11255 "Photo.c"
+#line 11270 "Photo.c"
 	}
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = updated_row;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = _tmp34_->master;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_->original_orientation;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = backing;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->original_orientation;
-#line 1443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp36_ != _tmp38_) {
-#line 11269 "Photo.c"
+#line 11284 "Photo.c"
 		gchar** _tmp39_ = NULL;
 		gint _tmp39__length1 = 0;
 		gchar* _tmp40_ = NULL;
@@ -11275,33 +11290,33 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		BackingPhotoRow* _tmp42_ = NULL;
 		BackingPhotoRow* _tmp43_ = NULL;
 		Orientation _tmp44_ = 0;
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = list;
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39__length1 = list_length1;
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = g_strdup ("image:orientation");
-#line 1444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1446 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add89 (&list, &list_length1, &_list_size_, _tmp40_);
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = updated_row;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _tmp41_->master;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = backing;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = _tmp43_->original_orientation;
-#line 1445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1447 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_->original_orientation = _tmp44_;
-#line 11295 "Photo.c"
+#line 11310 "Photo.c"
 	}
-#line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = detected;
-#line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = _tmp45_->metadata;
-#line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_ != NULL) {
-#line 11303 "Photo.c"
+#line 11318 "Photo.c"
 		MetadataDateTime* date_time = NULL;
 		DetectedPhotoInformation* _tmp47_ = NULL;
 		PhotoMetadata* _tmp48_ = NULL;
@@ -11327,204 +11342,204 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		DetectedPhotoInformation* _tmp78_ = NULL;
 		PhotoMetadata* _tmp79_ = NULL;
 		Rating _tmp80_ = 0;
-#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = detected;
-#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_->metadata;
-#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = photo_metadata_get_exposure_date_time (_tmp48_);
-#line 1449 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp49_;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = date_time;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp51_ != NULL) {
-#line 11341 "Photo.c"
+#line 11356 "Photo.c"
 			PhotoRow* _tmp52_ = NULL;
 			time_t _tmp53_ = 0;
 			MetadataDateTime* _tmp54_ = NULL;
 			time_t _tmp55_ = 0;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = updated_row;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = _tmp52_->exposure_time;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = date_time;
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = metadata_date_time_get_timestamp (_tmp54_);
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = _tmp53_ != _tmp55_;
-#line 11356 "Photo.c"
+#line 11371 "Photo.c"
 		} else {
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = FALSE;
-#line 11360 "Photo.c"
+#line 11375 "Photo.c"
 		}
-#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1452 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp50_) {
-#line 11364 "Photo.c"
+#line 11379 "Photo.c"
 			gchar** _tmp56_ = NULL;
 			gint _tmp56__length1 = 0;
 			gchar* _tmp57_ = NULL;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = list;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56__length1 = list_length1;
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp57_ = g_strdup ("metadata:exposure-time");
-#line 1451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add90 (&list, &list_length1, &_list_size_, _tmp57_);
-#line 11376 "Photo.c"
+#line 11391 "Photo.c"
 		}
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = updated_row;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = _tmp58_->title;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = detected;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_->metadata;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = _tmp62_;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp64_ = g_strcmp0 (_tmp59_, _tmp63_) != 0;
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp63_);
-#line 1453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1455 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp64_) {
-#line 11396 "Photo.c"
+#line 11411 "Photo.c"
 			gchar** _tmp65_ = NULL;
 			gint _tmp65__length1 = 0;
 			gchar* _tmp66_ = NULL;
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65_ = list;
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65__length1 = list_length1;
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = g_strdup ("metadata:name");
-#line 1454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add91 (&list, &list_length1, &_list_size_, _tmp66_);
-#line 11408 "Photo.c"
+#line 11423 "Photo.c"
 		}
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp67_ = updated_row;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp68_ = _tmp67_->comment;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = detected;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = _tmp69_->metadata;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp72_ = _tmp71_;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp73_ = g_strcmp0 (_tmp68_, _tmp72_) != 0;
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp72_);
-#line 1456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1458 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp73_) {
-#line 11428 "Photo.c"
+#line 11443 "Photo.c"
 			gchar** _tmp74_ = NULL;
 			gint _tmp74__length1 = 0;
 			gchar* _tmp75_ = NULL;
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp74_ = list;
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp74__length1 = list_length1;
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = g_strdup ("metadata:comment");
-#line 1457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add92 (&list, &list_length1, &_list_size_, _tmp75_);
-#line 11440 "Photo.c"
+#line 11455 "Photo.c"
 		}
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp76_ = updated_row;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = _tmp76_->rating;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = detected;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp79_ = _tmp78_->metadata;
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp80_ = photo_metadata_get_rating (_tmp79_);
-#line 1459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1461 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp77_ != _tmp80_) {
-#line 11454 "Photo.c"
+#line 11469 "Photo.c"
 			gchar** _tmp81_ = NULL;
 			gint _tmp81__length1 = 0;
 			gchar* _tmp82_ = NULL;
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp81_ = list;
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp81__length1 = list_length1;
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp82_ = g_strdup ("metadata:rating");
-#line 1460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1462 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add93 (&list, &list_length1, &_list_size_, _tmp82_);
-#line 11466 "Photo.c"
+#line 11481 "Photo.c"
 		}
-#line 1448 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1450 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11470 "Photo.c"
+#line 11485 "Photo.c"
 	}
-#line 1463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp83_ = updated_row;
-#line 1463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp84_ = backing;
-#line 1463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = _backing_photo_row_ref0 (_tmp84_);
-#line 1463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp83_->master);
-#line 1463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp83_->master = _tmp85_;
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_ = updated_row;
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp87_ = detected;
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp88_ = _tmp87_->md5;
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = g_strdup (_tmp88_);
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp86_->md5);
-#line 1464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_->md5 = _tmp89_;
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp90_ = updated_row;
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp91_ = detected;
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = _tmp91_->exif_md5;
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = g_strdup (_tmp92_);
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp90_->exif_md5);
-#line 1465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1467 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp90_->exif_md5 = _tmp93_;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp94_ = updated_row;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp95_ = detected;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = _tmp95_->thumbnail_md5;
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = g_strdup (_tmp96_);
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp94_->thumbnail_md5);
-#line 1466 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp94_->thumbnail_md5 = _tmp97_;
 #line 1468 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp94_->thumbnail_md5 = _tmp97_;
+#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = NULL;
-#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp98_ = detected;
-#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp99_ = _tmp98_->metadata;
-#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp99_ != NULL) {
-#line 11526 "Photo.c"
+#line 11541 "Photo.c"
 		DetectedPhotoInformation* _tmp100_ = NULL;
 		PhotoMetadata* _tmp101_ = NULL;
 		PhotoMetadata* _tmp102_ = NULL;
@@ -11545,180 +11560,180 @@ gboolean photo_prepare_for_reimport_master (Photo* self, PhotoReimportMasterStat
 		DetectedPhotoInformation* _tmp119_ = NULL;
 		PhotoMetadata* _tmp120_ = NULL;
 		Rating _tmp121_ = 0;
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = detected;
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = _tmp100_->metadata;
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp102_ = _media_metadata_ref0 (_tmp101_);
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 1470 "/home/jens/Source/shotwell/src/Photo.vala"
-		metadata = _tmp102_;
 #line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+		metadata = _tmp102_;
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = detected;
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp104_ = _tmp103_->metadata;
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp105_ = photo_metadata_get_exposure_date_time (_tmp104_);
-#line 1472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp105_;
-#line 1473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp106_ = date_time;
-#line 1473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1475 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp106_ != NULL) {
-#line 11569 "Photo.c"
+#line 11584 "Photo.c"
 			PhotoRow* _tmp107_ = NULL;
 			MetadataDateTime* _tmp108_ = NULL;
 			time_t _tmp109_ = 0;
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp107_ = updated_row;
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = date_time;
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp109_ = metadata_date_time_get_timestamp (_tmp108_);
-#line 1474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp107_->exposure_time = _tmp109_;
-#line 11581 "Photo.c"
+#line 11596 "Photo.c"
 		}
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp110_ = updated_row;
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp111_ = detected;
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp112_ = _tmp111_->metadata;
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp113_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp110_->title);
-#line 1476 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp110_->title = _tmp113_;
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114_ = updated_row;
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp115_ = detected;
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp116_ = _tmp115_->metadata;
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp117_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp114_->comment);
-#line 1477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1479 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114_->comment = _tmp117_;
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp118_ = updated_row;
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp119_ = detected;
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp120_ = _tmp119_->metadata;
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = photo_metadata_get_rating (_tmp120_);
-#line 1478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1480 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp118_->rating = _tmp121_;
-#line 1469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1471 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 11619 "Photo.c"
+#line 11634 "Photo.c"
 	}
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp122_ = updated_row;
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp123_ = metadata;
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp124_ = list;
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp124__length1 = list_length1;
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp125_ = photo_reimport_master_state_impl_new (_tmp122_, _tmp123_, _tmp124_, _tmp124__length1);
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 1481 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
 #line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_reimport_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp125_, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = (_vala_array_free (list, list_length1, (GDestroyNotify) g_free), NULL);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (updated_row);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (reimport_state) {
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 		*reimport_state = _vala_reimport_state;
-#line 11653 "Photo.c"
+#line 11668 "Photo.c"
 	} else {
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_reimport_state);
-#line 11657 "Photo.c"
+#line 11672 "Photo.c"
 	}
-#line 1483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1485 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 11661 "Photo.c"
+#line 11676 "Photo.c"
 }
 
 
 static void photo_real_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) {
-#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1488 "/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 1486 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 11670 "Photo.c"
+#line 11685 "Photo.c"
 }
 
 
 void photo_apply_user_metadata_for_reimport (Photo* self, PhotoMetadata* metadata) {
-#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1486 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1488 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->apply_user_metadata_for_reimport (self, metadata);
-#line 11679 "Photo.c"
+#line 11694 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_master_state_ref0 (gpointer self) {
-#line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_master_state_ref (self) : NULL;
-#line 11686 "Photo.c"
+#line 11701 "Photo.c"
 }
 
 
 static void _vala_array_add94 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11697 "Photo.c"
+#line 11712 "Photo.c"
 	}
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 11703 "Photo.c"
+#line 11718 "Photo.c"
 }
 
 
 static void _vala_array_add95 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 11714 "Photo.c"
+#line 11729 "Photo.c"
 	}
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 11720 "Photo.c"
+#line 11735 "Photo.c"
 }
 
 
@@ -11737,56 +11752,56 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 	gboolean _tmp33_ = FALSE;
 	gboolean _tmp35_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1489 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1489 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state));
-#line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 1490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1492 "/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 1490 "/home/jens/Source/shotwell/src/Photo.vala"
-	reimport_state = _tmp1_;
 #line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+	reimport_state = _tmp1_;
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_table_get_instance ();
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = reimport_state->row;
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_table_reimport (_tmp3_, _tmp4_, &_inner_error_);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp3_);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (reimport_state);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 11769 "Photo.c"
+#line 11784 "Photo.c"
 		} else {
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (reimport_state);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/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 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 11779 "Photo.c"
+#line 11794 "Photo.c"
 		}
 	}
 	{
 		PhotoRow* _tmp5_ = NULL;
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = self->row;
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 11788 "Photo.c"
+#line 11803 "Photo.c"
 		{
 			BackingPhotoRow* original_master = NULL;
 			PhotoRow* _tmp6_ = NULL;
@@ -11802,191 +11817,191 @@ void photo_finish_reimport_master (Photo* self, PhotoReimportMasterState* state,
 			PhotoRow* _tmp16_ = NULL;
 			BackingPhotoRow* _tmp17_ = NULL;
 			gboolean _tmp18_ = FALSE;
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_->master;
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _backing_photo_row_ref0 (_tmp7_);
-#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
 			original_master = _tmp8_;
-#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = reimport_state->row;
-#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _photo_row_ref0 (_tmp9_);
-#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_row_unref0 (self->row);
-#line 1497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
 			self->row = _tmp10_;
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->row;
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = original_master;
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _backing_photo_row_ref0 (_tmp12_);
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_tmp11_->master);
-#line 1498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_->master = _tmp13_;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->row;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _tmp14_->master;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = reimport_state->row;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = _tmp16_->master;
-#line 1499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_row_copy_from (_tmp15_, _tmp17_);
-#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = reimport_state->metadata_only;
-#line 1500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1502 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp18_) {
-#line 1501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1503 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_internal_remove_all_transformations (self, FALSE);
-#line 11846 "Photo.c"
+#line 11861 "Photo.c"
 			}
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (original_master);
-#line 11850 "Photo.c"
+#line 11865 "Photo.c"
 		}
-		__finally304:
+		__finally305:
 		{
 			PhotoRow* _tmp19_ = NULL;
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 11859 "Photo.c"
+#line 11874 "Photo.c"
 		}
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 11871 "Photo.c"
+#line 11886 "Photo.c"
 			} else {
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_master_state_unref0 (reimport_state);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/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 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1496 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 11881 "Photo.c"
+#line 11896 "Photo.c"
 			}
 		}
 	}
-#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = reimport_state->metadata;
-#line 1504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1506 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_ != NULL) {
-#line 11889 "Photo.c"
+#line 11904 "Photo.c"
 		PhotoMetadata* _tmp21_ = NULL;
-#line 1505 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = reimport_state->metadata;
-#line 1505 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_apply_user_metadata_for_reimport (self, _tmp21_);
-#line 11895 "Photo.c"
+#line 11910 "Photo.c"
 	}
-#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = reimport_state->metadata_only;
-#line 1507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp22_) {
-#line 11901 "Photo.c"
+#line 11916 "Photo.c"
 		gchar** _tmp23_ = NULL;
 		gint _tmp23__length1 = 0;
 		gchar* _tmp24_ = NULL;
 		gboolean _tmp25_ = FALSE;
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = reimport_state->alterations;
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23__length1 = reimport_state->alterations_length1;
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = g_strdup ("image:master");
-#line 1508 "/home/jens/Source/shotwell/src/Photo.vala"
+#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 1509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = photo_is_master_baseline (self);
-#line 1509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1511 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp25_) {
-#line 11918 "Photo.c"
+#line 11933 "Photo.c"
 			gchar** _tmp26_ = NULL;
 			gint _tmp26__length1 = 0;
 			gchar* _tmp27_ = NULL;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = reimport_state->alterations;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26__length1 = reimport_state->alterations_length1;
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1512 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = g_strdup ("image:baseline");
-#line 1510 "/home/jens/Source/shotwell/src/Photo.vala"
+#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 11930 "Photo.c"
+#line 11945 "Photo.c"
 		}
 	}
-#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = reimport_state->alterations;
-#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28__length1 = reimport_state->alterations_length1;
-#line 1513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1515 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28__length1 > 0) {
-#line 11939 "Photo.c"
+#line 11954 "Photo.c"
 		gchar** _tmp29_ = NULL;
 		gint _tmp29__length1 = 0;
 		Alteration* _tmp30_ = NULL;
 		Alteration* _tmp31_ = NULL;
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = reimport_state->alterations;
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29__length1 = reimport_state->alterations_length1;
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = alteration_new_from_array (_tmp29_, _tmp29__length1);
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = _tmp30_;
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp31_);
-#line 1514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp31_);
-#line 11956 "Photo.c"
+#line 11971 "Photo.c"
 	}
-#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = reimport_state->metadata;
-#line 1516 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_notify_master_reimported (self, _tmp32_);
 #line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_notify_master_reimported (self, _tmp32_);
+#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = photo_is_master_baseline (self);
-#line 1518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1520 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp33_) {
-#line 11966 "Photo.c"
+#line 11981 "Photo.c"
 		PhotoMetadata* _tmp34_ = NULL;
-#line 1519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = reimport_state->metadata;
-#line 1519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_reimported (self, _tmp34_);
-#line 11972 "Photo.c"
+#line 11987 "Photo.c"
 	}
-#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_is_master_source (self);
-#line 1521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1523 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 11978 "Photo.c"
+#line 11993 "Photo.c"
 		PhotoMetadata* _tmp36_ = NULL;
-#line 1522 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = reimport_state->metadata;
-#line 1522 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1524 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_source_reimported (self, _tmp36_);
-#line 11984 "Photo.c"
+#line 11999 "Photo.c"
 	}
-#line 1489 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1491 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (reimport_state);
-#line 11988 "Photo.c"
+#line 12003 "Photo.c"
 }
 
 
@@ -12005,175 +12020,175 @@ static gboolean photo_verify_file_for_reimport (Photo* self, GFile* file, Backin
 	DetectedPhotoInformation* _tmp8_ = NULL;
 	GdkColorspace _tmp9_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1526 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 1528 "/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"
 	_tmp1_ = file;
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/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 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (_vala_detected);
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_detected = _tmp2_;
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 12027 "Photo.c"
+#line 12042 "Photo.c"
 	}
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_vala_backing);
-#line 1528 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_backing = _tmp4_;
 #line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_backing = _tmp4_;
+#line 1532 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _vala_backing;
-#line 1530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1532 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_tmp0_);
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (backing) {
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			*backing = _vala_backing;
-#line 12049 "Photo.c"
+#line 12064 "Photo.c"
 		} else {
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12053 "Photo.c"
+#line 12068 "Photo.c"
 		}
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 12059 "Photo.c"
+#line 12074 "Photo.c"
 		} else {
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12063 "Photo.c"
+#line 12078 "Photo.c"
 		}
-#line 1531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1533 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12067 "Photo.c"
+#line 12082 "Photo.c"
 	}
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _vala_detected;
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_->colorspace;
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ != GDK_COLORSPACE_RGB) {
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = TRUE;
-#line 12077 "Photo.c"
+#line 12092 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
-#line 1536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _vala_detected;
-#line 1536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp10_->channels;
-#line 1536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp11_ < 3;
-#line 12087 "Photo.c"
+#line 12102 "Photo.c"
 	}
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = TRUE;
-#line 12093 "Photo.c"
+#line 12108 "Photo.c"
 	} else {
 		DetectedPhotoInformation* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _vala_detected;
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp12_->bits_per_channel;
-#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1539 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp13_ != 8;
-#line 12103 "Photo.c"
+#line 12118 "Photo.c"
 	}
-#line 1535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1537 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 12107 "Photo.c"
+#line 12122 "Photo.c"
 		GFile* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
 		gchar* _tmp16_ = NULL;
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = file;
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = g_file_get_path (_tmp14_);
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_;
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:1538: Not re-importing %s: Unsupported color format", _tmp16_);
-#line 1538 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp16_);
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
-		result = FALSE;
+		g_warning ("Photo.vala:1540: Not re-importing %s: Unsupported color format", _tmp16_);
 #line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp16_);
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
+		result = FALSE;
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_tmp0_);
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (backing) {
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			*backing = _vala_backing;
-#line 12129 "Photo.c"
+#line 12144 "Photo.c"
 		} else {
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (_vala_backing);
-#line 12133 "Photo.c"
+#line 12148 "Photo.c"
 		}
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (detected) {
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			*detected = _vala_detected;
-#line 12139 "Photo.c"
+#line 12154 "Photo.c"
 		} else {
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (_vala_detected);
-#line 12143 "Photo.c"
+#line 12158 "Photo.c"
 		}
-#line 1540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1542 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12147 "Photo.c"
+#line 12162 "Photo.c"
 	}
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp0_);
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (backing) {
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		*backing = _vala_backing;
-#line 12157 "Photo.c"
+#line 12172 "Photo.c"
 	} else {
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (_vala_backing);
-#line 12161 "Photo.c"
+#line 12176 "Photo.c"
 	}
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (detected) {
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		*detected = _vala_detected;
-#line 12167 "Photo.c"
+#line 12182 "Photo.c"
 	} else {
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (_vala_detected);
-#line 12171 "Photo.c"
+#line 12186 "Photo.c"
 	}
-#line 1543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1545 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12175 "Photo.c"
+#line 12190 "Photo.c"
 }
 
 
@@ -12195,130 +12210,130 @@ gboolean photo_prepare_for_reimport_editable (Photo* self, PhotoReimportEditable
 	PhotoMetadata* _tmp9_ = NULL;
 	PhotoReimportEditableStateImpl* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1549 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1550 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 1548 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = NULL;
 #line 1550 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = NULL;
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_file (self);
-#line 1550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp0_;
-#line 1551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 1551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1553 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12219 "Photo.c"
+#line 12234 "Photo.c"
 		} else {
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12223 "Photo.c"
+#line 12238 "Photo.c"
 		}
-#line 1552 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1554 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12227 "Photo.c"
+#line 12242 "Photo.c"
 	}
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_verify_file_for_reimport (self, _tmp3_, &_tmp4_, &_tmp5_, &_inner_error_);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp4_;
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp5_;
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp6_;
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 12255 "Photo.c"
+#line 12270 "Photo.c"
 	}
-#line 1556 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1558 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp2_) {
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (backing);
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12271 "Photo.c"
+#line 12286 "Photo.c"
 		} else {
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12275 "Photo.c"
+#line 12290 "Photo.c"
 		}
-#line 1557 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12279 "Photo.c"
+#line 12294 "Photo.c"
 	}
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = backing;
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = detected;
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_->metadata;
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = photo_reimport_editable_state_impl_new (_tmp7_, _tmp9_);
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 1559 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
 #line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 12305 "Photo.c"
+#line 12320 "Photo.c"
 	} else {
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 12309 "Photo.c"
+#line 12324 "Photo.c"
 	}
-#line 1561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1563 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12313 "Photo.c"
+#line 12328 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_editable_state_ref0 (gpointer self) {
-#line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_editable_state_ref (self) : NULL;
-#line 12320 "Photo.c"
+#line 12335 "Photo.c"
 }
 
 
@@ -12345,81 +12360,81 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 	gboolean _tmp46_ = FALSE;
 	gboolean _tmp49_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state));
-#line 1566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_editable_id (self, &_tmp0_);
-#line 1566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1568 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_id = _tmp0_;
-#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = backing_photo_id_is_invalid (&editable_id);
-#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1569 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 1568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 12361 "Photo.c"
+#line 12376 "Photo.c"
 	}
-#line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = state;
-#line 1570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1572 "/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 1570 "/home/jens/Source/shotwell/src/Photo.vala"
-	reimport_state = _tmp3_;
 #line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
+	reimport_state = _tmp3_;
+#line 1574 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = reimport_state;
-#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_->metadata_only;
-#line 1572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1574 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp5_) {
-#line 12375 "Photo.c"
+#line 12390 "Photo.c"
 		BackingPhotoTable* _tmp6_ = NULL;
 		BackingPhotoTable* _tmp7_ = NULL;
 		PhotoReimportEditableStateImpl* _tmp8_ = NULL;
 		BackingPhotoRow* _tmp9_ = NULL;
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = backing_photo_table_get_instance ();
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = reimport_state;
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_->backing_state;
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		backing_photo_table_update (_tmp7_, _tmp9_, &_inner_error_);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp7_);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 12402 "Photo.c"
+#line 12417 "Photo.c"
 			} else {
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/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 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 12412 "Photo.c"
+#line 12427 "Photo.c"
 			}
 		}
 		{
 			PhotoRow* _tmp10_ = NULL;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 12421 "Photo.c"
+#line 12436 "Photo.c"
 			{
 				PhotoReimportEditableStateImpl* _tmp11_ = NULL;
 				BackingPhotoRow* _tmp12_ = NULL;
@@ -12427,58 +12442,58 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 				PhotoReimportEditableStateImpl* _tmp14_ = NULL;
 				BackingPhotoRow* _tmp15_ = NULL;
 				Orientation _tmp16_ = 0;
-#line 1576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = reimport_state;
-#line 1576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->backing_state;
-#line 1576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _backing_photo_row_ref0 (_tmp12_);
-#line 1576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (self->priv->editable);
-#line 1576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->editable = _tmp13_;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = reimport_state;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp14_->backing_state;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->original_orientation;
-#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1579 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_set_orientation (self, _tmp16_);
-#line 1578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1580 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_internal_remove_all_transformations (self, FALSE);
-#line 12449 "Photo.c"
+#line 12464 "Photo.c"
 			}
-			__finally305:
+			__finally306:
 			{
 				PhotoRow* _tmp17_ = NULL;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = self->row;
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 12458 "Photo.c"
+#line 12473 "Photo.c"
 			}
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 12470 "Photo.c"
+#line 12485 "Photo.c"
 				} else {
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_reimport_editable_state_unref0 (reimport_state);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/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 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 1575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1577 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 12480 "Photo.c"
+#line 12495 "Photo.c"
 				}
 			}
 		}
@@ -12486,23 +12501,23 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		PhotoReimportEditableStateImpl* _tmp18_ = NULL;
 		BackingPhotoRow* _tmp19_ = NULL;
 		Orientation _tmp20_ = 0;
-#line 1581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = reimport_state;
-#line 1581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_->backing_state;
-#line 1581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_->original_orientation;
-#line 1581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1583 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_orientation (self, _tmp20_);
-#line 12496 "Photo.c"
+#line 12511 "Photo.c"
 	}
-#line 1584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = reimport_state;
-#line 1584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = _tmp21_->metadata;
-#line 1584 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 12504 "Photo.c"
+#line 12519 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp23_ = NULL;
 		PhotoMetadata* _tmp24_ = NULL;
 		gchar* _tmp25_ = NULL;
@@ -12516,127 +12531,127 @@ void photo_finish_reimport_editable (Photo* self, PhotoReimportEditableState* st
 		Rating _tmp33_ = 0;
 		PhotoReimportEditableStateImpl* _tmp34_ = NULL;
 		PhotoMetadata* _tmp35_ = NULL;
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = reimport_state;
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = _tmp23_->metadata;
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = _tmp25_;
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp26_);
-#line 1585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp26_);
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = reimport_state;
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp27_->metadata;
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = _tmp29_;
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp30_);
-#line 1586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp30_);
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = reimport_state;
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp31_->metadata;
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = photo_metadata_get_rating (_tmp32_);
-#line 1587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1589 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp33_);
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = reimport_state;
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = _tmp34_->metadata;
-#line 1588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1590 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_apply_user_metadata_for_reimport (self, _tmp35_);
-#line 12556 "Photo.c"
+#line 12571 "Photo.c"
 	}
-#line 1591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
-#line 1591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = _tmp36_;
-#line 1592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = reimport_state;
-#line 1592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = _tmp37_->metadata_only;
-#line 1592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1594 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp38_) {
-#line 12568 "Photo.c"
+#line 12583 "Photo.c"
 		const gchar* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
-#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = list;
-#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = g_strconcat (_tmp39_, "image:editable,image:baseline", NULL);
-#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (list);
-#line 1593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
 		list = _tmp40_;
-#line 12579 "Photo.c"
+#line 12594 "Photo.c"
 	}
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = list;
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = alteration_new_from_list (_tmp41_);
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = _tmp42_;
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp43_);
-#line 1595 "/home/jens/Source/shotwell/src/Photo.vala"
-	_alteration_unref0 (_tmp43_);
 #line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
+	_alteration_unref0 (_tmp43_);
+#line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = reimport_state;
-#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_->metadata;
-#line 1597 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_notify_editable_reimported (self, _tmp45_);
 #line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_notify_editable_reimported (self, _tmp45_);
+#line 1601 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = photo_is_editable_baseline (self);
-#line 1599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1601 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp46_) {
-#line 12601 "Photo.c"
+#line 12616 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp47_ = NULL;
 		PhotoMetadata* _tmp48_ = NULL;
-#line 1600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = reimport_state;
-#line 1600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_->metadata;
-#line 1600 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_reimported (self, _tmp48_);
-#line 12610 "Photo.c"
+#line 12625 "Photo.c"
 	}
-#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = photo_is_editable_source (self);
-#line 1602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1604 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp49_) {
-#line 12616 "Photo.c"
+#line 12631 "Photo.c"
 		PhotoReimportEditableStateImpl* _tmp50_ = NULL;
 		PhotoMetadata* _tmp51_ = NULL;
-#line 1603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp50_ = reimport_state;
-#line 1603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = _tmp50_->metadata;
-#line 1603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1605 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_source_reimported (self, _tmp51_);
-#line 12625 "Photo.c"
+#line 12640 "Photo.c"
 	}
-#line 1565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (list);
-#line 1565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1567 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (reimport_state);
-#line 12631 "Photo.c"
+#line 12646 "Photo.c"
 }
 
 
 static gpointer _photo_reimport_raw_development_state_ref0 (gpointer self) {
-#line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_reimport_raw_development_state_ref (self) : NULL;
-#line 12638 "Photo.c"
+#line 12653 "Photo.c"
 }
 
 
@@ -12653,56 +12668,56 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 	PhotoReimportRawDevelopmentStateImpl* _tmp20_ = NULL;
 	gint _tmp21_ = 0;
 	GError * _inner_error_ = NULL;
-#line 1607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1609 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 1608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1610 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 1608 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = NULL;
 #line 1610 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = NULL;
+#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_raw_developer_files (self);
-#line 1610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
 	files = _tmp0_;
-#line 1611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = files;
-#line 1611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1613 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (files);
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 12677 "Photo.c"
+#line 12692 "Photo.c"
 		} else {
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12681 "Photo.c"
+#line 12696 "Photo.c"
 		}
-#line 1612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 12685 "Photo.c"
+#line 12700 "Photo.c"
 	}
-#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_reimport_raw_development_state_impl_new ();
-#line 1614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp2_;
-#line 12691 "Photo.c"
+#line 12706 "Photo.c"
 	{
 		GeeIterator* _file_it = NULL;
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = files;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_file_it = _tmp4_;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 12704 "Photo.c"
+#line 12719 "Photo.c"
 			GeeIterator* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
 			GFile* file = NULL;
@@ -12719,121 +12734,121 @@ gboolean photo_prepare_for_reimport_raw_development (Photo* self, PhotoReimportR
 			BackingPhotoRow* _tmp15_ = NULL;
 			DetectedPhotoInformation* _tmp16_ = NULL;
 			PhotoMetadata* _tmp17_ = NULL;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _file_it;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = gee_iterator_next (_tmp5_);
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp6_) {
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12729 "Photo.c"
+#line 12744 "Photo.c"
 			}
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _file_it;
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_iterator_get (_tmp7_);
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			file = (GFile*) _tmp8_;
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = file;
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_verify_file_for_reimport (self, _tmp10_, &_tmp11_, &_tmp12_, &_inner_error_);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing = _tmp11_;
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			detected = _tmp12_;
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp13_;
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_file_it);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (files);
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 				return FALSE;
-#line 12769 "Photo.c"
+#line 12784 "Photo.c"
 			}
-#line 1619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1621 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp9_) {
-#line 1620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 1620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 1620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 1620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
 				continue;
-#line 12781 "Photo.c"
+#line 12796 "Photo.c"
 			}
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = reimport_state;
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = backing;
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = detected;
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = _tmp16_->metadata;
-#line 1622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1624 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_reimport_raw_development_state_impl_add (_tmp14_, _tmp15_, _tmp17_);
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 12799 "Photo.c"
+#line 12814 "Photo.c"
 		}
-#line 1616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_file_it);
-#line 12803 "Photo.c"
+#line 12818 "Photo.c"
 	}
-#line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = reimport_state;
-#line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _photo_reimport_raw_development_state_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState));
-#line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 1625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = _tmp19_;
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = reimport_state;
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = photo_reimport_raw_development_state_impl_get_size (_tmp20_);
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp21_ > 0;
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (files);
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 12827 "Photo.c"
+#line 12842 "Photo.c"
 	} else {
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_raw_development_state_unref0 (_vala_state);
-#line 12831 "Photo.c"
+#line 12846 "Photo.c"
 	}
-#line 1626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1628 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 12835 "Photo.c"
+#line 12850 "Photo.c"
 }
 
 
@@ -12850,41 +12865,41 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 	Alteration* _tmp38_ = NULL;
 	Alteration* _tmp39_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE (state));
-#line 1631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_file_format (self);
-#line 1631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1633 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
-#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 12862 "Photo.c"
+#line 12877 "Photo.c"
 	}
-#line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = state;
-#line 1634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1636 "/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 1634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
 	reimport_state = _tmp2_;
-#line 12870 "Photo.c"
+#line 12885 "Photo.c"
 	{
 		GeeIterator* _dev_it = NULL;
 		PhotoReimportRawDevelopmentStateImpl* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reimport_state;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_->list;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_dev_it = _tmp5_;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 12886 "Photo.c"
+#line 12901 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			PhotoReimportRawDevelopmentStateImplDevToReimport* dev = NULL;
@@ -12892,105 +12907,105 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 			gpointer _tmp9_ = NULL;
 			PhotoReimportRawDevelopmentStateImpl* _tmp10_ = NULL;
 			gboolean _tmp11_ = FALSE;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _dev_it;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 12902 "Photo.c"
+#line 12917 "Photo.c"
 			}
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _dev_it;
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			dev = (PhotoReimportRawDevelopmentStateImplDevToReimport*) _tmp9_;
-#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = reimport_state;
-#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_->metadata_only;
-#line 1637 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1639 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp11_) {
-#line 12916 "Photo.c"
+#line 12931 "Photo.c"
 				BackingPhotoTable* _tmp12_ = NULL;
 				BackingPhotoTable* _tmp13_ = NULL;
 				PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp14_ = NULL;
 				BackingPhotoRow* _tmp15_ = NULL;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = backing_photo_table_get_instance ();
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = dev;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp14_->backing;
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_update (_tmp13_, _tmp15_, &_inner_error_);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp13_);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_propagate_error (error, _inner_error_);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_dev_it);
-#line 1638 "/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 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 12947 "Photo.c"
+#line 12962 "Photo.c"
 					} else {
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_dev_it);
-#line 1638 "/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 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/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 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_clear_error (&_inner_error_);
-#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
 						return;
-#line 12961 "Photo.c"
+#line 12976 "Photo.c"
 					}
 				}
 				{
 					PhotoRow* _tmp16_ = NULL;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = self->row;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_row);
-#line 12970 "Photo.c"
+#line 12985 "Photo.c"
 					{
 						gint _tmp17_ = 0;
 						RawDeveloper* _tmp18_ = NULL;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = raw_developer_as_array (&_tmp17_);
-#line 12976 "Photo.c"
+#line 12991 "Photo.c"
 						{
 							RawDeveloper* d_collection = NULL;
 							gint d_collection_length1 = 0;
 							gint _d_collection_size_ = 0;
 							gint d_it = 0;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection = _tmp18_;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection_length1 = _tmp17_;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 							for (d_it = 0; d_it < _tmp17_; d_it = d_it + 1) {
-#line 12988 "Photo.c"
+#line 13003 "Photo.c"
 								RawDeveloper d = 0;
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 								d = d_collection[d_it];
-#line 12992 "Photo.c"
+#line 13007 "Photo.c"
 								{
 									BackingPhotoID id = {0};
 									PhotoRow* _tmp19_ = NULL;
@@ -13000,154 +13015,154 @@ void photo_finish_reimport_raw_development (Photo* self, PhotoReimportRawDevelop
 									BackingPhotoID _tmp22_ = {0};
 									BackingPhotoID _tmp23_ = {0};
 									gint64 _tmp24_ = 0LL;
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp19_ = self->row;
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp20_ = _tmp19_->development_ids;
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp20__length1 = _tmp19_->development_ids_length1;
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp21_ = d;
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp22_ = _tmp20_[_tmp21_];
-#line 1643 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
 									id = _tmp22_;
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp23_ = id;
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 									_tmp24_ = _tmp23_.id;
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 									if (_tmp24_ != BACKING_PHOTO_ID_INVALID) {
-#line 13020 "Photo.c"
+#line 13035 "Photo.c"
 										BackingPhotoRow* bpr = NULL;
 										BackingPhotoID _tmp25_ = {0};
 										BackingPhotoRow* _tmp26_ = NULL;
 										BackingPhotoRow* _tmp27_ = NULL;
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 										_tmp25_ = id;
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 										_tmp26_ = photo_get_backing_row (self, &_tmp25_);
-#line 1645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
 										bpr = _tmp26_;
-#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1648 "/home/jens/Source/shotwell/src/Photo.vala"
 										_tmp27_ = bpr;
-#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1648 "/home/jens/Source/shotwell/src/Photo.vala"
 										if (_tmp27_ != NULL) {
-#line 13035 "Photo.c"
+#line 13050 "Photo.c"
 											GeeHashMap* _tmp28_ = NULL;
 											RawDeveloper _tmp29_ = 0;
 											BackingPhotoRow* _tmp30_ = NULL;
-#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
 											_tmp28_ = self->priv->developments;
-#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
 											_tmp29_ = d;
-#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1649 "/home/jens/Source/shotwell/src/Photo.vala"
 											_tmp30_ = bpr;
-#line 1647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1649 "/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 13047 "Photo.c"
+#line 13062 "Photo.c"
 										}
-#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1646 "/home/jens/Source/shotwell/src/Photo.vala"
 										_backing_photo_row_unref0 (bpr);
-#line 13051 "Photo.c"
+#line 13066 "Photo.c"
 									}
 								}
 							}
-#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1644 "/home/jens/Source/shotwell/src/Photo.vala"
 							d_collection = (g_free (d_collection), NULL);
-#line 13057 "Photo.c"
+#line 13072 "Photo.c"
 						}
 					}
-					__finally306:
+					__finally307:
 					{
 						PhotoRow* _tmp31_ = NULL;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = self->row;
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13067 "Photo.c"
+#line 13082 "Photo.c"
 					}
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							g_propagate_error (error, _inner_error_);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/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 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_dev_it);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/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 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							return;
-#line 13083 "Photo.c"
+#line 13098 "Photo.c"
 						} else {
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/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 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_dev_it);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/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 1642 "/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 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							g_clear_error (&_inner_error_);
-#line 1640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1642 "/home/jens/Source/shotwell/src/Photo.vala"
 							return;
-#line 13097 "Photo.c"
+#line 13112 "Photo.c"
 						}
 					}
 				}
 			}
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (dev);
-#line 13104 "Photo.c"
+#line 13119 "Photo.c"
 		}
-#line 1636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_dev_it);
-#line 13108 "Photo.c"
+#line 13123 "Photo.c"
 	}
-#line 1654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = g_strdup ("metadata:name,image:orientation,metadata:rating,metadata:exposure-time");
-#line 1654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
 	list = _tmp32_;
-#line 1655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = reimport_state;
-#line 1655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_->metadata_only;
-#line 1655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1657 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp34_) {
-#line 13120 "Photo.c"
+#line 13135 "Photo.c"
 		const gchar* _tmp35_ = NULL;
 		gchar* _tmp36_ = NULL;
-#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = list;
-#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = g_strconcat (_tmp35_, "image:editable,image:baseline", NULL);
-#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (list);
-#line 1656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
 		list = _tmp36_;
-#line 13131 "Photo.c"
+#line 13146 "Photo.c"
 	}
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = list;
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = alteration_new_from_list (_tmp37_);
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = _tmp38_;
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_);
-#line 1658 "/home/jens/Source/shotwell/src/Photo.vala"
-	_alteration_unref0 (_tmp39_);
 #line 1660 "/home/jens/Source/shotwell/src/Photo.vala"
+	_alteration_unref0 (_tmp39_);
+#line 1662 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_notify_raw_development_modified (self);
-#line 1630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (list);
-#line 1630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1632 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_unref0 (reimport_state);
-#line 13149 "Photo.c"
+#line 13164 "Photo.c"
 }
 
 
@@ -13155,15 +13170,15 @@ static gchar* photo_real_get_typename (DataSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1665 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = g_strdup (PHOTO_TYPENAME);
-#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1666 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13165 "Photo.c"
+#line 13180 "Photo.c"
 }
 
 
@@ -13172,17 +13187,17 @@ static gint64 photo_real_get_instance_id (DataSource* base) {
 	gint64 result = 0LL;
 	PhotoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
-#line 1667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1669 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (self, &_tmp0_);
-#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 1668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1670 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13184 "Photo.c"
+#line 13199 "Photo.c"
 }
 
 
@@ -13194,25 +13209,25 @@ static gchar* photo_real_get_source_id (DataSource* base) {
 	gint64 _tmp2_ = 0LL;
 	gchar* _tmp3_ = NULL;
 	gchar* _tmp4_ = NULL;
-#line 1671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1673 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = data_source_get_typename (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource));
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = data_source_get_instance_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_SOURCE, DataSource));
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = g_strdup_printf ("%s%016" G_GINT64_MODIFIER "x", _tmp1_, _tmp2_);
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp1_);
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 1675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1677 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13214 "Photo.c"
+#line 13229 "Photo.c"
 }
 
 
@@ -13222,25 +13237,25 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 	GTimeVal _tmp1_ = {0};
 	gboolean _tmp21_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1681 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = info;
-#line 1680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 1680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
 	modification = _tmp1_;
-#line 13234 "Photo.c"
+#line 13249 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13242 "Photo.c"
+#line 13257 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
 				BackingPhotoRow* _tmp4_ = NULL;
@@ -13257,148 +13272,148 @@ void photo_set_master_timestamp (Photo* self, GFileInfo* info) {
 				BackingPhotoRow* _tmp16_ = NULL;
 				GTimeVal _tmp17_ = {0};
 				glong _tmp18_ = 0L;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->master;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->timestamp;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = modification;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_.tv_sec;
-#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1686 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp5_ == ((time_t) _tmp7_)) {
-#line 13271 "Photo.c"
+#line 13286 "Photo.c"
 					{
 						PhotoRow* _tmp8_ = NULL;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp8_ = self->row;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13278 "Photo.c"
+#line 13293 "Photo.c"
 					}
-#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13282 "Photo.c"
+#line 13297 "Photo.c"
 				}
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_table_get_instance ();
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_;
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->row;
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->photo_id;
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = modification;
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _tmp13_.tv_sec;
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_update_timestamp (_tmp10_, &_tmp12_, (time_t) _tmp14_, &_inner_error_);
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp10_);
-#line 1687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1689 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13302 "Photo.c"
-					goto __finally308;
+#line 13317 "Photo.c"
+					goto __finally309;
 				}
-#line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->row;
-#line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->master;
-#line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = modification;
-#line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_.tv_sec;
-#line 1688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1690 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_->timestamp = (time_t) _tmp18_;
-#line 13315 "Photo.c"
+#line 13330 "Photo.c"
 			}
-			__finally308:
+			__finally309:
 			{
 				PhotoRow* _tmp19_ = NULL;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = self->row;
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13324 "Photo.c"
+#line 13339 "Photo.c"
 			}
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 13330 "Photo.c"
-					goto __catch307_database_error;
+#line 13345 "Photo.c"
+					goto __catch308_database_error;
 				}
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/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 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1685 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13339 "Photo.c"
+#line 13354 "Photo.c"
 			}
 		}
 	}
-	goto __finally307;
-	__catch307_database_error:
+	goto __finally308;
+	__catch308_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1693 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = err;
-#line 1691 "/home/jens/Source/shotwell/src/Photo.vala"
-		app_window_database_error (_tmp20_);
 #line 1693 "/home/jens/Source/shotwell/src/Photo.vala"
+		app_window_database_error (_tmp20_);
+#line 1695 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 1693 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1695 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 13360 "Photo.c"
+#line 13375 "Photo.c"
 	}
-	__finally307:
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally308:
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1684 "/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 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1684 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 13371 "Photo.c"
+#line 13386 "Photo.c"
 	}
-#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = photo_is_master_baseline (self);
-#line 1696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1698 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 13377 "Photo.c"
+#line 13392 "Photo.c"
 		Alteration* _tmp22_ = NULL;
 		Alteration* _tmp23_ = NULL;
-#line 1697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = alteration_new_from_list ("metadata:master-timestamp,metadata:baseline-timestamp");
-#line 1697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp22_;
-#line 1697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp23_);
-#line 1697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp23_);
-#line 13388 "Photo.c"
+#line 13403 "Photo.c"
 	} else {
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("metadata", "master-timestamp");
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
-#line 1699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 13400 "Photo.c"
+#line 13415 "Photo.c"
 	}
 }
 
@@ -13410,60 +13425,60 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 	gboolean altered = FALSE;
 	gboolean _tmp20_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1705 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = info;
-#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1706 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 1704 "/home/jens/Source/shotwell/src/Photo.vala"
-	modification = _tmp1_;
 #line 1706 "/home/jens/Source/shotwell/src/Photo.vala"
+	modification = _tmp1_;
+#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
 	altered = FALSE;
-#line 13424 "Photo.c"
+#line 13439 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 13431 "Photo.c"
+#line 13446 "Photo.c"
 		{
 			gboolean _tmp3_ = FALSE;
 			PhotoRow* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = backing_photo_id_is_valid (&_tmp4_->editable_id);
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp5_) {
-#line 13442 "Photo.c"
+#line 13457 "Photo.c"
 				BackingPhotoRow* _tmp6_ = NULL;
 				time_t _tmp7_ = 0;
 				GTimeVal _tmp8_ = {0};
 				glong _tmp9_ = 0L;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->priv->editable;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_->timestamp;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = modification;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_.tv_sec;
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _tmp7_ != ((time_t) _tmp9_);
-#line 13457 "Photo.c"
+#line 13472 "Photo.c"
 			} else {
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = FALSE;
-#line 13461 "Photo.c"
+#line 13476 "Photo.c"
 			}
-#line 1708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1710 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_) {
-#line 13465 "Photo.c"
+#line 13480 "Photo.c"
 				BackingPhotoTable* _tmp10_ = NULL;
 				BackingPhotoTable* _tmp11_ = NULL;
 				PhotoRow* _tmp12_ = NULL;
@@ -13473,96 +13488,96 @@ void photo_update_editable_modification_time (Photo* self, GFileInfo* info, GErr
 				BackingPhotoRow* _tmp16_ = NULL;
 				GTimeVal _tmp17_ = {0};
 				glong _tmp18_ = 0L;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = backing_photo_table_get_instance ();
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp10_;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = self->row;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_->editable_id;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = modification;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp14_.tv_sec;
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_update_timestamp (_tmp11_, &_tmp13_, (time_t) _tmp15_, &_inner_error_);
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp11_);
-#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13493 "Photo.c"
-					goto __finally309;
+#line 13508 "Photo.c"
+					goto __finally310;
 				}
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->editable;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = modification;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_.tv_sec;
-#line 1711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1713 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_->timestamp = (time_t) _tmp18_;
-#line 1712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1714 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered = TRUE;
-#line 13506 "Photo.c"
+#line 13521 "Photo.c"
 			}
 		}
-		__finally309:
+		__finally310:
 		{
 			PhotoRow* _tmp19_ = NULL;
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 13516 "Photo.c"
+#line 13531 "Photo.c"
 		}
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13526 "Photo.c"
+#line 13541 "Photo.c"
 			} else {
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/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 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1707 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1709 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 13534 "Photo.c"
+#line 13549 "Photo.c"
 			}
 		}
 	}
-#line 1716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = altered;
-#line 1716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1718 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_) {
-#line 13542 "Photo.c"
+#line 13557 "Photo.c"
 		Alteration* _tmp21_ = NULL;
 		Alteration* _tmp22_ = NULL;
-#line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = alteration_new_from_list ("metadata:editable-timestamp,metadata:baseline-timestamp");
-#line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = _tmp21_;
-#line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp22_);
-#line 1717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1719 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp22_);
-#line 13553 "Photo.c"
+#line 13568 "Photo.c"
 	}
 }
 
 
 void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 1721 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail (GEE_IS_MAP (map));
 #line 1723 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail (GEE_IS_MAP (map));
+#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_begin_transaction ();
-#line 13564 "Photo.c"
+#line 13579 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -13571,25 +13586,25 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 		GeeSet* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = map;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_it = _tmp5_;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 13591 "Photo.c"
+#line 13606 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			Photo* photo = NULL;
@@ -13600,90 +13615,90 @@ void photo_update_many_editable_timestamps (GeeMap* map, GError** error) {
 			Photo* _tmp12_ = NULL;
 			gpointer _tmp13_ = NULL;
 			GFileInfo* _tmp14_ = NULL;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _photo_it;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 13610 "Photo.c"
+#line 13625 "Photo.c"
 			}
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = (Photo*) _tmp9_;
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo;
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = map;
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo;
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = gee_map_get (_tmp11_, _tmp12_);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = (GFileInfo*) _tmp13_;
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_update_editable_modification_time (_tmp10_, _tmp14_, &_inner_error_);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp14_);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_photo_it);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13644 "Photo.c"
+#line 13659 "Photo.c"
 				} else {
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_photo_it);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/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 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 1725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1727 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 13656 "Photo.c"
+#line 13671 "Photo.c"
 				}
 			}
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 13661 "Photo.c"
+#line 13676 "Photo.c"
 		}
-#line 1724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 13665 "Photo.c"
+#line 13680 "Photo.c"
 	}
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 13677 "Photo.c"
+#line 13692 "Photo.c"
 		} else {
-#line 1726 "/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 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1728 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 13685 "Photo.c"
+#line 13700 "Photo.c"
 		}
 	}
 }
@@ -13695,34 +13710,34 @@ static PhotoFileFormat photo_real_get_preferred_thumbnail_format (ThumbnailSourc
 	PhotoFileFormat _tmp0_ = 0;
 	PhotoFileFormat _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1731 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_file_format (self);
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_format_can_write_image (_tmp1_);
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 13705 "Photo.c"
+#line 13720 "Photo.c"
 		PhotoFileFormat _tmp3_ = 0;
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_get_file_format (self);
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 13711 "Photo.c"
+#line 13726 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp4_ = 0;
-#line 1731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_file_format_get_system_default_format ();
-#line 1731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1733 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp4_;
-#line 13718 "Photo.c"
+#line 13733 "Photo.c"
 	}
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1732 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13724 "Photo.c"
+#line 13739 "Photo.c"
 }
 
 
@@ -13735,35 +13750,35 @@ static GdkPixbuf* photo_real_create_thumbnail (ThumbnailSource* base, gint scale
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1736 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scale;
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	scaling_for_best_fit (_tmp1_, TRUE, &_tmp2_);
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/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 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 13753 "Photo.c"
+#line 13768 "Photo.c"
 	}
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 1735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1737 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13765 "Photo.c"
+#line 13780 "Photo.c"
 }
 
 
@@ -13772,41 +13787,41 @@ gboolean photo_is_file_image (GFile* file) {
 	gboolean _tmp0_ = FALSE;
 	GFile* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1740 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_format_is_file_supported (_tmp1_);
-#line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 13784 "Photo.c"
+#line 13799 "Photo.c"
 	} else {
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = file;
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = g_file_get_basename (_tmp3_);
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = photo_is_extension_found (_tmp5_, PHOTO_IMAGE_EXTENSIONS, G_N_ELEMENTS (PHOTO_IMAGE_EXTENSIONS));
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp6_;
-#line 1743 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1745 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp5_);
-#line 13802 "Photo.c"
+#line 13817 "Photo.c"
 	}
-#line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 1742 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1744 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13808 "Photo.c"
+#line 13823 "Photo.c"
 }
 
 
@@ -13822,102 +13837,102 @@ static gboolean photo_is_extension_found (const gchar* basename, gchar** extensi
 	gchar* _tmp5_ = NULL;
 	gchar** _tmp6_ = NULL;
 	gint _tmp6__length1 = 0;
-#line 1746 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (basename != NULL, FALSE);
 #line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (basename != NULL, FALSE);
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = basename;
-#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	disassemble_filename (_tmp0_, &_tmp1_, &_tmp2_);
-#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	name = _tmp1_;
-#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 1748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
 	ext = _tmp2_;
-#line 1749 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = ext;
-#line 1749 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1751 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ == NULL) {
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (ext);
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (name);
-#line 1750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1752 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 13850 "Photo.c"
+#line 13865 "Photo.c"
 	}
-#line 1753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = ext;
-#line 1753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = g_utf8_strdown (_tmp4_, (gssize) -1);
-#line 1753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 1753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1755 "/home/jens/Source/shotwell/src/Photo.vala"
 	ext = _tmp5_;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = extensions;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6__length1 = extensions_length1;
-#line 13864 "Photo.c"
+#line 13879 "Photo.c"
 	{
 		gchar** extension_collection = NULL;
 		gint extension_collection_length1 = 0;
 		gint _extension_collection_size_ = 0;
 		gint extension_it = 0;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 		extension_collection = _tmp6_;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 		extension_collection_length1 = _tmp6__length1;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 		for (extension_it = 0; extension_it < _tmp6__length1; extension_it = extension_it + 1) {
-#line 13876 "Photo.c"
+#line 13891 "Photo.c"
 			gchar* _tmp7_ = NULL;
 			gchar* extension = NULL;
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = g_strdup (extension_collection[extension_it]);
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 			extension = _tmp7_;
-#line 13883 "Photo.c"
+#line 13898 "Photo.c"
 			{
 				const gchar* _tmp8_ = NULL;
 				const gchar* _tmp9_ = NULL;
-#line 1757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = ext;
-#line 1757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = extension;
-#line 1757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1759 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (g_strcmp0 (_tmp8_, _tmp9_) == 0) {
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (extension);
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (ext);
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (name);
-#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1760 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 13903 "Photo.c"
+#line 13918 "Photo.c"
 				}
-#line 1756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (extension);
-#line 13907 "Photo.c"
+#line 13922 "Photo.c"
 			}
 		}
 	}
-#line 1761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 1761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 1761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 1761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1763 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13919 "Photo.c"
+#line 13934 "Photo.c"
 }
 
 
@@ -13931,31 +13946,31 @@ gboolean photo_is_duplicate (GFile* file, const gchar* thumbnail_md5, const gcha
 	PhotoFileFormat _tmp5_ = 0;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 1767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1769 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_table_get_instance ();
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = thumbnail_md5;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = full_md5;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = file_format;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_table_has_duplicate (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp7_;
-#line 1770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1772 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 13957 "Photo.c"
+#line 13972 "Photo.c"
 }
 
 
@@ -13973,43 +13988,43 @@ PhotoID* photo_get_duplicate_ids (GFile* file, const gchar* thumbnail_md5, const
 	gint _tmp8__length1 = 0;
 	PhotoID* _tmp9_ = NULL;
 	gint _tmp9__length1 = 0;
-#line 1776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1778 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), NULL);
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_table_get_instance ();
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = thumbnail_md5;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = full_md5;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = file_format;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = photo_table_get_duplicate_ids (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_, &_tmp6_);
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8__length1 = _tmp6_;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9__length1 = _tmp8__length1;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (result_length1) {
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp9__length1;
-#line 14005 "Photo.c"
+#line 14020 "Photo.c"
 	}
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp9_;
-#line 1779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1781 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14011 "Photo.c"
+#line 14026 "Photo.c"
 }
 
 
@@ -14018,19 +14033,19 @@ gint64 photo_get_photo_key (DataSource* source) {
 	DataSource* _tmp0_ = NULL;
 	PhotoID _tmp1_ = {0};
 	gint64 _tmp2_ = 0LL;
-#line 1786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1788 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
-#line 1787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 1787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1789 "/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 1787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_.id;
-#line 1787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 1787 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1789 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14032 "Photo.c"
+#line 14047 "Photo.c"
 }
 
 
@@ -14041,91 +14056,91 @@ static GFile* photo_real_get_file (MediaSource* base) {
 	PhotoFileReader* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 1805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1807 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/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 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1808 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 14059 "Photo.c"
+#line 14074 "Photo.c"
 }
 
 
 static void _vala_array_add96 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14070 "Photo.c"
+#line 14085 "Photo.c"
 	}
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14076 "Photo.c"
+#line 14091 "Photo.c"
 }
 
 
 static void _vala_array_add97 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14087 "Photo.c"
+#line 14102 "Photo.c"
 	}
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14093 "Photo.c"
+#line 14108 "Photo.c"
 }
 
 
 static void _vala_array_add98 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14104 "Photo.c"
+#line 14119 "Photo.c"
 	}
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14110 "Photo.c"
+#line 14125 "Photo.c"
 }
 
 
 static void _vala_array_add99 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14121 "Photo.c"
+#line 14136 "Photo.c"
 	}
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14127 "Photo.c"
+#line 14142 "Photo.c"
 }
 
 
@@ -14140,43 +14155,43 @@ void photo_set_master_file (Photo* self, GFile* file) {
 	GFile* old_file = NULL;
 	gboolean _tmp41_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 1812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 1812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1814 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1812 "/home/jens/Source/shotwell/src/Photo.vala"
-	filepath = _tmp1_;
 #line 1814 "/home/jens/Source/shotwell/src/Photo.vala"
+	filepath = _tmp1_;
+#line 1816 "/home/jens/Source/shotwell/src/Photo.vala"
 	altered = FALSE;
-#line 1815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1817 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_baseline = FALSE;
-#line 1816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1818 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_source = FALSE;
-#line 1817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
 	name_changed = FALSE;
-#line 1818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
 	old_file = NULL;
-#line 14162 "Photo.c"
+#line 14177 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14170 "Photo.c"
+#line 14185 "Photo.c"
 			{
 				{
 					PhotoBackingReaders* _tmp3_ = NULL;
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp3_ = self->priv->readers;
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14178 "Photo.c"
+#line 14193 "Photo.c"
 					{
 						PhotoBackingReaders* _tmp4_ = NULL;
 						PhotoFileReader* _tmp5_ = NULL;
@@ -14184,25 +14199,25 @@ void photo_set_master_file (Photo* self, GFile* file) {
 						GFile* _tmp7_ = NULL;
 						GFile* _tmp8_ = NULL;
 						gboolean _tmp9_ = FALSE;
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp4_ = self->priv->readers;
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp5_ = _tmp4_->master;
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1824 "/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 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (old_file);
-#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
 						old_file = _tmp6_;
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp7_ = file;
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp8_ = old_file;
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp9_ = g_file_equal (_tmp7_, _tmp8_);
-#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1825 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp9_) {
-#line 14204 "Photo.c"
+#line 14219 "Photo.c"
 							PhotoTable* _tmp10_ = NULL;
 							PhotoTable* _tmp11_ = NULL;
 							PhotoID _tmp12_ = {0};
@@ -14225,196 +14240,196 @@ void photo_set_master_file (Photo* self, GFile* file) {
 							PhotoRow* _tmp29_ = NULL;
 							const gchar* _tmp30_ = NULL;
 							gboolean _tmp31_ = FALSE;
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp10_ = photo_table_get_instance ();
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = _tmp10_;
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_get_photo_id (self, &_tmp12_);
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp13_ = filepath;
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							photo_table_set_filepath (_tmp11_, &_tmp12_, _tmp13_, &_inner_error_);
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							_database_table_unref0 (_tmp11_);
-#line 1824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14241 "Photo.c"
-								goto __finally312;
+#line 14256 "Photo.c"
+								goto __finally313;
 							}
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp14_ = self->row;
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp15_ = _tmp14_->master;
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp16_ = filepath;
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp17_ = g_strdup (_tmp16_);
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (_tmp15_->filepath);
-#line 1826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp15_->filepath = _tmp17_;
-#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp18_ = file;
-#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = g_file_get_basename (_tmp18_);
-#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (self->priv->file_title);
-#line 1827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1829 "/home/jens/Source/shotwell/src/Photo.vala"
 							self->priv->file_title = _tmp19_;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp20_ = self->priv->readers;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = self->row;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = _tmp21_->master;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = _tmp22_->file_format;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = filepath;
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = photo_file_format_create_reader (_tmp23_, _tmp24_);
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_file_adapter_unref0 (_tmp20_->master);
-#line 1828 "/home/jens/Source/shotwell/src/Photo.vala"
-							_tmp20_->master = _tmp25_;
 #line 1830 "/home/jens/Source/shotwell/src/Photo.vala"
+							_tmp20_->master = _tmp25_;
+#line 1832 "/home/jens/Source/shotwell/src/Photo.vala"
 							altered = TRUE;
-#line 1831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = photo_is_master_baseline (self);
-#line 1831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_baseline = _tmp26_;
-#line 1832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = photo_is_master_source (self);
-#line 1832 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_source = _tmp27_;
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp29_ = self->row;
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = _tmp29_->title;
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = is_string_empty (_tmp30_);
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp31_) {
-#line 14298 "Photo.c"
+#line 14313 "Photo.c"
 								GFile* _tmp32_ = NULL;
 								gchar* _tmp33_ = NULL;
 								gchar* _tmp34_ = NULL;
 								GFile* _tmp35_ = NULL;
 								gchar* _tmp36_ = NULL;
 								gchar* _tmp37_ = NULL;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp32_ = old_file;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp33_ = g_file_get_basename (_tmp32_);
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp34_ = _tmp33_;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp35_ = file;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp36_ = g_file_get_basename (_tmp35_);
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp37_ = _tmp36_;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp28_ = g_strcmp0 (_tmp34_, _tmp37_) != 0;
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_free0 (_tmp37_);
-#line 1834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1836 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_free0 (_tmp34_);
-#line 14323 "Photo.c"
+#line 14338 "Photo.c"
 							} else {
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp28_ = FALSE;
-#line 14327 "Photo.c"
+#line 14342 "Photo.c"
 							}
-#line 1833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1835 "/home/jens/Source/shotwell/src/Photo.vala"
 							name_changed = _tmp28_;
-#line 14331 "Photo.c"
+#line 14346 "Photo.c"
 						}
 					}
-					__finally312:
+					__finally313:
 					{
 						PhotoBackingReaders* _tmp38_ = NULL;
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp38_ = self->priv->readers;
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14341 "Photo.c"
+#line 14356 "Photo.c"
 					}
-#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1823 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14345 "Photo.c"
-						goto __finally311;
+#line 14360 "Photo.c"
+						goto __finally312;
 					}
 				}
 			}
-			__finally311:
+			__finally312:
 			{
 				PhotoRow* _tmp39_ = NULL;
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = self->row;
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14357 "Photo.c"
+#line 14372 "Photo.c"
 			}
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14363 "Photo.c"
-					goto __catch310_database_error;
+#line 14378 "Photo.c"
+					goto __catch311_database_error;
 				}
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (filepath);
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/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 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1820 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1822 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 14376 "Photo.c"
+#line 14391 "Photo.c"
 			}
 		}
 	}
-	goto __finally310;
-	__catch310_database_error:
+	goto __finally311;
+	__catch311_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp40_ = NULL;
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = err;
-#line 1839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1841 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp40_);
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 14395 "Photo.c"
+#line 14410 "Photo.c"
 	}
-	__finally310:
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally311:
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (old_file);
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (filepath);
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/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 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1821 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 14410 "Photo.c"
+#line 14425 "Photo.c"
 	}
-#line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = altered;
-#line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_) {
-#line 14416 "Photo.c"
+#line 14431 "Photo.c"
 		GFile* _tmp42_ = NULL;
 		GFile* _tmp43_ = NULL;
 		gboolean _tmp44_ = FALSE;
@@ -14432,162 +14447,162 @@ void photo_set_master_file (Photo* self, GFile* file) {
 		gint _tmp57__length1 = 0;
 		Alteration* _tmp58_ = NULL;
 		Alteration* _tmp59_ = NULL;
-#line 1843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = old_file;
-#line 1843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = file;
-#line 1843 "/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 1845 "/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"
 		_tmp44_ = is_baseline;
-#line 1845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1847 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp44_) {
-#line 1846 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_notify_baseline_replaced (self);
-#line 14446 "Photo.c"
+#line 14461 "Photo.c"
 		}
-#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = g_new0 (gchar*, 0 + 1);
-#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = _tmp45_;
-#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list_length1 = 0;
-#line 1848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1850 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_list_size_ = alteration_list_length1;
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = alteration_list;
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46__length1 = alteration_list_length1;
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = g_strdup ("backing:master");
-#line 1849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1851 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add96 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp47_);
-#line 1853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = name_changed;
-#line 1853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1855 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 14468 "Photo.c"
+#line 14483 "Photo.c"
 			gchar** _tmp49_ = NULL;
 			gint _tmp49__length1 = 0;
 			gchar* _tmp50_ = NULL;
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp49_ = alteration_list;
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp49__length1 = alteration_list_length1;
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = g_strdup ("metadata:name");
-#line 1854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add97 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp50_);
-#line 14480 "Photo.c"
+#line 14495 "Photo.c"
 		}
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = is_source;
-#line 1856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1858 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp51_) {
-#line 14486 "Photo.c"
+#line 14501 "Photo.c"
 			gchar** _tmp52_ = NULL;
 			gint _tmp52__length1 = 0;
 			gchar* _tmp53_ = NULL;
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = alteration_list;
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52__length1 = alteration_list_length1;
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = g_strdup ("backing:source");
-#line 1857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add98 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp53_);
-#line 14498 "Photo.c"
+#line 14513 "Photo.c"
 		}
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = is_baseline;
-#line 1859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1861 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp54_) {
-#line 14504 "Photo.c"
+#line 14519 "Photo.c"
 			gchar** _tmp55_ = NULL;
 			gint _tmp55__length1 = 0;
 			gchar* _tmp56_ = NULL;
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = alteration_list;
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55__length1 = alteration_list_length1;
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = g_strdup ("backing:baseline");
-#line 1860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add99 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp56_);
-#line 14516 "Photo.c"
+#line 14531 "Photo.c"
 		}
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = alteration_list;
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57__length1 = alteration_list_length1;
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = alteration_new_from_array (_tmp57_, _tmp57__length1);
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = _tmp58_;
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp59_);
-#line 1862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1864 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp59_);
-#line 1842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1844 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 14532 "Photo.c"
+#line 14547 "Photo.c"
 	}
-#line 1811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (old_file);
-#line 1811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (filepath);
-#line 14538 "Photo.c"
+#line 14553 "Photo.c"
 }
 
 
 static void _vala_array_add100 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14549 "Photo.c"
+#line 14564 "Photo.c"
 	}
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14555 "Photo.c"
+#line 14570 "Photo.c"
 }
 
 
 static void _vala_array_add101 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14566 "Photo.c"
+#line 14581 "Photo.c"
 	}
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14572 "Photo.c"
+#line 14587 "Photo.c"
 }
 
 
 static void _vala_array_add102 (gchar*** array, int* length, int* size, gchar* value) {
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 14583 "Photo.c"
+#line 14598 "Photo.c"
 	}
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 14589 "Photo.c"
+#line 14604 "Photo.c"
 }
 
 
@@ -14601,41 +14616,41 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 	GFile* old_file = NULL;
 	gboolean _tmp34_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 1868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 1869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1871 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 1869 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1871 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1869 "/home/jens/Source/shotwell/src/Photo.vala"
-	filepath = _tmp1_;
 #line 1871 "/home/jens/Source/shotwell/src/Photo.vala"
+	filepath = _tmp1_;
+#line 1873 "/home/jens/Source/shotwell/src/Photo.vala"
 	altered = FALSE;
-#line 1872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1874 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_baseline = FALSE;
-#line 1873 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_source = FALSE;
-#line 1874 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
 	old_file = NULL;
-#line 14621 "Photo.c"
+#line 14636 "Photo.c"
 	{
 		{
 			PhotoRow* _tmp2_ = NULL;
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 14629 "Photo.c"
+#line 14644 "Photo.c"
 			{
 				{
 					PhotoBackingReaders* _tmp3_ = NULL;
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp3_ = self->priv->readers;
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 14637 "Photo.c"
+#line 14652 "Photo.c"
 					{
 						GFile* _tmp4_ = NULL;
 						PhotoBackingReaders* _tmp5_ = NULL;
@@ -14643,65 +14658,65 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 						GFile* _tmp10_ = NULL;
 						gboolean _tmp11_ = FALSE;
 						GFile* _tmp12_ = NULL;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp5_ = self->priv->readers;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp6_ = _tmp5_->editable;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp6_ != NULL) {
-#line 14651 "Photo.c"
+#line 14666 "Photo.c"
 							PhotoBackingReaders* _tmp7_ = NULL;
 							PhotoFileReader* _tmp8_ = NULL;
 							GFile* _tmp9_ = NULL;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp7_ = self->priv->readers;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp8_ = _tmp7_->editable;
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/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 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp4_);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp4_ = _tmp9_;
-#line 14665 "Photo.c"
+#line 14680 "Photo.c"
 						} else {
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp4_);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp4_ = NULL;
-#line 14671 "Photo.c"
+#line 14686 "Photo.c"
 						}
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp10_ = _g_object_ref0 (_tmp4_);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (old_file);
-#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
 						old_file = _tmp10_;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp12_ = old_file;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp12_ != NULL) {
-#line 14683 "Photo.c"
+#line 14698 "Photo.c"
 							GFile* _tmp13_ = NULL;
 							GFile* _tmp14_ = NULL;
 							gboolean _tmp15_ = FALSE;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp13_ = old_file;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp14_ = file;
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp15_ = g_file_equal (_tmp13_, _tmp14_);
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = !_tmp15_;
-#line 14695 "Photo.c"
+#line 14710 "Photo.c"
 						} else {
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp11_ = FALSE;
-#line 14699 "Photo.c"
+#line 14714 "Photo.c"
 						}
-#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1881 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp11_) {
-#line 14703 "Photo.c"
+#line 14718 "Photo.c"
 							BackingPhotoTable* _tmp16_ = NULL;
 							BackingPhotoTable* _tmp17_ = NULL;
 							PhotoRow* _tmp18_ = NULL;
@@ -14717,150 +14732,150 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 							PhotoFileReader* _tmp28_ = NULL;
 							gboolean _tmp29_ = FALSE;
 							gboolean _tmp30_ = FALSE;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp16_ = backing_photo_table_get_instance ();
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp17_ = _tmp16_;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp18_ = self->row;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp19_ = _tmp18_->editable_id;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp20_ = filepath;
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							backing_photo_table_set_filepath (_tmp17_, &_tmp19_, _tmp20_, &_inner_error_);
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							_database_table_unref0 (_tmp17_);
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
 								_g_object_unref0 (_tmp4_);
-#line 14737 "Photo.c"
-								goto __finally315;
+#line 14752 "Photo.c"
+								goto __finally316;
 							}
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = self->priv->editable;
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = filepath;
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = g_strdup (_tmp22_);
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (_tmp21_->filepath);
-#line 1882 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1884 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_->filepath = _tmp23_;
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = self->priv->readers;
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = self->priv->editable;
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = _tmp25_->file_format;
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = filepath;
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp28_ = photo_file_format_create_reader (_tmp26_, _tmp27_);
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
 							_photo_file_adapter_unref0 (_tmp24_->editable);
-#line 1883 "/home/jens/Source/shotwell/src/Photo.vala"
-							_tmp24_->editable = _tmp28_;
 #line 1885 "/home/jens/Source/shotwell/src/Photo.vala"
+							_tmp24_->editable = _tmp28_;
+#line 1887 "/home/jens/Source/shotwell/src/Photo.vala"
 							altered = TRUE;
-#line 1886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp29_ = photo_is_editable_baseline (self);
-#line 1886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1888 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_baseline = _tmp29_;
-#line 1887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = photo_is_editable_source (self);
-#line 1887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1889 "/home/jens/Source/shotwell/src/Photo.vala"
 							is_source = _tmp30_;
-#line 14774 "Photo.c"
+#line 14789 "Photo.c"
 						}
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_tmp4_);
-#line 14778 "Photo.c"
+#line 14793 "Photo.c"
 					}
-					__finally315:
+					__finally316:
 					{
 						PhotoBackingReaders* _tmp31_ = NULL;
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = self->priv->readers;
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 14787 "Photo.c"
+#line 14802 "Photo.c"
 					}
-#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1879 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 14791 "Photo.c"
-						goto __finally314;
+#line 14806 "Photo.c"
+						goto __finally315;
 					}
 				}
 			}
-			__finally314:
+			__finally315:
 			{
 				PhotoRow* _tmp32_ = NULL;
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = self->row;
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 14803 "Photo.c"
+#line 14818 "Photo.c"
 			}
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 14809 "Photo.c"
-					goto __catch313_database_error;
+#line 14824 "Photo.c"
+					goto __catch314_database_error;
 				}
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (old_file);
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (filepath);
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/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 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 1876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1878 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 14822 "Photo.c"
+#line 14837 "Photo.c"
 			}
 		}
 	}
-	goto __finally313;
-	__catch313_database_error:
+	goto __finally314;
+	__catch314_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp33_ = NULL;
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 1892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1894 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = err;
-#line 1892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1894 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp33_);
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 14841 "Photo.c"
+#line 14856 "Photo.c"
 	}
-	__finally313:
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally314:
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (old_file);
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (filepath);
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/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 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1877 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 14856 "Photo.c"
+#line 14871 "Photo.c"
 	}
-#line 1895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = altered;
-#line 1895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp34_) {
-#line 14862 "Photo.c"
+#line 14877 "Photo.c"
 		GFile* _tmp35_ = NULL;
 		GFile* _tmp36_ = NULL;
 		gboolean _tmp37_ = FALSE;
@@ -14877,93 +14892,93 @@ void photo_set_editable_file (Photo* self, GFile* file) {
 		gint _tmp47__length1 = 0;
 		Alteration* _tmp48_ = NULL;
 		Alteration* _tmp49_ = NULL;
-#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = old_file;
-#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = file;
-#line 1896 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_notify_editable_replaced (self, _tmp35_, _tmp36_);
 #line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_notify_editable_replaced (self, _tmp35_, _tmp36_);
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = is_baseline;
-#line 1898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1900 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp37_) {
-#line 1899 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_notify_baseline_replaced (self);
-#line 14891 "Photo.c"
+#line 14906 "Photo.c"
 		}
-#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = g_new0 (gchar*, 0 + 1);
-#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = _tmp38_;
-#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list_length1 = 0;
-#line 1901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1903 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_list_size_ = alteration_list_length1;
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = alteration_list;
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39__length1 = alteration_list_length1;
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = g_strdup ("backing:editable");
-#line 1902 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add100 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp40_);
 #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"
 		_tmp41_ = is_baseline;
-#line 1904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1906 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp41_) {
-#line 14913 "Photo.c"
+#line 14928 "Photo.c"
 			gchar** _tmp42_ = NULL;
 			gint _tmp42__length1 = 0;
 			gchar* _tmp43_ = NULL;
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = alteration_list;
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42__length1 = alteration_list_length1;
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = g_strdup ("backing:baseline");
-#line 1905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add101 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp43_);
-#line 14925 "Photo.c"
+#line 14940 "Photo.c"
 		}
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = is_source;
-#line 1907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1909 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp44_) {
-#line 14931 "Photo.c"
+#line 14946 "Photo.c"
 			gchar** _tmp45_ = NULL;
 			gint _tmp45__length1 = 0;
 			gchar* _tmp46_ = NULL;
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp45_ = alteration_list;
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp45__length1 = alteration_list_length1;
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp46_ = g_strdup ("backing:source");
-#line 1908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add102 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp46_);
-#line 14943 "Photo.c"
+#line 14958 "Photo.c"
 		}
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = alteration_list;
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47__length1 = alteration_list_length1;
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = alteration_new_from_array (_tmp47_, _tmp47__length1);
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = _tmp48_;
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp49_);
-#line 1910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1912 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp49_);
-#line 1895 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1897 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 14959 "Photo.c"
+#line 14974 "Photo.c"
 	}
-#line 1868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (old_file);
-#line 1868 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1870 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (filepath);
-#line 14965 "Photo.c"
+#line 14980 "Photo.c"
 }
 
 
@@ -14972,19 +14987,19 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 	GeeMap* _tmp0_ = NULL;
 	GeeMapIterator* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 1916 "/home/jens/Source/shotwell/src/Photo.vala"
-	database_table_begin_transaction ();
 #line 1918 "/home/jens/Source/shotwell/src/Photo.vala"
+	database_table_begin_transaction ();
+#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = map;
-#line 1918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_map_map_iterator (_tmp0_);
-#line 1918 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
 	map_iter = _tmp1_;
-#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 	while (TRUE) {
-#line 14986 "Photo.c"
+#line 15001 "Photo.c"
 		GeeMapIterator* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		GeeMapIterator* _tmp4_ = NULL;
@@ -14993,64 +15008,64 @@ void photo_set_many_editable_file (GeeMap* map, GError** error) {
 		GeeMapIterator* _tmp7_ = NULL;
 		gpointer _tmp8_ = NULL;
 		GFile* _tmp9_ = NULL;
-#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = map_iter;
-#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_map_iterator_next (_tmp2_);
-#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (!_tmp3_) {
-#line 1919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1921 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 15003 "Photo.c"
+#line 15018 "Photo.c"
 		}
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = map_iter;
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = gee_map_iterator_get_key (_tmp4_);
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = (Photo*) _tmp5_;
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = map_iter;
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = gee_map_iterator_get_value (_tmp7_);
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = (GFile*) _tmp8_;
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_editable_file (_tmp6_, _tmp9_);
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp9_);
-#line 1920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp6_);
-#line 15023 "Photo.c"
+#line 15038 "Photo.c"
 	}
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (map_iter);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15037 "Photo.c"
+#line 15052 "Photo.c"
 		} else {
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (map_iter);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/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 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1922 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1924 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15047 "Photo.c"
+#line 15062 "Photo.c"
 		}
 	}
-#line 1915 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1917 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (map_iter);
-#line 15052 "Photo.c"
+#line 15067 "Photo.c"
 }
 
 
@@ -15060,23 +15075,23 @@ GFile* photo_get_actual_file (Photo* self) {
 	PhotoFileReader* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 1927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1929 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_baseline_reader (self);
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/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 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1930 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15078 "Photo.c"
+#line 15093 "Photo.c"
 }
 
 
@@ -15087,23 +15102,23 @@ static GFile* photo_real_get_master_file (MediaSource* base) {
 	PhotoFileReader* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 1931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1933 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_reader (self);
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/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 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1934 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15105 "Photo.c"
+#line 15120 "Photo.c"
 }
 
 
@@ -15113,42 +15128,42 @@ GFile* photo_get_editable_file (Photo* self) {
 	PhotoFileReader* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
 	PhotoFileReader* _tmp2_ = NULL;
-#line 1935 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1937 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 1936 "/home/jens/Source/shotwell/src/Photo.vala"
-	reader = _tmp0_;
 #line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+	reader = _tmp0_;
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 15125 "Photo.c"
+#line 15140 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reader;
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/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 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp4_;
-#line 15136 "Photo.c"
+#line 15151 "Photo.c"
 	} else {
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 15142 "Photo.c"
+#line 15157 "Photo.c"
 	}
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 1938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1940 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15150 "Photo.c"
+#line 15165 "Photo.c"
 }
 
 
@@ -15158,30 +15173,30 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 	GeeArrayList* ret = NULL;
 	GeeArrayList* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1941 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 1942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_file_format (self);
-#line 1942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1944 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != PHOTO_FILE_FORMAT_RAW) {
-#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = NULL;
-#line 1943 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 15170 "Photo.c"
+#line 15185 "Photo.c"
 	}
-#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_array_list_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 1945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = _tmp1_;
-#line 15176 "Photo.c"
+#line 15191 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15183 "Photo.c"
+#line 15198 "Photo.c"
 		{
 			{
 				GeeIterator* _row_it = NULL;
@@ -15191,25 +15206,25 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 				GeeCollection* _tmp6_ = NULL;
 				GeeIterator* _tmp7_ = NULL;
 				GeeIterator* _tmp8_ = NULL;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->developments;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_abstract_map_get_values (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MAP, GeeMap));
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = _tmp5_;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp6_);
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_row_it = _tmp8_;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				while (TRUE) {
-#line 15211 "Photo.c"
+#line 15226 "Photo.c"
 					GeeIterator* _tmp9_ = NULL;
 					gboolean _tmp10_ = FALSE;
 					BackingPhotoRow* row = NULL;
@@ -15220,72 +15235,72 @@ GeeCollection* photo_get_raw_developer_files (Photo* self) {
 					const gchar* _tmp15_ = NULL;
 					GFile* _tmp16_ = NULL;
 					GFile* _tmp17_ = NULL;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp9_ = _row_it;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = gee_iterator_next (_tmp9_);
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (!_tmp10_) {
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 15230 "Photo.c"
+#line 15245 "Photo.c"
 					}
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _row_it;
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = gee_iterator_get (_tmp11_);
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					row = (BackingPhotoRow*) _tmp12_;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = ret;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = row;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = _tmp14_->filepath;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = g_file_new_for_path (_tmp15_);
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = _tmp16_;
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_);
-#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1950 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp17_);
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (row);
-#line 15254 "Photo.c"
+#line 15269 "Photo.c"
 				}
-#line 1947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1949 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_row_it);
-#line 15258 "Photo.c"
+#line 15273 "Photo.c"
 			}
 		}
-		__finally316:
+		__finally317:
 		{
 			PhotoRow* _tmp18_ = NULL;
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->row;
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15268 "Photo.c"
+#line 15283 "Photo.c"
 		}
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (ret);
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/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 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 1946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1948 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 15280 "Photo.c"
+#line 15295 "Photo.c"
 		}
 	}
-#line 1951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (ret, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1953 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15287 "Photo.c"
+#line 15302 "Photo.c"
 }
 
 
@@ -15295,77 +15310,77 @@ GFile* photo_get_source_file (Photo* self) {
 	PhotoFileReader* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 1954 "/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 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/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 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp1_);
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 1955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1957 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15313 "Photo.c"
+#line 15328 "Photo.c"
 }
 
 
 PhotoFileFormat photo_get_file_format (Photo* self) {
 	PhotoFileFormat result = 0;
 	GError * _inner_error_ = NULL;
-#line 1958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15322 "Photo.c"
+#line 15337 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15329 "Photo.c"
+#line 15344 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			PhotoFileFormat _tmp2_ = 0;
-#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->file_format;
-#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15339 "Photo.c"
+#line 15354 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15346 "Photo.c"
+#line 15361 "Photo.c"
 			}
-#line 1960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1962 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15350 "Photo.c"
+#line 15365 "Photo.c"
 		}
-		__finally317:
+		__finally318:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15359 "Photo.c"
+#line 15374 "Photo.c"
 		}
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/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 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1961 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15367 "Photo.c"
+#line 15382 "Photo.c"
 	}
 }
 
@@ -15376,88 +15391,88 @@ PhotoFileFormat photo_get_best_export_file_format (Photo* self) {
 	PhotoFileFormat _tmp0_ = 0;
 	PhotoFileFormat _tmp1_ = 0;
 	gboolean _tmp2_ = FALSE;
-#line 1964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 1965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_file_format (self);
-#line 1965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
 	file_format = _tmp0_;
-#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file_format;
-#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_file_format_can_write (_tmp1_);
-#line 1966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1968 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp2_) {
-#line 15390 "Photo.c"
+#line 15405 "Photo.c"
 		PhotoFileFormat _tmp3_ = 0;
-#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_file_format_get_system_default_format ();
-#line 1967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
 		file_format = _tmp3_;
-#line 15396 "Photo.c"
+#line 15411 "Photo.c"
 	}
-#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = file_format;
-#line 1969 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1971 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15402 "Photo.c"
+#line 15417 "Photo.c"
 }
 
 
 PhotoFileFormat photo_get_master_file_format (Photo* self) {
 	PhotoFileFormat result = 0;
 	GError * _inner_error_ = NULL;
-#line 1972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 15411 "Photo.c"
+#line 15426 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15418 "Photo.c"
+#line 15433 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			PhotoFileFormat _tmp3_ = 0;
-#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/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 1974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 15431 "Photo.c"
+#line 15446 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15438 "Photo.c"
+#line 15453 "Photo.c"
 			}
-#line 1974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1976 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15442 "Photo.c"
+#line 15457 "Photo.c"
 		}
-		__finally318:
+		__finally319:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15451 "Photo.c"
+#line 15466 "Photo.c"
 		}
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/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 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1973 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1975 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15459 "Photo.c"
+#line 15474 "Photo.c"
 	}
 }
 
@@ -15466,108 +15481,108 @@ static time_t photo_real_get_timestamp (MediaSource* base) {
 	Photo * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 1978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15470 "Photo.c"
+#line 15485 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15477 "Photo.c"
+#line 15492 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
-#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->timestamp;
-#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15487 "Photo.c"
+#line 15502 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15494 "Photo.c"
+#line 15509 "Photo.c"
 			}
-#line 1980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1982 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15498 "Photo.c"
+#line 15513 "Photo.c"
 		}
-		__finally319:
+		__finally320:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15507 "Photo.c"
+#line 15522 "Photo.c"
 		}
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/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 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1981 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 15515 "Photo.c"
+#line 15530 "Photo.c"
 	}
 }
 
 
 void photo_get_photo_id (Photo* self, PhotoID* result) {
 	GError * _inner_error_ = NULL;
-#line 1984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 15524 "Photo.c"
+#line 15539 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15531 "Photo.c"
+#line 15546 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			PhotoID _tmp2_ = {0};
-#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->photo_id;
-#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15541 "Photo.c"
+#line 15556 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15548 "Photo.c"
+#line 15563 "Photo.c"
 			}
-#line 1986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1988 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15552 "Photo.c"
+#line 15567 "Photo.c"
 		}
-		__finally320:
+		__finally321:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15561 "Photo.c"
+#line 15576 "Photo.c"
 		}
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/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 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 1985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1987 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15569 "Photo.c"
+#line 15584 "Photo.c"
 	}
 }
 
@@ -15576,17 +15591,17 @@ static inline void photo_real_get_event_id (MediaSource* base, EventID* result)
 	Photo * self;
 	PhotoRow* _tmp0_ = NULL;
 	EventID _tmp1_ = {0};
-#line 1991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1993 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 1992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->row;
-#line 1992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->event_id;
-#line 1992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp1_;
-#line 1992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1994 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 15588 "Photo.c"
+#line 15603 "Photo.c"
 }
 
 
@@ -15595,127 +15610,127 @@ inline gint64 photo_get_raw_event_id (Photo* self) {
 	PhotoRow* _tmp0_ = NULL;
 	EventID _tmp1_ = {0};
 	gint64 _tmp2_ = 0LL;
-#line 1996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1998 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0LL);
-#line 1997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->row;
-#line 1997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->event_id;
-#line 1997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_.id;
-#line 1997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 1997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1999 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15609 "Photo.c"
+#line 15624 "Photo.c"
 }
 
 
 static void photo_real_get_import_id (MediaSource* base, ImportID* result) {
 	Photo * self;
 	GError * _inner_error_ = NULL;
-#line 2000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15618 "Photo.c"
+#line 15633 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15625 "Photo.c"
+#line 15640 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			ImportID _tmp2_ = {0};
-#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->import_id;
-#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15635 "Photo.c"
+#line 15650 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15642 "Photo.c"
+#line 15657 "Photo.c"
 			}
-#line 2002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2004 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15646 "Photo.c"
+#line 15661 "Photo.c"
 		}
-		__finally321:
+		__finally322:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15655 "Photo.c"
+#line 15670 "Photo.c"
 		}
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/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 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2003 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15663 "Photo.c"
+#line 15678 "Photo.c"
 	}
 }
 
 
 void photo_get_editable_id (Photo* self, BackingPhotoID* result) {
 	GError * _inner_error_ = NULL;
-#line 2006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 15672 "Photo.c"
+#line 15687 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15679 "Photo.c"
+#line 15694 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoID _tmp2_ = {0};
-#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable_id;
-#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 15689 "Photo.c"
+#line 15704 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15696 "Photo.c"
+#line 15711 "Photo.c"
 			}
-#line 2008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2010 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 15700 "Photo.c"
+#line 15715 "Photo.c"
 		}
-		__finally322:
+		__finally323:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15709 "Photo.c"
+#line 15724 "Photo.c"
 		}
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/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 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2009 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 15717 "Photo.c"
+#line 15732 "Photo.c"
 	}
 }
 
@@ -15724,57 +15739,57 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 15728 "Photo.c"
+#line 15743 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15735 "Photo.c"
+#line 15750 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->md5;
-#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 15748 "Photo.c"
+#line 15763 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15755 "Photo.c"
+#line 15770 "Photo.c"
 			}
-#line 2014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2016 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15759 "Photo.c"
+#line 15774 "Photo.c"
 		}
-		__finally323:
+		__finally324:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15768 "Photo.c"
+#line 15783 "Photo.c"
 		}
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/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 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2015 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 15776 "Photo.c"
+#line 15791 "Photo.c"
 	}
 }
 
@@ -15782,54 +15797,54 @@ static gchar* photo_real_get_master_md5 (MediaSource* base) {
 guint64 photo_get_flags (Photo* self) {
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 15786 "Photo.c"
+#line 15801 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15793 "Photo.c"
+#line 15808 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
-#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 15803 "Photo.c"
+#line 15818 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15810 "Photo.c"
+#line 15825 "Photo.c"
 			}
-#line 2022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2024 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 15814 "Photo.c"
+#line 15829 "Photo.c"
 		}
-		__finally324:
+		__finally325:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15823 "Photo.c"
+#line 15838 "Photo.c"
 		}
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/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 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2023 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 15831 "Photo.c"
+#line 15846 "Photo.c"
 	}
 }
 
@@ -15839,41 +15854,41 @@ static void photo_notify_flags_altered (Photo* self, Alteration* additional_alte
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
 	Alteration* _tmp5_ = NULL;
-#line 2026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration));
-#line 2027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = alteration_new ("metadata", "flags");
-#line 2027 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration = _tmp0_;
-#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = additional_alteration;
-#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2030 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 15853 "Photo.c"
+#line 15868 "Photo.c"
 		Alteration* _tmp2_ = NULL;
 		Alteration* _tmp3_ = NULL;
 		Alteration* _tmp4_ = NULL;
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = alteration;
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = additional_alteration;
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = alteration_compress (_tmp2_, _tmp3_);
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (alteration);
-#line 2029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
 		alteration = _tmp4_;
-#line 15867 "Photo.c"
+#line 15882 "Photo.c"
 	}
-#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = alteration;
-#line 2031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2033 "/home/jens/Source/shotwell/src/Photo.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 2026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2028 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (alteration);
-#line 15875 "Photo.c"
+#line 15890 "Photo.c"
 }
 
 
@@ -15883,18 +15898,18 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 	gboolean _tmp10_ = FALSE;
 	guint64 _tmp12_ = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2034 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 15889 "Photo.c"
+#line 15904 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15896 "Photo.c"
+#line 15911 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -15902,135 +15917,135 @@ guint64 photo_replace_flags (Photo* self, guint64 flags, Alteration* additional_
 			guint64 _tmp4_ = 0ULL;
 			gboolean _tmp5_ = FALSE;
 			gboolean _tmp6_ = FALSE;
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_get_photo_id (self, &_tmp3_);
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = flags;
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = photo_table_replace_flags (_tmp2_, &_tmp3_, _tmp4_);
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp5_;
-#line 2037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = committed;
-#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2040 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_) {
-#line 15922 "Photo.c"
+#line 15937 "Photo.c"
 				PhotoRow* _tmp7_ = NULL;
 				guint64 _tmp8_ = 0ULL;
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = flags;
-#line 2039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2041 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_->flags = _tmp8_;
-#line 15931 "Photo.c"
+#line 15946 "Photo.c"
 			}
 		}
-		__finally325:
+		__finally326:
 		{
 			PhotoRow* _tmp9_ = NULL;
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 15941 "Photo.c"
+#line 15956 "Photo.c"
 		}
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/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 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2036 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2038 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 15951 "Photo.c"
+#line 15966 "Photo.c"
 		}
 	}
-#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = committed;
-#line 2042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2044 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 15958 "Photo.c"
+#line 15973 "Photo.c"
 		Alteration* _tmp11_ = NULL;
-#line 2043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = additional_alteration;
-#line 2043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp11_);
-#line 15964 "Photo.c"
+#line 15979 "Photo.c"
 	}
-#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = flags;
-#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp12_;
-#line 2045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2047 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 15972 "Photo.c"
+#line 15987 "Photo.c"
 }
 
 
 gboolean photo_is_flag_set (Photo* self, guint64 mask) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 15981 "Photo.c"
+#line 15996 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 15988 "Photo.c"
+#line 16003 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
 			guint64 _tmp3_ = 0ULL;
 			gboolean _tmp4_ = FALSE;
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp4_;
-#line 16004 "Photo.c"
+#line 16019 "Photo.c"
 			{
 				PhotoRow* _tmp5_ = NULL;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = self->row;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16011 "Photo.c"
+#line 16026 "Photo.c"
 			}
-#line 2050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2052 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16015 "Photo.c"
+#line 16030 "Photo.c"
 		}
-		__finally326:
+		__finally327:
 		{
 			PhotoRow* _tmp6_ = NULL;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16024 "Photo.c"
+#line 16039 "Photo.c"
 		}
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/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 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2051 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 16032 "Photo.c"
+#line 16047 "Photo.c"
 	}
 }
 
@@ -16041,22 +16056,22 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 	gboolean committed = FALSE;
 	gboolean _tmp17_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2056 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 2055 "/home/jens/Source/shotwell/src/Photo.vala"
-	flags = (guint64) 0;
 #line 2057 "/home/jens/Source/shotwell/src/Photo.vala"
+	flags = (guint64) 0;
+#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16051 "Photo.c"
+#line 16066 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16058 "Photo.c"
+#line 16073 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16065,99 +16080,99 @@ guint64 photo_add_flags (Photo* self, guint64 mask, Alteration* additional_alter
 			PhotoRow* _tmp5_ = NULL;
 			guint64 _tmp6_ = 0ULL;
 			guint64 _tmp7_ = 0ULL;
-#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_);
-#line 2059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = _tmp4_;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = flags;
-#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16085 "Photo.c"
+#line 16100 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
 				guint64 _tmp11_ = 0ULL;
 				gboolean _tmp12_ = FALSE;
 				gboolean _tmp13_ = FALSE;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp10_);
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = flags;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = photo_table_replace_flags (_tmp9_, &_tmp10_, _tmp11_);
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp12_;
-#line 2061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp9_);
-#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = committed;
-#line 2062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2064 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16110 "Photo.c"
+#line 16125 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
-#line 2063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2065 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16119 "Photo.c"
+#line 16134 "Photo.c"
 				}
 			}
 		}
-		__finally327:
+		__finally328:
 		{
 			PhotoRow* _tmp16_ = NULL;
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16130 "Photo.c"
+#line 16145 "Photo.c"
 		}
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/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 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2060 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16140 "Photo.c"
+#line 16155 "Photo.c"
 		}
 	}
-#line 2067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = committed;
-#line 2067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2069 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 16147 "Photo.c"
+#line 16162 "Photo.c"
 		Alteration* _tmp18_ = NULL;
-#line 2068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = additional_alteration;
-#line 2068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp18_);
-#line 16153 "Photo.c"
+#line 16168 "Photo.c"
 	}
-#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2072 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16159 "Photo.c"
+#line 16174 "Photo.c"
 }
 
 
@@ -16167,22 +16182,22 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 	gboolean committed = FALSE;
 	gboolean _tmp17_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2073 "/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 2073 "/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 2074 "/home/jens/Source/shotwell/src/Photo.vala"
-	flags = (guint64) 0;
 #line 2076 "/home/jens/Source/shotwell/src/Photo.vala"
+	flags = (guint64) 0;
+#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16177 "Photo.c"
+#line 16192 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2077 "/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 16184 "Photo.c"
+#line 16199 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16191,99 +16206,99 @@ guint64 photo_remove_flags (Photo* self, guint64 mask, Alteration* additional_al
 			PhotoRow* _tmp5_ = NULL;
 			guint64 _tmp6_ = 0ULL;
 			guint64 _tmp7_ = 0ULL;
-#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_);
-#line 2078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = _tmp4_;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = flags;
-#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16211 "Photo.c"
+#line 16226 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
 				guint64 _tmp11_ = 0ULL;
 				gboolean _tmp12_ = FALSE;
 				gboolean _tmp13_ = FALSE;
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_;
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp10_);
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = flags;
-#line 2080 "/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 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp12_;
-#line 2080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp9_);
-#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = committed;
-#line 2081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2083 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16236 "Photo.c"
+#line 16251 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
-#line 2082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2084 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16245 "Photo.c"
+#line 16260 "Photo.c"
 				}
 			}
 		}
-		__finally328:
+		__finally329:
 		{
 			PhotoRow* _tmp16_ = NULL;
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
-#line 2077 "/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 16256 "Photo.c"
+#line 16271 "Photo.c"
 		}
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2077 "/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 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2079 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16266 "Photo.c"
+#line 16281 "Photo.c"
 		}
 	}
-#line 2086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = committed;
-#line 2086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2088 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 16273 "Photo.c"
+#line 16288 "Photo.c"
 		Alteration* _tmp18_ = NULL;
-#line 2087 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = additional_alteration;
-#line 2087 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp18_);
-#line 16279 "Photo.c"
+#line 16294 "Photo.c"
 	}
-#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2091 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16285 "Photo.c"
+#line 16300 "Photo.c"
 }
 
 
@@ -16293,22 +16308,22 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 	gboolean committed = FALSE;
 	gboolean _tmp17_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2092 "/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 2092 "/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 2093 "/home/jens/Source/shotwell/src/Photo.vala"
-	flags = (guint64) 0;
 #line 2095 "/home/jens/Source/shotwell/src/Photo.vala"
+	flags = (guint64) 0;
+#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16303 "Photo.c"
+#line 16318 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2096 "/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 16310 "Photo.c"
+#line 16325 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16317,99 +16332,99 @@ guint64 photo_add_remove_flags (Photo* self, guint64 add, guint64 remove, Altera
 			PhotoRow* _tmp5_ = NULL;
 			guint64 _tmp6_ = 0ULL;
 			guint64 _tmp7_ = 0ULL;
-#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = add;
-#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = remove;
-#line 2097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = (_tmp2_ | _tmp3_) & (~_tmp4_);
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = flags;
-#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != _tmp7_) {
-#line 16337 "Photo.c"
+#line 16352 "Photo.c"
 				PhotoTable* _tmp8_ = NULL;
 				PhotoTable* _tmp9_ = NULL;
 				PhotoID _tmp10_ = {0};
 				guint64 _tmp11_ = 0ULL;
 				gboolean _tmp12_ = FALSE;
 				gboolean _tmp13_ = FALSE;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = photo_table_get_instance ();
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp10_);
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = flags;
-#line 2099 "/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 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp12_;
-#line 2099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp9_);
-#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = committed;
-#line 2100 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2102 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_) {
-#line 16362 "Photo.c"
+#line 16377 "Photo.c"
 					PhotoRow* _tmp14_ = NULL;
 					guint64 _tmp15_ = 0ULL;
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->row;
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = flags;
-#line 2101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2103 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_->flags = _tmp15_;
-#line 16371 "Photo.c"
+#line 16386 "Photo.c"
 				}
 			}
 		}
-		__finally329:
+		__finally330:
 		{
 			PhotoRow* _tmp16_ = NULL;
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = self->row;
-#line 2096 "/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 16382 "Photo.c"
+#line 16397 "Photo.c"
 		}
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2096 "/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 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2098 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16392 "Photo.c"
+#line 16407 "Photo.c"
 		}
 	}
-#line 2105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = committed;
-#line 2105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2107 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 16399 "Photo.c"
+#line 16414 "Photo.c"
 		Alteration* _tmp18_ = NULL;
-#line 2106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = additional_alteration;
-#line 2106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp18_);
-#line 16405 "Photo.c"
+#line 16420 "Photo.c"
 	}
-#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2108 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2110 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16411 "Photo.c"
+#line 16426 "Photo.c"
 }
 
 
@@ -16417,34 +16432,34 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((add == NULL) || GEE_IS_COLLECTION (add));
-#line 2111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((additional_add_alteration == NULL) || IS_ALTERATION (additional_add_alteration));
-#line 2111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((remove == NULL) || GEE_IS_COLLECTION (remove));
-#line 2111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2113 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((additional_remove_alteration == NULL) || IS_ALTERATION (additional_remove_alteration));
-#line 2114 "/home/jens/Source/shotwell/src/Photo.vala"
-	database_table_begin_transaction ();
 #line 2116 "/home/jens/Source/shotwell/src/Photo.vala"
+	database_table_begin_transaction ();
+#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = add;
-#line 2116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 16433 "Photo.c"
+#line 16448 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = add;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_it = _tmp2_;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 16446 "Photo.c"
+#line 16461 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				Photo* photo = NULL;
@@ -16453,57 +16468,57 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				Photo* _tmp7_ = NULL;
 				guint64 _tmp8_ = 0ULL;
 				Alteration* _tmp9_ = NULL;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _photo_it;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 16463 "Photo.c"
+#line 16478 "Photo.c"
 				}
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _photo_it;
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = (Photo*) _tmp6_;
-#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo;
-#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = add_mask;
-#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = additional_add_alteration;
-#line 2118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2120 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_add_flags (_tmp7_, _tmp8_, _tmp9_);
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 16481 "Photo.c"
+#line 16496 "Photo.c"
 			}
-#line 2117 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2119 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16485 "Photo.c"
+#line 16500 "Photo.c"
 		}
 	}
-#line 2121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = remove;
-#line 2121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_ != NULL) {
-#line 16492 "Photo.c"
+#line 16507 "Photo.c"
 		{
 			GeeIterator* _photo_it = NULL;
 			GeeCollection* _tmp11_ = NULL;
 			GeeIterator* _tmp12_ = NULL;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = remove;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_it = _tmp12_;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 16505 "Photo.c"
+#line 16520 "Photo.c"
 				GeeIterator* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
 				Photo* photo = NULL;
@@ -16512,58 +16527,58 @@ void photo_add_remove_many_flags (GeeCollection* add, guint64 add_mask, Alterati
 				Photo* _tmp17_ = NULL;
 				guint64 _tmp18_ = 0ULL;
 				Alteration* _tmp19_ = NULL;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _photo_it;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = gee_iterator_next (_tmp13_);
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp14_) {
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 16522 "Photo.c"
+#line 16537 "Photo.c"
 				}
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _photo_it;
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = gee_iterator_get (_tmp15_);
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = (Photo*) _tmp16_;
-#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = photo;
-#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = remove_mask;
-#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = additional_remove_alteration;
-#line 2123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2125 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_remove_flags (_tmp17_, _tmp18_, _tmp19_);
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 16540 "Photo.c"
+#line 16555 "Photo.c"
 			}
-#line 2122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2124 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_photo_it);
-#line 16544 "Photo.c"
+#line 16559 "Photo.c"
 		}
 	}
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 	database_table_commit_transaction (&_inner_error_);
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 16557 "Photo.c"
+#line 16572 "Photo.c"
 		} else {
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/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 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2128 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 16565 "Photo.c"
+#line 16580 "Photo.c"
 		}
 	}
 }
@@ -16575,22 +16590,22 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 	gboolean committed = FALSE;
 	gboolean _tmp16_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 2129 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2131 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 2130 "/home/jens/Source/shotwell/src/Photo.vala"
-	flags = (guint64) 0;
 #line 2132 "/home/jens/Source/shotwell/src/Photo.vala"
+	flags = (guint64) 0;
+#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16585 "Photo.c"
+#line 16600 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16592 "Photo.c"
+#line 16607 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -16598,151 +16613,151 @@ guint64 photo_toggle_flags (Photo* self, guint64 mask, Alteration* additional_al
 			PhotoRow* _tmp4_ = NULL;
 			guint64 _tmp5_ = 0ULL;
 			guint64 _tmp6_ = 0ULL;
-#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = mask;
-#line 2134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
 			flags = _tmp2_ ^ _tmp3_;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->flags;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = flags;
-#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp5_ != _tmp6_) {
-#line 16616 "Photo.c"
+#line 16631 "Photo.c"
 				PhotoTable* _tmp7_ = NULL;
 				PhotoTable* _tmp8_ = NULL;
 				PhotoID _tmp9_ = {0};
 				guint64 _tmp10_ = 0ULL;
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo_table_get_instance ();
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp9_);
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = flags;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = photo_table_replace_flags (_tmp8_, &_tmp9_, _tmp10_);
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp11_;
-#line 2136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp8_);
-#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = committed;
-#line 2137 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2139 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 16641 "Photo.c"
+#line 16656 "Photo.c"
 					PhotoRow* _tmp13_ = NULL;
 					guint64 _tmp14_ = 0ULL;
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->row;
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = flags;
-#line 2138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2140 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->flags = _tmp14_;
-#line 16650 "Photo.c"
+#line 16665 "Photo.c"
 				}
 			}
 		}
-		__finally330:
+		__finally331:
 		{
 			PhotoRow* _tmp15_ = NULL;
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16661 "Photo.c"
+#line 16676 "Photo.c"
 		}
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/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 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2135 "/home/jens/Source/shotwell/src/Photo.vala"
 			return 0ULL;
-#line 16671 "Photo.c"
+#line 16686 "Photo.c"
 		}
 	}
-#line 2142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = committed;
-#line 2142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2144 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 16678 "Photo.c"
+#line 16693 "Photo.c"
 		Alteration* _tmp17_ = NULL;
-#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = additional_alteration;
-#line 2143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_flags_altered (self, _tmp17_);
-#line 16684 "Photo.c"
+#line 16699 "Photo.c"
 	}
-#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = flags;
-#line 2145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2147 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 16690 "Photo.c"
+#line 16705 "Photo.c"
 }
 
 
 gboolean photo_is_master_metadata_dirty (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 16699 "Photo.c"
+#line 16714 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16706 "Photo.c"
+#line 16721 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
-#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->metadata_dirty;
-#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16716 "Photo.c"
+#line 16731 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16723 "Photo.c"
+#line 16738 "Photo.c"
 			}
-#line 2150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2152 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16727 "Photo.c"
+#line 16742 "Photo.c"
 		}
-		__finally331:
+		__finally332:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16736 "Photo.c"
+#line 16751 "Photo.c"
 		}
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/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 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2151 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 16744 "Photo.c"
+#line 16759 "Photo.c"
 	}
 }
 
@@ -16751,110 +16766,110 @@ void photo_set_master_metadata_dirty (Photo* self, gboolean dirty, GError** erro
 	gboolean committed = FALSE;
 	gboolean _tmp11_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2154 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2155 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16757 "Photo.c"
+#line 16772 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16764 "Photo.c"
+#line 16779 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
 			gboolean _tmp3_ = FALSE;
-#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->metadata_dirty;
-#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = dirty;
-#line 2157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp3_) {
-#line 16777 "Photo.c"
+#line 16792 "Photo.c"
 				PhotoTable* _tmp4_ = NULL;
 				PhotoTable* _tmp5_ = NULL;
 				PhotoID _tmp6_ = {0};
 				gboolean _tmp7_ = FALSE;
 				PhotoRow* _tmp8_ = NULL;
 				gboolean _tmp9_ = FALSE;
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = photo_table_get_instance ();
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp6_);
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = dirty;
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_set_metadata_dirty (_tmp5_, &_tmp6_, _tmp7_, &_inner_error_);
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp5_);
-#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 16798 "Photo.c"
-					goto __finally332;
+#line 16813 "Photo.c"
+					goto __finally333;
 				}
-#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = dirty;
-#line 2159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2161 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_->metadata_dirty = _tmp9_;
-#line 2160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2162 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = TRUE;
-#line 16809 "Photo.c"
+#line 16824 "Photo.c"
 			}
 		}
-		__finally332:
+		__finally333:
 		{
 			PhotoRow* _tmp10_ = NULL;
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16819 "Photo.c"
+#line 16834 "Photo.c"
 		}
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 16829 "Photo.c"
+#line 16844 "Photo.c"
 			} else {
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/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 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2158 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 16837 "Photo.c"
+#line 16852 "Photo.c"
 			}
 		}
 	}
-#line 2164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = committed;
-#line 2164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2166 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 16845 "Photo.c"
+#line 16860 "Photo.c"
 		Alteration* _tmp12_ = NULL;
 		Alteration* _tmp13_ = NULL;
-#line 2165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = alteration_new ("metadata", "master-dirty");
-#line 2165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp12_;
-#line 2165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
-#line 2165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp13_);
-#line 16856 "Photo.c"
+#line 16871 "Photo.c"
 	}
 }
 
@@ -16863,54 +16878,54 @@ static Rating photo_real_get_rating (MediaSource* base) {
 	Photo * self;
 	Rating result = 0;
 	GError * _inner_error_ = NULL;
-#line 2168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 16867 "Photo.c"
+#line 16882 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16874 "Photo.c"
+#line 16889 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
-#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 16884 "Photo.c"
+#line 16899 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16891 "Photo.c"
+#line 16906 "Photo.c"
 			}
-#line 2170 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2172 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 16895 "Photo.c"
+#line 16910 "Photo.c"
 		}
-		__finally333:
+		__finally334:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 16904 "Photo.c"
+#line 16919 "Photo.c"
 		}
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/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 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2171 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 16912 "Photo.c"
+#line 16927 "Photo.c"
 	}
 }
 
@@ -16920,122 +16935,122 @@ static void photo_real_set_rating (MediaSource* base, Rating rating) {
 	gboolean committed = FALSE;
 	gboolean _tmp16_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2174 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2176 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 16926 "Photo.c"
+#line 16941 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 16933 "Photo.c"
+#line 16948 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			Rating _tmp2_ = 0;
 			PhotoRow* _tmp3_ = NULL;
 			Rating _tmp4_ = 0;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = rating;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->rating;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp4_) {
-#line 16947 "Photo.c"
+#line 16962 "Photo.c"
 				Rating _tmp5_ = 0;
 				gboolean _tmp6_ = FALSE;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = rating;
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = rating_is_valid (_tmp5_);
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp6_;
-#line 16956 "Photo.c"
+#line 16971 "Photo.c"
 			} else {
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 16960 "Photo.c"
+#line 16975 "Photo.c"
 			}
-#line 2178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 16964 "Photo.c"
+#line 16979 "Photo.c"
 				PhotoTable* _tmp7_ = NULL;
 				PhotoTable* _tmp8_ = NULL;
 				PhotoID _tmp9_ = {0};
 				Rating _tmp10_ = 0;
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo_table_get_instance ();
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (self, &_tmp9_);
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = rating;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = photo_table_set_rating (_tmp8_, &_tmp9_, _tmp10_);
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp11_;
-#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp8_);
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = committed;
-#line 2180 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2182 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 16989 "Photo.c"
+#line 17004 "Photo.c"
 					PhotoRow* _tmp13_ = NULL;
 					Rating _tmp14_ = 0;
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->row;
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = rating;
-#line 2181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2183 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_->rating = _tmp14_;
-#line 16998 "Photo.c"
+#line 17013 "Photo.c"
 				}
 			}
 		}
-		__finally334:
+		__finally335:
 		{
 			PhotoRow* _tmp15_ = NULL;
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17009 "Photo.c"
+#line 17024 "Photo.c"
 		}
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/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 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2179 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17019 "Photo.c"
+#line 17034 "Photo.c"
 		}
 	}
-#line 2185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = committed;
-#line 2185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2187 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 17026 "Photo.c"
+#line 17041 "Photo.c"
 		Alteration* _tmp17_ = NULL;
 		Alteration* _tmp18_ = NULL;
-#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = alteration_new ("metadata", "rating");
-#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_;
-#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp18_);
-#line 2186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2188 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp18_);
-#line 17037 "Photo.c"
+#line 17052 "Photo.c"
 	}
 }
 
@@ -17043,48 +17058,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 2189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17047 "Photo.c"
+#line 17062 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17054 "Photo.c"
+#line 17069 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = rating_increase (_tmp2_);
-#line 2191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2193 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17067 "Photo.c"
+#line 17082 "Photo.c"
 		}
-		__finally335:
+		__finally336:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17076 "Photo.c"
+#line 17091 "Photo.c"
 		}
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/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 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2190 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2192 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17086 "Photo.c"
+#line 17101 "Photo.c"
 		}
 	}
 }
@@ -17093,48 +17108,48 @@ static void photo_real_increase_rating (MediaSource* base) {
 static void photo_real_decrease_rating (MediaSource* base) {
 	Photo * self;
 	GError * _inner_error_ = NULL;
-#line 2195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17097 "Photo.c"
+#line 17112 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2196 "/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 17104 "Photo.c"
+#line 17119 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = rating_decrease (_tmp2_);
-#line 2197 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2199 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 17117 "Photo.c"
+#line 17132 "Photo.c"
 		}
-		__finally336:
+		__finally337:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2196 "/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 17126 "Photo.c"
+#line 17141 "Photo.c"
 		}
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2196 "/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 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2196 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2198 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17136 "Photo.c"
+#line 17151 "Photo.c"
 		}
 	}
 }
@@ -17143,130 +17158,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 2201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2203 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 17149 "Photo.c"
+#line 17164 "Photo.c"
 	{
 		PhotoTable* _tmp0_ = NULL;
 		PhotoTable* _tmp1_ = NULL;
 		PhotoID _tmp2_ = {0};
 		const gchar* _tmp3_ = NULL;
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_table_get_instance ();
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (self, &_tmp2_);
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = backlinks;
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_);
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp1_);
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17171 "Photo.c"
-				goto __catch337_database_error;
+#line 17186 "Photo.c"
+				goto __catch338_database_error;
 			}
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/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 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17180 "Photo.c"
+#line 17195 "Photo.c"
 		}
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17188 "Photo.c"
+#line 17203 "Photo.c"
 			{
 				PhotoRow* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
 				gchar* _tmp7_ = NULL;
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = self->row;
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = backlinks;
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = g_strdup (_tmp6_);
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp5_->backlinks);
-#line 2208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2210 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 17203 "Photo.c"
+#line 17218 "Photo.c"
 			}
-			__finally338:
+			__finally339:
 			{
 				PhotoRow* _tmp8_ = NULL;
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17212 "Photo.c"
+#line 17227 "Photo.c"
 			}
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 17218 "Photo.c"
-					goto __catch337_database_error;
+#line 17233 "Photo.c"
+					goto __catch338_database_error;
 				}
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/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 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2209 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 17227 "Photo.c"
+#line 17242 "Photo.c"
 			}
 		}
 	}
-	goto __finally337;
-	__catch337_database_error:
+	goto __finally338;
+	__catch338_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		GError* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp9_;
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = err;
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2213 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp11_->message;
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2211: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
-#line 2211 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_free0 (_tmp10_);
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17257 "Photo.c"
+#line 17272 "Photo.c"
 	}
-	__finally337:
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally338:
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/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 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2207 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17268 "Photo.c"
+#line 17283 "Photo.c"
 	}
 }
 
@@ -17275,18 +17290,18 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 	Photo * self;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 17281 "Photo.c"
+#line 17296 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17288 "Photo.c"
+#line 17303 "Photo.c"
 		{
 			gboolean committed = FALSE;
 			PhotoTable* _tmp1_ = NULL;
@@ -17297,70 +17312,70 @@ static gboolean photo_real_set_event_id (MediaSource* base, EventID* event_id) {
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
 			gboolean _tmp8_ = FALSE;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->photo_id;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = *event_id;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = photo_table_set_event (_tmp2_, &_tmp4_, &_tmp5_);
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_;
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2221 "/home/jens/Source/shotwell/src/Photo.vala"
-			committed = _tmp7_;
 #line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+			committed = _tmp7_;
+#line 2225 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = committed;
-#line 2223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2225 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_) {
-#line 17321 "Photo.c"
+#line 17336 "Photo.c"
 				PhotoRow* _tmp9_ = NULL;
 				EventID _tmp10_ = {0};
-#line 2224 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
-#line 2224 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = *event_id;
-#line 2224 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 17330 "Photo.c"
+#line 17345 "Photo.c"
 			}
-#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = committed;
-#line 17334 "Photo.c"
+#line 17349 "Photo.c"
 			{
 				PhotoRow* _tmp11_ = NULL;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->row;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17341 "Photo.c"
+#line 17356 "Photo.c"
 			}
-#line 2226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2228 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17345 "Photo.c"
+#line 17360 "Photo.c"
 		}
-		__finally339:
+		__finally340:
 		{
 			PhotoRow* _tmp12_ = NULL;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->row;
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17354 "Photo.c"
+#line 17369 "Photo.c"
 		}
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/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 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2222 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 17362 "Photo.c"
+#line 17377 "Photo.c"
 	}
 }
 
@@ -17380,13 +17395,13 @@ static gchar* photo_real_to_string (DataObject* base) {
 	gchar* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
 	gchar* _tmp19_ = NULL;
-#line 2230 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2232 "/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"
 	_tmp1_ = photo_is_master_baseline (self);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 17388 "Photo.c"
+#line 17403 "Photo.c"
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
@@ -17394,74 +17409,74 @@ static gchar* photo_real_to_string (DataObject* base) {
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo_get_actual_file (self);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = g_file_get_path (_tmp3_);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = g_strconcat (" (", _tmp5_, NULL);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = g_strconcat (_tmp7_, ")", NULL);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp8_;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp7_);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp5_);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 17420 "Photo.c"
+#line 17435 "Photo.c"
 	} else {
 		gchar* _tmp9_ = NULL;
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = g_strdup ("");
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 2232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2234 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp9_;
-#line 17429 "Photo.c"
+#line 17444 "Photo.c"
 	}
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (self, &_tmp10_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_.id;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp11_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_get_master_reader (self);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/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 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _tmp16_;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = g_strdup_printf ("[%s] %s%s", _tmp13_, _tmp17_, _tmp0_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp17_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp15_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp13_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp19_;
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp0_);
-#line 2231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2233 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 17463 "Photo.c"
+#line 17478 "Photo.c"
 }
 
 
@@ -17474,21 +17489,21 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 	Photo* _tmp2_ = NULL;
 	DataSource* _tmp14_ = NULL;
 	gboolean _tmp15_ = FALSE;
-#line 2235 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2235 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail ((source == NULL) || IS_DATA_SOURCE (source), FALSE);
 #line 2237 "/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"
 	_tmp0_ = source;
-#line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO) ? ((Photo*) _tmp0_) : NULL);
-#line 2237 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 2238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 2238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 17490 "Photo.c"
+#line 17505 "Photo.c"
 		PhotoID photo_id = {0};
 		PhotoID _tmp3_ = {0};
 		PhotoID other_photo_id = {0};
@@ -17496,66 +17511,66 @@ static gboolean photo_real_equals (DataSource* base, DataSource* source) {
 		PhotoID _tmp5_ = {0};
 		gboolean _tmp6_ = FALSE;
 		Photo* _tmp7_ = NULL;
-#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (self, &_tmp3_);
-#line 2239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2241 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_id = _tmp3_;
-#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo;
-#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (_tmp4_, &_tmp5_);
-#line 2240 "/home/jens/Source/shotwell/src/Photo.vala"
-		other_photo_id = _tmp5_;
 #line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+		other_photo_id = _tmp5_;
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo;
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (self != _tmp7_) {
-#line 17512 "Photo.c"
+#line 17527 "Photo.c"
 			PhotoID _tmp8_ = {0};
 			gint64 _tmp9_ = 0LL;
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = photo_id;
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_.id;
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp9_ != PHOTO_ID_INVALID;
-#line 17521 "Photo.c"
+#line 17536 "Photo.c"
 		} else {
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = FALSE;
-#line 17525 "Photo.c"
+#line 17540 "Photo.c"
 		}
-#line 2242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2244 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp6_) {
-#line 17529 "Photo.c"
+#line 17544 "Photo.c"
 			PhotoID _tmp10_ = {0};
 			gint64 _tmp11_ = 0LL;
 			PhotoID _tmp12_ = {0};
 			gint64 _tmp13_ = 0LL;
-#line 2243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_id;
-#line 2243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_.id;
-#line 2243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = other_photo_id;
-#line 2243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _tmp12_.id;
-#line 2243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2245 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_assert (_tmp11_ != _tmp13_, "photo_id.id != other_photo_id.id");
-#line 17544 "Photo.c"
+#line 17559 "Photo.c"
 		}
 	}
-#line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2249 "/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 2247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp15_;
-#line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 2247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2249 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 17557 "Photo.c"
+#line 17572 "Photo.c"
 }
 
 
@@ -17575,196 +17590,196 @@ static void photo_file_exif_updated (Photo* self) {
 	gboolean success = FALSE;
 	gboolean _tmp37_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2254 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2252 "/home/jens/Source/shotwell/src/Photo.vala"
-	file = _tmp0_;
 #line 2254 "/home/jens/Source/shotwell/src/Photo.vala"
+	file = _tmp0_;
+#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
 	info = NULL;
-#line 17585 "Photo.c"
+#line 17600 "Photo.c"
 	{
 		GFileInfo* _tmp1_ = NULL;
 		GFileInfo* _tmp2_ = NULL;
 		GFileInfo* _tmp3_ = NULL;
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/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 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp2_;
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17596 "Photo.c"
-			goto __catch340_g_error;
+#line 17611 "Photo.c"
+			goto __catch341_g_error;
 		}
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp1_;
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2256 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2258 "/home/jens/Source/shotwell/src/Photo.vala"
 		info = _tmp3_;
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 17609 "Photo.c"
+#line 17624 "Photo.c"
 	}
-	goto __finally340;
-	__catch340_g_error:
+	goto __finally341;
+	__catch341_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2261 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = err->message;
-#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_error ("Photo.vala:2259: Unable to read file information for %s: %s", _tmp5_, _tmp6_);
-#line 2259 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_free0 (_tmp5_);
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17634 "Photo.c"
+#line 17649 "Photo.c"
 	}
-	__finally340:
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally341:
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/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 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2257 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17649 "Photo.c"
+#line 17664 "Photo.c"
 	}
-#line 2262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = info;
-#line 2262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_info_get_modification_time (_tmp7_, &_tmp8_);
-#line 2262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2264 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp = _tmp8_;
-#line 2265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_interrogator_new (file, PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL);
-#line 2265 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
 	interrogator = _tmp9_;
-#line 17661 "Photo.c"
+#line 17676 "Photo.c"
 	{
-#line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_interrogator_interrogate (interrogator, &_inner_error_);
-#line 2267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 17667 "Photo.c"
-			goto __catch341_g_error;
+#line 17682 "Photo.c"
+			goto __catch342_g_error;
 		}
 	}
-	goto __finally341;
-	__catch341_g_error:
+	goto __finally342;
+	__catch342_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
 		GError* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = g_file_get_path (file);
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp10_;
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = err;
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2271 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp12_->message;
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2269: Unable to interrogate photo file %s: %s", _tmp11_, _tmp13_);
-#line 2269 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_free0 (_tmp11_);
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 17697 "Photo.c"
+#line 17712 "Photo.c"
 	}
-	__finally341:
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally342:
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/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 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2268 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17714 "Photo.c"
+#line 17729 "Photo.c"
 	}
-#line 2272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_file_interrogator_get_detected_photo_information (interrogator);
-#line 2272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp14_;
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = detected;
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_ == NULL) {
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = TRUE;
-#line 17726 "Photo.c"
+#line 17741 "Photo.c"
 	} else {
 		gboolean _tmp17_ = FALSE;
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = photo_file_interrogator_get_is_photo_corrupted (interrogator);
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp17_;
-#line 17733 "Photo.c"
+#line 17748 "Photo.c"
 	}
-#line 2273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2275 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 17737 "Photo.c"
+#line 17752 "Photo.c"
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
-#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_;
-#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_critical ("Photo.vala:2274: file_exif_updated: %s no longer an image", _tmp19_);
-#line 2274 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp19_);
 #line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
-		_detected_photo_information_unref0 (detected);
+		g_critical ("Photo.vala:2276: file_exif_updated: %s no longer an image", _tmp19_);
 #line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp19_);
+#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
+		_detected_photo_information_unref0 (detected);
+#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_interrogator_unref0 (interrogator);
-#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 2276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2278 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 17758 "Photo.c"
+#line 17773 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp20_ = NULL;
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = self->row;
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17766 "Photo.c"
+#line 17781 "Photo.c"
 		{
 			PhotoTable* _tmp21_ = NULL;
 			PhotoTable* _tmp22_ = NULL;
@@ -17781,96 +17796,96 @@ static void photo_file_exif_updated (Photo* self) {
 			const gchar* _tmp33_ = NULL;
 			PhotoRow* _tmp34_ = NULL;
 			gboolean _tmp35_ = FALSE;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = photo_table_get_instance ();
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = _tmp21_;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_get_photo_id (self, &_tmp23_);
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = info;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = g_file_info_get_size (_tmp24_);
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = timestamp;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = _tmp26_.tv_sec;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = detected;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = _tmp28_->md5;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp30_ = detected;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = _tmp30_->exif_md5;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp32_ = detected;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp33_ = _tmp32_->thumbnail_md5;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = self->row;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp35_ = photo_table_master_exif_updated (_tmp22_, &_tmp23_, _tmp25_, _tmp27_, _tmp29_, _tmp31_, _tmp33_, _tmp34_);
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			success = _tmp35_;
-#line 2281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2283 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp22_);
-#line 17817 "Photo.c"
+#line 17832 "Photo.c"
 		}
-		__finally342:
+		__finally343:
 		{
 			PhotoRow* _tmp36_ = NULL;
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = self->row;
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17826 "Photo.c"
+#line 17841 "Photo.c"
 		}
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_interrogator_unref0 (interrogator);
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/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 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2282 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 17844 "Photo.c"
+#line 17859 "Photo.c"
 		}
 	}
-#line 2285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = success;
-#line 2285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2287 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp37_) {
-#line 17851 "Photo.c"
+#line 17866 "Photo.c"
 		Alteration* _tmp38_ = NULL;
 		Alteration* _tmp39_ = NULL;
-#line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = alteration_new_from_list ("metadata:exif,metadata:md5");
-#line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = _tmp38_;
-#line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp39_);
-#line 2286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2288 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp39_);
-#line 17862 "Photo.c"
+#line 17877 "Photo.c"
 	}
-#line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_interrogator_unref0 (interrogator);
-#line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (info);
-#line 2251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 17872 "Photo.c"
+#line 17887 "Photo.c"
 }
 
 
@@ -17878,54 +17893,54 @@ static guint64 photo_real_get_filesize (MediaSource* base) {
 	Photo * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17882 "Photo.c"
+#line 17897 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17889 "Photo.c"
+#line 17904 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
-#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 17899 "Photo.c"
+#line 17914 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17906 "Photo.c"
+#line 17921 "Photo.c"
 			}
-#line 2293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2295 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17910 "Photo.c"
+#line 17925 "Photo.c"
 		}
-		__finally343:
+		__finally344:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17919 "Photo.c"
+#line 17934 "Photo.c"
 		}
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/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 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2294 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 17927 "Photo.c"
+#line 17942 "Photo.c"
 	}
 }
 
@@ -17934,57 +17949,57 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 	Photo * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 17938 "Photo.c"
+#line 17953 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 17945 "Photo.c"
+#line 17960 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			BackingPhotoRow* _tmp2_ = NULL;
 			gint64 _tmp3_ = 0LL;
-#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->master;
-#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->filesize;
-#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp3_;
-#line 17958 "Photo.c"
+#line 17973 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17965 "Photo.c"
+#line 17980 "Photo.c"
 			}
-#line 2299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2301 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 17969 "Photo.c"
+#line 17984 "Photo.c"
 		}
-		__finally344:
+		__finally345:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 17978 "Photo.c"
+#line 17993 "Photo.c"
 		}
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/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 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2298 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2300 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 17986 "Photo.c"
+#line 18001 "Photo.c"
 	}
 }
 
@@ -17992,54 +18007,54 @@ static guint64 photo_real_get_master_filesize (MediaSource* base) {
 guint64 photo_get_editable_filesize (Photo* self) {
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 2303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0ULL);
-#line 17996 "Photo.c"
+#line 18011 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18003 "Photo.c"
+#line 18018 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
-#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->editable;
-#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = (guint64) _tmp2_;
-#line 18013 "Photo.c"
+#line 18028 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18020 "Photo.c"
+#line 18035 "Photo.c"
 			}
-#line 2305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2307 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18024 "Photo.c"
+#line 18039 "Photo.c"
 		}
-		__finally345:
+		__finally346:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18033 "Photo.c"
+#line 18048 "Photo.c"
 		}
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/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 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2304 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2306 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0ULL;
-#line 18041 "Photo.c"
+#line 18056 "Photo.c"
 	}
 }
 
@@ -18048,15 +18063,15 @@ static time_t photo_real_get_exposure_time (Dateable* base) {
 	Photo * self;
 	time_t result = 0;
 	time_t _tmp0_ = 0;
-#line 2309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2311 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->cached_exposure_time;
-#line 2310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2312 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 18058 "Photo.c"
+#line 18073 "Photo.c"
 }
 
 
@@ -18064,54 +18079,54 @@ static gchar* photo_real_get_basename (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18068 "Photo.c"
+#line 18083 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18075 "Photo.c"
+#line 18090 "Photo.c"
 		{
 			const gchar* _tmp1_ = NULL;
 			gchar* _tmp2_ = NULL;
-#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->file_title;
-#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = g_strdup (_tmp1_);
-#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 18085 "Photo.c"
+#line 18100 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18092 "Photo.c"
+#line 18107 "Photo.c"
 			}
-#line 2315 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2317 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18096 "Photo.c"
+#line 18111 "Photo.c"
 		}
-		__finally346:
+		__finally347:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18105 "Photo.c"
+#line 18120 "Photo.c"
 		}
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/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 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2316 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18113 "Photo.c"
+#line 18128 "Photo.c"
 	}
 }
 
@@ -18120,57 +18135,57 @@ static gchar* photo_real_get_title (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18124 "Photo.c"
+#line 18139 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18131 "Photo.c"
+#line 18146 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->title;
-#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18144 "Photo.c"
+#line 18159 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18151 "Photo.c"
+#line 18166 "Photo.c"
 			}
-#line 2321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2323 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18155 "Photo.c"
+#line 18170 "Photo.c"
 		}
-		__finally347:
+		__finally348:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18164 "Photo.c"
+#line 18179 "Photo.c"
 		}
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/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 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2322 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18172 "Photo.c"
+#line 18187 "Photo.c"
 	}
 }
 
@@ -18179,57 +18194,57 @@ static gchar* photo_real_get_comment (MediaSource* base) {
 	Photo * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2325 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 18183 "Photo.c"
+#line 18198 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18190 "Photo.c"
+#line 18205 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->comment;
-#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 18203 "Photo.c"
+#line 18218 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18210 "Photo.c"
+#line 18225 "Photo.c"
 			}
-#line 2327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2329 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 18214 "Photo.c"
+#line 18229 "Photo.c"
 		}
-		__finally348:
+		__finally349:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18223 "Photo.c"
+#line 18238 "Photo.c"
 		}
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/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 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2328 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 18231 "Photo.c"
+#line 18246 "Photo.c"
 	}
 }
 
@@ -18242,24 +18257,24 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 	gboolean committed = FALSE;
 	gboolean _tmp18_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = title;
-#line 2332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2334 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 2332 "/home/jens/Source/shotwell/src/Photo.vala"
-	new_title = _tmp1_;
 #line 2334 "/home/jens/Source/shotwell/src/Photo.vala"
+	new_title = _tmp1_;
+#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 18254 "Photo.c"
+#line 18269 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18261 "Photo.c"
+#line 18276 "Photo.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			PhotoRow* _tmp4_ = NULL;
@@ -18271,108 +18286,108 @@ static void photo_real_set_title (MediaSource* base, const gchar* title) {
 			const gchar* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			gboolean _tmp13_ = FALSE;
-#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = new_title;
-#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->title;
-#line 2336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2338 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
-#line 18281 "Photo.c"
+#line 18296 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18288 "Photo.c"
+#line 18303 "Photo.c"
 				}
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (new_title);
-#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 18294 "Photo.c"
+#line 18309 "Photo.c"
 			}
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_;
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->photo_id;
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = new_title;
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_set_title (_tmp8_, &_tmp10_, _tmp11_);
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp12_;
-#line 2339 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp8_);
-#line 2340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = committed;
-#line 2340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2342 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 18316 "Photo.c"
+#line 18331 "Photo.c"
 				PhotoRow* _tmp14_ = NULL;
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = new_title;
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = g_strdup (_tmp15_);
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp14_->title);
-#line 2341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2343 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_->title = _tmp16_;
-#line 18330 "Photo.c"
+#line 18345 "Photo.c"
 			}
 		}
-		__finally349:
+		__finally350:
 		{
 			PhotoRow* _tmp17_ = NULL;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->row;
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18340 "Photo.c"
+#line 18355 "Photo.c"
 		}
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (new_title);
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/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 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2335 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2337 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 18352 "Photo.c"
+#line 18367 "Photo.c"
 		}
 	}
-#line 2344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
-#line 2344 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2346 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 18359 "Photo.c"
+#line 18374 "Photo.c"
 		Alteration* _tmp19_ = NULL;
 		Alteration* _tmp20_ = NULL;
-#line 2345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = alteration_new ("metadata", "name");
-#line 2345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_;
-#line 2345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 2345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2347 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp20_);
-#line 18370 "Photo.c"
+#line 18385 "Photo.c"
 	}
-#line 2331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2333 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (new_title);
-#line 18374 "Photo.c"
+#line 18389 "Photo.c"
 }
 
 
@@ -18385,24 +18400,24 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 	gboolean committed = FALSE;
 	gboolean _tmp18_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 2349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2351 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = comment;
-#line 2349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2351 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = media_source_prep_comment (_tmp0_);
-#line 2349 "/home/jens/Source/shotwell/src/Photo.vala"
-	new_comment = _tmp1_;
 #line 2351 "/home/jens/Source/shotwell/src/Photo.vala"
+	new_comment = _tmp1_;
+#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 18397 "Photo.c"
+#line 18412 "Photo.c"
 	{
 		PhotoRow* _tmp2_ = NULL;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18404 "Photo.c"
+#line 18419 "Photo.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			PhotoRow* _tmp4_ = NULL;
@@ -18414,121 +18429,121 @@ static gboolean photo_real_set_comment (MediaSource* base, const gchar* comment)
 			const gchar* _tmp11_ = NULL;
 			gboolean _tmp12_ = FALSE;
 			gboolean _tmp13_ = FALSE;
-#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = new_comment;
-#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->comment;
-#line 2353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2355 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (g_strcmp0 (_tmp3_, _tmp5_) == 0) {
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = TRUE;
-#line 18426 "Photo.c"
+#line 18441 "Photo.c"
 				{
 					PhotoRow* _tmp6_ = NULL;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp6_ = self->row;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18433 "Photo.c"
+#line 18448 "Photo.c"
 				}
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (new_comment);
-#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 18439 "Photo.c"
+#line 18454 "Photo.c"
 			}
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo_table_get_instance ();
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_;
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->photo_id;
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = new_comment;
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_set_comment (_tmp8_, &_tmp10_, _tmp11_);
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp12_;
-#line 2356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp8_);
-#line 2357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = committed;
-#line 2357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2359 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 18461 "Photo.c"
+#line 18476 "Photo.c"
 				PhotoRow* _tmp14_ = NULL;
 				const gchar* _tmp15_ = NULL;
 				gchar* _tmp16_ = NULL;
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = new_comment;
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = g_strdup (_tmp15_);
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp14_->comment);
-#line 2358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_->comment = _tmp16_;
-#line 18475 "Photo.c"
+#line 18490 "Photo.c"
 			}
 		}
-		__finally350:
+		__finally351:
 		{
 			PhotoRow* _tmp17_ = NULL;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = self->row;
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18485 "Photo.c"
+#line 18500 "Photo.c"
 		}
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (new_comment);
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/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 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2354 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 18497 "Photo.c"
+#line 18512 "Photo.c"
 		}
 	}
-#line 2361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = committed;
-#line 2361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2363 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp18_) {
-#line 18504 "Photo.c"
+#line 18519 "Photo.c"
 		Alteration* _tmp19_ = NULL;
 		Alteration* _tmp20_ = NULL;
-#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = alteration_new ("metadata", "comment");
-#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_;
-#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 2362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp20_);
-#line 18515 "Photo.c"
+#line 18530 "Photo.c"
 	}
-#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
-#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (new_comment);
-#line 2364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 18523 "Photo.c"
+#line 18538 "Photo.c"
 }
 
 
 static gpointer _g_error_copy0 (gpointer self) {
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? g_error_copy (self) : NULL;
-#line 18530 "Photo.c"
+#line 18545 "Photo.c"
 }
 
 
@@ -18536,20 +18551,20 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 	GError* dberr = NULL;
 	GError* _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (import_id != NULL);
-#line 2368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
 	dberr = NULL;
-#line 18544 "Photo.c"
+#line 18559 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 18551 "Photo.c"
+#line 18566 "Photo.c"
 		{
 			{
 				PhotoTable* _tmp1_ = NULL;
@@ -18559,158 +18574,158 @@ void photo_set_import_id (Photo* self, ImportID* import_id) {
 				ImportID _tmp5_ = {0};
 				PhotoRow* _tmp7_ = NULL;
 				ImportID _tmp8_ = {0};
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = photo_table_get_instance ();
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp2_ = _tmp1_;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->photo_id;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = *import_id;
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_set_import_id (_tmp2_, &_tmp4_, &_tmp5_, &_inner_error_);
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp2_);
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 18579 "Photo.c"
-						goto __catch352_database_error;
+#line 18594 "Photo.c"
+						goto __catch353_database_error;
 					}
 					{
 						PhotoRow* _tmp6_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp6_ = self->row;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18588 "Photo.c"
+#line 18603 "Photo.c"
 					}
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_error_free0 (dberr);
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/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 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2373 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 18598 "Photo.c"
+#line 18613 "Photo.c"
 				}
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = *import_id;
-#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_->import_id = _tmp8_;
-#line 18606 "Photo.c"
+#line 18621 "Photo.c"
 			}
-			goto __finally352;
-			__catch352_database_error:
+			goto __finally353;
+			__catch353_database_error:
 			{
 				GError* err = NULL;
 				GError* _tmp9_ = NULL;
 				GError* _tmp10_ = NULL;
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				err = _inner_error_;
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = err;
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _g_error_copy0 (_tmp9_);
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (dberr);
-#line 2374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2376 "/home/jens/Source/shotwell/src/Photo.vala"
 				dberr = _tmp10_;
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 18628 "Photo.c"
+#line 18643 "Photo.c"
 			}
-			__finally352:
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally353:
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18633 "Photo.c"
+#line 18648 "Photo.c"
 				{
 					PhotoRow* _tmp11_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18640 "Photo.c"
+#line 18655 "Photo.c"
 				}
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (dberr);
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/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 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2370 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2372 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 18650 "Photo.c"
+#line 18665 "Photo.c"
 			}
 		}
-		__finally351:
+		__finally352:
 		{
 			PhotoRow* _tmp12_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->row;
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 18660 "Photo.c"
+#line 18675 "Photo.c"
 		}
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (dberr);
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/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 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2371 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 18672 "Photo.c"
+#line 18687 "Photo.c"
 		}
 	}
-#line 2378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = dberr;
-#line 2378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == NULL) {
-#line 18679 "Photo.c"
+#line 18694 "Photo.c"
 		Alteration* _tmp14_ = NULL;
 		Alteration* _tmp15_ = NULL;
-#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = alteration_new ("metadata", "import-id");
-#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp14_;
-#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp15_);
-#line 2379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp15_);
-#line 18690 "Photo.c"
+#line 18705 "Photo.c"
 	} else {
 		gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 		GError* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_;
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = dberr;
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_->message;
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2381: Unable to write import ID for %s: %s", _tmp17_, _tmp19_);
-#line 2381 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_free0 (_tmp17_);
-#line 18708 "Photo.c"
+#line 18723 "Photo.c"
 	}
-#line 2367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2369 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_error_free0 (dberr);
-#line 18712 "Photo.c"
+#line 18727 "Photo.c"
 }
 
 
@@ -18733,155 +18748,155 @@ void photo_set_title_persistent (Photo* self, const gchar* title, GError** error
 	GFile* _tmp16_ = NULL;
 	const gchar* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 2385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2387 "/home/jens/Source/shotwell/src/Photo.vala"
 	source = _tmp0_;
-#line 2388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = source;
-#line 2388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/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 2388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2390 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 18749 "Photo.c"
+#line 18764 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 2389 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
-#line 2389 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/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 2389 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2389 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2389: No photo file writer available for %s", _tmp6_);
-#line 2389 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp6_);
 #line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp7_ = title;
+		g_warning ("Photo.vala:2391: No photo file writer available for %s", _tmp6_);
 #line 2391 "/home/jens/Source/shotwell/src/Photo.vala"
-		media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
+		_g_free0 (_tmp6_);
 #line 2393 "/home/jens/Source/shotwell/src/Photo.vala"
-		_photo_file_adapter_unref0 (source);
+		_tmp7_ = title;
 #line 2393 "/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"
+		_photo_file_adapter_unref0 (source);
+#line 2395 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18772 "Photo.c"
+#line 18787 "Photo.c"
 	}
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_);
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp9_;
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2396 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2398 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18788 "Photo.c"
+#line 18803 "Photo.c"
 	}
-#line 2397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
-#line 2397 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = title;
-#line 2397 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_metadata_set_title (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 2399 "/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"
 	_tmp12_ = source;
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_);
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp13_;
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18812 "Photo.c"
+#line 18827 "Photo.c"
 	}
-#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/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 2400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_;
-#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_title");
-#line 2400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp16_);
-#line 18824 "Photo.c"
+#line 18839 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = writer;
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = metadata;
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
-#line 2402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18836 "Photo.c"
-			goto __finally353;
+#line 18851 "Photo.c"
+			goto __finally354;
 		}
 	}
-	__finally353:
+	__finally354:
 	{
 		PhotoFileReader* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
 		GFile* _tmp21_ = NULL;
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = source;
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/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 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp21_);
-#line 2404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2406 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp21_);
-#line 18855 "Photo.c"
+#line 18870 "Photo.c"
 	}
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2403 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18869 "Photo.c"
+#line 18884 "Photo.c"
 	}
-#line 2407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2409 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = title;
-#line 2407 "/home/jens/Source/shotwell/src/Photo.vala"
-	media_source_set_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_);
 #line 2409 "/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"
 	photo_file_exif_updated (self);
-#line 2384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 2384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 18883 "Photo.c"
+#line 18898 "Photo.c"
 }
 
 
@@ -18904,155 +18919,155 @@ void photo_set_comment_persistent (Photo* self, const gchar* comment, GError** e
 	GFile* _tmp16_ = NULL;
 	const gchar* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2413 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 2413 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2415 "/home/jens/Source/shotwell/src/Photo.vala"
 	source = _tmp0_;
-#line 2416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = source;
-#line 2416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2418 "/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 2416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2418 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 18920 "Photo.c"
+#line 18935 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
-#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2419 "/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 2417 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2417: No photo file writer available for %s", _tmp6_);
-#line 2417 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp6_);
 #line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp7_ = comment;
+		g_warning ("Photo.vala:2419: No photo file writer available for %s", _tmp6_);
 #line 2419 "/home/jens/Source/shotwell/src/Photo.vala"
-		media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp7_);
+		_g_free0 (_tmp6_);
 #line 2421 "/home/jens/Source/shotwell/src/Photo.vala"
-		_photo_file_adapter_unref0 (source);
+		_tmp7_ = comment;
 #line 2421 "/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"
+		_photo_file_adapter_unref0 (source);
+#line 2423 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18943 "Photo.c"
+#line 18958 "Photo.c"
 	}
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_);
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp9_;
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2426 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18959 "Photo.c"
+#line 18974 "Photo.c"
 	}
-#line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
-#line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = comment;
-#line 2425 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_metadata_set_comment (_tmp10_, _tmp11_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
 #line 2427 "/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"
 	_tmp12_ = source;
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_file_reader_create_metadata_writer (_tmp12_, &_inner_error_);
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp13_;
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2427 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 18983 "Photo.c"
+#line 18998 "Photo.c"
 	}
-#line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2430 "/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 2428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_;
-#line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_monitor_blacklist_file (_tmp16_, "Photo.set_persistent_comment");
-#line 2428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp16_);
-#line 18995 "Photo.c"
+#line 19010 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp17_ = NULL;
 		PhotoMetadata* _tmp18_ = NULL;
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = writer;
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = metadata;
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_metadata_writer_write_metadata (_tmp17_, _tmp18_, &_inner_error_);
-#line 2430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19007 "Photo.c"
-			goto __finally354;
+#line 19022 "Photo.c"
+			goto __finally355;
 		}
 	}
-	__finally354:
+	__finally355:
 	{
 		PhotoFileReader* _tmp19_ = NULL;
 		GFile* _tmp20_ = NULL;
 		GFile* _tmp21_ = NULL;
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = source;
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/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 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp20_;
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp21_);
-#line 2432 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2434 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp21_);
-#line 19026 "Photo.c"
+#line 19041 "Photo.c"
 	}
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2431 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19040 "Photo.c"
+#line 19055 "Photo.c"
 	}
-#line 2435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2437 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = comment;
-#line 2435 "/home/jens/Source/shotwell/src/Photo.vala"
-	media_source_set_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp22_);
 #line 2437 "/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"
 	photo_file_exif_updated (self);
-#line 2412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 2412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2414 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 19054 "Photo.c"
+#line 19069 "Photo.c"
 }
 
 
@@ -19061,16 +19076,16 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 	gboolean committed = FALSE;
 	gboolean _tmp12_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 19065 "Photo.c"
+#line 19080 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19072 "Photo.c"
+#line 19087 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -19079,79 +19094,79 @@ static void photo_real_set_exposure_time (Dateable* base, time_t time) {
 			time_t _tmp5_ = 0;
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->photo_id;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = time;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = photo_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_);
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp6_;
-#line 2443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = committed;
-#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp7_) {
-#line 19101 "Photo.c"
+#line 19116 "Photo.c"
 				PhotoRow* _tmp8_ = NULL;
 				time_t _tmp9_ = 0;
 				time_t _tmp10_ = 0;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = time;
-#line 2445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2447 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_->exposure_time = _tmp9_;
-#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = time;
-#line 2446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2448 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->cached_exposure_time = _tmp10_;
-#line 19115 "Photo.c"
+#line 19130 "Photo.c"
 			}
 		}
-		__finally355:
+		__finally356:
 		{
 			PhotoRow* _tmp11_ = NULL;
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->row;
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19125 "Photo.c"
+#line 19140 "Photo.c"
 		}
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/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 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2444 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 19135 "Photo.c"
+#line 19150 "Photo.c"
 		}
 	}
-#line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = committed;
-#line 2450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2452 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 19142 "Photo.c"
+#line 19157 "Photo.c"
 		Alteration* _tmp13_ = NULL;
 		Alteration* _tmp14_ = NULL;
-#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = alteration_new ("metadata", "exposure-time");
-#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp13_;
-#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp14_);
-#line 2451 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2453 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp14_);
-#line 19153 "Photo.c"
+#line 19168 "Photo.c"
 	}
 }
 
@@ -19177,161 +19192,161 @@ void photo_set_exposure_time_persistent (Photo* self, time_t time, GError** erro
 	GFile* _tmp18_ = NULL;
 	time_t _tmp24_ = 0;
 	GError * _inner_error_ = NULL;
-#line 2454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_source_reader (self);
-#line 2455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2457 "/home/jens/Source/shotwell/src/Photo.vala"
 	source = _tmp0_;
-#line 2458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = source;
-#line 2458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2460 "/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 2458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2460 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 19193 "Photo.c"
+#line 19208 "Photo.c"
 		PhotoFileReader* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		time_t _tmp7_ = 0;
-#line 2459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = source;
-#line 2459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2461 "/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 2459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2459 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2459: No photo file writer available for %s", _tmp6_);
-#line 2459 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp6_);
 #line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
-		_tmp7_ = time;
+		g_warning ("Photo.vala:2461: No photo file writer available for %s", _tmp6_);
 #line 2461 "/home/jens/Source/shotwell/src/Photo.vala"
-		dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp7_);
+		_g_free0 (_tmp6_);
 #line 2463 "/home/jens/Source/shotwell/src/Photo.vala"
-		_photo_file_adapter_unref0 (source);
+		_tmp7_ = time;
 #line 2463 "/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"
+		_photo_file_adapter_unref0 (source);
+#line 2465 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19216 "Photo.c"
+#line 19231 "Photo.c"
 	}
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = source;
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_file_reader_read_metadata (_tmp8_, &_inner_error_);
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp9_;
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2468 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19232 "Photo.c"
+#line 19247 "Photo.c"
 	}
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = time;
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = metadata_date_time_new (_tmp11_);
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_;
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_metadata_set_exposure_date_time (_tmp10_, _tmp13_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 2467 "/home/jens/Source/shotwell/src/Photo.vala"
-	_metadata_date_time_unref0 (_tmp13_);
 #line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+	_metadata_date_time_unref0 (_tmp13_);
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = source;
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_file_reader_create_metadata_writer (_tmp14_, &_inner_error_);
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp15_;
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19262 "Photo.c"
+#line 19277 "Photo.c"
 	}
-#line 2470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = source;
-#line 2470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/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 2470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = _tmp17_;
-#line 2470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_monitor_blacklist_file (_tmp18_, "Photo.set_exposure_time_persistent");
-#line 2470 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp18_);
-#line 19274 "Photo.c"
+#line 19289 "Photo.c"
 	{
 		PhotoFileMetadataWriter* _tmp19_ = NULL;
 		PhotoMetadata* _tmp20_ = NULL;
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = writer;
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = metadata;
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_file_metadata_writer_write_metadata (_tmp19_, _tmp20_, &_inner_error_);
-#line 2472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 19286 "Photo.c"
-			goto __finally356;
+#line 19301 "Photo.c"
+			goto __finally357;
 		}
 	}
-	__finally356:
+	__finally357:
 	{
 		PhotoFileReader* _tmp21_ = NULL;
 		GFile* _tmp22_ = NULL;
 		GFile* _tmp23_ = NULL;
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = source;
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/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 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp22_;
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp23_);
-#line 2474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2476 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp23_);
-#line 19305 "Photo.c"
+#line 19320 "Photo.c"
 	}
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (source);
-#line 2471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2473 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19319 "Photo.c"
+#line 19334 "Photo.c"
 	}
-#line 2477 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2479 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = time;
-#line 2477 "/home/jens/Source/shotwell/src/Photo.vala"
-	dateable_set_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATEABLE, Dateable), _tmp24_);
 #line 2479 "/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"
 	photo_file_exif_updated (self);
-#line 2454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 2454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (source);
-#line 19333 "Photo.c"
+#line 19348 "Photo.c"
 }
 
 
@@ -19358,39 +19373,39 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 	gboolean _tmp11_ = FALSE;
 	PhotoException _tmp22_ = 0;
 	gboolean _tmp23_ = FALSE;
-#line 2495 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
 #line 2497 "/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"
 	photo_get_raw_dimensions (self, &_tmp0_);
-#line 2497 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2499 "/home/jens/Source/shotwell/src/Photo.vala"
 	returned_dims = _tmp0_;
-#line 2500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = disallowed_steps;
-#line 2500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_exception_allows (_tmp1_, PHOTO_EXCEPTION_ORIENTATION);
-#line 2500 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2502 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 19372 "Photo.c"
+#line 19387 "Photo.c"
 		Orientation ori_tmp = 0;
 		Orientation _tmp3_ = 0;
 		Orientation _tmp4_ = 0;
-#line 2501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2503 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_get_orientation (self);
-#line 2501 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2503 "/home/jens/Source/shotwell/src/Photo.vala"
 		ori_tmp = _tmp3_;
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = ori_tmp;
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 		switch (_tmp4_) {
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_LEFT_TOP:
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_RIGHT_TOP:
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_LEFT_BOTTOM:
-#line 2504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2506 "/home/jens/Source/shotwell/src/Photo.vala"
 			case ORIENTATION_RIGHT_BOTTOM:
-#line 19392 "Photo.c"
+#line 19407 "Photo.c"
 			{
 				gint width_tmp = 0;
 				Dimensions _tmp5_ = {0};
@@ -19398,41 +19413,41 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 				Dimensions _tmp7_ = {0};
 				gint _tmp8_ = 0;
 				gint _tmp9_ = 0;
-#line 2510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = returned_dims;
-#line 2510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = _tmp5_.width;
-#line 2510 "/home/jens/Source/shotwell/src/Photo.vala"
-				width_tmp = _tmp6_;
 #line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
+				width_tmp = _tmp6_;
+#line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = returned_dims;
-#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_.height;
-#line 2512 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
 				returned_dims.width = _tmp8_;
-#line 2513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = width_tmp;
-#line 2513 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2515 "/home/jens/Source/shotwell/src/Photo.vala"
 				returned_dims.height = _tmp9_;
-#line 2514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2516 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 19418 "Photo.c"
+#line 19433 "Photo.c"
 			}
 			default:
 			{
-#line 2518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2520 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 19424 "Photo.c"
+#line 19439 "Photo.c"
 			}
 		}
 	}
-#line 2523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = disallowed_steps;
-#line 2523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_STRAIGHTEN);
-#line 2523 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 19434 "Photo.c"
+#line 19449 "Photo.c"
 		gdouble x_size = 0.0;
 		gdouble y_size = 0.0;
 		gdouble angle = 0.0;
@@ -19446,71 +19461,71 @@ static void photo_real_get_dimensions (MediaSource* base, PhotoException disallo
 		gdouble _tmp19_ = 0.0;
 		gdouble _tmp20_ = 0.0;
 		gdouble _tmp21_ = 0.0;
-#line 2525 "/home/jens/Source/shotwell/src/Photo.vala"
-		angle = 0.0;
 #line 2527 "/home/jens/Source/shotwell/src/Photo.vala"
+		angle = 0.0;
+#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_straighten (self, &_tmp12_);
-#line 2527 "/home/jens/Source/shotwell/src/Photo.vala"
-		angle = _tmp12_;
 #line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+		angle = _tmp12_;
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = returned_dims;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp13_.width;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = returned_dims;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_.height;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = angle;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		compute_arb_rotated_size ((gdouble) _tmp14_, (gdouble) _tmp16_, _tmp17_, &_tmp18_, &_tmp19_);
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
 		x_size = _tmp18_;
-#line 2529 "/home/jens/Source/shotwell/src/Photo.vala"
-		y_size = _tmp19_;
 #line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+		y_size = _tmp19_;
+#line 2533 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = x_size;
-#line 2531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2533 "/home/jens/Source/shotwell/src/Photo.vala"
 		returned_dims.width = (gint) _tmp20_;
-#line 2532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = y_size;
-#line 2532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2534 "/home/jens/Source/shotwell/src/Photo.vala"
 		returned_dims.height = (gint) _tmp21_;
-#line 19478 "Photo.c"
+#line 19493 "Photo.c"
 	}
-#line 2536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = disallowed_steps;
-#line 2536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo_exception_allows (_tmp22_, PHOTO_EXCEPTION_CROP);
-#line 2536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 19486 "Photo.c"
+#line 19501 "Photo.c"
 		Box crop = {0};
 		PhotoException _tmp24_ = 0;
 		Box _tmp25_ = {0};
 		gboolean _tmp26_ = FALSE;
-#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = disallowed_steps;
-#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = photo_get_crop (self, &_tmp25_, _tmp24_);
-#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
 		crop = _tmp25_;
-#line 2538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2540 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp26_) {
-#line 19499 "Photo.c"
+#line 19514 "Photo.c"
 			Dimensions _tmp27_ = {0};
-#line 2539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp27_);
-#line 2539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2541 "/home/jens/Source/shotwell/src/Photo.vala"
 			returned_dims = _tmp27_;
-#line 19505 "Photo.c"
+#line 19520 "Photo.c"
 		}
 	}
-#line 2542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = returned_dims;
-#line 2542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2544 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 19512 "Photo.c"
+#line 19527 "Photo.c"
 }
 
 
@@ -19521,114 +19536,114 @@ static void photo_locked_create_adjustments_from_data (Photo* self) {
 	KeyValueMap* _tmp2_ = NULL;
 	PixelTransformationBundle* _tmp6_ = NULL;
 	PixelTransformer* _tmp7_ = NULL;
-#line 2546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = pixel_transformation_bundle_new ();
-#line 2547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2547 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->adjustments = _tmp0_;
 #line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->adjustments = _tmp0_;
+#line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_transformation (self, "adjustments");
-#line 2549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp1_;
-#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
-#line 2550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2552 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ == NULL) {
-#line 19539 "Photo.c"
+#line 19554 "Photo.c"
 		PixelTransformationBundle* _tmp3_ = NULL;
-#line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = self->priv->adjustments;
-#line 2551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_transformation_bundle_set_to_identity (_tmp3_);
-#line 19545 "Photo.c"
+#line 19560 "Photo.c"
 	} else {
 		PixelTransformationBundle* _tmp4_ = NULL;
 		KeyValueMap* _tmp5_ = NULL;
-#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->adjustments;
-#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = map;
-#line 2553 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_transformation_bundle_load (_tmp4_, _tmp5_);
-#line 19555 "Photo.c"
+#line 19570 "Photo.c"
 	}
-#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = self->priv->adjustments;
-#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = pixel_transformation_bundle_generate_transformer (_tmp6_);
-#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
-#line 2555 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2557 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->transformer = _tmp7_;
-#line 2546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2548 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 19567 "Photo.c"
+#line 19582 "Photo.c"
 }
 
 
 PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 	PixelTransformationBundle* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2561 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19576 "Photo.c"
+#line 19591 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19583 "Photo.c"
+#line 19598 "Photo.c"
 		{
 			PixelTransformationBundle* _tmp1_ = NULL;
 			PixelTransformationBundle* _tmp2_ = NULL;
 			PixelTransformationBundle* _tmp3_ = NULL;
-#line 2561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->adjustments;
-#line 2561 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2563 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_ == NULL) {
-#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19594 "Photo.c"
+#line 19609 "Photo.c"
 			}
-#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->adjustments;
-#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = pixel_transformation_bundle_copy (_tmp2_);
-#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 19602 "Photo.c"
+#line 19617 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19609 "Photo.c"
+#line 19624 "Photo.c"
 			}
-#line 2564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2566 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19613 "Photo.c"
+#line 19628 "Photo.c"
 		}
-		__finally357:
+		__finally358:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19622 "Photo.c"
+#line 19637 "Photo.c"
 		}
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/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 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2562 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 19630 "Photo.c"
+#line 19645 "Photo.c"
 	}
 }
 
@@ -19636,63 +19651,63 @@ PixelTransformationBundle* photo_get_color_adjustments (Photo* self) {
 PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 	PixelTransformer* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2570 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 19640 "Photo.c"
+#line 19655 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19647 "Photo.c"
+#line 19662 "Photo.c"
 		{
 			PixelTransformer* _tmp1_ = NULL;
 			PixelTransformer* _tmp2_ = NULL;
 			PixelTransformer* _tmp3_ = NULL;
-#line 2570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->transformer;
-#line 2570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2572 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_ == NULL) {
-#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_locked_create_adjustments_from_data (self);
-#line 19658 "Photo.c"
+#line 19673 "Photo.c"
 			}
-#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->transformer;
-#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = pixel_transformer_copy (_tmp2_);
-#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp3_;
-#line 19666 "Photo.c"
+#line 19681 "Photo.c"
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19673 "Photo.c"
+#line 19688 "Photo.c"
 			}
-#line 2573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2575 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 19677 "Photo.c"
+#line 19692 "Photo.c"
 		}
-		__finally358:
+		__finally359:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19686 "Photo.c"
+#line 19701 "Photo.c"
 		}
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/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 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2571 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 19694 "Photo.c"
+#line 19709 "Photo.c"
 	}
 }
 
@@ -19700,15 +19715,15 @@ PixelTransformer* photo_get_pixel_transformer (Photo* self) {
 gboolean photo_has_color_adjustments (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2579 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_transformation (self, "adjustments");
-#line 2578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2580 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19710 "Photo.c"
+#line 19725 "Photo.c"
 }
 
 
@@ -19719,25 +19734,25 @@ PixelTransformation* photo_get_color_adjustment (Photo* self, PixelTransformatio
 	PixelTransformationType _tmp2_ = 0;
 	PixelTransformation* _tmp3_ = NULL;
 	PixelTransformation* _tmp4_ = NULL;
-#line 2581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2583 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_color_adjustments (self);
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = type;
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp1_, _tmp2_);
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (_tmp1_);
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 2582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2584 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 19739 "Photo.c"
+#line 19754 "Photo.c"
 }
 
 
@@ -19750,141 +19765,141 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 	gboolean committed = FALSE;
 	gboolean _tmp39_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_adjustments));
-#line 2588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = new_adjustments;
-#line 2588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = pixel_transformation_bundle_is_identity (_tmp0_);
-#line 2588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 19762 "Photo.c"
+#line 19777 "Photo.c"
 		gboolean _result_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 		{
 			PhotoRow* _tmp2_ = NULL;
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19771 "Photo.c"
+#line 19786 "Photo.c"
 			{
 				gboolean _tmp3_ = FALSE;
-#line 2591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = photo_remove_transformation (self, "adjustments");
-#line 2591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
 				_result_ = _tmp3_;
-#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2594 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = NULL;
-#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2595 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (self->priv->transformer);
-#line 2593 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2595 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = NULL;
-#line 19786 "Photo.c"
+#line 19801 "Photo.c"
 			}
-			__finally359:
+			__finally360:
 			{
 				PhotoRow* _tmp4_ = NULL;
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19795 "Photo.c"
+#line 19810 "Photo.c"
 			}
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/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 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2592 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 19805 "Photo.c"
+#line 19820 "Photo.c"
 			}
 		}
-#line 2596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _result_;
-#line 2596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2598 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp5_) {
-#line 19812 "Photo.c"
+#line 19827 "Photo.c"
 			Alteration* _tmp6_ = NULL;
 			Alteration* _tmp7_ = NULL;
-#line 2597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = alteration_new ("image", "color-adjustments");
-#line 2597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_;
-#line 2597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 			data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp7_);
-#line 2597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
 			_alteration_unref0 (_tmp7_);
-#line 19823 "Photo.c"
+#line 19838 "Photo.c"
 		}
-#line 2599 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2601 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 19827 "Photo.c"
+#line 19842 "Photo.c"
 	}
-#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = new_adjustments;
-#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = pixel_transformation_bundle_save (_tmp8_, "adjustments");
-#line 2603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2605 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp9_;
-#line 19835 "Photo.c"
+#line 19850 "Photo.c"
 	{
 		PhotoRow* _tmp10_ = NULL;
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = self->row;
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 19842 "Photo.c"
+#line 19857 "Photo.c"
 		{
 			gboolean _tmp11_ = FALSE;
 			PixelTransformer* _tmp12_ = NULL;
 			KeyValueMap* _tmp36_ = NULL;
 			gboolean _tmp37_ = FALSE;
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = self->priv->transformer;
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp12_ == NULL) {
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = TRUE;
-#line 19854 "Photo.c"
+#line 19869 "Photo.c"
 			} else {
 				PixelTransformationBundle* _tmp13_ = NULL;
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = self->priv->adjustments;
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp13_ == NULL;
-#line 19861 "Photo.c"
+#line 19876 "Photo.c"
 			}
-#line 2607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp11_) {
-#line 19865 "Photo.c"
+#line 19880 "Photo.c"
 				PixelTransformationBundle* _tmp14_ = NULL;
 				PixelTransformationBundle* _tmp15_ = NULL;
 				PixelTransformationBundle* _tmp16_ = NULL;
 				PixelTransformer* _tmp17_ = NULL;
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = new_adjustments;
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = pixel_transformation_bundle_copy (_tmp14_);
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2609 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2611 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp15_;
-#line 2610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = new_adjustments;
-#line 2610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = pixel_transformation_bundle_generate_transformer (_tmp16_);
-#line 2610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (self->priv->transformer);
-#line 2610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2612 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = _tmp17_;
-#line 19886 "Photo.c"
+#line 19901 "Photo.c"
 			} else {
 				PixelTransformationBundle* _tmp34_ = NULL;
 				PixelTransformationBundle* _tmp35_ = NULL;
@@ -19895,23 +19910,23 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 					GeeIterable* _tmp20_ = NULL;
 					GeeIterator* _tmp21_ = NULL;
 					GeeIterator* _tmp22_ = NULL;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = new_adjustments;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = pixel_transformation_bundle_get_transformations (_tmp18_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = _tmp19_;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = gee_iterable_iterator (_tmp20_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp20_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_transformation_it = _tmp22_;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 19913 "Photo.c"
+#line 19928 "Photo.c"
 						GeeIterator* _tmp23_ = NULL;
 						gboolean _tmp24_ = FALSE;
 						PixelTransformation* transformation = NULL;
@@ -19924,108 +19939,108 @@ void photo_set_color_adjustments (Photo* self, PixelTransformationBundle* new_ad
 						PixelTransformation* _tmp31_ = NULL;
 						PixelTransformation* _tmp32_ = NULL;
 						PixelTransformation* _tmp33_ = NULL;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp23_ = _transformation_it;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp24_ = gee_iterator_next (_tmp23_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp24_) {
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 19934 "Photo.c"
+#line 19949 "Photo.c"
 						}
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = _transformation_it;
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = gee_iterator_get (_tmp25_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						transformation = (PixelTransformation*) _tmp26_;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = self->priv->transformer;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp28_ = self->priv->adjustments;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = transformation;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp30_ = pixel_transformation_get_transformation_type (_tmp29_);
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp31_ = pixel_transformation_bundle_get_transformation (_tmp28_, _tmp30_);
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp32_ = _tmp31_;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp33_ = transformation;
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						pixel_transformer_replace_transformation (_tmp27_, _tmp32_, _tmp33_);
-#line 2614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2616 "/home/jens/Source/shotwell/src/Photo.vala"
 						_pixel_transformation_unref0 (_tmp32_);
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 						_pixel_transformation_unref0 (transformation);
-#line 19962 "Photo.c"
+#line 19977 "Photo.c"
 					}
-#line 2613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2615 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_transformation_it);
-#line 19966 "Photo.c"
+#line 19981 "Photo.c"
 				}
-#line 2619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = new_adjustments;
-#line 2619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = pixel_transformation_bundle_copy (_tmp34_);
-#line 2619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2621 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp35_;
-#line 19976 "Photo.c"
+#line 19991 "Photo.c"
 			}
-#line 2622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = map;
-#line 2622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = photo_set_transformation (self, _tmp36_);
-#line 2622 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2624 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp37_;
-#line 19984 "Photo.c"
+#line 19999 "Photo.c"
 		}
-		__finally360:
+		__finally361:
 		{
 			PhotoRow* _tmp38_ = NULL;
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = self->row;
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 19993 "Photo.c"
+#line 20008 "Photo.c"
 		}
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			_key_value_map_unref0 (map);
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/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 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2606 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2608 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20005 "Photo.c"
+#line 20020 "Photo.c"
 		}
 	}
-#line 2625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = committed;
-#line 2625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2627 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_) {
-#line 20012 "Photo.c"
+#line 20027 "Photo.c"
 		Alteration* _tmp40_ = NULL;
 		Alteration* _tmp41_ = NULL;
-#line 2626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = alteration_new ("image", "color-adjustments");
-#line 2626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = _tmp40_;
-#line 2626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp41_);
-#line 2626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2628 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp41_);
-#line 20023 "Photo.c"
+#line 20038 "Photo.c"
 	}
-#line 2585 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2587 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 20027 "Photo.c"
+#line 20042 "Photo.c"
 }
 
 
@@ -20033,9 +20048,9 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 	Photo * self;
 	PhotoMetadata* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 20037 "Photo.c"
+#line 20052 "Photo.c"
 	{
 		PhotoMetadata* _tmp0_ = NULL;
 		PhotoFileReader* _tmp1_ = NULL;
@@ -20043,67 +20058,67 @@ static PhotoMetadata* photo_real_get_metadata (PhotoSource* base) {
 		PhotoMetadata* _tmp3_ = NULL;
 		PhotoMetadata* _tmp4_ = NULL;
 		PhotoMetadata* _tmp5_ = NULL;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_get_source_reader (self);
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_file_reader_read_metadata (_tmp2_, &_inner_error_);
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp2_);
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp4_;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 20059 "Photo.c"
-			goto __catch361_g_error;
+#line 20074 "Photo.c"
+			goto __catch362_g_error;
 		}
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp0_;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp5_;
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (_tmp0_);
-#line 2632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20072 "Photo.c"
+#line 20087 "Photo.c"
 	}
-	goto __finally361;
-	__catch361_g_error:
+	goto __finally362;
+	__catch362_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		const gchar* _tmp7_ = NULL;
-#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = err;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_->message;
-#line 2634 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:2634: Unable to load metadata: %s", _tmp7_);
 #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"
 		result = NULL;
-#line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 2636 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2638 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20096 "Photo.c"
+#line 20111 "Photo.c"
 	}
-	__finally361:
-#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally362:
+#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_clear_error (&_inner_error_);
-#line 2631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2633 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 20105 "Photo.c"
+#line 20120 "Photo.c"
 }
 
 
@@ -20116,39 +20131,39 @@ PhotoMetadata* photo_get_master_metadata (Photo* self, GError** error) {
 	PhotoMetadata* _tmp4_ = NULL;
 	PhotoMetadata* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2642 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_master_reader (self);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_reader_read_metadata (_tmp2_, &_inner_error_);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp2_);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp4_;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 20138 "Photo.c"
+#line 20153 "Photo.c"
 	}
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp0_;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp5_;
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (_tmp0_);
-#line 2641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2643 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20150 "Photo.c"
+#line 20165 "Photo.c"
 }
 
 
@@ -20159,53 +20174,53 @@ PhotoMetadata* photo_get_editable_metadata (Photo* self, GError** error) {
 	PhotoMetadata* _tmp1_ = NULL;
 	PhotoFileReader* _tmp2_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2646 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 2645 "/home/jens/Source/shotwell/src/Photo.vala"
-	reader = _tmp0_;
 #line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+	reader = _tmp0_;
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 20171 "Photo.c"
+#line 20186 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
 		PhotoMetadata* _tmp4_ = NULL;
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = reader;
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_file_reader_read_metadata (_tmp3_, &_inner_error_);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (_tmp1_);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp4_;
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (_tmp1_);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 20192 "Photo.c"
+#line 20207 "Photo.c"
 		}
 	} else {
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (_tmp1_);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = NULL;
-#line 20199 "Photo.c"
+#line 20214 "Photo.c"
 	}
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 2647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2649 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20207 "Photo.c"
+#line 20222 "Photo.c"
 }
 
 
@@ -20228,180 +20243,180 @@ gboolean photo_persist_master_metadata (Photo* self, PhotoMetadata* metadata, Ph
 	gboolean _tmp12_ = FALSE;
 	PhotoReimportMasterState* _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2653 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE);
 #line 2655 "/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"
 	_photo_reimport_master_state_unref0 (_vala_state);
-#line 2655 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = NULL;
 #line 2657 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = NULL;
+#line 2659 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_master_reader (self);
-#line 2657 "/home/jens/Source/shotwell/src/Photo.vala"
-	master_reader = _tmp0_;
 #line 2659 "/home/jens/Source/shotwell/src/Photo.vala"
+	master_reader = _tmp0_;
+#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = master_reader;
-#line 2659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2661 "/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 2659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_file_format_can_write_metadata (_tmp2_);
-#line 2659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2661 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20258 "Photo.c"
+#line 20273 "Photo.c"
 		} else {
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20262 "Photo.c"
+#line 20277 "Photo.c"
 		}
-#line 2660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20266 "Photo.c"
+#line 20281 "Photo.c"
 	}
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = master_reader;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_file_reader_create_metadata_writer (_tmp5_, &_inner_error_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp6_;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20282 "Photo.c"
+#line 20297 "Photo.c"
 	}
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp4_;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = NULL;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = metadata;
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp8_, _tmp9_, &_inner_error_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp8_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp4_);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20306 "Photo.c"
+#line 20321 "Photo.c"
 	}
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo_prepare_for_reimport_master (self, &_tmp11_, &_inner_error_);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_master_state_unref0 (_vala_state);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = _tmp11_;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp12_;
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp4_);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20326 "Photo.c"
+#line 20341 "Photo.c"
 	}
-#line 2664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2666 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp10_) {
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp4_);
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (master_reader);
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20340 "Photo.c"
+#line 20355 "Photo.c"
 		} else {
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_master_state_unref0 (_vala_state);
-#line 20344 "Photo.c"
+#line 20359 "Photo.c"
 		}
-#line 2665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20348 "Photo.c"
+#line 20363 "Photo.c"
 	}
-#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _vala_state;
-#line 2667 "/home/jens/Source/shotwell/src/Photo.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE;
 #line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+	G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl)->metadata_only = TRUE;
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp4_);
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (master_reader);
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 20364 "Photo.c"
+#line 20379 "Photo.c"
 	} else {
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_master_state_unref0 (_vala_state);
-#line 20368 "Photo.c"
+#line 20383 "Photo.c"
 	}
-#line 2669 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2671 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20372 "Photo.c"
+#line 20387 "Photo.c"
 }
 
 
 void photo_finish_update_master_metadata (Photo* self, PhotoReimportMasterState* state, GError** error) {
 	PhotoReimportMasterState* _tmp0_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2672 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2672 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2674 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_MASTER_STATE (state));
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_finish_reimport_master (self, _tmp0_, &_inner_error_);
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20395 "Photo.c"
+#line 20410 "Photo.c"
 		} else {
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/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 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2675 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20403 "Photo.c"
+#line 20418 "Photo.c"
 		}
 	}
 }
@@ -20427,202 +20442,202 @@ gboolean photo_persist_editable_metadata (Photo* self, PhotoMetadata* metadata,
 	gboolean _tmp13_ = FALSE;
 	PhotoReimportEditableState* _tmp14_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2676 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO_METADATA (metadata), FALSE);
 #line 2678 "/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"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 2678 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = NULL;
 #line 2680 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = NULL;
+#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 2680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_reader = _tmp0_;
-#line 2681 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = editable_reader;
-#line 2681 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2683 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20453 "Photo.c"
+#line 20468 "Photo.c"
 		} else {
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20457 "Photo.c"
+#line 20472 "Photo.c"
 		}
-#line 2682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20461 "Photo.c"
+#line 20476 "Photo.c"
 	}
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = editable_reader;
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/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 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_file_format_can_write_metadata (_tmp3_);
-#line 2684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2686 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp4_) {
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20479 "Photo.c"
+#line 20494 "Photo.c"
 		} else {
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20483 "Photo.c"
+#line 20498 "Photo.c"
 		}
-#line 2685 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20487 "Photo.c"
+#line 20502 "Photo.c"
 	}
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = editable_reader;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = photo_file_reader_create_metadata_writer (_tmp6_, &_inner_error_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp7_;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20503 "Photo.c"
+#line 20518 "Photo.c"
 	}
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp5_;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = NULL;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = metadata;
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp9_, _tmp10_, &_inner_error_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp9_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp5_);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2687 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20527 "Photo.c"
+#line 20542 "Photo.c"
 	}
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_prepare_for_reimport_editable (self, &_tmp12_, &_inner_error_);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_editable_state_unref0 (_vala_state);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_state = _tmp12_;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp13_;
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp5_);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20547 "Photo.c"
+#line 20562 "Photo.c"
 	}
-#line 2689 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2691 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp11_) {
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp5_);
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (editable_reader);
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 20561 "Photo.c"
+#line 20576 "Photo.c"
 		} else {
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20565 "Photo.c"
+#line 20580 "Photo.c"
 		}
-#line 2690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 20569 "Photo.c"
+#line 20584 "Photo.c"
 	}
-#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _vala_state;
-#line 2692 "/home/jens/Source/shotwell/src/Photo.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE;
 #line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+	G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl)->metadata_only = TRUE;
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp5_);
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (editable_reader);
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 20585 "Photo.c"
+#line 20600 "Photo.c"
 	} else {
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_reimport_editable_state_unref0 (_vala_state);
-#line 20589 "Photo.c"
+#line 20604 "Photo.c"
 	}
-#line 2694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2696 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 20593 "Photo.c"
+#line 20608 "Photo.c"
 }
 
 
 void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableState* state, GError** error) {
 	PhotoReimportEditableState* _tmp0_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2699 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2699 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_EDITABLE_STATE (state));
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_finish_reimport_editable (self, _tmp0_, &_inner_error_);
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_inner_error_->domain == DATABASE_ERROR) {
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20616 "Photo.c"
+#line 20631 "Photo.c"
 		} else {
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/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 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2700 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20624 "Photo.c"
+#line 20639 "Photo.c"
 		}
 	}
 }
@@ -20630,54 +20645,54 @@ void photo_finish_update_editable_metadata (Photo* self, PhotoReimportEditableSt
 
 void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
-#line 2703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 20634 "Photo.c"
+#line 20649 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20641 "Photo.c"
+#line 20656 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			Dimensions _tmp2_ = {0};
-#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->dim;
-#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result = _tmp2_;
-#line 20651 "Photo.c"
+#line 20666 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20658 "Photo.c"
+#line 20673 "Photo.c"
 			}
-#line 2705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2707 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 20662 "Photo.c"
+#line 20677 "Photo.c"
 		}
-		__finally362:
+		__finally363:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20671 "Photo.c"
+#line 20686 "Photo.c"
 		}
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/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 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2706 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 20679 "Photo.c"
+#line 20694 "Photo.c"
 	}
 }
 
@@ -20685,77 +20700,77 @@ void photo_get_raw_dimensions (Photo* self, Dimensions* result) {
 gboolean photo_has_transformations (Photo* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 20689 "Photo.c"
+#line 20704 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20696 "Photo.c"
+#line 20711 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoRow* _tmp2_ = NULL;
 			Orientation _tmp3_ = 0;
 			BackingPhotoRow* _tmp4_ = NULL;
 			Orientation _tmp5_ = 0;
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->orientation;
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->backing_photo_row;
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->original_orientation;
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != _tmp5_) {
-#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2714 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = TRUE;
-#line 20715 "Photo.c"
+#line 20730 "Photo.c"
 			} else {
 				PhotoRow* _tmp6_ = NULL;
 				GeeHashMap* _tmp7_ = NULL;
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_->transformations;
-#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2715 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_ != NULL;
-#line 20725 "Photo.c"
+#line 20740 "Photo.c"
 			}
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 20729 "Photo.c"
+#line 20744 "Photo.c"
 			{
 				PhotoRow* _tmp8_ = NULL;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20736 "Photo.c"
+#line 20751 "Photo.c"
 			}
-#line 2711 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2713 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 20740 "Photo.c"
+#line 20755 "Photo.c"
 		}
-		__finally363:
+		__finally364:
 		{
 			PhotoRow* _tmp9_ = NULL;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20749 "Photo.c"
+#line 20764 "Photo.c"
 		}
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/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 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2712 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20757 "Photo.c"
+#line 20772 "Photo.c"
 	}
 }
 
@@ -20767,152 +20782,152 @@ gboolean photo_only_metadata_changed (Photo* self) {
 	PhotoMetadata* _tmp0_ = NULL;
 	PhotoMetadata* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2718 "/home/jens/Source/shotwell/src/Photo.vala"
-	date_time = NULL;
 #line 2720 "/home/jens/Source/shotwell/src/Photo.vala"
+	date_time = NULL;
+#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 2720 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp0_;
-#line 2721 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 2721 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2723 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 20781 "Photo.c"
+#line 20796 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		MetadataDateTime* _tmp3_ = NULL;
-#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
-#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_);
-#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2722 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp3_;
-#line 20792 "Photo.c"
+#line 20807 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp4_ = NULL;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->row;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20800 "Photo.c"
+#line 20815 "Photo.c"
 		{
 			gboolean _tmp5_ = FALSE;
 			PhotoRow* _tmp6_ = NULL;
 			GeeHashMap* _tmp7_ = NULL;
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_->transformations;
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp7_ == NULL) {
-#line 20811 "Photo.c"
+#line 20826 "Photo.c"
 				gboolean _tmp8_ = FALSE;
 				PhotoRow* _tmp9_ = NULL;
 				Orientation _tmp10_ = 0;
 				BackingPhotoRow* _tmp11_ = NULL;
 				Orientation _tmp12_ = 0;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_->orientation;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->backing_photo_row;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->original_orientation;
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_ != _tmp12_) {
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = TRUE;
-#line 20829 "Photo.c"
+#line 20844 "Photo.c"
 				} else {
 					gboolean _tmp13_ = FALSE;
 					MetadataDateTime* _tmp14_ = NULL;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = date_time;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp14_ != NULL) {
-#line 20837 "Photo.c"
+#line 20852 "Photo.c"
 						PhotoRow* _tmp15_ = NULL;
 						time_t _tmp16_ = 0;
 						MetadataDateTime* _tmp17_ = NULL;
 						time_t _tmp18_ = 0;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = self->row;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp16_ = _tmp15_->exposure_time;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp17_ = date_time;
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp18_ = metadata_date_time_get_timestamp (_tmp17_);
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = _tmp16_ != _tmp18_;
-#line 20852 "Photo.c"
+#line 20867 "Photo.c"
 					} else {
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = FALSE;
-#line 20856 "Photo.c"
+#line 20871 "Photo.c"
 					}
-#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2729 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = _tmp13_;
-#line 20860 "Photo.c"
+#line 20875 "Photo.c"
 				}
-#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2728 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp8_;
-#line 20864 "Photo.c"
+#line 20879 "Photo.c"
 			} else {
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = FALSE;
-#line 20868 "Photo.c"
+#line 20883 "Photo.c"
 			}
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp5_;
-#line 20872 "Photo.c"
+#line 20887 "Photo.c"
 			{
 				PhotoRow* _tmp19_ = NULL;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = self->row;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20879 "Photo.c"
+#line 20894 "Photo.c"
 			}
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_metadata_date_time_unref0 (date_time);
-#line 2725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2727 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 20887 "Photo.c"
+#line 20902 "Photo.c"
 		}
-		__finally364:
+		__finally365:
 		{
 			PhotoRow* _tmp20_ = NULL;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->row;
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 20896 "Photo.c"
+#line 20911 "Photo.c"
 		}
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/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 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2726 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 20908 "Photo.c"
+#line 20923 "Photo.c"
 	}
-#line 2717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2719 "/home/jens/Source/shotwell/src/Photo.vala"
 	_metadata_date_time_unref0 (date_time);
-#line 20914 "Photo.c"
+#line 20929 "Photo.c"
 }
 
 
@@ -20926,142 +20941,142 @@ gboolean photo_has_alterations (Photo* self) {
 	PhotoMetadata* _tmp1_ = NULL;
 	MetadataDateTime* _tmp8_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2732 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2734 "/home/jens/Source/shotwell/src/Photo.vala"
 	date_time = NULL;
-#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2735 "/home/jens/Source/shotwell/src/Photo.vala"
 	title = NULL;
-#line 2734 "/home/jens/Source/shotwell/src/Photo.vala"
-	comment = NULL;
 #line 2736 "/home/jens/Source/shotwell/src/Photo.vala"
+	comment = NULL;
+#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 2736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp0_;
-#line 2737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 2737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ != NULL) {
-#line 20944 "Photo.c"
+#line 20959 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		MetadataDateTime* _tmp3_ = NULL;
 		PhotoMetadata* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		PhotoMetadata* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
-#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_metadata_get_exposure_date_time (_tmp2_);
-#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2738 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
 		date_time = _tmp3_;
-#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = metadata;
-#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 2739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2741 "/home/jens/Source/shotwell/src/Photo.vala"
 		title = _tmp5_;
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = metadata;
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 2740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2742 "/home/jens/Source/shotwell/src/Photo.vala"
 		comment = _tmp7_;
-#line 20975 "Photo.c"
+#line 20990 "Photo.c"
 	}
-#line 2744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = date_time;
-#line 2744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ == NULL) {
-#line 20981 "Photo.c"
+#line 20996 "Photo.c"
 		{
 			PhotoRow* _tmp9_ = NULL;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 20988 "Photo.c"
+#line 21003 "Photo.c"
 			{
 				BackingPhotoRow* _tmp10_ = NULL;
 				time_t _tmp11_ = 0;
 				PhotoRow* _tmp12_ = NULL;
 				time_t _tmp13_ = 0;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = self->backing_photo_row;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp10_->timestamp;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = self->row;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_->exposure_time;
-#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
-				if (_tmp11_ != _tmp13_) {
 #line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+				if (_tmp11_ != _tmp13_) {
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 21006 "Photo.c"
+#line 21021 "Photo.c"
 					{
 						PhotoRow* _tmp14_ = NULL;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp14_ = self->row;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21013 "Photo.c"
+#line 21028 "Photo.c"
 					}
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (metadata);
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (comment);
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (title);
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					_metadata_date_time_unref0 (date_time);
-#line 2750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2752 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 21025 "Photo.c"
+#line 21040 "Photo.c"
 				}
 			}
-			__finally365:
+			__finally366:
 			{
 				PhotoRow* _tmp15_ = NULL;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->row;
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21035 "Photo.c"
+#line 21050 "Photo.c"
 			}
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_media_metadata_unref0 (metadata);
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (comment);
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (title);
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				_metadata_date_time_unref0 (date_time);
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/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 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 2746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2748 "/home/jens/Source/shotwell/src/Photo.vala"
 				return FALSE;
-#line 21053 "Photo.c"
+#line 21068 "Photo.c"
 			}
 		}
 	}
 	{
 		PhotoRow* _tmp16_ = NULL;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = self->row;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21063 "Photo.c"
+#line 21078 "Photo.c"
 		{
 			gboolean _tmp17_ = FALSE;
 			gboolean _tmp18_ = FALSE;
@@ -21069,184 +21084,184 @@ gboolean photo_has_alterations (Photo* self) {
 			gboolean _tmp20_ = FALSE;
 			PhotoRow* _tmp21_ = NULL;
 			GeeHashMap* _tmp22_ = NULL;
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = self->row;
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = _tmp21_->transformations;
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp22_ != NULL) {
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = TRUE;
-#line 21079 "Photo.c"
+#line 21094 "Photo.c"
 			} else {
 				PhotoRow* _tmp23_ = NULL;
 				Orientation _tmp24_ = 0;
 				BackingPhotoRow* _tmp25_ = NULL;
 				Orientation _tmp26_ = 0;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = self->row;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _tmp23_->orientation;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = self->backing_photo_row;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = _tmp25_->original_orientation;
-#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = _tmp24_ != _tmp26_;
-#line 21095 "Photo.c"
+#line 21110 "Photo.c"
 			}
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp20_) {
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = TRUE;
-#line 21101 "Photo.c"
+#line 21116 "Photo.c"
 			} else {
 				gboolean _tmp27_ = FALSE;
 				MetadataDateTime* _tmp28_ = NULL;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = date_time;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_ != NULL) {
-#line 21109 "Photo.c"
+#line 21124 "Photo.c"
 					PhotoRow* _tmp29_ = NULL;
 					time_t _tmp30_ = 0;
 					MetadataDateTime* _tmp31_ = NULL;
 					time_t _tmp32_ = 0;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = self->row;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = _tmp29_->exposure_time;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = date_time;
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = metadata_date_time_get_timestamp (_tmp31_);
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = _tmp30_ != _tmp32_;
-#line 21124 "Photo.c"
+#line 21139 "Photo.c"
 				} else {
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = FALSE;
-#line 21128 "Photo.c"
+#line 21143 "Photo.c"
 				}
-#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = _tmp27_;
-#line 21132 "Photo.c"
+#line 21147 "Photo.c"
 			}
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp19_) {
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = TRUE;
-#line 21138 "Photo.c"
+#line 21153 "Photo.c"
 			} else {
 				gchar* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
 				const gchar* _tmp35_ = NULL;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = _tmp33_;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = comment;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = g_strcmp0 (_tmp34_, _tmp35_) != 0;
-#line 2759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2761 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp34_);
-#line 21153 "Photo.c"
+#line 21168 "Photo.c"
 			}
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp18_) {
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = TRUE;
-#line 21159 "Photo.c"
+#line 21174 "Photo.c"
 			} else {
 				gchar* _tmp36_ = NULL;
 				gchar* _tmp37_ = NULL;
 				const gchar* _tmp38_ = NULL;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = title;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = g_strcmp0 (_tmp37_, _tmp38_) != 0;
-#line 2760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2762 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp37_);
-#line 21174 "Photo.c"
+#line 21189 "Photo.c"
 			}
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp17_;
-#line 21178 "Photo.c"
+#line 21193 "Photo.c"
 			{
 				PhotoRow* _tmp39_ = NULL;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = self->row;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21185 "Photo.c"
+#line 21200 "Photo.c"
 			}
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (comment);
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (title);
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			_metadata_date_time_unref0 (date_time);
-#line 2756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2758 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21197 "Photo.c"
+#line 21212 "Photo.c"
 		}
-		__finally366:
+		__finally367:
 		{
 			PhotoRow* _tmp40_ = NULL;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = self->row;
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21206 "Photo.c"
+#line 21221 "Photo.c"
 		}
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (comment);
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (title);
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (date_time);
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/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 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2757 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 21222 "Photo.c"
+#line 21237 "Photo.c"
 	}
-#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (comment);
-#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (title);
-#line 2731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_metadata_date_time_unref0 (date_time);
-#line 21232 "Photo.c"
+#line 21247 "Photo.c"
 }
 
 
 PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 	PhotoTransformationState* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 2765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 21241 "Photo.c"
+#line 21256 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21248 "Photo.c"
+#line 21263 "Photo.c"
 		{
 			PixelTransformer* _tmp1_ = NULL;
 			PixelTransformer* _tmp2_ = NULL;
@@ -21257,112 +21272,112 @@ PhotoTransformationState* photo_save_transformation_state (Photo* self) {
 			PhotoRow* _tmp11_ = NULL;
 			GeeHashMap* _tmp12_ = NULL;
 			PhotoPhotoTransformationStateImpl* _tmp13_ = NULL;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->transformer;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 21263 "Photo.c"
+#line 21278 "Photo.c"
 				PixelTransformer* _tmp3_ = NULL;
 				PixelTransformer* _tmp4_ = NULL;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->transformer;
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = pixel_transformer_copy (_tmp3_);
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (_tmp1_);
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp4_;
-#line 21274 "Photo.c"
+#line 21289 "Photo.c"
 			} else {
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (_tmp1_);
-#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2771 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = NULL;
-#line 21280 "Photo.c"
+#line 21295 "Photo.c"
 			}
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->adjustments;
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ != NULL) {
-#line 21286 "Photo.c"
+#line 21301 "Photo.c"
 				PixelTransformationBundle* _tmp7_ = NULL;
 				PixelTransformationBundle* _tmp8_ = NULL;
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->priv->adjustments;
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = pixel_transformation_bundle_copy (_tmp7_);
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (_tmp5_);
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp8_;
-#line 21297 "Photo.c"
+#line 21312 "Photo.c"
 			} else {
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (_tmp5_);
-#line 2770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2772 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = NULL;
-#line 21303 "Photo.c"
+#line 21318 "Photo.c"
 			}
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->orientation;
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->row;
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = _tmp11_->transformations;
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_photo_transformation_state_impl_new (self, _tmp10_, _tmp12_, _tmp1_, _tmp5_);
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState);
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (_tmp5_);
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (_tmp1_);
-#line 21321 "Photo.c"
+#line 21336 "Photo.c"
 			{
 				PhotoRow* _tmp14_ = NULL;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = self->row;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21328 "Photo.c"
+#line 21343 "Photo.c"
 			}
-#line 2767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2769 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21332 "Photo.c"
+#line 21347 "Photo.c"
 		}
-		__finally367:
+		__finally368:
 		{
 			PhotoRow* _tmp15_ = NULL;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = self->row;
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21341 "Photo.c"
+#line 21356 "Photo.c"
 		}
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/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 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2766 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2768 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 21349 "Photo.c"
+#line 21364 "Photo.c"
 	}
 }
 
 
 static gpointer _pixel_transformer_ref0 (gpointer self) {
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? pixel_transformer_ref (self) : NULL;
-#line 21357 "Photo.c"
+#line 21372 "Photo.c"
 }
 
 
 static gpointer _pixel_transformation_bundle_ref0 (gpointer self) {
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? pixel_transformation_bundle_ref (self) : NULL;
-#line 21364 "Photo.c"
+#line 21379 "Photo.c"
 }
 
 
@@ -21387,60 +21402,60 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 	gboolean committed = FALSE;
 	gboolean _tmp30_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_TRANSFORMATION_STATE (state), FALSE);
-#line 2775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = state;
-#line 2775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/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 2775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
 	state_impl = _tmp1_;
-#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = state_impl;
-#line 2776 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2778 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ == NULL) {
-#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (state_impl);
-#line 2777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 21409 "Photo.c"
+#line 21424 "Photo.c"
 	}
-#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = state_impl;
-#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_photo_transformation_state_impl_get_orientation (_tmp3_);
-#line 2779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_orientation = _tmp4_;
-#line 2780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = state_impl;
-#line 2780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_photo_transformation_state_impl_get_transformations (_tmp5_);
-#line 2780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_transformations = _tmp6_;
-#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = state_impl;
-#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo_photo_transformation_state_impl_get_transformer (_tmp7_);
-#line 2781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2783 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_transformer = _tmp8_;
-#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = state_impl;
-#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = photo_photo_transformation_state_impl_get_color_adjustments (_tmp9_);
-#line 2782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2784 "/home/jens/Source/shotwell/src/Photo.vala"
 	saved_adjustments = _tmp10_;
-#line 21435 "Photo.c"
+#line 21450 "Photo.c"
 	{
 		PhotoRow* _tmp11_ = NULL;
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = self->row;
-#line 2785 "/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 21442 "Photo.c"
+#line 21457 "Photo.c"
 		{
 			PhotoTable* _tmp12_ = NULL;
 			PhotoTable* _tmp13_ = NULL;
@@ -21450,29 +21465,29 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 			GeeHashMap* _tmp17_ = NULL;
 			gboolean _tmp18_ = FALSE;
 			gboolean _tmp19_ = FALSE;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_get_instance ();
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _tmp12_;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->row;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _tmp14_->photo_id;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = saved_orientation;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = saved_transformations;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = photo_table_set_transformation_state (_tmp13_, &_tmp15_, _tmp16_, _tmp17_);
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
 			committed = _tmp18_;
-#line 2786 "/home/jens/Source/shotwell/src/Photo.vala"
-			_database_table_unref0 (_tmp13_);
 #line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+			_database_table_unref0 (_tmp13_);
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = committed;
-#line 2788 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp19_) {
-#line 21474 "Photo.c"
+#line 21489 "Photo.c"
 				PhotoRow* _tmp20_ = NULL;
 				Orientation _tmp21_ = 0;
 				PhotoRow* _tmp22_ = NULL;
@@ -21482,108 +21497,108 @@ gboolean photo_load_transformation_state (Photo* self, PhotoTransformationState*
 				PixelTransformer* _tmp26_ = NULL;
 				PixelTransformationBundle* _tmp27_ = NULL;
 				PixelTransformationBundle* _tmp28_ = NULL;
-#line 2789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = self->row;
-#line 2789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = saved_orientation;
-#line 2789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_->orientation = _tmp21_;
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = self->row;
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = saved_transformations;
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp22_->transformations);
-#line 2790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_->transformations = _tmp24_;
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = saved_transformer;
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = _pixel_transformer_ref0 (_tmp25_);
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (self->priv->transformer);
-#line 2791 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2793 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->transformer = _tmp26_;
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = saved_adjustments;
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = _pixel_transformation_bundle_ref0 (_tmp27_);
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2792 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2794 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->adjustments = _tmp28_;
-#line 21516 "Photo.c"
+#line 21531 "Photo.c"
 			}
 		}
-		__finally368:
+		__finally369:
 		{
 			PhotoRow* _tmp29_ = NULL;
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = self->row;
-#line 2785 "/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 21526 "Photo.c"
+#line 21541 "Photo.c"
 		}
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (saved_adjustments);
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (saved_transformer);
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (saved_transformations);
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (state_impl);
-#line 2785 "/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 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2787 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 21544 "Photo.c"
+#line 21559 "Photo.c"
 		}
 	}
-#line 2796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = committed;
-#line 2796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2798 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp30_) {
-#line 21551 "Photo.c"
+#line 21566 "Photo.c"
 		Alteration* _tmp31_ = NULL;
 		Alteration* _tmp32_ = NULL;
-#line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = alteration_new ("image", "transformation-state");
-#line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp31_;
-#line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp32_);
-#line 2797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp32_);
-#line 21562 "Photo.c"
+#line 21577 "Photo.c"
 	}
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (saved_adjustments);
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformer_unref0 (saved_transformer);
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (saved_transformations);
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (state_impl);
-#line 2799 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2801 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21576 "Photo.c"
+#line 21591 "Photo.c"
 }
 
 
 void photo_remove_all_transformations (Photo* self) {
-#line 2802 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2804 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2805 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_internal_remove_all_transformations (self, TRUE);
-#line 21585 "Photo.c"
+#line 21600 "Photo.c"
 }
 
 
@@ -21592,18 +21607,18 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 	gboolean _tmp21_ = FALSE;
 	gboolean _tmp22_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_altered = FALSE;
-#line 21598 "Photo.c"
+#line 21613 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21605 "Photo.c"
+#line 21620 "Photo.c"
 		{
 			PhotoTable* _tmp1_ = NULL;
 			PhotoTable* _tmp2_ = NULL;
@@ -21615,45 +21630,45 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 			Orientation _tmp8_ = 0;
 			BackingPhotoRow* _tmp9_ = NULL;
 			Orientation _tmp10_ = 0;
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_table_get_instance ();
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_;
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp3_->photo_id;
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = photo_table_remove_all_transformations (_tmp2_, &_tmp4_);
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			is_altered = _tmp5_;
-#line 2809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp2_);
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->row;
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp6_->transformations);
-#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
-			_tmp6_->transformations = NULL;
 #line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
+			_tmp6_->transformations = NULL;
+#line 2814 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (self->priv->transformer);
-#line 2812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2814 "/home/jens/Source/shotwell/src/Photo.vala"
 			self->priv->transformer = NULL;
-#line 2813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (self->priv->adjustments);
-#line 2813 "/home/jens/Source/shotwell/src/Photo.vala"
-			self->priv->adjustments = NULL;
 #line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+			self->priv->adjustments = NULL;
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_->orientation;
-#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->backing_photo_row;
-#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _tmp9_->original_orientation;
-#line 2815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2817 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp8_ != _tmp10_) {
-#line 21655 "Photo.c"
+#line 21670 "Photo.c"
 				PhotoTable* _tmp11_ = NULL;
 				PhotoTable* _tmp12_ = NULL;
 				PhotoRow* _tmp13_ = NULL;
@@ -21663,85 +21678,85 @@ static void photo_internal_remove_all_transformations (Photo* self, gboolean not
 				PhotoRow* _tmp17_ = NULL;
 				BackingPhotoRow* _tmp18_ = NULL;
 				Orientation _tmp19_ = 0;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = photo_table_get_instance ();
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = self->row;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _tmp13_->photo_id;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = self->backing_photo_row;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_->original_orientation;
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_table_set_orientation (_tmp12_, &_tmp14_, _tmp16_);
-#line 2816 "/home/jens/Source/shotwell/src/Photo.vala"
-				_database_table_unref0 (_tmp12_);
 #line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+				_database_table_unref0 (_tmp12_);
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = self->row;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = self->backing_photo_row;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = _tmp18_->original_orientation;
-#line 2818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2820 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_->orientation = _tmp19_;
-#line 2819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2821 "/home/jens/Source/shotwell/src/Photo.vala"
 				is_altered = TRUE;
-#line 21691 "Photo.c"
+#line 21706 "Photo.c"
 			}
 		}
-		__finally369:
+		__finally370:
 		{
 			PhotoRow* _tmp20_ = NULL;
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->row;
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21701 "Photo.c"
+#line 21716 "Photo.c"
 		}
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/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 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2810 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 21711 "Photo.c"
+#line 21726 "Photo.c"
 		}
 	}
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = is_altered;
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_) {
-#line 21718 "Photo.c"
+#line 21733 "Photo.c"
 		gboolean _tmp23_ = FALSE;
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = notify;
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp23_;
-#line 21724 "Photo.c"
+#line 21739 "Photo.c"
 	} else {
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = FALSE;
-#line 21728 "Photo.c"
+#line 21743 "Photo.c"
 	}
-#line 2823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2825 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp21_) {
-#line 21732 "Photo.c"
+#line 21747 "Photo.c"
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
-#line 2824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("image", "revert");
-#line 2824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 2824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
-#line 2824 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2826 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 21743 "Photo.c"
+#line 21758 "Photo.c"
 	}
 }
 
@@ -21749,54 +21764,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 2827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21753 "Photo.c"
+#line 21768 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21760 "Photo.c"
+#line 21775 "Photo.c"
 		{
 			BackingPhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
-#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->backing_photo_row;
-#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->original_orientation;
-#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21770 "Photo.c"
+#line 21785 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21777 "Photo.c"
+#line 21792 "Photo.c"
 			}
-#line 2829 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2831 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21781 "Photo.c"
+#line 21796 "Photo.c"
 		}
-		__finally370:
+		__finally371:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21790 "Photo.c"
+#line 21805 "Photo.c"
 		}
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/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 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2830 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 21798 "Photo.c"
+#line 21813 "Photo.c"
 	}
 }
 
@@ -21804,54 +21819,54 @@ Orientation photo_get_original_orientation (Photo* self) {
 Orientation photo_get_orientation (Photo* self) {
 	Orientation result = 0;
 	GError * _inner_error_ = NULL;
-#line 2833 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), 0);
-#line 21808 "Photo.c"
+#line 21823 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21815 "Photo.c"
+#line 21830 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
-#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->orientation;
-#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp2_;
-#line 21825 "Photo.c"
+#line 21840 "Photo.c"
 			{
 				PhotoRow* _tmp3_ = NULL;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21832 "Photo.c"
+#line 21847 "Photo.c"
 			}
-#line 2835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2837 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 21836 "Photo.c"
+#line 21851 "Photo.c"
 		}
-		__finally371:
+		__finally372:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21845 "Photo.c"
+#line 21860 "Photo.c"
 		}
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/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 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2836 "/home/jens/Source/shotwell/src/Photo.vala"
 		return 0;
-#line 21853 "Photo.c"
+#line 21868 "Photo.c"
 	}
 }
 
@@ -21861,31 +21876,31 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 	gboolean committed = FALSE;
 	gboolean _tmp14_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2839 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
 	committed = FALSE;
-#line 21867 "Photo.c"
+#line 21882 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 21874 "Photo.c"
+#line 21889 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			Orientation _tmp2_ = 0;
 			Orientation _tmp3_ = 0;
-#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->orientation;
-#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = orientation;
-#line 2842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != _tmp3_) {
-#line 21887 "Photo.c"
+#line 21902 "Photo.c"
 				PhotoTable* _tmp4_ = NULL;
 				PhotoTable* _tmp5_ = NULL;
 				PhotoRow* _tmp6_ = NULL;
@@ -21893,96 +21908,96 @@ gboolean photo_set_orientation (Photo* self, Orientation orientation) {
 				Orientation _tmp8_ = 0;
 				gboolean _tmp9_ = FALSE;
 				gboolean _tmp10_ = FALSE;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = photo_table_get_instance ();
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp6_->photo_id;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = orientation;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_table_set_orientation (_tmp5_, &_tmp7_, _tmp8_);
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				committed = _tmp9_;
-#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp5_);
-#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2846 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = committed;
-#line 2844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2846 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_) {
-#line 21915 "Photo.c"
+#line 21930 "Photo.c"
 					PhotoRow* _tmp11_ = NULL;
 					Orientation _tmp12_ = 0;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = orientation;
-#line 2845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2847 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->orientation = _tmp12_;
-#line 21924 "Photo.c"
+#line 21939 "Photo.c"
 				}
 			}
 		}
-		__finally372:
+		__finally373:
 		{
 			PhotoRow* _tmp13_ = NULL;
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->row;
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 21935 "Photo.c"
+#line 21950 "Photo.c"
 		}
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/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 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2841 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2843 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 21945 "Photo.c"
+#line 21960 "Photo.c"
 		}
 	}
-#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = committed;
-#line 2849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2851 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp14_) {
-#line 21952 "Photo.c"
+#line 21967 "Photo.c"
 		Alteration* _tmp15_ = NULL;
 		Alteration* _tmp16_ = NULL;
-#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = alteration_new ("image", "orientation");
-#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_;
-#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_);
-#line 2850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp16_);
-#line 21963 "Photo.c"
+#line 21978 "Photo.c"
 	}
-#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2854 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = committed;
-#line 2852 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2854 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21969 "Photo.c"
+#line 21984 "Photo.c"
 }
 
 
 gboolean photo_check_can_rotate (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2855 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2857 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->can_rotate_now;
-#line 2856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2858 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 21984 "Photo.c"
+#line 21999 "Photo.c"
 }
 
 
@@ -21990,134 +22005,134 @@ static void photo_real_rotate (Photo* self, Rotation rotation) {
 	GError * _inner_error_ = NULL;
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2860 "/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 21996 "Photo.c"
+#line 22011 "Photo.c"
 		{
 			Orientation _tmp1_ = 0;
 			Rotation _tmp2_ = 0;
 			Orientation _tmp3_ = 0;
-#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_orientation (self);
-#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = rotation;
-#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = orientation_perform (_tmp1_, _tmp2_);
-#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2863 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_orientation (self, _tmp3_);
-#line 22009 "Photo.c"
+#line 22024 "Photo.c"
 		}
-		__finally373:
+		__finally374:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 2860 "/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 22018 "Photo.c"
+#line 22033 "Photo.c"
 		}
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2860 "/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 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2862 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 22028 "Photo.c"
+#line 22043 "Photo.c"
 		}
 	}
 }
 
 
 void photo_rotate (Photo* self, Rotation rotation) {
-#line 2859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2859 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2861 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->rotate (self, rotation);
-#line 22039 "Photo.c"
+#line 22054 "Photo.c"
 }
 
 
 static gboolean photo_has_transformation (Photo* self, const gchar* name) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2865 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2865 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 22050 "Photo.c"
+#line 22065 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22057 "Photo.c"
+#line 22072 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoRow* _tmp2_ = NULL;
 			GeeHashMap* _tmp3_ = NULL;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->row;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->transformations;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 22068 "Photo.c"
+#line 22083 "Photo.c"
 				PhotoRow* _tmp4_ = NULL;
 				GeeHashMap* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
 				gboolean _tmp7_ = FALSE;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->row;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->transformations;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = name;
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/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 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_;
-#line 22083 "Photo.c"
+#line 22098 "Photo.c"
 			} else {
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 22087 "Photo.c"
+#line 22102 "Photo.c"
 			}
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp1_;
-#line 22091 "Photo.c"
+#line 22106 "Photo.c"
 			{
 				PhotoRow* _tmp8_ = NULL;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->row;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22098 "Photo.c"
+#line 22113 "Photo.c"
 			}
-#line 2867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2869 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22102 "Photo.c"
+#line 22117 "Photo.c"
 		}
-		__finally374:
+		__finally375:
 		{
 			PhotoRow* _tmp9_ = NULL;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = self->row;
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22111 "Photo.c"
+#line 22126 "Photo.c"
 		}
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/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 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2868 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 22119 "Photo.c"
+#line 22134 "Photo.c"
 	}
 }
 
@@ -22126,111 +22141,111 @@ static KeyValueMap* photo_get_transformation (Photo* self, const gchar* name) {
 	KeyValueMap* result = NULL;
 	KeyValueMap* map = NULL;
 	GError * _inner_error_ = NULL;
-#line 2874 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2874 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 2875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = NULL;
-#line 22134 "Photo.c"
+#line 22149 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22141 "Photo.c"
+#line 22156 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
-#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
-#line 2877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22151 "Photo.c"
+#line 22166 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
 				const gchar* _tmp5_ = NULL;
 				gpointer _tmp6_ = NULL;
 				KeyValueMap* _tmp7_ = NULL;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->transformations;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = name;
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/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 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				_key_value_map_unref0 (map);
-#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
 				map = (KeyValueMap*) _tmp6_;
-#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = map;
-#line 2879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2881 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp7_ != NULL) {
-#line 22173 "Photo.c"
+#line 22188 "Photo.c"
 					KeyValueMap* _tmp8_ = NULL;
 					KeyValueMap* _tmp9_ = NULL;
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp8_ = map;
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp9_ = key_value_map_copy (_tmp8_);
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 					_key_value_map_unref0 (map);
-#line 2880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2882 "/home/jens/Source/shotwell/src/Photo.vala"
 					map = _tmp9_;
-#line 22184 "Photo.c"
+#line 22199 "Photo.c"
 				}
 			}
 		}
-		__finally375:
+		__finally376:
 		{
 			PhotoRow* _tmp10_ = NULL;
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = self->row;
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22195 "Photo.c"
+#line 22210 "Photo.c"
 		}
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			_key_value_map_unref0 (map);
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/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 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2878 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 22207 "Photo.c"
+#line 22222 "Photo.c"
 		}
 	}
-#line 2884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = map;
-#line 2884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2886 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22214 "Photo.c"
+#line 22229 "Photo.c"
 }
 
 
 static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_KEY_VALUE_MAP (trans), FALSE);
-#line 22225 "Photo.c"
+#line 22240 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22232 "Photo.c"
+#line 22247 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -22247,88 +22262,88 @@ static gboolean photo_set_transformation (Photo* self, KeyValueMap* trans) {
 			KeyValueMap* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			gboolean _tmp17_ = FALSE;
-#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
-#line 2889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2891 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ == NULL) {
-#line 22255 "Photo.c"
+#line 22270 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp3_->transformations);
-#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_->transformations = _tmp4_;
-#line 22266 "Photo.c"
+#line 22281 "Photo.c"
 			}
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp5_->transformations;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = trans;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = key_value_map_get_group (_tmp7_);
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = trans;
-#line 2892 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2894 "/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 2892 "/home/jens/Source/shotwell/src/Photo.vala"
-			_g_free0 (_tmp9_);
 #line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+			_g_free0 (_tmp9_);
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = photo_table_get_instance ();
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = _tmp11_;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = self->row;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_->photo_id;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = trans;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = photo_table_set_transformation (_tmp12_, &_tmp14_, _tmp15_);
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = _tmp16_;
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp12_);
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp17_;
-#line 22302 "Photo.c"
+#line 22317 "Photo.c"
 			{
 				PhotoRow* _tmp18_ = NULL;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = self->row;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22309 "Photo.c"
+#line 22324 "Photo.c"
 			}
-#line 2894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2896 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 22313 "Photo.c"
+#line 22328 "Photo.c"
 		}
-		__finally376:
+		__finally377:
 		{
 			PhotoRow* _tmp19_ = NULL;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = self->row;
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22322 "Photo.c"
+#line 22337 "Photo.c"
 		}
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/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 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 2888 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2890 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 22330 "Photo.c"
+#line 22345 "Photo.c"
 	}
 }
 
@@ -22340,18 +22355,18 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 	gboolean _tmp19_ = FALSE;
 	gboolean _tmp20_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (name != NULL, FALSE);
-#line 22346 "Photo.c"
+#line 22361 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 22353 "Photo.c"
+#line 22368 "Photo.c"
 		{
 			PhotoRow* _tmp1_ = NULL;
 			GeeHashMap* _tmp2_ = NULL;
@@ -22361,13 +22376,13 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 			PhotoID _tmp15_ = {0};
 			const gchar* _tmp16_ = NULL;
 			gboolean _tmp17_ = FALSE;
-#line 2901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->row;
-#line 2901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->transformations;
-#line 2901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 22369 "Photo.c"
+#line 22384 "Photo.c"
 				PhotoRow* _tmp3_ = NULL;
 				GeeHashMap* _tmp4_ = NULL;
 				const gchar* _tmp5_ = NULL;
@@ -22376,111 +22391,111 @@ static gboolean photo_remove_transformation (Photo* self, const gchar* name) {
 				GeeHashMap* _tmp8_ = NULL;
 				gint _tmp9_ = 0;
 				gint _tmp10_ = 0;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->row;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->transformations;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = name;
-#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2904 "/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 2902 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered_cache = _tmp6_;
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = self->row;
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_->transformations;
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = gee_abstract_map_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_MAP, GeeMap));
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp9_;
-#line 2903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2905 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp10_ == 0) {
-#line 22398 "Photo.c"
+#line 22413 "Photo.c"
 					PhotoRow* _tmp11_ = NULL;
-#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = self->row;
-#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp11_->transformations);
-#line 2904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_->transformations = NULL;
-#line 22406 "Photo.c"
+#line 22421 "Photo.c"
 				}
 			} else {
-#line 2906 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2908 "/home/jens/Source/shotwell/src/Photo.vala"
 				altered_cache = FALSE;
-#line 22411 "Photo.c"
+#line 22426 "Photo.c"
 			}
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_table_get_instance ();
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = _tmp12_;
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->row;
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = _tmp14_->photo_id;
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = name;
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = photo_table_remove_transformation (_tmp13_, &_tmp15_, _tmp16_);
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			altered_persistent = _tmp17_;
-#line 2909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2911 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp13_);
-#line 22429 "Photo.c"
+#line 22444 "Photo.c"
 		}
-		__finally377:
+		__finally378:
 		{
 			PhotoRow* _tmp18_ = NULL;
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->row;
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 22438 "Photo.c"
+#line 22453 "Photo.c"
 		}
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/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 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 2900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2902 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 22448 "Photo.c"
+#line 22463 "Photo.c"
 		}
 	}
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = altered_cache;
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp20_) {
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = TRUE;
-#line 22457 "Photo.c"
+#line 22472 "Photo.c"
 	} else {
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = altered_persistent;
-#line 22461 "Photo.c"
+#line 22476 "Photo.c"
 	}
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp19_;
-#line 2913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2915 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22467 "Photo.c"
+#line 22482 "Photo.c"
 }
 
 
 gboolean photo_has_crop (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2918 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2917 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_transformation (self, "crop");
-#line 2917 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 2917 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2919 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22482 "Photo.c"
+#line 22497 "Photo.c"
 }
 
 
@@ -22510,136 +22525,136 @@ gboolean photo_get_raw_crop (Photo* self, Box* crop) {
 	gint _tmp18_ = 0;
 	gint _tmp19_ = 0;
 	gint _tmp20_ = 0;
-#line 2921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2923 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2922 "/home/jens/Source/shotwell/src/Photo.vala"
-	box_init (&_vala_crop, 0, 0, 0, 0);
 #line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
+	box_init (&_vala_crop, 0, 0, 0, 0);
+#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "crop");
-#line 2924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2927 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2925 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2927 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (crop) {
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 22532 "Photo.c"
+#line 22547 "Photo.c"
 		}
-#line 2926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22536 "Photo.c"
+#line 22551 "Photo.c"
 	}
-#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
-#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = key_value_map_get_int (_tmp2_, "left", -1);
-#line 2928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
 	left = _tmp3_;
-#line 2929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 2929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = key_value_map_get_int (_tmp4_, "top", -1);
-#line 2929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
 	top = _tmp5_;
-#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2932 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = map;
-#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2932 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = key_value_map_get_int (_tmp6_, "right", -1);
-#line 2930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2932 "/home/jens/Source/shotwell/src/Photo.vala"
 	right = _tmp7_;
-#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = map;
-#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = key_value_map_get_int (_tmp8_, "bottom", -1);
-#line 2931 "/home/jens/Source/shotwell/src/Photo.vala"
-	bottom = _tmp9_;
 #line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+	bottom = _tmp9_;
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = left;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp13_ == -1) {
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = TRUE;
-#line 22568 "Photo.c"
+#line 22583 "Photo.c"
 	} else {
 		gint _tmp14_ = 0;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = top;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp14_ == -1;
-#line 22575 "Photo.c"
+#line 22590 "Photo.c"
 	}
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_) {
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 22581 "Photo.c"
+#line 22596 "Photo.c"
 	} else {
 		gint _tmp15_ = 0;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = right;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp15_ == -1;
-#line 22588 "Photo.c"
+#line 22603 "Photo.c"
 	}
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = TRUE;
-#line 22594 "Photo.c"
+#line 22609 "Photo.c"
 	} else {
 		gint _tmp16_ = 0;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = bottom;
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp16_ == -1;
-#line 22601 "Photo.c"
+#line 22616 "Photo.c"
 	}
-#line 2933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2935 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (crop) {
-#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 22613 "Photo.c"
+#line 22628 "Photo.c"
 		}
-#line 2934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22617 "Photo.c"
+#line 22632 "Photo.c"
 	}
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = left;
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = top;
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = right;
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = bottom;
-#line 2936 "/home/jens/Source/shotwell/src/Photo.vala"
-	box_init (&_vala_crop, _tmp17_, _tmp18_, _tmp19_, _tmp20_);
 #line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+	box_init (&_vala_crop, _tmp17_, _tmp18_, _tmp19_, _tmp20_);
+#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (crop) {
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 		*crop = _vala_crop;
-#line 22637 "Photo.c"
+#line 22652 "Photo.c"
 	}
-#line 2938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2940 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22641 "Photo.c"
+#line 22656 "Photo.c"
 }
 
 
@@ -22660,68 +22675,68 @@ static void photo_set_raw_crop (Photo* self, Box* crop) {
 	gint _tmp12_ = 0;
 	KeyValueMap* _tmp13_ = NULL;
 	gboolean _tmp14_ = FALSE;
-#line 2942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (crop != NULL);
-#line 2943 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = key_value_map_new ("crop");
-#line 2943 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *crop;
-#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_.left;
-#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp1_, "left", _tmp3_);
-#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = *crop;
-#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_.top;
-#line 2945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp4_, "top", _tmp6_);
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = map;
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = *crop;
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_.right;
-#line 2946 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2948 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp7_, "right", _tmp9_);
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = map;
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = *crop;
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = _tmp11_.bottom;
-#line 2947 "/home/jens/Source/shotwell/src/Photo.vala"
-	key_value_map_set_int (_tmp10_, "bottom", _tmp12_);
 #line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
+	key_value_map_set_int (_tmp10_, "bottom", _tmp12_);
+#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = map;
-#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo_set_transformation (self, _tmp13_);
-#line 2949 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2951 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp14_) {
-#line 22708 "Photo.c"
+#line 22723 "Photo.c"
 		Alteration* _tmp15_ = NULL;
 		Alteration* _tmp16_ = NULL;
-#line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = alteration_new ("image", "crop");
-#line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp15_;
-#line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp16_);
-#line 2950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2952 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp16_);
-#line 22719 "Photo.c"
+#line 22734 "Photo.c"
 	}
-#line 2942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2944 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22723 "Photo.c"
+#line 22738 "Photo.c"
 }
 
 
@@ -22733,51 +22748,51 @@ static gboolean photo_get_raw_straighten (Photo* self, gdouble* angle) {
 	KeyValueMap* _tmp1_ = NULL;
 	KeyValueMap* _tmp2_ = NULL;
 	gdouble _tmp3_ = 0.0;
-#line 2953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2956 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "straighten");
-#line 2954 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2956 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2957 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2957 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 2956 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_angle = 0.0;
 #line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_angle = 0.0;
+#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (angle) {
-#line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 			*angle = _vala_angle;
-#line 22755 "Photo.c"
+#line 22770 "Photo.c"
 		}
-#line 2958 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2960 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22759 "Photo.c"
+#line 22774 "Photo.c"
 	}
-#line 2961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = map;
-#line 2961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = key_value_map_get_double (_tmp2_, "angle", 0.0);
-#line 2961 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_angle = _tmp3_;
 #line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_angle = _tmp3_;
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (angle) {
-#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 		*angle = _vala_angle;
-#line 22775 "Photo.c"
+#line 22790 "Photo.c"
 	}
-#line 2963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2965 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 22779 "Photo.c"
+#line 22794 "Photo.c"
 }
 
 
@@ -22788,40 +22803,40 @@ static void photo_set_raw_straighten (Photo* self, gdouble theta) {
 	gdouble _tmp2_ = 0.0;
 	KeyValueMap* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 2967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2969 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = key_value_map_new ("straighten");
-#line 2967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2969 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = theta;
-#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
-	key_value_map_set_double (_tmp1_, "angle", _tmp2_);
 #line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
+	key_value_map_set_double (_tmp1_, "angle", _tmp2_);
+#line 2972 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = map;
-#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2972 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_set_transformation (self, _tmp3_);
-#line 2970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2972 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 22808 "Photo.c"
+#line 22823 "Photo.c"
 		Alteration* _tmp5_ = NULL;
 		Alteration* _tmp6_ = NULL;
-#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = alteration_new ("image", "straighten");
-#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp6_);
-#line 2971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp6_);
-#line 22819 "Photo.c"
+#line 22834 "Photo.c"
 	}
-#line 2966 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2968 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 22823 "Photo.c"
+#line 22838 "Photo.c"
 }
 
 
@@ -22843,81 +22858,81 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 	GdkPoint _tmp9_ = {0};
 	EditingToolsRedeyeInstance* _tmp47_ = NULL;
 	gint _tmp47__length1 = 0;
-#line 2976 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2978 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 2977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "redeye");
-#line 2977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 2978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2980 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 2978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2980 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 22855 "Photo.c"
+#line 22870 "Photo.c"
 		EditingToolsRedeyeInstance* _tmp2_ = NULL;
 		EditingToolsRedeyeInstance* _tmp3_ = NULL;
 		gint _tmp3__length1 = 0;
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = g_new0 (EditingToolsRedeyeInstance, 0);
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3__length1 = 0;
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (result_length1) {
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 			*result_length1 = _tmp3__length1;
-#line 22869 "Photo.c"
+#line 22884 "Photo.c"
 		}
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp3_;
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 2979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 22877 "Photo.c"
+#line 22892 "Photo.c"
 	}
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1);
-#line 2981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2983 "/home/jens/Source/shotwell/src/Photo.vala"
 	num_points = _tmp5_;
-#line 2982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = num_points;
-#line 2982 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp6_ > 0, "num_points > 0");
 #line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp6_ > 0, "num_points > 0");
+#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = num_points;
-#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_new0 (EditingToolsRedeyeInstance, _tmp7_);
-#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
 	res = _tmp8_;
-#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
 	res_length1 = _tmp7_;
-#line 2984 "/home/jens/Source/shotwell/src/Photo.vala"
-	_res_size_ = res_length1;
 #line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
+	_res_size_ = res_length1;
+#line 2988 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_.x = 0;
-#line 2986 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2988 "/home/jens/Source/shotwell/src/Photo.vala"
 	default_point = _tmp9_;
-#line 2987 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2989 "/home/jens/Source/shotwell/src/Photo.vala"
 	default_point.x = -1;
-#line 2988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
 	default_point.y = -1;
-#line 22907 "Photo.c"
+#line 22922 "Photo.c"
 	{
 		gint i = 0;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 		i = 0;
-#line 22912 "Photo.c"
+#line 22927 "Photo.c"
 		{
 			gboolean _tmp10_ = FALSE;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = TRUE;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 22919 "Photo.c"
+#line 22934 "Photo.c"
 				gint _tmp12_ = 0;
 				gint _tmp13_ = 0;
 				gchar* center_key = NULL;
@@ -22960,158 +22975,158 @@ static EditingToolsRedeyeInstance* photo_get_raw_redeye_instances (Photo* self,
 				gint _tmp44_ = 0;
 				EditingToolsRedeyeInstance _tmp45_ = {0};
 				gint _tmp46_ = 0;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp10_) {
-#line 22964 "Photo.c"
+#line 22979 "Photo.c"
 					gint _tmp11_ = 0;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = i;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					i = _tmp11_ + 1;
-#line 22970 "Photo.c"
+#line 22985 "Photo.c"
 				}
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = FALSE;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = i;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = num_points;
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp12_ < _tmp13_)) {
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 22982 "Photo.c"
+#line 22997 "Photo.c"
 				}
-#line 2991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = i;
-#line 2991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = g_strdup_printf ("center%d", _tmp14_);
-#line 2991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2993 "/home/jens/Source/shotwell/src/Photo.vala"
 				center_key = _tmp15_;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = i;
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = g_strdup_printf ("radius%d", _tmp16_);
-#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
-				radius_key = _tmp17_;
 #line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+				radius_key = _tmp17_;
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = res;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18__length1 = res_length1;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = i;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = map;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = center_key;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = default_point;
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				key_value_map_get_point (_tmp20_, _tmp21_, &_tmp22_, &_tmp23_);
-#line 2994 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_[_tmp19_].center = _tmp23_;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = res;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24__length1 = res_length1;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = i;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = _tmp24_[_tmp25_];
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _tmp26_.center;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = _tmp27_.x;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = default_point;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _tmp29_.x;
-#line 2995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2997 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_assert (_tmp28_ != _tmp30_, "res[i].center.x != default_point.x");
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = res;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31__length1 = res_length1;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = i;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = _tmp31_[_tmp32_];
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = _tmp33_.center;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = _tmp34_.y;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = default_point;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_.y;
-#line 2996 "/home/jens/Source/shotwell/src/Photo.vala"
-				_vala_assert (_tmp35_ != _tmp37_, "res[i].center.y != default_point.y");
 #line 2998 "/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"
 				_tmp38_ = res;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38__length1 = res_length1;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = i;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = map;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = radius_key;
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = key_value_map_get_int (_tmp40_, _tmp41_, -1);
-#line 2998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3000 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_[_tmp39_].radius = _tmp42_;
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = res;
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43__length1 = res_length1;
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = i;
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _tmp43_[_tmp44_];
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = _tmp45_.radius;
-#line 2999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3001 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_assert (_tmp46_ != -1, "res[i].radius != -1");
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (radius_key);
-#line 2990 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 2992 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (center_key);
-#line 23078 "Photo.c"
+#line 23093 "Photo.c"
 			}
 		}
 	}
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = res;
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47__length1 = res_length1;
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (result_length1) {
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result_length1 = _tmp47__length1;
-#line 23090 "Photo.c"
+#line 23105 "Photo.c"
 	}
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp47_;
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 3002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3004 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23098 "Photo.c"
+#line 23113 "Photo.c"
 }
 
 
 gboolean photo_has_redeye_transformations (Photo* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 3005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3007 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_has_transformation (self, "redeye");
-#line 3006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 3006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3008 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23113 "Photo.c"
+#line 23128 "Photo.c"
 }
 
 
@@ -23142,111 +23157,111 @@ void photo_add_redeye_instance (Photo* self, EditingToolsRedeyeInstance* redeye)
 	gint _tmp21_ = 0;
 	KeyValueMap* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
-#line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (redeye != NULL);
-#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_transformation (self, "redeye");
-#line 3011 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = map;
-#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 23156 "Photo.c"
+#line 23171 "Photo.c"
 		KeyValueMap* _tmp2_ = NULL;
 		KeyValueMap* _tmp3_ = NULL;
-#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = key_value_map_new ("redeye");
-#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_key_value_map_unref0 (map);
-#line 3013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3015 "/home/jens/Source/shotwell/src/Photo.vala"
 		map = _tmp2_;
-#line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = map;
-#line 3014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3016 "/home/jens/Source/shotwell/src/Photo.vala"
 		key_value_map_set_int (_tmp3_, "num_points", 0);
-#line 23169 "Photo.c"
+#line 23184 "Photo.c"
 	}
-#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = map;
-#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = key_value_map_get_int (_tmp4_, "num_points", -1);
-#line 3017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3019 "/home/jens/Source/shotwell/src/Photo.vala"
 	num_points = _tmp5_;
-#line 3018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = num_points;
-#line 3018 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp6_ >= 0, "num_points >= 0");
 #line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp6_ >= 0, "num_points >= 0");
+#line 3022 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = num_points;
-#line 3020 "/home/jens/Source/shotwell/src/Photo.vala"
-	num_points = _tmp7_ + 1;
 #line 3022 "/home/jens/Source/shotwell/src/Photo.vala"
+	num_points = _tmp7_ + 1;
+#line 3024 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = num_points;
-#line 3022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3024 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = g_strdup_printf ("radius%d", _tmp8_ - 1);
-#line 3022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3024 "/home/jens/Source/shotwell/src/Photo.vala"
 	radius_key = _tmp9_;
-#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = num_points;
-#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = g_strdup_printf ("center%d", _tmp10_ - 1);
-#line 3023 "/home/jens/Source/shotwell/src/Photo.vala"
-	center_key = _tmp11_;
 #line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+	center_key = _tmp11_;
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = map;
-#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = radius_key;
-#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = *redeye;
-#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_.radius;
-#line 3025 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3027 "/home/jens/Source/shotwell/src/Photo.vala"
 	key_value_map_set_int (_tmp12_, _tmp13_, _tmp15_);
-#line 3026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = map;
-#line 3026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = center_key;
-#line 3026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = *redeye;
-#line 3026 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_.center;
-#line 3026 "/home/jens/Source/shotwell/src/Photo.vala"
-	key_value_map_set_point (_tmp16_, _tmp17_, &_tmp19_);
 #line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
+	key_value_map_set_point (_tmp16_, _tmp17_, &_tmp19_);
+#line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = map;
-#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = num_points;
-#line 3028 "/home/jens/Source/shotwell/src/Photo.vala"
-	key_value_map_set_int (_tmp20_, "num_points", _tmp21_);
 #line 3030 "/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"
 	_tmp22_ = map;
-#line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo_set_transformation (self, _tmp22_);
-#line 3030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3032 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp23_) {
-#line 23229 "Photo.c"
+#line 23244 "Photo.c"
 		Alteration* _tmp24_ = NULL;
 		Alteration* _tmp25_ = NULL;
-#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = alteration_new ("image", "redeye");
-#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp25_);
-#line 3031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3033 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp25_);
-#line 23240 "Photo.c"
+#line 23255 "Photo.c"
 	}
-#line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (center_key);
-#line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (radius_key);
-#line 3010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3012 "/home/jens/Source/shotwell/src/Photo.vala"
 	_key_value_map_unref0 (map);
-#line 23248 "Photo.c"
+#line 23263 "Photo.c"
 }
 
 
@@ -23255,89 +23270,89 @@ static gboolean photo_calculate_pixbuf_dimensions (Photo* self, Scaling* scaling
 	Dimensions _vala_scaled_to_viewport = {0};
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 23261 "Photo.c"
+#line 23276 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 23268 "Photo.c"
+#line 23283 "Photo.c"
 		{
 			Scaling _tmp1_ = {0};
 			PhotoException _tmp2_ = 0;
 			Dimensions _tmp3_ = {0};
 			Dimensions _tmp4_ = {0};
 			gboolean _tmp5_ = FALSE;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = *scaling;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = exceptions;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = photo_locked_calculate_pixbuf_dimensions (self, &_tmp1_, _tmp2_, &_tmp3_, &_tmp4_);
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_image = _tmp3_;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_to_viewport = _tmp4_;
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp5_;
-#line 23287 "Photo.c"
+#line 23302 "Photo.c"
 			{
 				PhotoRow* _tmp6_ = NULL;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->row;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23294 "Photo.c"
+#line 23309 "Photo.c"
 			}
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (scaled_image) {
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 				*scaled_image = _vala_scaled_image;
-#line 23300 "Photo.c"
+#line 23315 "Photo.c"
 			}
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (scaled_to_viewport) {
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 				*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23306 "Photo.c"
+#line 23321 "Photo.c"
 			}
-#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3051 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 23310 "Photo.c"
+#line 23325 "Photo.c"
 		}
-		__finally378:
+		__finally379:
 		{
 			PhotoRow* _tmp7_ = NULL;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->row;
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 23319 "Photo.c"
+#line 23334 "Photo.c"
 		}
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/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 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3049 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 23327 "Photo.c"
+#line 23342 "Photo.c"
 	}
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_image) {
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_image = _vala_scaled_image;
-#line 23333 "Photo.c"
+#line 23348 "Photo.c"
 	}
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_to_viewport) {
-#line 3045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3047 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23339 "Photo.c"
+#line 23354 "Photo.c"
 	}
 }
 
@@ -23361,72 +23376,72 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 	gint _tmp57_ = 0;
 	gboolean _tmp63_ = FALSE;
 	gboolean _tmp64_ = FALSE;
-#line 3055 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3055 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (scaling != NULL, FALSE);
 #line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_val_if_fail (scaling != NULL, FALSE);
+#line 3059 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp0_);
-#line 3057 "/home/jens/Source/shotwell/src/Photo.vala"
-	raw = _tmp0_;
 #line 3059 "/home/jens/Source/shotwell/src/Photo.vala"
+	raw = _tmp0_;
+#line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scaling_is_unscaled (scaling);
-#line 3059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 23375 "Photo.c"
+#line 23390 "Photo.c"
 		Dimensions _tmp2_ = {0};
 		Dimensions _tmp3_ = {0};
-#line 3060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3062 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = raw;
-#line 3060 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3062 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_scaled_image = _tmp2_;
-#line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = raw;
-#line 3061 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_scaled_to_viewport = _tmp3_;
 #line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_scaled_to_viewport = _tmp3_;
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_image) {
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_image = _vala_scaled_image;
-#line 23392 "Photo.c"
+#line 23407 "Photo.c"
 		}
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_to_viewport) {
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23398 "Photo.c"
+#line 23413 "Photo.c"
 		}
-#line 3063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3065 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23402 "Photo.c"
+#line 23417 "Photo.c"
 	}
-#line 3066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_get_orientation (self);
-#line 3066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3068 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation = _tmp4_;
-#line 3071 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3073 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&_vala_scaled_image, 0, 0);
-#line 3072 "/home/jens/Source/shotwell/src/Photo.vala"
-	dimensions_init (&_vala_scaled_to_viewport, 0, 0);
 #line 3074 "/home/jens/Source/shotwell/src/Photo.vala"
+	dimensions_init (&_vala_scaled_to_viewport, 0, 0);
+#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = exceptions;
-#line 3074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_exception_allows (_tmp5_, PHOTO_EXCEPTION_CROP);
-#line 3074 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 23418 "Photo.c"
+#line 23433 "Photo.c"
 		Box crop = {0};
 		Box _tmp7_ = {0};
 		gboolean _tmp8_ = FALSE;
-#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = photo_get_raw_crop (self, &_tmp7_);
-#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 		crop = _tmp7_;
-#line 3076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3078 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp8_) {
-#line 23428 "Photo.c"
+#line 23443 "Photo.c"
 			Dimensions rotated_raw = {0};
 			Dimensions _tmp9_ = {0};
 			PhotoException _tmp10_ = 0;
@@ -23444,17 +23459,17 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 			Dimensions _tmp32_ = {0};
 			PhotoException _tmp33_ = 0;
 			gboolean _tmp34_ = FALSE;
-#line 3079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = raw;
-#line 3079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
 			rotated_raw = _tmp9_;
-#line 3080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = exceptions;
-#line 3080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = photo_exception_allows (_tmp10_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp11_) {
-#line 23456 "Photo.c"
+#line 23471 "Photo.c"
 				Orientation _tmp12_ = 0;
 				Dimensions _tmp13_ = {0};
 				Box _tmp14_ = {0};
@@ -23462,125 +23477,125 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 				Orientation _tmp16_ = 0;
 				Dimensions _tmp17_ = {0};
 				Dimensions _tmp18_ = {0};
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = orientation;
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = raw;
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = crop;
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
 				orientation_rotate_box (_tmp12_, &_tmp13_, &_tmp14_, &_tmp15_);
-#line 3081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3083 "/home/jens/Source/shotwell/src/Photo.vala"
 				crop = _tmp15_;
-#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = orientation;
-#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = raw;
-#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 				orientation_rotate_dimensions (_tmp16_, &_tmp17_, &_tmp18_);
-#line 3082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3084 "/home/jens/Source/shotwell/src/Photo.vala"
 				rotated_raw = _tmp18_;
-#line 23482 "Photo.c"
+#line 23497 "Photo.c"
 			}
-#line 3086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp19_);
-#line 3086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaling_get_scaled_dimensions (scaling, &_tmp19_, &_tmp20_);
-#line 3086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_scaled (&crop, &_tmp20_, &_tmp21_);
-#line 3086 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3088 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaled_crop = _tmp21_;
-#line 3089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3091 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&scaled_crop, &_tmp22_);
-#line 3089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3091 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_to_viewport = _tmp22_;
-#line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = box_get_width (&crop);
-#line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = box_get_width (&scaled_crop);
-#line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp24_ <= _tmp25_) {
-#line 23502 "Photo.c"
+#line 23517 "Photo.c"
 				gint _tmp26_ = 0;
 				gint _tmp27_ = 0;
-#line 3093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = box_get_height (&crop);
-#line 3093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = box_get_height (&scaled_crop);
-#line 3093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = _tmp26_ <= _tmp27_;
-#line 23511 "Photo.c"
+#line 23526 "Photo.c"
 			} else {
-#line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = FALSE;
-#line 23515 "Photo.c"
+#line 23530 "Photo.c"
 			}
-#line 3092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp23_) {
-#line 23519 "Photo.c"
+#line 23534 "Photo.c"
 				Dimensions _tmp28_ = {0};
 				Dimensions _tmp29_ = {0};
-#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3096 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = raw;
-#line 3094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3096 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_scaled_image = _tmp28_;
-#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
 				box_get_dimensions (&crop, &_tmp29_);
-#line 3095 "/home/jens/Source/shotwell/src/Photo.vala"
-				_vala_scaled_to_viewport = _tmp29_;
 #line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+				_vala_scaled_to_viewport = _tmp29_;
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 				result = FALSE;
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (scaled_image) {
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 					*scaled_image = _vala_scaled_image;
-#line 23536 "Photo.c"
+#line 23551 "Photo.c"
 				}
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (scaled_to_viewport) {
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 					*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23542 "Photo.c"
+#line 23557 "Photo.c"
 				}
-#line 3097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3099 "/home/jens/Source/shotwell/src/Photo.vala"
 				return result;
-#line 23546 "Photo.c"
+#line 23561 "Photo.c"
 			}
-#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&crop, &_tmp30_);
-#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
 			box_get_dimensions (&scaled_crop, &_tmp31_);
-#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
 			dimensions_get_scaled_similar (&rotated_raw, &_tmp30_, &_tmp31_, &_tmp32_);
-#line 3102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3104 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_image = _tmp32_;
-#line 3106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3108 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp33_ = exceptions;
-#line 3106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3108 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = photo_exception_allows (_tmp33_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3108 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp34_) {
-#line 23562 "Photo.c"
+#line 23577 "Photo.c"
 				Orientation _tmp35_ = 0;
 				Dimensions _tmp36_ = {0};
 				Dimensions _tmp37_ = {0};
-#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = orientation;
-#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = _vala_scaled_image;
-#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
 				orientation_derotate_dimensions (_tmp35_, &_tmp36_, &_tmp37_);
-#line 3107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_scaled_image = _tmp37_;
-#line 23574 "Photo.c"
+#line 23589 "Photo.c"
 			}
 		}
 	}
-#line 3112 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = dimensions_has_area (&_vala_scaled_image);
-#line 3112 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp38_) {
-#line 23582 "Photo.c"
+#line 23597 "Photo.c"
 		Dimensions rotated_raw = {0};
 		Dimensions _tmp39_ = {0};
 		PhotoException _tmp40_ = 0;
@@ -23590,143 +23605,143 @@ static gboolean photo_locked_calculate_pixbuf_dimensions (Photo* self, Scaling*
 		Dimensions _tmp47_ = {0};
 		PhotoException _tmp48_ = 0;
 		gboolean _tmp49_ = FALSE;
-#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = raw;
-#line 3114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
 		rotated_raw = _tmp39_;
-#line 3115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3117 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = exceptions;
-#line 3115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3117 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3117 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp41_) {
-#line 23602 "Photo.c"
+#line 23617 "Photo.c"
 			Orientation _tmp42_ = 0;
 			Dimensions _tmp43_ = {0};
 			Dimensions _tmp44_ = {0};
-#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = orientation;
-#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = raw;
-#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 			orientation_rotate_dimensions (_tmp42_, &_tmp43_, &_tmp44_);
-#line 3116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
 			rotated_raw = _tmp44_;
-#line 23614 "Photo.c"
+#line 23629 "Photo.c"
 		}
-#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = rotated_raw;
-#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
 		scaling_get_scaled_dimensions (scaling, &_tmp45_, &_tmp46_);
-#line 3118 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3120 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_scaled_image = _tmp46_;
-#line 3119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3121 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = _vala_scaled_image;
-#line 3119 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3121 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_scaled_to_viewport = _tmp47_;
-#line 3122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3124 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = exceptions;
-#line 3122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3124 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = photo_exception_allows (_tmp48_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3124 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp49_) {
-#line 23632 "Photo.c"
+#line 23647 "Photo.c"
 			Orientation _tmp50_ = 0;
 			Dimensions _tmp51_ = {0};
 			Dimensions _tmp52_ = {0};
-#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = orientation;
-#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp51_ = _vala_scaled_image;
-#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
 			orientation_derotate_dimensions (_tmp50_, &_tmp51_, &_tmp52_);
-#line 3123 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3125 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_scaled_image = _tmp52_;
-#line 23644 "Photo.c"
+#line 23659 "Photo.c"
 		}
 	}
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp54_ = _vala_scaled_image;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp55_ = _tmp54_.width;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp56_ = raw;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp57_ = _tmp56_.width;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_ >= _tmp57_) {
-#line 23657 "Photo.c"
+#line 23672 "Photo.c"
 		Dimensions _tmp58_ = {0};
 		gint _tmp59_ = 0;
 		Dimensions _tmp60_ = {0};
 		gint _tmp61_ = 0;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = _vala_scaled_image;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = _tmp58_.height;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = raw;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_.height;
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = _tmp59_ >= _tmp61_;
-#line 23672 "Photo.c"
+#line 23687 "Photo.c"
 	} else {
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = FALSE;
-#line 23676 "Photo.c"
+#line 23691 "Photo.c"
 	}
-#line 3127 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3129 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp53_) {
-#line 23680 "Photo.c"
+#line 23695 "Photo.c"
 		Dimensions _tmp62_ = {0};
-#line 3128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = raw;
-#line 3128 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_scaled_image = _tmp62_;
 #line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_scaled_image = _tmp62_;
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_image) {
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_image = _vala_scaled_image;
-#line 23692 "Photo.c"
+#line 23707 "Photo.c"
 		}
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (scaled_to_viewport) {
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 			*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23698 "Photo.c"
+#line 23713 "Photo.c"
 		}
-#line 3130 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3132 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23702 "Photo.c"
+#line 23717 "Photo.c"
 	}
-#line 3133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp63_ = dimensions_has_area (&_vala_scaled_image);
-#line 3133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp63_, "scaled_image.has_area()");
-#line 3134 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp64_ = dimensions_has_area (&_vala_scaled_to_viewport);
-#line 3134 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp64_, "scaled_to_viewport.has_area()");
 #line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp64_, "scaled_to_viewport.has_area()");
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_image) {
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_image = _vala_scaled_image;
-#line 23718 "Photo.c"
+#line 23733 "Photo.c"
 	}
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (scaled_to_viewport) {
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 		*scaled_to_viewport = _vala_scaled_to_viewport;
-#line 23724 "Photo.c"
+#line 23739 "Photo.c"
 	}
-#line 3136 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3138 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23728 "Photo.c"
+#line 23743 "Photo.c"
 }
 
 
@@ -23754,141 +23769,141 @@ static GdkPixbuf* photo_load_raw_pixbuf (Photo* self, Scaling* scaling, PhotoExc
 	Dimensions _tmp22_ = {0};
 	gboolean _tmp23_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3144 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3147 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = fetch_mode;
-#line 3145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3147 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_backing_reader (self, _tmp0_);
-#line 3145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3147 "/home/jens/Source/shotwell/src/Photo.vala"
 	loader = _tmp1_;
-#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3150 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = scaling_is_unscaled (scaling);
-#line 3148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3150 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 23770 "Photo.c"
+#line 23785 "Photo.c"
 		GdkPixbuf* _tmp3_ = NULL;
 		PhotoFileReader* _tmp4_ = NULL;
 		GdkPixbuf* _tmp5_ = NULL;
 		GdkPixbuf* _tmp6_ = NULL;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = loader;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_file_reader_unscaled_read (_tmp4_, &_inner_error_);
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp5_;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (loader);
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 23789 "Photo.c"
+#line 23804 "Photo.c"
 		}
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp3_;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = NULL;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp6_;
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (loader);
-#line 3153 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3155 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23803 "Photo.c"
+#line 23818 "Photo.c"
 	}
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = *scaling;
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = exceptions;
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = photo_calculate_pixbuf_dimensions (self, &_tmp7_, _tmp8_, &_tmp9_, &_tmp10_);
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	scaled_image = _tmp9_;
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
 	scaled_to_viewport = _tmp10_;
-#line 3158 "/home/jens/Source/shotwell/src/Photo.vala"
-	is_scaled = _tmp11_;
 #line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
+	is_scaled = _tmp11_;
+#line 3162 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = is_scaled;
-#line 3160 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3162 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp12_) {
-#line 23821 "Photo.c"
+#line 23836 "Photo.c"
 		GdkPixbuf* _tmp13_ = NULL;
 		PhotoFileReader* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
 		GdkPixbuf* _tmp16_ = NULL;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = loader;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = photo_file_reader_unscaled_read (_tmp14_, &_inner_error_);
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _tmp15_;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (loader);
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 23840 "Photo.c"
+#line 23855 "Photo.c"
 		}
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp13_;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = NULL;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp16_;
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp13_);
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (loader);
-#line 3165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3167 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 23854 "Photo.c"
+#line 23869 "Photo.c"
 	}
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = loader;
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp18_);
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = scaled_image;
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo_file_reader_scaled_read (_tmp17_, &_tmp18_, &_tmp19_, &_inner_error_);
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp20_;
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (loader);
-#line 3168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3170 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 23874 "Photo.c"
+#line 23889 "Photo.c"
 	}
-#line 3176 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = pixbuf;
-#line 3176 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_for_pixbuf (_tmp21_, &_tmp22_);
-#line 3176 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = dimensions_approx_equals (&scaled_image, &_tmp22_, PHOTO_SCALING_FUDGE);
-#line 3176 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp23_, "scaled_image.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)");
 #line 3178 "/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"
 	result = pixbuf;
-#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3180 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (loader);
-#line 3178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3180 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23890 "Photo.c"
+#line 23905 "Photo.c"
 }
 
 
@@ -23900,37 +23915,37 @@ GdkPixbuf* photo_get_master_pixbuf (Photo* self, Scaling* scaling, gboolean rota
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3185 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3183 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3185 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *scaling;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = rotate;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_MASTER, &_inner_error_);
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 23920 "Photo.c"
+#line 23935 "Photo.c"
 	}
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3186 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23932 "Photo.c"
+#line 23947 "Photo.c"
 }
 
 
@@ -23942,37 +23957,37 @@ GdkPixbuf* photo_get_unmodified_pixbuf (Photo* self, Scaling* scaling, gboolean
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3190 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3190 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *scaling;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = rotate;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_untransformed_pixbuf (self, &_tmp1_, _tmp2_, BACKING_FETCH_MODE_UNMODIFIED, &_inner_error_);
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp3_;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 23962 "Photo.c"
+#line 23977 "Photo.c"
 	}
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp0_;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3189 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3191 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 23974 "Photo.c"
+#line 23989 "Photo.c"
 }
 
 
@@ -23987,93 +24002,93 @@ static GdkPixbuf* photo_get_untransformed_pixbuf (Photo* self, Scaling* scaling,
 	GdkPixbuf* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3195 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3195 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 23993 "Photo.c"
+#line 24008 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 24000 "Photo.c"
+#line 24015 "Photo.c"
 		{
 			Scaling _tmp1_ = {0};
 			Dimensions _tmp2_ = {0};
 			Dimensions _tmp3_ = {0};
 			Orientation _tmp4_ = 0;
-#line 3208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = *scaling;
-#line 3208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_calculate_pixbuf_dimensions (self, &_tmp1_, PHOTO_EXCEPTION_NONE, &_tmp2_, &_tmp3_);
-#line 3208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaled_image = _tmp2_;
-#line 3208 "/home/jens/Source/shotwell/src/Photo.vala"
-			scaled_to_viewport = _tmp3_;
 #line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
+			scaled_to_viewport = _tmp3_;
+#line 3212 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_get_original_orientation (self);
-#line 3210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3212 "/home/jens/Source/shotwell/src/Photo.vala"
 			original_orientation = _tmp4_;
-#line 24018 "Photo.c"
+#line 24033 "Photo.c"
 		}
-		__finally379:
+		__finally380:
 		{
 			PhotoRow* _tmp5_ = NULL;
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = self->row;
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 24027 "Photo.c"
+#line 24042 "Photo.c"
 		}
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3209 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 24035 "Photo.c"
+#line 24050 "Photo.c"
 		}
 	}
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = *scaling;
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = fetch_mode;
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo_load_raw_pixbuf (self, &_tmp6_, PHOTO_EXCEPTION_NONE, _tmp7_, &_inner_error_);
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp8_;
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3216 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24052 "Photo.c"
+#line 24067 "Photo.c"
 	}
-#line 3220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = rotate;
-#line 3220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3222 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_) {
-#line 24058 "Photo.c"
+#line 24073 "Photo.c"
 		GdkPixbuf* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
-#line 3221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = pixbuf;
-#line 3221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = orientation_rotate_pixbuf (original_orientation, _tmp10_);
-#line 3221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3221 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3223 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp11_;
-#line 24069 "Photo.c"
+#line 24084 "Photo.c"
 	}
-#line 3230 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3232 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
-#line 3230 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3232 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24075 "Photo.c"
+#line 24090 "Photo.c"
 }
 
 
@@ -24085,35 +24100,35 @@ static GdkPixbuf* photo_real_get_pixbuf (PhotoSource* base, Scaling* scaling, GE
 	GdkPixbuf* _tmp2_ = NULL;
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO, Photo);
-#line 3233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3235 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = *scaling;
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/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 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp2_;
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24103 "Photo.c"
+#line 24118 "Photo.c"
 	}
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3236 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24115 "Photo.c"
+#line 24130 "Photo.c"
 }
 
 
@@ -24133,34 +24148,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 3269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? photo_cached_pixbuf_ref (self) : NULL;
-#line 24137 "Photo.c"
+#line 24152 "Photo.c"
 }
 
 
 static gboolean _photo_trim_source_pixbuf_cache_gsource_func (gpointer self) {
 	gboolean result;
 	result = photo_trim_source_pixbuf_cache ();
-#line 3321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24146 "Photo.c"
+#line 24161 "Photo.c"
 }
 
 
 static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, GError** error) {
 	GdkPixbuf* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 3252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3254 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((locate == NULL) || IS_PHOTO (locate), NULL);
-#line 24155 "Photo.c"
+#line 24170 "Photo.c"
 	{
 		GeeLinkedList* _tmp0_ = NULL;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_source_pixbuf_cache;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&__lock_photo_source_pixbuf_cache);
-#line 24162 "Photo.c"
+#line 24177 "Photo.c"
 		{
 			PhotoCachedPixbuf* found = NULL;
 			gdouble min_elapsed = 0.0;
@@ -24180,21 +24195,21 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 			GdkPixbuf* _tmp69_ = NULL;
 			PhotoCachedPixbuf* _tmp70_ = NULL;
 			GdkPixbuf* _tmp73_ = NULL;
-#line 3254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3256 "/home/jens/Source/shotwell/src/Photo.vala"
 			found = NULL;
-#line 3258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3260 "/home/jens/Source/shotwell/src/Photo.vala"
 			min_elapsed = DBL_MAX;
-#line 3259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
 			count = 0;
-#line 3260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_source_pixbuf_cache;
-#line 3260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
-#line 3260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
 			iter = _tmp2_;
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 24196 "Photo.c"
+#line 24211 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				PhotoCachedPixbuf* cached_pixbuf = NULL;
@@ -24207,236 +24222,236 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				gdouble _tmp10_ = 0.0;
 				gboolean _tmp11_ = FALSE;
 				Photo* _tmp12_ = NULL;
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = iter;
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 24217 "Photo.c"
+#line 24232 "Photo.c"
 				}
-#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = iter;
-#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 3262 "/home/jens/Source/shotwell/src/Photo.vala"
-				cached_pixbuf = (PhotoCachedPixbuf*) _tmp6_;
 #line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
+				cached_pixbuf = (PhotoCachedPixbuf*) _tmp6_;
+#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = cached_pixbuf;
-#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _tmp7_->last_touched;
-#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = g_timer_elapsed (_tmp8_, NULL);
-#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = trunc (_tmp9_);
-#line 3264 "/home/jens/Source/shotwell/src/Photo.vala"
-				elapsed = _tmp10_ + 1;
 #line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+				elapsed = _tmp10_ + 1;
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = locate;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_ != NULL) {
-#line 24239 "Photo.c"
+#line 24254 "Photo.c"
 					PhotoCachedPixbuf* _tmp13_ = NULL;
 					Photo* _tmp14_ = NULL;
 					Photo* _tmp15_ = NULL;
 					gboolean _tmp16_ = FALSE;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = cached_pixbuf;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = _tmp13_->photo;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = locate;
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/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 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp16_;
-#line 24254 "Photo.c"
+#line 24269 "Photo.c"
 				} else {
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 24258 "Photo.c"
+#line 24273 "Photo.c"
 				}
-#line 3266 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 24262 "Photo.c"
+#line 24277 "Photo.c"
 					GeeIterator* _tmp17_ = NULL;
 					PhotoCachedPixbuf* _tmp18_ = NULL;
 					PhotoCachedPixbuf* _tmp19_ = NULL;
 					gint _tmp20_ = 0;
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3270 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = iter;
-#line 3268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3270 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_iterator_remove (_tmp17_);
-#line 3269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = cached_pixbuf;
-#line 3269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = _photo_cached_pixbuf_ref0 (_tmp18_);
-#line 3269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (found);
-#line 3269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3271 "/home/jens/Source/shotwell/src/Photo.vala"
 					found = _tmp19_;
-#line 3272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = count;
-#line 3272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
 					count = _tmp20_ + 1;
-#line 24283 "Photo.c"
+#line 24298 "Photo.c"
 				} else {
 					gdouble _tmp21_ = 0.0;
-#line 3273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = elapsed;
-#line 3273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp21_ >= ((gdouble) PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC)) {
-#line 24290 "Photo.c"
+#line 24305 "Photo.c"
 						GeeIterator* _tmp22_ = NULL;
-#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp22_ = iter;
-#line 3274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_iterator_remove (_tmp22_);
-#line 24296 "Photo.c"
+#line 24311 "Photo.c"
 					} else {
 						gint _tmp23_ = 0;
-#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3277 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp23_ = count;
-#line 3275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3277 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp23_ >= PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT) {
-#line 24303 "Photo.c"
+#line 24318 "Photo.c"
 							GeeIterator* _tmp24_ = NULL;
-#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3278 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = iter;
-#line 3276 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3278 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_iterator_remove (_tmp24_);
-#line 24309 "Photo.c"
+#line 24324 "Photo.c"
 						} else {
 							gdouble _tmp25_ = 0.0;
 							gdouble _tmp26_ = 0.0;
 							gdouble _tmp27_ = 0.0;
 							gint _tmp28_ = 0;
-#line 3280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = elapsed;
-#line 3280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = min_elapsed;
-#line 3280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = MIN (_tmp25_, _tmp26_);
-#line 3280 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3282 "/home/jens/Source/shotwell/src/Photo.vala"
 							min_elapsed = _tmp27_;
-#line 3281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3283 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp28_ = count;
-#line 3281 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3283 "/home/jens/Source/shotwell/src/Photo.vala"
 							count = _tmp28_ + 1;
-#line 24327 "Photo.c"
+#line 24342 "Photo.c"
 						}
 					}
 				}
-#line 3261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3263 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_cached_pixbuf_unref0 (cached_pixbuf);
-#line 24333 "Photo.c"
+#line 24348 "Photo.c"
 			}
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = found;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp31_ == NULL) {
-#line 24339 "Photo.c"
+#line 24354 "Photo.c"
 				Photo* _tmp32_ = NULL;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = locate;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _tmp32_ != NULL;
-#line 24345 "Photo.c"
+#line 24360 "Photo.c"
 			} else {
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = FALSE;
-#line 24349 "Photo.c"
+#line 24364 "Photo.c"
 			}
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp30_) {
-#line 24353 "Photo.c"
+#line 24368 "Photo.c"
 				gboolean _tmp33_ = FALSE;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = keep;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = _tmp33_;
-#line 24359 "Photo.c"
+#line 24374 "Photo.c"
 			} else {
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = FALSE;
-#line 24363 "Photo.c"
+#line 24378 "Photo.c"
 			}
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp29_) {
-#line 24367 "Photo.c"
+#line 24382 "Photo.c"
 				GdkPixbuf* _tmp34_ = NULL;
 				Photo* _tmp35_ = NULL;
 				Scaling _tmp36_ = {0};
 				GdkPixbuf* _tmp37_ = NULL;
 				Photo* _tmp38_ = NULL;
 				PhotoCachedPixbuf* _tmp39_ = NULL;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = locate;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 				scaling_for_original (&_tmp36_);
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = photo_load_raw_pixbuf (_tmp35_, &_tmp36_, PHOTO_EXCEPTION_ALL, BACKING_FETCH_MODE_SOURCE, &_inner_error_);
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = _tmp37_;
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (iter);
-#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3290 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (found);
-#line 24388 "Photo.c"
-					goto __finally380;
+#line 24403 "Photo.c"
+					goto __finally381;
 				}
-#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = locate;
-#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = photo_cached_pixbuf_new (_tmp38_, _tmp34_);
-#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_cached_pixbuf_unref0 (found);
-#line 3287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
 				found = _tmp39_;
-#line 3286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp34_);
-#line 24401 "Photo.c"
+#line 24416 "Photo.c"
 			} else {
 				PhotoCachedPixbuf* _tmp40_ = NULL;
-#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = found;
-#line 3289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp40_ != NULL) {
-#line 24408 "Photo.c"
+#line 24423 "Photo.c"
 					PhotoCachedPixbuf* _tmp41_ = NULL;
 					GTimer* _tmp42_ = NULL;
-#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp41_ = found;
-#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp42_ = _tmp41_->last_touched;
-#line 3291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3293 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_timer_start (_tmp42_);
-#line 24417 "Photo.c"
+#line 24432 "Photo.c"
 				}
 			}
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = found;
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp44_ != NULL) {
-#line 24424 "Photo.c"
+#line 24439 "Photo.c"
 				gboolean _tmp45_ = FALSE;
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = keep;
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = _tmp45_;
-#line 24430 "Photo.c"
+#line 24445 "Photo.c"
 			} else {
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = FALSE;
-#line 24434 "Photo.c"
+#line 24449 "Photo.c"
 			}
-#line 3295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3297 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp43_) {
-#line 24438 "Photo.c"
+#line 24453 "Photo.c"
 				GeeLinkedList* _tmp46_ = NULL;
 				PhotoCachedPixbuf* _tmp47_ = NULL;
 				PhotoCachedPixbuf* _tmp48_ = NULL;
@@ -24444,157 +24459,157 @@ static GdkPixbuf* photo_run_source_pixbuf_cache (Photo* locate, gboolean keep, G
 				gdouble _tmp50_ = 0.0;
 				gdouble _tmp51_ = 0.0;
 				gdouble _tmp52_ = 0.0;
-#line 3296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = photo_source_pixbuf_cache;
-#line 3296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3298 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = found;
-#line 3296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3298 "/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 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = found;
-#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = _tmp48_->last_touched;
-#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp50_ = g_timer_elapsed (_tmp49_, NULL);
-#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp51_ = min_elapsed;
-#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp52_ = MIN (_tmp50_, _tmp51_);
-#line 3301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3303 "/home/jens/Source/shotwell/src/Photo.vala"
 				min_elapsed = _tmp52_;
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 				while (TRUE) {
-#line 24466 "Photo.c"
+#line 24481 "Photo.c"
 					GeeLinkedList* _tmp53_ = NULL;
 					gint _tmp54_ = 0;
 					gint _tmp55_ = 0;
 					GeeLinkedList* _tmp56_ = NULL;
 					gpointer _tmp57_ = NULL;
 					PhotoCachedPixbuf* _tmp58_ = NULL;
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = photo_source_pixbuf_cache;
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = _tmp54_;
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (!(_tmp55_ > PHOTO_SOURCE_PIXBUF_MAX_LRU_COUNT)) {
-#line 3305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3307 "/home/jens/Source/shotwell/src/Photo.vala"
 						break;
-#line 24483 "Photo.c"
+#line 24498 "Photo.c"
 					}
-#line 3306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp56_ = photo_source_pixbuf_cache;
-#line 3306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp57_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GEE_TYPE_DEQUE, GeeDeque));
-#line 3306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp58_ = (PhotoCachedPixbuf*) _tmp57_;
-#line 3306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3308 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_cached_pixbuf_unref0 (_tmp58_);
-#line 24493 "Photo.c"
+#line 24508 "Photo.c"
 				}
 			}
-#line 3310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = photo_discard_source_id;
-#line 3310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp59_ != ((guint) 0)) {
-#line 24500 "Photo.c"
+#line 24515 "Photo.c"
 				guint _tmp60_ = 0U;
-#line 3311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3313 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = photo_discard_source_id;
-#line 3311 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3313 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_source_remove (_tmp60_);
-#line 3312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3314 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_discard_source_id = (guint) 0;
-#line 24508 "Photo.c"
+#line 24523 "Photo.c"
 			}
-#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = photo_source_pixbuf_cache;
-#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp63_ = _tmp62_;
-#line 3316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3318 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp63_ > PHOTO_SOURCE_PIXBUF_MIN_LRU_COUNT) {
-#line 24518 "Photo.c"
+#line 24533 "Photo.c"
 				gdouble _tmp64_ = 0.0;
 				guint retry_sec = 0U;
 				gdouble _tmp65_ = 0.0;
 				gdouble _tmp66_ = 0.0;
 				guint _tmp67_ = 0U;
 				guint _tmp68_ = 0U;
-#line 3317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3319 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = min_elapsed;
-#line 3317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3319 "/home/jens/Source/shotwell/src/Photo.vala"
 				_vala_assert (_tmp64_ >= 0.0, "min_elapsed >= 0.0");
-#line 3320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = min_elapsed;
-#line 3320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_ = trunc (_tmp65_);
-#line 3320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3322 "/home/jens/Source/shotwell/src/Photo.vala"
 				retry_sec = PHOTO_SOURCE_PIXBUF_TIME_TO_LIVE_SEC - ((guint) _tmp66_);
-#line 3321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp67_ = retry_sec;
-#line 3321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3323 "/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 3321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3323 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_discard_source_id = _tmp68_;
-#line 24541 "Photo.c"
+#line 24556 "Photo.c"
 			}
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = found;
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp70_ != NULL) {
-#line 24547 "Photo.c"
+#line 24562 "Photo.c"
 				PhotoCachedPixbuf* _tmp71_ = NULL;
 				GdkPixbuf* _tmp72_ = NULL;
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp71_ = found;
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp72_ = _tmp71_->pixbuf;
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = _tmp72_;
-#line 24556 "Photo.c"
+#line 24571 "Photo.c"
 			} else {
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = NULL;
-#line 24560 "Photo.c"
+#line 24575 "Photo.c"
 			}
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = _g_object_ref0 (_tmp69_);
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp73_;
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (iter);
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_cached_pixbuf_unref0 (found);
-#line 24570 "Photo.c"
+#line 24585 "Photo.c"
 			{
 				GeeLinkedList* _tmp74_ = NULL;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = photo_source_pixbuf_cache;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24577 "Photo.c"
+#line 24592 "Photo.c"
 			}
-#line 3324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3326 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 24581 "Photo.c"
+#line 24596 "Photo.c"
 		}
-		__finally380:
+		__finally381:
 		{
 			GeeLinkedList* _tmp75_ = NULL;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = photo_source_pixbuf_cache;
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&__lock_photo_source_pixbuf_cache);
-#line 24590 "Photo.c"
+#line 24605 "Photo.c"
 		}
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3255 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24596 "Photo.c"
+#line 24611 "Photo.c"
 	}
 }
 
@@ -24605,46 +24620,46 @@ static gboolean photo_trim_source_pixbuf_cache (void) {
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		GdkPixbuf* _tmp1_ = NULL;
-#line 3330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_run_source_pixbuf_cache (NULL, FALSE, &_inner_error_);
-#line 3330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 3330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3332 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24615 "Photo.c"
-			goto __catch381_g_error;
+#line 24630 "Photo.c"
+			goto __catch382_g_error;
 		}
 	}
-	goto __finally381;
-	__catch381_g_error:
+	goto __finally382;
+	__catch382_g_error:
 	{
 		GError* err = NULL;
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 24629 "Photo.c"
+#line 24644 "Photo.c"
 	}
-	__finally381:
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally382:
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/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 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 3329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3331 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 24640 "Photo.c"
+#line 24655 "Photo.c"
 	}
-#line 3334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3336 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 3334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3336 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24646 "Photo.c"
+#line 24661 "Photo.c"
 }
 
 
@@ -24662,39 +24677,39 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
 	GdkPixbuf* _tmp4_ = NULL;
 	GdkPixbuf* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3344 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_run_source_pixbuf_cache (self, TRUE, &_inner_error_);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp1_;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 24676 "Photo.c"
+#line 24691 "Photo.c"
 	}
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp0_;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = gdk_pixbuf_copy (_tmp3_);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp5_;
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 3343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3345 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 24696 "Photo.c"
+#line 24711 "Photo.c"
 }
 
 
@@ -24703,46 +24718,46 @@ GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error) {
      */
 void photo_discard_prefetched (Photo* self) {
 	GError * _inner_error_ = NULL;
-#line 3349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 24707 "Photo.c"
+#line 24722 "Photo.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		GdkPixbuf* _tmp1_ = NULL;
-#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_run_source_pixbuf_cache (self, FALSE, &_inner_error_);
-#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp1_);
-#line 3351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3353 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 24719 "Photo.c"
-			goto __catch382_g_error;
+#line 24734 "Photo.c"
+			goto __catch383_g_error;
 		}
 	}
-	goto __finally382;
-	__catch382_g_error:
+	goto __finally383;
+	__catch383_g_error:
 	{
 		GError* err = NULL;
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 24733 "Photo.c"
+#line 24748 "Photo.c"
 	}
-	__finally382:
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally383:
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/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 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 3350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3352 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 24744 "Photo.c"
+#line 24759 "Photo.c"
 	}
 }
 
@@ -24794,117 +24809,117 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 	gboolean _tmp101_ = FALSE;
 	gboolean _tmp102_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3369 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_develop_raw_photos_to_files ();
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 24806 "Photo.c"
+#line 24821 "Photo.c"
 		PhotoFileFormat _tmp5_ = 0;
-#line 3381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_get_master_file_format (self);
-#line 3381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp5_ == PHOTO_FILE_FORMAT_RAW;
-#line 24812 "Photo.c"
+#line 24827 "Photo.c"
 	} else {
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = FALSE;
-#line 24816 "Photo.c"
+#line 24831 "Photo.c"
 	}
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 24820 "Photo.c"
+#line 24835 "Photo.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		BackingFetchMode _tmp8_ = 0;
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = fetch_mode;
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp8_ == BACKING_FETCH_MODE_BASELINE) {
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = TRUE;
-#line 24830 "Photo.c"
+#line 24845 "Photo.c"
 		} else {
 			BackingFetchMode _tmp9_ = 0;
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = fetch_mode;
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp9_ == BACKING_FETCH_MODE_UNMODIFIED;
-#line 24837 "Photo.c"
+#line 24852 "Photo.c"
 		}
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp7_) {
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = TRUE;
-#line 24843 "Photo.c"
+#line 24858 "Photo.c"
 		} else {
 			BackingFetchMode _tmp10_ = 0;
-#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = fetch_mode;
-#line 3383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tmp10_ == BACKING_FETCH_MODE_SOURCE;
-#line 24850 "Photo.c"
+#line 24865 "Photo.c"
 		}
-#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp6_;
-#line 24854 "Photo.c"
+#line 24869 "Photo.c"
 	} else {
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 24858 "Photo.c"
+#line 24873 "Photo.c"
 	}
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 24862 "Photo.c"
+#line 24877 "Photo.c"
 		RawDeveloper _tmp11_ = 0;
 		gboolean _tmp12_ = FALSE;
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = photo_get_raw_developer (self);
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = photo_is_raw_developer_complete (self, _tmp11_);
-#line 3384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3386 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp12_;
-#line 24871 "Photo.c"
+#line 24886 "Photo.c"
 	} else {
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 24875 "Photo.c"
+#line 24890 "Photo.c"
 	}
-#line 3380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3382 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 24879 "Photo.c"
+#line 24894 "Photo.c"
 		RawDeveloper _tmp13_ = 0;
-#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3387 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_get_raw_developer (self);
-#line 3385 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3387 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_raw_developer (self, _tmp13_);
-#line 24885 "Photo.c"
+#line 24900 "Photo.c"
 	}
-#line 3390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&original, 0, 0);
-#line 3391 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3393 "/home/jens/Source/shotwell/src/Photo.vala"
 	dimensions_init (&scaled, 0, 0);
-#line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3394 "/home/jens/Source/shotwell/src/Photo.vala"
 	redeye_instances = NULL;
-#line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3394 "/home/jens/Source/shotwell/src/Photo.vala"
 	redeye_instances_length1 = 0;
-#line 3392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3394 "/home/jens/Source/shotwell/src/Photo.vala"
 	_redeye_instances_size_ = redeye_instances_length1;
-#line 3395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3397 "/home/jens/Source/shotwell/src/Photo.vala"
 	transformer = NULL;
-#line 24899 "Photo.c"
+#line 24914 "Photo.c"
 	{
 		PhotoRow* _tmp14_ = NULL;
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = self->row;
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 24906 "Photo.c"
+#line 24921 "Photo.c"
 		{
 			Dimensions _tmp15_ = {0};
 			PhotoException _tmp16_ = 0;
@@ -24922,201 +24937,201 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			gboolean _tmp28_ = FALSE;
 			gboolean _tmp29_ = FALSE;
 			Orientation _tmp31_ = 0;
-#line 3399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/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 3399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
 			original = _tmp15_;
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = exceptions;
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp16_, &_tmp17_);
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaling_get_scaled_dimensions (scaling, &_tmp17_, &_tmp18_);
-#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3402 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaled = _tmp18_;
-#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = scaled;
-#line 3401 "/home/jens/Source/shotwell/src/Photo.vala"
-			scaled_to_viewport = _tmp19_;
 #line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
+			scaled_to_viewport = _tmp19_;
+#line 3405 "/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 3403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = scaled;
-#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = dimensions_equals (&_tmp20_, &_tmp21_);
-#line 3403 "/home/jens/Source/shotwell/src/Photo.vala"
-			is_scaled = !_tmp22_;
 #line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+			is_scaled = !_tmp22_;
+#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = photo_get_raw_redeye_instances (self, &_tmp23_);
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances = (g_free (redeye_instances), NULL);
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances = _tmp24_;
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances_length1 = _tmp23_;
-#line 3405 "/home/jens/Source/shotwell/src/Photo.vala"
-			_redeye_instances_size_ = redeye_instances_length1;
 #line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
+			_redeye_instances_size_ = redeye_instances_length1;
+#line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = photo_get_raw_crop (self, &_tmp25_);
-#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
 			crop = _tmp25_;
-#line 3407 "/home/jens/Source/shotwell/src/Photo.vala"
-			is_cropped = _tmp26_;
 #line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
+			is_cropped = _tmp26_;
+#line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = photo_get_raw_straighten (self, &_tmp27_);
-#line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
 			straightening_angle = _tmp27_;
-#line 3409 "/home/jens/Source/shotwell/src/Photo.vala"
-			is_straightened = _tmp28_;
 #line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
+			is_straightened = _tmp28_;
+#line 3413 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = photo_has_color_adjustments (self);
-#line 3411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3413 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp29_) {
-#line 24974 "Photo.c"
+#line 24989 "Photo.c"
 				PixelTransformer* _tmp30_ = NULL;
-#line 3412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = photo_get_pixel_transformer (self);
-#line 3412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 				_pixel_transformer_unref0 (transformer);
-#line 3412 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
 				transformer = _tmp30_;
-#line 24982 "Photo.c"
+#line 24997 "Photo.c"
 			}
-#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3416 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = photo_get_orientation (self);
-#line 3414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3416 "/home/jens/Source/shotwell/src/Photo.vala"
 			orientation = _tmp31_;
-#line 24988 "Photo.c"
+#line 25003 "Photo.c"
 		}
-		__finally383:
+		__finally384:
 		{
 			PhotoRow* _tmp32_ = NULL;
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp32_ = self->row;
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 24997 "Photo.c"
+#line 25012 "Photo.c"
 		}
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformer_unref0 (transformer);
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			redeye_instances = (g_free (redeye_instances), NULL);
-#line 3398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3400 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 25009 "Photo.c"
+#line 25024 "Photo.c"
 		}
 	}
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = photo_get_prefetched_copy (self, &_inner_error_);
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp33_;
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformer_unref0 (transformer);
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 		redeye_instances = (g_free (redeye_instances), NULL);
-#line 3421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3423 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 25026 "Photo.c"
+#line 25041 "Photo.c"
 	}
-#line 3428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = exceptions;
-#line 3428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_exception_allows (_tmp34_, PHOTO_EXCEPTION_REDEYE);
-#line 3428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3430 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 25034 "Photo.c"
+#line 25049 "Photo.c"
 		EditingToolsRedeyeInstance* _tmp36_ = NULL;
 		gint _tmp36__length1 = 0;
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = redeye_instances;
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36__length1 = redeye_instances_length1;
-#line 25041 "Photo.c"
+#line 25056 "Photo.c"
 		{
 			EditingToolsRedeyeInstance* instance_collection = NULL;
 			gint instance_collection_length1 = 0;
 			gint _instance_collection_size_ = 0;
 			gint instance_it = 0;
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 			instance_collection = _tmp36_;
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 			instance_collection_length1 = _tmp36__length1;
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 			for (instance_it = 0; instance_it < _tmp36__length1; instance_it = instance_it + 1) {
-#line 25053 "Photo.c"
+#line 25068 "Photo.c"
 				EditingToolsRedeyeInstance instance = {0};
-#line 3433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3435 "/home/jens/Source/shotwell/src/Photo.vala"
 				instance = instance_collection[instance_it];
-#line 25057 "Photo.c"
+#line 25072 "Photo.c"
 				{
 					GdkPixbuf* _tmp37_ = NULL;
 					EditingToolsRedeyeInstance _tmp38_ = {0};
 					GdkPixbuf* _tmp39_ = NULL;
-#line 3434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp37_ = pixbuf;
-#line 3434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp38_ = instance;
-#line 3434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp39_ = photo_do_redeye (self, _tmp37_, &_tmp38_);
-#line 3434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (pixbuf);
-#line 3434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3436 "/home/jens/Source/shotwell/src/Photo.vala"
 					pixbuf = _tmp39_;
-#line 25072 "Photo.c"
+#line 25087 "Photo.c"
 				}
 			}
 		}
 	}
-#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3444 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = exceptions;
-#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3444 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = photo_exception_allows (_tmp40_, PHOTO_EXCEPTION_STRAIGHTEN);
-#line 3442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3444 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp41_) {
-#line 25083 "Photo.c"
+#line 25098 "Photo.c"
 		gboolean _tmp42_ = FALSE;
-#line 3446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = is_straightened;
-#line 3446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3448 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp42_) {
-#line 25089 "Photo.c"
+#line 25104 "Photo.c"
 			GdkPixbuf* _tmp43_ = NULL;
 			gdouble _tmp44_ = 0.0;
 			GdkPixbuf* _tmp45_ = NULL;
-#line 3447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = pixbuf;
-#line 3447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = straightening_angle;
-#line 3447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp45_ = rotate_arb (_tmp43_, _tmp44_);
-#line 3447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3447 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3449 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixbuf = _tmp45_;
-#line 25103 "Photo.c"
+#line 25118 "Photo.c"
 		}
 	}
-#line 3456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = exceptions;
-#line 3456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = photo_exception_allows (_tmp46_, PHOTO_EXCEPTION_CROP);
-#line 3456 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3458 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp47_) {
-#line 25112 "Photo.c"
+#line 25127 "Photo.c"
 		gboolean _tmp48_ = FALSE;
-#line 3460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = is_cropped;
-#line 3460 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3462 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp48_) {
-#line 25118 "Photo.c"
+#line 25133 "Photo.c"
 			Box _tmp49_ = {0};
 			gint _tmp50_ = 0;
 			GdkPixbuf* _tmp51_ = NULL;
@@ -25153,255 +25168,255 @@ GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoEx
 			gint _tmp82_ = 0;
 			gint _tmp83_ = 0;
 			GdkPixbuf* _tmp84_ = NULL;
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp49_ = crop;
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp50_ = _tmp49_.left;
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp51_ = pixbuf;
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp52_ = gdk_pixbuf_get_width (_tmp51_);
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = _tmp52_;
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = CLAMP (_tmp50_, 0, _tmp53_ - 2);
-#line 3465 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3467 "/home/jens/Source/shotwell/src/Photo.vala"
 			crop.left = _tmp54_;
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = crop;
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = _tmp55_.top;
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp57_ = pixbuf;
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp58_ = gdk_pixbuf_get_height (_tmp57_);
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp59_ = _tmp58_;
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp60_ = CLAMP (_tmp56_, 0, _tmp59_ - 2);
-#line 3466 "/home/jens/Source/shotwell/src/Photo.vala"
-			crop.top = _tmp60_;
 #line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+			crop.top = _tmp60_;
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp61_ = crop;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp62_ = _tmp61_.right;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp63_ = crop;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp64_ = _tmp63_.left;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65_ = pixbuf;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = gdk_pixbuf_get_width (_tmp65_);
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = _tmp66_;
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = CLAMP (_tmp62_, _tmp64_ + 1, _tmp67_ - 1);
-#line 3468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3470 "/home/jens/Source/shotwell/src/Photo.vala"
 			crop.right = _tmp68_;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp69_ = crop;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = _tmp69_.bottom;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp71_ = crop;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = _tmp71_.top;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = pixbuf;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp74_ = gdk_pixbuf_get_height (_tmp73_);
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = _tmp74_;
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = CLAMP (_tmp70_, _tmp72_ + 1, _tmp75_ - 1);
-#line 3469 "/home/jens/Source/shotwell/src/Photo.vala"
-			crop.bottom = _tmp76_;
 #line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+			crop.bottom = _tmp76_;
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = pixbuf;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp78_ = crop;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp79_ = _tmp78_.left;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp80_ = crop;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp81_ = _tmp80_.top;
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp82_ = box_get_width (&crop);
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp83_ = box_get_height (&crop);
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp84_ = gdk_pixbuf_new_subpixbuf (_tmp77_, _tmp79_, _tmp81_, _tmp82_, _tmp83_);
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3471 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3473 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixbuf = _tmp84_;
-#line 25239 "Photo.c"
+#line 25254 "Photo.c"
 		}
 	}
-#line 3481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp85_ = exceptions;
-#line 3481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_ = photo_exception_allows (_tmp85_, PHOTO_EXCEPTION_ORIENTATION);
-#line 3481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3483 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp86_) {
-#line 25248 "Photo.c"
+#line 25263 "Photo.c"
 		GdkPixbuf* _tmp87_ = NULL;
 		GdkPixbuf* _tmp88_ = NULL;
-#line 3485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = pixbuf;
-#line 3485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp88_ = orientation_rotate_pixbuf (orientation, _tmp87_);
-#line 3485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3485 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3487 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp88_;
-#line 25259 "Photo.c"
+#line 25274 "Photo.c"
 	}
-#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3494 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = is_scaled;
-#line 3492 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3494 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp89_) {
-#line 25265 "Photo.c"
+#line 25280 "Photo.c"
 		GdkPixbuf* _tmp90_ = NULL;
 		Dimensions _tmp91_ = {0};
 		gint _tmp92_ = 0;
 		Dimensions _tmp93_ = {0};
 		gint _tmp94_ = 0;
 		GdkPixbuf* _tmp95_ = NULL;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = pixbuf;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = scaled_to_viewport;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp92_ = _tmp91_.width;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp93_ = scaled_to_viewport;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp94_ = _tmp93_.height;
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp95_ = gdk_pixbuf_scale_simple (_tmp90_, _tmp92_, _tmp94_, GDK_INTERP_BILINEAR);
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3496 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3498 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp95_;
-#line 25288 "Photo.c"
+#line 25303 "Photo.c"
 	}
-#line 3504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = exceptions;
-#line 3504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = photo_exception_allows (_tmp96_, PHOTO_EXCEPTION_ADJUST);
-#line 3504 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3506 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp97_) {
-#line 25296 "Photo.c"
+#line 25311 "Photo.c"
 		PixelTransformer* _tmp98_ = NULL;
-#line 3508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp98_ = transformer;
-#line 3508 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3510 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp98_ != NULL) {
-#line 25302 "Photo.c"
+#line 25317 "Photo.c"
 			PixelTransformer* _tmp99_ = NULL;
 			GdkPixbuf* _tmp100_ = NULL;
-#line 3509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp99_ = transformer;
-#line 3509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp100_ = pixbuf;
-#line 3509 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3511 "/home/jens/Source/shotwell/src/Photo.vala"
 			pixel_transformer_transform_pixbuf (_tmp99_, _tmp100_, NULL);
-#line 25311 "Photo.c"
+#line 25326 "Photo.c"
 		}
 	}
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp102_ = is_scaled;
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp102_) {
-#line 25318 "Photo.c"
+#line 25333 "Photo.c"
 		gboolean _tmp103_ = FALSE;
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = is_straightened;
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = !_tmp103_;
-#line 25324 "Photo.c"
+#line 25339 "Photo.c"
 	} else {
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp101_ = FALSE;
-#line 25328 "Photo.c"
+#line 25343 "Photo.c"
 	}
-#line 3518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3520 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp101_) {
-#line 25332 "Photo.c"
+#line 25347 "Photo.c"
 		GdkPixbuf* _tmp104_ = NULL;
 		Dimensions _tmp105_ = {0};
 		gboolean _tmp106_ = FALSE;
-#line 3519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp104_ = pixbuf;
-#line 3519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
 		dimensions_for_pixbuf (_tmp104_, &_tmp105_);
-#line 3519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp106_ = dimensions_approx_equals (&scaled_to_viewport, &_tmp105_, PHOTO_SCALING_FUDGE);
-#line 3519 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3521 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp106_, "scaled_to_viewport.approx_equals(Dimensions.for_pixbuf(pixbuf), SCALING_FUDGE)");
-#line 25344 "Photo.c"
+#line 25359 "Photo.c"
 	}
-#line 3527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = pixbuf;
-#line 3527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformer_unref0 (transformer);
-#line 3527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 	redeye_instances = (g_free (redeye_instances), NULL);
-#line 3527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3529 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 25354 "Photo.c"
+#line 25369 "Photo.c"
 }
 
 
 static gboolean photo_real_has_user_generated_metadata (Photo* self) {
-#line 3535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3537 "/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 3535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
 	return FALSE;
-#line 25363 "Photo.c"
+#line 25378 "Photo.c"
 }
 
 
 gboolean photo_has_user_generated_metadata (Photo* self) {
-#line 3535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3537 "/home/jens/Source/shotwell/src/Photo.vala"
 	return PHOTO_GET_CLASS (self)->has_user_generated_metadata (self);
-#line 25372 "Photo.c"
+#line 25387 "Photo.c"
 }
 
 
 static void photo_real_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) {
-#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3541 "/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 3539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 25381 "Photo.c"
+#line 25396 "Photo.c"
 }
 
 
 void photo_set_user_metadata_for_export (Photo* self, PhotoMetadata* metadata) {
-#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3541 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_GET_CLASS (self)->set_user_metadata_for_export (self, metadata);
-#line 25390 "Photo.c"
+#line 25405 "Photo.c"
 }
 
 
 gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 	gchar* result = NULL;
 	PhotoFileFormat* _tmp0_ = NULL;
-#line 3546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 3547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3549 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file_format;
-#line 3547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3549 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 25403 "Photo.c"
+#line 25418 "Photo.c"
 		PhotoFileFormat* _tmp1_ = NULL;
 		PhotoFileFormatProperties* _tmp2_ = NULL;
 		PhotoFileFormatProperties* _tmp3_ = NULL;
@@ -25411,45 +25426,45 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 		GFile* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = file_format;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo_file_format_get_properties (*_tmp1_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = photo_file_format_properties_convert_file_extension (_tmp3_, _tmp5_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = g_file_get_basename (_tmp7_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp5_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp3_);
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp9_;
-#line 3548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25441 "Photo.c"
+#line 25456 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp10_ = 0;
 		gboolean _tmp11_ = FALSE;
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = photo_get_file_format (self);
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = photo_file_format_can_write (_tmp10_);
-#line 3550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3552 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp11_) {
-#line 25451 "Photo.c"
+#line 25466 "Photo.c"
 			PhotoFileFormat _tmp12_ = 0;
 			PhotoFileFormatProperties* _tmp13_ = NULL;
 			PhotoFileFormatProperties* _tmp14_ = NULL;
@@ -25459,35 +25474,35 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 			GFile* _tmp18_ = NULL;
 			gchar* _tmp19_ = NULL;
 			gchar* _tmp20_ = NULL;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = photo_get_file_format (self);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_file_format_get_properties (_tmp12_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _tmp13_;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = _tmp15_;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = photo_file_format_properties_convert_file_extension (_tmp14_, _tmp16_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = _tmp17_;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = g_file_get_basename (_tmp18_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _tmp19_;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp18_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp16_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_format_properties_unref0 (_tmp14_);
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp20_;
-#line 3551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3553 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 25489 "Photo.c"
+#line 25504 "Photo.c"
 		} else {
 			PhotoFileFormat _tmp21_ = 0;
 			PhotoFileFormatProperties* _tmp22_ = NULL;
@@ -25498,35 +25513,35 @@ gchar* photo_get_export_basename (Photo* self, PhotoFileFormat* file_format) {
 			GFile* _tmp27_ = NULL;
 			gchar* _tmp28_ = NULL;
 			gchar* _tmp29_ = NULL;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = photo_file_format_get_system_default_format ();
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = photo_file_format_get_properties (_tmp21_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = _tmp22_;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = _tmp24_;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = photo_file_format_properties_convert_file_extension (_tmp23_, _tmp25_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = _tmp26_;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = g_file_get_basename (_tmp27_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = _tmp28_;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp27_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp25_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_format_properties_unref0 (_tmp23_);
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			result = _tmp29_;
-#line 3554 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3556 "/home/jens/Source/shotwell/src/Photo.vala"
 			return result;
-#line 25528 "Photo.c"
+#line 25543 "Photo.c"
 		}
 	}
 }
@@ -25580,465 +25595,465 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 	PhotoFileMetadataWriter* _tmp97_ = NULL;
 	PhotoMetadata* _tmp98_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3562 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3562 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 3563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
 	export_reader = NULL;
-#line 3564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
 	is_master = TRUE;
-#line 25590 "Photo.c"
+#line 25605 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 25597 "Photo.c"
+#line 25612 "Photo.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			PhotoBackingReaders* _tmp2_ = NULL;
 			PhotoFileReader* _tmp3_ = NULL;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = self->priv->readers;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _tmp2_->editable;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp3_ != NULL) {
-#line 25608 "Photo.c"
+#line 25623 "Photo.c"
 				PhotoBackingReaders* _tmp4_ = NULL;
 				PhotoFileReader* _tmp5_ = NULL;
 				PhotoFileFormat _tmp6_ = 0;
 				gboolean _tmp7_ = FALSE;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = self->priv->readers;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _tmp4_->editable;
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/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 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = photo_file_format_can_write_metadata (_tmp6_);
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = _tmp7_;
-#line 25623 "Photo.c"
+#line 25638 "Photo.c"
 			} else {
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp1_ = FALSE;
-#line 25627 "Photo.c"
+#line 25642 "Photo.c"
 			}
-#line 3566 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp1_) {
-#line 25631 "Photo.c"
+#line 25646 "Photo.c"
 				PhotoBackingReaders* _tmp8_ = NULL;
 				PhotoFileReader* _tmp9_ = NULL;
 				PhotoFileReader* _tmp10_ = NULL;
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = self->priv->readers;
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tmp8_->editable;
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _photo_file_adapter_ref0 (_tmp9_);
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (export_reader);
-#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
 				export_reader = _tmp10_;
-#line 3568 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
 				is_master = FALSE;
-#line 25647 "Photo.c"
+#line 25662 "Photo.c"
 			} else {
 				gboolean _tmp11_ = FALSE;
 				PhotoBackingReaders* _tmp12_ = NULL;
 				PhotoFileReader* _tmp13_ = NULL;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = self->priv->readers;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tmp12_->developer;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp13_ != NULL) {
-#line 25658 "Photo.c"
+#line 25673 "Photo.c"
 					PhotoBackingReaders* _tmp14_ = NULL;
 					PhotoFileReader* _tmp15_ = NULL;
 					PhotoFileFormat _tmp16_ = 0;
 					gboolean _tmp17_ = FALSE;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = self->priv->readers;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = _tmp14_->developer;
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/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 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = photo_file_format_can_write_metadata (_tmp16_);
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp17_;
-#line 25673 "Photo.c"
+#line 25688 "Photo.c"
 				} else {
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = FALSE;
-#line 25677 "Photo.c"
+#line 25692 "Photo.c"
 				}
-#line 3569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_) {
-#line 25681 "Photo.c"
+#line 25696 "Photo.c"
 					PhotoBackingReaders* _tmp18_ = NULL;
 					PhotoFileReader* _tmp19_ = NULL;
 					PhotoFileReader* _tmp20_ = NULL;
-#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = self->priv->readers;
-#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = _tmp18_->developer;
-#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = _photo_file_adapter_ref0 (_tmp19_);
-#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (export_reader);
-#line 3570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
 					export_reader = _tmp20_;
-#line 3571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
 					is_master = FALSE;
-#line 25697 "Photo.c"
+#line 25712 "Photo.c"
 				} else {
 					PhotoBackingReaders* _tmp21_ = NULL;
 					PhotoFileReader* _tmp22_ = NULL;
 					PhotoFileFormat _tmp23_ = 0;
 					gboolean _tmp24_ = FALSE;
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = self->priv->readers;
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_->master;
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3574 "/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 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = photo_file_format_can_write_metadata (_tmp23_);
-#line 3572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3574 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp24_) {
-#line 25713 "Photo.c"
+#line 25728 "Photo.c"
 						PhotoBackingReaders* _tmp25_ = NULL;
 						PhotoFileReader* _tmp26_ = NULL;
 						PhotoFileReader* _tmp27_ = NULL;
-#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp25_ = self->priv->readers;
-#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = _tmp25_->master;
-#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = _photo_file_adapter_ref0 (_tmp26_);
-#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						_photo_file_adapter_unref0 (export_reader);
-#line 3573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3575 "/home/jens/Source/shotwell/src/Photo.vala"
 						export_reader = _tmp27_;
-#line 25727 "Photo.c"
+#line 25742 "Photo.c"
 					}
 				}
 			}
 		}
-		__finally384:
+		__finally385:
 		{
 			PhotoBackingReaders* _tmp28_ = NULL;
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = self->priv->readers;
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 25739 "Photo.c"
+#line 25754 "Photo.c"
 		}
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (export_reader);
-#line 3565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3567 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 25749 "Photo.c"
+#line 25764 "Photo.c"
 		}
 	}
-#line 3577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3579 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = export_reader;
-#line 3577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3579 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_ == NULL) {
-#line 3578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25762 "Photo.c"
+#line 25777 "Photo.c"
 	}
-#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = export_reader;
-#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = photo_file_format_get_properties (_tmp31_);
-#line 3580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3582 "/home/jens/Source/shotwell/src/Photo.vala"
 	format_properties = _tmp32_;
-#line 3583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = format_properties;
-#line 3583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = file;
-#line 3583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_file_format_properties_convert_file_extension (_tmp33_, _tmp34_);
-#line 3583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3585 "/home/jens/Source/shotwell/src/Photo.vala"
 	dest_file = _tmp35_;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = export_reader;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = dest_file;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = g_file_get_path (_tmp38_);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = _tmp39_;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = photo_file_format_create_metadata_writer (_tmp37_, _tmp40_, &_inner_error_);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = _tmp41_;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp40_);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp42_;
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3588 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 25810 "Photo.c"
+#line 25825 "Photo.c"
 	}
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = _tmp43_;
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = writer;
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = _tmp46_;
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3589: Exporting full-sized copy of %s to %s", _tmp44_, _tmp47_);
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:3591: Exporting full-sized copy of %s to %s", _tmp44_, _tmp47_);
+#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp47_);
-#line 3589 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp44_);
 #line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+	_g_free0 (_tmp44_);
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = export_reader;
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = _tmp49_;
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = dest_file;
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_copy (_tmp50_, _tmp51_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_TARGET_DEFAULT_PERMS, NULL, NULL, NULL, &_inner_error_);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp50_);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3593 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 25854 "Photo.c"
+#line 25869 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp57_ = photo_has_alterations (self);
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp57_) {
-#line 25860 "Photo.c"
+#line 25875 "Photo.c"
 		gboolean _tmp58_ = FALSE;
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = is_master;
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = _tmp58_;
-#line 25866 "Photo.c"
+#line 25881 "Photo.c"
 	} else {
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = FALSE;
-#line 25870 "Photo.c"
+#line 25885 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp56_) {
-#line 25874 "Photo.c"
+#line 25889 "Photo.c"
 		gboolean _tmp59_ = FALSE;
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = photo_has_user_generated_metadata (self);
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = !_tmp59_;
-#line 25880 "Photo.c"
+#line 25895 "Photo.c"
 	} else {
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp55_ = FALSE;
-#line 25884 "Photo.c"
+#line 25899 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_) {
-#line 25888 "Photo.c"
+#line 25903 "Photo.c"
 		gchar* _tmp60_ = NULL;
 		gchar* _tmp61_ = NULL;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = _tmp61_ == NULL;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp61_);
-#line 25899 "Photo.c"
+#line 25914 "Photo.c"
 	} else {
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp54_ = FALSE;
-#line 25903 "Photo.c"
+#line 25918 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp54_) {
-#line 25907 "Photo.c"
+#line 25922 "Photo.c"
 		gchar* _tmp62_ = NULL;
 		gchar* _tmp63_ = NULL;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp63_ = _tmp62_;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = _tmp63_ == NULL;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp63_);
-#line 25918 "Photo.c"
+#line 25933 "Photo.c"
 	} else {
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = FALSE;
-#line 25922 "Photo.c"
+#line 25937 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp53_) {
-#line 25926 "Photo.c"
+#line 25941 "Photo.c"
 		gboolean _tmp64_ = FALSE;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp64_ = export_metadata;
-#line 3597 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3599 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = _tmp64_;
-#line 25932 "Photo.c"
+#line 25947 "Photo.c"
 	} else {
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = FALSE;
-#line 25936 "Photo.c"
+#line 25951 "Photo.c"
 	}
-#line 3596 "/home/jens/Source/shotwell/src/Photo.vala"
-	if (_tmp52_) {
 #line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+	if (_tmp52_) {
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3600 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 25952 "Photo.c"
+#line 25967 "Photo.c"
 	}
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp65_ = export_reader;
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp66_ = photo_file_reader_read_metadata (_tmp65_, &_inner_error_);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp66_;
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 25974 "Photo.c"
+#line 25989 "Photo.c"
 	}
-#line 3602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp67_ = metadata;
-#line 3602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3604 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp67_ == NULL) {
-#line 25980 "Photo.c"
+#line 25995 "Photo.c"
 		PhotoFileReader* _tmp68_ = NULL;
 		PhotoFileFormat _tmp69_ = 0;
 		PhotoMetadata* _tmp70_ = NULL;
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp68_ = export_reader;
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = photo_file_format_create_metadata (_tmp69_);
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
 		metadata = _tmp70_;
-#line 25994 "Photo.c"
+#line 26009 "Photo.c"
 	}
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp71_ = writer;
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp72_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp73_ = _tmp72_;
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3605: Updating metadata of %s", _tmp73_);
-#line 3605 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp73_);
 #line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp74_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+	g_debug ("Photo.vala:3607: Updating metadata of %s", _tmp73_);
 #line 3607 "/home/jens/Source/shotwell/src/Photo.vala"
+	_g_free0 (_tmp73_);
+#line 3609 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp74_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
+#line 3609 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp74_ != ((time_t) 0)) {
-#line 26010 "Photo.c"
+#line 26025 "Photo.c"
 		PhotoMetadata* _tmp75_ = NULL;
 		time_t _tmp76_ = 0;
 		MetadataDateTime* _tmp77_ = NULL;
 		MetadataDateTime* _tmp78_ = NULL;
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = metadata;
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp76_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = metadata_date_time_new (_tmp76_);
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = _tmp77_;
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_exposure_date_time (_tmp75_, _tmp78_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_metadata_date_time_unref0 (_tmp78_);
-#line 26027 "Photo.c"
+#line 26042 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp79_ = NULL;
-#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp79_ = metadata;
-#line 3610 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_exposure_date_time (_tmp79_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26034 "Photo.c"
+#line 26049 "Photo.c"
 	}
-#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp80_ = export_metadata;
-#line 3612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp80_) {
-#line 26040 "Photo.c"
+#line 26055 "Photo.c"
 		PhotoMetadata* _tmp81_ = NULL;
 		gchar* _tmp82_ = NULL;
 		gchar* _tmp83_ = NULL;
@@ -26053,108 +26068,108 @@ static gboolean photo_export_fullsized_backing (Photo* self, GFile* file, gboole
 		Orientation _tmp92_ = 0;
 		Orientation _tmp93_ = 0;
 		PhotoMetadata* _tmp95_ = NULL;
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp81_ = metadata;
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp82_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = _tmp82_;
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_title (_tmp81_, _tmp83_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp83_);
-#line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp84_ = metadata;
-#line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp86_ = _tmp85_;
-#line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_comment (_tmp84_, _tmp86_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3615 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp86_);
-#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = metadata;
-#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp88_);
-#line 3616 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_pixel_dimensions (_tmp87_, &_tmp88_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp89_ = metadata;
-#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp90_ = photo_get_orientation (self);
-#line 3617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3619 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp89_, _tmp90_);
-#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp91_ = metadata;
-#line 3618 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_software (_tmp91_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
 #line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_metadata_set_software (_tmp91_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp92_ = photo_get_orientation (self);
-#line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp93_ = photo_get_original_orientation (self);
-#line 3620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3622 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp92_ != _tmp93_) {
-#line 26097 "Photo.c"
+#line 26112 "Photo.c"
 			PhotoMetadata* _tmp94_ = NULL;
-#line 3621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp94_ = metadata;
-#line 3621 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_remove_exif_thumbnail (_tmp94_);
-#line 26103 "Photo.c"
+#line 26118 "Photo.c"
 		}
-#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp95_ = metadata;
-#line 3623 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3625 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_set_user_metadata_for_export (self, _tmp95_);
-#line 26109 "Photo.c"
+#line 26124 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp96_ = NULL;
-#line 3627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp96_ = metadata;
-#line 3627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_clear (_tmp96_);
-#line 26116 "Photo.c"
+#line 26131 "Photo.c"
 	}
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = writer;
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp98_ = metadata;
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp97_, _tmp98_, &_inner_error_);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dest_file);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (format_properties);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (export_reader);
-#line 3629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 26140 "Photo.c"
+#line 26155 "Photo.c"
 	}
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (dest_file);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_format_properties_unref0 (format_properties);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (export_reader);
-#line 3631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3633 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 26156 "Photo.c"
+#line 26171 "Photo.c"
 }
 
 
@@ -26164,59 +26179,59 @@ gboolean photo_is_export_required (Photo* self, Scaling* scaling, PhotoFileForma
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 3637 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 3637 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = scaling_is_unscaled (scaling);
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp3_) {
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = TRUE;
-#line 26176 "Photo.c"
+#line 26191 "Photo.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = photo_has_alterations (self);
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp4_;
-#line 26183 "Photo.c"
+#line 26198 "Photo.c"
 	}
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = TRUE;
-#line 26189 "Photo.c"
+#line 26204 "Photo.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = photo_has_user_generated_metadata (self);
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp5_;
-#line 26196 "Photo.c"
+#line 26211 "Photo.c"
 	}
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 26202 "Photo.c"
+#line 26217 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp6_ = 0;
 		PhotoFileFormat _tmp7_ = 0;
-#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = export_format;
-#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo_get_file_format (self);
-#line 3639 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3641 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp6_ != _tmp7_;
-#line 26212 "Photo.c"
+#line 26227 "Photo.c"
 	}
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 3638 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3640 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 26218 "Photo.c"
+#line 26233 "Photo.c"
 }
 
 
@@ -26268,342 +26283,342 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 	PhotoFileMetadataWriter* _tmp94_ = NULL;
 	PhotoMetadata* _tmp95_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail (scaling != NULL);
 #line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail (scaling != NULL);
+#line 3649 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = direct_copy_unmodified;
-#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3649 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 26280 "Photo.c"
+#line 26295 "Photo.c"
 		GFile* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = dest_file;
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/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 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp2_);
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26300 "Photo.c"
+#line 26315 "Photo.c"
 		}
-#line 3650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3652 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26304 "Photo.c"
+#line 26319 "Photo.c"
 	}
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = scaling_is_unscaled (scaling);
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 26310 "Photo.c"
+#line 26325 "Photo.c"
 		gboolean _tmp8_ = FALSE;
 		gboolean _tmp9_ = FALSE;
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = photo_has_alterations (self);
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (!_tmp9_) {
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = TRUE;
-#line 26319 "Photo.c"
+#line 26334 "Photo.c"
 		} else {
 			gboolean _tmp10_ = FALSE;
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_only_metadata_changed (self);
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp10_;
-#line 26326 "Photo.c"
+#line 26341 "Photo.c"
 		}
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 26330 "Photo.c"
+#line 26345 "Photo.c"
 	} else {
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 26334 "Photo.c"
+#line 26349 "Photo.c"
 	}
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 26338 "Photo.c"
+#line 26353 "Photo.c"
 		PhotoFileFormat _tmp11_ = 0;
 		PhotoFileFormat _tmp12_ = 0;
-#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = export_format;
-#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = photo_get_file_format (self);
-#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp11_ == _tmp12_;
-#line 26347 "Photo.c"
+#line 26362 "Photo.c"
 	} else {
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = FALSE;
-#line 26351 "Photo.c"
+#line 26366 "Photo.c"
 	}
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 26355 "Photo.c"
+#line 26370 "Photo.c"
 		PhotoFileFormat _tmp13_ = 0;
-#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = photo_get_file_format (self);
-#line 3658 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp13_ == PHOTO_FILE_FORMAT_JFIF;
-#line 26361 "Photo.c"
+#line 26376 "Photo.c"
 	} else {
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = FALSE;
-#line 26365 "Photo.c"
+#line 26380 "Photo.c"
 	}
-#line 3657 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp4_) {
-#line 26369 "Photo.c"
+#line 26384 "Photo.c"
 		gboolean _tmp14_ = FALSE;
 		GFile* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = dest_file;
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = export_metadata;
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = photo_export_fullsized_backing (self, _tmp15_, _tmp16_, &_inner_error_);
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp17_;
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26388 "Photo.c"
+#line 26403 "Photo.c"
 		}
-#line 3659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3661 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp14_) {
-#line 3660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3662 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26394 "Photo.c"
+#line 26409 "Photo.c"
 		}
 	}
-#line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 3666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp18_;
-#line 3667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = metadata;
-#line 3667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3669 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ == NULL) {
-#line 26405 "Photo.c"
+#line 26420 "Photo.c"
 		PhotoFileFormat _tmp20_ = 0;
 		PhotoMetadata* _tmp21_ = NULL;
-#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = export_format;
-#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = photo_file_format_create_metadata (_tmp20_);
-#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3668 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
 		metadata = _tmp21_;
-#line 26416 "Photo.c"
+#line 26431 "Photo.c"
 	}
-#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = export_format;
-#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo_file_format_can_write (_tmp22_);
-#line 3670 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3672 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp23_) {
-#line 26424 "Photo.c"
+#line 26439 "Photo.c"
 		PhotoFileFormat _tmp24_ = 0;
-#line 3671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = photo_file_format_get_system_default_format ();
-#line 3671 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
 		export_format = _tmp24_;
-#line 26430 "Photo.c"
+#line 26445 "Photo.c"
 	}
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = export_format;
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = dest_file;
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = g_file_get_path (_tmp26_);
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_;
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = photo_file_format_create_writer (_tmp25_, _tmp28_, &_inner_error_);
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp29_;
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp28_);
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	writer = _tmp30_;
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3673 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26456 "Photo.c"
+#line 26471 "Photo.c"
 	}
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = _tmp31_;
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = writer;
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/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 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = _tmp34_;
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = export_format;
-#line 3676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3678 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), _tmp36_);
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3675: Saving transformed version of %s to %s in file format" \
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_debug ("Photo.vala:3677: Saving transformed version of %s to %s in file format" \
 " %s", _tmp32_, _tmp35_, (_tmp37_ != NULL) ? _tmp37_->value_name : NULL);
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp35_);
-#line 3675 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3677 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp32_);
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = photo_get_file_format (self);
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = TRUE;
-#line 26484 "Photo.c"
+#line 26499 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp40_ = 0;
-#line 3683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3685 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = photo_get_file_format (self);
-#line 3683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3685 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp38_ = _tmp40_ == PHOTO_FILE_FORMAT_RAW;
-#line 26491 "Photo.c"
+#line 26506 "Photo.c"
 	}
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp38_) {
-#line 26495 "Photo.c"
+#line 26510 "Photo.c"
 		GdkPixbuf* _tmp41_ = NULL;
 		Scaling _tmp42_ = {0};
 		GdkPixbuf* _tmp43_ = NULL;
 		GdkPixbuf* _tmp44_ = NULL;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = *scaling;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/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 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = _tmp43_;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (writer);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26518 "Photo.c"
+#line 26533 "Photo.c"
 		}
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp44_ = _tmp41_;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = NULL;
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3686 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp44_;
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp41_);
-#line 26530 "Photo.c"
+#line 26545 "Photo.c"
 	} else {
 		GdkPixbuf* _tmp45_ = NULL;
 		Scaling _tmp46_ = {0};
 		GdkPixbuf* _tmp47_ = NULL;
 		GdkPixbuf* _tmp48_ = NULL;
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = *scaling;
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/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 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = _tmp47_;
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (pixbuf);
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (writer);
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 26554 "Photo.c"
+#line 26569 "Photo.c"
 		}
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp45_;
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = NULL;
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3688 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3690 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp48_;
-#line 3682 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3684 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp45_);
-#line 26566 "Photo.c"
+#line 26581 "Photo.c"
 	}
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp49_ = writer;
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = pixbuf;
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp51_ = quality;
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_writer_write (_tmp49_, _tmp50_, _tmp51_, &_inner_error_);
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26588 "Photo.c"
+#line 26603 "Photo.c"
 	}
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = writer;
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/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 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3696 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp54_ = _tmp53_;
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:3694: Setting EXIF for %s", _tmp54_);
-#line 3694 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 	_g_free0 (_tmp54_);
-#line 3697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp55_ = export_metadata;
-#line 3697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp55_) {
-#line 26604 "Photo.c"
+#line 26619 "Photo.c"
 		PhotoMetadata* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
 		gchar* _tmp58_ = NULL;
@@ -26616,213 +26631,213 @@ void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality
 		PhotoMetadata* _tmp70_ = NULL;
 		PhotoMetadata* _tmp71_ = NULL;
 		gboolean _tmp72_ = FALSE;
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp56_ = metadata;
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp57_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp58_ = _tmp57_;
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_title (_tmp56_, _tmp58_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp58_);
-#line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp59_ = metadata;
-#line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp60_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp61_ = _tmp60_;
-#line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_comment (_tmp59_, _tmp61_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3700 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3702 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp61_);
-#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp62_ = metadata;
-#line 3701 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_set_software (_tmp62_, RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
 #line 3703 "/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"
 		_tmp63_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3705 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp63_ != ((time_t) 0)) {
-#line 26645 "Photo.c"
+#line 26660 "Photo.c"
 			PhotoMetadata* _tmp64_ = NULL;
 			time_t _tmp65_ = 0;
 			MetadataDateTime* _tmp66_ = NULL;
 			MetadataDateTime* _tmp67_ = NULL;
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp64_ = metadata;
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp65_ = media_source_get_exposure_time (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp66_ = metadata_date_time_new (_tmp65_);
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp67_ = _tmp66_;
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_set_exposure_date_time (_tmp64_, _tmp67_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
 			_metadata_date_time_unref0 (_tmp67_);
-#line 26662 "Photo.c"
+#line 26677 "Photo.c"
 		} else {
 			PhotoMetadata* _tmp68_ = NULL;
-#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp68_ = metadata;
-#line 3706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_metadata_set_exposure_date_time (_tmp68_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 26669 "Photo.c"
+#line 26684 "Photo.c"
 		}
-#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp69_ = metadata;
-#line 3708 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_remove_tag (_tmp69_, "Exif.Iop.RelatedImageWidth");
-#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3711 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp70_ = metadata;
-#line 3709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3711 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_remove_tag (_tmp70_, "Exif.Iop.RelatedImageHeight");
-#line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3712 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = metadata;
-#line 3710 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_metadata_remove_exif_thumbnail (_tmp71_);
 #line 3712 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_metadata_remove_exif_thumbnail (_tmp71_);
+#line 3714 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp72_ = photo_has_user_generated_metadata (self);
-#line 3712 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3714 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp72_) {
-#line 26687 "Photo.c"
+#line 26702 "Photo.c"
 			PhotoMetadata* _tmp73_ = NULL;
-#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = metadata;
-#line 3713 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3715 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_user_metadata_for_export (self, _tmp73_);
-#line 26693 "Photo.c"
+#line 26708 "Photo.c"
 		}
 	} else {
 		PhotoMetadata* _tmp74_ = NULL;
-#line 3717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3719 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = metadata;
-#line 3717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3719 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_clear (_tmp74_);
-#line 26701 "Photo.c"
+#line 26716 "Photo.c"
 	}
-#line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp76_ = photo_get_file_format (self);
-#line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp76_ == PHOTO_FILE_FORMAT_JFIF) {
-#line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = TRUE;
-#line 26709 "Photo.c"
+#line 26724 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp77_ = 0;
-#line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp77_ = photo_get_file_format (self);
-#line 3725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = _tmp77_ == PHOTO_FILE_FORMAT_RAW;
-#line 26716 "Photo.c"
+#line 26731 "Photo.c"
 	}
-#line 3724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp75_) {
-#line 26720 "Photo.c"
+#line 26735 "Photo.c"
 		PhotoMetadata* _tmp78_ = NULL;
 		Dimensions _tmp79_ = {0};
 		PhotoMetadata* _tmp80_ = NULL;
 		Orientation _tmp81_ = 0;
-#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp78_ = metadata;
-#line 3726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3728 "/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 3726 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3728 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_pixel_dimensions (_tmp78_, &_tmp79_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp80_ = metadata;
-#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp81_ = photo_get_orientation (self);
-#line 3727 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3729 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp80_, _tmp81_);
-#line 26737 "Photo.c"
+#line 26752 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp82_ = NULL;
 		GdkPixbuf* _tmp83_ = NULL;
 		Dimensions _tmp84_ = {0};
 		PhotoMetadata* _tmp85_ = NULL;
-#line 3730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp82_ = metadata;
-#line 3730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = pixbuf;
-#line 3730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
 		dimensions_for_pixbuf (_tmp83_, &_tmp84_);
-#line 3730 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3732 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_pixel_dimensions (_tmp82_, &_tmp84_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 3731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3733 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = metadata;
-#line 3731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3733 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_orientation (_tmp85_, ORIENTATION_TOP_LEFT);
-#line 26755 "Photo.c"
+#line 26770 "Photo.c"
 	}
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp87_ = export_format;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp88_ = dest_file;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = g_file_get_path (_tmp88_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp90_ = _tmp89_;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp91_ = photo_file_format_create_metadata_writer (_tmp87_, _tmp90_, &_inner_error_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = _tmp91_;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp90_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_ = _tmp92_;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26785 "Photo.c"
+#line 26800 "Photo.c"
 	}
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = _tmp86_;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp86_ = NULL;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp94_ = _tmp93_;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp95_ = metadata;
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_file_metadata_writer_write_metadata (_tmp94_, _tmp95_, &_inner_error_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp94_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (_tmp86_);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (writer);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 3734 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3736 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 26813 "Photo.c"
+#line 26828 "Photo.c"
 	}
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp86_);
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (pixbuf);
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (writer);
-#line 3645 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3647 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 26823 "Photo.c"
+#line 26838 "Photo.c"
 }
 
 
@@ -26854,214 +26869,214 @@ static GFile* photo_generate_new_editable_file (Photo* self, PhotoFileFormat* fi
 	GFile* _tmp31_ = NULL;
 	GFile* _tmp32_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3737 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 26857 "Photo.c"
+#line 26872 "Photo.c"
 	{
 		PhotoRow* _tmp0_ = NULL;
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->row;
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 26864 "Photo.c"
+#line 26879 "Photo.c"
 		{
 			PhotoFileFormat _tmp1_ = 0;
 			GFile* _tmp2_ = NULL;
-#line 3740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3742 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = photo_get_file_format (self);
-#line 3740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3742 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_file_format = _tmp1_;
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3743 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3743 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (backing);
-#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3743 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing = _tmp2_;
-#line 26878 "Photo.c"
+#line 26893 "Photo.c"
 		}
-		__finally385:
+		__finally386:
 		{
 			PhotoRow* _tmp3_ = NULL;
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = self->row;
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 26887 "Photo.c"
+#line 26902 "Photo.c"
 		}
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (backing);
-#line 3739 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3741 "/home/jens/Source/shotwell/src/Photo.vala"
 			return NULL;
-#line 26897 "Photo.c"
+#line 26912 "Photo.c"
 		}
 	}
-#line 3744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _vala_file_format;
-#line 3744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_file_format_can_write (_tmp4_);
-#line 3744 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3746 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp5_) {
-#line 26906 "Photo.c"
+#line 26921 "Photo.c"
 		PhotoFileFormat _tmp6_ = 0;
-#line 3745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = photo_file_format_get_system_default_format ();
-#line 3745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3747 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_file_format = _tmp6_;
-#line 26912 "Photo.c"
+#line 26927 "Photo.c"
 	}
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = g_file_get_basename (backing);
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_;
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	disassemble_filename (_tmp8_, &_tmp9_, &_tmp10_);
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	name = _tmp9_;
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
 	ext = _tmp10_;
-#line 3748 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp8_);
 #line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+	_g_free0 (_tmp8_);
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = ext;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_ == NULL) {
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = TRUE;
-#line 26936 "Photo.c"
+#line 26951 "Photo.c"
 	} else {
 		PhotoFileFormat _tmp13_ = 0;
 		PhotoFileFormatProperties* _tmp14_ = NULL;
 		PhotoFileFormatProperties* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		gboolean _tmp17_ = FALSE;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = _vala_file_format;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = photo_file_format_get_properties (_tmp13_);
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp14_;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = ext;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = photo_file_format_properties_is_recognized_extension (_tmp15_, _tmp16_);
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = !_tmp17_;
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp15_);
-#line 26957 "Photo.c"
+#line 26972 "Photo.c"
 	}
-#line 3750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3752 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 26961 "Photo.c"
+#line 26976 "Photo.c"
 		PhotoFileFormat _tmp18_ = 0;
 		PhotoFileFormatProperties* _tmp19_ = NULL;
 		PhotoFileFormatProperties* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _vala_file_format;
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = photo_file_format_get_properties (_tmp18_);
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_;
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = photo_file_format_properties_get_default_extension (_tmp20_);
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (ext);
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		ext = _tmp21_;
-#line 3751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_format_properties_unref0 (_tmp20_);
-#line 26980 "Photo.c"
+#line 26995 "Photo.c"
 	}
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = name;
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = _ ("modified");
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = ext;
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = g_strdup_printf ("%s_%s.%s", _tmp22_, _tmp23_, _tmp24_);
-#line 3753 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3755 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_basename = _tmp25_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = g_file_get_parent (backing);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = generate_unique_file (_tmp28_, editable_basename, &_tmp29_, &_inner_error_);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	collision = _tmp29_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp30_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp28_);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = _tmp31_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (editable_basename);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (ext);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (name);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (backing);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 27020 "Photo.c"
+#line 27035 "Photo.c"
 	}
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = _tmp26_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = NULL;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp32_;
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp26_);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (editable_basename);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (ext);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (name);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (backing);
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (file_format) {
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 		*file_format = _vala_file_format;
-#line 27042 "Photo.c"
+#line 27057 "Photo.c"
 	}
-#line 3756 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3758 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 27046 "Photo.c"
+#line 27061 "Photo.c"
 }
 
 
 static void _g_object_unref0_ (gpointer var) {
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 	(var == NULL) ? NULL : (var = (g_object_unref (var), NULL));
-#line 27053 "Photo.c"
+#line 27068 "Photo.c"
 }
 
 
 static void _g_list_free__g_object_unref0_ (GList* self) {
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_list_foreach (self, (GFunc) _g_object_unref0_, NULL);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_list_free (self);
-#line 27062 "Photo.c"
+#line 27077 "Photo.c"
 }
 
 
@@ -27099,260 +27114,260 @@ static gboolean photo_launch_editor (GFile* file, PhotoFileFormat file_format, G
 	GPid _tmp33_ = 0;
 	gboolean _tmp34_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 3759 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file_format;
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
-#line 27106 "Photo.c"
+#line 27121 "Photo.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/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 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp4_;
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 27122 "Photo.c"
+#line 27137 "Photo.c"
 	} else {
 		ConfigFacade* _tmp5_ = NULL;
 		ConfigFacade* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = config_facade_get_instance ();
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/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 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp7_;
-#line 3761 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp6_);
-#line 27139 "Photo.c"
+#line 27154 "Photo.c"
 	}
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_strdup (_tmp0_);
-#line 3760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3762 "/home/jens/Source/shotwell/src/Photo.vala"
 	commandline = _tmp8_;
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = commandline;
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = is_string_empty (_tmp9_);
-#line 3763 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3765 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 3764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 3764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3766 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 27159 "Photo.c"
+#line 27174 "Photo.c"
 	}
 	{
 		GAppInfo* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 		GAppInfo* _tmp13_ = NULL;
 		GAppInfo* _tmp14_ = NULL;
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = commandline;
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = g_app_info_create_from_commandline (_tmp12_, "", G_APP_INFO_CREATE_NONE, &_inner_error_);
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp13_;
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27174 "Photo.c"
-			goto __catch386_g_error;
+#line 27189 "Photo.c"
+			goto __catch387_g_error;
 		}
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp11_;
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = NULL;
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3770 "/home/jens/Source/shotwell/src/Photo.vala"
 		app = _tmp14_;
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp11_);
-#line 27187 "Photo.c"
+#line 27202 "Photo.c"
 	}
-	goto __finally386;
-	__catch386_g_error:
+	goto __finally387;
+	__catch387_g_error:
 	{
 		GError* er = NULL;
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		er = _inner_error_;
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3773 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3771 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3773 "/home/jens/Source/shotwell/src/Photo.vala"
 		app = NULL;
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (er);
-#line 27203 "Photo.c"
+#line 27218 "Photo.c"
 	}
-	__finally386:
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally387:
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3767 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3769 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 27218 "Photo.c"
+#line 27233 "Photo.c"
 	}
-#line 3774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3776 "/home/jens/Source/shotwell/src/Photo.vala"
 	files = NULL;
-#line 3775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = file;
-#line 3775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _g_object_ref0 (_tmp15_);
-#line 3775 "/home/jens/Source/shotwell/src/Photo.vala"
-	files = g_list_insert (files, _tmp16_, -1);
 #line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
+	files = g_list_insert (files, _tmp16_, -1);
+#line 3779 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = app;
-#line 3777 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3779 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ != NULL) {
-#line 27232 "Photo.c"
+#line 27247 "Photo.c"
 		gboolean _tmp18_ = FALSE;
 		GAppInfo* _tmp19_ = NULL;
 		GList* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = app;
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = files;
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = g_app_info_launch (_tmp19_, _tmp20_, NULL, &_inner_error_);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp21_;
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			__g_list_free__g_object_unref0_0 (files);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (app);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (commandline);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp0_);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 27259 "Photo.c"
+#line 27274 "Photo.c"
 		}
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp18_;
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		__g_list_free__g_object_unref0_0 (files);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 27273 "Photo.c"
+#line 27288 "Photo.c"
 	}
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = g_new0 (gchar*, 2 + 1);
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 	argv = _tmp22_;
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 	argv_length1 = 2;
-#line 3780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_argv_size_ = argv_length1;
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = argv;
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23__length1 = argv_length1;
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = commandline;
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = g_strdup (_tmp24_);
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp23_[0]);
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_[0] = _tmp25_;
-#line 3781 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3783 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = _tmp23_[0];
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = argv;
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27__length1 = argv_length1;
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = file;
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = g_file_get_path (_tmp28_);
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp27_[1]);
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_[1] = _tmp29_;
-#line 3782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp27_[1];
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = argv;
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32__length1 = argv_length1;
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = g_spawn_async ("/", _tmp32_, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &_tmp33_, &_inner_error_);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	child_pid = _tmp33_;
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp34_;
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		__g_list_free__g_object_unref0_0 (files);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (app);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (commandline);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp0_);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 27337 "Photo.c"
+#line 27352 "Photo.c"
 	}
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp31_;
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	__g_list_free__g_object_unref0_0 (files);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (app);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (commandline);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp0_);
-#line 3786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3788 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 27353 "Photo.c"
+#line 27368 "Photo.c"
 }
 
 
@@ -27361,25 +27376,25 @@ void photo_open_with_raw_external_editor (Photo* self, GError** error) {
 	GFile* _tmp1_ = NULL;
 	PhotoFileFormat _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 3796 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3798 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_get_master_file_format (self);
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_launch_editor (_tmp1_, _tmp2_, &_inner_error_);
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3799 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27380 "Photo.c"
+#line 27395 "Photo.c"
 	}
 }
 
@@ -27398,248 +27413,248 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 	GFile* _tmp47_ = NULL;
 	PhotoFileFormat _tmp48_ = 0;
 	GError * _inner_error_ = NULL;
-#line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3802 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3804 "/home/jens/Source/shotwell/src/Photo.vala"
 	current_editable_file = NULL;
-#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
 	create_editable_file = NULL;
-#line 27405 "Photo.c"
+#line 27420 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 27412 "Photo.c"
+#line 27427 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
 			GFile* _tmp6_ = NULL;
-#line 3806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 3806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 3806 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3808 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 27423 "Photo.c"
+#line 27438 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				GFile* _tmp5_ = NULL;
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3809 "/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 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (current_editable_file);
-#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
 				current_editable_file = _tmp5_;
-#line 27437 "Photo.c"
+#line 27452 "Photo.c"
 			}
-#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = current_editable_file;
-#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp6_ == NULL) {
-#line 27443 "Photo.c"
+#line 27458 "Photo.c"
 				GFile* _tmp7_ = NULL;
 				PhotoFileFormat _tmp8_ = 0;
 				GFile* _tmp9_ = NULL;
 				GFile* _tmp10_ = NULL;
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo_generate_new_editable_file (self, &_tmp8_, &_inner_error_);
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_file_format = _tmp8_;
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = _tmp9_;
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27456 "Photo.c"
-					goto __finally387;
+#line 27471 "Photo.c"
+					goto __finally388;
 				}
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tmp7_;
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = NULL;
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (create_editable_file);
-#line 3810 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
 				create_editable_file = _tmp10_;
-#line 3809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3811 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp7_);
-#line 27469 "Photo.c"
+#line 27484 "Photo.c"
 			} else {
 				PhotoBackingReaders* _tmp11_ = NULL;
 				PhotoFileReader* _tmp12_ = NULL;
 				PhotoFileFormat _tmp13_ = 0;
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = self->priv->readers;
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_->editable;
-#line 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3814 "/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 3812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3814 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_file_format = _tmp13_;
-#line 27482 "Photo.c"
+#line 27497 "Photo.c"
 			}
 		}
-		__finally387:
+		__finally388:
 		{
 			PhotoBackingReaders* _tmp14_ = NULL;
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = self->priv->readers;
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 27492 "Photo.c"
+#line 27507 "Photo.c"
 		}
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3807 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27504 "Photo.c"
+#line 27519 "Photo.c"
 		}
 	}
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = create_editable_file;
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ == NULL) {
-#line 27511 "Photo.c"
+#line 27526 "Photo.c"
 		GFile* _tmp18_ = NULL;
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = current_editable_file;
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp18_ != NULL;
-#line 27517 "Photo.c"
+#line 27532 "Photo.c"
 	} else {
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = FALSE;
-#line 27521 "Photo.c"
+#line 27536 "Photo.c"
 	}
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_) {
-#line 27525 "Photo.c"
+#line 27540 "Photo.c"
 		gboolean _tmp19_ = FALSE;
 		GFile* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = current_editable_file;
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = g_file_query_exists (_tmp20_, NULL);
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (!_tmp21_) {
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = TRUE;
-#line 27537 "Photo.c"
+#line 27552 "Photo.c"
 		} else {
 			gboolean _tmp22_ = FALSE;
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = photo_has_transformations (self);
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = _tmp22_;
-#line 27544 "Photo.c"
+#line 27559 "Photo.c"
 		}
-#line 3818 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3820 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = _tmp19_;
-#line 27548 "Photo.c"
+#line 27563 "Photo.c"
 	} else {
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = FALSE;
-#line 27552 "Photo.c"
+#line 27567 "Photo.c"
 	}
-#line 3817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_) {
-#line 27556 "Photo.c"
+#line 27571 "Photo.c"
 		GFile* _tmp23_ = NULL;
 		GFile* _tmp24_ = NULL;
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = current_editable_file;
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = _g_object_ref0 (_tmp23_);
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (create_editable_file);
-#line 3819 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3821 "/home/jens/Source/shotwell/src/Photo.vala"
 		create_editable_file = _tmp24_;
-#line 27567 "Photo.c"
+#line 27582 "Photo.c"
 	}
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = create_editable_file;
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp26_ != NULL) {
-#line 27573 "Photo.c"
+#line 27588 "Photo.c"
 		PhotoFileFormat _tmp27_ = 0;
 		gboolean _tmp28_ = FALSE;
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = editable_file_format;
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = photo_file_format_can_write (_tmp27_);
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp28_;
-#line 27582 "Photo.c"
+#line 27597 "Photo.c"
 	} else {
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = FALSE;
-#line 27586 "Photo.c"
+#line 27601 "Photo.c"
 	}
-#line 3822 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3824 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_) {
-#line 27590 "Photo.c"
+#line 27605 "Photo.c"
 		PhotoFileFormat _tmp40_ = 0;
 		GFile* _tmp41_ = NULL;
 		GFile* _tmp42_ = NULL;
 		GFile* _tmp43_ = NULL;
-#line 3823 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_halt_monitoring_editable (self);
-#line 27597 "Photo.c"
+#line 27612 "Photo.c"
 		{
 			GFile* _tmp29_ = NULL;
 			Scaling _tmp30_ = {0};
 			PhotoFileFormat _tmp31_ = 0;
-#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp29_ = create_editable_file;
-#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			scaling_for_original (&_tmp30_);
-#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = editable_file_format;
-#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_export (self, _tmp29_, &_tmp30_, JPEG_QUALITY_MAXIMUM, _tmp31_, FALSE, TRUE, &_inner_error_);
-#line 3826 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3828 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27612 "Photo.c"
-				goto __catch388_g_error;
+#line 27627 "Photo.c"
+				goto __catch389_g_error;
 			}
 		}
-		goto __finally388;
-		__catch388_g_error:
+		goto __finally389;
+		__catch389_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp38_ = NULL;
 			GError* _tmp39_ = NULL;
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 27626 "Photo.c"
+#line 27641 "Photo.c"
 			{
 				GFile* _tmp32_ = NULL;
-#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = create_editable_file;
-#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_file_delete (_tmp32_, NULL, &_inner_error_);
-#line 3831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3833 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 27635 "Photo.c"
-					goto __catch389_g_error;
+#line 27650 "Photo.c"
+					goto __catch390_g_error;
 				}
 			}
-			goto __finally389;
-			__catch389_g_error:
+			goto __finally390;
+			__catch390_g_error:
 			{
 				GError* delete_err = NULL;
 				GFile* _tmp33_ = NULL;
@@ -27647,169 +27662,169 @@ void photo_open_with_external_editor (Photo* self, GError** error) {
 				gchar* _tmp35_ = NULL;
 				GError* _tmp36_ = NULL;
 				const gchar* _tmp37_ = NULL;
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				delete_err = _inner_error_;
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_inner_error_ = NULL;
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = create_editable_file;
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = g_file_get_path (_tmp33_);
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = _tmp34_;
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = delete_err;
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_->message;
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
-				g_warning ("Photo.vala:3834: Unable to delete editable file %s after export error:" \
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
+				g_warning ("Photo.vala:3836: Unable to delete editable file %s after export error:" \
 " %s", _tmp35_, _tmp37_);
-#line 3834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3836 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp35_);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (delete_err);
-#line 27668 "Photo.c"
+#line 27683 "Photo.c"
 			}
-			__finally389:
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+			__finally390:
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_error_free0 (err);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (create_editable_file);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (current_editable_file);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/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 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_clear_error (&_inner_error_);
-#line 3830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3832 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 27687 "Photo.c"
+#line 27702 "Photo.c"
 			}
-#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = err;
-#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = _g_error_copy0 (_tmp38_);
-#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = _tmp39_;
-#line 3838 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3840 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 27697 "Photo.c"
-			goto __finally388;
+#line 27712 "Photo.c"
+			goto __finally389;
 		}
-		__finally388:
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally389:
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3827 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27711 "Photo.c"
+#line 27726 "Photo.c"
 		}
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp40_ = editable_file_format;
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp41_ = create_editable_file;
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_attach_editable (self, _tmp40_, _tmp41_, &_inner_error_);
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3842 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27729 "Photo.c"
+#line 27744 "Photo.c"
 		}
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = create_editable_file;
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _g_object_ref0 (_tmp42_);
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (current_editable_file);
-#line 3844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3846 "/home/jens/Source/shotwell/src/Photo.vala"
 		current_editable_file = _tmp43_;
-#line 27739 "Photo.c"
+#line 27754 "Photo.c"
 	}
-#line 3847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3849 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = current_editable_file;
-#line 3847 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3849 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp44_ != NULL, "current_editable_file != null");
-#line 3850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3852 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = self->priv->editable_monitor;
-#line 3850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3852 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp45_ == NULL) {
-#line 27749 "Photo.c"
+#line 27764 "Photo.c"
 		GFile* _tmp46_ = NULL;
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = current_editable_file;
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_start_monitoring_editable (self, _tmp46_, &_inner_error_);
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (create_editable_file);
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (current_editable_file);
-#line 3851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 27765 "Photo.c"
+#line 27780 "Photo.c"
 		}
 	}
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = current_editable_file;
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp48_ = photo_get_file_format (self);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_launch_editor (_tmp47_, _tmp48_, &_inner_error_);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (create_editable_file);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (current_editable_file);
-#line 3853 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3855 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27784 "Photo.c"
+#line 27799 "Photo.c"
 	}
-#line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (create_editable_file);
-#line 3801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (current_editable_file);
-#line 27790 "Photo.c"
+#line 27805 "Photo.c"
 }
 
 
 void photo_revert_to_master (Photo* self, gboolean notify) {
 	gboolean _tmp0_ = FALSE;
-#line 3856 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3858 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = notify;
-#line 3857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3859 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_detach_editable (self, TRUE, TRUE, _tmp0_);
-#line 27802 "Photo.c"
+#line 27817 "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 3867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3869 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_editable_file_changed ((Photo*) self, file, other_file, event_type);
-#line 27809 "Photo.c"
+#line 27824 "Photo.c"
 }
 
 
@@ -27821,45 +27836,45 @@ static void photo_start_monitoring_editable (Photo* self, GFile* file, GError**
 	GFileMonitor* _tmp4_ = NULL;
 	GFileMonitor* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 3861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3863 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_halt_monitoring_editable (self);
-#line 3864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 3864 "/home/jens/Source/shotwell/src/Photo.vala"
-	library_monitor_blacklist_file (_tmp0_, "Photo.start_monitoring_editable");
 #line 3866 "/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"
 	_tmp2_ = file;
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = g_file_monitor (_tmp2_, G_FILE_MONITOR_NONE, NULL, &_inner_error_);
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp3_;
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27843 "Photo.c"
+#line 27858 "Photo.c"
 	}
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp1_;
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = NULL;
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->editable_monitor);
-#line 3866 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3868 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->editable_monitor = _tmp4_;
-#line 3867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3869 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = self->priv->editable_monitor;
-#line 3867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3869 "/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 3860 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3862 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp1_);
-#line 27859 "Photo.c"
+#line 27874 "Photo.c"
 }
 
 
@@ -27871,49 +27886,49 @@ static void photo_halt_monitoring_editable (Photo* self) {
 	GFileMonitor* _tmp4_ = NULL;
 	guint _tmp5_ = 0U;
 	GFileMonitor* _tmp6_ = NULL;
-#line 3870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->editable_monitor;
-#line 3871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3873 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ == NULL) {
-#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3874 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27879 "Photo.c"
+#line 27894 "Photo.c"
 	}
-#line 3875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_editable_file (self);
-#line 3875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp1_;
-#line 3876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3878 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 3876 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3878 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 27889 "Photo.c"
+#line 27904 "Photo.c"
 		GFile* _tmp3_ = NULL;
-#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = file;
-#line 3877 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_monitor_unblacklist_file (_tmp3_);
-#line 27895 "Photo.c"
+#line 27910 "Photo.c"
 	}
-#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->editable_monitor;
-#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_parse_name ("changed", g_file_monitor_get_type (), &_tmp5_, NULL, FALSE);
-#line 3879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3881 "/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 3880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3882 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = self->priv->editable_monitor;
-#line 3880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3882 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_file_monitor_cancel (_tmp6_);
-#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3883 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->editable_monitor);
-#line 3881 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3883 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->editable_monitor = NULL;
-#line 3870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3872 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 27913 "Photo.c"
+#line 27928 "Photo.c"
 }
 
 
@@ -27925,174 +27940,174 @@ static void photo_attach_editable (Photo* self, PhotoFileFormat file_format, GFi
 	PhotoFileReader* _tmp4_ = NULL;
 	PhotoFileReader* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 3884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3886 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3884 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3886 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 3889 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3891 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_internal_remove_all_transformations (self, FALSE);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file_format;
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_file_format_create_reader (_tmp0_, _tmp3_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_update_editable (self, FALSE, _tmp5_, &_inner_error_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (_tmp5_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp3_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3892 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27955 "Photo.c"
+#line 27970 "Photo.c"
 	}
 }
 
 
 static void photo_update_editable_attributes (Photo* self, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 3893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3895 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_update_editable (self, TRUE, NULL, &_inner_error_);
-#line 3894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3896 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27972 "Photo.c"
+#line 27987 "Photo.c"
 	}
 }
 
 
 void photo_reimport_editable (Photo* self, GError** error) {
 	GError * _inner_error_ = NULL;
-#line 3897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3899 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_update_editable (self, FALSE, NULL, &_inner_error_);
-#line 3898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3898 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3900 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 27989 "Photo.c"
+#line 28004 "Photo.c"
 	}
 }
 
 
 static void _vala_array_add103 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28001 "Photo.c"
+#line 28016 "Photo.c"
 	}
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28007 "Photo.c"
+#line 28022 "Photo.c"
 }
 
 
 static void _vala_array_add104 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28018 "Photo.c"
+#line 28033 "Photo.c"
 	}
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28024 "Photo.c"
+#line 28039 "Photo.c"
 }
 
 
 static void _vala_array_add105 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28035 "Photo.c"
+#line 28050 "Photo.c"
 	}
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28041 "Photo.c"
+#line 28056 "Photo.c"
 }
 
 
 static void _vala_array_add106 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28052 "Photo.c"
+#line 28067 "Photo.c"
 	}
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28058 "Photo.c"
+#line 28073 "Photo.c"
 }
 
 
 static void _vala_array_add107 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28069 "Photo.c"
+#line 28084 "Photo.c"
 	}
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28075 "Photo.c"
+#line 28090 "Photo.c"
 }
 
 
 static void _vala_array_add108 (gchar*** array, int* length, int* size, gchar* value) {
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((*length) == (*size)) {
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 28086 "Photo.c"
+#line 28101 "Photo.c"
 	}
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[(*length)++] = value;
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 	(*array)[*length] = NULL;
-#line 28092 "Photo.c"
+#line 28107 "Photo.c"
 }
 
 
@@ -28135,168 +28150,168 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 	gchar** _tmp131_ = NULL;
 	gint _tmp131__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((new_reader == NULL) || IS_PHOTO_FILE_READER (new_reader));
 #line 3905 "/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"
 	_tmp2_ = only_attributes;
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_) {
-#line 28143 "Photo.c"
+#line 28158 "Photo.c"
 		PhotoFileReader* _tmp3_ = NULL;
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = new_reader;
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 28149 "Photo.c"
+#line 28164 "Photo.c"
 	} else {
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = FALSE;
-#line 28153 "Photo.c"
+#line 28168 "Photo.c"
 	}
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 28159 "Photo.c"
+#line 28174 "Photo.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = only_attributes;
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = !_tmp4_;
-#line 28166 "Photo.c"
+#line 28181 "Photo.c"
 	}
-#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp0_, "(only_attributes && new_reader == null) || (!only_attributes)");
 #line 3907 "/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"
 	_tmp5_ = photo_get_editable_reader (self);
-#line 3907 "/home/jens/Source/shotwell/src/Photo.vala"
-	old_reader = _tmp5_;
 #line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+	old_reader = _tmp5_;
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = new_reader;
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp7_;
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_ == NULL) {
-#line 28180 "Photo.c"
+#line 28195 "Photo.c"
 		PhotoFileReader* _tmp8_ = NULL;
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = old_reader;
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8_;
-#line 28186 "Photo.c"
+#line 28201 "Photo.c"
 	}
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _photo_file_adapter_ref0 (_tmp6_);
-#line 3909 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
 	reader = _tmp9_;
-#line 3910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3912 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = reader;
-#line 3910 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3912 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_ == NULL) {
-#line 3911 "/home/jens/Source/shotwell/src/Photo.vala"
-		photo_detach_editable (self, FALSE, TRUE, TRUE);
 #line 3913 "/home/jens/Source/shotwell/src/Photo.vala"
+		photo_detach_editable (self, FALSE, TRUE, TRUE);
+#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 3913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (old_reader);
-#line 3913 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3915 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28204 "Photo.c"
+#line 28219 "Photo.c"
 	}
-#line 3916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3918 "/home/jens/Source/shotwell/src/Photo.vala"
 	timestamp_changed = FALSE;
-#line 3917 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3919 "/home/jens/Source/shotwell/src/Photo.vala"
 	filesize_changed = FALSE;
-#line 3918 "/home/jens/Source/shotwell/src/Photo.vala"
-	is_new_editable = FALSE;
 #line 3920 "/home/jens/Source/shotwell/src/Photo.vala"
+	is_new_editable = FALSE;
+#line 3922 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_editable_id (self, &_tmp11_);
-#line 3920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3922 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_id = _tmp11_;
-#line 3921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3923 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = reader;
-#line 3921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3923 "/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 3921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3923 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp13_;
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/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 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	detected = _tmp15_;
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing = _tmp16_;
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (file);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (old_reader);
-#line 3924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3926 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 28246 "Photo.c"
+#line 28261 "Photo.c"
 	}
-#line 3928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = backing_photo_id_is_invalid (&editable_id);
-#line 3928 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_) {
-#line 28252 "Photo.c"
+#line 28267 "Photo.c"
 		BackingPhotoRow* _tmp18_ = NULL;
-#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = backing;
-#line 3930 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp18_ != NULL) {
-#line 28258 "Photo.c"
+#line 28273 "Photo.c"
 			BackingPhotoTable* _tmp19_ = NULL;
 			BackingPhotoTable* _tmp20_ = NULL;
 			BackingPhotoRow* _tmp21_ = NULL;
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = backing_photo_table_get_instance ();
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _tmp19_;
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = backing;
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_table_add (_tmp20_, _tmp21_, &_inner_error_);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp20_);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3931 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28288 "Photo.c"
+#line 28303 "Photo.c"
 			}
 			{
 				PhotoRow* _tmp22_ = NULL;
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = self->row;
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28296 "Photo.c"
+#line 28311 "Photo.c"
 				{
 					PhotoTable* _tmp23_ = NULL;
 					PhotoTable* _tmp24_ = NULL;
@@ -28309,91 +28324,91 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					BackingPhotoRow* _tmp31_ = NULL;
 					BackingPhotoRow* _tmp32_ = NULL;
 					Orientation _tmp33_ = 0;
-#line 3933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3935 "/home/jens/Source/shotwell/src/Photo.vala"
 					timestamp_changed = TRUE;
-#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
-					filesize_changed = TRUE;
 #line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+					filesize_changed = TRUE;
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = photo_table_get_instance ();
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = _tmp23_;
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = self->row;
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp26_ = backing;
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = _tmp26_->id;
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_table_attach_editable (_tmp24_, _tmp25_, &_tmp27_, &_inner_error_);
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					_database_table_unref0 (_tmp24_);
-#line 3936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28329 "Photo.c"
-						goto __finally390;
+#line 28344 "Photo.c"
+						goto __finally391;
 					}
-#line 3937 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = backing;
-#line 3937 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = _backing_photo_row_ref0 (_tmp28_);
-#line 3937 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->priv->editable);
-#line 3937 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->priv->editable = _tmp29_;
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = self->priv->editable;
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = _backing_photo_row_ref0 (_tmp30_);
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->backing_photo_row);
-#line 3938 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3940 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->backing_photo_row = _tmp31_;
-#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = self->backing_photo_row;
-#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = _tmp32_->original_orientation;
-#line 3939 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3941 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_set_orientation (self, _tmp33_);
-#line 28354 "Photo.c"
+#line 28369 "Photo.c"
 				}
-				__finally390:
+				__finally391:
 				{
 					PhotoRow* _tmp34_ = NULL;
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = self->row;
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28363 "Photo.c"
+#line 28378 "Photo.c"
 				}
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (backing);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_detected_photo_information_unref0 (detected);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (file);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (reader);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (old_reader);
-#line 3932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3934 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 28381 "Photo.c"
+#line 28396 "Photo.c"
 				}
 			}
 		}
-#line 3942 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3944 "/home/jens/Source/shotwell/src/Photo.vala"
 		is_new_editable = TRUE;
-#line 28387 "Photo.c"
+#line 28402 "Photo.c"
 	}
-#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = only_attributes;
-#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp35_) {
-#line 28393 "Photo.c"
+#line 28408 "Photo.c"
 		gboolean _tmp36_ = FALSE;
 		GFileInfo* info = NULL;
 		GTimeVal timestamp = {0};
@@ -28406,155 +28421,155 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		glong _tmp51_ = 0L;
 		GFileInfo* _tmp52_ = NULL;
 		gint64 _tmp53_ = 0LL;
-#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp36_ = backing_photo_id_is_valid (&editable_id);
-#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3949 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp36_, "editable_id.is_valid()");
-#line 28410 "Photo.c"
+#line 28425 "Photo.c"
 		{
 			GFileInfo* _tmp37_ = NULL;
 			GFile* _tmp38_ = NULL;
 			GFileInfo* _tmp39_ = NULL;
 			GFileInfo* _tmp40_ = NULL;
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = file;
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = g_file_query_filesystem_info (_tmp38_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, NULL, &_inner_error_);
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = _tmp39_;
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 28424 "Photo.c"
-				goto __catch391_g_error;
+#line 28439 "Photo.c"
+				goto __catch392_g_error;
 			}
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = _tmp37_;
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = NULL;
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3951 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
 			info = _tmp40_;
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp37_);
-#line 28437 "Photo.c"
+#line 28452 "Photo.c"
 		}
-		goto __finally391;
-		__catch391_g_error:
+		goto __finally392;
+		__catch392_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp41_ = NULL;
 			gchar* _tmp42_ = NULL;
 			GError* _tmp43_ = NULL;
 			const gchar* _tmp44_ = NULL;
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = _tmp41_;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = err;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3955 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = _tmp43_->message;
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:3953: Unable to read editable filesystem info for %s: %s", _tmp42_, _tmp44_);
-#line 3953 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 			_g_free0 (_tmp42_);
-#line 3954 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo_detach_editable (self, FALSE, TRUE, TRUE);
 #line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+			photo_detach_editable (self, FALSE, TRUE, TRUE);
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (old_reader);
-#line 3956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3958 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28481 "Photo.c"
+#line 28496 "Photo.c"
 		}
-		__finally391:
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally392:
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (old_reader);
-#line 3950 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3952 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28502 "Photo.c"
+#line 28517 "Photo.c"
 		}
-#line 3959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = info;
-#line 3959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_file_info_get_modification_time (_tmp45_, &_tmp46_);
-#line 3959 "/home/jens/Source/shotwell/src/Photo.vala"
-		timestamp = _tmp46_;
 #line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+		timestamp = _tmp46_;
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = backing_photo_table_get_instance ();
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_;
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = editable_id;
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp50_ = timestamp;
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = _tmp50_.tv_sec;
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = info;
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp53_ = g_file_info_get_size (_tmp52_);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		backing_photo_table_update_attributes (_tmp48_, &_tmp49_, (time_t) _tmp51_, _tmp53_, &_inner_error_);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp48_);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (info);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_backing_photo_row_unref0 (backing);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (reader);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			_photo_file_adapter_unref0 (old_reader);
-#line 3961 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 28546 "Photo.c"
+#line 28561 "Photo.c"
 		}
 		{
 			PhotoRow* _tmp54_ = NULL;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = self->row;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28554 "Photo.c"
+#line 28569 "Photo.c"
 			{
 				BackingPhotoRow* _tmp55_ = NULL;
 				time_t _tmp56_ = 0;
@@ -28570,145 +28585,145 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 				BackingPhotoRow* _tmp66_ = NULL;
 				GFileInfo* _tmp67_ = NULL;
 				gint64 _tmp68_ = 0LL;
-#line 3964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp55_ = self->priv->editable;
-#line 3964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = _tmp55_->timestamp;
-#line 3964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = timestamp;
-#line 3964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = _tmp57_.tv_sec;
-#line 3964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3966 "/home/jens/Source/shotwell/src/Photo.vala"
 				timestamp_changed = _tmp56_ != ((time_t) _tmp58_);
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = self->priv->editable;
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = _tmp59_->filesize;
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp61_ = info;
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp62_ = g_file_info_get_size (_tmp61_);
-#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
-				filesize_changed = _tmp60_ != _tmp62_;
 #line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+				filesize_changed = _tmp60_ != _tmp62_;
+#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp63_ = self->priv->editable;
-#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = timestamp;
-#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = _tmp64_.tv_sec;
-#line 3967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3969 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp63_->timestamp = (time_t) _tmp65_;
-#line 3968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_ = self->priv->editable;
-#line 3968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp67_ = info;
-#line 3968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp68_ = g_file_info_get_size (_tmp67_);
-#line 3968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3970 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_->filesize = _tmp68_;
-#line 28606 "Photo.c"
+#line 28621 "Photo.c"
 			}
-			__finally392:
+			__finally393:
 			{
 				PhotoRow* _tmp69_ = NULL;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = self->row;
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28615 "Photo.c"
+#line 28630 "Photo.c"
 			}
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (info);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3963 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3965 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28635 "Photo.c"
+#line 28650 "Photo.c"
 			}
 		}
-#line 3945 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3947 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (info);
-#line 28640 "Photo.c"
+#line 28655 "Photo.c"
 	} else {
 		gboolean _tmp70_ = FALSE;
 		gboolean _tmp71_ = FALSE;
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp71_ = backing_photo_id_is_valid (&editable_id);
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp71_) {
-#line 28648 "Photo.c"
+#line 28663 "Photo.c"
 			gboolean _tmp72_ = FALSE;
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp72_ = is_new_editable;
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = !_tmp72_;
-#line 28654 "Photo.c"
+#line 28669 "Photo.c"
 		} else {
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp70_ = FALSE;
-#line 28658 "Photo.c"
+#line 28673 "Photo.c"
 		}
-#line 3972 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3974 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp70_) {
-#line 28662 "Photo.c"
+#line 28677 "Photo.c"
 			BackingPhotoRow* _tmp73_ = NULL;
 			BackingPhotoID _tmp74_ = {0};
 			BackingPhotoTable* _tmp75_ = NULL;
 			BackingPhotoTable* _tmp76_ = NULL;
 			BackingPhotoRow* _tmp77_ = NULL;
-#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_ = backing;
-#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp74_ = editable_id;
-#line 3977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp73_->id = _tmp74_;
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp75_ = backing_photo_table_get_instance ();
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = _tmp75_;
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = backing;
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_table_update (_tmp76_, _tmp77_, &_inner_error_);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp76_);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28700 "Photo.c"
+#line 28715 "Photo.c"
 			}
 			{
 				PhotoRow* _tmp78_ = NULL;
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp78_ = self->row;
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 28708 "Photo.c"
+#line 28723 "Photo.c"
 				{
 					BackingPhotoRow* _tmp79_ = NULL;
 					time_t _tmp80_ = 0;
@@ -28724,232 +28739,232 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 					BackingPhotoRow* _tmp90_ = NULL;
 					BackingPhotoRow* _tmp91_ = NULL;
 					Orientation _tmp92_ = 0;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp79_ = self->priv->editable;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp80_ = _tmp79_->timestamp;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp81_ = backing;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp82_ = _tmp81_->timestamp;
-#line 3980 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3982 "/home/jens/Source/shotwell/src/Photo.vala"
 					timestamp_changed = _tmp80_ != _tmp82_;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp83_ = self->priv->editable;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp84_ = _tmp83_->filesize;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp85_ = backing;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp86_ = _tmp85_->filesize;
-#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
-					filesize_changed = _tmp84_ != _tmp86_;
 #line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+					filesize_changed = _tmp84_ != _tmp86_;
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp87_ = backing;
-#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp88_ = _backing_photo_row_ref0 (_tmp87_);
-#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->priv->editable);
-#line 3983 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->priv->editable = _tmp88_;
-#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp89_ = self->priv->editable;
-#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp90_ = _backing_photo_row_ref0 (_tmp89_);
-#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->backing_photo_row);
-#line 3984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3986 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->backing_photo_row = _tmp90_;
-#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3987 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp91_ = self->backing_photo_row;
-#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3987 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp92_ = _tmp91_->original_orientation;
-#line 3985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3987 "/home/jens/Source/shotwell/src/Photo.vala"
 					photo_set_orientation (self, _tmp92_);
-#line 28766 "Photo.c"
+#line 28781 "Photo.c"
 				}
-				__finally393:
+				__finally394:
 				{
 					PhotoRow* _tmp93_ = NULL;
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp93_ = self->row;
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 28775 "Photo.c"
+#line 28790 "Photo.c"
 				}
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_propagate_error (error, _inner_error_);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (backing);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_detected_photo_information_unref0 (detected);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (file);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (reader);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					_photo_file_adapter_unref0 (old_reader);
-#line 3979 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3981 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 28793 "Photo.c"
+#line 28808 "Photo.c"
 				}
 			}
 		}
 	}
-#line 3991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp94_ = new_reader;
-#line 3991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp94_ != NULL) {
-#line 28802 "Photo.c"
+#line 28817 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp95_ = NULL;
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp95_ = self->priv->readers;
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 28809 "Photo.c"
+#line 28824 "Photo.c"
 			{
 				PhotoBackingReaders* _tmp96_ = NULL;
 				PhotoFileReader* _tmp97_ = NULL;
 				PhotoFileReader* _tmp98_ = NULL;
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp96_ = self->priv->readers;
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp97_ = new_reader;
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = _photo_file_adapter_ref0 (_tmp97_);
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (_tmp96_->editable);
-#line 3993 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3995 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp96_->editable = _tmp98_;
-#line 28824 "Photo.c"
+#line 28839 "Photo.c"
 			}
-			__finally394:
+			__finally395:
 			{
 				PhotoBackingReaders* _tmp99_ = NULL;
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp99_ = self->priv->readers;
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 28833 "Photo.c"
+#line 28848 "Photo.c"
 			}
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (backing);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (reader);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (old_reader);
-#line 3992 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3994 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 28851 "Photo.c"
+#line 28866 "Photo.c"
 			}
 		}
 	}
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp101_ = only_attributes;
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp101_) {
-#line 28859 "Photo.c"
+#line 28874 "Photo.c"
 		PhotoFileReader* _tmp102_ = NULL;
 		PhotoFileReader* _tmp103_ = NULL;
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp102_ = reader;
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp103_ = old_reader;
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = _tmp102_ != _tmp103_;
-#line 28868 "Photo.c"
+#line 28883 "Photo.c"
 	} else {
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp100_ = FALSE;
-#line 28872 "Photo.c"
+#line 28887 "Photo.c"
 	}
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp100_) {
-#line 28876 "Photo.c"
+#line 28891 "Photo.c"
 		GFile* _tmp104_ = NULL;
 		PhotoFileReader* _tmp105_ = NULL;
 		GFile* _tmp108_ = NULL;
 		PhotoFileReader* _tmp109_ = NULL;
-#line 3998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_replaced (self);
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp105_ = old_reader;
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp105_ != NULL) {
-#line 28887 "Photo.c"
+#line 28902 "Photo.c"
 			PhotoFileReader* _tmp106_ = NULL;
 			GFile* _tmp107_ = NULL;
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp106_ = old_reader;
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/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 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp104_);
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp104_ = _tmp107_;
-#line 28898 "Photo.c"
+#line 28913 "Photo.c"
 		} else {
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp104_);
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp104_ = NULL;
-#line 28904 "Photo.c"
+#line 28919 "Photo.c"
 		}
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp109_ = new_reader;
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp109_ != NULL) {
-#line 28910 "Photo.c"
+#line 28925 "Photo.c"
 			PhotoFileReader* _tmp110_ = NULL;
 			GFile* _tmp111_ = NULL;
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp110_ = new_reader;
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/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 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp108_);
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = _tmp111_;
-#line 28921 "Photo.c"
+#line 28936 "Photo.c"
 		} else {
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp108_);
-#line 4000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp108_ = NULL;
-#line 28927 "Photo.c"
+#line 28942 "Photo.c"
 		}
-#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4001 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp104_, _tmp108_);
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp108_);
-#line 3997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3999 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp104_);
-#line 28935 "Photo.c"
+#line 28950 "Photo.c"
 	}
-#line 4003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp112_ = g_new0 (gchar*, 0 + 1);
-#line 4003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration_list = _tmp112_;
-#line 4003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration_list_length1 = 0;
-#line 4003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_list_size_ = alteration_list_length1;
-#line 4004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp113_ = timestamp_changed;
-#line 4004 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp113_) {
-#line 28949 "Photo.c"
+#line 28964 "Photo.c"
 		gchar** _tmp114_ = NULL;
 		gint _tmp114__length1 = 0;
 		gchar* _tmp115_ = NULL;
@@ -28957,59 +28972,59 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		gint _tmp116__length1 = 0;
 		gchar* _tmp117_ = NULL;
 		gboolean _tmp118_ = FALSE;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114_ = alteration_list;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp114__length1 = alteration_list_length1;
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp115_ = g_strdup ("metadata:editable-timestamp");
-#line 4005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4007 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add103 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp115_);
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp116_ = alteration_list;
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp116__length1 = alteration_list_length1;
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp117_ = g_strdup ("metadata:baseline-timestamp");
-#line 4006 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add104 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp117_);
 #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"
 		_tmp118_ = photo_is_editable_source (self);
-#line 4008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4010 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp118_) {
-#line 28977 "Photo.c"
+#line 28992 "Photo.c"
 			gchar** _tmp119_ = NULL;
 			gint _tmp119__length1 = 0;
 			gchar* _tmp120_ = NULL;
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp119_ = alteration_list;
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp119__length1 = alteration_list_length1;
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp120_ = g_strdup ("metadata:source-timestamp");
-#line 4009 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4011 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add105 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp120_);
-#line 28989 "Photo.c"
+#line 29004 "Photo.c"
 		}
 	}
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp122_ = filesize_changed;
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp122_) {
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = TRUE;
-#line 28998 "Photo.c"
+#line 29013 "Photo.c"
 	} else {
 		PhotoFileReader* _tmp123_ = NULL;
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp123_ = new_reader;
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp121_ = _tmp123_ != NULL;
-#line 29005 "Photo.c"
+#line 29020 "Photo.c"
 	}
-#line 4012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp121_) {
-#line 29009 "Photo.c"
+#line 29024 "Photo.c"
 		gchar** _tmp124_ = NULL;
 		gint _tmp124__length1 = 0;
 		gchar* _tmp125_ = NULL;
@@ -29017,79 +29032,79 @@ static void photo_update_editable (Photo* self, gboolean only_attributes, PhotoF
 		gint _tmp126__length1 = 0;
 		gchar* _tmp127_ = NULL;
 		gboolean _tmp128_ = FALSE;
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp124_ = alteration_list;
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp124__length1 = alteration_list_length1;
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp125_ = g_strdup ("image:editable");
-#line 4013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4015 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_array_add106 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp125_);
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp126_ = alteration_list;
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp126__length1 = alteration_list_length1;
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp127_ = g_strdup ("image:baseline");
-#line 4014 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_array_add107 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp127_);
 #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"
 		_tmp128_ = photo_is_editable_source (self);
-#line 4016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4018 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp128_) {
-#line 29037 "Photo.c"
+#line 29052 "Photo.c"
 			gchar** _tmp129_ = NULL;
 			gint _tmp129__length1 = 0;
 			gchar* _tmp130_ = NULL;
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp129_ = alteration_list;
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp129__length1 = alteration_list_length1;
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp130_ = g_strdup ("image:source");
-#line 4017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4019 "/home/jens/Source/shotwell/src/Photo.vala"
 			_vala_array_add108 (&alteration_list, &alteration_list_length1, &_alteration_list_size_, _tmp130_);
-#line 29049 "Photo.c"
+#line 29064 "Photo.c"
 		}
 	}
-#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp131_ = alteration_list;
-#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp131__length1 = alteration_list_length1;
-#line 4020 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4022 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp131__length1 > 0) {
-#line 29058 "Photo.c"
+#line 29073 "Photo.c"
 		gchar** _tmp132_ = NULL;
 		gint _tmp132__length1 = 0;
 		Alteration* _tmp133_ = NULL;
 		Alteration* _tmp134_ = NULL;
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp132_ = alteration_list;
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp132__length1 = alteration_list_length1;
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp133_ = alteration_new_from_array (_tmp132_, _tmp132__length1);
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp134_ = _tmp133_;
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp134_);
-#line 4021 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4023 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp134_);
-#line 29075 "Photo.c"
+#line 29090 "Photo.c"
 	}
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	alteration_list = (_vala_array_free (alteration_list, alteration_list_length1, (GDestroyNotify) g_free), NULL);
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (backing);
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_detected_photo_information_unref0 (detected);
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 3903 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 3905 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (old_reader);
-#line 29089 "Photo.c"
+#line 29104 "Photo.c"
 }
 
 
@@ -29105,96 +29120,96 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 	gboolean _tmp43_ = FALSE;
 	gboolean _tmp44_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 4024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4025 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_halt_monitoring_editable (self);
 #line 4027 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_halt_monitoring_editable (self);
+#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
 	has_editable = FALSE;
-#line 4028 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable_file = NULL;
-#line 29113 "Photo.c"
+#line 29128 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29120 "Photo.c"
+#line 29135 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
-#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 4030 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp2_ != NULL) {
-#line 29130 "Photo.c"
+#line 29145 "Photo.c"
 				PhotoBackingReaders* _tmp3_ = NULL;
 				PhotoFileReader* _tmp4_ = NULL;
 				GFile* _tmp5_ = NULL;
 				PhotoBackingReaders* _tmp6_ = NULL;
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = self->priv->readers;
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = _tmp3_->editable;
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/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 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (editable_file);
-#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_file = _tmp5_;
-#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = self->priv->readers;
-#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_file_adapter_unref0 (_tmp6_->editable);
-#line 4032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4034 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_->editable = NULL;
-#line 4033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4035 "/home/jens/Source/shotwell/src/Photo.vala"
 				has_editable = TRUE;
-#line 29153 "Photo.c"
+#line 29168 "Photo.c"
 			}
 		}
-		__finally395:
+		__finally396:
 		{
 			PhotoBackingReaders* _tmp7_ = NULL;
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = self->priv->readers;
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29163 "Photo.c"
+#line 29178 "Photo.c"
 		}
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/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 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4029 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4031 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29175 "Photo.c"
+#line 29190 "Photo.c"
 		}
 	}
-#line 4037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = has_editable;
-#line 4037 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 29182 "Photo.c"
+#line 29197 "Photo.c"
 		BackingPhotoID editable_id = {0};
-#line 4038 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
 		backing_photo_id_init (&editable_id, BACKING_PHOTO_ID_INVALID);
-#line 29186 "Photo.c"
+#line 29201 "Photo.c"
 		{
 			{
 				PhotoRow* _tmp9_ = NULL;
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = self->row;
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_rec_mutex_lock (&self->priv->__lock_row);
-#line 29194 "Photo.c"
+#line 29209 "Photo.c"
 				{
 					PhotoRow* _tmp10_ = NULL;
 					BackingPhotoID _tmp11_ = {0};
@@ -29202,237 +29217,237 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 					PhotoRow* _tmp16_ = NULL;
 					BackingPhotoRow* _tmp17_ = NULL;
 					BackingPhotoRow* _tmp18_ = NULL;
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = self->row;
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp11_ = _tmp10_->editable_id;
-#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
 					editable_id = _tmp11_;
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = backing_photo_id_is_valid (&editable_id);
-#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_tmp12_) {
-#line 29212 "Photo.c"
+#line 29227 "Photo.c"
 						PhotoTable* _tmp13_ = NULL;
 						PhotoTable* _tmp14_ = NULL;
 						PhotoRow* _tmp15_ = NULL;
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp13_ = photo_table_get_instance ();
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp14_ = _tmp13_;
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp15_ = self->row;
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						photo_table_detach_editable (_tmp14_, _tmp15_, &_inner_error_);
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						_database_table_unref0 (_tmp14_);
-#line 4043 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4045 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29228 "Photo.c"
-							goto __finally397;
+#line 29243 "Photo.c"
+							goto __finally398;
 						}
 					}
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = self->row;
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = _tmp16_->master;
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = _backing_photo_row_ref0 (_tmp17_);
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (self->backing_photo_row);
-#line 4044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4046 "/home/jens/Source/shotwell/src/Photo.vala"
 					self->backing_photo_row = _tmp18_;
-#line 29242 "Photo.c"
+#line 29257 "Photo.c"
 				}
-				__finally397:
+				__finally398:
 				{
 					PhotoRow* _tmp19_ = NULL;
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = self->row;
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 29251 "Photo.c"
+#line 29266 "Photo.c"
 				}
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29257 "Photo.c"
-						goto __catch396_database_error;
+#line 29272 "Photo.c"
+						goto __catch397_database_error;
 					}
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/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 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 4040 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4042 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 29268 "Photo.c"
+#line 29283 "Photo.c"
 				}
 			}
 		}
-		goto __finally396;
-		__catch396_database_error:
+		goto __finally397;
+		__catch397_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp20_ = NULL;
 			const gchar* _tmp21_ = NULL;
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 4047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4049 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = err;
-#line 4047 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4049 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = _tmp20_->message;
-#line 4047 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:4047: Unable to remove editable from PhotoTable: %s", _tmp21_);
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 			_g_error_free0 (err);
-#line 29290 "Photo.c"
+#line 29305 "Photo.c"
 		}
-		__finally396:
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally397:
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/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 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4041 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29303 "Photo.c"
+#line 29318 "Photo.c"
 		}
 		{
 			gboolean _tmp22_ = FALSE;
-#line 4051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = backing_photo_id_is_valid (&editable_id);
-#line 4051 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4053 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp22_) {
-#line 29311 "Photo.c"
+#line 29326 "Photo.c"
 				BackingPhotoTable* _tmp23_ = NULL;
 				BackingPhotoTable* _tmp24_ = NULL;
 				BackingPhotoID _tmp25_ = {0};
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = backing_photo_table_get_instance ();
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _tmp23_;
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = editable_id;
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				backing_photo_table_remove (_tmp24_, &_tmp25_, &_inner_error_);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				_database_table_unref0 (_tmp24_);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 29329 "Photo.c"
-						goto __catch398_database_error;
+#line 29344 "Photo.c"
+						goto __catch399_database_error;
 					}
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (editable_file);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/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 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_clear_error (&_inner_error_);
-#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 29340 "Photo.c"
+#line 29355 "Photo.c"
 				}
 			}
 		}
-		goto __finally398;
-		__catch398_database_error:
+		goto __finally399;
+		__catch399_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp26_ = NULL;
 			const gchar* _tmp27_ = NULL;
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4056 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = err;
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4056 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = _tmp26_->message;
-#line 4054 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:4054: Unable to remove editable from BackingPhotoTable: %s", _tmp27_);
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 			_g_error_free0 (err);
-#line 29362 "Photo.c"
+#line 29377 "Photo.c"
 		}
-		__finally398:
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally399:
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/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 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4050 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4052 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29375 "Photo.c"
+#line 29390 "Photo.c"
 		}
 	}
-#line 4058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = remove_transformations;
-#line 4058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4060 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_) {
-#line 4059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_internal_remove_all_transformations (self, FALSE);
-#line 29384 "Photo.c"
+#line 29399 "Photo.c"
 	}
-#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = has_editable;
-#line 4061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_) {
-#line 29390 "Photo.c"
+#line 29405 "Photo.c"
 		GFile* _tmp30_ = NULL;
-#line 4062 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4064 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_baseline_replaced (self);
-#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = editable_file;
-#line 4063 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4065 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_notify_editable_replaced (self, _tmp30_, NULL);
-#line 29398 "Photo.c"
+#line 29413 "Photo.c"
 	}
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = delete_editable;
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp32_) {
-#line 29404 "Photo.c"
+#line 29419 "Photo.c"
 		GFile* _tmp33_ = NULL;
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = editable_file;
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = _tmp33_ != NULL;
-#line 29410 "Photo.c"
+#line 29425 "Photo.c"
 	} else {
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = FALSE;
-#line 29414 "Photo.c"
+#line 29429 "Photo.c"
 	}
-#line 4066 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp31_) {
-#line 29418 "Photo.c"
+#line 29433 "Photo.c"
 		{
 			GFile* _tmp34_ = NULL;
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = editable_file;
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_file_trash (_tmp34_, NULL, &_inner_error_);
-#line 4068 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29427 "Photo.c"
-				goto __catch399_g_error;
+#line 29442 "Photo.c"
+				goto __catch400_g_error;
 			}
 		}
-		goto __finally399;
-		__catch399_g_error:
+		goto __finally400;
+		__catch400_g_error:
 		{
 			GError* err = NULL;
 			GFile* _tmp35_ = NULL;
@@ -29442,116 +29457,116 @@ static void photo_detach_editable (Photo* self, gboolean delete_editable, gboole
 			gchar* _tmp39_ = NULL;
 			GError* _tmp40_ = NULL;
 			const gchar* _tmp41_ = NULL;
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			err = _inner_error_;
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			_inner_error_ = NULL;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp35_ = editable_file;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp36_ = g_file_get_path (_tmp35_);
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp37_ = _tmp36_;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = _tmp38_;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = err;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = _tmp40_->message;
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
-			g_warning ("Photo.vala:4070: Unable to trash editable %s for %s: %s", _tmp37_, _tmp39_, _tmp41_);
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 			_g_free0 (_tmp39_);
-#line 4070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4072 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_free0 (_tmp37_);
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_error_free0 (err);
-#line 29468 "Photo.c"
+#line 29483 "Photo.c"
 		}
-		__finally399:
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+		__finally400:
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (editable_file);
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/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 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4069 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29481 "Photo.c"
+#line 29496 "Photo.c"
 		}
 	}
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = has_editable;
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp44_) {
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = TRUE;
-#line 29490 "Photo.c"
+#line 29505 "Photo.c"
 	} else {
 		gboolean _tmp45_ = FALSE;
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp45_ = remove_transformations;
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp45_;
-#line 29497 "Photo.c"
+#line 29512 "Photo.c"
 	}
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp43_) {
-#line 29501 "Photo.c"
+#line 29516 "Photo.c"
 		gboolean _tmp46_ = FALSE;
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = notify;
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = _tmp46_;
-#line 29507 "Photo.c"
+#line 29522 "Photo.c"
 	} else {
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp42_ = FALSE;
-#line 29511 "Photo.c"
+#line 29526 "Photo.c"
 	}
-#line 4075 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4077 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp42_) {
-#line 29515 "Photo.c"
+#line 29530 "Photo.c"
 		Alteration* _tmp47_ = NULL;
 		Alteration* _tmp48_ = NULL;
-#line 4076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = alteration_new ("image", "revert");
-#line 4076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_;
-#line 4076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
 		data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp48_);
-#line 4076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4078 "/home/jens/Source/shotwell/src/Photo.vala"
 		_alteration_unref0 (_tmp48_);
-#line 29526 "Photo.c"
+#line 29541 "Photo.c"
 	}
-#line 4024 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4026 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (editable_file);
-#line 29530 "Photo.c"
+#line 29545 "Photo.c"
 }
 
 
 static void _photo_on_reimport_editable_one_shot_callback (gpointer self) {
-#line 4098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_reimport_editable ((Photo*) self);
-#line 29537 "Photo.c"
+#line 29552 "Photo.c"
 }
 
 
 static void _photo_on_update_editable_attributes_one_shot_callback (gpointer self) {
-#line 4107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_update_editable_attributes ((Photo*) self);
-#line 29544 "Photo.c"
+#line 29559 "Photo.c"
 }
 
 
 static void _photo_on_remove_editable_one_shot_callback (gpointer self) {
-#line 4116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_on_remove_editable ((Photo*) self);
-#line 29551 "Photo.c"
+#line 29566 "Photo.c"
 }
 
 
@@ -29563,20 +29578,20 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 	gchar* _tmp16_ = NULL;
 	GFileMonitorEvent _tmp17_ = 0;
 	GError * _inner_error_ = NULL;
-#line 4079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 4079 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((other_file == NULL) || G_IS_FILE (other_file));
-#line 29569 "Photo.c"
+#line 29584 "Photo.c"
 	{
 		PhotoBackingReaders* _tmp0_ = NULL;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->readers;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_readers);
-#line 29576 "Photo.c"
+#line 29591 "Photo.c"
 		{
 			PhotoBackingReaders* _tmp1_ = NULL;
 			PhotoFileReader* _tmp2_ = NULL;
@@ -29587,181 +29602,181 @@ static void photo_on_editable_file_changed (Photo* self, GFile* file, GFile* oth
 			GFile* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			gboolean _tmp9_ = FALSE;
-#line 4082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = self->priv->readers;
-#line 4082 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = _tmp1_->editable;
-#line 4082 "/home/jens/Source/shotwell/src/Photo.vala"
-			_vala_assert (_tmp2_ != NULL, "readers.editable != null");
 #line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+			_vala_assert (_tmp2_ != NULL, "readers.editable != null");
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = file;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->priv->readers;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp4_->editable;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/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 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _tmp6_;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = g_file_equal (_tmp3_, _tmp7_);
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = !_tmp8_;
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp7_);
-#line 4084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4086 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp9_) {
-#line 29611 "Photo.c"
+#line 29626 "Photo.c"
 				{
 					PhotoBackingReaders* _tmp10_ = NULL;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp10_ = self->priv->readers;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29618 "Photo.c"
+#line 29633 "Photo.c"
 				}
-#line 4088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4090 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 29622 "Photo.c"
+#line 29637 "Photo.c"
 			}
 		}
-		__finally400:
+		__finally401:
 		{
 			PhotoBackingReaders* _tmp11_ = NULL;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = self->priv->readers;
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_readers);
-#line 29632 "Photo.c"
+#line 29647 "Photo.c"
 		}
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/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 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4081 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4083 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 29642 "Photo.c"
+#line 29657 "Photo.c"
 		}
 	}
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = event;
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = g_enum_get_value (g_type_class_ref (g_file_monitor_event_get_type ()), _tmp12_);
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = file;
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = g_file_get_path (_tmp14_);
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = _tmp15_;
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4092: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_);
-#line 4092 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_free0 (_tmp16_);
 #line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
-	_tmp17_ = event;
+	g_debug ("Photo.vala:4094: EDITABLE %s: %s", (_tmp13_ != NULL) ? _tmp13_->value_name : NULL, _tmp16_);
 #line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+	_g_free0 (_tmp16_);
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
+	_tmp17_ = event;
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 	switch (_tmp17_) {
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CHANGED:
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CREATED:
-#line 29667 "Photo.c"
+#line 29682 "Photo.c"
 		{
 			OneShotScheduler* _tmp18_ = NULL;
 			OneShotScheduler* _tmp20_ = NULL;
-#line 4097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4099 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = self->priv->reimport_editable_scheduler;
-#line 4097 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4099 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp18_ == NULL) {
-#line 29675 "Photo.c"
+#line 29690 "Photo.c"
 				OneShotScheduler* _tmp19_ = NULL;
-#line 4098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = one_shot_scheduler_new ("Photo.reimport_editable", _photo_on_reimport_editable_one_shot_callback, self);
-#line 4098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->reimport_editable_scheduler);
-#line 4098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4100 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->reimport_editable_scheduler = _tmp19_;
-#line 29683 "Photo.c"
+#line 29698 "Photo.c"
 			}
-#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4104 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = self->priv->reimport_editable_scheduler;
-#line 4102 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4104 "/home/jens/Source/shotwell/src/Photo.vala"
 			one_shot_scheduler_after_timeout (_tmp20_, (guint) 1000, TRUE);
-#line 4103 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4105 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29691 "Photo.c"
+#line 29706 "Photo.c"
 		}
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_ATTRIBUTE_CHANGED:
-#line 29695 "Photo.c"
+#line 29710 "Photo.c"
 		{
 			OneShotScheduler* _tmp21_ = NULL;
 			OneShotScheduler* _tmp23_ = NULL;
-#line 4106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4108 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = self->priv->update_editable_attributes_scheduler;
-#line 4106 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4108 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_ == NULL) {
-#line 29703 "Photo.c"
+#line 29718 "Photo.c"
 				OneShotScheduler* _tmp22_ = NULL;
-#line 4107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4109 "/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 4107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->update_editable_attributes_scheduler);
-#line 4107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4109 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->update_editable_attributes_scheduler = _tmp22_;
-#line 29711 "Photo.c"
+#line 29726 "Photo.c"
 			}
-#line 4111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = self->priv->update_editable_attributes_scheduler;
-#line 4111 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4113 "/home/jens/Source/shotwell/src/Photo.vala"
 			one_shot_scheduler_after_timeout (_tmp23_, (guint) 1000, TRUE);
-#line 4112 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4114 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29719 "Photo.c"
+#line 29734 "Photo.c"
 		}
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_DELETED:
-#line 29723 "Photo.c"
+#line 29738 "Photo.c"
 		{
 			OneShotScheduler* _tmp24_ = NULL;
 			OneShotScheduler* _tmp26_ = NULL;
-#line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4117 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = self->priv->remove_editable_scheduler;
-#line 4115 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4117 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp24_ == NULL) {
-#line 29731 "Photo.c"
+#line 29746 "Photo.c"
 				OneShotScheduler* _tmp25_ = NULL;
-#line 4116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = one_shot_scheduler_new ("Photo.remove_editable", _photo_on_remove_editable_one_shot_callback, self);
-#line 4116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 				_one_shot_scheduler_unref0 (self->priv->remove_editable_scheduler);
-#line 4116 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4118 "/home/jens/Source/shotwell/src/Photo.vala"
 				self->priv->remove_editable_scheduler = _tmp25_;
-#line 29739 "Photo.c"
+#line 29754 "Photo.c"
 			}
-#line 4120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4122 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = self->priv->remove_editable_scheduler;
-#line 4120 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4122 "/home/jens/Source/shotwell/src/Photo.vala"
 			one_shot_scheduler_after_timeout (_tmp26_, (guint) 3000, TRUE);
-#line 4121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4123 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29747 "Photo.c"
+#line 29762 "Photo.c"
 		}
 		default:
-#line 4094 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4096 "/home/jens/Source/shotwell/src/Photo.vala"
 		case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-#line 29752 "Photo.c"
+#line 29767 "Photo.c"
 		{
-#line 4126 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4128 "/home/jens/Source/shotwell/src/Photo.vala"
 			break;
-#line 29756 "Photo.c"
+#line 29771 "Photo.c"
 		}
 	}
-#line 4131 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4133 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_discard_prefetched (self);
-#line 29761 "Photo.c"
+#line 29776 "Photo.c"
 }
 
 
@@ -29769,67 +29784,67 @@ static void photo_on_reimport_editable (Photo* self) {
 	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 4134 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail (IS_PHOTO (self));
 #line 4136 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_discard_prefetched (self);
+	g_return_if_fail (IS_PHOTO (self));
 #line 4138 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_discard_prefetched (self);
+#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4138 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4138: Reimporting editable for %s", _tmp1_);
-#line 4138 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 	_g_free0 (_tmp1_);
-#line 29781 "Photo.c"
+#line 29796 "Photo.c"
 	{
-#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable (self, &_inner_error_);
-#line 4140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29787 "Photo.c"
-			goto __catch401_g_error;
+#line 29802 "Photo.c"
+			goto __catch402_g_error;
 		}
 	}
-	goto __finally401;
-	__catch401_g_error:
+	goto __finally402;
+	__catch402_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_->message;
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:4142: Unable to reimport photo %s changed by external edito" \
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
+		g_warning ("Photo.vala:4144: Unable to reimport photo %s changed by external edito" \
 "r: %s", _tmp3_, _tmp5_);
-#line 4142 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4144 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_free0 (_tmp3_);
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 29817 "Photo.c"
+#line 29832 "Photo.c"
 	}
-	__finally401:
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally402:
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/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 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 4139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4141 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29828 "Photo.c"
+#line 29843 "Photo.c"
 	}
 }
 
@@ -29838,56 +29853,56 @@ static void photo_on_update_editable_attributes (Photo* self) {
 	gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 4147 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4148 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4148: Updating editable attributes for %s", _tmp1_);
-#line 4148 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 	_g_free0 (_tmp1_);
-#line 29847 "Photo.c"
+#line 29862 "Photo.c"
 	{
-#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_update_editable_attributes (self, &_inner_error_);
-#line 4150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 29853 "Photo.c"
-			goto __catch402_g_error;
+#line 29868 "Photo.c"
+			goto __catch403_g_error;
 		}
 	}
-	goto __finally402;
-	__catch402_g_error:
+	goto __finally403;
+	__catch403_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4154 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = err;
-#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4154 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_->message;
-#line 4152 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:4152: Unable to update editable attributes: %s", _tmp3_);
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_error_free0 (err);
-#line 29875 "Photo.c"
+#line 29890 "Photo.c"
 	}
-	__finally402:
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally403:
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4151 "/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 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 4149 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4151 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29886 "Photo.c"
+#line 29901 "Photo.c"
 	}
 }
 
@@ -29903,68 +29918,68 @@ static void photo_on_remove_editable (Photo* self) {
 	gboolean _tmp5_ = FALSE;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 4156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_editable_reader (self);
-#line 4157 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
 	reader = _tmp0_;
-#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = reader;
-#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4160 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 4159 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29916 "Photo.c"
+#line 29931 "Photo.c"
 	}
-#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = reader;
-#line 4161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4163 "/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 4161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp3_;
-#line 4162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4164 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = file;
-#line 4162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4164 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = g_file_query_exists (_tmp4_, NULL);
-#line 4162 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4164 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 29930 "Photo.c"
+#line 29945 "Photo.c"
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_;
-#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_debug ("Photo.vala:4163: Not removing editable for %s: file exists", _tmp7_);
-#line 4163 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_free0 (_tmp7_);
 #line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
-		_g_object_unref0 (file);
+		g_debug ("Photo.vala:4165: Not removing editable for %s: file exists", _tmp7_);
 #line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_free0 (_tmp7_);
+#line 4167 "/home/jens/Source/shotwell/src/Photo.vala"
+		_g_object_unref0 (file);
+#line 4167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_file_adapter_unref0 (reader);
-#line 4165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4167 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 29947 "Photo.c"
+#line 29962 "Photo.c"
 	}
-#line 4168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 4168 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4170 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_;
-#line 4168 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_debug ("Photo.vala:4168: Removing editable for %s: file no longer exists", _tmp9_);
-#line 4168 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 	_g_free0 (_tmp9_);
-#line 4169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4171 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_detach_editable (self, FALSE, TRUE, TRUE);
-#line 4156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 4156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4158 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_file_adapter_unref0 (reader);
-#line 29963 "Photo.c"
+#line 29978 "Photo.c"
 }
 
 
@@ -29975,25 +29990,25 @@ void photo_get_original_dimensions (Photo* self, Dimensions* result) {
 	Orientation _tmp1_ = 0;
 	Dimensions _tmp2_ = {0};
 	Dimensions _tmp3_ = {0};
-#line 4177 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4179 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4180 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp0_);
-#line 4178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4180 "/home/jens/Source/shotwell/src/Photo.vala"
 	dim = _tmp0_;
-#line 4179 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_orientation (self);
-#line 4179 "/home/jens/Source/shotwell/src/Photo.vala"
-	orientation = _tmp1_;
 #line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
+	orientation = _tmp1_;
+#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = dim;
-#line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_rotate_dimensions (orientation, &_tmp2_, &_tmp3_);
-#line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp3_;
-#line 4181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4183 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 29992 "Photo.c"
+#line 30007 "Photo.c"
 }
 
 
@@ -30001,19 +30016,19 @@ void photo_get_master_dimensions (Photo* self, Dimensions* result) {
 	Orientation _tmp0_ = 0;
 	Dimensions _tmp1_ = {0};
 	Dimensions _tmp2_ = {0};
-#line 4185 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4187 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_original_orientation (self);
-#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_raw_dimensions (self, &_tmp1_);
-#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_rotate_dimensions (_tmp0_, &_tmp1_, &_tmp2_);
-#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp2_;
-#line 4186 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4188 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 30012 "Photo.c"
+#line 30027 "Photo.c"
 }
 
 
@@ -30029,77 +30044,77 @@ gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions) {
 	Orientation _tmp3_ = 0;
 	PhotoException _tmp4_ = 0;
 	gboolean _tmp5_ = FALSE;
-#line 4190 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO (self), FALSE);
 #line 4192 "/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"
 	_tmp1_ = photo_get_raw_crop (self, &_tmp0_);
-#line 4192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4194 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw = _tmp0_;
-#line 4192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4194 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 4193 "/home/jens/Source/shotwell/src/Photo.vala"
-		box_init (&_vala_crop, 0, 0, 0, 0);
 #line 4195 "/home/jens/Source/shotwell/src/Photo.vala"
+		box_init (&_vala_crop, 0, 0, 0, 0);
+#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 4195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (crop) {
-#line 4195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
 			*crop = _vala_crop;
-#line 30044 "Photo.c"
+#line 30059 "Photo.c"
 		}
-#line 4195 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4197 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30048 "Photo.c"
+#line 30063 "Photo.c"
 	}
-#line 4198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4200 "/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 4198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4200 "/home/jens/Source/shotwell/src/Photo.vala"
 	dim = _tmp2_;
-#line 4199 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4201 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_get_orientation (self);
-#line 4199 "/home/jens/Source/shotwell/src/Photo.vala"
-	orientation = _tmp3_;
 #line 4201 "/home/jens/Source/shotwell/src/Photo.vala"
+	orientation = _tmp3_;
+#line 4203 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = exceptions;
-#line 4201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4203 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_exception_allows (_tmp4_, PHOTO_EXCEPTION_ORIENTATION);
-#line 4201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4203 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 30064 "Photo.c"
+#line 30079 "Photo.c"
 		Orientation _tmp6_ = 0;
 		Dimensions _tmp7_ = {0};
 		Box _tmp8_ = {0};
 		Box _tmp9_ = {0};
-#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = orientation;
-#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = dim;
-#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = raw;
-#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		orientation_rotate_box (_tmp6_, &_tmp7_, &_tmp8_, &_tmp9_);
-#line 4202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_crop = _tmp9_;
-#line 30079 "Photo.c"
+#line 30094 "Photo.c"
 	} else {
 		Box _tmp10_ = {0};
-#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = raw;
-#line 4204 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_crop = _tmp10_;
-#line 30086 "Photo.c"
+#line 30101 "Photo.c"
 	}
-#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (crop) {
-#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 		*crop = _vala_crop;
-#line 30094 "Photo.c"
+#line 30109 "Photo.c"
 	}
-#line 4206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4208 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30098 "Photo.c"
+#line 30113 "Photo.c"
 }
 
 
@@ -30137,87 +30152,87 @@ void photo_set_crop (Photo* self, Box* crop) {
 	gint _tmp27_ = 0;
 	gint _tmp28_ = 0;
 	Box _tmp29_ = {0};
-#line 4210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4210 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (crop != NULL);
-#line 4211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4213 "/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 4211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4213 "/home/jens/Source/shotwell/src/Photo.vala"
 	dim = _tmp0_;
-#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_orientation (self);
-#line 4212 "/home/jens/Source/shotwell/src/Photo.vala"
-	orientation = _tmp1_;
 #line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
+	orientation = _tmp1_;
+#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = dim;
-#line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = *crop;
-#line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_derotate_box (orientation, &_tmp2_, &_tmp3_, &_tmp4_);
-#line 4214 "/home/jens/Source/shotwell/src/Photo.vala"
-	derotated = _tmp4_;
 #line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+	derotated = _tmp4_;
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = derotated;
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_.left;
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = dim;
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_.width;
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = CLAMP (_tmp6_, 0, _tmp8_ - 2);
-#line 4216 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4218 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated.left = _tmp9_;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = derotated;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_.right;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = derotated;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_.left;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = dim;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_.width;
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = CLAMP (_tmp11_, _tmp13_, _tmp15_ - 1);
-#line 4217 "/home/jens/Source/shotwell/src/Photo.vala"
-	derotated.right = _tmp16_;
 #line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+	derotated.right = _tmp16_;
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = derotated;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = _tmp17_.top;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = dim;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = _tmp19_.height;
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = CLAMP (_tmp18_, 0, _tmp20_ - 2);
-#line 4219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4221 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated.top = _tmp21_;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = derotated;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = _tmp22_.bottom;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = derotated;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = _tmp24_.top;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = dim;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = _tmp26_.height;
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = CLAMP (_tmp23_, _tmp25_, _tmp27_ - 1);
-#line 4220 "/home/jens/Source/shotwell/src/Photo.vala"
-	derotated.bottom = _tmp28_;
 #line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+	derotated.bottom = _tmp28_;
+#line 4224 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = derotated;
-#line 4222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4224 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_set_raw_crop (self, &_tmp29_);
-#line 30216 "Photo.c"
+#line 30231 "Photo.c"
 }
 
 
@@ -30226,49 +30241,49 @@ gboolean photo_get_straighten (Photo* self, gdouble* theta) {
 	gboolean result = FALSE;
 	gdouble _tmp0_ = 0.0;
 	gboolean _tmp1_ = FALSE;
-#line 4225 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 4226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4228 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_raw_straighten (self, &_tmp0_);
-#line 4226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4228 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_theta = _tmp0_;
-#line 4226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4228 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (theta) {
-#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 			*theta = _vala_theta;
-#line 30239 "Photo.c"
+#line 30254 "Photo.c"
 		}
-#line 4227 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 30243 "Photo.c"
+#line 30258 "Photo.c"
 	}
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (theta) {
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 		*theta = _vala_theta;
-#line 30251 "Photo.c"
+#line 30266 "Photo.c"
 	}
-#line 4229 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4231 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30255 "Photo.c"
+#line 30270 "Photo.c"
 }
 
 
 void photo_set_straighten (Photo* self, gdouble theta) {
 	gdouble _tmp0_ = 0.0;
-#line 4232 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4234 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = theta;
-#line 4233 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4235 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_set_raw_straighten (self, _tmp0_);
-#line 30267 "Photo.c"
+#line 30282 "Photo.c"
 }
 
 
@@ -30326,48 +30341,48 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 	gint _tmp96__length1 = 0;
 	GdkPixbuf* _tmp133_ = NULL;
 	GdkPixbuf* _tmp134_ = NULL;
-#line 4236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 4236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 4236 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4238 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (inst != NULL, NULL);
-#line 4246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = *inst;
-#line 4246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.radius;
-#line 4246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4248 "/home/jens/Source/shotwell/src/Photo.vala"
 	r = (gdouble) _tmp1_;
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *inst;
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_.radius;
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = g_new0 (gint, _tmp3_ + 1);
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_insets_first_quadrant = _tmp4_;
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4249 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_insets_first_quadrant_length1 = _tmp3_ + 1;
-#line 4247 "/home/jens/Source/shotwell/src/Photo.vala"
-	_x_insets_first_quadrant_size_ = x_insets_first_quadrant_length1;
 #line 4249 "/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"
 	i = 0;
-#line 30351 "Photo.c"
+#line 30366 "Photo.c"
 	{
 		gdouble y = 0.0;
 		gdouble _tmp5_ = 0.0;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = r;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 		y = _tmp5_;
-#line 30359 "Photo.c"
+#line 30374 "Photo.c"
 		{
 			gboolean _tmp6_ = FALSE;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = TRUE;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30366 "Photo.c"
+#line 30381 "Photo.c"
 				gdouble _tmp8_ = 0.0;
 				gdouble theta = 0.0;
 				gdouble _tmp9_ = 0.0;
@@ -30385,178 +30400,178 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp19_ = 0;
 				gint _tmp20_ = 0;
 				gint _tmp21_ = 0;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp6_) {
-#line 30386 "Photo.c"
+#line 30401 "Photo.c"
 					gdouble _tmp7_ = 0.0;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp7_ = y;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 					y = _tmp7_ - 1.0;
-#line 30392 "Photo.c"
+#line 30407 "Photo.c"
 				}
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = FALSE;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = y;
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp8_ >= 0.0)) {
-#line 4250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30402 "Photo.c"
+#line 30417 "Photo.c"
 				}
-#line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = y;
-#line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = r;
-#line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = asin (_tmp9_ / _tmp10_);
-#line 4251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
 				theta = _tmp11_;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = r;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = theta;
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = cos (_tmp13_);
-#line 4252 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4254 "/home/jens/Source/shotwell/src/Photo.vala"
 				x = (gint) ((_tmp12_ * _tmp14_) + 0.5);
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = x_insets_first_quadrant;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15__length1 = x_insets_first_quadrant_length1;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = i;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = *inst;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_.radius;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = x;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_[_tmp16_] = _tmp18_ - _tmp19_;
-#line 4253 "/home/jens/Source/shotwell/src/Photo.vala"
-				_tmp20_ = _tmp15_[_tmp16_];
 #line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+				_tmp20_ = _tmp15_[_tmp16_];
+#line 4257 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = i;
-#line 4255 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4257 "/home/jens/Source/shotwell/src/Photo.vala"
 				i = _tmp21_ + 1;
-#line 30440 "Photo.c"
+#line 30455 "Photo.c"
 			}
 		}
 	}
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = *inst;
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = _tmp22_.center;
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = _tmp23_.x;
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = *inst;
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = _tmp25_.radius;
-#line 4258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_bounds_min = _tmp24_ - _tmp26_;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = *inst;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_.center;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = _tmp28_.x;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = *inst;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp30_.radius;
-#line 4259 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_bounds_max = _tmp29_ + _tmp31_;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = *inst;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = _tmp32_.center;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _tmp33_.y;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = *inst;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_.radius;
-#line 4260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp34_ - _tmp36_;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = ymin;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp38_ < 0) {
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = 0;
-#line 30486 "Photo.c"
+#line 30501 "Photo.c"
 	} else {
 		gint _tmp39_ = 0;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp39_ = ymin;
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp37_ = _tmp39_;
-#line 30493 "Photo.c"
+#line 30508 "Photo.c"
 	}
-#line 4261 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp37_;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = *inst;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = _tmp40_.center;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = _tmp41_.y;
-#line 4262 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4264 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymax = _tmp42_;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = ymax;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = pixbuf;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = gdk_pixbuf_get_height (_tmp45_);
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = _tmp46_;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp44_ > (_tmp47_ - 1)) {
-#line 30515 "Photo.c"
+#line 30530 "Photo.c"
 		GdkPixbuf* _tmp48_ = NULL;
 		gint _tmp49_ = 0;
 		gint _tmp50_ = 0;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = pixbuf;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = gdk_pixbuf_get_height (_tmp48_);
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp50_ = _tmp49_;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp50_ - 1;
-#line 30527 "Photo.c"
+#line 30542 "Photo.c"
 	} else {
 		gint _tmp51_ = 0;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp51_ = ymax;
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp43_ = _tmp51_;
-#line 30534 "Photo.c"
+#line 30549 "Photo.c"
 	}
-#line 4263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4265 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymax = _tmp43_;
-#line 4267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
 	inset_index = 0;
-#line 30540 "Photo.c"
+#line 30555 "Photo.c"
 	{
 		gint y_it = 0;
 		gint _tmp52_ = 0;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp52_ = ymin;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp52_;
-#line 30548 "Photo.c"
+#line 30563 "Photo.c"
 		{
 			gboolean _tmp53_ = FALSE;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = TRUE;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30555 "Photo.c"
+#line 30570 "Photo.c"
 				gint _tmp55_ = 0;
 				gint _tmp56_ = 0;
 				gint xmin = 0;
@@ -30579,118 +30594,118 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp71_ = 0;
 				gint _tmp72_ = 0;
 				gint _tmp87_ = 0;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp53_) {
-#line 30580 "Photo.c"
+#line 30595 "Photo.c"
 					gint _tmp54_ = 0;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = y_it;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					y_it = _tmp54_ + 1;
-#line 30586 "Photo.c"
+#line 30601 "Photo.c"
 				}
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp53_ = FALSE;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp55_ = y_it;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = ymax;
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp55_ <= _tmp56_)) {
-#line 4268 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30598 "Photo.c"
+#line 30613 "Photo.c"
 				}
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = x_bounds_min;
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = x_insets_first_quadrant;
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58__length1 = x_insets_first_quadrant_length1;
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = inset_index;
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = _tmp58_[_tmp59_];
-#line 4269 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp57_ + _tmp60_;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp62_ = xmin;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp62_ < 0) {
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = 0;
-#line 30618 "Photo.c"
+#line 30633 "Photo.c"
 				} else {
 					gint _tmp63_ = 0;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp63_ = xmin;
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = _tmp63_;
-#line 30625 "Photo.c"
+#line 30640 "Photo.c"
 				}
-#line 4270 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp61_;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = x_bounds_max;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = x_insets_first_quadrant;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65__length1 = x_insets_first_quadrant_length1;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp66_ = inset_index;
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp67_ = _tmp65_[_tmp66_];
-#line 4271 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4273 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp64_ - _tmp67_;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp69_ = xmax;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp70_ = pixbuf;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp71_ = gdk_pixbuf_get_width (_tmp70_);
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp72_ = _tmp71_;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp69_ > (_tmp72_ - 1)) {
-#line 30651 "Photo.c"
+#line 30666 "Photo.c"
 					GdkPixbuf* _tmp73_ = NULL;
 					gint _tmp74_ = 0;
 					gint _tmp75_ = 0;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp73_ = pixbuf;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp74_ = gdk_pixbuf_get_width (_tmp73_);
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp75_ = _tmp74_;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = _tmp75_ - 1;
-#line 30663 "Photo.c"
+#line 30678 "Photo.c"
 				} else {
 					gint _tmp76_ = 0;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp76_ = xmax;
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = _tmp76_;
-#line 30670 "Photo.c"
+#line 30685 "Photo.c"
 				}
-#line 4272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp68_;
-#line 30674 "Photo.c"
+#line 30689 "Photo.c"
 				{
 					gint x_it = 0;
 					gint _tmp77_ = 0;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp77_ = xmin;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp77_;
-#line 30682 "Photo.c"
+#line 30697 "Photo.c"
 					{
 						gboolean _tmp78_ = FALSE;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp78_ = TRUE;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 30689 "Photo.c"
+#line 30704 "Photo.c"
 							gint _tmp80_ = 0;
 							gint _tmp81_ = 0;
 							GdkPixbuf* _tmp82_ = NULL;
@@ -30698,94 +30713,94 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							gint _tmp84_ = 0;
 							GdkPixbuf* _tmp85_ = NULL;
 							GdkPixbuf* _tmp86_ = NULL;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp78_) {
-#line 30699 "Photo.c"
+#line 30714 "Photo.c"
 								gint _tmp79_ = 0;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp79_ = x_it;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 								x_it = _tmp79_ + 1;
-#line 30705 "Photo.c"
+#line 30720 "Photo.c"
 							}
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp78_ = FALSE;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp80_ = x_it;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp81_ = xmax;
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!(_tmp80_ <= _tmp81_)) {
-#line 4274 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4276 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 30717 "Photo.c"
+#line 30732 "Photo.c"
 							}
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp82_ = pixbuf;
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp83_ = x_it;
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp84_ = y_it;
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp85_ = photo_red_reduce_pixel (self, _tmp82_, _tmp83_, _tmp84_);
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp86_ = _tmp85_;
-#line 4275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp86_);
-#line 30731 "Photo.c"
+#line 30746 "Photo.c"
 						}
 					}
 				}
-#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp87_ = inset_index;
-#line 4277 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4279 "/home/jens/Source/shotwell/src/Photo.vala"
 				inset_index = _tmp87_ + 1;
-#line 30739 "Photo.c"
+#line 30754 "Photo.c"
 			}
 		}
 	}
-#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp88_ = *inst;
-#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp89_ = _tmp88_.center;
-#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp90_ = _tmp89_.y;
-#line 4282 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymin = _tmp90_;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp91_ = *inst;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp92_ = _tmp91_.center;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp93_ = _tmp92_.y;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp94_ = *inst;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp95_ = _tmp94_.radius;
-#line 4283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
 	ymax = _tmp93_ + _tmp95_;
-#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96_ = x_insets_first_quadrant;
-#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp96__length1 = x_insets_first_quadrant_length1;
-#line 4284 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
 	inset_index = _tmp96__length1 - 1;
-#line 30769 "Photo.c"
+#line 30784 "Photo.c"
 	{
 		gint y_it = 0;
 		gint _tmp97_ = 0;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp97_ = ymin;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 		y_it = _tmp97_;
-#line 30777 "Photo.c"
+#line 30792 "Photo.c"
 		{
 			gboolean _tmp98_ = FALSE;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp98_ = TRUE;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 30784 "Photo.c"
+#line 30799 "Photo.c"
 				gint _tmp100_ = 0;
 				gint _tmp101_ = 0;
 				gint xmin = 0;
@@ -30808,118 +30823,118 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 				gint _tmp116_ = 0;
 				gint _tmp117_ = 0;
 				gint _tmp132_ = 0;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp98_) {
-#line 30809 "Photo.c"
+#line 30824 "Photo.c"
 					gint _tmp99_ = 0;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp99_ = y_it;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					y_it = _tmp99_ + 1;
-#line 30815 "Photo.c"
+#line 30830 "Photo.c"
 				}
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = FALSE;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp100_ = y_it;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp101_ = ymax;
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp100_ <= _tmp101_)) {
-#line 4285 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 30827 "Photo.c"
+#line 30842 "Photo.c"
 				}
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp102_ = x_bounds_min;
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp103_ = x_insets_first_quadrant;
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp103__length1 = x_insets_first_quadrant_length1;
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp104_ = inset_index;
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp105_ = _tmp103_[_tmp104_];
-#line 4286 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp102_ + _tmp105_;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp107_ = xmin;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp107_ < 0) {
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp106_ = 0;
-#line 30847 "Photo.c"
+#line 30862 "Photo.c"
 				} else {
 					gint _tmp108_ = 0;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp108_ = xmin;
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp106_ = _tmp108_;
-#line 30854 "Photo.c"
+#line 30869 "Photo.c"
 				}
-#line 4287 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmin = _tmp106_;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp109_ = x_bounds_max;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp110_ = x_insets_first_quadrant;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp110__length1 = x_insets_first_quadrant_length1;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp111_ = inset_index;
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp112_ = _tmp110_[_tmp111_];
-#line 4288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4290 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp109_ - _tmp112_;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp114_ = xmax;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp115_ = pixbuf;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp116_ = gdk_pixbuf_get_width (_tmp115_);
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp117_ = _tmp116_;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp114_ > (_tmp117_ - 1)) {
-#line 30880 "Photo.c"
+#line 30895 "Photo.c"
 					GdkPixbuf* _tmp118_ = NULL;
 					gint _tmp119_ = 0;
 					gint _tmp120_ = 0;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp118_ = pixbuf;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp119_ = gdk_pixbuf_get_width (_tmp118_);
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp120_ = _tmp119_;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp113_ = _tmp120_ - 1;
-#line 30892 "Photo.c"
+#line 30907 "Photo.c"
 				} else {
 					gint _tmp121_ = 0;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp121_ = xmax;
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp113_ = _tmp121_;
-#line 30899 "Photo.c"
+#line 30914 "Photo.c"
 				}
-#line 4289 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
 				xmax = _tmp113_;
-#line 30903 "Photo.c"
+#line 30918 "Photo.c"
 				{
 					gint x_it = 0;
 					gint _tmp122_ = 0;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp122_ = xmin;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 					x_it = _tmp122_;
-#line 30911 "Photo.c"
+#line 30926 "Photo.c"
 					{
 						gboolean _tmp123_ = FALSE;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp123_ = TRUE;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 30918 "Photo.c"
+#line 30933 "Photo.c"
 							gint _tmp125_ = 0;
 							gint _tmp126_ = 0;
 							GdkPixbuf* _tmp127_ = NULL;
@@ -30927,63 +30942,63 @@ static GdkPixbuf* photo_do_redeye (Photo* self, GdkPixbuf* pixbuf, EditingToolsR
 							gint _tmp129_ = 0;
 							GdkPixbuf* _tmp130_ = NULL;
 							GdkPixbuf* _tmp131_ = NULL;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp123_) {
-#line 30928 "Photo.c"
+#line 30943 "Photo.c"
 								gint _tmp124_ = 0;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp124_ = x_it;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 								x_it = _tmp124_ + 1;
-#line 30934 "Photo.c"
+#line 30949 "Photo.c"
 							}
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp123_ = FALSE;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp125_ = x_it;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp126_ = xmax;
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!(_tmp125_ <= _tmp126_)) {
-#line 4291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4293 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 30946 "Photo.c"
+#line 30961 "Photo.c"
 							}
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp127_ = pixbuf;
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp128_ = x_it;
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp129_ = y_it;
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp130_ = photo_red_reduce_pixel (self, _tmp127_, _tmp128_, _tmp129_);
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp131_ = _tmp130_;
-#line 4292 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp131_);
-#line 30960 "Photo.c"
+#line 30975 "Photo.c"
 						}
 					}
 				}
-#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp132_ = inset_index;
-#line 4294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4296 "/home/jens/Source/shotwell/src/Photo.vala"
 				inset_index = _tmp132_ - 1;
-#line 30968 "Photo.c"
+#line 30983 "Photo.c"
 			}
 		}
 	}
-#line 4297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp133_ = pixbuf;
-#line 4297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp134_ = _g_object_ref0 (_tmp133_);
-#line 4297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp134_;
-#line 4297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
 	x_insets_first_quadrant = (g_free (x_insets_first_quadrant), NULL);
-#line 4297 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4299 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 30982 "Photo.c"
+#line 30997 "Photo.c"
 }
 
 
@@ -31002,89 +31017,89 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 	gint _tmp9_ = 0;
 	GdkPixbuf* _tmp33_ = NULL;
 	GdkPixbuf* _tmp34_ = NULL;
-#line 4300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4302 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 4300 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4302 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = y;
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = pixbuf;
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gdk_pixbuf_get_rowstride (_tmp1_);
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = x;
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = pixbuf;
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_);
-#line 4301 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4303 "/home/jens/Source/shotwell/src/Photo.vala"
 	px_start_byte_offset = (_tmp0_ * _tmp2_) + (_tmp3_ * _tmp5_);
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = x;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ >= 0) {
-#line 31023 "Photo.c"
+#line 31038 "Photo.c"
 		gint _tmp10_ = 0;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = y;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = _tmp10_ >= 0;
-#line 31029 "Photo.c"
+#line 31044 "Photo.c"
 	} else {
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = FALSE;
-#line 31033 "Photo.c"
+#line 31048 "Photo.c"
 	}
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 31037 "Photo.c"
+#line 31052 "Photo.c"
 		gint _tmp11_ = 0;
 		GdkPixbuf* _tmp12_ = NULL;
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = x;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = pixbuf;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = gdk_pixbuf_get_width (_tmp12_);
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = _tmp13_;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp11_ < _tmp14_;
-#line 31052 "Photo.c"
+#line 31067 "Photo.c"
 	} else {
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = FALSE;
-#line 31056 "Photo.c"
+#line 31071 "Photo.c"
 	}
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_) {
-#line 31060 "Photo.c"
+#line 31075 "Photo.c"
 		gint _tmp15_ = 0;
 		GdkPixbuf* _tmp16_ = NULL;
 		gint _tmp17_ = 0;
 		gint _tmp18_ = 0;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = y;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = pixbuf;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = gdk_pixbuf_get_height (_tmp16_);
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_;
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp15_ < _tmp18_;
-#line 31075 "Photo.c"
+#line 31090 "Photo.c"
 	} else {
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = FALSE;
-#line 31079 "Photo.c"
+#line 31094 "Photo.c"
 	}
-#line 4308 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4310 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 31083 "Photo.c"
+#line 31098 "Photo.c"
 		guchar* pixel_data = NULL;
 		GdkPixbuf* _tmp19_ = NULL;
 		guint8* _tmp20_ = NULL;
@@ -31108,65 +31123,65 @@ static GdkPixbuf* photo_red_reduce_pixel (Photo* self, GdkPixbuf* pixbuf, gint x
 		gint _tmp30_ = 0;
 		guchar _tmp31_ = '\0';
 		guchar _tmp32_ = '\0';
-#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = pixbuf;
-#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = gdk_pixbuf_get_pixels (_tmp19_);
-#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_data = _tmp20_;
-#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixel_data_length1 = -1;
-#line 4309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4311 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_data_size_ = pixel_data_length1;
-#line 4319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = pixel_data;
-#line 4319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21__length1 = pixel_data_length1;
-#line 4319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = px_start_byte_offset;
-#line 4319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp21_[_tmp22_ + 1];
-#line 4319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4321 "/home/jens/Source/shotwell/src/Photo.vala"
 		g = _tmp23_;
-#line 4320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = pixel_data;
-#line 4320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24__length1 = pixel_data_length1;
-#line 4320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = px_start_byte_offset;
-#line 4320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = _tmp24_[_tmp25_ + 2];
-#line 4320 "/home/jens/Source/shotwell/src/Photo.vala"
-		b = _tmp26_;
 #line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
+		b = _tmp26_;
+#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp27_ = g;
-#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = b;
-#line 4322 "/home/jens/Source/shotwell/src/Photo.vala"
-		r = (guchar) ((_tmp27_ + _tmp28_) / 2);
 #line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+		r = (guchar) ((_tmp27_ + _tmp28_) / 2);
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_ = pixel_data;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29__length1 = pixel_data_length1;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = px_start_byte_offset;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = r;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp29_[_tmp30_] = _tmp31_;
-#line 4324 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4326 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp29_[_tmp30_];
-#line 31155 "Photo.c"
+#line 31170 "Photo.c"
 	}
-#line 4327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = pixbuf;
-#line 4327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 4327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp34_;
-#line 4327 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4329 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31165 "Photo.c"
+#line 31180 "Photo.c"
 }
 
 
@@ -31191,78 +31206,78 @@ void photo_unscaled_to_raw_point (Photo* self, GdkPoint* unscaled_point, GdkPoin
 	gint _tmp15_ = 0;
 	gint _tmp16_ = 0;
 	gint _tmp17_ = 0;
-#line 4330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4332 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4332 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (unscaled_point != NULL);
-#line 4331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4333 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_orientation (self);
-#line 4331 "/home/jens/Source/shotwell/src/Photo.vala"
-	unscaled_orientation = _tmp0_;
 #line 4333 "/home/jens/Source/shotwell/src/Photo.vala"
+	unscaled_orientation = _tmp0_;
+#line 4335 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = unscaled_orientation;
-#line 4333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4335 "/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 4333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4335 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_rotate_dimensions (_tmp1_, &_tmp2_, &_tmp3_);
-#line 4333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4335 "/home/jens/Source/shotwell/src/Photo.vala"
 	unscaled_dims = _tmp3_;
-#line 4336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4338 "/home/jens/Source/shotwell/src/Photo.vala"
 	unscaled_x_offset_raw = 0;
-#line 4337 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4339 "/home/jens/Source/shotwell/src/Photo.vala"
 	unscaled_y_offset_raw = 0;
-#line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_get_raw_crop (self, &_tmp4_);
-#line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
 	crop_box = _tmp4_;
-#line 4340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 31216 "Photo.c"
+#line 31231 "Photo.c"
 		Box _tmp6_ = {0};
 		gint _tmp7_ = 0;
 		Box _tmp8_ = {0};
 		gint _tmp9_ = 0;
-#line 4341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = crop_box;
-#line 4341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = _tmp6_.left;
-#line 4341 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4343 "/home/jens/Source/shotwell/src/Photo.vala"
 		unscaled_x_offset_raw = _tmp7_;
-#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4344 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = crop_box;
-#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4344 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = _tmp8_.top;
-#line 4342 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4344 "/home/jens/Source/shotwell/src/Photo.vala"
 		unscaled_y_offset_raw = _tmp9_;
-#line 31233 "Photo.c"
+#line 31248 "Photo.c"
 	}
-#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = unscaled_orientation;
-#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = unscaled_dims;
-#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = *unscaled_point;
-#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	orientation_derotate_point (_tmp10_, &_tmp11_, &_tmp12_, &_tmp13_);
-#line 4345 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4347 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated_point = _tmp13_;
-#line 4349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4351 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = derotated_point.x;
-#line 4349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4351 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = unscaled_x_offset_raw;
-#line 4349 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4351 "/home/jens/Source/shotwell/src/Photo.vala"
 	derotated_point.x = _tmp14_ + _tmp15_;
-#line 4350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = derotated_point.y;
-#line 4350 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = unscaled_y_offset_raw;
-#line 4350 "/home/jens/Source/shotwell/src/Photo.vala"
-	derotated_point.y = _tmp16_ + _tmp17_;
 #line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
+	derotated_point.y = _tmp16_ + _tmp17_;
+#line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = derotated_point;
-#line 4352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4354 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 31261 "Photo.c"
+#line 31276 "Photo.c"
 }
 
 
@@ -31308,171 +31323,171 @@ void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRe
 	gint _tmp45_ = 0;
 	GdkPoint _tmp46_ = {0};
 	gint _tmp47_ = 0;
-#line 4355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (self));
-#line 4355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (unscaled_rect != NULL);
-#line 4356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_.x = 0;
-#line 4356 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left = _tmp0_;
-#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_.x = 0;
-#line 4357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
 	lower_right = _tmp1_;
-#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *unscaled_rect;
-#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_.x;
-#line 4358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left.x = _tmp3_;
-#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = *unscaled_rect;
-#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_.y;
-#line 4359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left.y = _tmp5_;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = upper_left;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_.x;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = *unscaled_rect;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_.width;
-#line 4360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4362 "/home/jens/Source/shotwell/src/Photo.vala"
 	lower_right.x = _tmp7_ + _tmp9_;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = upper_left;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_.y;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = *unscaled_rect;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_.height;
-#line 4361 "/home/jens/Source/shotwell/src/Photo.vala"
-	lower_right.y = _tmp11_ + _tmp13_;
 #line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
+	lower_right.y = _tmp11_ + _tmp13_;
+#line 4365 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = upper_left;
-#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4365 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_unscaled_to_raw_point (self, &_tmp14_, &_tmp15_);
-#line 4363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4365 "/home/jens/Source/shotwell/src/Photo.vala"
 	upper_left = _tmp15_;
-#line 4364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = lower_right;
-#line 4364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_unscaled_to_raw_point (self, &_tmp16_, &_tmp17_);
-#line 4364 "/home/jens/Source/shotwell/src/Photo.vala"
-	lower_right = _tmp17_;
 #line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+	lower_right = _tmp17_;
+#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = upper_left;
-#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_.x;
-#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = lower_right;
-#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = _tmp20_.x;
-#line 4366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ > _tmp21_) {
-#line 31373 "Photo.c"
+#line 31388 "Photo.c"
 		gint temp = 0;
 		GdkPoint _tmp22_ = {0};
 		gint _tmp23_ = 0;
 		GdkPoint _tmp24_ = {0};
 		gint _tmp25_ = 0;
 		gint _tmp26_ = 0;
-#line 4367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = upper_left;
-#line 4367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = _tmp22_.x;
-#line 4367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
 		temp = _tmp23_;
-#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = lower_right;
-#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_.x;
-#line 4368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4370 "/home/jens/Source/shotwell/src/Photo.vala"
 		upper_left.x = _tmp25_;
-#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp26_ = temp;
-#line 4369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
 		lower_right.x = _tmp26_;
-#line 31396 "Photo.c"
+#line 31411 "Photo.c"
 	}
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = upper_left;
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = _tmp27_.y;
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = lower_right;
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp30_ = _tmp29_.y;
-#line 4371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_ > _tmp30_) {
-#line 31408 "Photo.c"
+#line 31423 "Photo.c"
 		gint temp = 0;
 		GdkPoint _tmp31_ = {0};
 		gint _tmp32_ = 0;
 		GdkPoint _tmp33_ = {0};
 		gint _tmp34_ = 0;
 		gint _tmp35_ = 0;
-#line 4372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp31_ = upper_left;
-#line 4372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp32_ = _tmp31_.y;
-#line 4372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
 		temp = _tmp32_;
-#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4375 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp33_ = lower_right;
-#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4375 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp34_ = _tmp33_.y;
-#line 4373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4375 "/home/jens/Source/shotwell/src/Photo.vala"
 		upper_left.y = _tmp34_;
-#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4376 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp35_ = temp;
-#line 4374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4376 "/home/jens/Source/shotwell/src/Photo.vala"
 		lower_right.y = _tmp35_;
-#line 31431 "Photo.c"
+#line 31446 "Photo.c"
 	}
-#line 4377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
 	memset (&raw_rect, 0, sizeof (GdkRectangle));
-#line 4378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = upper_left;
-#line 4378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = _tmp36_.x;
-#line 4378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rect.x = _tmp37_;
-#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = upper_left;
-#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = _tmp38_.y;
-#line 4379 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rect.y = _tmp39_;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = lower_right;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = _tmp40_.x;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = upper_left;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = _tmp42_.x;
-#line 4380 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4382 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rect.width = _tmp41_ - _tmp43_;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = lower_right;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_.y;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp46_ = upper_left;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp47_ = _tmp46_.y;
-#line 4381 "/home/jens/Source/shotwell/src/Photo.vala"
-	raw_rect.height = _tmp45_ - _tmp47_;
 #line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
+	raw_rect.height = _tmp45_ - _tmp47_;
+#line 4385 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = raw_rect;
-#line 4383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4385 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 31471 "Photo.c"
+#line 31486 "Photo.c"
 }
 
 
@@ -31483,85 +31498,85 @@ PixelTransformationBundle* photo_get_enhance_transformations (Photo* self) {
 	GdkPixbuf* _tmp4_ = NULL;
 	PixelTransformationBundle* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 4386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), NULL);
-#line 4387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4389 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = NULL;
-#line 31486 "Photo.c"
+#line 31501 "Photo.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Scaling _tmp1_ = {0};
 		GdkPixbuf* _tmp2_ = NULL;
 		GdkPixbuf* _tmp3_ = NULL;
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		scaling_for_best_fit (360, FALSE, &_tmp1_);
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/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 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp2_;
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 31500 "Photo.c"
-			goto __catch403_g_error;
+#line 31515 "Photo.c"
+			goto __catch404_g_error;
 		}
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp0_;
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = NULL;
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 4394 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4396 "/home/jens/Source/shotwell/src/Photo.vala"
 		pixbuf = _tmp3_;
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp0_);
-#line 31513 "Photo.c"
+#line 31528 "Photo.c"
 	}
-	goto __finally403;
-	__catch403_g_error:
+	goto __finally404;
+	__catch404_g_error:
 	{
 		GError* e = NULL;
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		e = _inner_error_;
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 4401 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:4401: %s", "Photo: get_enhance_transformations: couldn't obtain pixbuf to build " "transform histogram");
 #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"
 		result = NULL;
-#line 4403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (e);
-#line 4403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 4403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4405 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31533 "Photo.c"
+#line 31548 "Photo.c"
 	}
-	__finally403:
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally404:
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (pixbuf);
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/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 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 4393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4395 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 31546 "Photo.c"
+#line 31561 "Photo.c"
 	}
-#line 4410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = pixbuf;
-#line 4410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = auto_enhance_create_auto_enhance_adjustments (_tmp4_);
-#line 4410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4412 "/home/jens/Source/shotwell/src/Photo.vala"
 	transformations = _tmp5_;
-#line 4418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = transformations;
-#line 4418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (pixbuf);
-#line 4418 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4420 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31560 "Photo.c"
+#line 31575 "Photo.c"
 }
 
 
@@ -31571,68 +31586,68 @@ gboolean photo_enhance (Photo* self) {
 	PixelTransformationBundle* _tmp0_ = NULL;
 	PixelTransformationBundle* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 4421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4423 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO (self), FALSE);
-#line 4422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_get_enhance_transformations (self);
-#line 4422 "/home/jens/Source/shotwell/src/Photo.vala"
-	transformations = _tmp0_;
 #line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
+	transformations = _tmp0_;
+#line 4426 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = transformations;
-#line 4424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4426 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 4425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 4425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
 		_pixel_transformation_bundle_unref0 (transformations);
-#line 4425 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4427 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 31586 "Photo.c"
+#line 31601 "Photo.c"
 	}
 	{
 		PhotoRow* _tmp2_ = NULL;
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = self->row;
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_rec_mutex_lock (&self->priv->__lock_row);
-#line 31594 "Photo.c"
+#line 31609 "Photo.c"
 		{
 			PixelTransformationBundle* _tmp3_ = NULL;
-#line 4431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4433 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = transformations;
-#line 4431 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4433 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo_set_color_adjustments (self, _tmp3_);
-#line 31601 "Photo.c"
+#line 31616 "Photo.c"
 		}
-		__finally404:
+		__finally405:
 		{
 			PhotoRow* _tmp4_ = NULL;
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = self->row;
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_row);
-#line 31610 "Photo.c"
+#line 31625 "Photo.c"
 		}
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			_pixel_transformation_bundle_unref0 (transformations);
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/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 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 4430 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4432 "/home/jens/Source/shotwell/src/Photo.vala"
 			return FALSE;
-#line 31622 "Photo.c"
+#line 31637 "Photo.c"
 		}
 	}
-#line 4438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = TRUE;
-#line 4438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
 	_pixel_transformation_bundle_unref0 (transformations);
-#line 4438 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4440 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31631 "Photo.c"
+#line 31646 "Photo.c"
 }
 
 
@@ -31645,7 +31660,7 @@ gboolean photo_get_develop_raw_photos_to_files (void) {
 	result = _tmp0_;
 #line 349 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 31644 "Photo.c"
+#line 31659 "Photo.c"
 }
 
 
@@ -31655,7 +31670,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 31654 "Photo.c"
+#line 31669 "Photo.c"
 }
 
 
@@ -31664,7 +31679,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 31663 "Photo.c"
+#line 31678 "Photo.c"
 }
 
 
@@ -31683,19 +31698,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 31682 "Photo.c"
+#line 31697 "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 31688 "Photo.c"
+#line 31703 "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 31694 "Photo.c"
+#line 31709 "Photo.c"
 }
 
 
@@ -31710,7 +31725,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 31709 "Photo.c"
+#line 31724 "Photo.c"
 }
 
 
@@ -31729,47 +31744,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 31728 "Photo.c"
+#line 31743 "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 31734 "Photo.c"
+#line 31749 "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 31740 "Photo.c"
+#line 31755 "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 31747 "Photo.c"
+#line 31762 "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 31754 "Photo.c"
+#line 31769 "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 31761 "Photo.c"
+#line 31776 "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 31768 "Photo.c"
+#line 31783 "Photo.c"
 }
 
 
@@ -31837,14 +31852,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 31836 "Photo.c"
+#line 31851 "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 31843 "Photo.c"
+#line 31858 "Photo.c"
 }
 
 
@@ -31859,7 +31874,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 31858 "Photo.c"
+#line 31873 "Photo.c"
 }
 
 
@@ -31877,7 +31892,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 31876 "Photo.c"
+#line 31891 "Photo.c"
 }
 
 
@@ -31891,7 +31906,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 31890 "Photo.c"
+#line 31905 "Photo.c"
 		PixelTransformer* _tmp2_ = NULL;
 		PixelTransformer* _tmp3_ = NULL;
 #line 269 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31902,19 +31917,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 31901 "Photo.c"
+#line 31916 "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 31907 "Photo.c"
+#line 31922 "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 31913 "Photo.c"
+#line 31928 "Photo.c"
 }
 
 
@@ -31928,7 +31943,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 31927 "Photo.c"
+#line 31942 "Photo.c"
 		PixelTransformationBundle* _tmp2_ = NULL;
 		PixelTransformationBundle* _tmp3_ = NULL;
 #line 273 "/home/jens/Source/shotwell/src/Photo.vala"
@@ -31939,19 +31954,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 31938 "Photo.c"
+#line 31953 "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 31944 "Photo.c"
+#line 31959 "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 31950 "Photo.c"
+#line 31965 "Photo.c"
 }
 
 
@@ -31970,13 +31985,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 31969 "Photo.c"
+#line 31984 "Photo.c"
 	}
 #line 281 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 281 "/home/jens/Source/shotwell/src/Photo.vala"
 	clone = _tmp1_;
-#line 31975 "Photo.c"
+#line 31990 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeHashMap* _tmp2_ = NULL;
@@ -32003,7 +32018,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 32002 "Photo.c"
+#line 32017 "Photo.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			gchar* object = NULL;
@@ -32025,7 +32040,7 @@ static GeeHashMap* photo_photo_transformation_state_impl_copy_transformations (G
 			if (!_tmp9_) {
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 32024 "Photo.c"
+#line 32039 "Photo.c"
 			}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = _object_it;
@@ -32057,17 +32072,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 32056 "Photo.c"
+#line 32071 "Photo.c"
 		}
 #line 282 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 32060 "Photo.c"
+#line 32075 "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 32066 "Photo.c"
+#line 32081 "Photo.c"
 }
 
 
@@ -32081,7 +32096,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_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_TRANSFORMATION_STATE, PhotoTransformationState), "broken");
-#line 32080 "Photo.c"
+#line 32095 "Photo.c"
 	}
 }
 
@@ -32093,14 +32108,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 32092 "Photo.c"
+#line 32107 "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 32099 "Photo.c"
+#line 32114 "Photo.c"
 }
 
 
@@ -32126,7 +32141,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 32125 "Photo.c"
+#line 32140 "Photo.c"
 }
 
 
@@ -32148,21 +32163,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 32147 "Photo.c"
+#line 32162 "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 32154 "Photo.c"
+#line 32169 "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 32161 "Photo.c"
+#line 32176 "Photo.c"
 }
 
 
@@ -32171,7 +32186,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 32170 "Photo.c"
+#line 32185 "Photo.c"
 	}
 }
 
@@ -32181,11 +32196,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 32180 "Photo.c"
+#line 32195 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32184 "Photo.c"
+#line 32199 "Photo.c"
 	}
 }
 
@@ -32193,37 +32208,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 32192 "Photo.c"
+#line 32207 "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 32199 "Photo.c"
+#line 32214 "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 32206 "Photo.c"
+#line 32221 "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 32210 "Photo.c"
+#line 32225 "Photo.c"
 		}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_backing_readers_ref (object);
-#line 32214 "Photo.c"
+#line 32229 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32218 "Photo.c"
+#line 32233 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32222 "Photo.c"
+#line 32237 "Photo.c"
 }
 
 
@@ -32234,25 +32249,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 32233 "Photo.c"
+#line 32248 "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 32239 "Photo.c"
+#line 32254 "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 32243 "Photo.c"
+#line 32258 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_backing_readers_ref (value->data[0].v_pointer);
-#line 32247 "Photo.c"
+#line 32262 "Photo.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32251 "Photo.c"
+#line 32266 "Photo.c"
 }
 
 
@@ -32266,7 +32281,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 32265 "Photo.c"
+#line 32280 "Photo.c"
 }
 
 
@@ -32275,7 +32290,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 32274 "Photo.c"
+#line 32289 "Photo.c"
 }
 
 
@@ -32295,17 +32310,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 32294 "Photo.c"
+#line 32309 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32298 "Photo.c"
+#line 32313 "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 32304 "Photo.c"
+#line 32319 "Photo.c"
 	}
 }
 
@@ -32324,17 +32339,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 32323 "Photo.c"
+#line 32338 "Photo.c"
 	} else {
 #line 294 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32327 "Photo.c"
+#line 32342 "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 32333 "Photo.c"
+#line 32348 "Photo.c"
 	}
 }
 
@@ -32344,14 +32359,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 32343 "Photo.c"
+#line 32358 "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 32350 "Photo.c"
+#line 32365 "Photo.c"
 }
 
 
@@ -32367,7 +32382,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 32366 "Photo.c"
+#line 32381 "Photo.c"
 }
 
 
@@ -32392,7 +32407,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 32391 "Photo.c"
+#line 32406 "Photo.c"
 }
 
 
@@ -32405,7 +32420,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 32404 "Photo.c"
+#line 32419 "Photo.c"
 	}
 }
 
@@ -32440,21 +32455,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 32439 "Photo.c"
+#line 32454 "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 32446 "Photo.c"
+#line 32461 "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 32453 "Photo.c"
+#line 32468 "Photo.c"
 }
 
 
@@ -32463,7 +32478,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 32462 "Photo.c"
+#line 32477 "Photo.c"
 	}
 }
 
@@ -32473,11 +32488,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 32472 "Photo.c"
+#line 32487 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32476 "Photo.c"
+#line 32491 "Photo.c"
 	}
 }
 
@@ -32485,37 +32500,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 32484 "Photo.c"
+#line 32499 "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 32491 "Photo.c"
+#line 32506 "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 32498 "Photo.c"
+#line 32513 "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 32502 "Photo.c"
+#line 32517 "Photo.c"
 		}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_cached_pixbuf_ref (object);
-#line 32506 "Photo.c"
+#line 32521 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32510 "Photo.c"
+#line 32525 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32514 "Photo.c"
+#line 32529 "Photo.c"
 }
 
 
@@ -32526,25 +32541,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 32525 "Photo.c"
+#line 32540 "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 32531 "Photo.c"
+#line 32546 "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 32535 "Photo.c"
+#line 32550 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_cached_pixbuf_ref (value->data[0].v_pointer);
-#line 32539 "Photo.c"
+#line 32554 "Photo.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32543 "Photo.c"
+#line 32558 "Photo.c"
 }
 
 
@@ -32558,7 +32573,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 32557 "Photo.c"
+#line 32572 "Photo.c"
 }
 
 
@@ -32567,7 +32582,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 32566 "Photo.c"
+#line 32581 "Photo.c"
 }
 
 
@@ -32587,17 +32602,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 32586 "Photo.c"
+#line 32601 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32590 "Photo.c"
+#line 32605 "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 32596 "Photo.c"
+#line 32611 "Photo.c"
 	}
 }
 
@@ -32616,17 +32631,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 32615 "Photo.c"
+#line 32630 "Photo.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32619 "Photo.c"
+#line 32634 "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 32625 "Photo.c"
+#line 32640 "Photo.c"
 	}
 }
 
@@ -32636,7 +32651,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 32635 "Photo.c"
+#line 32650 "Photo.c"
 }
 
 
@@ -32648,7 +32663,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 32647 "Photo.c"
+#line 32662 "Photo.c"
 }
 
 
@@ -32664,7 +32679,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 32663 "Photo.c"
+#line 32678 "Photo.c"
 }
 
 
@@ -32689,7 +32704,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 32688 "Photo.c"
+#line 32703 "Photo.c"
 }
 
 
@@ -32702,224 +32717,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 32701 "Photo.c"
+#line 32716 "Photo.c"
 	}
 }
 
 
 PhotoReimportMasterState* photo_reimport_master_state_construct (GType object_type) {
 	PhotoReimportMasterState* self = NULL;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportMasterState*) g_type_create_instance (object_type);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 32712 "Photo.c"
+#line 32727 "Photo.c"
 }
 
 
 static void photo_value_reimport_master_state_init (GValue* value) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 32719 "Photo.c"
+#line 32734 "Photo.c"
 }
 
 
 static void photo_value_reimport_master_state_free_value (GValue* value) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (value->data[0].v_pointer);
-#line 32728 "Photo.c"
+#line 32743 "Photo.c"
 	}
 }
 
 
 static void photo_value_reimport_master_state_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/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 32738 "Photo.c"
+#line 32753 "Photo.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 32742 "Photo.c"
+#line 32757 "Photo.c"
 	}
 }
 
 
 static gpointer photo_value_reimport_master_state_peek_pointer (const GValue* value) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32750 "Photo.c"
+#line 32765 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_master_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 32757 "Photo.c"
+#line 32772 "Photo.c"
 		PhotoReimportMasterState* object;
 		object = collect_values[0].v_pointer;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 32764 "Photo.c"
+#line 32779 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/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 32768 "Photo.c"
+#line 32783 "Photo.c"
 		}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_master_state_ref (object);
-#line 32772 "Photo.c"
+#line 32787 "Photo.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32776 "Photo.c"
+#line 32791 "Photo.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32780 "Photo.c"
+#line 32795 "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 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 32791 "Photo.c"
+#line 32806 "Photo.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 32797 "Photo.c"
+#line 32812 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 32801 "Photo.c"
+#line 32816 "Photo.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32805 "Photo.c"
+#line 32820 "Photo.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 32809 "Photo.c"
+#line 32824 "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 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/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 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 32823 "Photo.c"
+#line 32838 "Photo.c"
 }
 
 
 gpointer photo_value_get_reimport_master_state (const GValue* value) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/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 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 32832 "Photo.c"
+#line 32847 "Photo.c"
 }
 
 
 void photo_value_set_reimport_master_state (GValue* value, gpointer v_object) {
 	PhotoReimportMasterState* old;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/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 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_ref (value->data[0].v_pointer);
-#line 32852 "Photo.c"
+#line 32867 "Photo.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32856 "Photo.c"
+#line 32871 "Photo.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (old);
-#line 32862 "Photo.c"
+#line 32877 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_master_state (GValue* value, gpointer v_object) {
 	PhotoReimportMasterState* old;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_MASTER_STATE));
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/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 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 32881 "Photo.c"
+#line 32896 "Photo.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 32885 "Photo.c"
+#line 32900 "Photo.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_master_state_unref (old);
-#line 32891 "Photo.c"
+#line 32906 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_master_state_class_init (PhotoReimportMasterStateClass * klass) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_master_state_parent_class = g_type_class_peek_parent (klass);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_finalize;
-#line 32901 "Photo.c"
+#line 32916 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_instance_init (PhotoReimportMasterState * self) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 32908 "Photo.c"
+#line 32923 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_finalize (PhotoReimportMasterState* obj) {
 	PhotoReimportMasterState * self;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE, PhotoReimportMasterState);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 32918 "Photo.c"
+#line 32933 "Photo.c"
 }
 
 
@@ -32940,24 +32955,24 @@ GType photo_reimport_master_state_get_type (void) {
 gpointer photo_reimport_master_state_ref (gpointer instance) {
 	PhotoReimportMasterState* self;
 	self = instance;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 32943 "Photo.c"
+#line 32958 "Photo.c"
 }
 
 
 void photo_reimport_master_state_unref (gpointer instance) {
 	PhotoReimportMasterState* self;
 	self = instance;
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_MASTER_STATE_GET_CLASS (self)->finalize (self);
-#line 1348 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1350 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 32956 "Photo.c"
+#line 32971 "Photo.c"
 	}
 }
 
@@ -32965,21 +32980,21 @@ void photo_reimport_master_state_unref (gpointer instance) {
 static gchar** _vala_array_dup28 (gchar** self, int length) {
 	gchar** result;
 	int i;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = g_new0 (gchar*, length + 1);
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	for (i = 0; i < length; i++) {
-#line 32968 "Photo.c"
+#line 32983 "Photo.c"
 		gchar* _tmp0_ = NULL;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = g_strdup (self[i]);
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 		result[i] = _tmp0_;
-#line 32974 "Photo.c"
+#line 32989 "Photo.c"
 	}
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 32978 "Photo.c"
+#line 32993 "Photo.c"
 }
 
 
@@ -32993,91 +33008,91 @@ static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_construct
 	gint _tmp4__length1 = 0;
 	gchar** _tmp5_ = NULL;
 	gint _tmp5__length1 = 0;
-#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
-#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL);
-#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportMasterStateImpl*) photo_reimport_master_state_construct (object_type);
-#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = row;
-#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _photo_row_ref0 (_tmp0_);
-#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (self->row);
-#line 1358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->row = _tmp1_;
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _media_metadata_ref0 (_tmp2_);
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1361 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata = _tmp3_;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = alterations;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4__length1 = alterations_length1;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = (_tmp4_ != NULL) ? _vala_array_dup28 (_tmp4_, _tmp4__length1) : ((gpointer) _tmp4_);
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5__length1 = _tmp4__length1;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL);
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations = _tmp5_;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations_length1 = _tmp5__length1;
-#line 1360 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1362 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->_alterations_size_ = self->alterations_length1;
-#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33032 "Photo.c"
+#line 33047 "Photo.c"
 }
 
 
 static PhotoReimportMasterStateImpl* photo_reimport_master_state_impl_new (PhotoRow* row, PhotoMetadata* metadata, gchar** alterations, int alterations_length1) {
-#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1359 "/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 33039 "Photo.c"
+#line 33054 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_impl_class_init (PhotoReimportMasterStateImplClass * klass) {
-#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_master_state_impl_parent_class = g_type_class_peek_parent (klass);
-#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportMasterStateClass *) klass)->finalize = photo_reimport_master_state_impl_finalize;
-#line 33048 "Photo.c"
+#line 33063 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_impl_instance_init (PhotoReimportMasterStateImpl * self) {
 	PhotoRow* _tmp0_ = NULL;
-#line 1352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_row_new ();
-#line 1352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->row = _tmp0_;
-#line 1355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1357 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33060 "Photo.c"
+#line 33075 "Photo.c"
 }
 
 
 static void photo_reimport_master_state_impl_finalize (PhotoReimportMasterState* obj) {
 	PhotoReimportMasterStateImpl * self;
-#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_MASTER_STATE_IMPL, PhotoReimportMasterStateImpl);
-#line 1352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (self->row);
-#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1355 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1356 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->alterations = (_vala_array_free (self->alterations, self->alterations_length1, (GDestroyNotify) g_free), NULL);
-#line 1351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1353 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_MASTER_STATE_CLASS (photo_reimport_master_state_impl_parent_class)->finalize (obj);
-#line 33076 "Photo.c"
+#line 33091 "Photo.c"
 }
 
 
@@ -33095,217 +33110,217 @@ static GType photo_reimport_master_state_impl_get_type (void) {
 
 PhotoReimportEditableState* photo_reimport_editable_state_construct (GType object_type) {
 	PhotoReimportEditableState* self = NULL;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportEditableState*) g_type_create_instance (object_type);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33098 "Photo.c"
+#line 33113 "Photo.c"
 }
 
 
 static void photo_value_reimport_editable_state_init (GValue* value) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33105 "Photo.c"
+#line 33120 "Photo.c"
 }
 
 
 static void photo_value_reimport_editable_state_free_value (GValue* value) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (value->data[0].v_pointer);
-#line 33114 "Photo.c"
+#line 33129 "Photo.c"
 	}
 }
 
 
 static void photo_value_reimport_editable_state_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/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 33124 "Photo.c"
+#line 33139 "Photo.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33128 "Photo.c"
+#line 33143 "Photo.c"
 	}
 }
 
 
 static gpointer photo_value_reimport_editable_state_peek_pointer (const GValue* value) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33136 "Photo.c"
+#line 33151 "Photo.c"
 }
 
 
 static gchar* photo_value_reimport_editable_state_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33143 "Photo.c"
+#line 33158 "Photo.c"
 		PhotoReimportEditableState* object;
 		object = collect_values[0].v_pointer;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33150 "Photo.c"
+#line 33165 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/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 33154 "Photo.c"
+#line 33169 "Photo.c"
 		}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_editable_state_ref (object);
-#line 33158 "Photo.c"
+#line 33173 "Photo.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33162 "Photo.c"
+#line 33177 "Photo.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33166 "Photo.c"
+#line 33181 "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 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33177 "Photo.c"
+#line 33192 "Photo.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33183 "Photo.c"
+#line 33198 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33187 "Photo.c"
+#line 33202 "Photo.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33191 "Photo.c"
+#line 33206 "Photo.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33195 "Photo.c"
+#line 33210 "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 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/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 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33209 "Photo.c"
+#line 33224 "Photo.c"
 }
 
 
 gpointer photo_value_get_reimport_editable_state (const GValue* value) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/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 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33218 "Photo.c"
+#line 33233 "Photo.c"
 }
 
 
 void photo_value_set_reimport_editable_state (GValue* value, gpointer v_object) {
 	PhotoReimportEditableState* old;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/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 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_ref (value->data[0].v_pointer);
-#line 33238 "Photo.c"
+#line 33253 "Photo.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33242 "Photo.c"
+#line 33257 "Photo.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (old);
-#line 33248 "Photo.c"
+#line 33263 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_editable_state (GValue* value, gpointer v_object) {
 	PhotoReimportEditableState* old;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, PHOTO_TYPE_REIMPORT_EDITABLE_STATE));
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/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 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33267 "Photo.c"
+#line 33282 "Photo.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33271 "Photo.c"
+#line 33286 "Photo.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_editable_state_unref (old);
-#line 33277 "Photo.c"
+#line 33292 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_editable_state_class_init (PhotoReimportEditableStateClass * klass) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_editable_state_parent_class = g_type_class_peek_parent (klass);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_finalize;
-#line 33287 "Photo.c"
+#line 33302 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_instance_init (PhotoReimportEditableState * self) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33294 "Photo.c"
+#line 33309 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_finalize (PhotoReimportEditableState* obj) {
 	PhotoReimportEditableState * self;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_EDITABLE_STATE, PhotoReimportEditableState);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33304 "Photo.c"
+#line 33319 "Photo.c"
 }
 
 
@@ -33326,24 +33341,24 @@ GType photo_reimport_editable_state_get_type (void) {
 gpointer photo_reimport_editable_state_ref (gpointer instance) {
 	PhotoReimportEditableState* self;
 	self = instance;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33329 "Photo.c"
+#line 33344 "Photo.c"
 }
 
 
 void photo_reimport_editable_state_unref (gpointer instance) {
 	PhotoReimportEditableState* self;
 	self = instance;
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_EDITABLE_STATE_GET_CLASS (self)->finalize (self);
-#line 1364 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1366 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33342 "Photo.c"
+#line 33357 "Photo.c"
 	}
 }
 
@@ -33354,73 +33369,73 @@ static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_constr
 	BackingPhotoRow* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
 	PhotoMetadata* _tmp3_ = NULL;
-#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing_state), NULL);
-#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL);
-#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportEditableStateImpl*) photo_reimport_editable_state_construct (object_type);
-#line 1373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_state;
-#line 1373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _backing_photo_row_ref0 (_tmp0_);
-#line 1373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing_state);
-#line 1373 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1375 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing_state = _tmp1_;
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _media_metadata_ref0 (_tmp2_);
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1376 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata = _tmp3_;
-#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33377 "Photo.c"
+#line 33392 "Photo.c"
 }
 
 
 static PhotoReimportEditableStateImpl* photo_reimport_editable_state_impl_new (BackingPhotoRow* backing_state, PhotoMetadata* metadata) {
-#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1374 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_editable_state_impl_construct (PHOTO_TYPE_REIMPORT_EDITABLE_STATE_IMPL, backing_state, metadata);
-#line 33384 "Photo.c"
+#line 33399 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_impl_class_init (PhotoReimportEditableStateImplClass * klass) {
-#line 1367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_editable_state_impl_parent_class = g_type_class_peek_parent (klass);
-#line 1367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportEditableStateClass *) klass)->finalize = photo_reimport_editable_state_impl_finalize;
-#line 33393 "Photo.c"
+#line 33408 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_impl_instance_init (PhotoReimportEditableStateImpl * self) {
 	BackingPhotoRow* _tmp0_ = NULL;
-#line 1368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 1368 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->backing_state = _tmp0_;
 #line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->backing_state = _tmp0_;
+#line 1372 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 33405 "Photo.c"
+#line 33420 "Photo.c"
 }
 
 
 static void photo_reimport_editable_state_impl_finalize (PhotoReimportEditableState* obj) {
 	PhotoReimportEditableStateImpl * self;
-#line 1367 "/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_EDITABLE_STATE_IMPL, PhotoReimportEditableStateImpl);
-#line 1368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1370 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing_state);
-#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1371 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1369 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_EDITABLE_STATE_CLASS (photo_reimport_editable_state_impl_parent_class)->finalize (obj);
-#line 33419 "Photo.c"
+#line 33434 "Photo.c"
 }
 
 
@@ -33438,217 +33453,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 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportRawDevelopmentState*) g_type_create_instance (object_type);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33441 "Photo.c"
+#line 33456 "Photo.c"
 }
 
 
 static void photo_value_reimport_raw_development_state_init (GValue* value) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33448 "Photo.c"
+#line 33463 "Photo.c"
 }
 
 
 static void photo_value_reimport_raw_development_state_free_value (GValue* value) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (value->data[0].v_pointer);
-#line 33457 "Photo.c"
+#line 33472 "Photo.c"
 	}
 }
 
 
 static void photo_value_reimport_raw_development_state_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/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 33467 "Photo.c"
+#line 33482 "Photo.c"
 	} else {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33471 "Photo.c"
+#line 33486 "Photo.c"
 	}
 }
 
 
 static gpointer photo_value_reimport_raw_development_state_peek_pointer (const GValue* value) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33479 "Photo.c"
+#line 33494 "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 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33486 "Photo.c"
+#line 33501 "Photo.c"
 		PhotoReimportRawDevelopmentState* object;
 		object = collect_values[0].v_pointer;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33493 "Photo.c"
+#line 33508 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/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 33497 "Photo.c"
+#line 33512 "Photo.c"
 		}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_raw_development_state_ref (object);
-#line 33501 "Photo.c"
+#line 33516 "Photo.c"
 	} else {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33505 "Photo.c"
+#line 33520 "Photo.c"
 	}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33509 "Photo.c"
+#line 33524 "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 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33520 "Photo.c"
+#line 33535 "Photo.c"
 	}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33526 "Photo.c"
+#line 33541 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33530 "Photo.c"
+#line 33545 "Photo.c"
 	} else {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33534 "Photo.c"
+#line 33549 "Photo.c"
 	}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33538 "Photo.c"
+#line 33553 "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 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33552 "Photo.c"
+#line 33567 "Photo.c"
 }
 
 
 gpointer photo_value_get_reimport_raw_development_state (const GValue* value) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33561 "Photo.c"
+#line 33576 "Photo.c"
 }
 
 
 void photo_value_set_reimport_raw_development_state (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentState* old;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_ref (value->data[0].v_pointer);
-#line 33581 "Photo.c"
+#line 33596 "Photo.c"
 	} else {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33585 "Photo.c"
+#line 33600 "Photo.c"
 	}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (old);
-#line 33591 "Photo.c"
+#line 33606 "Photo.c"
 	}
 }
 
 
 void photo_value_take_reimport_raw_development_state (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentState* old;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE));
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/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 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33610 "Photo.c"
+#line 33625 "Photo.c"
 	} else {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33614 "Photo.c"
+#line 33629 "Photo.c"
 	}
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_unref (old);
-#line 33620 "Photo.c"
+#line 33635 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_class_init (PhotoReimportRawDevelopmentStateClass * klass) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_raw_development_state_parent_class = g_type_class_peek_parent (klass);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_finalize;
-#line 33630 "Photo.c"
+#line 33645 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_instance_init (PhotoReimportRawDevelopmentState * self) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33637 "Photo.c"
+#line 33652 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_finalize (PhotoReimportRawDevelopmentState* obj) {
 	PhotoReimportRawDevelopmentState * self;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE, PhotoReimportRawDevelopmentState);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 33647 "Photo.c"
+#line 33662 "Photo.c"
 }
 
 
@@ -33669,42 +33684,42 @@ GType photo_reimport_raw_development_state_get_type (void) {
 gpointer photo_reimport_raw_development_state_ref (gpointer instance) {
 	PhotoReimportRawDevelopmentState* self;
 	self = instance;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 33672 "Photo.c"
+#line 33687 "Photo.c"
 }
 
 
 void photo_reimport_raw_development_state_unref (gpointer instance) {
 	PhotoReimportRawDevelopmentState* self;
 	self = instance;
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_GET_CLASS (self)->finalize (self);
-#line 1378 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1380 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 33685 "Photo.c"
+#line 33700 "Photo.c"
 	}
 }
 
 
 static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_construct (GType object_type) {
 	PhotoReimportRawDevelopmentStateImpl* self = NULL;
-#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportRawDevelopmentStateImpl*) photo_reimport_raw_development_state_construct (object_type);
-#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33696 "Photo.c"
+#line 33711 "Photo.c"
 }
 
 
 static PhotoReimportRawDevelopmentStateImpl* photo_reimport_raw_development_state_impl_new (void) {
-#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1397 "/home/jens/Source/shotwell/src/Photo.vala"
 	return photo_reimport_raw_development_state_impl_construct (PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL);
-#line 33703 "Photo.c"
+#line 33718 "Photo.c"
 }
 
 
@@ -33714,27 +33729,27 @@ static void photo_reimport_raw_development_state_impl_add (PhotoReimportRawDevel
 	PhotoMetadata* _tmp2_ = NULL;
 	PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp3_ = NULL;
 	PhotoReimportRawDevelopmentStateImplDevToReimport* _tmp4_ = NULL;
-#line 1398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self));
-#line 1398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_BACKING_PHOTO_ROW (backing));
-#line 1398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->list;
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = backing;
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_reimport_raw_development_state_impl_dev_to_reimport_new (_tmp1_, _tmp2_);
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	gee_collection_add (_tmp0_, _tmp4_);
-#line 1399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1401 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_reimport_raw_development_state_impl_dev_to_reimport_unref0 (_tmp4_);
-#line 33733 "Photo.c"
+#line 33748 "Photo.c"
 }
 
 
@@ -33743,19 +33758,19 @@ static gint photo_reimport_raw_development_state_impl_get_size (PhotoReimportRaw
 	GeeCollection* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
 	gint _tmp2_ = 0;
-#line 1402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1404 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (PHOTO_IS_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL (self), 0);
-#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->list;
-#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 1403 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1405 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 33754 "Photo.c"
+#line 33769 "Photo.c"
 }
 
 
@@ -33765,253 +33780,253 @@ static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_dev
 	BackingPhotoRow* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
 	PhotoMetadata* _tmp3_ = NULL;
-#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_BACKING_PHOTO_ROW (backing), NULL);
-#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata), NULL);
-#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = (PhotoReimportRawDevelopmentStateImplDevToReimport*) g_type_create_instance (object_type);
-#line 1387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing;
-#line 1387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _backing_photo_row_ref0 (_tmp0_);
-#line 1387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing);
-#line 1387 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1389 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing = _tmp1_;
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _media_metadata_ref0 (_tmp2_);
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1390 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata = _tmp3_;
-#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 33788 "Photo.c"
+#line 33803 "Photo.c"
 }
 
 
 static PhotoReimportRawDevelopmentStateImplDevToReimport* photo_reimport_raw_development_state_impl_dev_to_reimport_new (BackingPhotoRow* backing, PhotoMetadata* metadata) {
-#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1388 "/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 33795 "Photo.c"
+#line 33810 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_init (GValue* value) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	value->data[0].v_pointer = NULL;
-#line 33802 "Photo.c"
+#line 33817 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_free_value (GValue* value) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (value->data[0].v_pointer) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (value->data[0].v_pointer);
-#line 33811 "Photo.c"
+#line 33826 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_dev_to_reimport_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (src_value->data[0].v_pointer) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 33821 "Photo.c"
+#line 33836 "Photo.c"
 	} else {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 33825 "Photo.c"
+#line 33840 "Photo.c"
 	}
 }
 
 
 static gpointer photo_reimport_raw_development_state_impl_value_dev_to_reimport_peek_pointer (const GValue* value) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33833 "Photo.c"
+#line 33848 "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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (collect_values[0].v_pointer) {
-#line 33840 "Photo.c"
+#line 33855 "Photo.c"
 		PhotoReimportRawDevelopmentStateImplDevToReimport* object;
 		object = collect_values[0].v_pointer;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 33847 "Photo.c"
+#line 33862 "Photo.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 33851 "Photo.c"
+#line 33866 "Photo.c"
 		}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = photo_reimport_raw_development_state_impl_dev_to_reimport_ref (object);
-#line 33855 "Photo.c"
+#line 33870 "Photo.c"
 	} else {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33859 "Photo.c"
+#line 33874 "Photo.c"
 	}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33863 "Photo.c"
+#line 33878 "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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!object_p) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 33874 "Photo.c"
+#line 33889 "Photo.c"
 	}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!value->data[0].v_pointer) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = NULL;
-#line 33880 "Photo.c"
+#line 33895 "Photo.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		*object_p = value->data[0].v_pointer;
-#line 33884 "Photo.c"
+#line 33899 "Photo.c"
 	} else {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 33888 "Photo.c"
+#line 33903 "Photo.c"
 	}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return NULL;
-#line 33892 "Photo.c"
+#line 33907 "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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return G_PARAM_SPEC (spec);
-#line 33906 "Photo.c"
+#line 33921 "Photo.c"
 }
 
 
 static gpointer photo_reimport_raw_development_state_impl_value_get_dev_to_reimport (const GValue* value) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return value->data[0].v_pointer;
-#line 33915 "Photo.c"
+#line 33930 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_set_dev_to_reimport (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport* old;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_ref (value->data[0].v_pointer);
-#line 33935 "Photo.c"
+#line 33950 "Photo.c"
 	} else {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33939 "Photo.c"
+#line 33954 "Photo.c"
 	}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 33945 "Photo.c"
+#line 33960 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_value_take_dev_to_reimport (GValue* value, gpointer v_object) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport* old;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	old = value->data[0].v_pointer;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (v_object) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = v_object;
-#line 33964 "Photo.c"
+#line 33979 "Photo.c"
 	} else {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		value->data[0].v_pointer = NULL;
-#line 33968 "Photo.c"
+#line 33983 "Photo.c"
 	}
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (old) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_reimport_raw_development_state_impl_dev_to_reimport_unref (old);
-#line 33974 "Photo.c"
+#line 33989 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_class_init (PhotoReimportRawDevelopmentStateImplDevToReimportClass * klass) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateImplDevToReimportClass *) klass)->finalize = photo_reimport_raw_development_state_impl_dev_to_reimport_finalize;
-#line 33984 "Photo.c"
+#line 33999 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_instance_init (PhotoReimportRawDevelopmentStateImplDevToReimport * self) {
 	BackingPhotoRow* _tmp0_ = NULL;
-#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->backing = _tmp0_;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->ref_count = 1;
-#line 33996 "Photo.c"
+#line 34011 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_finalize (PhotoReimportRawDevelopmentStateImplDevToReimport* obj) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport * self;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_handlers_destroy (self);
-#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1385 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (self->backing);
-#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (self->metadata);
-#line 34010 "Photo.c"
+#line 34025 "Photo.c"
 }
 
 
@@ -34032,58 +34047,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 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	return instance;
-#line 34035 "Photo.c"
+#line 34050 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_dev_to_reimport_unref (gpointer instance) {
 	PhotoReimportRawDevelopmentStateImplDevToReimport* self;
 	self = instance;
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL_DEV_TO_REIMPORT_GET_CLASS (self)->finalize (self);
-#line 1382 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1384 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 34048 "Photo.c"
+#line 34063 "Photo.c"
 	}
 }
 
 
 static void photo_reimport_raw_development_state_impl_class_init (PhotoReimportRawDevelopmentStateImplClass * klass) {
-#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_reimport_raw_development_state_impl_parent_class = g_type_class_peek_parent (klass);
-#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoReimportRawDevelopmentStateClass *) klass)->finalize = photo_reimport_raw_development_state_impl_finalize;
-#line 34058 "Photo.c"
+#line 34073 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_instance_init (PhotoReimportRawDevelopmentStateImpl * self) {
 	GeeArrayList* _tmp0_ = NULL;
-#line 1392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1394 "/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, photo_reimport_raw_development_state_impl_dev_to_reimport_unref, NULL, NULL, NULL);
-#line 1392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->list = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1395 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->metadata_only = FALSE;
-#line 34070 "Photo.c"
+#line 34085 "Photo.c"
 }
 
 
 static void photo_reimport_raw_development_state_impl_finalize (PhotoReimportRawDevelopmentState* obj) {
 	PhotoReimportRawDevelopmentStateImpl * self;
-#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_TYPE_REIMPORT_RAW_DEVELOPMENT_STATE_IMPL, PhotoReimportRawDevelopmentStateImpl);
-#line 1392 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1394 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->list);
-#line 1381 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 1383 "/home/jens/Source/shotwell/src/Photo.vala"
 	PHOTO_REIMPORT_RAW_DEVELOPMENT_STATE_CLASS (photo_reimport_raw_development_state_impl_parent_class)->finalize (obj);
-#line 34082 "Photo.c"
+#line 34097 "Photo.c"
 }
 
 
@@ -34226,7 +34241,7 @@ static void photo_class_init (PhotoClass * klass) {
 	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 34225 "Photo.c"
+#line 34240 "Photo.c"
 }
 
 
@@ -34237,7 +34252,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 34236 "Photo.c"
+#line 34251 "Photo.c"
 }
 
 
@@ -34280,7 +34295,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 34279 "Photo.c"
+#line 34294 "Photo.c"
 }
 
 
@@ -34320,7 +34335,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 34319 "Photo.c"
+#line 34334 "Photo.c"
 }
 
 
@@ -34343,13 +34358,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 34342 "Photo.c"
+#line 34357 "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 34348 "Photo.c"
+#line 34363 "Photo.c"
 	}
 }
 
@@ -34359,13 +34374,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 34358 "Photo.c"
+#line 34373 "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 34364 "Photo.c"
+#line 34379 "Photo.c"
 	}
 }
 
@@ -34385,71 +34400,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 4462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34386 "Photo.c"
+#line 34401 "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 4462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34395 "Photo.c"
+#line 34410 "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 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34404 "Photo.c"
+#line 34419 "Photo.c"
 }
 
 
 static gint64* _int64_dup (gint64* self) {
 	gint64* dup;
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	dup = g_new0 (gint64, 1);
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	memcpy (dup, self, sizeof (gint64));
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	return dup;
-#line 34416 "Photo.c"
+#line 34431 "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 4468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34425 "Photo.c"
+#line 34440 "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 4488 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34434 "Photo.c"
+#line 34449 "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 4490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_trashcan_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34441 "Photo.c"
+#line 34456 "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 4491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_offline_contents_altered ((LibraryPhotoSourceCollection*) self, added, removed);
-#line 34448 "Photo.c"
+#line 34463 "Photo.c"
 }
 
 
@@ -34459,43 +34474,43 @@ LibraryPhotoSourceCollection* library_photo_source_collection_construct (GType o
 	MediaSourceHoldingTank* _tmp1_ = NULL;
 	MediaSourceHoldingTank* _tmp2_ = NULL;
 	MediaSourceHoldingTank* _tmp3_ = NULL;
-#line 4488 "/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 4490 "/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"
 	_tmp0_ = media_source_collection_get_trashcan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4492 "/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 4490 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4492 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/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 4491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 4491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/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 4491 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4493 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 34478 "Photo.c"
+#line 34493 "Photo.c"
 }
 
 
 LibraryPhotoSourceCollection* library_photo_source_collection_new (void) {
-#line 4487 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4489 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_source_collection_construct (TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION);
-#line 34485 "Photo.c"
+#line 34500 "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 4495 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34494 "Photo.c"
+#line 34509 "Photo.c"
 }
 
 
@@ -34503,24 +34518,24 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_trash
 	LibraryPhotoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	LibraryPhotoSourceHoldingTank* _tmp0_ = NULL;
-#line 4494 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4496 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4495 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4497 "/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 4495 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
-#line 4495 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4497 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34510 "Photo.c"
+#line 34525 "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 4499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34519 "Photo.c"
+#line 34534 "Photo.c"
 }
 
 
@@ -34528,15 +34543,15 @@ static MediaSourceHoldingTank* library_photo_source_collection_real_create_offli
 	LibraryPhotoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	LibraryPhotoSourceHoldingTank* _tmp0_ = NULL;
-#line 4498 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4500 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4501 "/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 4499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE_HOLDING_TANK, MediaSourceHoldingTank);
-#line 4499 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4501 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34535 "Photo.c"
+#line 34550 "Photo.c"
 }
 
 
@@ -34546,23 +34561,23 @@ static MediaMonitor* library_photo_source_collection_real_create_media_monitor (
 	Workers* _tmp0_ = NULL;
 	GCancellable* _tmp1_ = NULL;
 	PhotoMonitor* _tmp2_ = NULL;
-#line 4502 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4502 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_WORKERS (workers), NULL);
-#line 4502 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4504 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 4503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = workers;
-#line 4503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = cancellable;
-#line 4503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_monitor_new (_tmp0_, _tmp1_);
-#line 4503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_MONITOR, MediaMonitor);
-#line 4503 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4505 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34561 "Photo.c"
+#line 34576 "Photo.c"
 }
 
 
@@ -34570,17 +34585,17 @@ static gboolean library_photo_source_collection_real_holds_type_of_source (Sourc
 	LibraryPhotoSourceCollection * self;
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
-#line 4506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4506 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4508 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 4507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 4507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO);
-#line 4507 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4509 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34579 "Photo.c"
+#line 34594 "Photo.c"
 }
 
 
@@ -34588,15 +34603,15 @@ static gchar* library_photo_source_collection_real_get_typename (MediaSourceColl
 	LibraryPhotoSourceCollection * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 4510 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4512 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = g_strdup (PHOTO_TYPENAME);
-#line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 4511 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4513 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34595 "Photo.c"
+#line 34610 "Photo.c"
 }
 
 
@@ -34605,33 +34620,33 @@ static gboolean library_photo_source_collection_real_is_file_recognized (MediaSo
 	gboolean result = FALSE;
 	GFile* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 4514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4514 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4516 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 4515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 4515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_file_format_is_file_supported (_tmp0_);
-#line 4515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 4515 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4517 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 34616 "Photo.c"
+#line 34631 "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 4527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_editable_replaced ((LibraryPhotoSourceCollection*) self, _sender, old_file, new_file);
-#line 34623 "Photo.c"
+#line 34638 "Photo.c"
 }
 
 
 static void _library_photo_source_collection_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) {
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_on_raw_development_modified ((LibraryPhotoSourceCollection*) self, _sender);
-#line 34630 "Photo.c"
+#line 34645 "Photo.c"
 }
 
 
@@ -34641,30 +34656,30 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 	GeeIterable* _tmp75_ = NULL;
 	GeeIterable* _tmp153_ = NULL;
 	GeeIterable* _tmp154_ = NULL;
-#line 4518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4518 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 4518 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
 #line 4520 "/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"
 	_tmp0_ = added;
-#line 4520 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 34650 "Photo.c"
+#line 34665 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = added;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			_object_it = _tmp2_;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 34663 "Photo.c"
+#line 34678 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataObject* object = NULL;
@@ -34706,80 +34721,80 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				LibraryPhoto* _tmp56_ = NULL;
 				GeeCollection* _tmp57_ = NULL;
 				GeeCollection* _tmp58_ = NULL;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _object_it;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 34713 "Photo.c"
+#line 34728 "Photo.c"
 				}
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _object_it;
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				object = (DataObject*) _tmp6_;
-#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = object;
-#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4522 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo = _tmp8_;
 #line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
+				photo = _tmp8_;
+#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo;
-#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo));
-#line 4524 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable = _tmp10_;
-#line 4525 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = editable;
-#line 4525 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp11_ != NULL) {
-#line 34737 "Photo.c"
+#line 34752 "Photo.c"
 					GeeHashMap* _tmp12_ = NULL;
 					GFile* _tmp13_ = NULL;
 					LibraryPhoto* _tmp14_ = NULL;
-#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = self->priv->by_editable_file;
-#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = editable;
-#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4528 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = photo;
-#line 4526 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4528 "/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 34749 "Photo.c"
+#line 34764 "Photo.c"
 				}
-#line 4527 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo;
-#line 4527 "/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 4529 "/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"
 				_tmp16_ = photo;
-#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_PHOTO, Photo));
-#line 4529 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_list = _tmp17_;
-#line 4530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = raw_list;
-#line 4530 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp18_ != NULL) {
-#line 34765 "Photo.c"
+#line 34780 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp19_ = NULL;
 						GeeIterator* _tmp20_ = NULL;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp19_ = raw_list;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp20_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						_f_it = _tmp20_;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 34778 "Photo.c"
+#line 34793 "Photo.c"
 							GeeIterator* _tmp21_ = NULL;
 							gboolean _tmp22_ = FALSE;
 							GFile* f = NULL;
@@ -34788,163 +34803,163 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							GeeHashMap* _tmp25_ = NULL;
 							GFile* _tmp26_ = NULL;
 							LibraryPhoto* _tmp27_ = NULL;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp21_ = _f_it;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp22_ = gee_iterator_next (_tmp21_);
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp22_) {
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 34795 "Photo.c"
+#line 34810 "Photo.c"
 							}
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp23_ = _f_it;
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp24_ = gee_iterator_get (_tmp23_);
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							f = (GFile*) _tmp24_;
-#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4534 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp25_ = self->priv->by_raw_development_file;
-#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4534 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp26_ = f;
-#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4534 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp27_ = photo;
-#line 4532 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4534 "/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 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 34813 "Photo.c"
+#line 34828 "Photo.c"
 						}
-#line 4531 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 34817 "Photo.c"
+#line 34832 "Photo.c"
 					}
 				}
-#line 4533 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = photo;
-#line 4533 "/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 4535 "/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"
 				_tmp29_ = photo;
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_PHOTO, Photo));
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = _tmp30_;
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = _tmp31_->filesize;
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = _tmp32_;
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp31_);
-#line 4535 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
 				master_filesize = _tmp33_;
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = photo;
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo));
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tmp36_;
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = _tmp37_ != NULL;
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp37_);
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp38_) {
-#line 34850 "Photo.c"
+#line 34865 "Photo.c"
 					LibraryPhoto* _tmp39_ = NULL;
 					BackingPhotoRow* _tmp40_ = NULL;
 					BackingPhotoRow* _tmp41_ = NULL;
 					gint64 _tmp42_ = 0LL;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp39_ = photo;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp40_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_PHOTO, Photo));
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp41_ = _tmp40_;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp42_ = _tmp41_->filesize;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = _tmp42_;
-#line 4537 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp41_);
-#line 34867 "Photo.c"
+#line 34882 "Photo.c"
 				} else {
-#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = (gint64) -1;
-#line 34871 "Photo.c"
+#line 34886 "Photo.c"
 				}
-#line 4536 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4538 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp34_;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = self->priv->filesize_to_photo;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = master_filesize;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = photo;
-#line 4539 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_set (_tmp43_, &_tmp44_, _tmp45_);
-#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = self->priv->photo_to_master_filesize;
-#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = photo;
-#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = master_filesize;
-#line 4540 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4542 "/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 4541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = editable_filesize;
-#line 4541 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp49_ >= ((gint64) 0)) {
-#line 34895 "Photo.c"
+#line 34910 "Photo.c"
 					GeeMultiMap* _tmp50_ = NULL;
 					gint64 _tmp51_ = 0LL;
 					LibraryPhoto* _tmp52_ = NULL;
 					GeeHashMap* _tmp53_ = NULL;
 					LibraryPhoto* _tmp54_ = NULL;
 					gint64 _tmp55_ = 0LL;
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = self->priv->filesize_to_photo;
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp51_ = editable_filesize;
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp52_ = photo;
-#line 4542 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4544 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp50_, &_tmp51_, _tmp52_);
-#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = self->priv->photo_to_editable_filesize;
-#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = photo;
-#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4545 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = editable_filesize;
-#line 4543 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4545 "/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 34918 "Photo.c"
+#line 34933 "Photo.c"
 				}
-#line 4546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = photo;
-#line 4546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PHOTO, Photo));
-#line 4546 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_rows = _tmp57_;
-#line 4547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = raw_rows;
-#line 4547 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp58_ != NULL) {
-#line 34930 "Photo.c"
+#line 34945 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
 						GeeCollection* _tmp59_ = NULL;
 						GeeIterator* _tmp60_ = NULL;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp59_ = raw_rows;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						_row_it = _tmp60_;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 34943 "Photo.c"
+#line 34958 "Photo.c"
 							GeeIterator* _tmp61_ = NULL;
 							gboolean _tmp62_ = FALSE;
 							BackingPhotoRow* row = NULL;
@@ -34952,29 +34967,29 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gpointer _tmp64_ = NULL;
 							BackingPhotoRow* _tmp65_ = NULL;
 							gint64 _tmp66_ = 0LL;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp61_ = _row_it;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp62_ = gee_iterator_next (_tmp61_);
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp62_) {
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 34959 "Photo.c"
+#line 34974 "Photo.c"
 							}
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp63_ = _row_it;
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp64_ = gee_iterator_get (_tmp63_);
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							row = (BackingPhotoRow*) _tmp64_;
-#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp65_ = row;
-#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp66_ = _tmp65_->filesize;
-#line 4549 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp66_ >= ((gint64) 0)) {
-#line 34973 "Photo.c"
+#line 34988 "Photo.c"
 								GeeMultiMap* _tmp67_ = NULL;
 								BackingPhotoRow* _tmp68_ = NULL;
 								gint64 _tmp69_ = 0LL;
@@ -34983,72 +34998,72 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 								LibraryPhoto* _tmp72_ = NULL;
 								BackingPhotoRow* _tmp73_ = NULL;
 								gint64 _tmp74_ = 0LL;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp67_ = self->priv->filesize_to_photo;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp68_ = row;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp69_ = _tmp68_->filesize;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp70_ = photo;
-#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4552 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_set (_tmp67_, &_tmp69_, _tmp70_);
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp71_ = self->priv->photo_to_raw_development_filesize;
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp72_ = photo;
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp73_ = row;
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp74_ = _tmp73_->filesize;
-#line 4551 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4553 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_set (_tmp71_, _tmp72_, &_tmp74_);
-#line 35002 "Photo.c"
+#line 35017 "Photo.c"
 							}
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35006 "Photo.c"
+#line 35021 "Photo.c"
 						}
-#line 4548 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4550 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35010 "Photo.c"
+#line 35025 "Photo.c"
 					}
 				}
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_rows);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_list);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (editable);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (object);
-#line 35023 "Photo.c"
+#line 35038 "Photo.c"
 			}
-#line 4521 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4523 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35027 "Photo.c"
+#line 35042 "Photo.c"
 		}
 	}
-#line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp75_ = removed;
-#line 4558 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp75_ != NULL) {
-#line 35034 "Photo.c"
+#line 35049 "Photo.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp76_ = NULL;
 			GeeIterator* _tmp77_ = NULL;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = removed;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = gee_iterable_iterator (_tmp76_);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_object_it = _tmp77_;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35047 "Photo.c"
+#line 35062 "Photo.c"
 				GeeIterator* _tmp78_ = NULL;
 				gboolean _tmp79_ = FALSE;
 				DataObject* object = NULL;
@@ -35091,39 +35106,39 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 				LibraryPhoto* _tmp134_ = NULL;
 				GeeCollection* _tmp135_ = NULL;
 				GeeCollection* _tmp136_ = NULL;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp78_ = _object_it;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp79_ = gee_iterator_next (_tmp78_);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp79_) {
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35098 "Photo.c"
+#line 35113 "Photo.c"
 				}
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp80_ = _object_it;
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp81_ = gee_iterator_get (_tmp80_);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				object = (DataObject*) _tmp81_;
-#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp82_ = object;
-#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp83_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4560 "/home/jens/Source/shotwell/src/Photo.vala"
-				photo = _tmp83_;
 #line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
+				photo = _tmp83_;
+#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp84_ = photo;
-#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp85_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_PHOTO, Photo));
-#line 4562 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable = _tmp85_;
-#line 4563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp86_ = editable;
-#line 4563 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp86_ != NULL) {
-#line 35122 "Photo.c"
+#line 35137 "Photo.c"
 					gboolean is_removed = FALSE;
 					GeeHashMap* _tmp87_ = NULL;
 					LibraryPhoto* _tmp88_ = NULL;
@@ -35132,58 +35147,58 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 					gboolean _tmp91_ = FALSE;
 					gboolean _tmp92_ = FALSE;
 					gboolean _tmp93_ = FALSE;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp87_ = self->priv->by_editable_file;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp88_ = photo;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp89_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp88_, TYPE_PHOTO, Photo));
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp90_ = _tmp89_;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/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 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp92_ = _tmp91_;
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp90_);
-#line 4564 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4566 "/home/jens/Source/shotwell/src/Photo.vala"
 					is_removed = _tmp92_;
-#line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp93_ = is_removed;
-#line 4565 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
 					_vala_assert (_tmp93_, "is_removed");
-#line 35151 "Photo.c"
+#line 35166 "Photo.c"
 				}
-#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp94_ = photo;
-#line 4567 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp95_, NULL, FALSE);
-#line 4567 "/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 4569 "/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"
 				_tmp96_ = photo;
-#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp97_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, TYPE_PHOTO, Photo));
-#line 4569 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_list = _tmp97_;
-#line 4570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp98_ = raw_list;
-#line 4570 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp98_ != NULL) {
-#line 35169 "Photo.c"
+#line 35184 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp99_ = NULL;
 						GeeIterator* _tmp100_ = NULL;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp99_ = raw_list;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp100_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						_f_it = _tmp100_;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35182 "Photo.c"
+#line 35197 "Photo.c"
 							GeeIterator* _tmp101_ = NULL;
 							gboolean _tmp102_ = FALSE;
 							GFile* f = NULL;
@@ -35191,158 +35206,158 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gpointer _tmp104_ = NULL;
 							GeeHashMap* _tmp105_ = NULL;
 							GFile* _tmp106_ = NULL;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp101_ = _f_it;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp102_ = gee_iterator_next (_tmp101_);
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp102_) {
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35198 "Photo.c"
+#line 35213 "Photo.c"
 							}
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp103_ = _f_it;
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp104_ = gee_iterator_get (_tmp103_);
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							f = (GFile*) _tmp104_;
-#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4574 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp105_ = self->priv->by_raw_development_file;
-#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4574 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp106_ = f;
-#line 4572 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4574 "/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 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 35214 "Photo.c"
+#line 35229 "Photo.c"
 						}
-#line 4571 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 35218 "Photo.c"
+#line 35233 "Photo.c"
 					}
 				}
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp107_ = photo;
-#line 4573 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp108_, NULL, FALSE);
-#line 4573 "/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 4575 "/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"
 				_tmp109_ = photo;
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp110_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_PHOTO, Photo));
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp111_ = _tmp110_;
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp112_ = _tmp111_->filesize;
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp113_ = _tmp112_;
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp111_);
-#line 4575 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
 				master_filesize = _tmp113_;
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp115_ = photo;
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp116_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp115_, TYPE_PHOTO, Photo));
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp117_ = _tmp116_;
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp118_ = _tmp117_ != NULL;
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp117_);
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp118_) {
-#line 35253 "Photo.c"
+#line 35268 "Photo.c"
 					LibraryPhoto* _tmp119_ = NULL;
 					BackingPhotoRow* _tmp120_ = NULL;
 					BackingPhotoRow* _tmp121_ = NULL;
 					gint64 _tmp122_ = 0LL;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp119_ = photo;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp120_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp119_, TYPE_PHOTO, Photo));
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp121_ = _tmp120_;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp122_ = _tmp121_->filesize;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp114_ = _tmp122_;
-#line 4577 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp121_);
-#line 35270 "Photo.c"
+#line 35285 "Photo.c"
 				} else {
-#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp114_ = (gint64) -1;
-#line 35274 "Photo.c"
+#line 35289 "Photo.c"
 				}
-#line 4576 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4578 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp114_;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp123_ = self->priv->filesize_to_photo;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp124_ = master_filesize;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp125_ = photo;
-#line 4579 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove (_tmp123_, &_tmp124_, _tmp125_);
-#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp126_ = self->priv->photo_to_master_filesize;
-#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp127_ = photo;
-#line 4580 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4582 "/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 4581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp128_ = editable_filesize;
-#line 4581 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp128_ >= ((gint64) 0)) {
-#line 35296 "Photo.c"
+#line 35311 "Photo.c"
 					GeeMultiMap* _tmp129_ = NULL;
 					gint64 _tmp130_ = 0LL;
 					LibraryPhoto* _tmp131_ = NULL;
 					GeeHashMap* _tmp132_ = NULL;
 					LibraryPhoto* _tmp133_ = NULL;
-#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp129_ = self->priv->filesize_to_photo;
-#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp130_ = editable_filesize;
-#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp131_ = photo;
-#line 4582 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4584 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_remove (_tmp129_, &_tmp130_, _tmp131_);
-#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp132_ = self->priv->photo_to_editable_filesize;
-#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp133_ = photo;
-#line 4583 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4585 "/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 35316 "Photo.c"
+#line 35331 "Photo.c"
 				}
-#line 4586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp134_ = photo;
-#line 4586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp135_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp134_, TYPE_PHOTO, Photo));
-#line 4586 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_rows = _tmp135_;
-#line 4587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp136_ = raw_rows;
-#line 4587 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp136_ != NULL) {
-#line 35328 "Photo.c"
+#line 35343 "Photo.c"
 					{
 						GeeIterator* _row_it = NULL;
 						GeeCollection* _tmp137_ = NULL;
 						GeeIterator* _tmp138_ = NULL;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp137_ = raw_rows;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp138_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp137_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						_row_it = _tmp138_;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 35341 "Photo.c"
+#line 35356 "Photo.c"
 							GeeIterator* _tmp139_ = NULL;
 							gboolean _tmp140_ = FALSE;
 							BackingPhotoRow* row = NULL;
@@ -35350,29 +35365,29 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 							gpointer _tmp142_ = NULL;
 							BackingPhotoRow* _tmp143_ = NULL;
 							gint64 _tmp144_ = 0LL;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp139_ = _row_it;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp140_ = gee_iterator_next (_tmp139_);
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp140_) {
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 35357 "Photo.c"
+#line 35372 "Photo.c"
 							}
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp141_ = _row_it;
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp142_ = gee_iterator_get (_tmp141_);
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							row = (BackingPhotoRow*) _tmp142_;
-#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp143_ = row;
-#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp144_ = _tmp143_->filesize;
-#line 4589 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (_tmp144_ >= ((gint64) 0)) {
-#line 35371 "Photo.c"
+#line 35386 "Photo.c"
 								GeeMultiMap* _tmp145_ = NULL;
 								BackingPhotoRow* _tmp146_ = NULL;
 								gint64 _tmp147_ = 0LL;
@@ -35381,116 +35396,116 @@ static void library_photo_source_collection_real_notify_contents_altered (DataCo
 								LibraryPhoto* _tmp150_ = NULL;
 								BackingPhotoRow* _tmp151_ = NULL;
 								gint64 _tmp152_ = 0LL;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp145_ = self->priv->filesize_to_photo;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp146_ = row;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp147_ = _tmp146_->filesize;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp148_ = photo;
-#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4592 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_remove (_tmp145_, &_tmp147_, _tmp148_);
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp149_ = self->priv->photo_to_raw_development_filesize;
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp150_ = photo;
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp151_ = row;
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 								_tmp152_ = _tmp151_->filesize;
-#line 4591 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4593 "/home/jens/Source/shotwell/src/Photo.vala"
 								gee_multi_map_remove (_tmp149_, _tmp150_, &_tmp152_);
-#line 35400 "Photo.c"
+#line 35415 "Photo.c"
 							}
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 							_backing_photo_row_unref0 (row);
-#line 35404 "Photo.c"
+#line 35419 "Photo.c"
 						}
-#line 4588 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4590 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_row_it);
-#line 35408 "Photo.c"
+#line 35423 "Photo.c"
 					}
 				}
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_rows);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_list);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (editable);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (object);
-#line 35421 "Photo.c"
+#line 35436 "Photo.c"
 			}
-#line 4559 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4561 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_object_it);
-#line 35425 "Photo.c"
+#line 35440 "Photo.c"
 		}
 	}
-#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp153_ = added;
-#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4600 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp154_ = removed;
-#line 4598 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4600 "/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 35434 "Photo.c"
+#line 35449 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_editable_replaced (LibraryPhotoSourceCollection* self, Photo* photo, GFile* old_file, GFile* new_file) {
 	GFile* _tmp0_ = NULL;
 	GFile* _tmp5_ = NULL;
-#line 4601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 4601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
-#line 4601 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file));
-#line 4602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = old_file;
-#line 4602 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 35453 "Photo.c"
+#line 35468 "Photo.c"
 		gboolean is_removed = FALSE;
 		GeeHashMap* _tmp1_ = NULL;
 		GFile* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = self->priv->by_editable_file;
-#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = old_file;
-#line 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4605 "/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 4603 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4605 "/home/jens/Source/shotwell/src/Photo.vala"
 		is_removed = _tmp3_;
-#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4606 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = is_removed;
-#line 4604 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4606 "/home/jens/Source/shotwell/src/Photo.vala"
 		_vala_assert (_tmp4_, "is_removed");
-#line 35471 "Photo.c"
+#line 35486 "Photo.c"
 	}
-#line 4607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = new_file;
-#line 4607 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4609 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ != NULL) {
-#line 35477 "Photo.c"
+#line 35492 "Photo.c"
 		GeeHashMap* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
-#line 4608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = self->priv->by_editable_file;
-#line 4608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = new_file;
-#line 4608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4610 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = photo;
-#line 4608 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4610 "/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 35489 "Photo.c"
+#line 35504 "Photo.c"
 	}
 }
 
@@ -35511,35 +35526,35 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 	LibraryPhoto* _tmp35_ = NULL;
 	GeeCollection* _tmp36_ = NULL;
 	GeeCollection* _tmp37_ = NULL;
-#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (_photo));
-#line 4612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _photo;
-#line 4612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL);
-#line 4612 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4615 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4615 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ == NULL) {
-#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4616 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (photo);
-#line 4614 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4616 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 35528 "Photo.c"
+#line 35543 "Photo.c"
 	}
-#line 4617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = self->priv->photo_to_raw_development_filesize;
-#line 4617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo;
-#line 4617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
-#line 4617 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 35538 "Photo.c"
+#line 35553 "Photo.c"
 		GeeMultiMap* _tmp21_ = NULL;
 		LibraryPhoto* _tmp22_ = NULL;
 		{
@@ -35550,25 +35565,25 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 			GeeCollection* _tmp9_ = NULL;
 			GeeIterator* _tmp10_ = NULL;
 			GeeIterator* _tmp11_ = NULL;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->photo_to_raw_development_filesize;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_);
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp9_);
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_s_it = _tmp11_;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35567 "Photo.c"
+#line 35582 "Photo.c"
 				GeeIterator* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
 				gint64 s = 0LL;
@@ -35579,74 +35594,74 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				GeeMultiMap* _tmp18_ = NULL;
 				gint64 _tmp19_ = 0LL;
 				LibraryPhoto* _tmp20_ = NULL;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _s_it;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = gee_iterator_next (_tmp12_);
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp13_) {
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35586 "Photo.c"
+#line 35601 "Photo.c"
 				}
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _s_it;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = gee_iterator_get (_tmp14_);
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = (gint64*) _tmp15_;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = *_tmp16_;
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp16_);
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 				s = _tmp17_;
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = self->priv->filesize_to_photo;
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = s;
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = photo;
-#line 4619 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4621 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove (_tmp18_, &_tmp19_, _tmp20_);
-#line 35608 "Photo.c"
+#line 35623 "Photo.c"
 			}
-#line 4618 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_s_it);
-#line 35612 "Photo.c"
+#line 35627 "Photo.c"
 		}
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = self->priv->photo_to_raw_development_filesize;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp22_ = photo;
-#line 4620 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4622 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove_all (_tmp21_, _tmp22_);
-#line 35620 "Photo.c"
+#line 35635 "Photo.c"
 	}
-#line 4624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = photo;
-#line 4624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo));
-#line 4624 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_list = _tmp24_;
-#line 4625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = raw_list;
-#line 4625 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp25_ != NULL) {
-#line 35632 "Photo.c"
+#line 35647 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
 			GeeCollection* _tmp26_ = NULL;
 			GeeIterator* _tmp27_ = NULL;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = raw_list;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_f_it = _tmp27_;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35645 "Photo.c"
+#line 35660 "Photo.c"
 				GeeIterator* _tmp28_ = NULL;
 				gboolean _tmp29_ = FALSE;
 				GFile* f = NULL;
@@ -35655,63 +35670,63 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				GeeHashMap* _tmp32_ = NULL;
 				GFile* _tmp33_ = NULL;
 				LibraryPhoto* _tmp34_ = NULL;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = _f_it;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = gee_iterator_next (_tmp28_);
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp29_) {
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35662 "Photo.c"
+#line 35677 "Photo.c"
 				}
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = _f_it;
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = gee_iterator_get (_tmp30_);
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = (GFile*) _tmp31_;
-#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = self->priv->by_raw_development_file;
-#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = f;
-#line 4627 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = photo;
-#line 4627 "/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 (_tmp32_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp33_, _tmp34_);
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 35680 "Photo.c"
+#line 35695 "Photo.c"
 			}
-#line 4626 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4628 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 35684 "Photo.c"
+#line 35699 "Photo.c"
 		}
 	}
-#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo;
-#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo));
-#line 4629 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_rows = _tmp36_;
-#line 4630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = raw_rows;
-#line 4630 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp37_ != NULL) {
-#line 35697 "Photo.c"
+#line 35712 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
 			GeeCollection* _tmp38_ = NULL;
 			GeeIterator* _tmp39_ = NULL;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp38_ = raw_rows;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp39_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_row_it = _tmp39_;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 35710 "Photo.c"
+#line 35725 "Photo.c"
 				GeeIterator* _tmp40_ = NULL;
 				gboolean _tmp41_ = FALSE;
 				BackingPhotoRow* row = NULL;
@@ -35719,29 +35734,29 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 				gpointer _tmp43_ = NULL;
 				BackingPhotoRow* _tmp44_ = NULL;
 				gint64 _tmp45_ = 0LL;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = _row_it;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = gee_iterator_next (_tmp40_);
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp41_) {
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 35726 "Photo.c"
+#line 35741 "Photo.c"
 				}
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = _row_it;
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = gee_iterator_get (_tmp42_);
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				row = (BackingPhotoRow*) _tmp43_;
-#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = row;
-#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _tmp44_->filesize;
-#line 4632 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp45_ > ((gint64) 0)) {
-#line 35740 "Photo.c"
+#line 35755 "Photo.c"
 					GeeMultiMap* _tmp46_ = NULL;
 					BackingPhotoRow* _tmp47_ = NULL;
 					gint64 _tmp48_ = 0LL;
@@ -35750,62 +35765,62 @@ static void library_photo_source_collection_on_raw_development_modified (Library
 					LibraryPhoto* _tmp51_ = NULL;
 					BackingPhotoRow* _tmp52_ = NULL;
 					gint64 _tmp53_ = 0LL;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp46_ = self->priv->filesize_to_photo;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp47_ = row;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp48_ = _tmp47_->filesize;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp49_ = photo;
-#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4635 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp46_, &_tmp48_, _tmp49_);
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = self->priv->photo_to_raw_development_filesize;
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp51_ = photo;
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp52_ = row;
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = _tmp52_->filesize;
-#line 4634 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4636 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp50_, _tmp51_, &_tmp53_);
-#line 35769 "Photo.c"
+#line 35784 "Photo.c"
 				}
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 35773 "Photo.c"
+#line 35788 "Photo.c"
 			}
-#line 4631 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4633 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 35777 "Photo.c"
+#line 35792 "Photo.c"
 		}
 	}
-#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (raw_rows);
-#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (raw_list);
-#line 4611 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4613 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 35786 "Photo.c"
+#line 35801 "Photo.c"
 }
 
 
 static gpointer __int64_dup0 (gpointer self) {
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self ? _int64_dup (self) : NULL;
-#line 35793 "Photo.c"
+#line 35808 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_items_altered (DataCollection* base, GeeMap* items) {
 	LibraryPhotoSourceCollection * self;
 	GeeMap* _tmp72_ = NULL;
-#line 4640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4640 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_MAP (items));
-#line 35804 "Photo.c"
+#line 35819 "Photo.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -35814,25 +35829,25 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 		GeeSet* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = items;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = gee_map_get_keys (_tmp0_);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_object_it = _tmp5_;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 35831 "Photo.c"
+#line 35846 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -35848,59 +35863,59 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 			gboolean _tmp15_ = FALSE;
 			Alteration* _tmp16_ = NULL;
 			gboolean _tmp17_ = FALSE;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _object_it;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 35855 "Photo.c"
+#line 35870 "Photo.c"
 			}
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _object_it;
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			object = (DataObject*) _tmp9_;
-#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = items;
-#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = object;
-#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = gee_map_get (_tmp10_, _tmp11_);
-#line 4642 "/home/jens/Source/shotwell/src/Photo.vala"
-			alteration = (Alteration*) _tmp12_;
 #line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
+			alteration = (Alteration*) _tmp12_;
+#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = object;
-#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4644 "/home/jens/Source/shotwell/src/Photo.vala"
-			photo = _tmp14_;
 #line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+			photo = _tmp14_;
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = alteration;
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = alteration_has_detail (_tmp16_, "image", "master");
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp17_) {
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = TRUE;
-#line 35885 "Photo.c"
+#line 35900 "Photo.c"
 			} else {
 				Alteration* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = alteration;
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = alteration_has_detail (_tmp18_, "image", "editable");
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = _tmp19_;
-#line 35895 "Photo.c"
+#line 35910 "Photo.c"
 			}
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp15_) {
-#line 35899 "Photo.c"
+#line 35914 "Photo.c"
 				gint64 old_master_filesize = 0LL;
 				GeeHashMap* _tmp20_ = NULL;
 				LibraryPhoto* _tmp21_ = NULL;
@@ -35937,215 +35952,215 @@ static void library_photo_source_collection_real_items_altered (DataCollection*
 				gint64 _tmp63_ = 0LL;
 				LibraryPhoto* _tmp64_ = NULL;
 				gint64 _tmp65_ = 0LL;
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = self->priv->photo_to_master_filesize;
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = photo;
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/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 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = (gint64*) _tmp22_;
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = *_tmp23_;
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp23_);
-#line 4647 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
 				old_master_filesize = _tmp24_;
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = self->priv->photo_to_editable_filesize;
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = photo;
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/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 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_) {
-#line 35958 "Photo.c"
+#line 35973 "Photo.c"
 					GeeHashMap* _tmp29_ = NULL;
 					LibraryPhoto* _tmp30_ = NULL;
 					gpointer _tmp31_ = NULL;
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = self->priv->photo_to_editable_filesize;
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = photo;
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/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 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (_tmp25_);
-#line 4649 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4651 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = (gint64*) _tmp31_;
-#line 35972 "Photo.c"
+#line 35987 "Photo.c"
 				} else {
 					gint64 _tmp32_ = 0LL;
 					gint64* _tmp33_ = NULL;
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = (gint64) -1;
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = __int64_dup0 (&_tmp32_);
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (_tmp25_);
-#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = _tmp33_;
-#line 35984 "Photo.c"
+#line 35999 "Photo.c"
 				}
-#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4650 "/home/jens/Source/shotwell/src/Photo.vala"
 				old_editable_filesize = *_tmp25_;
-#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = self->priv->photo_to_master_filesize;
-#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp35_ = photo;
-#line 4652 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4654 "/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 4653 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = self->priv->filesize_to_photo;
-#line 4653 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = old_master_filesize;
-#line 4653 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = photo;
-#line 4653 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove (_tmp36_, &_tmp37_, _tmp38_);
-#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = old_editable_filesize;
-#line 4654 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp39_ >= ((gint64) 0)) {
-#line 36006 "Photo.c"
+#line 36021 "Photo.c"
 					GeeHashMap* _tmp40_ = NULL;
 					LibraryPhoto* _tmp41_ = NULL;
 					GeeMultiMap* _tmp42_ = NULL;
 					gint64 _tmp43_ = 0LL;
 					LibraryPhoto* _tmp44_ = NULL;
-#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp40_ = self->priv->photo_to_editable_filesize;
-#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4657 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp41_ = photo;
-#line 4655 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4657 "/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 4656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp42_ = self->priv->filesize_to_photo;
-#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp43_ = old_editable_filesize;
-#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp44_ = photo;
-#line 4656 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4658 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_remove (_tmp42_, &_tmp43_, _tmp44_);
-#line 36026 "Photo.c"
+#line 36041 "Photo.c"
 				}
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = photo;
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_PHOTO, Photo));
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _tmp46_;
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = _tmp47_->filesize;
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = _tmp48_;
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp47_);
-#line 4659 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
 				master_filesize = _tmp49_;
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp51_ = photo;
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp52_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_PHOTO, Photo));
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp53_ = _tmp52_;
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp54_ = _tmp53_ != NULL;
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (_tmp53_);
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp54_) {
-#line 36054 "Photo.c"
+#line 36069 "Photo.c"
 					LibraryPhoto* _tmp55_ = NULL;
 					BackingPhotoRow* _tmp56_ = NULL;
 					BackingPhotoRow* _tmp57_ = NULL;
 					gint64 _tmp58_ = 0LL;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp55_ = photo;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp56_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PHOTO, Photo));
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp57_ = _tmp56_;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp58_ = _tmp57_->filesize;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = _tmp58_;
-#line 4661 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (_tmp57_);
-#line 36071 "Photo.c"
+#line 36086 "Photo.c"
 				} else {
-#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = (gint64) -1;
-#line 36075 "Photo.c"
+#line 36090 "Photo.c"
 				}
-#line 4660 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4662 "/home/jens/Source/shotwell/src/Photo.vala"
 				editable_filesize = _tmp50_;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = self->priv->photo_to_master_filesize;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = photo;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp61_ = master_filesize;
-#line 4663 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4665 "/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 4664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp62_ = self->priv->filesize_to_photo;
-#line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp63_ = master_filesize;
-#line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp64_ = photo;
-#line 4664 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_set (_tmp62_, &_tmp63_, _tmp64_);
-#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp65_ = editable_filesize;
-#line 4665 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp65_ >= ((gint64) 0)) {
-#line 36099 "Photo.c"
+#line 36114 "Photo.c"
 					GeeHashMap* _tmp66_ = NULL;
 					LibraryPhoto* _tmp67_ = NULL;
 					gint64 _tmp68_ = 0LL;
 					GeeMultiMap* _tmp69_ = NULL;
 					gint64 _tmp70_ = 0LL;
 					LibraryPhoto* _tmp71_ = NULL;
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp66_ = self->priv->photo_to_editable_filesize;
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp67_ = photo;
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp68_ = editable_filesize;
-#line 4666 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4668 "/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 4667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp69_ = self->priv->filesize_to_photo;
-#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp70_ = editable_filesize;
-#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp71_ = photo;
-#line 4667 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4669 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp69_, &_tmp70_, _tmp71_);
-#line 36122 "Photo.c"
+#line 36137 "Photo.c"
 				}
-#line 4646 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4648 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp25_);
-#line 36126 "Photo.c"
+#line 36141 "Photo.c"
 			}
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_alteration_unref0 (alteration);
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (object);
-#line 36134 "Photo.c"
+#line 36149 "Photo.c"
 		}
-#line 4641 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4643 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_object_it);
-#line 36138 "Photo.c"
+#line 36153 "Photo.c"
 	}
-#line 4672 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4674 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp72_ = items;
-#line 4672 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4674 "/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 36144 "Photo.c"
+#line 36159 "Photo.c"
 }
 
 
@@ -36154,28 +36169,28 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 	GeeHashMultiMap* map = NULL;
 	GeeHashMultiMap* _tmp0_ = NULL;
 	GeeCollection* _tmp97_ = NULL;
-#line 4676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (media_sources));
-#line 4677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_hash_multi_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 4677 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
 	map = _tmp0_;
-#line 36161 "Photo.c"
+#line 36176 "Photo.c"
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp1_ = NULL;
 		GeeIterator* _tmp2_ = NULL;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = media_sources;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_it = _tmp2_;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36174 "Photo.c"
+#line 36189 "Photo.c"
 			GeeIterator* _tmp3_ = NULL;
 			gboolean _tmp4_ = FALSE;
 			MediaSource* media = NULL;
@@ -36198,80 +36213,80 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			gboolean _tmp21_ = FALSE;
 			PhotoMetadata* _tmp55_ = NULL;
 			gboolean _tmp56_ = FALSE;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp3_ = _media_it;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp4_) {
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36205 "Photo.c"
+#line 36220 "Photo.c"
 			}
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _media_it;
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = gee_iterator_get (_tmp5_);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			media = (MediaSource*) _tmp6_;
-#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = media;
-#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4679 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4681 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = _tmp8_;
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = photo;
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4682 "/home/jens/Source/shotwell/src/Photo.vala"
 			metadata = _tmp10_;
-#line 4683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4685 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = hierarchical_tag_index_get_global_index ();
-#line 4683 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4685 "/home/jens/Source/shotwell/src/Photo.vala"
 			global_index = _tmp11_;
-#line 4690 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
 			htag_index = NULL;
-#line 4691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = metadata;
-#line 4691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = photo_metadata_has_hierarchical_keywords (_tmp12_);
-#line 4691 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4693 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp13_) {
-#line 36237 "Photo.c"
+#line 36252 "Photo.c"
 				PhotoMetadata* _tmp14_ = NULL;
 				GeeSet* _tmp15_ = NULL;
 				GeeSet* _tmp16_ = NULL;
 				HierarchicalTagIndex* _tmp17_ = NULL;
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = metadata;
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo_metadata_get_hierarchical_keywords (_tmp14_);
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = _tmp15_;
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/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 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_hierarchical_tag_index_unref0 (htag_index);
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				htag_index = _tmp17_;
-#line 4692 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4694 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp16_);
-#line 36256 "Photo.c"
+#line 36271 "Photo.c"
 			}
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = photo;
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = library_photo_get_import_keywords (_tmp18_);
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _tmp19_;
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = _tmp20_ != NULL;
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp20_);
-#line 4696 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp21_) {
-#line 36270 "Photo.c"
+#line 36285 "Photo.c"
 				{
 					GeeIterator* _keyword_it = NULL;
 					LibraryPhoto* _tmp22_ = NULL;
@@ -36279,23 +36294,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 					GeeCollection* _tmp24_ = NULL;
 					GeeIterator* _tmp25_ = NULL;
 					GeeIterator* _tmp26_ = NULL;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = photo;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = library_photo_get_import_keywords (_tmp22_);
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = _tmp23_;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp26_ = _tmp25_;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp24_);
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_keyword_it = _tmp26_;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 36294 "Photo.c"
+#line 36309 "Photo.c"
 						GeeIterator* _tmp27_ = NULL;
 						gboolean _tmp28_ = FALSE;
 						gchar* keyword = NULL;
@@ -36310,67 +36325,67 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						const gchar* _tmp39_ = NULL;
 						gboolean _tmp40_ = FALSE;
 						const gchar* _tmp49_ = NULL;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = _keyword_it;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp28_ = gee_iterator_next (_tmp27_);
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp28_) {
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 36317 "Photo.c"
+#line 36332 "Photo.c"
 						}
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = _keyword_it;
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp30_ = gee_iterator_get (_tmp29_);
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						keyword = (gchar*) _tmp30_;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp32_ = htag_index;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp32_ != NULL) {
-#line 36329 "Photo.c"
+#line 36344 "Photo.c"
 							HierarchicalTagIndex* _tmp33_ = NULL;
 							const gchar* _tmp34_ = NULL;
 							gboolean _tmp35_ = FALSE;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp33_ = htag_index;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp34_ = keyword;
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp35_ = hierarchical_tag_index_is_tag_in_index (_tmp33_, _tmp34_);
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = _tmp35_;
-#line 36341 "Photo.c"
+#line 36356 "Photo.c"
 						} else {
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = FALSE;
-#line 36345 "Photo.c"
+#line 36360 "Photo.c"
 						}
-#line 4698 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4700 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp31_) {
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (keyword);
-#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
 							continue;
-#line 36353 "Photo.c"
+#line 36368 "Photo.c"
 						}
-#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp36_ = keyword;
-#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp37_ = tag_prep_tag_name (_tmp36_);
-#line 4701 "/home/jens/Source/shotwell/src/Photo.vala"
-						name = _tmp37_;
 #line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
+						name = _tmp37_;
+#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp38_ = global_index;
-#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp39_ = name;
-#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp40_ = hierarchical_tag_index_is_tag_in_index (_tmp38_, _tmp39_);
-#line 4703 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp40_) {
-#line 36369 "Photo.c"
+#line 36384 "Photo.c"
 							gchar* most_derived_path = NULL;
 							HierarchicalTagIndex* _tmp41_ = NULL;
 							const gchar* _tmp42_ = NULL;
@@ -36380,82 +36395,82 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 							Tag* _tmp46_ = NULL;
 							Tag* _tmp47_ = NULL;
 							LibraryPhoto* _tmp48_ = NULL;
-#line 4704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp41_ = global_index;
-#line 4704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp42_ = name;
-#line 4704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp43_ = hierarchical_tag_index_get_path_for_name (_tmp41_, _tmp42_);
-#line 4704 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
 							most_derived_path = _tmp43_;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp44_ = map;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp45_ = most_derived_path;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp46_ = tag_for_path (_tmp45_);
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp47_ = _tmp46_;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp48_ = photo;
-#line 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/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 4705 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4707 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp47_);
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (most_derived_path);
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (name);
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_free0 (keyword);
-#line 4706 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4708 "/home/jens/Source/shotwell/src/Photo.vala"
 							continue;
-#line 36409 "Photo.c"
+#line 36424 "Photo.c"
 						}
-#line 4709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4711 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp49_ = name;
-#line 4709 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4711 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp49_ != NULL) {
-#line 36415 "Photo.c"
+#line 36430 "Photo.c"
 							GeeHashMultiMap* _tmp50_ = NULL;
 							const gchar* _tmp51_ = NULL;
 							Tag* _tmp52_ = NULL;
 							Tag* _tmp53_ = NULL;
 							LibraryPhoto* _tmp54_ = NULL;
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp50_ = map;
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp51_ = name;
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp52_ = tag_for_path (_tmp51_);
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp53_ = _tmp52_;
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp54_ = photo;
-#line 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/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 4710 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4712 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp53_);
-#line 36435 "Photo.c"
+#line 36450 "Photo.c"
 						}
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (name);
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (keyword);
-#line 36441 "Photo.c"
+#line 36456 "Photo.c"
 					}
-#line 4697 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4699 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_keyword_it);
-#line 36445 "Photo.c"
+#line 36460 "Photo.c"
 				}
 			}
-#line 4714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp55_ = metadata;
-#line 4714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp56_ = photo_metadata_has_hierarchical_keywords (_tmp55_);
-#line 4714 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp56_) {
-#line 36454 "Photo.c"
+#line 36469 "Photo.c"
 				{
 					GeeIterator* _path_it = NULL;
 					HierarchicalTagIndex* _tmp57_ = NULL;
@@ -36463,23 +36478,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 					GeeCollection* _tmp59_ = NULL;
 					GeeIterator* _tmp60_ = NULL;
 					GeeIterator* _tmp61_ = NULL;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp57_ = htag_index;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp58_ = hierarchical_tag_index_get_all_paths (_tmp57_);
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp59_ = _tmp58_;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp60_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp59_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = _tmp60_;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp59_);
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_path_it = _tmp61_;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 36478 "Photo.c"
+#line 36493 "Photo.c"
 						GeeIterator* _tmp62_ = NULL;
 						gboolean _tmp63_ = FALSE;
 						gchar* path = NULL;
@@ -36489,94 +36504,94 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 						const gchar* _tmp66_ = NULL;
 						gchar* _tmp67_ = NULL;
 						const gchar* _tmp68_ = NULL;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp62_ = _path_it;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp63_ = gee_iterator_next (_tmp62_);
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp63_) {
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 36496 "Photo.c"
+#line 36511 "Photo.c"
 						}
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp64_ = _path_it;
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp65_ = gee_iterator_get (_tmp64_);
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						path = (gchar*) _tmp65_;
-#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp66_ = path;
-#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp67_ = tag_prep_tag_name (_tmp66_);
-#line 4716 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
 						name = _tmp67_;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp68_ = name;
-#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4719 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (_tmp68_ != NULL) {
-#line 36514 "Photo.c"
+#line 36529 "Photo.c"
 							GeeHashMultiMap* _tmp69_ = NULL;
 							const gchar* _tmp70_ = NULL;
 							Tag* _tmp71_ = NULL;
 							Tag* _tmp72_ = NULL;
 							LibraryPhoto* _tmp73_ = NULL;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp69_ = map;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp70_ = name;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp71_ = tag_for_path (_tmp70_);
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp72_ = _tmp71_;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp73_ = photo;
-#line 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/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 4718 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4720 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (_tmp72_);
-#line 36534 "Photo.c"
+#line 36549 "Photo.c"
 						}
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (name);
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_free0 (path);
-#line 36540 "Photo.c"
+#line 36555 "Photo.c"
 					}
-#line 4715 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4717 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_path_it);
-#line 36544 "Photo.c"
+#line 36559 "Photo.c"
 				}
 			}
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_hierarchical_tag_index_unref0 (htag_index);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_hierarchical_tag_index_unref0 (global_index);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_media_metadata_unref0 (metadata);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 36557 "Photo.c"
+#line 36572 "Photo.c"
 		}
-#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4680 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36561 "Photo.c"
+#line 36576 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
 		GeeCollection* _tmp74_ = NULL;
 		GeeIterator* _tmp75_ = NULL;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp74_ = media_sources;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp75_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_it = _tmp75_;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36575 "Photo.c"
+#line 36590 "Photo.c"
 			GeeIterator* _tmp76_ = NULL;
 			gboolean _tmp77_ = FALSE;
 			MediaSource* media = NULL;
@@ -36586,41 +36601,41 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			MediaSource* _tmp80_ = NULL;
 			LibraryPhoto* _tmp81_ = NULL;
 			LibraryPhoto* _tmp82_ = NULL;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp76_ = _media_it;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp77_ = gee_iterator_next (_tmp76_);
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp77_) {
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36593 "Photo.c"
+#line 36608 "Photo.c"
 			}
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp78_ = _media_it;
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp79_ = gee_iterator_get (_tmp78_);
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			media = (MediaSource*) _tmp79_;
-#line 4724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp80_ = media;
-#line 4724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp81_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 4724 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4726 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = _tmp81_;
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4727 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp82_ = photo;
-#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4727 "/home/jens/Source/shotwell/src/Photo.vala"
 			library_photo_clear_import_keywords (_tmp82_);
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 36615 "Photo.c"
+#line 36630 "Photo.c"
 		}
-#line 4723 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4725 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 36619 "Photo.c"
+#line 36634 "Photo.c"
 	}
 	{
 		GeeIterator* _tag_it = NULL;
@@ -36629,23 +36644,23 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 		GeeSet* _tmp85_ = NULL;
 		GeeIterator* _tmp86_ = NULL;
 		GeeIterator* _tmp87_ = NULL;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp83_ = map;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/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 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp85_ = _tmp84_;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp86_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp87_ = _tmp86_;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp85_);
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tag_it = _tmp87_;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 36644 "Photo.c"
+#line 36659 "Photo.c"
 			GeeIterator* _tmp88_ = NULL;
 			gboolean _tmp89_ = FALSE;
 			Tag* tag = NULL;
@@ -36656,155 +36671,155 @@ static void library_photo_source_collection_real_postprocess_imported_media (Med
 			Tag* _tmp94_ = NULL;
 			GeeCollection* _tmp95_ = NULL;
 			GeeCollection* _tmp96_ = NULL;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp88_ = _tag_it;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp89_ = gee_iterator_next (_tmp88_);
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp89_) {
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 36663 "Photo.c"
+#line 36678 "Photo.c"
 			}
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp90_ = _tag_it;
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp91_ = gee_iterator_get (_tmp90_);
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			tag = (Tag*) _tmp91_;
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp92_ = tag;
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp93_ = map;
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp94_ = tag;
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/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 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp96_ = _tmp95_;
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			tag_attach_many (_tmp92_, _tmp96_);
-#line 4729 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp96_);
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (tag);
-#line 36687 "Photo.c"
+#line 36702 "Photo.c"
 		}
-#line 4728 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4730 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tag_it);
-#line 36691 "Photo.c"
+#line 36706 "Photo.c"
 	}
-#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4733 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp97_ = media_sources;
-#line 4731 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4733 "/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 4676 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4678 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (map);
-#line 36699 "Photo.c"
+#line 36714 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_ = NULL;
 	PhotoMetadata* _tmp1_ = NULL;
-#line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4736 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4738 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "master-reimported", _tmp0_, _tmp1_);
-#line 36716 "Photo.c"
+#line 36731 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4735 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4737 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_master_reimported (self, photo, metadata);
-#line 36725 "Photo.c"
+#line 36740 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_ = NULL;
 	PhotoMetadata* _tmp1_ = NULL;
-#line 4740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4741 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4743 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "editable-reimported", _tmp0_, _tmp1_);
-#line 36742 "Photo.c"
+#line 36757 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4740 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4742 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_editable_reimported (self, photo, metadata);
-#line 36751 "Photo.c"
+#line 36766 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_ = NULL;
 	PhotoMetadata* _tmp1_ = NULL;
-#line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4746 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4748 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "source-reimported", _tmp0_, _tmp1_);
-#line 36768 "Photo.c"
+#line 36783 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4745 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4747 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_source_reimported (self, photo, metadata);
-#line 36777 "Photo.c"
+#line 36792 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
 	LibraryPhoto* _tmp0_ = NULL;
 	PhotoMetadata* _tmp1_ = NULL;
-#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 4751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = metadata;
-#line 4751 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4753 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_signal_emit_by_name (self, "baseline-reimported", _tmp0_, _tmp1_);
-#line 36794 "Photo.c"
+#line 36809 "Photo.c"
 }
 
 
 void library_photo_source_collection_notify_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4750 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4752 "/home/jens/Source/shotwell/src/Photo.vala"
 	LIBRARY_PHOTO_SOURCE_COLLECTION_GET_CLASS (self)->notify_baseline_reimported (self, photo, metadata);
-#line 36803 "Photo.c"
+#line 36818 "Photo.c"
 }
 
 
@@ -36814,38 +36829,38 @@ static MediaSource* library_photo_source_collection_real_fetch_by_numeric_id (Me
 	gint64 _tmp0_ = 0LL;
 	PhotoID _tmp1_ = {0};
 	LibraryPhoto* _tmp2_ = NULL;
-#line 4754 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4756 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = numeric_id;
-#line 4755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp1_, _tmp0_);
-#line 4755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = library_photo_source_collection_fetch (self, &_tmp1_);
-#line 4755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 4755 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4757 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36825 "Photo.c"
+#line 36840 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_trashcan_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 4758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4758 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 4758 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 4760 "/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"
 	_tmp0_ = added;
-#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4762 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = removed;
-#line 4760 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4762 "/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 36844 "Photo.c"
+#line 36859 "Photo.c"
 }
 
 
@@ -36853,40 +36868,40 @@ static gboolean library_photo_source_collection_check_if_trashed_photo (LibraryP
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 4764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
-#line 4764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 4764 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4766 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 4765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 4765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4767 "/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 4765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 4765 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4767 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36866 "Photo.c"
+#line 36881 "Photo.c"
 }
 
 
 static void library_photo_source_collection_on_offline_contents_altered (LibraryPhotoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 4768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4768 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 4768 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 4770 "/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"
 	_tmp0_ = added;
-#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4772 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = removed;
-#line 4770 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4772 "/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 36885 "Photo.c"
+#line 36900 "Photo.c"
 }
 
 
@@ -36894,21 +36909,21 @@ static gboolean library_photo_source_collection_check_if_offline_photo (LibraryP
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 4774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
-#line 4774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 4774 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4776 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_ALTERATION (alteration), FALSE);
-#line 4775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source;
-#line 4775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4777 "/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 4775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 4775 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4777 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 36907 "Photo.c"
+#line 36922 "Photo.c"
 }
 
 
@@ -36931,7 +36946,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 	_tmp3_ = end;
 #line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 36930 "Photo.c"
+#line 36945 "Photo.c"
 		glong _tmp4_ = 0L;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
@@ -36939,7 +36954,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = _tmp4_;
 #line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 36938 "Photo.c"
+#line 36953 "Photo.c"
 	} else {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
@@ -36951,7 +36966,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
 		result = (glong) (_tmp5_ - _tmp6_);
 #line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 36950 "Photo.c"
+#line 36965 "Photo.c"
 	}
 }
 
@@ -36975,21 +36990,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	_tmp1_ = offset;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 36974 "Photo.c"
+#line 36989 "Photo.c"
 		glong _tmp2_ = 0L;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 36980 "Photo.c"
+#line 36995 "Photo.c"
 	} else {
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 36984 "Photo.c"
+#line 36999 "Photo.c"
 	}
 #line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 36988 "Photo.c"
+#line 37003 "Photo.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 		glong _tmp5_ = 0L;
@@ -37001,7 +37016,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
 #line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 37000 "Photo.c"
+#line 37015 "Photo.c"
 	} else {
 		gint _tmp6_ = 0;
 		gint _tmp7_ = 0;
@@ -37011,13 +37026,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp7_ = _tmp6_;
 #line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 37010 "Photo.c"
+#line 37025 "Photo.c"
 	}
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
 #line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 37016 "Photo.c"
+#line 37031 "Photo.c"
 		glong _tmp9_ = 0L;
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
@@ -37031,7 +37046,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp11_ = offset;
 #line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 37030 "Photo.c"
+#line 37045 "Photo.c"
 	} else {
 		glong _tmp12_ = 0L;
 		glong _tmp13_ = 0L;
@@ -37041,13 +37056,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp13_ = string_length;
 #line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 37040 "Photo.c"
+#line 37055 "Photo.c"
 	}
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
 #line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 37046 "Photo.c"
+#line 37061 "Photo.c"
 		glong _tmp15_ = 0L;
 		glong _tmp16_ = 0L;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -37056,7 +37071,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 		_tmp16_ = offset;
 #line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 37055 "Photo.c"
+#line 37070 "Photo.c"
 	}
 #line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
@@ -37076,7 +37091,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	result = _tmp22_;
 #line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 37075 "Photo.c"
+#line 37090 "Photo.c"
 }
 
 
@@ -37092,37 +37107,37 @@ static MediaSource* library_photo_source_collection_real_fetch_by_source_id (Med
 	gchar* _tmp5_ = NULL;
 	gint64 _tmp6_ = 0LL;
 	MediaSource* _tmp7_ = NULL;
-#line 4778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4778 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (source_id != NULL, NULL);
-#line 4779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = source_id;
-#line 4779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = g_str_has_prefix (_tmp0_, PHOTO_TYPENAME);
-#line 4779 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4781 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp1_, "source_id.has_prefix(Photo.TYPENAME)");
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = source_id;
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = strlen (PHOTO_TYPENAME);
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = string_substring (_tmp2_, (glong) _tmp4_, (glong) -1);
-#line 4780 "/home/jens/Source/shotwell/src/Photo.vala"
-	numeric_only = _tmp5_;
 #line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+	numeric_only = _tmp5_;
+#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = parse_int64 (numeric_only, 16);
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4784 "/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 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp7_;
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (numeric_only);
-#line 4782 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4784 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37121 "Photo.c"
+#line 37136 "Photo.c"
 }
 
 
@@ -37134,27 +37149,27 @@ static GeeCollection* library_photo_source_collection_real_get_event_source_ids
 	EventID _tmp2_ = {0};
 	GeeArrayList* _tmp3_ = NULL;
 	GeeCollection* _tmp4_ = NULL;
-#line 4785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4787 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4785 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4787 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (event_id != NULL, NULL);
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo_table_get_instance ();
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = *event_id;
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_table_get_event_source_ids (_tmp1_, &_tmp2_);
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 4786 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4788 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37153 "Photo.c"
+#line 37168 "Photo.c"
 }
 
 
@@ -37163,21 +37178,21 @@ LibraryPhoto* library_photo_source_collection_fetch (LibraryPhotoSourceCollectio
 	PhotoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
 	DataSource* _tmp2_ = NULL;
-#line 4789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4789 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4791 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (photo_id != NULL, NULL);
-#line 4790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = *photo_id;
-#line 4790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_.id;
-#line 4790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4792 "/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 4790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4790 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4792 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37176 "Photo.c"
+#line 37191 "Photo.c"
 }
 
 
@@ -37186,21 +37201,21 @@ LibraryPhoto* library_photo_source_collection_fetch_by_editable_file (LibraryPho
 	GeeHashMap* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
 	gpointer _tmp2_ = NULL;
-#line 4793 "/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), NULL);
-#line 4793 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4795 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->by_editable_file;
-#line 4794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 4794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/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 4794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = (LibraryPhoto*) _tmp2_;
-#line 4794 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4796 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37199 "Photo.c"
+#line 37214 "Photo.c"
 }
 
 
@@ -37209,21 +37224,21 @@ LibraryPhoto* library_photo_source_collection_fetch_by_raw_development_file (Lib
 	GeeHashMap* _tmp0_ = NULL;
 	GFile* _tmp1_ = NULL;
 	gpointer _tmp2_ = NULL;
-#line 4797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4797 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4799 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->by_raw_development_file;
-#line 4798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 4798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/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 4798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = (LibraryPhoto*) _tmp2_;
-#line 4798 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4800 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37222 "Photo.c"
+#line 37237 "Photo.c"
 }
 
 
@@ -37243,110 +37258,110 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 	LibraryPhoto* _tmp17_ = NULL;
 	GeeCollection* _tmp18_ = NULL;
 	GeeCollection* _tmp19_ = NULL;
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_master));
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_editable));
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_development));
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = photo;
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_get_master_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO, Photo));
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = info;
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backing_photo_row_matches_file_info (_tmp2_, _tmp3_);
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp2_);
-#line 4804 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4806 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 37270 "Photo.c"
+#line 37285 "Photo.c"
 		GeeCollection* _tmp6_ = NULL;
 		LibraryPhoto* _tmp7_ = NULL;
-#line 4805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = matches_master;
-#line 4805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo;
-#line 4805 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp6_, _tmp7_);
-#line 37279 "Photo.c"
+#line 37294 "Photo.c"
 	}
-#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo;
-#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PHOTO, Photo));
-#line 4807 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
 	editable = _tmp9_;
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = editable;
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ != NULL) {
-#line 37291 "Photo.c"
+#line 37306 "Photo.c"
 		BackingPhotoRow* _tmp12_ = NULL;
 		GFileInfo* _tmp13_ = NULL;
 		gboolean _tmp14_ = FALSE;
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = editable;
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp13_ = info;
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = backing_photo_row_matches_file_info (_tmp12_, _tmp13_);
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp14_;
-#line 37303 "Photo.c"
+#line 37318 "Photo.c"
 	} else {
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = FALSE;
-#line 37307 "Photo.c"
+#line 37322 "Photo.c"
 	}
-#line 4808 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4810 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp10_) {
-#line 37311 "Photo.c"
+#line 37326 "Photo.c"
 		GeeCollection* _tmp15_ = NULL;
 		LibraryPhoto* _tmp16_ = NULL;
-#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp15_ = matches_editable;
-#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = photo;
-#line 4809 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_collection_add (_tmp15_, _tmp16_);
-#line 37320 "Photo.c"
+#line 37335 "Photo.c"
 	}
-#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = photo;
-#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp18_ = photo_get_raw_development_photo_rows (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo));
-#line 4811 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
 	development = _tmp18_;
-#line 4812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = development;
-#line 4812 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp19_ != NULL) {
-#line 37332 "Photo.c"
+#line 37347 "Photo.c"
 		{
 			GeeIterator* _row_it = NULL;
 			GeeCollection* _tmp20_ = NULL;
 			GeeIterator* _tmp21_ = NULL;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = development;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_row_it = _tmp21_;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 37345 "Photo.c"
+#line 37360 "Photo.c"
 				GeeIterator* _tmp22_ = NULL;
 				gboolean _tmp23_ = FALSE;
 				BackingPhotoRow* row = NULL;
@@ -37355,74 +37370,74 @@ static void library_photo_source_collection_compare_backing (LibraryPhotoSourceC
 				BackingPhotoRow* _tmp26_ = NULL;
 				GFileInfo* _tmp27_ = NULL;
 				gboolean _tmp28_ = FALSE;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = _row_it;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = gee_iterator_next (_tmp22_);
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp23_) {
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 37362 "Photo.c"
+#line 37377 "Photo.c"
 				}
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = _row_it;
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = gee_iterator_get (_tmp24_);
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				row = (BackingPhotoRow*) _tmp25_;
-#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = row;
-#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = info;
-#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = backing_photo_row_matches_file_info (_tmp26_, _tmp27_);
-#line 4814 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4816 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp28_) {
-#line 37378 "Photo.c"
+#line 37393 "Photo.c"
 					GeeCollection* _tmp29_ = NULL;
 					LibraryPhoto* _tmp30_ = NULL;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = matches_development;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp30_ = photo;
-#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
-					gee_collection_add (_tmp29_, _tmp30_);
 #line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
+					gee_collection_add (_tmp29_, _tmp30_);
+#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
 					_backing_photo_row_unref0 (row);
-#line 4817 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4819 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 37391 "Photo.c"
+#line 37406 "Photo.c"
 				}
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (row);
-#line 37395 "Photo.c"
+#line 37410 "Photo.c"
 			}
-#line 4813 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4815 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_row_it);
-#line 37399 "Photo.c"
+#line 37414 "Photo.c"
 		}
 	}
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (development);
-#line 4801 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4803 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (editable);
-#line 37406 "Photo.c"
+#line 37421 "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 4825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_master));
-#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matches_editable));
-#line 4825 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matched_development));
-#line 37421 "Photo.c"
+#line 37436 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -37432,27 +37447,27 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 		GeeCollection* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
 		GeeIterator* _tmp6_ = NULL;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->filesize_to_photo;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = info;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = g_file_info_get_size (_tmp1_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_multi_map_get (_tmp0_, &_tmp2_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp4_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_it = _tmp6_;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37451 "Photo.c"
+#line 37466 "Photo.c"
 			GeeIterator* _tmp7_ = NULL;
 			gboolean _tmp8_ = FALSE;
 			LibraryPhoto* photo = NULL;
@@ -37463,41 +37478,41 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			GeeCollection* _tmp13_ = NULL;
 			GeeCollection* _tmp14_ = NULL;
 			GeeCollection* _tmp15_ = NULL;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = _photo_it;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_iterator_next (_tmp7_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp8_) {
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37470 "Photo.c"
+#line 37485 "Photo.c"
 			}
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _photo_it;
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterator_get (_tmp9_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = (LibraryPhoto*) _tmp10_;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = photo;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = info;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = matches_master;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = matches_editable;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = matched_development;
-#line 4828 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
 			library_photo_source_collection_compare_backing (self, _tmp11_, _tmp12_, _tmp13_, _tmp14_, _tmp15_);
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 37492 "Photo.c"
+#line 37507 "Photo.c"
 		}
-#line 4827 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4829 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37496 "Photo.c"
+#line 37511 "Photo.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -37505,21 +37520,21 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 		GeeCollection* _tmp17_ = NULL;
 		GeeIterator* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/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 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = _tmp18_;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp17_);
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_it = _tmp19_;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37518 "Photo.c"
+#line 37533 "Photo.c"
 			GeeIterator* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 			MediaSource* media = NULL;
@@ -37530,52 +37545,52 @@ void library_photo_source_collection_fetch_by_matching_backing (LibraryPhotoSour
 			GeeCollection* _tmp26_ = NULL;
 			GeeCollection* _tmp27_ = NULL;
 			GeeCollection* _tmp28_ = NULL;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp20_ = _media_it;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp21_ = gee_iterator_next (_tmp20_);
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp21_) {
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37537 "Photo.c"
+#line 37552 "Photo.c"
 			}
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp22_ = _media_it;
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = gee_iterator_get (_tmp22_);
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			media = (MediaSource*) _tmp23_;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = media;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp25_ = info;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp26_ = matches_master;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp27_ = matches_editable;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp28_ = matched_development;
-#line 4831 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4833 "/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 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (media);
-#line 37559 "Photo.c"
+#line 37574 "Photo.c"
 		}
-#line 4830 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4832 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_media_it);
-#line 37563 "Photo.c"
+#line 37578 "Photo.c"
 	}
 }
 
 
 void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPhotoSourceCollection* self, const gchar* basename, gint64 filesize, PhotoID* result) {
 	PhotoID _tmp19_ = {0};
-#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self));
-#line 4834 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (basename != NULL);
-#line 37574 "Photo.c"
+#line 37589 "Photo.c"
 	{
 		GeeIterator* _photo_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -37584,25 +37599,25 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = self->priv->filesize_to_photo;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = filesize;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_);
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp3_);
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_photo_it = _tmp5_;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		while (TRUE) {
-#line 37601 "Photo.c"
+#line 37616 "Photo.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			LibraryPhoto* photo = NULL;
@@ -37615,72 +37630,72 @@ void library_photo_source_collection_get_basename_filesize_duplicate (LibraryPho
 			const gchar* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
 			gboolean _tmp16_ = FALSE;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _photo_it;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (!_tmp7_) {
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 				break;
-#line 37622 "Photo.c"
+#line 37637 "Photo.c"
 			}
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _photo_it;
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			photo = (LibraryPhoto*) _tmp9_;
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = photo;
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp12_ = _tmp11_;
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp13_ = g_file_get_basename (_tmp12_);
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp14_ = basename;
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_);
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = _tmp15_ == 0;
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp12_);
-#line 4836 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4838 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_tmp16_) {
-#line 37648 "Photo.c"
+#line 37663 "Photo.c"
 				LibraryPhoto* _tmp17_ = NULL;
 				PhotoID _tmp18_ = {0};
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = photo;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_PHOTO, Photo), &_tmp18_);
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				*result = _tmp18_;
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_photo_it);
-#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4839 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 37663 "Photo.c"
+#line 37678 "Photo.c"
 			}
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (photo);
-#line 37667 "Photo.c"
+#line 37682 "Photo.c"
 		}
-#line 4835 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4837 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_photo_it);
-#line 37671 "Photo.c"
+#line 37686 "Photo.c"
 	}
-#line 4840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp19_, PHOTO_ID_INVALID);
-#line 4840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp19_;
-#line 4840 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4842 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 37679 "Photo.c"
+#line 37694 "Photo.c"
 }
 
 
@@ -37690,23 +37705,23 @@ gboolean library_photo_source_collection_has_basename_filesize_duplicate (Librar
 	gint64 _tmp1_ = 0LL;
 	PhotoID _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 4844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), FALSE);
-#line 4844 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4846 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = basename;
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = filesize;
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_id_is_valid (&_tmp2_);
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 4845 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4847 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37705 "Photo.c"
+#line 37720 "Photo.c"
 }
 
 
@@ -37719,54 +37734,54 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_file (LibraryPhotoS
 	MediaSource* _tmp3_ = NULL;
 	LibraryPhoto* _tmp4_ = NULL;
 	LibraryPhoto* _tmp5_ = NULL;
-#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4848 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/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 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_);
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4849 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp4_;
-#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo;
-#line 4850 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4852 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 37740 "Photo.c"
+#line 37755 "Photo.c"
 		MediaSourceHoldingTank* _tmp6_ = NULL;
 		LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
 		LibraryPhoto* _tmp9_ = NULL;
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/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 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = file;
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (photo);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4851 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4853 "/home/jens/Source/shotwell/src/Photo.vala"
 		_source_holding_tank_unref0 (_tmp7_);
-#line 37759 "Photo.c"
+#line 37774 "Photo.c"
 	}
-#line 4854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = photo;
-#line 4854 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4856 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37765 "Photo.c"
+#line 37780 "Photo.c"
 }
 
 
@@ -37777,27 +37792,27 @@ LibraryPhoto* library_photo_source_collection_get_trashed_by_md5 (LibraryPhotoSo
 	const gchar* _tmp2_ = NULL;
 	MediaSource* _tmp3_ = NULL;
 	LibraryPhoto* _tmp4_ = NULL;
-#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4859 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4857 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4859 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (md5 != NULL, NULL);
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/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 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = md5;
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_);
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 4858 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4860 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37796 "Photo.c"
+#line 37811 "Photo.c"
 }
 
 
@@ -37810,54 +37825,54 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_file (LibraryPhotoS
 	MediaSource* _tmp3_ = NULL;
 	LibraryPhoto* _tmp4_ = NULL;
 	LibraryPhoto* _tmp5_ = NULL;
-#line 4861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4861 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/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 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = file;
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_master_file (_tmp1_, _tmp2_);
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4862 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp4_;
-#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4865 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo;
-#line 4863 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4865 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ == NULL) {
-#line 37831 "Photo.c"
+#line 37846 "Photo.c"
 		MediaSourceHoldingTank* _tmp6_ = NULL;
 		LibraryPhotoSourceHoldingTank* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
 		LibraryPhoto* _tmp9_ = NULL;
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/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 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = file;
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = library_photo_source_holding_tank_fetch_by_backing_file (_tmp7_, _tmp8_);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (photo);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4864 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4866 "/home/jens/Source/shotwell/src/Photo.vala"
 		_source_holding_tank_unref0 (_tmp7_);
-#line 37850 "Photo.c"
+#line 37865 "Photo.c"
 	}
-#line 4867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = photo;
-#line 4867 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4869 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37856 "Photo.c"
+#line 37871 "Photo.c"
 }
 
 
@@ -37868,27 +37883,27 @@ LibraryPhoto* library_photo_source_collection_get_offline_by_md5 (LibraryPhotoSo
 	const gchar* _tmp2_ = NULL;
 	MediaSource* _tmp3_ = NULL;
 	LibraryPhoto* _tmp4_ = NULL;
-#line 4870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4870 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4872 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (md5 != NULL, NULL);
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/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 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = md5;
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = media_source_holding_tank_fetch_by_md5 (_tmp1_, _tmp2_);
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp4_;
-#line 4871 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4873 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37887 "Photo.c"
+#line 37902 "Photo.c"
 }
 
 
@@ -37898,23 +37913,23 @@ gint library_photo_source_collection_get_offline_count (LibraryPhotoSourceCollec
 	MediaSourceHoldingTank* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
-#line 4874 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4876 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), 0);
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/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 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/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 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 4875 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4877 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 37913 "Photo.c"
+#line 37928 "Photo.c"
 }
 
 
@@ -37939,169 +37954,169 @@ LibraryPhoto* library_photo_source_collection_get_state_by_file (LibraryPhotoSou
 	LibraryPhoto* _tmp14_ = NULL;
 	LibraryPhoto* _tmp15_ = NULL;
 	LibraryPhoto* _tmp16_ = NULL;
-#line 4878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (self), NULL);
-#line 4878 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4881 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = file;
-#line 4879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4881 "/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 4879 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4881 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4882 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 4880 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4882 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 4881 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE;
 #line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_ONLINE;
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 37960 "Photo.c"
+#line 37975 "Photo.c"
 		}
-#line 4883 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4885 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 37964 "Photo.c"
+#line 37979 "Photo.c"
 	}
-#line 4886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file;
-#line 4886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = library_photo_source_collection_fetch_by_editable_file (self, _tmp3_);
-#line 4886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4886 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp4_;
-#line 4887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4889 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo;
-#line 4887 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4889 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_ != NULL) {
-#line 4888 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE;
 #line 4890 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_EDITABLE;
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 37986 "Photo.c"
+#line 38001 "Photo.c"
 		}
-#line 4890 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4892 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 37990 "Photo.c"
+#line 38005 "Photo.c"
 	}
-#line 4893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = file;
-#line 4893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = library_photo_source_collection_fetch_by_raw_development_file (self, _tmp6_);
-#line 4893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4893 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp7_;
-#line 4894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = photo;
-#line 4894 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4896 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ != NULL) {
-#line 4895 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER;
 #line 4897 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_DEVELOPER;
+#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38012 "Photo.c"
+#line 38027 "Photo.c"
 		}
-#line 4897 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4899 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38016 "Photo.c"
+#line 38031 "Photo.c"
 	}
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = file;
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = library_photo_source_collection_get_trashed_by_file (self, _tmp9_);
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp10_) : NULL;
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ == NULL) {
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp10_);
-#line 38028 "Photo.c"
+#line 38043 "Photo.c"
 	}
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4900 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp11_;
-#line 4901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4903 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = photo;
-#line 4901 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4903 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp12_ != NULL) {
-#line 4902 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH;
 #line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_TRASH;
+#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38046 "Photo.c"
+#line 38061 "Photo.c"
 		}
-#line 4904 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4906 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38050 "Photo.c"
+#line 38065 "Photo.c"
 	}
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = file;
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = library_photo_source_collection_get_offline_by_file (self, _tmp13_);
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp14_) : NULL;
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp15_ == NULL) {
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp14_);
-#line 38062 "Photo.c"
+#line 38077 "Photo.c"
 	}
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4907 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp15_;
-#line 4908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4910 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp16_ = photo;
-#line 4908 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4910 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp16_ != NULL) {
-#line 4909 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE;
 #line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_OFFLINE;
+#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = photo;
-#line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (state) {
-#line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
 			*state = _vala_state;
-#line 38080 "Photo.c"
+#line 38095 "Photo.c"
 		}
-#line 4911 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4913 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38084 "Photo.c"
+#line 38099 "Photo.c"
 	}
-#line 4914 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN;
 #line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_state = LIBRARY_PHOTO_SOURCE_COLLECTION_STATE_UNKNOWN;
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = NULL;
-#line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (state) {
-#line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 		*state = _vala_state;
-#line 38096 "Photo.c"
+#line 38111 "Photo.c"
 	}
-#line 4916 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4918 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38100 "Photo.c"
+#line 38115 "Photo.c"
 }
 
 
@@ -38120,67 +38135,67 @@ static gboolean library_photo_source_collection_real_has_backlink (SourceCollect
 	SourceBacklink* _tmp9_ = NULL;
 	gboolean _tmp10_ = FALSE;
 	gboolean _tmp11_ = FALSE;
-#line 4919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4919 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_SOURCE_BACKLINK (backlink), FALSE);
-#line 4920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4922 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = backlink;
-#line 4920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4922 "/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 4920 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4922 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 4921 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38133 "Photo.c"
+#line 38148 "Photo.c"
 	}
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/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 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backlink;
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/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 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = _tmp5_;
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 4923 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4925 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 4924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 4924 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38153 "Photo.c"
+#line 38168 "Photo.c"
 	}
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/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 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_;
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = backlink;
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/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 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_;
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp8_);
-#line 4926 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4928 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_) {
-#line 4927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 4927 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38173 "Photo.c"
+#line 38188 "Photo.c"
 	}
-#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4931 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 4929 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4931 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38179 "Photo.c"
+#line 38194 "Photo.c"
 }
 
 
@@ -38193,35 +38208,35 @@ static void library_photo_source_collection_real_remove_backlink (SourceCollecti
 	MediaSourceHoldingTank* _tmp4_ = NULL;
 	SourceBacklink* _tmp5_ = NULL;
 	SourceBacklink* _tmp6_ = NULL;
-#line 4932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4932 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_SOURCE_BACKLINK (backlink));
-#line 4933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4935 "/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 4933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 4933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = backlink;
-#line 4933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4935 "/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 4933 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4935 "/home/jens/Source/shotwell/src/Photo.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4936 "/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 4934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = backlink;
-#line 4934 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4936 "/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 4934 "/home/jens/Source/shotwell/src/Photo.vala"
-	_source_holding_tank_unref0 (_tmp4_);
 #line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
+	_source_holding_tank_unref0 (_tmp4_);
+#line 4938 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = backlink;
-#line 4936 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4938 "/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 38220 "Photo.c"
+#line 38235 "Photo.c"
 }
 
 
@@ -38230,38 +38245,38 @@ static TransactionController* library_photo_source_collection_real_get_transacti
 	LibraryPhotoSourceCollection* self;
 	TransactionController* _tmp0_ = NULL;
 	TransactionController* _tmp2_ = NULL;
-#line 4453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->_transaction_controller;
-#line 4454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4456 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ == NULL) {
-#line 38235 "Photo.c"
+#line 38250 "Photo.c"
 		MediaSourceTransactionController* _tmp1_ = NULL;
-#line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4457 "/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 4455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 4455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 38243 "Photo.c"
+#line 38258 "Photo.c"
 	}
-#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = self->priv->_transaction_controller;
-#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 4457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4459 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38251 "Photo.c"
+#line 38266 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_master_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4477 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4477 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38260 "Photo.c"
+#line 38275 "Photo.c"
 }
 
 
@@ -38272,119 +38287,119 @@ static void g_cclosure_user_marshal_VOID__OBJECT_MEDIA_METADATA (GClosure * clos
 	register gpointer data1;
 	register gpointer data2;
 	cc = (GCClosure *) closure;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (n_param_values == 3);
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_CCLOSURE_SWAP_DATA (closure)) {
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = closure->data;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 38279 "Photo.c"
+#line 38294 "Photo.c"
 	} else {
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 		data1 = param_values->data[0].v_pointer;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 		data2 = closure->data;
-#line 38285 "Photo.c"
+#line 38300 "Photo.c"
 	}
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_MEDIA_METADATA) (marshal_data ? marshal_data : cc->callback);
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/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 38291 "Photo.c"
+#line 38306 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_editable_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4480 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4478 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4480 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38300 "Photo.c"
+#line 38315 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_baseline_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4483 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38309 "Photo.c"
+#line 38324 "Photo.c"
 }
 
 
 static void library_photo_source_collection_real_source_reimported (LibraryPhotoSourceCollection* self, LibraryPhoto* photo, PhotoMetadata* metadata) {
-#line 4484 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4486 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 4484 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4486 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 38318 "Photo.c"
+#line 38333 "Photo.c"
 }
 
 
 static void library_photo_source_collection_class_init (LibraryPhotoSourceCollectionClass * klass) {
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_parent_class = g_type_class_peek_parent (klass);
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataCollectionClass *) klass)->finalize = library_photo_source_collection_finalize;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoSourceCollectionPrivate));
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->create_trashcan = library_photo_source_collection_real_create_trashcan;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->create_offline_bin = library_photo_source_collection_real_create_offline_bin;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->create_media_monitor = library_photo_source_collection_real_create_media_monitor;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceCollectionClass *) klass)->holds_type_of_source = library_photo_source_collection_real_holds_type_of_source;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->get_typename = library_photo_source_collection_real_get_typename;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->is_file_recognized = library_photo_source_collection_real_is_file_recognized;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataCollectionClass *) klass)->notify_contents_altered = library_photo_source_collection_real_notify_contents_altered;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataCollectionClass *) klass)->items_altered = library_photo_source_collection_real_items_altered;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->postprocess_imported_media = library_photo_source_collection_real_postprocess_imported_media;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_master_reimported = library_photo_source_collection_real_notify_master_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_editable_reimported = library_photo_source_collection_real_notify_editable_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_source_reimported = library_photo_source_collection_real_notify_source_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->notify_baseline_reimported = library_photo_source_collection_real_notify_baseline_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = library_photo_source_collection_real_fetch_by_numeric_id;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_source_id = library_photo_source_collection_real_fetch_by_source_id;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceCollectionClass *) klass)->get_event_source_ids = library_photo_source_collection_real_get_event_source_ids;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceCollectionClass *) klass)->has_backlink = library_photo_source_collection_real_has_backlink;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceCollectionClass *) klass)->remove_backlink = library_photo_source_collection_real_remove_backlink;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->master_reimported = library_photo_source_collection_real_master_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->editable_reimported = library_photo_source_collection_real_editable_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->baseline_reimported = library_photo_source_collection_real_baseline_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	((LibraryPhotoSourceCollectionClass *) klass)->source_reimported = library_photo_source_collection_real_source_reimported;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = library_photo_source_collection_real_get_transaction_controller;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	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 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	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 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	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 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	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 38383 "Photo.c"
+#line 38398 "Photo.c"
 }
 
 
@@ -38395,59 +38410,59 @@ static void library_photo_source_collection_instance_init (LibraryPhotoSourceCol
 	GeeHashMap* _tmp3_ = NULL;
 	GeeHashMap* _tmp4_ = NULL;
 	GeeTreeMultiMap* _tmp5_ = NULL;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = LIBRARY_PHOTO_SOURCE_COLLECTION_GET_PRIVATE (self);
-#line 4461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->_transaction_controller = NULL;
-#line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->by_editable_file = _tmp0_;
 #line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->by_editable_file = _tmp0_;
+#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->by_raw_development_file = _tmp1_;
 #line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->by_raw_development_file = _tmp1_;
+#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_tree_multi_map_new (G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _int64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->filesize_to_photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
 #line 4468 "/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"
 	_tmp3_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL, _int64_equal_gee_equal_data_func, NULL, NULL);
-#line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->photo_to_master_filesize = _tmp3_;
 #line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->photo_to_master_filesize = _tmp3_;
+#line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = gee_hash_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, 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"
-	self->priv->photo_to_editable_filesize = _tmp4_;
 #line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->photo_to_editable_filesize = _tmp4_;
+#line 4474 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_tree_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, G_TYPE_INT64, (GBoxedCopyFunc) _int64_dup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 4472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4474 "/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 38422 "Photo.c"
+#line 38437 "Photo.c"
 }
 
 
 static void library_photo_source_collection_finalize (DataCollection* obj) {
 	LibraryPhotoSourceCollection * self;
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_COLLECTION, LibraryPhotoSourceCollection);
-#line 4461 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4463 "/home/jens/Source/shotwell/src/Photo.vala"
 	_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 4462 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->by_editable_file);
 #line 4464 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->by_raw_development_file);
+	_g_object_unref0 (self->priv->by_editable_file);
 #line 4466 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->filesize_to_photo);
+	_g_object_unref0 (self->priv->by_raw_development_file);
 #line 4468 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->photo_to_master_filesize);
+	_g_object_unref0 (self->priv->filesize_to_photo);
 #line 4470 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->photo_to_editable_filesize);
+	_g_object_unref0 (self->priv->photo_to_master_filesize);
 #line 4472 "/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"
 	_g_object_unref0 (self->priv->photo_to_raw_development_filesize);
-#line 4442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4444 "/home/jens/Source/shotwell/src/Photo.vala"
 	DATA_COLLECTION_CLASS (library_photo_source_collection_parent_class)->finalize (obj);
-#line 38446 "Photo.c"
+#line 38461 "Photo.c"
 }
 
 
@@ -38464,9 +38479,9 @@ GType library_photo_source_collection_get_type (void) {
 
 
 static void _library_photo_generate_thumbnails_one_shot_callback (gpointer self) {
-#line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_generate_thumbnails ((LibraryPhoto*) self);
-#line 38465 "Photo.c"
+#line 38480 "Photo.c"
 }
 
 
@@ -38478,69 +38493,69 @@ static LibraryPhoto* library_photo_construct (GType object_type, PhotoRow* row)
 	guint64 _tmp3_ = 0ULL;
 	PhotoRow* _tmp7_ = NULL;
 	guint64 _tmp8_ = 0ULL;
-#line 4959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_ROW (row), NULL);
-#line 4960 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4962 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = row;
-#line 4960 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = (LibraryPhoto*) photo_construct (object_type, _tmp0_);
 #line 4962 "/home/jens/Source/shotwell/src/Photo.vala"
+	self = (LibraryPhoto*) photo_construct (object_type, _tmp0_);
+#line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 4962 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->import_keywords = NULL;
 #line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->import_keywords = NULL;
+#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self);
-#line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
 	_one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler);
-#line 4964 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4966 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->thumbnail_scheduler = _tmp1_;
-#line 4967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4969 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = row;
-#line 4967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4969 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_->flags;
-#line 4967 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4969 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp3_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38499 "Photo.c"
+#line 38514 "Photo.c"
 		LibraryPhotoSourceCollection* _tmp4_ = NULL;
 		PhotoRow* _tmp5_ = NULL;
 		const gchar* _tmp6_ = NULL;
-#line 4968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = library_photo_global;
-#line 4968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = row;
-#line 4968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp5_->backlinks;
-#line 4968 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4970 "/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 38511 "Photo.c"
+#line 38526 "Photo.c"
 	}
-#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = row;
-#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_->flags;
-#line 4970 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4972 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38519 "Photo.c"
+#line 38534 "Photo.c"
 		PhotoRow* _tmp9_ = NULL;
 		guint64 _tmp10_ = 0ULL;
-#line 4971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = row;
-#line 4971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = _tmp9_->flags;
-#line 4971 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4973 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_photo_upgrade_rating_flags (self, _tmp10_);
-#line 38528 "Photo.c"
+#line 38543 "Photo.c"
 	}
-#line 4959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38532 "Photo.c"
+#line 38547 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_new (PhotoRow* row) {
-#line 4959 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4961 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_construct (TYPE_LIBRARY_PHOTO, row);
-#line 38539 "Photo.c"
+#line 38554 "Photo.c"
 }
 
 
@@ -38558,87 +38573,87 @@ static LibraryPhoto* library_photo_construct_from_import_params (GType object_ty
 	PhotoImportParams* _tmp13_ = NULL;
 	PhotoRow* _tmp14_ = NULL;
 	guint64 _tmp15_ = 0ULL;
-#line 4974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (import_params), NULL);
-#line 4975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = import_params;
-#line 4975 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_->row;
-#line 4975 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = (LibraryPhoto*) photo_construct (object_type, _tmp1_);
 #line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+	self = (LibraryPhoto*) photo_construct (object_type, _tmp1_);
+#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = import_params;
-#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_->keywords;
-#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _g_object_ref0 (_tmp3_);
-#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 4977 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4979 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->import_keywords = _tmp4_;
-#line 4978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = one_shot_scheduler_new ("LibraryPhoto", _library_photo_generate_thumbnails_one_shot_callback, self);
-#line 4978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
 	_one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler);
-#line 4978 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4980 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->thumbnail_scheduler = _tmp5_;
-#line 4981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = import_params;
-#line 4981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_->row;
-#line 4981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = _tmp7_->flags;
-#line 4981 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4983 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp8_ & (LIBRARY_PHOTO_FLAG_TRASH | LIBRARY_PHOTO_FLAG_OFFLINE)) != ((guint64) 0)) {
-#line 38589 "Photo.c"
+#line 38604 "Photo.c"
 		LibraryPhotoSourceCollection* _tmp9_ = NULL;
 		PhotoImportParams* _tmp10_ = NULL;
 		PhotoRow* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 4982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = library_photo_global;
-#line 4982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = import_params;
-#line 4982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = _tmp10_->row;
-#line 4982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = _tmp11_->backlinks;
-#line 4982 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4984 "/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 38604 "Photo.c"
+#line 38619 "Photo.c"
 	}
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = import_params;
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = _tmp13_->row;
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_->flags;
-#line 4984 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4986 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp15_ & (LIBRARY_PHOTO_FLAG_HIDDEN | LIBRARY_PHOTO_FLAG_FAVORITE)) != ((guint64) 0)) {
-#line 38614 "Photo.c"
+#line 38629 "Photo.c"
 		PhotoImportParams* _tmp16_ = NULL;
 		PhotoRow* _tmp17_ = NULL;
 		guint64 _tmp18_ = 0ULL;
-#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = import_params;
-#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp17_ = _tmp16_->row;
-#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = _tmp17_->flags;
-#line 4985 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4987 "/home/jens/Source/shotwell/src/Photo.vala"
 		library_photo_upgrade_rating_flags (self, _tmp18_);
-#line 38626 "Photo.c"
+#line 38641 "Photo.c"
 	}
-#line 4974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 38630 "Photo.c"
+#line 38645 "Photo.c"
 }
 
 
 static LibraryPhoto* library_photo_new_from_import_params (PhotoImportParams* import_params) {
-#line 4974 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4976 "/home/jens/Source/shotwell/src/Photo.vala"
 	return library_photo_construct_from_import_params (TYPE_LIBRARY_PHOTO, import_params);
-#line 38637 "Photo.c"
+#line 38652 "Photo.c"
 }
 
 
@@ -38667,59 +38682,59 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 	GeeArrayList* _tmp39_ = NULL;
 	LibraryPhotoSourceCollection* _tmp40_ = NULL;
 	GeeArrayList* _tmp41_ = NULL;
-#line 4989 "/home/jens/Source/shotwell/src/Photo.vala"
-	photo_init_photo ();
 #line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
+	photo_init_photo ();
+#line 4993 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = library_photo_source_collection_new ();
-#line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4993 "/home/jens/Source/shotwell/src/Photo.vala"
 	_data_collection_unref0 (library_photo_global);
-#line 4991 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4993 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_global = _tmp0_;
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_table_get_instance ();
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = _tmp1_;
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = photo_table_get_all (_tmp2_);
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = _tmp3_;
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp2_);
-#line 4995 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
 	all = _tmp4_;
-#line 4996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 4996 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
 	all_photos = _tmp5_;
-#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 4997 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
 	trashed_photos = _tmp6_;
-#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 4998 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
 	offline_photos = _tmp7_;
-#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = all;
-#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = _tmp9_;
-#line 4999 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
 	count = _tmp10_;
-#line 38706 "Photo.c"
+#line 38721 "Photo.c"
 	{
 		gint ctr = 0;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 		ctr = 0;
-#line 38711 "Photo.c"
+#line 38726 "Photo.c"
 		{
 			gboolean _tmp11_ = FALSE;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = TRUE;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 38718 "Photo.c"
+#line 38733 "Photo.c"
 				gint _tmp13_ = 0;
 				gint _tmp14_ = 0;
 				PhotoRow* row = NULL;
@@ -38735,159 +38750,159 @@ void library_photo_init (ProgressMonitor monitor, void* monitor_target) {
 				guint64 _tmp22_ = 0ULL;
 				ProgressMonitor _tmp30_ = NULL;
 				void* _tmp30__target = NULL;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp11_) {
-#line 38736 "Photo.c"
+#line 38751 "Photo.c"
 					gint _tmp12_ = 0;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp12_ = ctr;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					ctr = _tmp12_ + 1;
-#line 38742 "Photo.c"
+#line 38757 "Photo.c"
 				}
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = FALSE;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = ctr;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = count;
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp13_ < _tmp14_)) {
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 38754 "Photo.c"
+#line 38769 "Photo.c"
 				}
-#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = all;
-#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = ctr;
-#line 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/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 5001 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
 				row = (PhotoRow*) _tmp17_;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5004 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = row;
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5004 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp19_ = library_photo_new (_tmp18_);
-#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5004 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp19_;
-#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = row;
-#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = _tmp20_->flags;
-#line 5003 "/home/jens/Source/shotwell/src/Photo.vala"
-				flags = _tmp21_;
 #line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
+				flags = _tmp21_;
+#line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = flags;
-#line 5005 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
 				if ((_tmp22_ & LIBRARY_PHOTO_FLAG_TRASH) != ((guint64) 0)) {
-#line 38780 "Photo.c"
+#line 38795 "Photo.c"
 					GeeArrayList* _tmp23_ = NULL;
 					LibraryPhoto* _tmp24_ = NULL;
-#line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp23_ = trashed_photos;
-#line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp24_ = photo;
-#line 5006 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp24_);
-#line 38789 "Photo.c"
+#line 38804 "Photo.c"
 				} else {
 					guint64 _tmp25_ = 0ULL;
-#line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp25_ = flags;
-#line 5007 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5009 "/home/jens/Source/shotwell/src/Photo.vala"
 					if ((_tmp25_ & LIBRARY_PHOTO_FLAG_OFFLINE) != ((guint64) 0)) {
-#line 38796 "Photo.c"
+#line 38811 "Photo.c"
 						GeeArrayList* _tmp26_ = NULL;
 						LibraryPhoto* _tmp27_ = NULL;
-#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = offline_photos;
-#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = photo;
-#line 5008 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp27_);
-#line 38805 "Photo.c"
+#line 38820 "Photo.c"
 					} else {
 						GeeArrayList* _tmp28_ = NULL;
 						LibraryPhoto* _tmp29_ = NULL;
-#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp28_ = all_photos;
-#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp29_ = photo;
-#line 5010 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp29_);
-#line 38815 "Photo.c"
+#line 38830 "Photo.c"
 					}
 				}
-#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = monitor;
-#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30__target = monitor_target;
-#line 5012 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5014 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp30_ != NULL) {
-#line 38824 "Photo.c"
+#line 38839 "Photo.c"
 					ProgressMonitor _tmp31_ = NULL;
 					void* _tmp31__target = NULL;
 					gint _tmp32_ = 0;
 					gint _tmp33_ = 0;
-#line 5013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ = monitor;
-#line 5013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31__target = monitor_target;
-#line 5013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp32_ = ctr;
-#line 5013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = count;
-#line 5013 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5015 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp31_ ((guint64) _tmp32_, (guint64) _tmp33_, TRUE, _tmp31__target);
-#line 38839 "Photo.c"
+#line 38854 "Photo.c"
 				}
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 5000 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5002 "/home/jens/Source/shotwell/src/Photo.vala"
 				_photo_row_unref0 (row);
-#line 38845 "Photo.c"
+#line 38860 "Photo.c"
 			}
 		}
 	}
-#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = library_photo_global;
-#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = all_photos;
-#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/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 5016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = _tmp36_;
-#line 5016 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp37_);
-#line 5017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5019 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = library_photo_global;
-#line 5017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5019 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = trashed_photos;
-#line 5017 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5019 "/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 5018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = library_photo_global;
-#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5020 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = offline_photos;
-#line 5018 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5020 "/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 4988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (offline_photos);
-#line 4988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (trashed_photos);
-#line 4988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (all_photos);
-#line 4988 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4990 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (all);
-#line 38879 "Photo.c"
+#line 38894 "Photo.c"
 }
 
 
 void library_photo_terminate (void) {
-#line 5022 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5024 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_terminate_photo ();
-#line 38886 "Photo.c"
+#line 38901 "Photo.c"
 }
 
 
@@ -38904,139 +38919,139 @@ ImportResult library_photo_import_create (PhotoImportParams* params, LibraryPhot
 	gboolean _tmp6_ = FALSE;
 	PhotoImportParams* _tmp7_ = NULL;
 	LibraryPhoto* _tmp8_ = NULL;
-#line 5029 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_PHOTO_IMPORT_PARAMS (params), 0);
 #line 5031 "/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"
 	_tmp0_ = photo_table_get_instance ();
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = params;
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_->row;
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_table_add (_tmp1_, _tmp3_, &_tmp4_);
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp1_);
-#line 5031 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id = _tmp5_;
-#line 5032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5034 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = photo_id_is_invalid (&photo_id);
-#line 5032 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5034 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_vala_photo);
-#line 5033 "/home/jens/Source/shotwell/src/Photo.vala"
-		_vala_photo = NULL;
 #line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+		_vala_photo = NULL;
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = IMPORT_RESULT_DATABASE_ERROR;
-#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (photo) {
-#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 			*photo = _vala_photo;
-#line 38935 "Photo.c"
+#line 38950 "Photo.c"
 		} else {
-#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_vala_photo);
-#line 38939 "Photo.c"
+#line 38954 "Photo.c"
 		}
-#line 5035 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5037 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 38943 "Photo.c"
+#line 38958 "Photo.c"
 	}
-#line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = params;
-#line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = library_photo_new_from_import_params (_tmp7_);
-#line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_vala_photo);
-#line 5039 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_photo = _tmp8_;
 #line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_photo = _tmp8_;
+#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (photo) {
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 		*photo = _vala_photo;
-#line 38959 "Photo.c"
+#line 38974 "Photo.c"
 	} else {
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_vala_photo);
-#line 38963 "Photo.c"
+#line 38978 "Photo.c"
 	}
-#line 5041 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5043 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 38967 "Photo.c"
+#line 38982 "Photo.c"
 }
 
 
 void library_photo_import_failed (LibraryPhoto* photo) {
 	GError * _inner_error_ = NULL;
-#line 5044 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 38975 "Photo.c"
+#line 38990 "Photo.c"
 	{
 		PhotoTable* _tmp0_ = NULL;
 		PhotoTable* _tmp1_ = NULL;
 		LibraryPhoto* _tmp2_ = NULL;
 		PhotoID _tmp3_ = {0};
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = photo_table_get_instance ();
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = photo;
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO, Photo), &_tmp3_);
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_table_remove (_tmp1_, &_tmp3_, &_inner_error_);
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp1_);
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 38997 "Photo.c"
-				goto __catch405_database_error;
+#line 39012 "Photo.c"
+				goto __catch406_database_error;
 			}
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/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 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 5046 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39006 "Photo.c"
+#line 39021 "Photo.c"
 		}
 	}
-	goto __finally405;
-	__catch405_database_error:
+	goto __finally406;
+	__catch406_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5050 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 5048 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5050 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp4_);
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39024 "Photo.c"
+#line 39039 "Photo.c"
 	}
-	__finally405:
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally406:
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/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 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5045 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5047 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39035 "Photo.c"
+#line 39050 "Photo.c"
 	}
 }
 
@@ -39046,21 +39061,21 @@ static void library_photo_real_notify_master_reimported (Photo* base, PhotoMetad
 	PhotoMetadata* _tmp0_ = NULL;
 	LibraryPhotoSourceCollection* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
-#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5052 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5054 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5053 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5055 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5053 "/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 5055 "/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"
 	_tmp1_ = library_photo_global;
-#line 5055 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5057 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5055 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5057 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_master_reimported (_tmp1_, self, _tmp2_);
-#line 39059 "Photo.c"
+#line 39074 "Photo.c"
 }
 
 
@@ -39069,21 +39084,21 @@ static void library_photo_real_notify_editable_reimported (Photo* base, PhotoMet
 	PhotoMetadata* _tmp0_ = NULL;
 	LibraryPhotoSourceCollection* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
-#line 5058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5058 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5060 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5059 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5061 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5059 "/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 5061 "/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"
 	_tmp1_ = library_photo_global;
-#line 5061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5063 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5061 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5063 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_editable_reimported (_tmp1_, self, _tmp2_);
-#line 39082 "Photo.c"
+#line 39097 "Photo.c"
 }
 
 
@@ -39092,21 +39107,21 @@ static void library_photo_real_notify_source_reimported (Photo* base, PhotoMetad
 	PhotoMetadata* _tmp0_ = NULL;
 	LibraryPhotoSourceCollection* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
-#line 5064 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5064 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5066 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5065 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5065 "/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 5067 "/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"
 	_tmp1_ = library_photo_global;
-#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5067 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5069 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_source_reimported (_tmp1_, self, _tmp2_);
-#line 39105 "Photo.c"
+#line 39120 "Photo.c"
 }
 
 
@@ -39115,80 +39130,80 @@ static void library_photo_real_notify_baseline_reimported (Photo* base, PhotoMet
 	PhotoMetadata* _tmp0_ = NULL;
 	LibraryPhotoSourceCollection* _tmp1_ = NULL;
 	PhotoMetadata* _tmp2_ = NULL;
-#line 5070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5072 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5070 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5072 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((metadata == NULL) || IS_PHOTO_METADATA (metadata));
-#line 5071 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5071 "/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 5073 "/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"
 	_tmp1_ = library_photo_global;
-#line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5075 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = metadata;
-#line 5073 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5075 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_collection_notify_baseline_reimported (_tmp1_, self, _tmp2_);
-#line 39128 "Photo.c"
+#line 39143 "Photo.c"
 }
 
 
 static void library_photo_generate_thumbnails (LibraryPhoto* self) {
 	GError * _inner_error_ = NULL;
-#line 5076 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5078 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 39136 "Photo.c"
+#line 39151 "Photo.c"
 	{
-#line 5078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5080 "/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 5078 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39142 "Photo.c"
-			goto __catch406_g_error;
+#line 39157 "Photo.c"
+			goto __catch407_g_error;
 		}
 	}
-	goto __finally406;
-	__catch406_g_error:
+	goto __finally407;
+	__catch407_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp0_ = NULL;
 		gchar* _tmp1_ = NULL;
 		GError* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = _tmp0_;
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = err;
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5082 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_->message;
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:5080: Unable to generate thumbnails for %s: %s", _tmp1_, _tmp3_);
-#line 5080 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_free0 (_tmp1_);
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39172 "Photo.c"
+#line 39187 "Photo.c"
 	}
-	__finally406:
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally407:
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/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 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5077 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5079 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39183 "Photo.c"
+#line 39198 "Photo.c"
 	}
-#line 5084 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5086 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39187 "Photo.c"
+#line 39202 "Photo.c"
 }
 
 
@@ -39196,28 +39211,28 @@ GeeCollection* library_photo_get_import_keywords (LibraryPhoto* self) {
 	GeeCollection* result = NULL;
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 5088 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5090 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL);
-#line 5089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->import_keywords;
-#line 5089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 5089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 5089 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5091 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39205 "Photo.c"
+#line 39220 "Photo.c"
 }
 
 
 void library_photo_clear_import_keywords (LibraryPhoto* self) {
-#line 5092 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5094 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5095 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 5093 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5095 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->import_keywords = NULL;
-#line 39216 "Photo.c"
+#line 39231 "Photo.c"
 }
 
 
@@ -39226,44 +39241,44 @@ static void library_photo_real_notify_altered (DataObject* base, Alteration* alt
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	Alteration* _tmp5_ = NULL;
-#line 5096 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5096 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail (IS_ALTERATION (alteration));
 #line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+	g_return_if_fail (IS_ALTERATION (alteration));
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = self->priv->block_thumbnail_generation;
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp1_) {
-#line 39233 "Photo.c"
+#line 39248 "Photo.c"
 		Alteration* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = alteration;
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = alteration_has_subject (_tmp2_, "image");
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_;
-#line 39242 "Photo.c"
+#line 39257 "Photo.c"
 	} else {
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = FALSE;
-#line 39246 "Photo.c"
+#line 39261 "Photo.c"
 	}
-#line 5098 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5100 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 39250 "Photo.c"
+#line 39265 "Photo.c"
 		OneShotScheduler* _tmp4_ = NULL;
-#line 5099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->thumbnail_scheduler;
-#line 5099 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
 		one_shot_scheduler_at_priority_idle (_tmp4_, G_PRIORITY_LOW);
-#line 39256 "Photo.c"
+#line 39271 "Photo.c"
 	}
-#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5103 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = alteration;
-#line 5101 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5103 "/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 39262 "Photo.c"
+#line 39277 "Photo.c"
 }
 
 
@@ -39274,31 +39289,31 @@ static GdkPixbuf* library_photo_real_get_preview_pixbuf (MediaSource* base, Scal
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 5104 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5106 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5104 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5106 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 5105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5107 "/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 5105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 	pixbuf = _tmp0_;
-#line 5105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5105 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39287 "Photo.c"
+#line 39302 "Photo.c"
 	}
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_BILINEAR, TRUE);
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp1_;
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (pixbuf);
-#line 5107 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5109 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39297 "Photo.c"
+#line 39312 "Photo.c"
 }
 
 
@@ -39306,71 +39321,71 @@ static void library_photo_real_rotate (Photo* base, Rotation rotation) {
 	LibraryPhoto * self;
 	Rotation _tmp0_ = 0;
 	GError * _inner_error_ = NULL;
-#line 5110 "/home/jens/Source/shotwell/src/Photo.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 5112 "/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"
 	self->priv->block_thumbnail_generation = TRUE;
-#line 5113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5115 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = rotation;
-#line 5113 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5115 "/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 5114 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5116 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->block_thumbnail_generation = FALSE;
-#line 39315 "Photo.c"
+#line 39330 "Photo.c"
 	{
 		Rotation _tmp1_ = 0;
-#line 5122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = rotation;
-#line 5122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
 		thumbnail_cache_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), _tmp1_, &_inner_error_);
-#line 5122 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5124 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 39324 "Photo.c"
-			goto __catch407_g_error;
+#line 39339 "Photo.c"
+			goto __catch408_g_error;
 		}
 	}
-	goto __finally407;
-	__catch407_g_error:
+	goto __finally408;
+	__catch408_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		GError* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_;
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5127 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = _tmp4_->message;
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
-		g_warning ("Photo.vala:5125: Unable to update thumbnails for %s: %s", _tmp3_, _tmp5_);
-#line 5125 "/home/jens/Source/shotwell/src/Photo.vala"
+#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"
 		_g_free0 (_tmp3_);
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 39354 "Photo.c"
+#line 39369 "Photo.c"
 	}
-	__finally407:
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally408:
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/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 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5121 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5123 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39365 "Photo.c"
+#line 39380 "Photo.c"
 	}
-#line 5128 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5130 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 39369 "Photo.c"
+#line 39384 "Photo.c"
 }
 
 
@@ -39382,40 +39397,40 @@ static GdkPixbuf* library_photo_real_get_thumbnail (ThumbnailSource* base, gint
 	GdkPixbuf* _tmp2_ = NULL;
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 5132 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5134 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = scale;
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/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 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp2_;
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39395 "Photo.c"
+#line 39410 "Photo.c"
 	}
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp0_;
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = NULL;
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp3_;
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp0_);
-#line 5133 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5135 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39407 "Photo.c"
+#line 39422 "Photo.c"
 }
 
 
 static void _library_photo_on_duplicate_progress_gfile_progress_callback (gint64 current_num_bytes, gint64 total_num_bytes, gpointer self) {
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_on_duplicate_progress ((LibraryPhoto*) self, current_num_bytes, total_num_bytes);
-#line 39414 "Photo.c"
+#line 39429 "Photo.c"
 }
 
 
@@ -39430,53 +39445,53 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 	GFile* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 5138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5138 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((backing == NULL) || IS_BACKING_PHOTO_ROW (backing));
-#line 5139 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5141 "/home/jens/Source/shotwell/src/Photo.vala"
 	backing_photo_id_init (&backing_id, BACKING_PHOTO_ID_INVALID);
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = backing;
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_ == NULL) {
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = TRUE;
-#line 39441 "Photo.c"
+#line 39456 "Photo.c"
 	} else {
 		BackingPhotoRow* _tmp2_ = NULL;
 		const gchar* _tmp3_ = NULL;
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = backing;
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = _tmp2_->filepath;
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp0_ = _tmp3_ == NULL;
-#line 39451 "Photo.c"
+#line 39466 "Photo.c"
 	}
-#line 5140 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5142 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_) {
-#line 5141 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result = backing_id;
-#line 5141 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 39459 "Photo.c"
+#line 39474 "Photo.c"
 	}
-#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = backing;
-#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_->filepath;
-#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = g_file_new_for_path (_tmp5_);
-#line 5143 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
 	file = _tmp6_;
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = file;
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = g_file_query_exists (_tmp7_, NULL);
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_) {
-#line 39475 "Photo.c"
+#line 39490 "Photo.c"
 		GFile* dupe_file = NULL;
 		GFile* _tmp9_ = NULL;
 		GFile* _tmp10_ = NULL;
@@ -39486,105 +39501,105 @@ static void library_photo_duplicate_backing_photo (LibraryPhoto* self, BackingPh
 		DetectedPhotoInformation* _tmp12_ = NULL;
 		BackingPhotoRow* _tmp13_ = NULL;
 		BackingPhotoRow* _tmp14_ = NULL;
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp9_ = file;
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/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 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 		dupe_file = _tmp10_;
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 5145 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5147 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39499 "Photo.c"
+#line 39514 "Photo.c"
 		}
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = dupe_file;
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/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 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		detected = _tmp12_;
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		state = _tmp13_;
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_propagate_error (error, _inner_error_);
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 			_detected_photo_information_unref0 (detected);
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (dupe_file);
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (file);
-#line 5148 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 39523 "Photo.c"
+#line 39538 "Photo.c"
 		}
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp14_ = state;
-#line 5150 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp14_ != NULL) {
-#line 39529 "Photo.c"
+#line 39544 "Photo.c"
 			BackingPhotoTable* _tmp15_ = NULL;
 			BackingPhotoTable* _tmp16_ = NULL;
 			BackingPhotoRow* _tmp17_ = NULL;
 			BackingPhotoRow* _tmp18_ = NULL;
 			BackingPhotoID _tmp19_ = {0};
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp15_ = backing_photo_table_get_instance ();
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp16_ = _tmp15_;
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp17_ = state;
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_photo_table_add (_tmp16_, _tmp17_, &_inner_error_);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			_database_table_unref0 (_tmp16_);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_propagate_error (error, _inner_error_);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				_backing_photo_row_unref0 (state);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				_detected_photo_information_unref0 (detected);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (dupe_file);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (file);
-#line 5151 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5153 "/home/jens/Source/shotwell/src/Photo.vala"
 				return;
-#line 39559 "Photo.c"
+#line 39574 "Photo.c"
 			}
-#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp18_ = state;
-#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp19_ = _tmp18_->id;
-#line 5152 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5154 "/home/jens/Source/shotwell/src/Photo.vala"
 			backing_id = _tmp19_;
-#line 39567 "Photo.c"
+#line 39582 "Photo.c"
 		}
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_backing_photo_row_unref0 (state);
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_detected_photo_information_unref0 (detected);
-#line 5144 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5146 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 39575 "Photo.c"
+#line 39590 "Photo.c"
 	}
-#line 5156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = backing_id;
-#line 5156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (file);
-#line 5156 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5158 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 39583 "Photo.c"
+#line 39598 "Photo.c"
 }
 
 
@@ -39649,231 +39664,231 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 	GeeList* _tmp51_ = NULL;
 	GeeCollection* _tmp52_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 5159 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_LIBRARY_PHOTO (self), NULL);
 #line 5161 "/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"
 	_tmp0_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/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 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = _tmp2_;
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp1_);
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_file = _tmp3_;
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5161 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5163 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39668 "Photo.c"
+#line 39683 "Photo.c"
 	}
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo_get_editable_photo_row (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo));
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = _tmp4_;
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp5_, &_tmp6_, &_inner_error_);
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = _tmp6_;
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp5_);
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_editable_id = _tmp7_;
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5164 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5166 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39690 "Photo.c"
+#line 39705 "Photo.c"
 	}
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/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 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = _tmp8_;
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp9_, &_tmp10_, &_inner_error_);
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = _tmp10_;
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp9_);
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_raw_shotwell_id = _tmp11_;
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5165 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39712 "Photo.c"
+#line 39727 "Photo.c"
 	}
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/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 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = _tmp12_;
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp13_, &_tmp14_, &_inner_error_);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = _tmp14_;
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp13_);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_raw_camera_id = _tmp15_;
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5167 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39734 "Photo.c"
+#line 39749 "Photo.c"
 	}
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/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 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = _tmp16_;
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_duplicate_backing_photo (self, _tmp17_, &_tmp18_, &_inner_error_);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp19_ = _tmp18_;
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	_backing_photo_row_unref0 (_tmp17_);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_raw_embedded_id = _tmp19_;
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (dupe_file);
-#line 5169 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5171 "/home/jens/Source/shotwell/src/Photo.vala"
 		return NULL;
-#line 39756 "Photo.c"
+#line 39771 "Photo.c"
 	}
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo_table_get_instance ();
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = _tmp20_;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp22_);
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = dupe_file;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp24_ = g_file_get_path (_tmp23_);
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp25_ = _tmp24_;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = dupe_editable_id;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = dupe_raw_shotwell_id;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp28_ = dupe_raw_camera_id;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = dupe_raw_embedded_id;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_table_duplicate (_tmp21_, &_tmp22_, _tmp25_, &_tmp26_, &_tmp27_, &_tmp28_, &_tmp29_, &_tmp30_);
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp31_ = _tmp30_;
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_free0 (_tmp25_);
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp21_);
-#line 5173 "/home/jens/Source/shotwell/src/Photo.vala"
-	dupe_id = _tmp31_;
 #line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+	dupe_id = _tmp31_;
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp32_ = photo_table_get_instance ();
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp33_ = _tmp32_;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp34_ = dupe_id;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp35_ = photo_table_get_row (_tmp33_, &_tmp34_);
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp36_ = _tmp35_;
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	_database_table_unref0 (_tmp33_);
-#line 5175 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5177 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe_row = _tmp36_;
-#line 5178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5180 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp37_ = dupe_row;
-#line 5178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5180 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp38_ = library_photo_new (_tmp37_);
-#line 5178 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5180 "/home/jens/Source/shotwell/src/Photo.vala"
 	dupe = _tmp38_;
-#line 5181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5183 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = dupe;
-#line 5181 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5183 "/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 5184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = library_photo_global;
-#line 5184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp41_ = dupe;
-#line 5184 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5186 "/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 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp42_ = dupe;
-#line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp43_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp44_ = _tmp43_;
-#line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp45_ = _tmp44_ != NULL;
-#line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (_tmp44_);
-#line 5187 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5189 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp45_) {
-#line 39830 "Photo.c"
+#line 39845 "Photo.c"
 		LibraryPhoto* _tmp46_ = NULL;
 		Event* _tmp47_ = NULL;
 		Event* _tmp48_ = NULL;
 		LibraryPhoto* _tmp49_ = NULL;
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp46_ = dupe;
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp47_ = media_source_get_event (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp48_ = _tmp47_;
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp49_ = dupe;
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		event_attach (_tmp48_, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5188 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5190 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp48_);
-#line 39847 "Photo.c"
+#line 39862 "Photo.c"
 	}
-#line 5191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp50_ = tag_global;
-#line 5191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5193 "/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 5191 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
 	tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 5192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp52_ = tags;
-#line 5192 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp52_ != NULL) {
-#line 39859 "Photo.c"
+#line 39874 "Photo.c"
 		{
 			GeeIterator* _tag_it = NULL;
 			GeeCollection* _tmp53_ = NULL;
 			GeeIterator* _tmp54_ = NULL;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp53_ = tags;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp54_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_it = _tmp54_;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 39872 "Photo.c"
+#line 39887 "Photo.c"
 				GeeIterator* _tmp55_ = NULL;
 				gboolean _tmp56_ = FALSE;
 				Tag* tag = NULL;
@@ -39881,84 +39896,84 @@ LibraryPhoto* library_photo_duplicate (LibraryPhoto* self, GError** error) {
 				gpointer _tmp58_ = NULL;
 				Tag* _tmp59_ = NULL;
 				LibraryPhoto* _tmp60_ = NULL;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp55_ = _tag_it;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp56_ = gee_iterator_next (_tmp55_);
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp56_) {
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 39888 "Photo.c"
+#line 39903 "Photo.c"
 				}
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp57_ = _tag_it;
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp58_ = gee_iterator_get (_tmp57_);
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag = (Tag*) _tmp58_;
-#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp59_ = tag;
-#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp60_ = dupe;
-#line 5194 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5196 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag_attach (_tmp59_, G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 39904 "Photo.c"
+#line 39919 "Photo.c"
 			}
-#line 5193 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5195 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_it);
-#line 39908 "Photo.c"
+#line 39923 "Photo.c"
 		}
 	}
-#line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = dupe;
-#line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (tags);
-#line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
 	_photo_row_unref0 (dupe_row);
-#line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (dupe_file);
-#line 5198 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5200 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39921 "Photo.c"
+#line 39936 "Photo.c"
 }
 
 
 static void library_photo_on_duplicate_progress (LibraryPhoto* self, gint64 current, gint64 total) {
-#line 5201 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5203 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5202 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5204 "/home/jens/Source/shotwell/src/Photo.vala"
 	spin_event_loop ();
-#line 39930 "Photo.c"
+#line 39945 "Photo.c"
 }
 
 
 static void library_photo_upgrade_rating_flags (LibraryPhoto* self, guint64 flags) {
 	guint64 _tmp0_ = 0ULL;
 	guint64 _tmp1_ = 0ULL;
-#line 5205 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5207 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (self));
-#line 5206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = flags;
-#line 5206 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp0_ & LIBRARY_PHOTO_FLAG_HIDDEN) != ((guint64) 0)) {
-#line 5207 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5209 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_REJECTED);
-#line 5208 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5210 "/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 39947 "Photo.c"
+#line 39962 "Photo.c"
 	}
-#line 5211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = flags;
-#line 5211 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
 	if ((_tmp1_ & LIBRARY_PHOTO_FLAG_FAVORITE) != ((guint64) 0)) {
-#line 5212 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5214 "/home/jens/Source/shotwell/src/Photo.vala"
 		media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), RATING_FIVE);
-#line 5213 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5215 "/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 39957 "Photo.c"
+#line 39972 "Photo.c"
 	}
 }
 
@@ -39967,35 +39982,35 @@ static gboolean library_photo_real_is_trashed (MediaSource* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 5218 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5220 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5221 "/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 5219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 5219 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5221 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 39974 "Photo.c"
+#line 39989 "Photo.c"
 }
 
 
 static void library_photo_real_trash (MediaSource* base) {
 	LibraryPhoto * self;
-#line 5222 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5224 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5223 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5225 "/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 39984 "Photo.c"
+#line 39999 "Photo.c"
 }
 
 
 static void library_photo_real_untrash (MediaSource* base) {
 	LibraryPhoto * self;
-#line 5226 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5228 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5227 "/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_TRASH, NULL);
-#line 39994 "Photo.c"
+#line 40009 "Photo.c"
 }
 
 
@@ -40003,35 +40018,35 @@ static gboolean library_photo_real_is_offline (Monitorable* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 5230 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5232 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5233 "/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 5231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 5231 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5233 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40010 "Photo.c"
+#line 40025 "Photo.c"
 }
 
 
 static void library_photo_real_mark_offline (Monitorable* base) {
 	LibraryPhoto * self;
-#line 5234 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5236 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5235 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5237 "/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 40020 "Photo.c"
+#line 40035 "Photo.c"
 }
 
 
 static void library_photo_real_mark_online (Monitorable* base) {
 	LibraryPhoto * self;
-#line 5238 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5240 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5239 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5241 "/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 40030 "Photo.c"
+#line 40045 "Photo.c"
 }
 
 
@@ -40039,15 +40054,15 @@ static gboolean library_photo_real_is_flagged (Flaggable* base) {
 	LibraryPhoto * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 5242 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5244 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5245 "/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 5243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp0_;
-#line 5243 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5245 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40046 "Photo.c"
+#line 40061 "Photo.c"
 }
 
 
@@ -40055,17 +40070,17 @@ static void library_photo_real_mark_flagged (Flaggable* base) {
 	LibraryPhoto * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 5246 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5248 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 5247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5249 "/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 5247 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5249 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp1_);
-#line 40064 "Photo.c"
+#line 40079 "Photo.c"
 }
 
 
@@ -40073,17 +40088,17 @@ static void library_photo_real_mark_unflagged (Flaggable* base) {
 	LibraryPhoto * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 5250 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5252 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 5251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _tmp0_;
-#line 5251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5253 "/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 5251 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5253 "/home/jens/Source/shotwell/src/Photo.vala"
 	_alteration_unref0 (_tmp1_);
-#line 40082 "Photo.c"
+#line 40097 "Photo.c"
 }
 
 
@@ -40094,35 +40109,35 @@ static gboolean library_photo_real_internal_delete_backing (DataSource* base, GE
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 5254 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5256 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/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 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _tmp1_;
-#line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_propagate_error (error, _inner_error_);
-#line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 		return FALSE;
-#line 40105 "Photo.c"
+#line 40120 "Photo.c"
 	}
-#line 5257 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5259 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (!_tmp0_) {
-#line 5258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = FALSE;
-#line 5258 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40113 "Photo.c"
+#line 40128 "Photo.c"
 	}
-#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp2_;
-#line 5260 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5262 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40121 "Photo.c"
+#line 40136 "Photo.c"
 }
 
 
@@ -40131,76 +40146,76 @@ static void library_photo_real_destroy (DataSource* base) {
 	PhotoID photo_id = {0};
 	PhotoID _tmp0_ = {0};
 	GError * _inner_error_ = NULL;
-#line 5263 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5265 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5266 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_get_photo_id (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo), &_tmp0_);
-#line 5264 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5266 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id = _tmp0_;
-#line 5267 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5269 "/home/jens/Source/shotwell/src/Photo.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 40138 "Photo.c"
+#line 40153 "Photo.c"
 	{
 		PhotoTable* _tmp1_ = NULL;
 		PhotoTable* _tmp2_ = NULL;
 		PhotoID _tmp3_ = {0};
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp1_ = photo_table_get_instance ();
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = _tmp1_;
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_id;
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_table_remove (_tmp2_, &_tmp3_, &_inner_error_);
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		_database_table_unref0 (_tmp2_);
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 40157 "Photo.c"
-				goto __catch408_database_error;
+#line 40172 "Photo.c"
+				goto __catch409_database_error;
 			}
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/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 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 			g_clear_error (&_inner_error_);
-#line 5273 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
 			return;
-#line 40166 "Photo.c"
+#line 40181 "Photo.c"
 		}
 	}
-	goto __finally408;
-	__catch408_database_error:
+	goto __finally409;
+	__catch409_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		err = _inner_error_;
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		_inner_error_ = NULL;
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5277 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = err;
-#line 5275 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5277 "/home/jens/Source/shotwell/src/Photo.vala"
 		app_window_database_error (_tmp4_);
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_error_free0 (err);
-#line 40184 "Photo.c"
+#line 40199 "Photo.c"
 	}
-	__finally408:
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+	__finally409:
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/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 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		g_clear_error (&_inner_error_);
-#line 5272 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5274 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 40195 "Photo.c"
+#line 40210 "Photo.c"
 	}
-#line 5278 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5280 "/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 40199 "Photo.c"
+#line 40214 "Photo.c"
 }
 
 
@@ -40212,25 +40227,25 @@ gboolean library_photo_has_nontrash_duplicate (GFile* file, const gchar* thumbna
 	PhotoFileFormat _tmp3_ = 0;
 	PhotoID _tmp4_ = {0};
 	gboolean _tmp5_ = FALSE;
-#line 5281 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
 #line 5283 "/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"
 	_tmp0_ = file;
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = thumbnail_md5;
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = full_md5;
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file_format;
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_get_nontrash_duplicate (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_);
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_id_is_valid (&_tmp4_);
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = _tmp5_;
-#line 5283 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5285 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40229 "Photo.c"
+#line 40244 "Photo.c"
 }
 
 
@@ -40250,79 +40265,79 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 	PhotoID* _tmp10_ = NULL;
 	gint _tmp10__length1 = 0;
 	PhotoID _tmp18_ = {0};
-#line 5286 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((file == NULL) || G_IS_FILE (file));
 #line 5288 "/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"
 	_tmp0_ = file;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = thumbnail_md5;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = full_md5;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = file_format;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = photo_get_duplicate_ids (_tmp0_, _tmp1_, _tmp2_, _tmp3_, &_tmp4_);
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	ids = _tmp5_;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
 	ids_length1 = _tmp4_;
-#line 5288 "/home/jens/Source/shotwell/src/Photo.vala"
-	_ids_size_ = ids_length1;
 #line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+	_ids_size_ = ids_length1;
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = ids;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7__length1 = ids_length1;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp7_ == NULL) {
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = TRUE;
-#line 40275 "Photo.c"
+#line 40290 "Photo.c"
 	} else {
 		PhotoID* _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = ids;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8__length1 = ids_length1;
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = _tmp8__length1 == 0;
-#line 40285 "Photo.c"
+#line 40300 "Photo.c"
 	}
-#line 5290 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5292 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp6_) {
-#line 40289 "Photo.c"
+#line 40304 "Photo.c"
 		PhotoID _tmp9_ = {0};
-#line 5291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_id_init (&_tmp9_, PHOTO_ID_INVALID);
-#line 5291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		*result = _tmp9_;
-#line 5291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		ids = (g_free (ids), NULL);
-#line 5291 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
 		return;
-#line 40299 "Photo.c"
+#line 40314 "Photo.c"
 	}
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10_ = ids;
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp10__length1 = ids_length1;
-#line 40305 "Photo.c"
+#line 40320 "Photo.c"
 	{
 		PhotoID* id_collection = NULL;
 		gint id_collection_length1 = 0;
 		gint _id_collection_size_ = 0;
 		gint id_it = 0;
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 		id_collection = _tmp10_;
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 		id_collection_length1 = _tmp10__length1;
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 		for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) {
-#line 40317 "Photo.c"
+#line 40332 "Photo.c"
 			PhotoID id = {0};
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 			id = id_collection[id_it];
-#line 40321 "Photo.c"
+#line 40336 "Photo.c"
 			{
 				LibraryPhoto* photo = NULL;
 				LibraryPhotoSourceCollection* _tmp11_ = NULL;
@@ -40330,60 +40345,60 @@ void library_photo_get_nontrash_duplicate (GFile* file, const gchar* thumbnail_m
 				LibraryPhoto* _tmp13_ = NULL;
 				gboolean _tmp14_ = FALSE;
 				LibraryPhoto* _tmp15_ = NULL;
-#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = library_photo_global;
-#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = id;
-#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = library_photo_source_collection_fetch (_tmp11_, &_tmp12_);
-#line 5294 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp13_;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = photo;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp15_ != NULL) {
-#line 40341 "Photo.c"
+#line 40356 "Photo.c"
 					LibraryPhoto* _tmp16_ = NULL;
 					gboolean _tmp17_ = FALSE;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = photo;
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = !_tmp17_;
-#line 40350 "Photo.c"
+#line 40365 "Photo.c"
 				} else {
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = FALSE;
-#line 40354 "Photo.c"
+#line 40369 "Photo.c"
 				}
-#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5297 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp14_) {
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
 					*result = id;
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (photo);
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
 					ids = (g_free (ids), NULL);
-#line 5296 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5298 "/home/jens/Source/shotwell/src/Photo.vala"
 					return;
-#line 40366 "Photo.c"
+#line 40381 "Photo.c"
 				}
-#line 5293 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5295 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 40370 "Photo.c"
+#line 40385 "Photo.c"
 			}
 		}
 	}
-#line 5299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_id_init (&_tmp18_, PHOTO_ID_INVALID);
-#line 5299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
 	*result = _tmp18_;
-#line 5299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
 	ids = (g_free (ids), NULL);
-#line 5299 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5301 "/home/jens/Source/shotwell/src/Photo.vala"
 	return;
-#line 40382 "Photo.c"
+#line 40397 "Photo.c"
 }
 
 
@@ -40412,179 +40427,179 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 	gint _tmp27_ = 0;
 	gboolean _tmp28_ = FALSE;
 	GeeList* _tmp29_ = NULL;
-#line 5302 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5304 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = tag_global;
-#line 5303 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5305 "/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 5303 "/home/jens/Source/shotwell/src/Photo.vala"
-	tags = _tmp1_;
 #line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
+	tags = _tmp1_;
+#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_source_get_metadata (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 5305 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
 	metadata = _tmp2_;
-#line 5306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5308 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = metadata;
-#line 5306 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5308 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ == NULL) {
-#line 40427 "Photo.c"
+#line 40442 "Photo.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 		GeeList* _tmp6_ = NULL;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = tags;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp6_ != NULL) {
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = TRUE;
-#line 40437 "Photo.c"
+#line 40452 "Photo.c"
 		} else {
 			GeeList* _tmp7_ = NULL;
 			gint _tmp8_ = 0;
 			gint _tmp9_ = 0;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = tags;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _tmp9_ > 0;
-#line 40450 "Photo.c"
+#line 40465 "Photo.c"
 		}
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		if (_tmp5_) {
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = TRUE;
-#line 40456 "Photo.c"
+#line 40471 "Photo.c"
 		} else {
 			Rating _tmp10_ = 0;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = _tmp10_ != RATING_UNRATED;
-#line 40463 "Photo.c"
+#line 40478 "Photo.c"
 		}
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = _tmp4_;
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (tags);
-#line 5307 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40473 "Photo.c"
+#line 40488 "Photo.c"
 	}
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp12_ = metadata;
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = photo_metadata_get_rating (_tmp12_);
-#line 5309 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5311 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp11_ != _tmp13_) {
-#line 5310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 5310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 5310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (tags);
-#line 5310 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40491 "Photo.c"
+#line 40506 "Photo.c"
 	}
-#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = metadata;
-#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = photo_metadata_get_keywords (_tmp14_, NULL, NULL, NULL);
-#line 5312 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
 	keywords = _tmp15_;
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp17_ = tags;
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp17_ != NULL) {
-#line 40503 "Photo.c"
+#line 40518 "Photo.c"
 		GeeList* _tmp18_ = NULL;
 		gint _tmp19_ = 0;
 		gint _tmp20_ = 0;
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = tags;
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = _tmp19_;
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = _tmp20_;
-#line 40515 "Photo.c"
+#line 40530 "Photo.c"
 	} else {
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp16_ = 0;
-#line 40519 "Photo.c"
+#line 40534 "Photo.c"
 	}
-#line 5313 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5315 "/home/jens/Source/shotwell/src/Photo.vala"
 	tags_count = _tmp16_;
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = keywords;
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 40527 "Photo.c"
+#line 40542 "Photo.c"
 		GeeSet* _tmp23_ = NULL;
 		gint _tmp24_ = 0;
 		gint _tmp25_ = 0;
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp23_ = keywords;
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp25_ = _tmp24_;
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = _tmp25_;
-#line 40539 "Photo.c"
+#line 40554 "Photo.c"
 	} else {
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = 0;
-#line 40543 "Photo.c"
+#line 40558 "Photo.c"
 	}
-#line 5314 "/home/jens/Source/shotwell/src/Photo.vala"
-	keywords_count = _tmp21_;
 #line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+	keywords_count = _tmp21_;
+#line 5318 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp26_ = tags_count;
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5318 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp27_ = keywords_count;
-#line 5316 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5318 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp26_ != _tmp27_) {
-#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = TRUE;
-#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (keywords);
-#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_media_metadata_unref0 (metadata);
-#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (tags);
-#line 5317 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 40563 "Photo.c"
+#line 40578 "Photo.c"
 	}
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp29_ = tags;
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp29_ != NULL) {
-#line 40569 "Photo.c"
+#line 40584 "Photo.c"
 		GeeSet* _tmp30_ = NULL;
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp30_ = keywords;
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = _tmp30_ != NULL;
-#line 40575 "Photo.c"
+#line 40590 "Photo.c"
 	} else {
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp28_ = FALSE;
-#line 40579 "Photo.c"
+#line 40594 "Photo.c"
 	}
-#line 5319 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp28_) {
-#line 40583 "Photo.c"
+#line 40598 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp31_ = NULL;
@@ -40594,25 +40609,25 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 			gint _tmp34_ = 0;
 			gint _tmp35_ = 0;
 			gint _tag_index = 0;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp31_ = tags;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp32_ = _g_object_ref0 (_tmp31_);
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_list = _tmp32_;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp33_ = _tag_list;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp34_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp35_ = _tmp34_;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_size = _tmp35_;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_index = -1;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40611 "Photo.c"
+#line 40626 "Photo.c"
 				gint _tmp36_ = 0;
 				gint _tmp37_ = 0;
 				gint _tmp38_ = 0;
@@ -40628,86 +40643,86 @@ static gboolean library_photo_real_has_user_generated_metadata (Photo* base) {
 				gchar* _tmp47_ = NULL;
 				gboolean _tmp48_ = FALSE;
 				gboolean _tmp49_ = FALSE;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = _tag_index;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tag_index = _tmp36_ + 1;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = _tag_index;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = _tag_size;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp37_ < _tmp38_)) {
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40639 "Photo.c"
+#line 40654 "Photo.c"
 				}
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = _tag_list;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp40_ = _tag_index;
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp41_ = gee_list_get (_tmp39_, _tmp40_);
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag = (Tag*) _tmp41_;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp42_ = keywords;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = tag;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_DATA_OBJECT, DataObject));
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _tmp44_;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = g_utf8_normalize (_tmp45_, (gssize) -1, G_NORMALIZE_DEFAULT);
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _tmp46_;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), _tmp47_);
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = !_tmp48_;
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp47_);
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp45_);
-#line 5321 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5323 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp49_) {
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					result = TRUE;
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (tag);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tag_list);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (keywords);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					_media_metadata_unref0 (metadata);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (tags);
-#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5324 "/home/jens/Source/shotwell/src/Photo.vala"
 					return result;
-#line 40685 "Photo.c"
+#line 40700 "Photo.c"
 				}
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40689 "Photo.c"
+#line 40704 "Photo.c"
 			}
-#line 5320 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5322 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40693 "Photo.c"
+#line 40708 "Photo.c"
 		}
 	}
-#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = FALSE;
-#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (keywords);
-#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_media_metadata_unref0 (metadata);
-#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (tags);
-#line 5326 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5328 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 40706 "Photo.c"
+#line 40721 "Photo.c"
 }
 
 
@@ -40719,30 +40734,30 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 	GeeList* _tmp2_ = NULL;
 	PhotoMetadata* _tmp22_ = NULL;
 	Rating _tmp23_ = 0;
-#line 5329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 5330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = tag_global;
-#line 5330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5332 "/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 5330 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_tags = _tmp1_;
-#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo_tags;
-#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp2_ != NULL) {
-#line 40732 "Photo.c"
+#line 40747 "Photo.c"
 		GeeCollection* string_tags = NULL;
 		GeeArrayList* _tmp3_ = NULL;
 		PhotoMetadata* _tmp19_ = NULL;
 		GeeCollection* _tmp20_ = NULL;
-#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
-#line 5332 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
 		string_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 40741 "Photo.c"
+#line 40756 "Photo.c"
 		{
 			GeeList* _tag_list = NULL;
 			GeeList* _tmp4_ = NULL;
@@ -40752,25 +40767,25 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
 			gint _tag_index = 0;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp4_ = photo_tags;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_list = _tmp5_;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = _tag_list;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = _tmp7_;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_size = _tmp8_;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tag_index = -1;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40769 "Photo.c"
+#line 40784 "Photo.c"
 				gint _tmp9_ = 0;
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
@@ -40782,74 +40797,74 @@ static void library_photo_real_set_user_metadata_for_export (Photo* base, PhotoM
 				Tag* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
 				gchar* _tmp18_ = NULL;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = _tag_index;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tag_index = _tmp9_ + 1;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = _tag_index;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tag_size;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!(_tmp10_ < _tmp11_)) {
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40793 "Photo.c"
+#line 40808 "Photo.c"
 				}
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tag_list;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _tag_index;
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag = (Tag*) _tmp14_;
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = string_tags;
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = tag;
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_OBJECT, DataObject));
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp18_ = _tmp17_;
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_collection_add (_tmp15_, _tmp18_);
-#line 5334 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (_tmp18_);
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (tag);
-#line 40817 "Photo.c"
+#line 40832 "Photo.c"
 			}
-#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5335 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tag_list);
-#line 40821 "Photo.c"
+#line 40836 "Photo.c"
 		}
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = metadata;
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp20_ = string_tags;
-#line 5336 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_keywords (_tmp19_, _tmp20_, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5333 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (string_tags);
-#line 40831 "Photo.c"
+#line 40846 "Photo.c"
 	} else {
 		PhotoMetadata* _tmp21_ = NULL;
-#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp21_ = metadata;
-#line 5338 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
 		photo_metadata_set_keywords (_tmp21_, NULL, PHOTO_METADATA_SET_OPTION_ALL_DOMAINS);
-#line 40838 "Photo.c"
+#line 40853 "Photo.c"
 	}
-#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = metadata;
-#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5340 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5342 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo_metadata_set_rating (_tmp22_, _tmp23_);
-#line 5329 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5331 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo_tags);
-#line 40848 "Photo.c"
+#line 40863 "Photo.c"
 }
 
 
@@ -40863,63 +40878,63 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 	GeeSet* _tmp7_ = NULL;
 	GeeCollection* _tmp8_ = NULL;
 	HierarchicalTagIndex* _tmp39_ = NULL;
-#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 5344 "/home/jens/Source/shotwell/src/Photo.vala"
-	new_htag_index = NULL;
 #line 5346 "/home/jens/Source/shotwell/src/Photo.vala"
+	new_htag_index = NULL;
+#line 5348 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = metadata;
-#line 5346 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5348 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = photo_metadata_has_hierarchical_keywords (_tmp0_);
-#line 5346 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5348 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp1_) {
-#line 40874 "Photo.c"
+#line 40889 "Photo.c"
 		PhotoMetadata* _tmp2_ = NULL;
 		GeeSet* _tmp3_ = NULL;
 		GeeSet* _tmp4_ = NULL;
 		HierarchicalTagIndex* _tmp5_ = NULL;
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp2_ = metadata;
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp3_ = photo_metadata_get_hierarchical_keywords (_tmp2_);
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = _tmp3_;
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/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 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_hierarchical_tag_index_unref0 (new_htag_index);
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		new_htag_index = _tmp5_;
-#line 5347 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5349 "/home/jens/Source/shotwell/src/Photo.vala"
 		_g_object_unref0 (_tmp4_);
-#line 40893 "Photo.c"
+#line 40908 "Photo.c"
 	}
-#line 5351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp6_ = metadata;
-#line 5351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp7_ = photo_metadata_get_keywords (_tmp6_, NULL, NULL, NULL);
-#line 5351 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
 	keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 5352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp8_ = keywords;
-#line 5352 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp8_ != NULL) {
-#line 40905 "Photo.c"
+#line 40920 "Photo.c"
 		{
 			GeeIterator* _keyword_it = NULL;
 			GeeCollection* _tmp9_ = NULL;
 			GeeIterator* _tmp10_ = NULL;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = keywords;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_keyword_it = _tmp10_;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 40918 "Photo.c"
+#line 40933 "Photo.c"
 				GeeIterator* _tmp11_ = NULL;
 				gboolean _tmp12_ = FALSE;
 				gchar* keyword = NULL;
@@ -40942,156 +40957,156 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				const gchar* _tmp36_ = NULL;
 				Tag* _tmp37_ = NULL;
 				Tag* _tmp38_ = NULL;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _keyword_it;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = gee_iterator_next (_tmp11_);
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp12_) {
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 40949 "Photo.c"
+#line 40964 "Photo.c"
 				}
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = _keyword_it;
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = gee_iterator_get (_tmp13_);
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				keyword = (gchar*) _tmp14_;
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = new_htag_index;
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp16_ != NULL) {
-#line 40961 "Photo.c"
+#line 40976 "Photo.c"
 					HierarchicalTagIndex* _tmp17_ = NULL;
 					const gchar* _tmp18_ = NULL;
 					gboolean _tmp19_ = FALSE;
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = new_htag_index;
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = keyword;
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = hierarchical_tag_index_is_tag_in_index (_tmp17_, _tmp18_);
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = _tmp19_;
-#line 40973 "Photo.c"
+#line 40988 "Photo.c"
 				} else {
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = FALSE;
-#line 40977 "Photo.c"
+#line 40992 "Photo.c"
 				}
-#line 5354 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5356 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp15_) {
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (keyword);
-#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 40985 "Photo.c"
+#line 41000 "Photo.c"
 				}
-#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp20_ = keyword;
-#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp21_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp20_);
-#line 5357 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5359 "/home/jens/Source/shotwell/src/Photo.vala"
 				safe_keyword = _tmp21_;
-#line 5358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp22_ = safe_keyword;
-#line 5358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5360 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = hierarchical_tag_utilities_flat_to_hierarchical (_tmp22_);
-#line 5358 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5360 "/home/jens/Source/shotwell/src/Photo.vala"
 				promoted_keyword = _tmp23_;
-#line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = tag_global;
-#line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = safe_keyword;
-#line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = tag_source_collection_exists (_tmp24_, _tmp25_, FALSE);
-#line 5361 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp26_) {
-#line 41007 "Photo.c"
+#line 41022 "Photo.c"
 					const gchar* _tmp27_ = NULL;
 					Tag* _tmp28_ = NULL;
 					Tag* _tmp29_ = NULL;
-#line 5362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp27_ = safe_keyword;
-#line 5362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp28_ = tag_for_path (_tmp27_);
-#line 5362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp29_ = _tmp28_;
-#line 5362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 					tag_attach (_tmp29_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5362 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5364 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp29_);
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (promoted_keyword);
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (safe_keyword);
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (keyword);
-#line 5363 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5365 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41029 "Photo.c"
+#line 41044 "Photo.c"
 				}
-#line 5366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = tag_global;
-#line 5366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = promoted_keyword;
-#line 5366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = tag_source_collection_exists (_tmp30_, _tmp31_, FALSE);
-#line 5366 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp32_) {
-#line 41039 "Photo.c"
+#line 41054 "Photo.c"
 					const gchar* _tmp33_ = NULL;
 					Tag* _tmp34_ = NULL;
 					Tag* _tmp35_ = NULL;
-#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp33_ = promoted_keyword;
-#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp34_ = tag_for_path (_tmp33_);
-#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp35_ = _tmp34_;
-#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
 					tag_attach (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5367 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5369 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp35_);
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (promoted_keyword);
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (safe_keyword);
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_free0 (keyword);
-#line 5368 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5370 "/home/jens/Source/shotwell/src/Photo.vala"
 					continue;
-#line 41061 "Photo.c"
+#line 41076 "Photo.c"
 				}
-#line 5371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp36_ = keyword;
-#line 5371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp37_ = tag_for_path (_tmp36_);
-#line 5371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = _tmp37_;
-#line 5371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag_attach (_tmp38_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5371 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5373 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp38_);
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (promoted_keyword);
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (safe_keyword);
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (keyword);
-#line 41079 "Photo.c"
+#line 41094 "Photo.c"
 			}
-#line 5353 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5355 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_keyword_it);
-#line 41083 "Photo.c"
+#line 41098 "Photo.c"
 		}
 	}
-#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp39_ = new_htag_index;
-#line 5375 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp39_ != NULL) {
-#line 41090 "Photo.c"
+#line 41105 "Photo.c"
 		{
 			GeeIterator* _path_it = NULL;
 			HierarchicalTagIndex* _tmp40_ = NULL;
@@ -41099,23 +41114,23 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 			GeeCollection* _tmp42_ = NULL;
 			GeeIterator* _tmp43_ = NULL;
 			GeeIterator* _tmp44_ = NULL;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp40_ = new_htag_index;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = hierarchical_tag_index_get_all_paths (_tmp40_);
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = _tmp41_;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp43_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp44_ = _tmp43_;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp42_);
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_path_it = _tmp44_;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41114 "Photo.c"
+#line 41129 "Photo.c"
 				GeeIterator* _tmp45_ = NULL;
 				gboolean _tmp46_ = FALSE;
 				gchar* path = NULL;
@@ -41124,150 +41139,150 @@ static void library_photo_real_apply_user_metadata_for_reimport (Photo* base, Ph
 				const gchar* _tmp49_ = NULL;
 				Tag* _tmp50_ = NULL;
 				Tag* _tmp51_ = NULL;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _path_it;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = gee_iterator_next (_tmp45_);
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp46_) {
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41131 "Photo.c"
+#line 41146 "Photo.c"
 				}
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = _path_it;
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = gee_iterator_get (_tmp47_);
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				path = (gchar*) _tmp48_;
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp49_ = path;
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp50_ = tag_for_path (_tmp49_);
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp51_ = _tmp50_;
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				tag_attach (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 5377 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5379 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp51_);
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_free0 (path);
-#line 41151 "Photo.c"
+#line 41166 "Photo.c"
 			}
-#line 5376 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5378 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_path_it);
-#line 41155 "Photo.c"
+#line 41170 "Photo.c"
 		}
 	}
-#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (keywords);
-#line 5343 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5345 "/home/jens/Source/shotwell/src/Photo.vala"
 	_hierarchical_tag_index_unref0 (new_htag_index);
-#line 41162 "Photo.c"
+#line 41177 "Photo.c"
 }
 
 
 static void library_photo_class_init (LibraryPhotoClass * klass) {
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_parent_class = g_type_class_peek_parent (klass);
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoPrivate));
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_master_reimported = library_photo_real_notify_master_reimported;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_editable_reimported = library_photo_real_notify_editable_reimported;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_source_reimported = library_photo_real_notify_source_reimported;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->notify_baseline_reimported = library_photo_real_notify_baseline_reimported;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataObjectClass *) klass)->notify_altered = library_photo_real_notify_altered;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->get_preview_pixbuf = library_photo_real_get_preview_pixbuf;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->rotate = library_photo_real_rotate;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((ThumbnailSourceClass *) klass)->get_thumbnail = library_photo_real_get_thumbnail;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->is_trashed = library_photo_real_is_trashed;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->trash = library_photo_real_trash;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->untrash = library_photo_real_untrash;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->is_offline = library_photo_real_is_offline;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->mark_offline = library_photo_real_mark_offline;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((MediaSourceClass *) klass)->mark_online = library_photo_real_mark_online;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataSourceClass *) klass)->internal_delete_backing = library_photo_real_internal_delete_backing;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((DataSourceClass *) klass)->destroy = library_photo_real_destroy;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->has_user_generated_metadata = library_photo_real_has_user_generated_metadata;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->set_user_metadata_for_export = library_photo_real_set_user_metadata_for_export;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	((PhotoClass *) klass)->apply_user_metadata_for_reimport = library_photo_real_apply_user_metadata_for_reimport;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_finalize;
-#line 41211 "Photo.c"
+#line 41226 "Photo.c"
 }
 
 
 static void library_photo_flaggable_interface_init (FlaggableIface * iface) {
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_flaggable_parent_iface = g_type_interface_peek_parent (iface);
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->is_flagged = (gboolean (*)(Flaggable*)) library_photo_real_is_flagged;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_flagged = (void (*)(Flaggable*)) library_photo_real_mark_flagged;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_unflagged = (void (*)(Flaggable*)) library_photo_real_mark_unflagged;
-#line 41224 "Photo.c"
+#line 41239 "Photo.c"
 }
 
 
 static void library_photo_monitorable_interface_init (MonitorableIface * iface) {
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_monitorable_parent_iface = g_type_interface_peek_parent (iface);
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->is_offline = (gboolean (*)(Monitorable*)) library_photo_real_is_offline;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_offline = (void (*)(Monitorable*)) library_photo_real_mark_offline;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->mark_online = (void (*)(Monitorable*)) library_photo_real_mark_online;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->set_master_file = (void (*)(Monitorable*, GFile*)) photo_set_master_file;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) photo_set_master_timestamp;
-#line 41241 "Photo.c"
+#line 41256 "Photo.c"
 }
 
 
 static void library_photo_instance_init (LibraryPhoto * self) {
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = LIBRARY_PHOTO_GET_PRIVATE (self);
-#line 4955 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4957 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->block_thumbnail_generation = FALSE;
-#line 4956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4958 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->thumbnail_scheduler = NULL;
-#line 41252 "Photo.c"
+#line 41267 "Photo.c"
 }
 
 
 static void library_photo_finalize (GObject* obj) {
 	LibraryPhoto * self;
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 4956 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4958 "/home/jens/Source/shotwell/src/Photo.vala"
 	_one_shot_scheduler_unref0 (self->priv->thumbnail_scheduler);
-#line 4957 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4959 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (self->priv->import_keywords);
-#line 4944 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 4946 "/home/jens/Source/shotwell/src/Photo.vala"
 	G_OBJECT_CLASS (library_photo_parent_class)->finalize (obj);
-#line 41266 "Photo.c"
+#line 41281 "Photo.c"
 }
 
 
@@ -41294,30 +41309,30 @@ LibraryPhotoSourceHoldingTank* library_photo_source_holding_tank_construct (GTyp
 	void* _tmp1__target = NULL;
 	GetSourceDatabaseKey _tmp2_ = NULL;
 	void* _tmp2__target = NULL;
-#line 5393 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_COLLECTION (sources), NULL);
 #line 5395 "/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"
 	_tmp0_ = sources;
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = check_to_keep;
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1__target = check_to_keep_target;
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = get_key;
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2__target = get_key_target;
-#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5397 "/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 5393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5395 "/home/jens/Source/shotwell/src/Photo.vala"
 	return self;
-#line 41309 "Photo.c"
+#line 41324 "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 5393 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5395 "/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 41316 "Photo.c"
+#line 41331 "Photo.c"
 }
 
 
@@ -41331,59 +41346,59 @@ LibraryPhoto* library_photo_source_holding_tank_fetch_by_backing_file (LibraryPh
 	GeeHashMap* _tmp4_ = NULL;
 	GFile* _tmp5_ = NULL;
 	gpointer _tmp6_ = NULL;
-#line 5398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self), NULL);
-#line 5398 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 5399 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5401 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = NULL;
-#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = self->priv->editable_file_map;
-#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = file;
-#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5402 "/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 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (ret);
-#line 5400 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
 	ret = (LibraryPhoto*) _tmp2_;
-#line 5401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5403 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = ret;
-#line 5401 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5403 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ != NULL) {
-#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 		result = ret;
-#line 5402 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
 		return result;
-#line 41354 "Photo.c"
+#line 41369 "Photo.c"
 	}
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = self->priv->development_file_map;
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = file;
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/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 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	result = (LibraryPhoto*) _tmp6_;
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (ret);
-#line 5404 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5406 "/home/jens/Source/shotwell/src/Photo.vala"
 	return result;
-#line 41368 "Photo.c"
+#line 41383 "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 5428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_holding_tank_on_editable_replaced ((LibraryPhotoSourceHoldingTank*) self, _sender, old_file, new_file);
-#line 41375 "Photo.c"
+#line 41390 "Photo.c"
 }
 
 
 static void _library_photo_source_holding_tank_on_raw_development_modified_photo_raw_development_modified (Photo* _sender, gpointer self) {
-#line 5429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_holding_tank_on_raw_development_modified ((LibraryPhotoSourceHoldingTank*) self, _sender);
-#line 41382 "Photo.c"
+#line 41397 "Photo.c"
 }
 
 
@@ -41393,30 +41408,30 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 	GeeCollection* _tmp40_ = NULL;
 	GeeCollection* _tmp81_ = NULL;
 	GeeCollection* _tmp82_ = NULL;
-#line 5407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 5407 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 5407 "/home/jens/Source/shotwell/src/Photo.vala"
-	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
 #line 5409 "/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"
 	_tmp0_ = added;
-#line 5409 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp0_ != NULL) {
-#line 41402 "Photo.c"
+#line 41417 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp1_ = added;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			_source_it = _tmp2_;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41415 "Photo.c"
+#line 41430 "Photo.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataSource* source = NULL;
@@ -41435,41 +41450,41 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				GeeCollection* _tmp25_ = NULL;
 				LibraryPhoto* _tmp38_ = NULL;
 				LibraryPhoto* _tmp39_ = NULL;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp3_ = _source_it;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp4_) {
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41442 "Photo.c"
+#line 41457 "Photo.c"
 				}
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp5_ = _source_it;
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				source = (DataSource*) _tmp6_;
-#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5413 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp7_ = source;
-#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5413 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 5411 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5413 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp8_;
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp9_ = photo;
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp10_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo));
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp11_ = _tmp10_;
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _tmp11_ != NULL;
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (_tmp11_);
-#line 5414 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp12_) {
-#line 41468 "Photo.c"
+#line 41483 "Photo.c"
 					GeeHashMap* _tmp13_ = NULL;
 					LibraryPhoto* _tmp14_ = NULL;
 					GFile* _tmp15_ = NULL;
@@ -41480,60 +41495,60 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					LibraryPhoto* _tmp20_ = NULL;
 					GFile* _tmp21_ = NULL;
 					GFile* _tmp22_ = NULL;
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp13_ = self->priv->editable_file_map;
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp14_ = photo;
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp15_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_PHOTO, Photo));
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp16_ = _tmp15_;
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp17_ = photo;
-#line 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/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 5415 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5417 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp16_);
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp18_ = self->priv->reverse_editable_file_map;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp19_ = photo;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp20_ = photo;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp21_ = photo_get_editable_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp22_ = _tmp21_;
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					gee_multi_map_set (_tmp18_, _tmp19_, _tmp22_);
-#line 5416 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5418 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp22_);
-#line 41507 "Photo.c"
+#line 41522 "Photo.c"
 				}
-#line 5420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp23_ = photo;
-#line 5420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp24_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_PHOTO, Photo));
-#line 5420 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
 				raw_files = _tmp24_;
-#line 5421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = raw_files;
-#line 5421 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (_tmp25_ != NULL) {
-#line 41519 "Photo.c"
+#line 41534 "Photo.c"
 					{
 						GeeIterator* _f_it = NULL;
 						GeeCollection* _tmp26_ = NULL;
 						GeeIterator* _tmp27_ = NULL;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp26_ = raw_files;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp27_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						_f_it = _tmp27_;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						while (TRUE) {
-#line 41532 "Photo.c"
+#line 41547 "Photo.c"
 							GeeIterator* _tmp28_ = NULL;
 							gboolean _tmp29_ = FALSE;
 							GFile* f = NULL;
@@ -41545,86 +41560,86 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 							GeeMultiMap* _tmp35_ = NULL;
 							LibraryPhoto* _tmp36_ = NULL;
 							GFile* _tmp37_ = NULL;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp28_ = _f_it;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp29_ = gee_iterator_next (_tmp28_);
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							if (!_tmp29_) {
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 								break;
-#line 41552 "Photo.c"
+#line 41567 "Photo.c"
 							}
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp30_ = _f_it;
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp31_ = gee_iterator_get (_tmp30_);
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							f = (GFile*) _tmp31_;
-#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp32_ = self->priv->development_file_map;
-#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp33_ = f;
-#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp34_ = photo;
-#line 5423 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5425 "/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 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp35_ = self->priv->reverse_development_file_map;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp36_ = photo;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
 							_tmp37_ = f;
-#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5426 "/home/jens/Source/shotwell/src/Photo.vala"
 							gee_multi_map_set (_tmp35_, _tmp36_, _tmp37_);
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 							_g_object_unref0 (f);
-#line 41578 "Photo.c"
+#line 41593 "Photo.c"
 						}
-#line 5422 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5424 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (_f_it);
-#line 41582 "Photo.c"
+#line 41597 "Photo.c"
 					}
 				}
-#line 5428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5430 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp38_ = photo;
-#line 5428 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5430 "/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 5429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp39_ = photo;
-#line 5429 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5431 "/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 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (raw_files);
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (source);
-#line 41599 "Photo.c"
+#line 41614 "Photo.c"
 			}
-#line 5410 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5412 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41603 "Photo.c"
+#line 41618 "Photo.c"
 		}
 	}
-#line 5433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp40_ = removed;
-#line 5433 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp40_ != NULL) {
-#line 41610 "Photo.c"
+#line 41625 "Photo.c"
 		{
 			GeeIterator* _source_it = NULL;
 			GeeCollection* _tmp41_ = NULL;
 			GeeIterator* _tmp42_ = NULL;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp41_ = removed;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp42_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_source_it = _tmp42_;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41623 "Photo.c"
+#line 41638 "Photo.c"
 				GeeIterator* _tmp43_ = NULL;
 				gboolean _tmp44_ = FALSE;
 				DataSource* source = NULL;
@@ -41641,29 +41656,29 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 				guint _tmp78_ = 0U;
 				LibraryPhoto* _tmp79_ = NULL;
 				guint _tmp80_ = 0U;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp43_ = _source_it;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp44_ = gee_iterator_next (_tmp43_);
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp44_) {
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 41648 "Photo.c"
+#line 41663 "Photo.c"
 				}
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp45_ = _source_it;
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp46_ = gee_iterator_get (_tmp45_);
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				source = (DataSource*) _tmp46_;
-#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp47_ = source;
-#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp48_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 5435 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
 				photo = _tmp48_;
-#line 41662 "Photo.c"
+#line 41677 "Photo.c"
 				{
 					GeeIterator* _f_it = NULL;
 					GeeMultiMap* _tmp49_ = NULL;
@@ -41672,25 +41687,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					GeeCollection* _tmp52_ = NULL;
 					GeeIterator* _tmp53_ = NULL;
 					GeeIterator* _tmp54_ = NULL;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp49_ = self->priv->reverse_editable_file_map;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp50_ = photo;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp51_ = gee_multi_map_get (_tmp49_, _tmp50_);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp52_ = _tmp51_;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp53_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp54_ = _tmp53_;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp52_);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_f_it = _tmp54_;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 41689 "Photo.c"
+#line 41704 "Photo.c"
 						GeeIterator* _tmp55_ = NULL;
 						gboolean _tmp56_ = FALSE;
 						GFile* f = NULL;
@@ -41698,35 +41713,35 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						gpointer _tmp58_ = NULL;
 						GeeHashMap* _tmp59_ = NULL;
 						GFile* _tmp60_ = NULL;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp55_ = _f_it;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp56_ = gee_iterator_next (_tmp55_);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp56_) {
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 41705 "Photo.c"
+#line 41720 "Photo.c"
 						}
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp57_ = _f_it;
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp58_ = gee_iterator_get (_tmp57_);
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						f = (GFile*) _tmp58_;
-#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp59_ = self->priv->editable_file_map;
-#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp60_ = f;
-#line 5437 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5439 "/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 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (f);
-#line 41721 "Photo.c"
+#line 41736 "Photo.c"
 					}
-#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5438 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41725 "Photo.c"
+#line 41740 "Photo.c"
 				}
 				{
 					GeeIterator* _f_it = NULL;
@@ -41736,25 +41751,25 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 					GeeCollection* _tmp64_ = NULL;
 					GeeIterator* _tmp65_ = NULL;
 					GeeIterator* _tmp66_ = NULL;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp61_ = self->priv->reverse_development_file_map;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp62_ = photo;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp63_ = gee_multi_map_get (_tmp61_, _tmp62_);
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp64_ = _tmp63_;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp65_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_tmp66_ = _tmp65_;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_tmp64_);
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_f_it = _tmp66_;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					while (TRUE) {
-#line 41753 "Photo.c"
+#line 41768 "Photo.c"
 						GeeIterator* _tmp67_ = NULL;
 						gboolean _tmp68_ = FALSE;
 						GFile* f = NULL;
@@ -41762,78 +41777,78 @@ static void library_photo_source_holding_tank_real_notify_contents_altered (Sour
 						gpointer _tmp70_ = NULL;
 						GeeHashMap* _tmp71_ = NULL;
 						GFile* _tmp72_ = NULL;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp67_ = _f_it;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp68_ = gee_iterator_next (_tmp67_);
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						if (!_tmp68_) {
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 							break;
-#line 41769 "Photo.c"
+#line 41784 "Photo.c"
 						}
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp69_ = _f_it;
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp70_ = gee_iterator_get (_tmp69_);
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						f = (GFile*) _tmp70_;
-#line 5440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp71_ = self->priv->development_file_map;
-#line 5440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
 						_tmp72_ = f;
-#line 5440 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5442 "/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 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 						_g_object_unref0 (f);
-#line 41785 "Photo.c"
+#line 41800 "Photo.c"
 					}
-#line 5439 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5441 "/home/jens/Source/shotwell/src/Photo.vala"
 					_g_object_unref0 (_f_it);
-#line 41789 "Photo.c"
+#line 41804 "Photo.c"
 				}
-#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp73_ = self->priv->reverse_editable_file_map;
-#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp74_ = photo;
-#line 5442 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5444 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_remove_all (_tmp73_, _tmp74_);
-#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp75_ = self->priv->reverse_development_file_map;
-#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp76_ = photo;
-#line 5443 "/home/jens/Source/shotwell/src/Photo.vala"
-				gee_multi_map_remove_all (_tmp75_, _tmp76_);
 #line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
+				gee_multi_map_remove_all (_tmp75_, _tmp76_);
+#line 5447 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp77_ = photo;
-#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5447 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("editable-replaced", TYPE_PHOTO, &_tmp78_, NULL, FALSE);
-#line 5445 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5447 "/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 5446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5448 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp79_ = photo;
-#line 5446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5448 "/home/jens/Source/shotwell/src/Photo.vala"
 				g_signal_parse_name ("raw-development-modified", TYPE_PHOTO, &_tmp80_, NULL, FALSE);
-#line 5446 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5448 "/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 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (photo);
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (source);
-#line 41819 "Photo.c"
+#line 41834 "Photo.c"
 			}
-#line 5434 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5436 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_source_it);
-#line 41823 "Photo.c"
+#line 41838 "Photo.c"
 		}
 	}
-#line 5450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp81_ = added;
-#line 5450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5452 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp82_ = removed;
-#line 5450 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5452 "/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 41832 "Photo.c"
+#line 41847 "Photo.c"
 }
 
 
@@ -41847,79 +41862,79 @@ static void library_photo_source_holding_tank_on_editable_replaced (LibraryPhoto
 	GeeMultiMap* _tmp13_ = NULL;
 	LibraryPhoto* _tmp14_ = NULL;
 	GFile* _tmp15_ = NULL;
-#line 5453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self));
-#line 5453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (_photo));
-#line 5453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((old_file == NULL) || G_IS_FILE (old_file));
-#line 5453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail ((new_file == NULL) || G_IS_FILE (new_file));
-#line 5454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _photo;
-#line 5454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL);
-#line 5454 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5456 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
-	_vala_assert (_tmp2_ != NULL, "photo != null");
 #line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
+	_vala_assert (_tmp2_ != NULL, "photo != null");
+#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = old_file;
-#line 5457 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp3_ != NULL) {
-#line 41868 "Photo.c"
+#line 41883 "Photo.c"
 		GeeHashMap* _tmp4_ = NULL;
 		GFile* _tmp5_ = NULL;
 		GeeMultiMap* _tmp6_ = NULL;
 		LibraryPhoto* _tmp7_ = NULL;
 		GFile* _tmp8_ = NULL;
-#line 5458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp4_ = self->priv->editable_file_map;
-#line 5458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp5_ = old_file;
-#line 5458 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5460 "/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 5459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp6_ = self->priv->reverse_editable_file_map;
-#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp7_ = photo;
-#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp8_ = old_file;
-#line 5459 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5461 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove (_tmp6_, _tmp7_, _tmp8_);
-#line 41888 "Photo.c"
+#line 41903 "Photo.c"
 	}
-#line 5462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp9_ = new_file;
-#line 5462 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp9_ != NULL) {
-#line 41894 "Photo.c"
+#line 41909 "Photo.c"
 		GeeHashMap* _tmp10_ = NULL;
 		GFile* _tmp11_ = NULL;
 		LibraryPhoto* _tmp12_ = NULL;
-#line 5463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp10_ = self->priv->editable_file_map;
-#line 5463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp11_ = new_file;
-#line 5463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5465 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp12_ = photo;
-#line 5463 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5465 "/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 41906 "Photo.c"
+#line 41921 "Photo.c"
 	}
-#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp13_ = self->priv->reverse_editable_file_map;
-#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp14_ = photo;
-#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp15_ = new_file;
-#line 5464 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5466 "/home/jens/Source/shotwell/src/Photo.vala"
 	gee_multi_map_set (_tmp13_, _tmp14_, _tmp15_);
-#line 5453 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5455 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 41918 "Photo.c"
+#line 41933 "Photo.c"
 }
 
 
@@ -41935,29 +41950,29 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 	LibraryPhoto* _tmp20_ = NULL;
 	GeeCollection* _tmp21_ = NULL;
 	GeeCollection* _tmp22_ = NULL;
-#line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_SOURCE_HOLDING_TANK (self));
-#line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_return_if_fail (IS_PHOTO (_photo));
-#line 5468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5470 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = _photo;
-#line 5468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5470 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp0_) : NULL);
-#line 5468 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5470 "/home/jens/Source/shotwell/src/Photo.vala"
 	photo = _tmp1_;
-#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = photo;
-#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5471 "/home/jens/Source/shotwell/src/Photo.vala"
 	_vala_assert (_tmp2_ != NULL, "photo != null");
-#line 5472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp3_ = self->priv->reverse_development_file_map;
-#line 5472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp4_ = photo;
-#line 5472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp5_ = gee_multi_map_contains (_tmp3_, _tmp4_);
-#line 5472 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp5_) {
-#line 41956 "Photo.c"
+#line 41971 "Photo.c"
 		GeeMultiMap* _tmp18_ = NULL;
 		LibraryPhoto* _tmp19_ = NULL;
 		{
@@ -41968,25 +41983,25 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 			GeeCollection* _tmp9_ = NULL;
 			GeeIterator* _tmp10_ = NULL;
 			GeeIterator* _tmp11_ = NULL;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp6_ = self->priv->reverse_development_file_map;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp7_ = photo;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp8_ = gee_multi_map_get (_tmp6_, _tmp7_);
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp9_ = _tmp8_;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp11_ = _tmp10_;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_tmp9_);
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_f_it = _tmp11_;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 41985 "Photo.c"
+#line 42000 "Photo.c"
 				GeeIterator* _tmp12_ = NULL;
 				gboolean _tmp13_ = FALSE;
 				GFile* f = NULL;
@@ -41994,68 +42009,68 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				gpointer _tmp15_ = NULL;
 				GeeHashMap* _tmp16_ = NULL;
 				GFile* _tmp17_ = NULL;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp12_ = _f_it;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp13_ = gee_iterator_next (_tmp12_);
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp13_) {
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 42001 "Photo.c"
+#line 42016 "Photo.c"
 				}
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp14_ = _f_it;
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp15_ = gee_iterator_get (_tmp14_);
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = (GFile*) _tmp15_;
-#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5476 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp16_ = self->priv->development_file_map;
-#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5476 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp17_ = f;
-#line 5474 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5476 "/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 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 42017 "Photo.c"
+#line 42032 "Photo.c"
 			}
-#line 5473 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42021 "Photo.c"
+#line 42036 "Photo.c"
 		}
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp18_ = self->priv->reverse_development_file_map;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
 		_tmp19_ = photo;
-#line 5475 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5477 "/home/jens/Source/shotwell/src/Photo.vala"
 		gee_multi_map_remove_all (_tmp18_, _tmp19_);
-#line 42029 "Photo.c"
+#line 42044 "Photo.c"
 	}
-#line 5479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp20_ = photo;
-#line 5479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp21_ = photo_get_raw_developer_files (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PHOTO, Photo));
-#line 5479 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
 	raw_list = _tmp21_;
-#line 5480 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp22_ = raw_list;
-#line 5480 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
 	if (_tmp22_ != NULL) {
-#line 42041 "Photo.c"
+#line 42056 "Photo.c"
 		{
 			GeeIterator* _f_it = NULL;
 			GeeCollection* _tmp23_ = NULL;
 			GeeIterator* _tmp24_ = NULL;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp23_ = raw_list;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			_tmp24_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			_f_it = _tmp24_;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			while (TRUE) {
-#line 42054 "Photo.c"
+#line 42069 "Photo.c"
 				GeeIterator* _tmp25_ = NULL;
 				gboolean _tmp26_ = FALSE;
 				GFile* f = NULL;
@@ -42067,65 +42082,65 @@ static void library_photo_source_holding_tank_on_raw_development_modified (Libra
 				GeeMultiMap* _tmp32_ = NULL;
 				LibraryPhoto* _tmp33_ = NULL;
 				GFile* _tmp34_ = NULL;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp25_ = _f_it;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp26_ = gee_iterator_next (_tmp25_);
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				if (!_tmp26_) {
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 					break;
-#line 42074 "Photo.c"
+#line 42089 "Photo.c"
 				}
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp27_ = _f_it;
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp28_ = gee_iterator_get (_tmp27_);
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				f = (GFile*) _tmp28_;
-#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp29_ = self->priv->development_file_map;
-#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp30_ = f;
-#line 5482 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5484 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp31_ = photo;
-#line 5482 "/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 (_tmp29_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp30_, _tmp31_);
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp32_ = self->priv->reverse_development_file_map;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp33_ = photo;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 				_tmp34_ = f;
-#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5485 "/home/jens/Source/shotwell/src/Photo.vala"
 				gee_multi_map_set (_tmp32_, _tmp33_, _tmp34_);
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 				_g_object_unref0 (f);
-#line 42100 "Photo.c"
+#line 42115 "Photo.c"
 			}
-#line 5481 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5483 "/home/jens/Source/shotwell/src/Photo.vala"
 			_g_object_unref0 (_f_it);
-#line 42104 "Photo.c"
+#line 42119 "Photo.c"
 		}
 	}
-#line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (raw_list);
-#line 5467 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5469 "/home/jens/Source/shotwell/src/Photo.vala"
 	_g_object_unref0 (photo);
-#line 42111 "Photo.c"
+#line 42126 "Photo.c"
 }
 
 
 static void library_photo_source_holding_tank_class_init (LibraryPhotoSourceHoldingTankClass * klass) {
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	library_photo_source_holding_tank_parent_class = g_type_class_peek_parent (klass);
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceHoldingTankClass *) klass)->finalize = library_photo_source_holding_tank_finalize;
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoSourceHoldingTankPrivate));
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	((SourceHoldingTankClass *) klass)->notify_contents_altered = library_photo_source_holding_tank_real_notify_contents_altered;
-#line 42124 "Photo.c"
+#line 42139 "Photo.c"
 }
 
 
@@ -42134,43 +42149,43 @@ static void library_photo_source_holding_tank_instance_init (LibraryPhotoSourceH
 	GeeHashMap* _tmp1_ = NULL;
 	GeeHashMultiMap* _tmp2_ = NULL;
 	GeeHashMultiMap* _tmp3_ = NULL;
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv = LIBRARY_PHOTO_SOURCE_HOLDING_TANK_GET_PRIVATE (self);
-#line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp0_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->editable_file_map = _tmp0_;
 #line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->editable_file_map = _tmp0_;
+#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp1_ = gee_hash_map_new (g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->development_file_map = _tmp1_;
 #line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
+	self->priv->development_file_map = _tmp1_;
+#line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
 	_tmp2_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
-#line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
-	self->priv->reverse_editable_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
 #line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
+	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"
 	_tmp3_ = gee_hash_multi_map_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, g_file_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, _file_hash_gee_hash_data_func, NULL, NULL, _file_equal_gee_equal_data_func, NULL, NULL);
-#line 5390 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5392 "/home/jens/Source/shotwell/src/Photo.vala"
 	self->priv->reverse_development_file_map = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 42151 "Photo.c"
+#line 42166 "Photo.c"
 }
 
 
 static void library_photo_source_holding_tank_finalize (SourceHoldingTank* obj) {
 	LibraryPhotoSourceHoldingTank * self;
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_SOURCE_HOLDING_TANK, LibraryPhotoSourceHoldingTank);
-#line 5384 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->editable_file_map);
 #line 5386 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->development_file_map);
+	_g_object_unref0 (self->priv->editable_file_map);
 #line 5388 "/home/jens/Source/shotwell/src/Photo.vala"
-	_g_object_unref0 (self->priv->reverse_editable_file_map);
+	_g_object_unref0 (self->priv->development_file_map);
 #line 5390 "/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"
 	_g_object_unref0 (self->priv->reverse_development_file_map);
-#line 5383 "/home/jens/Source/shotwell/src/Photo.vala"
+#line 5385 "/home/jens/Source/shotwell/src/Photo.vala"
 	SOURCE_HOLDING_TANK_CLASS (library_photo_source_holding_tank_parent_class)->finalize (obj);
-#line 42169 "Photo.c"
+#line 42184 "Photo.c"
 }
 
 
diff --git a/src/Photo.vala b/src/Photo.vala
index 222896f..c768017 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -813,12 +813,6 @@ public abstract class Photo : PhotoSource, Dateable {
             // Perform development, bail out if it doesn't work.
             if (!is_raw_developer_complete(d)) {
                 develop_photo(d);
-                try {
-                    get_prefetched_copy();
-                } catch (Error e) {
-                    // couldn't reload the freshly-developed image, nothing to display
-                    return;
-                }
             }
             if (!developments.has_key(d))
                 return; // we tried!
@@ -830,7 +824,14 @@ public abstract class Photo : PhotoSource, Dateable {
             row.developer = d;
             backing_photo_row = developments.get(d);
             readers.developer = backing_photo_row.file_format.create_reader(backing_photo_row.filepath);
-            
+
+            try {
+                get_prefetched_copy();
+            } catch (Error e) {
+                // couldn't reload the freshly-developed image, nothing to display
+                return;
+            }
+
             set_orientation(backing_photo_row.original_orientation);
             
             try {
@@ -1258,6 +1259,7 @@ public abstract class Photo : PhotoSource, Dateable {
         if (params.thumbnails != null) {
             PhotoFileReader reader = params.row.master.file_format.create_reader(
                 params.row.master.filepath);
+            reader.set_role (PhotoFileReader.Role.THUMBNAIL);
             try {
                 ThumbnailCache.generate_for_photo(params.thumbnails, reader, params.row.orientation, 
                     params.row.master.dim);
diff --git a/src/PhotoMonitor.c b/src/PhotoMonitor.c
index 7d24c99..a1aed95 100644
--- a/src/PhotoMonitor.c
+++ b/src/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 __catch582_database_error;
+					goto __catch584_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 __finally582;
-		__catch582_database_error:
+		goto __finally584;
+		__catch584_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp97_ = NULL;
@@ -6658,7 +6658,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 			_g_error_free0 (err);
 #line 6658 "PhotoMonitor.c"
 		}
-		__finally582:
+		__finally584:
 #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 __catch583_database_error;
+					goto __catch585_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 __finally583;
-		__catch583_database_error:
+		goto __finally585;
+		__catch585_database_error:
 		{
 			GError* err = NULL;
 			GError* _tmp105_ = NULL;
@@ -6760,7 +6760,7 @@ static void photo_monitor_real_process_updates (MediaMonitor* base, GeeCollectio
 			_g_error_free0 (err);
 #line 6760 "PhotoMonitor.c"
 		}
-		__finally583:
+		__finally585:
 #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 __catch584_database_error;
+				goto __catch586_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 __finally584;
-	__catch584_database_error:
+	goto __finally586;
+	__catch586_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_ = NULL;
@@ -7467,7 +7467,7 @@ static void photo_monitor_on_master_reimported (PhotoMonitor* self, BackgroundJo
 		_g_error_free0 (err);
 #line 7466 "PhotoMonitor.c"
 	}
-	__finally584:
+	__finally586:
 #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 __catch585_database_error;
+				goto __catch587_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 __finally585;
-	__catch585_database_error:
+	goto __finally587;
+	__catch587_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
@@ -7680,7 +7680,7 @@ static void photo_monitor_on_editable_reimported (PhotoMonitor* self, Background
 		_g_error_free0 (err);
 #line 7679 "PhotoMonitor.c"
 	}
-	__finally585:
+	__finally587:
 #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 __catch586_database_error;
+				goto __catch588_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 __finally586;
-	__catch586_database_error:
+	goto __finally588;
+	__catch588_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp20_ = NULL;
@@ -7874,7 +7874,7 @@ static void photo_monitor_on_raw_development_reimported (PhotoMonitor* self, Bac
 		_g_error_free0 (err);
 #line 7873 "PhotoMonitor.c"
 	}
-	__finally586:
+	__finally588:
 #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 __catch587_g_error;
+			goto __catch589_g_error;
 		}
 #line 176 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->mark_online = _tmp0_;
 #line 8035 "PhotoMonitor.c"
 	}
-	goto __finally587;
-	__catch587_g_error:
+	goto __finally589;
+	__catch589_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8058,7 +8058,7 @@ static void photo_monitor_reimport_master_job_real_execute (BackgroundJob* base)
 		_g_error_free0 (err);
 #line 8057 "PhotoMonitor.c"
 	}
-	__finally587:
+	__finally589:
 #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 __catch588_g_error;
+			goto __catch590_g_error;
 		}
 #line 198 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8213 "PhotoMonitor.c"
 	}
-	goto __finally588;
-	__catch588_g_error:
+	goto __finally590;
+	__catch590_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8236,7 +8236,7 @@ static void photo_monitor_reimport_editable_job_real_execute (BackgroundJob* bas
 		_g_error_free0 (err);
 #line 8235 "PhotoMonitor.c"
 	}
-	__finally588:
+	__finally590:
 #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 __catch589_g_error;
+			goto __catch591_g_error;
 		}
 #line 220 "/home/jens/Source/shotwell/src/PhotoMonitor.vala"
 		self->success = _tmp0_;
 #line 8391 "PhotoMonitor.c"
 	}
-	goto __finally589;
-	__catch589_g_error:
+	goto __finally591;
+	__catch591_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -8414,7 +8414,7 @@ static void photo_monitor_reimport_raw_development_job_real_execute (BackgroundJ
 		_g_error_free0 (err);
 #line 8413 "PhotoMonitor.c"
 	}
-	__finally589:
+	__finally591:
 #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 5eddab0..579add0 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -3983,7 +3983,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3983 "PhotoPage.c"
-			goto __catch242_g_error;
+			goto __catch243_g_error;
 		}
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp0_;
@@ -3997,8 +3997,8 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		_g_object_unref0 (_tmp0_);
 #line 3996 "PhotoPage.c"
 	}
-	goto __finally242;
-	__catch242_g_error:
+	goto __finally243;
+	__catch243_g_error:
 	{
 		GError* fetch_error = NULL;
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4012,7 +4012,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		_g_error_free0 (fetch_error);
 #line 4010 "PhotoPage.c"
 	}
-	__finally242:
+	__finally243:
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4322,21 +4322,21 @@ GType zoom_buffer_get_type (void) {
 
 
 static void _editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_photos_altered ((EditingHostPage*) self, items);
 #line 4324 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
-#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
 #line 4331 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self) {
-#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
 #line 4338 "PhotoPage.c"
 }
@@ -4364,35 +4364,35 @@ static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkT
 
 
 static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
-#line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_crop_toggled ((EditingHostPage*) self);
 #line 4366 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
-#line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_straighten_toggled ((EditingHostPage*) self);
 #line 4373 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
-#line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_redeye_toggled ((EditingHostPage*) self);
 #line 4380 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
-#line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_toggled ((EditingHostPage*) self);
 #line 4387 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
-#line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
 #line 4394 "PhotoPage.c"
 }
@@ -4401,14 +4401,14 @@ static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton
 static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_out_pressed ((EditingHostPage*) self, event);
-#line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
 #line 4403 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
-#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_zoom_slider_value_changed ((EditingHostPage*) self);
 #line 4410 "PhotoPage.c"
 }
@@ -4417,7 +4417,7 @@ static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_chan
 static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_drag_begin ((EditingHostPage*) self, event);
-#line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
 #line 4419 "PhotoPage.c"
 }
@@ -4426,7 +4426,7 @@ static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_p
 static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_drag_end ((EditingHostPage*) self, event);
-#line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
 #line 4428 "PhotoPage.c"
 }
@@ -4435,7 +4435,7 @@ static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_rel
 static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_key_press ((EditingHostPage*) self, event);
-#line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
 #line 4437 "PhotoPage.c"
 }
@@ -4444,21 +4444,21 @@ static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press
 static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_zoom_in_pressed ((EditingHostPage*) self, event);
-#line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
 #line 4446 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
-#line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
 #line 4453 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
-#line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
 #line 4460 "PhotoPage.c"
 }
@@ -4483,9 +4483,10 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	GtkToolButton* _tmp13_ = NULL;
 	GtkToolButton* _tmp14_ = NULL;
 	GtkToolButton* _tmp15_ = NULL;
-	GtkToggleToolButton* _tmp16_ = NULL;
-	GtkToggleToolButton* _tmp17_ = NULL;
-	GtkToggleToolButton* _tmp18_ = NULL;
+	GtkBindingSet* binding_set = NULL;
+	GtkToolButton* _tmp16_ = NULL;
+	GObjectClass* _tmp17_ = NULL;
+	GtkBindingSet* _tmp18_ = NULL;
 	GtkToggleToolButton* _tmp19_ = NULL;
 	GtkToggleToolButton* _tmp20_ = NULL;
 	GtkToggleToolButton* _tmp21_ = NULL;
@@ -4511,52 +4512,55 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	GtkToggleToolButton* _tmp41_ = NULL;
 	GtkToggleToolButton* _tmp42_ = NULL;
 	GtkToggleToolButton* _tmp43_ = NULL;
-	GtkToolButton* _tmp44_ = NULL;
-	GtkToolButton* _tmp45_ = NULL;
-	GtkToolButton* _tmp46_ = NULL;
+	GtkToggleToolButton* _tmp44_ = NULL;
+	GtkToggleToolButton* _tmp45_ = NULL;
+	GtkToggleToolButton* _tmp46_ = NULL;
 	GtkToolButton* _tmp47_ = NULL;
 	GtkToolButton* _tmp48_ = NULL;
 	GtkToolButton* _tmp49_ = NULL;
+	GtkToolButton* _tmp50_ = NULL;
+	GtkToolButton* _tmp51_ = NULL;
+	GtkToolButton* _tmp52_ = NULL;
 	GtkSeparatorToolItem* separator = NULL;
-	GtkSeparatorToolItem* _tmp50_ = NULL;
+	GtkSeparatorToolItem* _tmp53_ = NULL;
 	GtkBox* zoom_group = NULL;
-	GtkBox* _tmp51_ = NULL;
+	GtkBox* _tmp54_ = NULL;
 	GtkImage* zoom_out = NULL;
-	GdkPixbuf* _tmp52_ = NULL;
-	GdkPixbuf* _tmp53_ = NULL;
-	GtkImage* _tmp54_ = NULL;
-	GtkImage* _tmp55_ = NULL;
+	GdkPixbuf* _tmp55_ = NULL;
+	GdkPixbuf* _tmp56_ = NULL;
+	GtkImage* _tmp57_ = NULL;
+	GtkImage* _tmp58_ = NULL;
 	GtkEventBox* zoom_out_box = NULL;
-	GtkEventBox* _tmp56_ = NULL;
-	GtkAdjustment* _tmp57_ = NULL;
-	GtkAdjustment* _tmp58_ = NULL;
-	GtkScale* _tmp59_ = NULL;
-	GtkScale* _tmp60_ = NULL;
-	GtkScale* _tmp61_ = NULL;
+	GtkEventBox* _tmp59_ = NULL;
+	GtkAdjustment* _tmp60_ = NULL;
+	GtkAdjustment* _tmp61_ = NULL;
 	GtkScale* _tmp62_ = NULL;
 	GtkScale* _tmp63_ = NULL;
 	GtkScale* _tmp64_ = NULL;
 	GtkScale* _tmp65_ = NULL;
 	GtkScale* _tmp66_ = NULL;
+	GtkScale* _tmp67_ = NULL;
+	GtkScale* _tmp68_ = NULL;
+	GtkScale* _tmp69_ = NULL;
 	GtkImage* zoom_in = NULL;
-	GdkPixbuf* _tmp67_ = NULL;
-	GdkPixbuf* _tmp68_ = NULL;
-	GtkImage* _tmp69_ = NULL;
-	GtkImage* _tmp70_ = NULL;
+	GdkPixbuf* _tmp70_ = NULL;
+	GdkPixbuf* _tmp71_ = NULL;
+	GtkImage* _tmp72_ = NULL;
+	GtkImage* _tmp73_ = NULL;
 	GtkEventBox* zoom_in_box = NULL;
-	GtkEventBox* _tmp71_ = NULL;
+	GtkEventBox* _tmp74_ = NULL;
 	GtkToolItem* group_wrapper = NULL;
-	GtkToolItem* _tmp72_ = NULL;
-	GtkToolButton* _tmp73_ = NULL;
-	const gchar* _tmp74_ = NULL;
-	GtkToolButton* _tmp75_ = NULL;
+	GtkToolItem* _tmp75_ = NULL;
 	GtkToolButton* _tmp76_ = NULL;
-	GtkToolButton* _tmp77_ = NULL;
+	const gchar* _tmp77_ = NULL;
 	GtkToolButton* _tmp78_ = NULL;
-	const gchar* _tmp79_ = NULL;
+	GtkToolButton* _tmp79_ = NULL;
 	GtkToolButton* _tmp80_ = NULL;
 	GtkToolButton* _tmp81_ = NULL;
-	GtkToolButton* _tmp82_ = NULL;
+	const gchar* _tmp82_ = NULL;
+	GtkToolButton* _tmp83_ = NULL;
+	GtkToolButton* _tmp84_ = NULL;
+	GtkToolButton* _tmp85_ = NULL;
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4629,330 +4633,342 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	_tmp15_ = self->priv->rotate_button;
 #line 442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp16_ = self->priv->rotate_button;
+#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp17_ = G_OBJECT_GET_CLASS (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, G_TYPE_OBJECT, GObject));
+#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp18_ = gtk_binding_set_by_class (_tmp17_);
+#line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	binding_set = _tmp18_;
+#line 444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_binding_entry_add_signal (binding_set, (guint) GDK_KEY_KP_Space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL);
 #line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
-#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp16_);
-#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->crop_button);
-#line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->crop_button = _tmp16_;
-#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = self->priv->crop_button;
-#line 446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_button_get_type (), GtkToolButton), "crop");
-#line 447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = self->priv->crop_button;
-#line 447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_CROP_LABEL);
+	gtk_binding_entry_add_signal (binding_set, (guint) GDK_KEY_space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL);
+#line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp19_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+#line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp19_);
 #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = self->priv->crop_button;
+	_g_object_unref0 (self->priv->crop_button);
 #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_CROP_TOOLTIP);
+	self->priv->crop_button = _tmp19_;
 #line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = self->priv->crop_button;
 #line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp20_, "toggled", (GCallback) _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_tool_button_get_type (), GtkToolButton), "crop");
 #line 450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->crop_button;
 #line 450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_CROP_LABEL);
 #line 451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->crop_button;
 #line 451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_CROP_TOOLTIP);
+#line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp23_ = self->priv->crop_button;
+#line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp23_, "toggled", (GCallback) _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled, self, 0);
+#line 453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp24_ = self->priv->crop_button;
+#line 453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp23_);
+	_tmp25_ = self->priv->crop_button;
 #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->straighten_button);
-#line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->straighten_button = _tmp23_;
-#line 455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = self->priv->straighten_button;
-#line 455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_button_get_type (), GtkToolButton), "straighten");
-#line 456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = self->priv->straighten_button;
-#line 456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp26_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = self->priv->straighten_button;
+	g_object_ref_sink (_tmp26_);
 #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP);
+	_g_object_unref0 (self->priv->straighten_button);
+#line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->straighten_button = _tmp26_;
 #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->straighten_button;
 #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp27_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_button_get_type (), GtkToolButton), "straighten");
 #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->straighten_button;
 #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL);
 #line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = self->priv->straighten_button;
 #line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP);
+#line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp30_ = self->priv->straighten_button;
+#line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp30_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0);
+#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp31_ = self->priv->straighten_button;
+#line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp30_);
+	_tmp32_ = self->priv->straighten_button;
 #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->redeye_button);
-#line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->redeye_button = _tmp30_;
-#line 464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp31_ = self->priv->redeye_button;
-#line 464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "redeye");
-#line 465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp32_ = self->priv->redeye_button;
-#line 465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp33_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp33_ = self->priv->redeye_button;
+	g_object_ref_sink (_tmp33_);
+#line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (self->priv->redeye_button);
 #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP);
+	self->priv->redeye_button = _tmp33_;
 #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp34_ = self->priv->redeye_button;
 #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp34_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_button_get_type (), GtkToolButton), "redeye");
 #line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = self->priv->redeye_button;
 #line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL);
 #line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp36_ = self->priv->redeye_button;
 #line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP);
+#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp37_ = self->priv->redeye_button;
+#line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp37_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0);
+#line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp38_ = self->priv->redeye_button;
+#line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp37_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+	_tmp39_ = self->priv->redeye_button;
 #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp37_);
-#line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->adjust_button);
-#line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->adjust_button = _tmp37_;
-#line 473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp38_ = self->priv->adjust_button;
-#line 473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST);
-#line 474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp39_ = self->priv->adjust_button;
-#line 474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp40_ = self->priv->adjust_button;
+	_tmp40_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP);
+	g_object_ref_sink (_tmp40_);
+#line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (self->priv->adjust_button);
+#line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->adjust_button = _tmp40_;
 #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp41_ = self->priv->adjust_button;
 #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp41_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST);
 #line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp42_ = self->priv->adjust_button;
 #line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL);
 #line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = self->priv->adjust_button;
 #line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL);
-#line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp44_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP);
+#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp44_ = self->priv->adjust_button;
+#line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp44_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0);
+#line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp45_ = self->priv->adjust_button;
+#line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (self->priv->enhance_button);
+	_tmp46_ = self->priv->adjust_button;
 #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->enhance_button = _tmp44_;
-#line 482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp45_ = self->priv->enhance_button;
-#line 482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp45_, RESOURCES_ENHANCE);
-#line 483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp46_ = self->priv->enhance_button;
-#line 483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp47_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL);
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp47_ = self->priv->enhance_button;
+	g_object_ref_sink (_tmp47_);
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp47_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0);
+	_g_object_unref0 (self->priv->enhance_button);
+#line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->enhance_button = _tmp47_;
 #line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp48_ = self->priv->enhance_button;
 #line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_button_set_icon_name (_tmp48_, RESOURCES_ENHANCE);
 #line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp49_ = self->priv->enhance_button;
 #line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp50_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP);
+#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp50_ = self->priv->enhance_button;
+#line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp50_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0);
+#line 488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp51_ = self->priv->enhance_button;
+#line 488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp50_);
+	_tmp52_ = self->priv->enhance_button;
 #line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	separator = _tmp50_;
-#line 490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp53_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp53_);
+#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	separator = _tmp53_;
+#line 493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), TRUE);
-#line 491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_separator_tool_item_set_draw (separator, FALSE);
-#line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), -1);
-#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp51_);
-#line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_group = _tmp51_;
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp52_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE);
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_ = _tmp52_;
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp54_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp53_);
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp54_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+#line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp54_);
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp55_ = _tmp54_;
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp53_);
-#line 496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_out = _tmp55_;
-#line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp56_ = (GtkEventBox*) gtk_event_box_new ();
-#line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp56_);
-#line 498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_out_box = _tmp56_;
+#line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_group = _tmp54_;
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp55_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE);
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp56_ = _tmp55_;
 #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp57_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp56_);
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp57_);
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp58_ = _tmp57_;
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp56_);
+#line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_out = _tmp58_;
+#line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp59_ = (GtkEventBox*) gtk_event_box_new ();
+#line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp59_);
+#line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_out_box = _tmp59_;
+#line 502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_event_box_set_above_child (zoom_out_box, TRUE);
-#line 500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_event_box_set_visible_window (zoom_out_box, FALSE);
-#line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_out, gtk_widget_get_type (), GtkWidget));
-#line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event, self, 0);
-#line 505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp57_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1);
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp57_);
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp58_ = _tmp57_;
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp59_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp58_);
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp59_);
 #line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp60_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1);
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp60_);
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp61_ = _tmp60_;
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp62_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp61_);
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp62_);
+#line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->zoom_slider);
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->zoom_slider = _tmp59_;
-#line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp58_);
-#line 509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp60_ = self->priv->zoom_slider;
-#line 509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_scale_set_draw_value (_tmp60_, FALSE);
-#line 510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp61_ = self->priv->zoom_slider;
-#line 510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), 120, -1);
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp62_ = self->priv->zoom_slider;
+	self->priv->zoom_slider = _tmp62_;
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
+	_g_object_unref0 (_tmp61_);
 #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp63_ = self->priv->zoom_slider;
 #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0);
+	gtk_scale_set_draw_value (_tmp63_, FALSE);
 #line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp64_ = self->priv->zoom_slider;
 #line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), 120, -1);
 #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp65_ = self->priv->zoom_slider;
 #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0);
-#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
+#line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp66_ = self->priv->zoom_slider;
+#line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0);
+#line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp67_ = self->priv->zoom_slider;
 #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp67_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp68_ = _tmp67_;
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp69_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp68_);
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp69_);
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp70_ = _tmp69_;
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp68_);
-#line 518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_in = _tmp70_;
-#line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp71_ = (GtkEventBox*) gtk_event_box_new ();
-#line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp71_);
-#line 520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_in_box = _tmp71_;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0);
+#line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp68_ = self->priv->zoom_slider;
+#line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0);
+#line 519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp69_ = self->priv->zoom_slider;
+#line 519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp70_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp71_ = _tmp70_;
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp72_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp71_);
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp72_);
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp73_ = _tmp72_;
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp71_);
+#line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_in = _tmp73_;
+#line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp74_ = (GtkEventBox*) gtk_event_box_new ();
+#line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp74_);
+#line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	zoom_in_box = _tmp74_;
+#line 524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_event_box_set_above_child (zoom_in_box, TRUE);
-#line 522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_event_box_set_visible_window (zoom_in_box, FALSE);
-#line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_in, gtk_widget_get_type (), GtkWidget));
-#line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event, self, 0);
-#line 527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
-#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp72_ = gtk_tool_item_new ();
-#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp72_);
-#line 529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	group_wrapper = _tmp72_;
 #line 530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (group_wrapper, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_group, gtk_widget_get_type (), GtkWidget));
+	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, group_wrapper, -1);
-#line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp73_ = self->priv->prev_button;
-#line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp74_ = _ ("Previous photo");
+	_tmp75_ = gtk_tool_item_new ();
+#line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_object_ref_sink (_tmp75_);
+#line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	group_wrapper = _tmp75_;
+#line 533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (group_wrapper, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_group, gtk_widget_get_type (), GtkWidget));
 #line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_tool_item_get_type (), GtkToolItem), _tmp74_);
-#line 536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp75_ = self->priv->prev_button;
-#line 536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp75_, "go-previous");
-#line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, group_wrapper, -1);
+#line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp76_ = self->priv->prev_button;
-#line 537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp76_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
 #line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp77_ = self->priv->prev_button;
+	_tmp77_ = _ ("Previous photo");
 #line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), _tmp77_);
+#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp78_ = self->priv->prev_button;
+#line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_button_set_icon_name (_tmp78_, "go-previous");
+#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp79_ = self->priv->prev_button;
+#line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp79_, "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 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp78_ = self->priv->next_button;
+	_tmp80_ = self->priv->prev_button;
 #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp79_ = _ ("Next photo");
-#line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_tool_item_get_type (), GtkToolItem), _tmp79_);
-#line 542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp80_ = self->priv->next_button;
-#line 542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp80_, "go-next");
-#line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), -1);
+#line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp81_ = self->priv->next_button;
-#line 543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp81_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
 #line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp82_ = self->priv->next_button;
+	_tmp82_ = _ ("Next photo");
 #line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_tool_item_get_type (), GtkToolItem), _tmp82_);
+#line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp83_ = self->priv->next_button;
+#line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_tool_button_set_icon_name (_tmp83_, "go-next");
+#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp84_ = self->priv->next_button;
+#line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_signal_connect_object (_tmp84_, "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 547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp85_ = self->priv->next_button;
+#line 547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp85_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (group_wrapper);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4971,7 +4987,7 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	_g_object_unref0 (toolbar);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 4971 "PhotoPage.c"
+#line 4987 "PhotoPage.c"
 }
 
 
@@ -4981,63 +4997,63 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 	GtkScale* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
 	gboolean _tmp3_ = FALSE;
-#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_rescale (&new_zoom_state, &_tmp0_, _tmp2_);
-#line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->enable_interactive_zoom_refresh;
-#line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 4995 "PhotoPage.c"
+#line 5011 "PhotoPage.c"
 		ZoomState _tmp4_ = {0};
 		gboolean _tmp5_ = FALSE;
-#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = new_zoom_state;
-#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_on_interactive_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_);
-#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = zoom_state_is_default (&new_zoom_state);
-#line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 5006 "PhotoPage.c"
+#line 5022 "PhotoPage.c"
 			ZoomState _tmp6_ = {0};
-#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = new_zoom_state;
-#line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 5012 "PhotoPage.c"
+#line 5028 "PhotoPage.c"
 		}
 	} else {
 		gboolean _tmp7_ = FALSE;
-#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = zoom_state_is_default (&new_zoom_state);
-#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp7_) {
-#line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 5022 "PhotoPage.c"
+#line 5038 "PhotoPage.c"
 		} else {
 			ZoomState _tmp8_ = {0};
-#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = new_zoom_state;
-#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 5029 "PhotoPage.c"
+#line 5045 "PhotoPage.c"
 		}
-#line 568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 5033 "PhotoPage.c"
+#line 5049 "PhotoPage.c"
 	}
-#line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5037 "PhotoPage.c"
+#line 5053 "PhotoPage.c"
 }
 
 
@@ -5046,40 +5062,40 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->enable_interactive_zoom_refresh = TRUE;
-#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW);
-#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5062 "PhotoPage.c"
+#line 5078 "PhotoPage.c"
 		GtkWindow* _tmp3_ = NULL;
 		FullscreenWindow* _tmp4_ = NULL;
-#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_disable_toolbar_dismissal (_tmp4_);
-#line 578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5073 "PhotoPage.c"
+#line 5089 "PhotoPage.c"
 	}
-#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5079 "PhotoPage.c"
+#line 5095 "PhotoPage.c"
 }
 
 
@@ -5093,86 +5109,86 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	GtkScale* _tmp6_ = NULL;
 	gdouble _tmp7_ = 0.0;
 	ZoomState _tmp8_ = {0};
-#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->enable_interactive_zoom_refresh = FALSE;
-#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW);
-#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5109 "PhotoPage.c"
+#line 5125 "PhotoPage.c"
 		GtkWindow* _tmp3_ = NULL;
 		FullscreenWindow* _tmp4_ = NULL;
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_update_toolbar_dismissal (_tmp4_);
-#line 587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5120 "PhotoPage.c"
+#line 5136 "PhotoPage.c"
 	}
-#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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_);
-#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->zoom_slider;
-#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange));
-#line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_rescale (&zoom_state, &_tmp5_, _tmp7_);
-#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = zoom_state;
-#line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 593 "/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 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5140 "PhotoPage.c"
+#line 5156 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_min (self);
-#line 599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5156 "PhotoPage.c"
+#line 5172 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_max (self);
-#line 604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5172 "PhotoPage.c"
+#line 5188 "PhotoPage.c"
 }
 
 
@@ -5206,85 +5222,85 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd
 	GdkRectangle _tmp23_ = {0};
 	gint _tmp24_ = 0;
 	gint _tmp25_ = 0;
-#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_.x = 0;
-#line 608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_canvas = _tmp0_;
-#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_->x;
-#line 609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_canvas.x = (gint) _tmp2_;
-#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = event;
-#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_->y;
-#line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_canvas.y = (gint) _tmp4_;
-#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewing_rectangle_wrt_screen (&_tmp5_, &_tmp6_);
-#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_wrt_canvas = _tmp6_;
-#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_.x = 0;
-#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_ = _tmp7_;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = cursor_wrt_canvas;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_.x;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = viewport_wrt_canvas;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = _tmp10_.x;
-#line 614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_.x = _tmp9_ - _tmp11_;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _result_;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_.x;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = viewport_wrt_canvas;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = _tmp14_.width;
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = CLAMP (_tmp13_, 0, _tmp15_);
-#line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_.x = _tmp16_;
-#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = cursor_wrt_canvas;
-#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = _tmp17_.y;
-#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = viewport_wrt_canvas;
-#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = _tmp19_.y;
-#line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_.y = _tmp18_ - _tmp20_;
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = _result_;
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = _tmp21_.y;
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = viewport_wrt_canvas;
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = _tmp23_.height;
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = CLAMP (_tmp22_, 0, _tmp24_);
-#line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_result_.y = _tmp25_;
-#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	*result = _result_;
-#line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5284 "PhotoPage.c"
+#line 5300 "PhotoPage.c"
 }
 
 
@@ -5304,49 +5320,49 @@ static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* s
 	GdkPoint _tmp9_ = {0};
 	GdkPoint _tmp10_ = {0};
 	GdkPoint _tmp11_ = {0};
-#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_cursor_wrt_viewport (self, _tmp0_, &_tmp1_);
-#line 623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_viewport = _tmp1_;
-#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_);
-#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewing_rectangle_wrt_screen (&_tmp2_, &_tmp3_);
-#line 624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_wrt_canvas = _tmp3_;
-#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_.x = 0;
-#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center = _tmp4_;
-#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = viewport_wrt_canvas;
-#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_.width;
-#line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center.x = _tmp6_ / 2;
-#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = viewport_wrt_canvas;
-#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_.height;
-#line 628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center.y = _tmp8_ / 2;
-#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = cursor_wrt_viewport;
-#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = viewport_center;
-#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	subtract_points (&_tmp9_, &_tmp10_, &_tmp11_);
-#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	*result = _tmp11_;
-#line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5346 "PhotoPage.c"
+#line 5362 "PhotoPage.c"
 }
 
 
@@ -5366,45 +5382,45 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
 	GdkPoint _tmp10_ = {0};
 	GdkPoint _tmp11_ = {0};
 	GdkPoint _tmp12_ = {0};
-#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewport_center (&_tmp0_, &_tmp1_);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = zoom_state_get_zoom_factor (&_tmp2_);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale_point (&_tmp1_, 1.0 / _tmp3_, &_tmp4_);
-#line 634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	viewport_center_iso = _tmp4_;
 #line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	viewport_center_iso = _tmp4_;
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_cursor_wrt_viewport_center (self, _tmp5_, &_tmp6_);
-#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_);
-#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = zoom_state_get_zoom_factor (&_tmp7_);
-#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale_point (&_tmp6_, 1.0 / _tmp8_, &_tmp9_);
-#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	cursor_wrt_center_iso = _tmp9_;
 #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	cursor_wrt_center_iso = _tmp9_;
+#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = viewport_center_iso;
-#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = cursor_wrt_center_iso;
-#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	add_points (&_tmp10_, &_tmp11_, &_tmp12_);
-#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	*result = _tmp12_;
-#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5404 "PhotoPage.c"
+#line 5420 "PhotoPage.c"
 }
 
 
@@ -5412,33 +5428,33 @@ static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* sel
 	gdouble result = 0.0;
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
-#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = interp;
-#line 644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ < 0.03) {
-#line 645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		interp = 0.0;
-#line 5420 "PhotoPage.c"
+#line 5436 "PhotoPage.c"
 	} else {
 		gdouble _tmp1_ = 0.0;
-#line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = interp;
-#line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp1_ > 0.97) {
-#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			interp = 1.0;
-#line 5429 "PhotoPage.c"
+#line 5445 "PhotoPage.c"
 		}
 	}
-#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = interp;
-#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5438 "PhotoPage.c"
+#line 5454 "PhotoPage.c"
 }
 
 
@@ -5448,21 +5464,21 @@ static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* s
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
 	gdouble _tmp3_ = 0.0;
-#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = zoom_state_get_interpolation_factor (&_tmp0_);
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = adjustment;
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_snap_interpolation_factor (self, _tmp1_ + _tmp2_);
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp3_;
-#line 653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5462 "PhotoPage.c"
+#line 5478 "PhotoPage.c"
 }
 
 
@@ -5497,127 +5513,127 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 	ZoomState _tmp21_ = {0};
 	GdkPoint _tmp22_ = {0};
 	ZoomState _tmp23_ = {0};
-#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
-#line 657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5507 "PhotoPage.c"
+#line 5523 "PhotoPage.c"
 	}
-#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_cursor_wrt_viewport_center (self, _tmp1_, &_tmp2_);
-#line 660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_viewport_center = _tmp2_;
-#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = event;
-#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_get_iso_pixel_under_cursor (self, _tmp3_, &_tmp4_);
-#line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	iso_pixel_under_cursor = _tmp4_;
-#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = zoom_increment;
-#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_adjust_interpolation_factor (self, _tmp5_);
-#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	interp = _tmp6_;
-#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->zoom_slider;
-#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
-#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = self->priv->zoom_slider;
-#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = interp;
-#line 665 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp10_);
-#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = self->priv->zoom_slider;
-#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp12_);
-#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = interp;
-#line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_rescale (&new_zoom_state, &_tmp12_, _tmp13_);
-#line 670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = zoom_state_is_min (&new_zoom_state);
-#line 670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_update_cursor_for_zoom_context (self);
-#line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5561 "PhotoPage.c"
+#line 5577 "PhotoPage.c"
 	}
-#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = iso_pixel_under_cursor;
-#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = zoom_state_get_zoom_factor (&new_zoom_state);
-#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale_point (&_tmp15_, _tmp16_, &_tmp17_);
-#line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_zoomed_old_cursor = _tmp17_;
-#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = new_zoomed_old_cursor;
-#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = cursor_wrt_viewport_center;
-#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	subtract_points (&_tmp18_, &_tmp19_, &_tmp20_);
-#line 679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	desired_new_viewport_center = _tmp20_;
 #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	desired_new_viewport_center = _tmp20_;
+#line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = new_zoom_state;
-#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = desired_new_viewport_center;
-#line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_pan (&new_zoom_state, &_tmp21_, &_tmp22_);
-#line 684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = new_zoom_state;
-#line 684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_);
-#line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5593 "PhotoPage.c"
+#line 5609 "PhotoPage.c"
 }
 
 
 void editing_host_page_snap_zoom_to_min (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
-#line 690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 5605 "PhotoPage.c"
+#line 5621 "PhotoPage.c"
 }
 
 
 void editing_host_page_snap_zoom_to_max (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
-#line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 5617 "PhotoPage.c"
+#line 5633 "PhotoPage.c"
 }
 
 
@@ -5626,19 +5642,19 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
 	ZoomState _tmp0_ = {0};
 	GtkScale* _tmp1_ = NULL;
 	gdouble _tmp2_ = 0.0;
-#line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_rescale_to_isomorphic (&iso_state, &_tmp0_);
-#line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_get_interpolation_factor (&iso_state);
-#line 700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 5638 "PhotoPage.c"
+#line 5654 "PhotoPage.c"
 }
 
 
@@ -5649,154 +5665,154 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label4 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label5 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label6 = 0;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp4_label7 = 0;
-#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) {
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5681 "PhotoPage.c"
+#line 5697 "PhotoPage.c"
 			default:
 			{
-#line 708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
-#line 709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5690 "PhotoPage.c"
+#line 5706 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5696 "PhotoPage.c"
+#line 5712 "PhotoPage.c"
 			default:
 			{
-#line 714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
-#line 715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5705 "PhotoPage.c"
+#line 5721 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) {
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5711 "PhotoPage.c"
+#line 5727 "PhotoPage.c"
 			default:
 			{
-#line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100");
-#line 719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5720 "PhotoPage.c"
+#line 5736 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) {
-#line 704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5726 "PhotoPage.c"
+#line 5742 "PhotoPage.c"
 			default:
 			{
-#line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit");
-#line 723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = TRUE;
-#line 723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5735 "PhotoPage.c"
+#line 5751 "PhotoPage.c"
 			}
 		}
 	}
-#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5743 "PhotoPage.c"
+#line 5759 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event) {
-#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event);
-#line 5752 "PhotoPage.c"
+#line 5768 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_increase_size (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 730 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 5765 "PhotoPage.c"
+#line 5781 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_increase_size (EditingHostPage* self) {
-#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 5774 "PhotoPage.c"
+#line 5790 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_decrease_size (EditingHostPage* self) {
 	GtkScale* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 5787 "PhotoPage.c"
+#line 5803 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_decrease_size (EditingHostPage* self) {
-#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5796 "PhotoPage.c"
+#line 5812 "PhotoPage.c"
 }
 
 
@@ -5804,17 +5820,17 @@ static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) {
 	EditingHostPage * self;
 	GtkScale* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
-#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
-#line 739 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->saved_slider_val = _tmp1_;
-#line 5814 "PhotoPage.c"
+#line 5830 "PhotoPage.c"
 }
 
 
@@ -5823,17 +5839,17 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base
 	ZoomBuffer* result = NULL;
 	ZoomBuffer* _tmp0_ = NULL;
 	ZoomBuffer* _tmp1_ = NULL;
-#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_buffer;
-#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5833 "PhotoPage.c"
+#line 5849 "PhotoPage.c"
 }
 
 
@@ -5844,47 +5860,47 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 	ZoomState _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	GdkEventScroll* _tmp5_ = NULL;
-#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5856 "PhotoPage.c"
+#line 5872 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->zoom_slider;
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5866 "PhotoPage.c"
+#line 5882 "PhotoPage.c"
 	}
-#line 747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5874 "PhotoPage.c"
+#line 5890 "PhotoPage.c"
 	}
-#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5884 "PhotoPage.c"
+#line 5900 "PhotoPage.c"
 }
 
 
@@ -5895,47 +5911,47 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 	ZoomState _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
 	GdkEventScroll* _tmp5_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_is_min (&_tmp1_);
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5907 "PhotoPage.c"
+#line 5923 "PhotoPage.c"
 	} else {
 		GtkScale* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->zoom_slider;
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 5917 "PhotoPage.c"
+#line 5933 "PhotoPage.c"
 	}
-#line 755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5925 "PhotoPage.c"
+#line 5941 "PhotoPage.c"
 	}
-#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5935 "PhotoPage.c"
+#line 5951 "PhotoPage.c"
 }
 
 
@@ -5946,40 +5962,40 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
 	GtkScale* _tmp2_ = NULL;
 	gdouble _tmp3_ = 0.0;
 	GtkScale* _tmp4_ = NULL;
-#line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE);
-#line 765 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 769 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->zoom_slider;
-#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 769 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->saved_slider_val;
-#line 766 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 769 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), _tmp3_);
-#line 767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->zoom_slider;
-#line 767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 5966 "PhotoPage.c"
+#line 5982 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base) {
 	EditingHostPage * self;
 	gboolean result = FALSE;
-#line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5979 "PhotoPage.c"
+#line 5995 "PhotoPage.c"
 }
 
 
@@ -5987,27 +6003,27 @@ static void editing_host_page_real_set_container (Page* base, GtkWindow* contain
 	EditingHostPage * self;
 	GtkWindow* _tmp0_ = NULL;
 	GtkWindow* _tmp1_ = NULL;
-#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
-#line 775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = container;
-#line 775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (editing_host_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
 #line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	PAGE_CLASS (editing_host_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
+#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = container;
-#line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 5999 "PhotoPage.c"
+#line 6015 "PhotoPage.c"
 		DragAndDropHandler* _tmp2_ = NULL;
-#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_drag_and_drop_handler_unref0 (self->priv->dnd_handler);
-#line 779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->dnd_handler = _tmp2_;
-#line 6007 "PhotoPage.c"
+#line 6023 "PhotoPage.c"
 	}
 }
 
@@ -6016,17 +6032,17 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
 	ViewCollection* result = NULL;
 	ViewCollection* _tmp0_ = NULL;
 	ViewCollection* _tmp1_ = NULL;
-#line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->parent_view;
-#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _data_collection_ref0 (_tmp0_);
-#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6026 "PhotoPage.c"
+#line 6042 "PhotoPage.c"
 }
 
 
@@ -6035,21 +6051,21 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) {
 	Photo* _tmp0_ = NULL;
 	Photo* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 789 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_ != NULL;
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6049 "PhotoPage.c"
+#line 6065 "PhotoPage.c"
 }
 
 
@@ -6068,57 +6084,57 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 	DataView* _tmp10_ = NULL;
 	DataSource* _tmp11_ = NULL;
 	Photo* _tmp12_ = NULL;
-#line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ == 0;
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 6086 "PhotoPage.c"
+#line 6102 "PhotoPage.c"
 	}
-#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = view_collection_get_selected_count (_tmp5_);
-#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp6_ == 1, "get_view().get_selected_count() == 1");
-#line 797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = view_collection_get_selected_at (_tmp8_, 0);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = data_view_get_source (_tmp10_);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp12_;
-#line 798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6118 "PhotoPage.c"
+#line 6134 "PhotoPage.c"
 }
 
 
@@ -6126,50 +6142,50 @@ static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo*
 	Photo* _tmp0_ = NULL;
 	PhotoFileFormat _tmp1_ = 0;
 	gboolean _tmp6_ = FALSE;
-#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (IS_PHOTO (new_photo));
 #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (IS_PHOTO (new_photo));
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = new_photo;
-#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo_get_file_format (_tmp0_);
-#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
-#line 806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, FALSE);
-#line 6136 "PhotoPage.c"
+#line 6152 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 		GFile* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = new_photo;
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = g_file_query_exists (_tmp4_, NULL);
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, !_tmp5_);
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6154 "PhotoPage.c"
+#line 6170 "PhotoPage.c"
 	}
-#line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->photo_missing;
-#line 810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_ui (self, _tmp6_);
-#line 6160 "PhotoPage.c"
+#line 6176 "PhotoPage.c"
 }
 
 
 void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo) {
-#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 802 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo);
-#line 6169 "PhotoPage.c"
+#line 6185 "PhotoPage.c"
 }
 
 
@@ -6198,148 +6214,148 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 	ViewCollection* _tmp19_ = NULL;
 	Marker* _tmp20_ = NULL;
 	ViewCollection* _tmp21_ = NULL;
-#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE);
-#line 814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->zoom_slider;
-#line 815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), 0.0);
-#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->zoom_slider;
-#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = photo;
-#line 818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_photo_changing (self, _tmp4_);
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view = _tmp9_;
-#line 820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = view;
-#line 820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_assert (_tmp10_ != NULL, "view != null");
 #line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_vala_assert (_tmp10_ != NULL, "view != null");
+#line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view_collection_unselect_all (_tmp12_);
-#line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp12_);
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = view;
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject));
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	marker = _tmp17_;
-#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = marker;
-#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view_collection_select_marked (_tmp19_, _tmp20_);
-#line 825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp19_);
-#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->parent_view;
-#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_ != NULL) {
-#line 6274 "PhotoPage.c"
+#line 6290 "PhotoPage.c"
 		ViewCollection* _tmp22_ = NULL;
 		DataView* view_in_parent = NULL;
 		ViewCollection* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
 		DataView* _tmp25_ = NULL;
 		DataView* _tmp26_ = NULL;
-#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = self->priv->parent_view;
-#line 830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_unselect_all (_tmp22_);
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = self->priv->parent_view;
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = photo;
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = view_collection_get_view_for_source_filtered (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource));
-#line 831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_in_parent = _tmp25_;
-#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = view_in_parent;
-#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (NULL != _tmp26_) {
-#line 6297 "PhotoPage.c"
+#line 6313 "PhotoPage.c"
 			ViewCollection* _tmp27_ = NULL;
 			ViewCollection* _tmp28_ = NULL;
 			DataView* _tmp29_ = NULL;
 			Marker* _tmp30_ = NULL;
 			Marker* _tmp31_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp27_ = self->priv->parent_view;
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp28_ = self->priv->parent_view;
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp29_ = view_in_parent;
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp30_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp31_ = _tmp30_;
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			view_collection_select_marked (_tmp27_, _tmp31_);
-#line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp31_);
-#line 6317 "PhotoPage.c"
+#line 6333 "PhotoPage.c"
 		}
-#line 829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (view_in_parent);
-#line 6321 "PhotoPage.c"
+#line 6337 "PhotoPage.c"
 	}
-#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (marker);
-#line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (view);
-#line 6327 "PhotoPage.c"
+#line 6343 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_realize (GtkWidget* base) {
 	EditingHostPage * self;
-#line 837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	GTK_WIDGET_CLASS (editing_host_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget));
-#line 840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "realize");
-#line 6339 "PhotoPage.c"
+#line 6355 "PhotoPage.c"
 }
 
 
@@ -6347,42 +6363,42 @@ static void editing_host_page_real_switched_to (Page* base) {
 	EditingHostPage * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
-#line 846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_rebuild_caches (self, "switched_to");
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_rebuild_caches (self, "switched_to");
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6357 "PhotoPage.c"
+#line 6373 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
-#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = self->priv->pixbuf_dirty;
-#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 6363 "PhotoPage.c"
+#line 6379 "PhotoPage.c"
 	} else {
-#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 6367 "PhotoPage.c"
+#line 6383 "PhotoPage.c"
 	}
-#line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6371 "PhotoPage.c"
+#line 6387 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
-#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
-#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_replace_photo (self, _tmp4_);
-#line 850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 6382 "PhotoPage.c"
+#line 6398 "PhotoPage.c"
 	}
 }
 
@@ -6394,37 +6410,37 @@ static void editing_host_page_real_switching_from (Page* base) {
 	gboolean _tmp2_ = FALSE;
 	ViewCollection* _tmp13_ = NULL;
 	ViewCollection* _tmp14_ = NULL;
-#line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
-#line 856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->is_pan_in_progress = FALSE;
-#line 859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 6410 "PhotoPage.c"
+#line 6426 "PhotoPage.c"
 		ViewCollection* _tmp3_ = NULL;
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->parent_view;
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ != NULL;
-#line 6416 "PhotoPage.c"
+#line 6432 "PhotoPage.c"
 	} else {
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6420 "PhotoPage.c"
+#line 6436 "PhotoPage.c"
 	}
-#line 866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6424 "PhotoPage.c"
+#line 6440 "PhotoPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
@@ -6434,54 +6450,54 @@ static void editing_host_page_real_switching_from (Page* base) {
 		DataView* _tmp10_ = NULL;
 		Marker* _tmp11_ = NULL;
 		Marker* _tmp12_ = NULL;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = self->priv->parent_view;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = self->priv->parent_view;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = self->priv->parent_view;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (self);
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource));
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_select_marked (_tmp4_, _tmp12_);
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 6460 "PhotoPage.c"
+#line 6476 "PhotoPage.c"
 	}
-#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
-#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
-#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
-#line 871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp14_);
-#line 6474 "PhotoPage.c"
+#line 6490 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
-#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_selection_changed ((EditingHostPage*) self, selected);
-#line 6481 "PhotoPage.c"
+#line 6497 "PhotoPage.c"
 }
 
 
@@ -6493,51 +6509,51 @@ static void editing_host_page_real_switching_to_fullscreen (Page* base, Fullscre
 	FullscreenWindow* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
 	Page* _tmp4_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = fsw;
-#line 875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->switching_to_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
-#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
-#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
-#line 879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->is_pan_in_progress = FALSE;
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = fsw;
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow));
-#line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page = _tmp3_;
-#line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page;
-#line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 6519 "PhotoPage.c"
+#line 6535 "PhotoPage.c"
 		Page* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page;
-#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = page_get_view (_tmp5_);
-#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_connect_object (_tmp7_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0);
-#line 884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6533 "PhotoPage.c"
+#line 6549 "PhotoPage.c"
 	}
-#line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6537 "PhotoPage.c"
+#line 6553 "PhotoPage.c"
 }
 
 
@@ -6548,107 +6564,107 @@ static void editing_host_page_real_returning_from_fullscreen (Page* base, Fullsc
 	FullscreenWindow* _tmp1_ = NULL;
 	Page* _tmp2_ = NULL;
 	Page* _tmp3_ = NULL;
-#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
-#line 888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = fsw;
-#line 888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->returning_from_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
-#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = fsw;
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow));
-#line 892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page = _tmp2_;
-#line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = page;
-#line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 6568 "PhotoPage.c"
+#line 6584 "PhotoPage.c"
 		Page* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		guint _tmp7_ = 0U;
-#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page;
-#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_view (_tmp4_);
-#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_parse_name ("items-selected", TYPE_VIEW_COLLECTION, &_tmp7_, NULL, FALSE);
-#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self);
-#line 894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp6_);
-#line 6585 "PhotoPage.c"
+#line 6601 "PhotoPage.c"
 	}
-#line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6589 "PhotoPage.c"
+#line 6605 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIterable* selected) {
-#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (selected));
-#line 6598 "PhotoPage.c"
+#line 6614 "PhotoPage.c"
 	{
 		GeeIterator* _view_it = NULL;
 		GeeIterable* _tmp0_ = NULL;
 		GeeIterator* _tmp1_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = selected;
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = gee_iterable_iterator (_tmp0_);
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_view_it = _tmp1_;
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 6611 "PhotoPage.c"
+#line 6627 "PhotoPage.c"
 			gboolean _tmp2_ = FALSE;
 			DataView* view = NULL;
 			gpointer _tmp3_ = NULL;
 			DataView* _tmp4_ = NULL;
 			DataSource* _tmp5_ = NULL;
 			Photo* _tmp6_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = gee_iterator_next (_view_it);
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp2_) {
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 6624 "PhotoPage.c"
+#line 6640 "PhotoPage.c"
 			}
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = gee_iterator_get (_view_it);
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			view = (DataView*) _tmp3_;
-#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = view;
-#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = data_view_get_source (_tmp4_);
-#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo);
-#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_replace_photo (self, _tmp6_);
-#line 899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp6_);
-#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (view);
-#line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 6644 "PhotoPage.c"
+#line 6660 "PhotoPage.c"
 		}
-#line 898 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_view_it);
-#line 6648 "PhotoPage.c"
+#line 6664 "PhotoPage.c"
 	}
 }
 
@@ -6656,31 +6672,31 @@ static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIt
 void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable) {
 	GtkToolButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->rotate_button;
-#line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = should_enable;
-#line 905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 6664 "PhotoPage.c"
+#line 6680 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) {
-#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err);
-#line 6671 "PhotoPage.c"
+#line 6687 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo, gpointer self) {
 	gboolean result;
 	result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo);
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6680 "PhotoPage.c"
+#line 6696 "PhotoPage.c"
 }
 
 
@@ -6701,118 +6717,118 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	Scaling _tmp19_ = {0};
 	PixbufCache* _tmp20_ = NULL;
 	const gchar* _tmp21_ = NULL;
-#line 911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (caller != NULL);
-#line 912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaling = _tmp0_;
 #line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	scaling = _tmp0_;
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->cache;
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 6713 "PhotoPage.c"
+#line 6729 "PhotoPage.c"
 		PixbufCache* _tmp3_ = NULL;
 		Scaling _tmp4_ = {0};
 		Scaling _tmp5_ = {0};
 		gboolean _tmp6_ = FALSE;
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->cache;
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_get_scaling (_tmp3_, &_tmp4_);
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = scaling;
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = scaling_equals (&_tmp4_, &_tmp5_);
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp6_;
-#line 6728 "PhotoPage.c"
+#line 6744 "PhotoPage.c"
 	} else {
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6732 "PhotoPage.c"
+#line 6748 "PhotoPage.c"
 	}
-#line 915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6738 "PhotoPage.c"
+#line 6754 "PhotoPage.c"
 	}
-#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = caller;
-#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = scaling_to_string (&scaling);
-#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_debug ("PhotoPage.vala:918: Rebuild pixbuf caches: %s (%s)", _tmp7_, _tmp9_);
-#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_debug ("PhotoPage.vala:921: Rebuild pixbuf caches: %s (%s)", _tmp7_, _tmp9_);
+#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp9_);
-#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = self->priv->cache;
-#line 922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ != NULL) {
-#line 6754 "PhotoPage.c"
+#line 6770 "PhotoPage.c"
 		PixbufCache* _tmp11_ = NULL;
 		guint _tmp12_ = 0U;
 		PixbufCache* _tmp13_ = NULL;
-#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = self->priv->cache;
-#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_parse_name ("fetched", TYPE_PIXBUF_CACHE, &_tmp12_, NULL, FALSE);
-#line 923 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self);
-#line 924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = self->priv->cache;
-#line 924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_cancel_all (_tmp13_);
-#line 6768 "PhotoPage.c"
+#line 6784 "PhotoPage.c"
 	}
-#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = self->priv->sources;
-#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = scaling;
-#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = pixbuf_cache_new (_tmp14_, PIXBUF_CACHE_PHOTO_TYPE_BASELINE, &_tmp15_, EDITING_HOST_PAGE_PIXBUF_CACHE_COUNT, NULL, NULL);
-#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cache);
-#line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->cache = _tmp16_;
-#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = self->priv->cache;
-#line 928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp17_, "fetched", (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self, 0);
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->sources;
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = scaling;
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = pixbuf_cache_new (_tmp18_, PIXBUF_CACHE_PHOTO_TYPE_MASTER, &_tmp19_, EDITING_HOST_PAGE_ORIGINAL_PIXBUF_CACHE_COUNT, _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter, self);
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->master_cache);
-#line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->master_cache = _tmp20_;
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->master_cache = _tmp20_;
+#line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = caller;
-#line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, _tmp21_);
-#line 6798 "PhotoPage.c"
+#line 6814 "PhotoPage.c"
 }
 
 
 static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar* caller) {
 	gboolean _tmp0_ = FALSE;
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (caller != NULL);
-#line 938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6812 "PhotoPage.c"
+#line 6828 "PhotoPage.c"
 		const gchar* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
@@ -6822,45 +6838,45 @@ static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar
 		ViewCollection* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Photo* _tmp9_ = NULL;
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = caller;
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (self);
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_debug ("PhotoPage.vala:939: Refresh pixbuf caches (%s): prefetching neighbors " \
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_debug ("PhotoPage.vala:942: Refresh pixbuf caches (%s): prefetching neighbors " \
 "of %s", _tmp1_, _tmp5_);
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp5_);
-#line 939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_host_page_get_photo (self);
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp8_;
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_prefetch_neighbors (self, _tmp7_, _tmp9_);
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 6852 "PhotoPage.c"
+#line 6868 "PhotoPage.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = caller;
-#line 943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_debug ("PhotoPage.vala:943: Refresh pixbuf caches (%s): (no photo)", _tmp10_);
-#line 6859 "PhotoPage.c"
+#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_debug ("PhotoPage.vala:946: Refresh pixbuf caches (%s): (no photo)", _tmp10_);
+#line 6875 "PhotoPage.c"
 	}
 }
 
@@ -6870,35 +6886,35 @@ static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Ph
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo_has_transformations (_tmp1_);
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 6881 "PhotoPage.c"
+#line 6897 "PhotoPage.c"
 	} else {
 		Photo* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = photo;
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = photo_has_editable (_tmp3_);
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_;
-#line 6891 "PhotoPage.c"
+#line 6907 "PhotoPage.c"
 	}
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_;
-#line 948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6897 "PhotoPage.c"
+#line 6913 "PhotoPage.c"
 }
 
 
@@ -6910,35 +6926,35 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 	gboolean _tmp4_ = FALSE;
 	GdkPixbuf* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf));
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = photo;
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource));
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6931 "PhotoPage.c"
+#line 6947 "PhotoPage.c"
 	}
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = pixbuf;
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 6937 "PhotoPage.c"
+#line 6953 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 		ZoomBuffer* _tmp7_ = NULL;
 		Dimensions max_dim = {0};
@@ -6948,62 +6964,62 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 		GdkPixbuf* _tmp31_ = NULL;
 		Dimensions _tmp32_ = {0};
 		Photo* _tmp33_ = NULL;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = self->priv->zoom_buffer;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp7_ != NULL) {
-#line 6951 "PhotoPage.c"
+#line 6967 "PhotoPage.c"
 			ZoomBuffer* _tmp8_ = NULL;
 			Photo* _tmp9_ = NULL;
 			Photo* _tmp10_ = NULL;
 			Photo* _tmp11_ = NULL;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = self->priv->zoom_buffer;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = zoom_buffer_get_backing_photo (_tmp8_);
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _tmp9_;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = photo;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = _tmp10_ == _tmp11_;
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp10_);
-#line 6968 "PhotoPage.c"
+#line 6984 "PhotoPage.c"
 		} else {
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 6972 "PhotoPage.c"
+#line 6988 "PhotoPage.c"
 		}
-#line 958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 6976 "PhotoPage.c"
+#line 6992 "PhotoPage.c"
 			Photo* _tmp12_ = NULL;
 			GdkPixbuf* _tmp13_ = NULL;
 			ZoomBuffer* _tmp14_ = NULL;
-#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = photo;
-#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = pixbuf;
-#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, _tmp13_);
-#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (self->priv->zoom_buffer);
-#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			self->priv->zoom_buffer = _tmp14_;
-#line 6990 "PhotoPage.c"
+#line 7006 "PhotoPage.c"
 		}
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = photo;
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp16_);
-#line 963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		max_dim = _tmp16_;
-#line 964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = self->priv->current_tool;
-#line 964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_ != NULL) {
-#line 7002 "PhotoPage.c"
+#line 7018 "PhotoPage.c"
 			{
 				Dimensions tool_pixbuf_dim = {0};
 				GdkPixbuf* tool_pixbuf = NULL;
@@ -7013,46 +7029,46 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				Dimensions _tmp21_ = {0};
 				GdkPixbuf* _tmp22_ = NULL;
 				GdkPixbuf* _tmp23_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp18_ = self->priv->current_tool;
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp19_);
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp20_ = photo;
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp22_ = editing_tools_editing_tool_get_display_pixbuf (_tmp18_, &_tmp19_, _tmp20_, &_tmp21_, &_inner_error_);
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				tool_pixbuf_dim = _tmp21_;
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				tool_pixbuf = _tmp22_;
-#line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7026 "PhotoPage.c"
-					goto __catch243_g_error;
+#line 7042 "PhotoPage.c"
+					goto __catch244_g_error;
 				}
-#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp23_ = tool_pixbuf;
-#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp23_ != NULL) {
-#line 7033 "PhotoPage.c"
+#line 7049 "PhotoPage.c"
 					GdkPixbuf* _tmp24_ = NULL;
 					Dimensions _tmp25_ = {0};
-#line 971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					_tmp24_ = tool_pixbuf;
-#line 971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					pixbuf = _tmp24_;
-#line 972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					_tmp25_ = tool_pixbuf_dim;
-#line 972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					max_dim = _tmp25_;
-#line 7044 "PhotoPage.c"
+#line 7060 "PhotoPage.c"
 				}
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (tool_pixbuf);
-#line 7048 "PhotoPage.c"
+#line 7064 "PhotoPage.c"
 			}
-			goto __finally243;
-			__catch243_g_error:
+			goto __finally244;
+			__catch244_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp26_ = NULL;
@@ -7060,72 +7076,72 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				gchar* _tmp28_ = NULL;
 				GError* _tmp29_ = NULL;
 				const gchar* _tmp30_ = NULL;
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				err = _inner_error_;
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_inner_error_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp26_ = photo;
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_OBJECT, DataObject));
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp28_ = _tmp27_;
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp29_ = err;
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp30_ = _tmp29_->message;
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				g_warning ("PhotoPage.vala:975: Unable to fetch tool pixbuf for %s: %s", _tmp28_, _tmp30_);
-#line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				g_warning ("PhotoPage.vala:978: Unable to fetch tool pixbuf for %s: %s", _tmp28_, _tmp30_);
+#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_free0 (_tmp28_);
-#line 976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				editing_host_page_set_photo_missing (self, TRUE);
-#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_error_free0 (err);
-#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7083 "PhotoPage.c"
+#line 7099 "PhotoPage.c"
 			}
-			__finally243:
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			__finally244:
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_clear_error (&_inner_error_);
-#line 965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7094 "PhotoPage.c"
+#line 7110 "PhotoPage.c"
 			}
 		}
-#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = pixbuf;
-#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = max_dim;
-#line 982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp31_, &_tmp32_, NULL);
-#line 983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = photo;
-#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 7109 "PhotoPage.c"
+#line 7125 "PhotoPage.c"
 	} else {
 		GError* _tmp34_ = NULL;
-#line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = err;
-#line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp34_ != NULL) {
-#line 7116 "PhotoPage.c"
+#line 7132 "PhotoPage.c"
 			Photo* _tmp35_ = NULL;
-#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			editing_host_page_set_photo_missing (self, TRUE);
 #line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			editing_host_page_set_photo_missing (self, TRUE);
+#line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp35_ = photo;
-#line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 7124 "PhotoPage.c"
+#line 7140 "PhotoPage.c"
 		}
 	}
 }
@@ -7157,73 +7173,73 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 	PixbufCachePixbufCacheBatch* _tmp40_ = NULL;
 	PixbufCache* _tmp41_ = NULL;
 	PixbufCachePixbufCacheBatch* _tmp42_ = NULL;
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (controller));
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = pixbuf_cache_pixbuf_cache_batch_new ();
-#line 997 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	normal_batch = _tmp0_;
-#line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = pixbuf_cache_pixbuf_cache_batch_new ();
-#line 998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	master_batch = _tmp1_;
-#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = normal_batch;
-#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo;
-#line 1000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_HIGHEST), _tmp3_);
-#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = master_batch;
-#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = photo;
-#line 1001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOW), _tmp5_);
 #line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOW), _tmp5_);
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = controller;
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = view_collection_get_immediate_neighbors (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource), &_tmp8_, &_tmp9_, PHOTO_TYPENAME);
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next_source);
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next_source = _tmp8_;
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (prev_source);
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	prev_source = _tmp9_;
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp10_) {
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (prev_source);
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (next_source);
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (master_batch);
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (normal_batch);
-#line 1005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 7208 "PhotoPage.c"
+#line 7224 "PhotoPage.c"
 	}
-#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = next_source;
-#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo));
-#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next = _tmp12_;
-#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = prev_source;
-#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo));
-#line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	prev = _tmp14_;
-#line 7222 "PhotoPage.c"
+#line 7238 "PhotoPage.c"
 	{
 		GeeIterator* _neighbor_source_it = NULL;
 		ViewCollection* _tmp15_ = NULL;
@@ -7232,25 +7248,25 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		GeeSet* _tmp18_ = NULL;
 		GeeIterator* _tmp19_ = NULL;
 		GeeIterator* _tmp20_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = controller;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = photo;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = view_collection_get_extended_neighbors (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_neighbor_source_it = _tmp20_;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7249 "PhotoPage.c"
+#line 7265 "PhotoPage.c"
 			GeeIterator* _tmp21_ = NULL;
 			gboolean _tmp22_ = FALSE;
 			DataSource* neighbor_source = NULL;
@@ -7269,110 +7285,110 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 			Photo* _tmp36_ = NULL;
 			PixbufCachePixbufCacheBatch* _tmp37_ = NULL;
 			Photo* _tmp38_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = _neighbor_source_it;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = gee_iterator_next (_tmp21_);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp22_) {
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7276 "PhotoPage.c"
+#line 7292 "PhotoPage.c"
 			}
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = _neighbor_source_it;
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = gee_iterator_get (_tmp23_);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			neighbor_source = (DataSource*) _tmp24_;
-#line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = neighbor_source;
-#line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
-#line 1012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			neighbor = _tmp26_;
-#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			priority = BACKGROUND_JOB_JOB_PRIORITY_NORMAL;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp28_ = neighbor;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp29_ = next;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp30_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_SOURCE, DataSource));
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp30_) {
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = TRUE;
-#line 7302 "PhotoPage.c"
+#line 7318 "PhotoPage.c"
 			} else {
 				Photo* _tmp31_ = NULL;
 				Photo* _tmp32_ = NULL;
 				gboolean _tmp33_ = FALSE;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp31_ = neighbor;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp32_ = prev;
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp33_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_SOURCE, DataSource));
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp27_ = _tmp33_;
-#line 7315 "PhotoPage.c"
+#line 7331 "PhotoPage.c"
 			}
-#line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp27_) {
-#line 1016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH;
-#line 7321 "PhotoPage.c"
+#line 7337 "PhotoPage.c"
 			}
-#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp34_ = normal_batch;
-#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp35_ = priority;
-#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp36_ = neighbor;
-#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp35_), _tmp36_);
-#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp37_ = master_batch;
-#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp38_ = neighbor;
-#line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOWEST), _tmp38_);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor);
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor_source);
-#line 7341 "PhotoPage.c"
+#line 7357 "PhotoPage.c"
 		}
-#line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_neighbor_source_it);
-#line 7345 "PhotoPage.c"
+#line 7361 "PhotoPage.c"
 	}
-#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = self->priv->cache;
-#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp40_ = normal_batch;
-#line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf_cache_prefetch_batch (_tmp39_, _tmp40_, FALSE);
-#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp41_ = self->priv->master_cache;
-#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp42_ = master_batch;
-#line 1023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf_cache_prefetch_batch (_tmp41_, _tmp42_, FALSE);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (prev);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (prev_source);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next_source);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (master_batch);
-#line 996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (normal_batch);
-#line 7371 "PhotoPage.c"
+#line 7387 "PhotoPage.c"
 }
 
 
@@ -7389,46 +7405,46 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 	GeeSet* _tmp24_ = NULL;
 	Photo* _tmp25_ = NULL;
 	gboolean _tmp26_ = FALSE;
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (old_controller));
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (old_photo));
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (new_controller));
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
-#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = old_controller;
-#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = old_photo;
-#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_extended_neighbors (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
-#line 1030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	old_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet);
-#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = new_controller;
-#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = new_photo;
-#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = view_collection_get_extended_neighbors (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
-#line 1032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet);
-#line 7414 "PhotoPage.c"
+#line 7430 "PhotoPage.c"
 	{
 		GeeIterator* _old_neighbor_it = NULL;
 		GeeSet* _tmp6_ = NULL;
 		GeeIterator* _tmp7_ = NULL;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = old_neighbors;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_old_neighbor_it = _tmp7_;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7427 "PhotoPage.c"
+#line 7443 "PhotoPage.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			Photo* old_neighbor = NULL;
@@ -7438,129 +7454,129 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 			GeeSet* _tmp13_ = NULL;
 			Photo* _tmp14_ = NULL;
 			gboolean _tmp15_ = FALSE;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _old_neighbor_it;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = gee_iterator_next (_tmp8_);
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp9_) {
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7445 "PhotoPage.c"
+#line 7461 "PhotoPage.c"
 			}
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _old_neighbor_it;
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = gee_iterator_get (_tmp10_);
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			old_neighbor = (Photo*) _tmp11_;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			old_neighbor = (Photo*) _tmp11_;
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = new_neighbors;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = old_neighbor;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_);
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp15_) {
-#line 7461 "PhotoPage.c"
+#line 7477 "PhotoPage.c"
 				Photo* _tmp16_ = NULL;
 				Photo* _tmp17_ = NULL;
 				gboolean _tmp18_ = FALSE;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp16_ = new_photo;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp17_ = old_neighbor;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource));
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = !_tmp18_;
-#line 7473 "PhotoPage.c"
+#line 7489 "PhotoPage.c"
 			} else {
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = FALSE;
-#line 7477 "PhotoPage.c"
+#line 7493 "PhotoPage.c"
 			}
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp12_) {
-#line 7481 "PhotoPage.c"
+#line 7497 "PhotoPage.c"
 				PixbufCache* _tmp19_ = NULL;
 				Photo* _tmp20_ = NULL;
 				PixbufCache* _tmp21_ = NULL;
 				Photo* _tmp22_ = NULL;
-#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp19_ = self->priv->cache;
-#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp20_ = old_neighbor;
-#line 1039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				pixbuf_cache_drop (_tmp19_, _tmp20_);
-#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp21_ = self->priv->master_cache;
-#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp22_ = old_neighbor;
-#line 1040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				pixbuf_cache_drop (_tmp21_, _tmp22_);
-#line 7498 "PhotoPage.c"
+#line 7514 "PhotoPage.c"
 			}
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (old_neighbor);
-#line 7502 "PhotoPage.c"
+#line 7518 "PhotoPage.c"
 		}
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_old_neighbor_it);
-#line 7506 "PhotoPage.c"
+#line 7522 "PhotoPage.c"
 	}
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = new_neighbors;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = old_photo;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 7516 "PhotoPage.c"
+#line 7532 "PhotoPage.c"
 		Photo* _tmp27_ = NULL;
 		Photo* _tmp28_ = NULL;
 		gboolean _tmp29_ = FALSE;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = new_photo;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = old_photo;
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource));
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = !_tmp29_;
-#line 7528 "PhotoPage.c"
+#line 7544 "PhotoPage.c"
 	} else {
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = FALSE;
-#line 7532 "PhotoPage.c"
+#line 7548 "PhotoPage.c"
 	}
-#line 1045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp23_) {
-#line 7536 "PhotoPage.c"
+#line 7552 "PhotoPage.c"
 		PixbufCache* _tmp30_ = NULL;
 		Photo* _tmp31_ = NULL;
 		PixbufCache* _tmp32_ = NULL;
 		Photo* _tmp33_ = NULL;
-#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = self->priv->cache;
-#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = old_photo;
-#line 1046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_drop (_tmp30_, _tmp31_);
-#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = self->priv->master_cache;
-#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = old_photo;
-#line 1047 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_drop (_tmp32_, _tmp33_);
-#line 7553 "PhotoPage.c"
+#line 7569 "PhotoPage.c"
 	}
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_neighbors);
-#line 1028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_neighbors);
-#line 7559 "PhotoPage.c"
+#line 7575 "PhotoPage.c"
 }
 
 
@@ -7568,61 +7584,61 @@ static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self
 	DataView* result = NULL;
 	DataSource* _tmp0_ = NULL;
 	PhotoView* _tmp1_ = NULL;
-#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = source;
-#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
-#line 1052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7577 "PhotoPage.c"
+#line 7593 "PhotoPage.c"
 }
 
 
 DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource* source) {
-#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source);
-#line 7586 "PhotoPage.c"
+#line 7602 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
-#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = source;
-#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE);
-#line 1056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7603 "PhotoPage.c"
+#line 7619 "PhotoPage.c"
 }
 
 
 static DataView* _editing_host_page_create_photo_view_create_view (DataSource* source, gpointer self) {
 	DataView* result;
 	result = editing_host_page_create_photo_view ((EditingHostPage*) self, source);
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7612 "PhotoPage.c"
+#line 7628 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* source, gpointer self) {
 	gboolean result;
 	result = editing_host_page_is_photo ((EditingHostPage*) self, source);
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7621 "PhotoPage.c"
+#line 7637 "PhotoPage.c"
 }
 
 
@@ -7637,54 +7653,54 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 	ViewCollection* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
 	Photo* _tmp18_ = NULL;
-#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (controller));
-#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (starting_photo));
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = controller;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = starting_photo;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null");
-#line 1060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = controller;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp5_ != _tmp7_;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7666 "PhotoPage.c"
+#line 7682 "PhotoPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = controller;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = self->priv->parent_view;
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7675 "PhotoPage.c"
+#line 7691 "PhotoPage.c"
 	} else {
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7679 "PhotoPage.c"
+#line 7695 "PhotoPage.c"
 	}
-#line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7683 "PhotoPage.c"
+#line 7699 "PhotoPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
@@ -7692,39 +7708,39 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 		ViewCollection* _tmp15_ = NULL;
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = controller;
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_copy_into (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self);
-#line 1064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = controller;
-#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _data_collection_ref0 (_tmp16_);
-#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (self->priv->parent_view);
-#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7717 "PhotoPage.c"
+#line 7733 "PhotoPage.c"
 	}
-#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
-#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7723 "PhotoPage.c"
+#line 7739 "PhotoPage.c"
 }
 
 
@@ -7739,54 +7755,54 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 	ViewCollection* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
 	Photo* _tmp18_ = NULL;
-#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_VIEW_COLLECTION (controller));
-#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (starting_photo));
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = controller;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = starting_photo;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null");
-#line 1072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = controller;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp5_ != _tmp7_;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp7_);
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 7768 "PhotoPage.c"
+#line 7784 "PhotoPage.c"
 		ViewCollection* _tmp9_ = NULL;
 		ViewCollection* _tmp10_ = NULL;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = controller;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = self->priv->parent_view;
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7777 "PhotoPage.c"
+#line 7793 "PhotoPage.c"
 	} else {
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 7781 "PhotoPage.c"
+#line 7797 "PhotoPage.c"
 	}
-#line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 7785 "PhotoPage.c"
+#line 7801 "PhotoPage.c"
 		ViewCollection* _tmp11_ = NULL;
 		ViewCollection* _tmp12_ = NULL;
 		ViewCollection* _tmp13_ = NULL;
@@ -7794,39 +7810,39 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 		ViewCollection* _tmp15_ = NULL;
 		ViewCollection* _tmp16_ = NULL;
 		ViewCollection* _tmp17_ = NULL;
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp12_);
-#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = controller;
-#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		view_collection_mirror (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self);
-#line 1076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = controller;
-#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _data_collection_ref0 (_tmp16_);
-#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (self->priv->parent_view);
-#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->parent_view = _tmp17_;
-#line 7819 "PhotoPage.c"
+#line 7835 "PhotoPage.c"
 	}
-#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = starting_photo;
-#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_replace_photo (self, _tmp18_);
-#line 7825 "PhotoPage.c"
+#line 7841 "PhotoPage.c"
 }
 
 
@@ -7841,68 +7857,68 @@ static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean mi
 	GtkToolButton* _tmp6_ = NULL;
 	GtkScale* _tmp7_ = NULL;
 	Dimensions _tmp8_ = {0};
-#line 1084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 1084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	sensitivity = !_tmp0_;
-#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->rotate_button;
-#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->crop_button;
-#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->straighten_button;
-#line 1088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->redeye_button;
-#line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = self->priv->adjust_button;
-#line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->enhance_button;
-#line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->zoom_slider;
-#line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), sensitivity);
-#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp8_, 0, 0);
-#line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE);
-#line 7876 "PhotoPage.c"
+#line 7892 "PhotoPage.c"
 }
 
 
 void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) {
-#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing);
-#line 7885 "PhotoPage.c"
+#line 7901 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
-#line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 7892 "PhotoPage.c"
+#line 7908 "PhotoPage.c"
 }
 
 
 void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
-#line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing);
-#line 7901 "PhotoPage.c"
+#line 7917 "PhotoPage.c"
 }
 
 
@@ -7932,91 +7948,91 @@ static void editing_host_page_draw_message (EditingHostPage* self, const gchar*
 	PangoLayout* _tmp18_ = NULL;
 	gint _tmp19_ = 0;
 	gint _tmp20_ = 0;
-#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (message != NULL);
-#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = message;
-#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 1103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pango_layout = _tmp1_;
-#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = pango_layout;
-#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pango_layout_get_pixel_size (_tmp2_, &_tmp3_, &_tmp4_);
-#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	text_width = _tmp3_;
-#line 1105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	text_height = _tmp4_;
 #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	text_height = _tmp4_;
+#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp5_);
-#line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	allocation = _tmp5_;
-#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = allocation;
-#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_.width;
-#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = text_width;
-#line 1110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = _tmp7_ - _tmp8_;
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = x;
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ > 0) {
-#line 7965 "PhotoPage.c"
+#line 7981 "PhotoPage.c"
 		gint _tmp11_ = 0;
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = x;
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp11_ / 2;
-#line 7971 "PhotoPage.c"
+#line 7987 "PhotoPage.c"
 	} else {
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = 0;
-#line 7975 "PhotoPage.c"
+#line 7991 "PhotoPage.c"
 	}
-#line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = _tmp9_;
-#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = allocation;
-#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_.height;
-#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = text_height;
-#line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = _tmp13_ - _tmp14_;
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = y;
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_ > 0) {
-#line 7991 "PhotoPage.c"
+#line 8007 "PhotoPage.c"
 		gint _tmp17_ = 0;
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = y;
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp17_ / 2;
-#line 7997 "PhotoPage.c"
+#line 8013 "PhotoPage.c"
 	} else {
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = 0;
-#line 8001 "PhotoPage.c"
+#line 8017 "PhotoPage.c"
 	}
-#line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = _tmp15_;
-#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = pango_layout;
-#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = x;
-#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = y;
-#line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp18_, _tmp19_, _tmp20_);
-#line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pango_layout);
-#line 8015 "PhotoPage.c"
+#line 8031 "PhotoPage.c"
 }
 
 
@@ -8030,45 +8046,45 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = missing;
-#line 1121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == _tmp1_) {
-#line 1122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8039 "PhotoPage.c"
+#line 8055 "PhotoPage.c"
 	}
-#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = missing;
-#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->photo_missing = _tmp2_;
-#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
-#line 1126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp3_;
-#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = photo;
-#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ == NULL) {
-#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8057 "PhotoPage.c"
+#line 8073 "PhotoPage.c"
 	}
-#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = missing;
-#line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_ui (self, _tmp5_);
-#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->photo_missing;
-#line 1132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8067 "PhotoPage.c"
+#line 8083 "PhotoPage.c"
 		{
 			GdkPixbuf* pixbuf = NULL;
 			Photo* _tmp7_ = NULL;
@@ -8083,49 +8099,49 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			GdkPixbuf* _tmp16_ = NULL;
 			Photo* _tmp17_ = NULL;
 			Dimensions _tmp18_ = {0};
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = photo;
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp8_, &_inner_error_);
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp9_;
-#line 1134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8092 "PhotoPage.c"
-				goto __catch244_g_error;
+#line 8108 "PhotoPage.c"
+				goto __catch245_g_error;
 			}
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = pixbuf;
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = pixbuf;
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = gdk_pixbuf_get_width (_tmp11_);
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = pixbuf;
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = gdk_pixbuf_get_height (_tmp13_);
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = gdk_pixbuf_composite_color_simple (_tmp10_, _tmp12_, _tmp14_, GDK_INTERP_NEAREST, 100, 2, (guint32) 0, (guint32) 0);
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			pixbuf = _tmp15_;
 #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			pixbuf = _tmp15_;
+#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp16_ = pixbuf;
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = photo;
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp18_);
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp16_, &_tmp18_, NULL);
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 8121 "PhotoPage.c"
+#line 8137 "PhotoPage.c"
 		}
-		goto __finally244;
-		__catch244_g_error:
+		goto __finally245;
+		__catch245_g_error:
 		{
 			GError* err = NULL;
 			GdkPixbuf* _tmp19_ = NULL;
@@ -8134,87 +8150,87 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			Dimensions _tmp22_ = {0};
 			GError* _tmp23_ = NULL;
 			const gchar* _tmp24_ = NULL;
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			err = _inner_error_;
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_inner_error_ = NULL;
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1);
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = _tmp19_;
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = photo;
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp22_);
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp20_, &_tmp22_, NULL);
-#line 1141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp20_);
-#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = err;
-#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = _tmp23_->message;
-#line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			g_warning ("PhotoPage.vala:1142: %s", _tmp24_);
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			g_warning ("PhotoPage.vala:1145: %s", _tmp24_);
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8157 "PhotoPage.c"
+#line 8173 "PhotoPage.c"
 		}
-		__finally244:
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		__finally245:
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (photo);
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_clear_error (&_inner_error_);
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8170 "PhotoPage.c"
+#line 8186 "PhotoPage.c"
 		}
 	}
-#line 1120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 8175 "PhotoPage.c"
+#line 8191 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_;
-#line 1148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8190 "PhotoPage.c"
+#line 8206 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) {
 	gboolean result = FALSE;
-#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail ((old_photo == NULL) || IS_PHOTO (old_photo), FALSE);
-#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (new_photo), FALSE);
-#line 1152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 1152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8204 "PhotoPage.c"
+#line 8220 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) {
-#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 8213 "PhotoPage.c"
+#line 8229 "PhotoPage.c"
 }
 
 
@@ -8227,121 +8243,121 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 	GdkPixbuf* _tmp3_ = NULL;
 	GdkPixbuf* _tmp11_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (new_photo), NULL);
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->cache;
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = new_photo;
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, _tmp1_);
-#line 1156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = _tmp2_;
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = pixbuf;
-#line 1157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 8242 "PhotoPage.c"
+#line 8258 "PhotoPage.c"
 		{
 			GdkPixbuf* _tmp4_ = NULL;
 			Photo* _tmp5_ = NULL;
 			Scaling _tmp6_ = {0};
 			GdkPixbuf* _tmp7_ = NULL;
 			GdkPixbuf* _tmp8_ = NULL;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = new_photo;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_);
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp6_, &_inner_error_);
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = _tmp7_;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8259 "PhotoPage.c"
-				goto __catch245_g_error;
+#line 8275 "PhotoPage.c"
+				goto __catch246_g_error;
 			}
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _tmp4_;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = NULL;
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp8_;
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp4_);
-#line 8272 "PhotoPage.c"
+#line 8288 "PhotoPage.c"
 		}
-		goto __finally245;
-		__catch245_g_error:
+		goto __finally246;
+		__catch246_g_error:
 		{
 			GError* err = NULL;
 			GError* _tmp9_ = NULL;
 			const gchar* _tmp10_ = NULL;
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			err = _inner_error_;
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_inner_error_ = NULL;
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_inner_error_ = NULL;
+#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = err;
-#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = _tmp9_->message;
+#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			g_warning ("PhotoPage.vala:1164: %s", _tmp10_);
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			g_warning ("PhotoPage.vala:1161: %s", _tmp10_);
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8292 "PhotoPage.c"
+#line 8308 "PhotoPage.c"
 		}
-		__finally245:
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		__finally246:
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_clear_error (&_inner_error_);
-#line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return NULL;
-#line 8305 "PhotoPage.c"
+#line 8321 "PhotoPage.c"
 		}
 	}
-#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = pixbuf;
-#line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 8312 "PhotoPage.c"
+#line 8328 "PhotoPage.c"
 		GdkPixbuf* _tmp12_ = NULL;
 		Scaling _tmp13_ = {0};
 		GdkPixbuf* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
 		GdkPixbuf* _tmp16_ = NULL;
-#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = get_placeholder_pixbuf ();
-#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf = _tmp12_;
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_);
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = pixbuf;
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = scaling_perform_on_pixbuf (&_tmp13_, _tmp14_, GDK_INTERP_NEAREST, TRUE);
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 8334 "PhotoPage.c"
+#line 8350 "PhotoPage.c"
 	}
-#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = pixbuf;
-#line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8340 "PhotoPage.c"
+#line 8356 "PhotoPage.c"
 }
 
 
@@ -8373,240 +8389,240 @@ static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_p
 	GdkPixbuf* _tmp45_ = NULL;
 	GdkPixbuf* _tmp46_ = NULL;
 	ZoomBuffer* _tmp47_ = NULL;
-#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = new_photo;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8390 "PhotoPage.c"
+#line 8406 "PhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = self->priv->pixbuf_dirty;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp7_;
-#line 8396 "PhotoPage.c"
+#line 8412 "PhotoPage.c"
 	} else {
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 8400 "PhotoPage.c"
+#line 8416 "PhotoPage.c"
 	}
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 8404 "PhotoPage.c"
+#line 8420 "PhotoPage.c"
 		gboolean _tmp8_ = FALSE;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = self->priv->photo_missing;
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp8_;
-#line 8410 "PhotoPage.c"
+#line 8426 "PhotoPage.c"
 	} else {
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 8414 "PhotoPage.c"
+#line 8430 "PhotoPage.c"
 	}
-#line 1176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 8418 "PhotoPage.c"
+#line 8434 "PhotoPage.c"
 		Photo* _tmp9_ = NULL;
 		Photo* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
 		ZoomBuffer* _tmp13_ = NULL;
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = new_photo;
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = new_photo;
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = editing_host_page_get_zoom_pixbuf (self, _tmp10_);
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp9_, _tmp12_);
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->zoom_buffer);
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->zoom_buffer = _tmp13_;
-#line 1177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8442 "PhotoPage.c"
+#line 8458 "PhotoPage.c"
 	}
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = editing_host_page_has_photo (self);
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp16_) {
-#line 8448 "PhotoPage.c"
+#line 8464 "PhotoPage.c"
 		Photo* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
 		Photo* _tmp19_ = NULL;
 		gboolean _tmp20_ = FALSE;
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = new_photo;
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = editing_host_page_get_photo (self);
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_SOURCE, DataSource));
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = !_tmp20_;
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 8465 "PhotoPage.c"
+#line 8481 "PhotoPage.c"
 	} else {
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = FALSE;
-#line 8469 "PhotoPage.c"
+#line 8485 "PhotoPage.c"
 	}
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = editing_host_page_confirm_replace_photo != NULL;
-#line 8475 "PhotoPage.c"
+#line 8491 "PhotoPage.c"
 	} else {
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 8479 "PhotoPage.c"
+#line 8495 "PhotoPage.c"
 	}
-#line 1182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_) {
-#line 8483 "PhotoPage.c"
+#line 8499 "PhotoPage.c"
 		Photo* _tmp21_ = NULL;
 		Photo* _tmp22_ = NULL;
 		Photo* _tmp23_ = NULL;
 		gboolean _tmp24_ = FALSE;
 		gboolean _tmp25_ = FALSE;
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = editing_host_page_get_photo (self);
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = new_photo;
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = editing_host_page_confirm_replace_photo (self, _tmp22_, _tmp23_);
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = !_tmp24_;
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp22_);
-#line 1183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp25_) {
-#line 1184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8505 "PhotoPage.c"
+#line 8521 "PhotoPage.c"
 		}
 	}
-#line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp26_, 0, 0);
-#line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp26_, FALSE);
 #line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp26_, FALSE);
+#line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = editing_host_page_get_photo (self);
-#line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	old_photo = _tmp27_;
-#line 1191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = new_photo;
-#line 1191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo (self, _tmp28_);
-#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = new_photo;
-#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
-#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp31_ = _tmp30_;
-#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp31_);
-#line 1192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_free0 (_tmp31_);
 #line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_free0 (_tmp31_);
+#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->swapped);
-#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->swapped = NULL;
 #line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->swapped = NULL;
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp32_ = new_photo;
-#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp34_ = _tmp33_;
-#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = g_file_query_exists (_tmp34_, NULL);
-#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, !_tmp35_);
-#line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp34_);
-#line 1199 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
-#line 1203 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "replace_photo");
-#line 1205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp36_ = old_photo;
-#line 1205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp36_ != NULL) {
-#line 8554 "PhotoPage.c"
+#line 8570 "PhotoPage.c"
 		ViewCollection* _tmp37_ = NULL;
 		ViewCollection* _tmp38_ = NULL;
 		Photo* _tmp39_ = NULL;
 		ViewCollection* _tmp40_ = NULL;
 		ViewCollection* _tmp41_ = NULL;
 		Photo* _tmp42_ = NULL;
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = _tmp37_;
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = old_photo;
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp41_ = _tmp40_;
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp42_ = new_photo;
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_cancel_prefetch_neighbors (self, _tmp38_, _tmp39_, _tmp41_, _tmp42_);
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp41_);
-#line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp38_);
-#line 8579 "PhotoPage.c"
+#line 8595 "PhotoPage.c"
 	}
-#line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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));
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = new_photo;
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp44_ = new_photo;
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp45_ = editing_host_page_get_zoom_pixbuf (self, _tmp44_);
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = _tmp45_;
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp47_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp43_, _tmp46_);
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->zoom_buffer);
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->zoom_buffer = _tmp47_;
-#line 1210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp46_);
-#line 1212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_quick_update_pixbuf (self);
 #line 1215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_quick_update_pixbuf (self);
+#line 1218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "replace_photo");
-#line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_photo);
-#line 8605 "PhotoPage.c"
+#line 8621 "PhotoPage.c"
 }
 
 
@@ -8621,84 +8637,84 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp12_ = FALSE;
 	GtkDrawingArea* _tmp13_ = NULL;
-#line 1218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
-#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp1_, NULL, FALSE);
-#line 1221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
-#line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->zoom_slider;
-#line 1222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), 0.0);
-#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->zoom_slider;
-#line 1223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (self);
-#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_ != NULL;
-#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 1225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8648 "PhotoPage.c"
+#line 8664 "PhotoPage.c"
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
 		Dimensions _tmp10_ = {0};
 		ZoomState _tmp11_ = {0};
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (self);
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_);
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_init (&_tmp11_, &_tmp9_, &_tmp10_, 0.0, NULL);
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_);
-#line 1226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8668 "PhotoPage.c"
+#line 8684 "PhotoPage.c"
 	}
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 8674 "PhotoPage.c"
+#line 8690 "PhotoPage.c"
 		GtkDrawingArea* _tmp14_ = NULL;
 		GdkWindow* _tmp15_ = NULL;
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp15_ != NULL;
-#line 8683 "PhotoPage.c"
+#line 8699 "PhotoPage.c"
 	} else {
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 8687 "PhotoPage.c"
+#line 8703 "PhotoPage.c"
 	}
-#line 1232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 1233 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 8693 "PhotoPage.c"
+#line 8709 "PhotoPage.c"
 	}
-#line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 8697 "PhotoPage.c"
+#line 8713 "PhotoPage.c"
 }
 
 
@@ -8722,76 +8738,76 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	Photo* _tmp29_ = NULL;
 	Photo* _tmp30_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->cache;
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, _tmp2_);
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1239 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = _tmp4_;
-#line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = pixbuf;
-#line 1240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 8741 "PhotoPage.c"
+#line 8757 "PhotoPage.c"
 		GdkPixbuf* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		Dimensions _tmp9_ = {0};
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = pixbuf;
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (self);
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_);
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp6_, &_tmp9_, NULL);
-#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8764 "PhotoPage.c"
+#line 8780 "PhotoPage.c"
 	}
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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_);
-#line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp10_;
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = editing_host_page_get_photo (self);
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = scaling_to_string (&scaling);
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_debug ("PhotoPage.vala:1249: Using progressive load for %s (%s)", _tmp14_, _tmp16_);
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_debug ("PhotoPage.vala:1252: Using progressive load for %s (%s)", _tmp14_, _tmp16_);
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp16_);
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp14_);
-#line 1249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 8790 "PhotoPage.c"
+#line 8806 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp17_ = NULL;
 		Photo* _tmp18_ = NULL;
@@ -8802,87 +8818,87 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		Photo* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
 		Dimensions _tmp25_ = {0};
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = editing_host_page_get_photo (self);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = scaling;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp20_, &_inner_error_);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _tmp22_;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8817 "PhotoPage.c"
-			goto __catch246_g_error;
+#line 8833 "PhotoPage.c"
+			goto __catch247_g_error;
 		}
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = editing_host_page_get_photo (self);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_;
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp25_);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp17_, &_tmp25_, NULL);
-#line 1254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp24_);
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 8832 "PhotoPage.c"
+#line 8848 "PhotoPage.c"
 	}
-	goto __finally246;
-	__catch246_g_error:
+	goto __finally247;
+	__catch247_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp26_ = NULL;
 		const gchar* _tmp27_ = NULL;
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_inner_error_ = NULL;
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_inner_error_ = NULL;
+#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = err;
-#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = _tmp26_->message;
+#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_warning ("PhotoPage.vala:1259: %s", _tmp27_);
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_warning ("PhotoPage.vala:1256: %s", _tmp27_);
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 8852 "PhotoPage.c"
+#line 8868 "PhotoPage.c"
 	}
-	__finally246:
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally247:
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8865 "PhotoPage.c"
+#line 8881 "PhotoPage.c"
 	}
-#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->cache;
-#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = editing_host_page_get_photo (self);
-#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = _tmp29_;
-#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf_cache_prefetch (_tmp28_, _tmp30_, BACKGROUND_JOB_JOB_PRIORITY_HIGHEST, FALSE);
-#line 1259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp30_);
-#line 1263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1266 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = FALSE;
-#line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 8881 "PhotoPage.c"
+#line 8897 "PhotoPage.c"
 }
 
 
@@ -8899,47 +8915,47 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	gboolean _tmp25_ = FALSE;
 	gboolean _tmp26_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1266 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 1271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp0_;
-#line 1272 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 1272 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 8914 "PhotoPage.c"
+#line 8930 "PhotoPage.c"
 	}
-#line 1275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = NULL;
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo;
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
-#line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp3_;
-#line 8924 "PhotoPage.c"
+#line 8940 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp4_ = {0};
 		EditingToolsEditingTool* _tmp5_ = NULL;
 		GdkPixbuf* _tmp13_ = NULL;
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_.width = 0;
-#line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_pixbuf_dim = _tmp4_;
-#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = self->priv->current_tool;
-#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 8938 "PhotoPage.c"
+#line 8954 "PhotoPage.c"
 			GdkPixbuf* _tmp6_ = NULL;
 			EditingToolsEditingTool* _tmp7_ = NULL;
 			Scaling _tmp8_ = {0};
@@ -8947,214 +8963,214 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			Dimensions _tmp10_ = {0};
 			GdkPixbuf* _tmp11_ = NULL;
 			GdkPixbuf* _tmp12_ = NULL;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = self->priv->current_tool;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = photo;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = editing_tools_editing_tool_get_display_pixbuf (_tmp7_, &_tmp8_, _tmp9_, &_tmp10_, &_inner_error_);
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			tool_pixbuf_dim = _tmp10_;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = _tmp11_;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8960 "PhotoPage.c"
-				goto __catch247_g_error;
+#line 8976 "PhotoPage.c"
+				goto __catch248_g_error;
 			}
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = _tmp6_;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = NULL;
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp12_;
-#line 1280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp6_);
-#line 8973 "PhotoPage.c"
+#line 8989 "PhotoPage.c"
 		}
-#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = pixbuf;
-#line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp13_ != NULL) {
-#line 8979 "PhotoPage.c"
+#line 8995 "PhotoPage.c"
 			Dimensions _tmp14_ = {0};
-#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = tool_pixbuf_dim;
-#line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp14_;
-#line 8985 "PhotoPage.c"
+#line 9001 "PhotoPage.c"
 		}
 	}
-	goto __finally247;
-	__catch247_g_error:
+	goto __finally248;
+	__catch248_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = err;
-#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_->message;
-#line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_warning ("PhotoPage.vala:1286: %s", _tmp16_);
-#line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_warning ("PhotoPage.vala:1289: %s", _tmp16_);
+#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, TRUE);
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 9008 "PhotoPage.c"
+#line 9024 "PhotoPage.c"
 	}
-	__finally247:
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally248:
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return FALSE;
-#line 9023 "PhotoPage.c"
+#line 9039 "PhotoPage.c"
 	}
-#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = self->priv->photo_missing;
-#line 1290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp17_) {
-#line 9029 "PhotoPage.c"
+#line 9045 "PhotoPage.c"
 		GdkPixbuf* _tmp18_ = NULL;
 		GdkPixbuf* _tmp22_ = NULL;
-#line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = pixbuf;
-#line 1292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp18_ == NULL) {
-#line 9036 "PhotoPage.c"
+#line 9052 "PhotoPage.c"
 			PixbufCache* _tmp19_ = NULL;
 			Photo* _tmp20_ = NULL;
 			GdkPixbuf* _tmp21_ = NULL;
-#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = self->priv->cache;
-#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = photo;
-#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = pixbuf_cache_get_ready_pixbuf (_tmp19_, _tmp20_);
-#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp21_;
-#line 9050 "PhotoPage.c"
+#line 9066 "PhotoPage.c"
 		}
-#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = pixbuf;
-#line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp22_ == NULL) {
-#line 9056 "PhotoPage.c"
+#line 9072 "PhotoPage.c"
 			PixbufCache* _tmp23_ = NULL;
 			Photo* _tmp24_ = NULL;
-#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = self->priv->cache;
-#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = photo;
-#line 1297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf_cache_prefetch (_tmp23_, _tmp24_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
-#line 9065 "PhotoPage.c"
+#line 9081 "PhotoPage.c"
 		}
 	}
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = self->priv->photo_missing;
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 9072 "PhotoPage.c"
+#line 9088 "PhotoPage.c"
 		GdkPixbuf* _tmp27_ = NULL;
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = pixbuf;
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = _tmp27_ != NULL;
-#line 9078 "PhotoPage.c"
+#line 9094 "PhotoPage.c"
 	} else {
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = FALSE;
-#line 9082 "PhotoPage.c"
+#line 9098 "PhotoPage.c"
 	}
-#line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp25_) {
-#line 9086 "PhotoPage.c"
+#line 9102 "PhotoPage.c"
 		GdkPixbuf* _tmp28_ = NULL;
 		Dimensions _tmp29_ = {0};
-#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = pixbuf;
-#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = max_dim;
-#line 1301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp28_, &_tmp29_, NULL);
-#line 1302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 9097 "PhotoPage.c"
+#line 9113 "PhotoPage.c"
 	}
-#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 1309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9107 "PhotoPage.c"
+#line 9123 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
 	GdkRectangle _tmp0_ = {0};
-#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = *rect;
-#line 1313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->on_resize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
-#line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_track_tool_window (self);
-#line 9124 "PhotoPage.c"
+#line 9140 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
-#line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1321 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "on_resize_finished");
-#line 1323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1326 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
-#line 1325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9140 "PhotoPage.c"
+#line 9156 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_viewport_resized (EditingHostPage* self) {
-#line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1331 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
+#line 1334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "on_viewport_resized");
-#line 1332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
-#line 1334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9153 "PhotoPage.c"
+#line 9169 "PhotoPage.c"
 }
 
 
@@ -9200,300 +9216,300 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 	GtkToggleToolButton* _tmp58_ = NULL;
 	gint _tmp59_ = 0;
 	gint _tmp60_ = 0;
-#line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_sources_of_type_count (_tmp1_, TYPE_PHOTO);
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 1;
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 1338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	multiple_photos = _tmp3_;
-#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->prev_button;
-#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = multiple_photos;
-#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp5_);
-#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->next_button;
-#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = multiple_photos;
-#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_);
-#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = editing_host_page_get_photo (self);
-#line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp8_;
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_);
-#line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp9_;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = photo;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 9237 "PhotoPage.c"
+#line 9253 "PhotoPage.c"
 		gboolean _tmp14_ = FALSE;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = self->priv->photo_missing;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = !_tmp14_;
-#line 9243 "PhotoPage.c"
+#line 9259 "PhotoPage.c"
 	} else {
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 9247 "PhotoPage.c"
+#line 9263 "PhotoPage.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 9251 "PhotoPage.c"
+#line 9267 "PhotoPage.c"
 		Photo* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = photo;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = photo_check_can_rotate (_tmp15_);
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp16_;
-#line 9260 "PhotoPage.c"
+#line 9276 "PhotoPage.c"
 	} else {
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = FALSE;
-#line 9264 "PhotoPage.c"
+#line 9280 "PhotoPage.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_) {
-#line 9268 "PhotoPage.c"
+#line 9284 "PhotoPage.c"
 		Photo* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = photo;
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_);
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp18_;
-#line 9277 "PhotoPage.c"
+#line 9293 "PhotoPage.c"
 	} else {
-#line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 9281 "PhotoPage.c"
+#line 9297 "PhotoPage.c"
 	}
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = self->priv->rotate_button;
-#line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), _tmp10_);
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = photo;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 9291 "PhotoPage.c"
+#line 9307 "PhotoPage.c"
 		gboolean _tmp23_ = FALSE;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = self->priv->photo_missing;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = !_tmp23_;
-#line 9297 "PhotoPage.c"
+#line 9313 "PhotoPage.c"
 	} else {
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = FALSE;
-#line 9301 "PhotoPage.c"
+#line 9317 "PhotoPage.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 9305 "PhotoPage.c"
+#line 9321 "PhotoPage.c"
 		Photo* _tmp24_ = NULL;
 		Scaling _tmp25_ = {0};
 		gboolean _tmp26_ = FALSE;
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = photo;
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = scaling;
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_);
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp26_;
-#line 9317 "PhotoPage.c"
+#line 9333 "PhotoPage.c"
 	} else {
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 9321 "PhotoPage.c"
+#line 9337 "PhotoPage.c"
 	}
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->crop_button;
-#line 1348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp20_);
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = photo;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_ != NULL) {
-#line 9331 "PhotoPage.c"
+#line 9347 "PhotoPage.c"
 		gboolean _tmp31_ = FALSE;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = self->priv->photo_missing;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = !_tmp31_;
-#line 9337 "PhotoPage.c"
+#line 9353 "PhotoPage.c"
 	} else {
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = FALSE;
-#line 9341 "PhotoPage.c"
+#line 9357 "PhotoPage.c"
 	}
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_) {
-#line 9345 "PhotoPage.c"
+#line 9361 "PhotoPage.c"
 		Photo* _tmp32_ = NULL;
 		Scaling _tmp33_ = {0};
 		gboolean _tmp34_ = FALSE;
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = photo;
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = scaling;
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_);
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = _tmp34_;
-#line 9357 "PhotoPage.c"
+#line 9373 "PhotoPage.c"
 	} else {
-#line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = FALSE;
-#line 9361 "PhotoPage.c"
+#line 9377 "PhotoPage.c"
 	}
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = self->priv->redeye_button;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), _tmp28_);
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp38_ = photo;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp38_ != NULL) {
-#line 9371 "PhotoPage.c"
+#line 9387 "PhotoPage.c"
 		gboolean _tmp39_ = FALSE;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = self->priv->photo_missing;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = !_tmp39_;
-#line 9377 "PhotoPage.c"
+#line 9393 "PhotoPage.c"
 	} else {
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = FALSE;
-#line 9381 "PhotoPage.c"
+#line 9397 "PhotoPage.c"
 	}
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp37_) {
-#line 9385 "PhotoPage.c"
+#line 9401 "PhotoPage.c"
 		Photo* _tmp40_ = NULL;
 		Scaling _tmp41_ = {0};
 		gboolean _tmp42_ = FALSE;
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = photo;
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp41_ = scaling;
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_);
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp42_;
-#line 9397 "PhotoPage.c"
+#line 9413 "PhotoPage.c"
 	} else {
-#line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = FALSE;
-#line 9401 "PhotoPage.c"
+#line 9417 "PhotoPage.c"
 	}
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = self->priv->adjust_button;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp36_);
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = photo;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_ != NULL) {
-#line 9411 "PhotoPage.c"
+#line 9427 "PhotoPage.c"
 		gboolean _tmp47_ = FALSE;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = self->priv->photo_missing;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = !_tmp47_;
-#line 9417 "PhotoPage.c"
+#line 9433 "PhotoPage.c"
 	} else {
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = FALSE;
-#line 9421 "PhotoPage.c"
+#line 9437 "PhotoPage.c"
 	}
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp45_) {
-#line 9425 "PhotoPage.c"
+#line 9441 "PhotoPage.c"
 		Photo* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = photo;
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_);
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = _tmp49_;
-#line 9434 "PhotoPage.c"
+#line 9450 "PhotoPage.c"
 	} else {
-#line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = FALSE;
-#line 9438 "PhotoPage.c"
+#line 9454 "PhotoPage.c"
 	}
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp50_ = self->priv->enhance_button;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), _tmp44_);
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp53_ = photo;
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp53_ != NULL) {
-#line 9448 "PhotoPage.c"
+#line 9464 "PhotoPage.c"
 		gboolean _tmp54_ = FALSE;
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp54_ = self->priv->photo_missing;
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = !_tmp54_;
-#line 9454 "PhotoPage.c"
+#line 9470 "PhotoPage.c"
 	} else {
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = FALSE;
-#line 9458 "PhotoPage.c"
+#line 9474 "PhotoPage.c"
 	}
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp52_) {
-#line 9462 "PhotoPage.c"
+#line 9478 "PhotoPage.c"
 		Photo* _tmp55_ = NULL;
 		Scaling _tmp56_ = {0};
 		gboolean _tmp57_ = FALSE;
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = photo;
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp56_ = scaling;
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_);
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = _tmp57_;
-#line 9474 "PhotoPage.c"
+#line 9490 "PhotoPage.c"
 	} else {
-#line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = FALSE;
-#line 9478 "PhotoPage.c"
+#line 9494 "PhotoPage.c"
 	}
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp58_ = self->priv->straighten_button;
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), _tmp51_);
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), _tmp51_);
+#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp59_ = selected_count;
-#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp60_ = count;
-#line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp59_, _tmp60_);
-#line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 9492 "PhotoPage.c"
+#line 9508 "PhotoPage.c"
 }
 
 
@@ -9506,67 +9522,67 @@ static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey
 	EditingToolsEditingTool* _tmp3_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 9511 "PhotoPage.c"
+#line 9527 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = !_tmp4_;
-#line 9517 "PhotoPage.c"
+#line 9533 "PhotoPage.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = FALSE;
-#line 9521 "PhotoPage.c"
+#line 9537 "PhotoPage.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 9525 "PhotoPage.c"
+#line 9541 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = !_tmp5_;
-#line 9531 "PhotoPage.c"
+#line 9547 "PhotoPage.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9535 "PhotoPage.c"
+#line 9551 "PhotoPage.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9539 "PhotoPage.c"
+#line 9555 "PhotoPage.c"
 		gboolean _tmp6_ = FALSE;
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_has_photo (self);
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp6_;
-#line 9545 "PhotoPage.c"
+#line 9561 "PhotoPage.c"
 	} else {
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9549 "PhotoPage.c"
+#line 9565 "PhotoPage.c"
 	}
-#line 1364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1368 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9555 "PhotoPage.c"
+#line 9571 "PhotoPage.c"
 	}
-#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
-#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_);
-#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp8_;
-#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9565 "PhotoPage.c"
+#line 9581 "PhotoPage.c"
 }
 
 
@@ -9576,25 +9592,25 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	EditingToolsEditingTool* _tmp0_ = NULL;
 	GdkEventKey* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1371 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1371 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1372 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1375 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9583 "PhotoPage.c"
+#line 9599 "PhotoPage.c"
 	}
-#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9593 "PhotoPage.c"
+#line 9609 "PhotoPage.c"
 }
 
 
@@ -9604,25 +9620,25 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	EditingToolsEditingTool* _tmp0_ = NULL;
 	GdkEventKey* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1380 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1379 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9611 "PhotoPage.c"
+#line 9627 "PhotoPage.c"
 	}
-#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9621 "PhotoPage.c"
+#line 9637 "PhotoPage.c"
 }
 
 
@@ -9634,53 +9650,53 @@ static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey*
 	EditingToolsEditingTool* _tmp2_ = NULL;
 	GdkEventKey* _tmp5_ = NULL;
 	gboolean _tmp6_ = FALSE;
-#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1387 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->current_tool;
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 9639 "PhotoPage.c"
+#line 9655 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_;
-#line 9645 "PhotoPage.c"
+#line 9661 "PhotoPage.c"
 	} else {
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9649 "PhotoPage.c"
+#line 9665 "PhotoPage.c"
 	}
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9653 "PhotoPage.c"
+#line 9669 "PhotoPage.c"
 		gboolean _tmp4_ = FALSE;
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 9659 "PhotoPage.c"
+#line 9675 "PhotoPage.c"
 	} else {
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9663 "PhotoPage.c"
+#line 9679 "PhotoPage.c"
 	}
-#line 1385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9669 "PhotoPage.c"
+#line 9685 "PhotoPage.c"
 	}
-#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = event;
-#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp5_);
-#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp6_;
-#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9679 "PhotoPage.c"
+#line 9695 "PhotoPage.c"
 }
 
 
@@ -9694,9 +9710,9 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 	Photo* _tmp14_ = NULL;
 	Dimensions _tmp15_ = {0};
 	GError * _inner_error_ = NULL;
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 9695 "PhotoPage.c"
+#line 9711 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_ = NULL;
@@ -9707,148 +9723,148 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		Photo* _tmp6_ = NULL;
 		Orientation _tmp7_ = 0;
 		GdkPixbuf* _tmp8_ = NULL;
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = editing_host_page_get_photo (self);
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = photo_get_prefetched_copy (_tmp2_, &_inner_error_);
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_;
-#line 1395 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9720 "PhotoPage.c"
-			goto __catch248_g_error;
+#line 9736 "PhotoPage.c"
+			goto __catch249_g_error;
 		}
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_get_photo (self);
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = photo_get_original_orientation (_tmp6_);
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = orientation_rotate_pixbuf (_tmp7_, _tmp0_);
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (original);
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		original = _tmp8_;
-#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 9739 "PhotoPage.c"
+#line 9755 "PhotoPage.c"
 	}
-	goto __finally248;
-	__catch248_g_error:
+	goto __finally249;
+	__catch249_g_error:
 	{
 		GError* err = NULL;
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (original);
-#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9755 "PhotoPage.c"
+#line 9771 "PhotoPage.c"
 	}
-	__finally248:
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally249:
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (original);
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1393 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9768 "PhotoPage.c"
+#line 9784 "PhotoPage.c"
 	}
-#line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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));
-#line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->swapped);
-#line 1401 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->swapped = _tmp9_;
-#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = self->priv->zoom_slider;
-#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange));
-#line 1405 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ != 0.0) {
-#line 1406 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1409 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1407 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 9786 "PhotoPage.c"
+#line 9802 "PhotoPage.c"
 	}
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = original;
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = editing_host_page_get_photo (self);
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo_get_master_dimensions (_tmp14_, &_tmp15_);
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, &_tmp15_, NULL);
-#line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (original);
-#line 9802 "PhotoPage.c"
+#line 9818 "PhotoPage.c"
 }
 
 
 static void editing_host_page_swap_out_original (EditingHostPage* self) {
 	GdkPixbuf* _tmp0_ = NULL;
-#line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1416 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1414 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->swapped;
-#line 1414 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 9814 "PhotoPage.c"
+#line 9830 "PhotoPage.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
 		Dimensions _tmp4_ = {0};
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->swapped;
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (self);
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp1_, &_tmp4_, NULL);
-#line 1415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1420 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_update_cursor_for_zoom_context (self);
 #line 1421 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		editing_host_page_update_cursor_for_zoom_context (self);
+#line 1424 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->swapped);
-#line 1421 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1424 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->swapped = NULL;
-#line 9839 "PhotoPage.c"
+#line 9855 "PhotoPage.c"
 	}
 }
 
 
 static gpointer _editing_tools_editing_tool_ref0 (gpointer self) {
-#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? editing_tools_editing_tool_ref (self) : NULL;
-#line 9847 "PhotoPage.c"
+#line 9863 "PhotoPage.c"
 }
 
 
@@ -9869,37 +9885,37 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	EditingToolsEditingTool* _tmp28_ = NULL;
 	EditingToolsPhotoCanvas* _tmp29_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (tool));
 #line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (tool));
+#line 1431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1429 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1432 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1433 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 1433 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
+#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
-#line 1436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->cancel_editing_pixbuf = _tmp1_;
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp5_;
-#line 9898 "PhotoPage.c"
+#line 9914 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp6_ = {0};
@@ -9913,192 +9929,192 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		GdkPixbuf* _tmp14_ = NULL;
 		GdkPixbuf* _tmp15_ = NULL;
 		GdkPixbuf* _tmp16_ = NULL;
-#line 1442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_.width = 0;
-#line 1442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_pixbuf_dim = _tmp6_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = tool;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_);
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = editing_host_page_get_photo (self);
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = editing_tools_editing_tool_get_display_pixbuf (_tmp8_, &_tmp9_, _tmp11_, &_tmp12_, &_inner_error_);
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_pixbuf_dim = _tmp12_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp14_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9936 "PhotoPage.c"
-			goto __catch249_g_error;
+#line 9952 "PhotoPage.c"
+			goto __catch250_g_error;
 		}
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp7_;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = NULL;
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (unscaled);
-#line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		unscaled = _tmp15_;
-#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = unscaled;
-#line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp16_ != NULL) {
-#line 9951 "PhotoPage.c"
+#line 9967 "PhotoPage.c"
 			Dimensions _tmp17_ = {0};
-#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = tool_pixbuf_dim;
-#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp17_;
-#line 9957 "PhotoPage.c"
+#line 9973 "PhotoPage.c"
 		}
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 9961 "PhotoPage.c"
+#line 9977 "PhotoPage.c"
 	}
-	goto __finally249;
-	__catch249_g_error:
+	goto __finally250;
+	__catch250_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
 		GtkToggleToolButton* _tmp20_ = NULL;
 		GtkToggleToolButton* _tmp21_ = NULL;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = err;
-#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_->message;
-#line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_warning ("PhotoPage.vala:1448: %s", _tmp19_);
-#line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_set_photo_missing (self, TRUE);
+#line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		g_warning ("PhotoPage.vala:1451: %s", _tmp19_);
 #line 1452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		editing_host_page_set_photo_missing (self, TRUE);
+#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = self->priv->current_editing_toggle;
-#line 1452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_vala_assert (_tmp20_ != NULL, "current_editing_toggle != null");
-#line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = self->priv->current_editing_toggle;
-#line 1453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gtk_toggle_tool_button_set_active (_tmp21_, FALSE);
-#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (unscaled);
-#line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9997 "PhotoPage.c"
+#line 10013 "PhotoPage.c"
 	}
-	__finally249:
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally250:
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (unscaled);
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 1441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10010 "PhotoPage.c"
+#line 10026 "PhotoPage.c"
 	}
-#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = unscaled;
-#line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp22_ != NULL) {
-#line 10016 "PhotoPage.c"
+#line 10032 "PhotoPage.c"
 		GdkPixbuf* _tmp23_ = NULL;
 		Dimensions _tmp24_ = {0};
-#line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = unscaled;
-#line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = max_dim;
-#line 1459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 10025 "PhotoPage.c"
+#line 10041 "PhotoPage.c"
 	}
-#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = editing_host_page_editing_host_canvas_new (self);
-#line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	photo_canvas = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
 #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	photo_canvas = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
+#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = tool;
-#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = _editing_tools_editing_tool_ref0 (_tmp26_);
-#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (self->priv->current_tool);
-#line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->current_tool = _tmp27_;
-#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->current_tool;
-#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = photo_canvas;
-#line 1466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_tools_editing_tool_activate (_tmp28_, _tmp29_);
 #line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_place_tool_window (self);
+	editing_tools_editing_tool_activate (_tmp28_, _tmp29_);
 #line 1472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_host_page_place_tool_window (self);
+#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_photo_canvas_unref0 (photo_canvas);
-#line 1425 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (unscaled);
-#line 10053 "PhotoPage.c"
+#line 10069 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) {
-#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_activated ((EditingHostPage*) self);
-#line 10060 "PhotoPage.c"
+#line 10076 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
-#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_deactivated ((EditingHostPage*) self);
-#line 10067 "PhotoPage.c"
+#line 10083 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement, gpointer self) {
-#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 10074 "PhotoPage.c"
+#line 10090 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) {
-#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_cancelled ((EditingHostPage*) self);
-#line 10081 "PhotoPage.c"
+#line 10097 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) {
-#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_aborted ((EditingHostPage*) self);
-#line 10088 "PhotoPage.c"
+#line 10104 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) {
 	gboolean result;
 	result = editing_host_page_update_pixbuf ((EditingHostPage*) self);
-#line 1527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10097 "PhotoPage.c"
+#line 10113 "PhotoPage.c"
 }
 
 
@@ -10128,60 +10144,60 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	GdkPixbuf* _tmp43_ = NULL;
 	gboolean _tmp46_ = FALSE;
 	Command* _tmp47_ = NULL;
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((command == NULL) || IS_COMMAND (command));
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((new_pixbuf == NULL) || GDK_IS_PIXBUF (new_pixbuf));
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (new_max_dim != NULL);
-#line 1477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10141 "PhotoPage.c"
+#line 10157 "PhotoPage.c"
 	}
-#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
-#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _editing_tools_editing_tool_ref0 (_tmp1_);
-#line 1480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool = _tmp2_;
-#line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (self->priv->current_tool);
-#line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->current_tool = NULL;
 #line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->current_tool = NULL;
+#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = tool;
-#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_tools_editing_tool_get_tool_window (_tmp3_);
-#line 1484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool_window = _tmp4_;
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = tool_window;
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ != NULL) {
-#line 10163 "PhotoPage.c"
+#line 10179 "PhotoPage.c"
 		EditingToolsEditingToolWindow* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = tool_window;
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_);
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp8_;
-#line 10172 "PhotoPage.c"
+#line 10188 "PhotoPage.c"
 	} else {
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 10176 "PhotoPage.c"
+#line 10192 "PhotoPage.c"
 	}
-#line 1485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 10180 "PhotoPage.c"
+#line 10196 "PhotoPage.c"
 		gint last_location_x = 0;
 		gint last_location_y = 0;
 		EditingToolsEditingToolWindow* _tmp9_ = NULL;
@@ -10199,219 +10215,219 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
 		gint _tmp23_ = 0;
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = tool_window;
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), &_tmp10_, &_tmp11_);
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		last_location_x = _tmp10_;
-#line 1487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		last_location_y = _tmp11_;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = self->priv->last_locations;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = tool;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_->name;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = g_strconcat (_tmp14_, "_x", NULL);
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = last_location_x;
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, (gpointer) ((gintptr) _tmp17_));
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp16_);
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = self->priv->last_locations;
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = tool;
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_->name;
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = g_strconcat (_tmp20_, "_y", NULL);
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = last_location_y;
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, (gpointer) ((gintptr) _tmp23_));
-#line 1489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp22_);
-#line 10238 "PhotoPage.c"
+#line 10254 "PhotoPage.c"
 	}
-#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = tool;
-#line 1494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_tools_editing_tool_deactivate (_tmp24_);
-#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = tool;
-#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp26_, NULL, FALSE);
-#line 1496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self);
-#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = tool;
-#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp28_, NULL, FALSE);
-#line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp27_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp28_, 0, NULL, (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self);
-#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = tool;
-#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp30_, NULL, FALSE);
-#line 1498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self);
-#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp31_ = tool;
-#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp32_, NULL, FALSE);
-#line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self);
-#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp33_ = tool;
-#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp34_, NULL, FALSE);
-#line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp33_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp34_, 0, NULL, (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self);
-#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool = NULL;
-#line 1506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->current_editing_toggle);
-#line 1506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->current_editing_toggle = NULL;
 #line 1509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->current_editing_toggle = NULL;
+#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	replacement = NULL;
-#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = new_pixbuf;
-#line 1510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_ != NULL) {
-#line 10288 "PhotoPage.c"
+#line 10304 "PhotoPage.c"
 		GdkPixbuf* _tmp36_ = NULL;
 		GdkPixbuf* _tmp37_ = NULL;
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = new_pixbuf;
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = _g_object_ref0 (_tmp36_);
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (replacement);
-#line 1511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		replacement = _tmp37_;
-#line 10299 "PhotoPage.c"
+#line 10315 "PhotoPage.c"
 	} else {
 		GdkPixbuf* _tmp38_ = NULL;
-#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = self->priv->cancel_editing_pixbuf;
-#line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp38_ != NULL) {
-#line 10306 "PhotoPage.c"
+#line 10322 "PhotoPage.c"
 			GdkPixbuf* _tmp39_ = NULL;
 			GdkPixbuf* _tmp40_ = NULL;
 			GdkPixbuf* _tmp41_ = NULL;
 			Dimensions _tmp42_ = {0};
-#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp39_ = self->priv->cancel_editing_pixbuf;
-#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp40_ = _g_object_ref0 (_tmp39_);
-#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (replacement);
-#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			replacement = _tmp40_;
-#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp41_ = replacement;
-#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			dimensions_for_pixbuf (_tmp41_, &_tmp42_);
-#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			*new_max_dim = _tmp42_;
-#line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = FALSE;
-#line 10327 "PhotoPage.c"
+#line 10343 "PhotoPage.c"
 		} else {
-#line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = TRUE;
-#line 10331 "PhotoPage.c"
+#line 10347 "PhotoPage.c"
 		}
 	}
-#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = replacement;
-#line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp43_ != NULL) {
-#line 10338 "PhotoPage.c"
+#line 10354 "PhotoPage.c"
 		GdkPixbuf* _tmp44_ = NULL;
 		Dimensions _tmp45_ = {0};
-#line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = replacement;
-#line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = *new_max_dim;
-#line 1521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 10347 "PhotoPage.c"
+#line 10363 "PhotoPage.c"
 	}
-#line 1522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
-#line 1522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->cancel_editing_pixbuf = NULL;
 #line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->cancel_editing_pixbuf = NULL;
+#line 1528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = needs_improvement;
-#line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_) {
-#line 1526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = TRUE;
-#line 1527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 10361 "PhotoPage.c"
+#line 10377 "PhotoPage.c"
 	}
-#line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp47_ = command;
-#line 1531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp47_ != NULL) {
-#line 10367 "PhotoPage.c"
+#line 10383 "PhotoPage.c"
 		CommandManager* _tmp48_ = NULL;
 		CommandManager* _tmp49_ = NULL;
 		Command* _tmp50_ = NULL;
-#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp49_ = _tmp48_;
-#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp50_ = command;
-#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp49_, _tmp50_);
-#line 1532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp49_);
-#line 10381 "PhotoPage.c"
+#line 10397 "PhotoPage.c"
 	}
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (replacement);
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (tool_window);
-#line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 10389 "PhotoPage.c"
+#line 10405 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, GdkEventButton* event) {
 	gboolean result = FALSE;
-#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10401 "PhotoPage.c"
+#line 10417 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButton* event) {
-#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event);
-#line 10410 "PhotoPage.c"
+#line 10426 "PhotoPage.c"
 }
 
 
@@ -10435,141 +10451,141 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 	EditingToolsEditingTool* _tmp22_ = NULL;
 	gint _tmp23_ = 0;
 	gint _tmp24_ = 0;
-#line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_->type;
-#line 1544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == GDK_2BUTTON_PRESS) {
-#line 10444 "PhotoPage.c"
+#line 10460 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		EditingToolsEditingTool* _tmp3_ = NULL;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->current_tool;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_ == NULL) {
-#line 10451 "PhotoPage.c"
+#line 10467 "PhotoPage.c"
 			GdkEventButton* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp4_ = event;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = editing_host_page_on_double_click (self, _tmp4_);
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp5_;
-#line 10460 "PhotoPage.c"
+#line 10476 "PhotoPage.c"
 		} else {
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = FALSE;
-#line 10464 "PhotoPage.c"
+#line 10480 "PhotoPage.c"
 		}
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = _tmp2_;
-#line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10470 "PhotoPage.c"
+#line 10486 "PhotoPage.c"
 	}
-#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = event;
-#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_->x;
-#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	x = (gint) _tmp7_;
-#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = event;
-#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_->y;
-#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	y = (gint) _tmp9_;
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = self->priv->current_tool;
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 10488 "PhotoPage.c"
+#line 10504 "PhotoPage.c"
 		GtkScale* _tmp12_ = NULL;
 		gdouble _tmp13_ = 0.0;
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = self->priv->zoom_slider;
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_range_get_type (), GtkRange));
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp13_ != 0.0;
-#line 10497 "PhotoPage.c"
+#line 10513 "PhotoPage.c"
 	} else {
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = FALSE;
-#line 10501 "PhotoPage.c"
+#line 10517 "PhotoPage.c"
 	}
-#line 1552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 10505 "PhotoPage.c"
+#line 10521 "PhotoPage.c"
 		GdkEventButton* _tmp14_ = NULL;
 		gdouble _tmp15_ = 0.0;
 		GdkEventButton* _tmp16_ = NULL;
 		gdouble _tmp17_ = 0.0;
-#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = event;
-#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp14_->x;
-#line 1553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->zoom_pan_start_point.x = (gint) _tmp15_;
-#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = event;
-#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _tmp16_->y;
-#line 1554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->zoom_pan_start_point.y = (gint) _tmp17_;
-#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->is_pan_in_progress = TRUE;
-#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10530 "PhotoPage.c"
+#line 10546 "PhotoPage.c"
 	}
-#line 1562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->current_tool;
-#line 1562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp18_ == NULL) {
-#line 1563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 1563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10540 "PhotoPage.c"
+#line 10556 "PhotoPage.c"
 	}
-#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = x;
-#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = y;
-#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = single_photo_page_is_inside_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp19_, _tmp20_);
-#line 1568 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp21_) {
-#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10554 "PhotoPage.c"
+#line 10570 "PhotoPage.c"
 	}
-#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
-#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = x;
-#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = y;
-#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_tools_editing_tool_on_left_click (_tmp22_, _tmp23_, _tmp24_);
 #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	editing_tools_editing_tool_on_left_click (_tmp22_, _tmp23_, _tmp24_);
+#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10568 "PhotoPage.c"
+#line 10584 "PhotoPage.c"
 }
 
 
@@ -10587,15 +10603,15 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	EditingToolsEditingToolWindow* _tmp28_ = NULL;
 	EditingToolsEditingToolWindow* _tmp29_ = NULL;
 	gboolean _tmp30_ = FALSE;
-#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->is_pan_in_progress;
-#line 1578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10594 "PhotoPage.c"
+#line 10610 "PhotoPage.c"
 		GdkPoint viewport_center = {0};
 		ZoomState _tmp1_ = {0};
 		GdkPoint _tmp2_ = {0};
@@ -10620,125 +10636,125 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 		ZoomBuffer* _tmp18_ = NULL;
 		ZoomBuffer* _tmp19_ = NULL;
 		ZoomState _tmp20_ = {0};
-#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_get_viewport_center (&_tmp1_, &_tmp2_);
-#line 1579 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center = _tmp2_;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = event;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_->x;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = self->priv->zoom_pan_start_point;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_.x;
-#line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		delta_x = ((gint) _tmp4_) - _tmp6_;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = event;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_->y;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = self->priv->zoom_pan_start_point;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_.y;
-#line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		delta_y = ((gint) _tmp8_) - _tmp10_;
-#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = viewport_center.x;
-#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = delta_x;
-#line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center.x = _tmp11_ - _tmp12_;
-#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = viewport_center.y;
-#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = delta_y;
-#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center.y = _tmp13_ - _tmp14_;
-#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_);
-#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = viewport_center;
-#line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_init_pan (&zoom_state, &_tmp15_, &_tmp16_);
-#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = zoom_state;
-#line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_);
-#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = single_photo_page_get_zoom_buffer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = zoom_state;
-#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_buffer_flush_demand_cache (_tmp19_, &_tmp20_);
-#line 1587 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp19_);
-#line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->is_pan_in_progress = FALSE;
-#line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 10681 "PhotoPage.c"
+#line 10697 "PhotoPage.c"
 	}
-#line 1595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = self->priv->current_tool;
-#line 1595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_ == NULL) {
-#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 1596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10691 "PhotoPage.c"
+#line 10707 "PhotoPage.c"
 	}
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = self->priv->current_tool;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = event;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = _tmp23_->x;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = event;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_->y;
-#line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_tools_editing_tool_on_left_released (_tmp22_, (gint) _tmp24_, (gint) _tmp26_);
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->current_tool;
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = editing_tools_editing_tool_get_tool_window (_tmp27_);
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = _tmp28_;
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp30_ = _tmp29_ != NULL;
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp29_);
-#line 1600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
-#line 10717 "PhotoPage.c"
+#line 10733 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp31_ = NULL;
 		EditingToolsEditingToolWindow* _tmp32_ = NULL;
 		EditingToolsEditingToolWindow* _tmp33_ = NULL;
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = self->priv->current_tool;
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = editing_tools_editing_tool_get_tool_window (_tmp31_);
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = _tmp32_;
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow));
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp33_);
-#line 10731 "PhotoPage.c"
+#line 10747 "PhotoPage.c"
 	}
-#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10737 "PhotoPage.c"
+#line 10753 "PhotoPage.c"
 }
 
 
@@ -10747,28 +10763,28 @@ static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButto
 	gboolean result = FALSE;
 	GdkEventButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = page_on_context_buttonpress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_);
-#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 1607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10758 "PhotoPage.c"
+#line 10774 "PhotoPage.c"
 }
 
 
 static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self) {
 	gboolean result;
 	result = editing_host_page_on_fetch_original ((EditingHostPage*) self);
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10767 "PhotoPage.c"
+#line 10783 "PhotoPage.c"
 }
 
 
@@ -10788,107 +10804,107 @@ static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap*
 	ViewCollection* _tmp12_ = NULL;
 	ViewCollection* _tmp13_ = NULL;
 	gint _tmp14_ = 0;
-#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = map;
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 1612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10807 "PhotoPage.c"
+#line 10823 "PhotoPage.c"
 	}
-#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (self);
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo_has_transformations (_tmp6_);
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 1619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 10825 "PhotoPage.c"
+#line 10841 "PhotoPage.c"
 	}
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = view_collection_get_selected_count (_tmp10_);
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection));
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp11_, _tmp14_);
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp13_);
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp10_);
-#line 10845 "PhotoPage.c"
+#line 10861 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage* self) {
-#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered");
-#line 10854 "PhotoPage.c"
+#line 10870 "PhotoPage.c"
 }
 
 
 static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 1629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10867 "PhotoPage.c"
+#line 10883 "PhotoPage.c"
 		PixbufCache* _tmp1_ = NULL;
 		Photo* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->master_cache;
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (self);
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE);
-#line 1630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 10881 "PhotoPage.c"
+#line 10897 "PhotoPage.c"
 	}
-#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
-#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10887 "PhotoPage.c"
+#line 10903 "PhotoPage.c"
 }
 
 
@@ -10907,82 +10923,82 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 	gint _tmp8_ = 0;
 	Dimensions _tmp9_ = {0};
 	gint _tmp10_ = 0;
-#line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
+#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_.width = 0;
-#line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	content_dim = _tmp0_;
-#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_get_zoomed_width (&_tmp1_);
-#line 1639 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	content_dim.width = _tmp2_;
-#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_);
-#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = zoom_state_get_zoomed_height (&_tmp3_);
-#line 1640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	content_dim.height = _tmp4_;
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	canvas_dim = _tmp5_;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = canvas_dim;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_.width;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = content_dim;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_.width;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ >= _tmp10_) {
-#line 10938 "PhotoPage.c"
+#line 10954 "PhotoPage.c"
 		Dimensions _tmp11_ = {0};
 		gint _tmp12_ = 0;
 		Dimensions _tmp13_ = {0};
 		gint _tmp14_ = 0;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = canvas_dim;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_.height;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = content_dim;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_.height;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp12_ >= _tmp14_;
-#line 10953 "PhotoPage.c"
+#line 10969 "PhotoPage.c"
 	} else {
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 10957 "PhotoPage.c"
+#line 10973 "PhotoPage.c"
 	}
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp6_;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10963 "PhotoPage.c"
+#line 10979 "PhotoPage.c"
 }
 
 
 static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_is_panning_possible (self);
-#line 1647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 10977 "PhotoPage.c"
+#line 10993 "PhotoPage.c"
 	} else {
-#line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 10981 "PhotoPage.c"
+#line 10997 "PhotoPage.c"
 	}
 }
 
@@ -10997,47 +11013,47 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	gint _tmp26_ = 0;
 	GdkModifierType _tmp27_ = 0;
 	gboolean _tmp28_ = FALSE;
-#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11004 "PhotoPage.c"
+#line 11020 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
 		gint _tmp3_ = 0;
 		GdkModifierType _tmp4_ = 0;
 		GdkEventMotion* _tmp5_ = NULL;
-#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = x;
-#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = y;
-#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = mask;
-#line 1656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_tools_editing_tool_on_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
 #line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		editing_tools_editing_tool_on_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
+#line 1662 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = event;
-#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1662 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_event_request_motions (_tmp5_);
-#line 1661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11028 "PhotoPage.c"
+#line 11044 "PhotoPage.c"
 	}
-#line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->is_pan_in_progress;
-#line 1666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 11036 "PhotoPage.c"
+#line 11052 "PhotoPage.c"
 		gint delta_x = 0;
 		GdkEventMotion* _tmp7_ = NULL;
 		gdouble _tmp8_ = 0.0;
@@ -11059,75 +11075,75 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 		ZoomState _tmp21_ = {0};
 		GdkPoint _tmp22_ = {0};
 		ZoomState _tmp23_ = {0};
-#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = event;
-#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_->x;
-#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = self->priv->zoom_pan_start_point;
-#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_.x;
-#line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		delta_x = ((gint) _tmp8_) - _tmp10_;
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = event;
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_->y;
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = self->priv->zoom_pan_start_point;
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_.y;
-#line 1668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		delta_y = ((gint) _tmp12_) - _tmp14_;
-#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_);
-#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_get_viewport_center (&_tmp15_, &_tmp16_);
-#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center = _tmp16_;
-#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = viewport_center.x;
-#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = delta_x;
-#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center.x = _tmp17_ - _tmp18_;
-#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = viewport_center.y;
-#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = delta_y;
-#line 1672 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center.y = _tmp19_ - _tmp20_;
-#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp21_);
-#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = viewport_center;
-#line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		zoom_state_init_pan (&zoom_state, &_tmp21_, &_tmp22_);
-#line 1676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = zoom_state;
-#line 1676 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_on_interactive_pan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_);
-#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11110 "PhotoPage.c"
+#line 11126 "PhotoPage.c"
 	}
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = event;
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = x;
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = y;
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = mask;
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = PAGE_CLASS (editing_host_page_parent_class)->on_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp24_, _tmp25_, _tmp26_, _tmp27_);
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp28_;
-#line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11126 "PhotoPage.c"
+#line 11142 "PhotoPage.c"
 }
 
 
@@ -11136,83 +11152,83 @@ static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11141 "PhotoPage.c"
+#line 11157 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_tools_editing_tool_on_leave_notify_event (_tmp1_);
-#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = _tmp2_;
-#line 1685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11152 "PhotoPage.c"
+#line 11168 "PhotoPage.c"
 	}
-#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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));
-#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp3_;
-#line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11160 "PhotoPage.c"
+#line 11176 "PhotoPage.c"
 }
 
 
 static void editing_host_page_track_tool_window (EditingHostPage* self) {
 	EditingToolsEditingTool* _tmp0_ = NULL;
-#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11172 "PhotoPage.c"
+#line 11188 "PhotoPage.c"
 		EditingToolsEditingToolWindow* tool_window = NULL;
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsEditingToolWindow* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		EditingToolsEditingToolWindow* _tmp4_ = NULL;
-#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_tools_editing_tool_get_tool_window (_tmp1_);
-#line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_window = _tmp2_;
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = tool_window;
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ != NULL) {
-#line 11188 "PhotoPage.c"
+#line 11204 "PhotoPage.c"
 			EditingToolsEditingToolWindow* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = tool_window;
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_);
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = !_tmp6_;
-#line 11197 "PhotoPage.c"
+#line 11213 "PhotoPage.c"
 		} else {
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = FALSE;
-#line 11201 "PhotoPage.c"
+#line 11217 "PhotoPage.c"
 		}
-#line 1694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_) {
-#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_place_tool_window (self);
-#line 11207 "PhotoPage.c"
+#line 11223 "PhotoPage.c"
 		}
-#line 1692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 11211 "PhotoPage.c"
+#line 11227 "PhotoPage.c"
 	}
 }
 
@@ -11220,17 +11236,17 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
 	EditingHostPage * self;
 	GdkRectangle _tmp0_ = {0};
-#line 1699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_track_tool_window (self);
-#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = *rect;
-#line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 11229 "PhotoPage.c"
+#line 11245 "PhotoPage.c"
 }
 
 
@@ -11238,19 +11254,19 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r
 	EditingHostPage * self;
 	GeeHashMap* _tmp0_ = NULL;
 	GdkRectangle _tmp1_ = {0};
-#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (rect != NULL);
-#line 1706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->last_locations;
-#line 1706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_abstract_map_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap));
-#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = *rect;
-#line 1708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 11249 "PhotoPage.c"
+#line 11265 "PhotoPage.c"
 }
 
 
@@ -11265,153 +11281,153 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	GQuark _tmp7_ = 0U;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label0 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label1 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label2 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label3 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label4 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label5 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label6 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label7 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label8 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label9 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label10 = 0;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp6_label11 = 0;
-#line 11288 "PhotoPage.c"
+#line 11304 "PhotoPage.c"
 	ZoomState new_zoom_state = {0};
 	ZoomState _tmp12_ = {0};
 	GdkPoint _tmp13_ = {0};
 	ZoomState _tmp14_ = {0};
-#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
-#line 1712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current_zoom_state = _tmp0_;
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewport_center (&current_zoom_state, &_tmp1_);
-#line 1713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center = _tmp1_;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (((_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("Left")))) || (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp7_ == ((0 != _tmp6_label2) ? _tmp6_label2 : (_tmp6_label2 = g_quark_from_static_string ("KP_4"))))) {
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11319 "PhotoPage.c"
+#line 11335 "PhotoPage.c"
 			default:
 			{
 				gint _tmp8_ = 0;
-#line 1719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp8_ = viewport_center.x;
-#line 1719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11329 "PhotoPage.c"
+#line 11345 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp7_ == ((0 != _tmp6_label3) ? _tmp6_label3 : (_tmp6_label3 = g_quark_from_static_string ("Right")))) || (_tmp7_ == ((0 != _tmp6_label4) ? _tmp6_label4 : (_tmp6_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp7_ == ((0 != _tmp6_label5) ? _tmp6_label5 : (_tmp6_label5 = g_quark_from_static_string ("KP_6"))))) {
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11335 "PhotoPage.c"
+#line 11351 "PhotoPage.c"
 			default:
 			{
 				gint _tmp9_ = 0;
-#line 1725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp9_ = viewport_center.x;
-#line 1725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11345 "PhotoPage.c"
+#line 11361 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp7_ == ((0 != _tmp6_label6) ? _tmp6_label6 : (_tmp6_label6 = g_quark_from_static_string ("Down")))) || (_tmp7_ == ((0 != _tmp6_label7) ? _tmp6_label7 : (_tmp6_label7 = g_quark_from_static_string ("KP_Down"))))) || (_tmp7_ == ((0 != _tmp6_label8) ? _tmp6_label8 : (_tmp6_label8 = g_quark_from_static_string ("KP_2"))))) {
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11351 "PhotoPage.c"
+#line 11367 "PhotoPage.c"
 			default:
 			{
 				gint _tmp10_ = 0;
-#line 1731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = viewport_center.y;
-#line 1731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11361 "PhotoPage.c"
+#line 11377 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp7_ == ((0 != _tmp6_label9) ? _tmp6_label9 : (_tmp6_label9 = g_quark_from_static_string ("Up")))) || (_tmp7_ == ((0 != _tmp6_label10) ? _tmp6_label10 : (_tmp6_label10 = g_quark_from_static_string ("KP_Up"))))) || (_tmp7_ == ((0 != _tmp6_label11) ? _tmp6_label11 : (_tmp6_label11 = g_quark_from_static_string ("KP_8"))))) {
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11367 "PhotoPage.c"
+#line 11383 "PhotoPage.c"
 			default:
 			{
 				gint _tmp11_ = 0;
-#line 1737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = viewport_center.y;
-#line 1737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
-#line 1738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11377 "PhotoPage.c"
+#line 11393 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 1715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11383 "PhotoPage.c"
+#line 11399 "PhotoPage.c"
 			default:
 			{
-#line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = FALSE;
-#line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 11390 "PhotoPage.c"
+#line 11406 "PhotoPage.c"
 			}
 		}
 	}
-#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = current_zoom_state;
-#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = viewport_center;
-#line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_init_pan (&new_zoom_state, &_tmp12_, &_tmp13_);
-#line 1745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_zoom_state;
-#line 1745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp14_);
-#line 1746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11410 "PhotoPage.c"
+#line 11426 "PhotoPage.c"
 }
 
 
@@ -11428,212 +11444,212 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	const gchar* _tmp11_ = NULL;
 	const gchar* _tmp12_ = NULL;
 	GQuark _tmp14_ = 0U;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label0 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label1 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label2 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label3 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label4 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label5 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label6 = 0;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp13_label7 = 0;
-#line 11443 "PhotoPage.c"
+#line 11459 "PhotoPage.c"
 	gboolean _tmp15_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11454 "PhotoPage.c"
+#line 11470 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		GdkEventKey* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = event;
-#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_tools_editing_tool_on_keypress (_tmp1_, _tmp2_);
-#line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_) {
-#line 1755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			result = TRUE;
-#line 1755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11470 "PhotoPage.c"
+#line 11486 "PhotoPage.c"
 		}
 	}
-#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_is_panning_possible (self);
-#line 1759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11477 "PhotoPage.c"
+#line 11493 "PhotoPage.c"
 		GdkEventKey* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = event;
-#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_on_keyboard_pan_event (self, _tmp5_);
-#line 1760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 1761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			result = TRUE;
-#line 1761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11490 "PhotoPage.c"
+#line 11506 "PhotoPage.c"
 		}
 	}
-#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
-#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = editing_host_page_on_zoom_slider_key_press (self, _tmp7_);
-#line 1767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_) {
-#line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11503 "PhotoPage.c"
+#line 11519 "PhotoPage.c"
 	}
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = event;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_->keyval;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = gdk_keyval_name (_tmp10_);
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = (NULL == _tmp12_) ? 0 : g_quark_from_string (_tmp12_);
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((_tmp14_ == ((0 != _tmp13_label0) ? _tmp13_label0 : (_tmp13_label0 = g_quark_from_static_string ("Down")))) || (_tmp14_ == ((0 != _tmp13_label1) ? _tmp13_label1 : (_tmp13_label1 = g_quark_from_static_string ("KP_Down"))))) {
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11521 "PhotoPage.c"
+#line 11537 "PhotoPage.c"
 			default:
 			{
-#line 1777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11526 "PhotoPage.c"
+#line 11542 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp14_ == ((0 != _tmp13_label2) ? _tmp13_label2 : (_tmp13_label2 = g_quark_from_static_string ("equal")))) || (_tmp14_ == ((0 != _tmp13_label3) ? _tmp13_label3 : (_tmp13_label3 = g_quark_from_static_string ("plus"))))) || (_tmp14_ == ((0 != _tmp13_label4) ? _tmp13_label4 : (_tmp13_label4 = g_quark_from_static_string ("KP_Add"))))) {
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11532 "PhotoPage.c"
+#line 11548 "PhotoPage.c"
 			default:
 			{
-#line 1782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
-#line 1783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11539 "PhotoPage.c"
+#line 11555 "PhotoPage.c"
 			}
 		}
 	} else if (((_tmp14_ == ((0 != _tmp13_label5) ? _tmp13_label5 : (_tmp13_label5 = g_quark_from_static_string ("minus")))) || (_tmp14_ == ((0 != _tmp13_label6) ? _tmp13_label6 : (_tmp13_label6 = g_quark_from_static_string ("underscore"))))) || (_tmp14_ == ((0 != _tmp13_label7) ? _tmp13_label7 : (_tmp13_label7 = g_quark_from_static_string ("KP_Subtract"))))) {
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11545 "PhotoPage.c"
+#line 11561 "PhotoPage.c"
 			default:
 			{
-#line 1789 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
-#line 1790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11552 "PhotoPage.c"
+#line 11568 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 1772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11558 "PhotoPage.c"
+#line 11574 "PhotoPage.c"
 			default:
 			{
-#line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
-#line 1794 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11565 "PhotoPage.c"
+#line 11581 "PhotoPage.c"
 			}
 		}
 	}
-#line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = handled;
-#line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 1798 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11577 "PhotoPage.c"
+#line 11593 "PhotoPage.c"
 	}
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) {
-#line 11581 "PhotoPage.c"
+#line 11597 "PhotoPage.c"
 		GdkEventKey* _tmp17_ = NULL;
 		gboolean _tmp18_ = FALSE;
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = event;
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp17_);
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp18_;
-#line 11590 "PhotoPage.c"
+#line 11606 "PhotoPage.c"
 	} else {
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = TRUE;
-#line 11594 "PhotoPage.c"
+#line 11610 "PhotoPage.c"
 	}
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp16_;
-#line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11600 "PhotoPage.c"
+#line 11616 "PhotoPage.c"
 }
 
 
 static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* default_ctx, Dimensions* dim) {
 	EditingHostPage * self;
 	EditingToolsEditingTool* _tmp0_ = NULL;
-#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (default_ctx != NULL);
-#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (dim != NULL);
-#line 1805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11617 "PhotoPage.c"
+#line 11633 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		EditingToolsPhotoCanvas* _tmp2_ = NULL;
 		cairo_t* _tmp3_ = NULL;
 		Dimensions _tmp4_ = {0};
-#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_->canvas;
-#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = default_ctx;
-#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = *dim;
-#line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_);
-#line 11632 "PhotoPage.c"
+#line 11648 "PhotoPage.c"
 	}
 }
 
@@ -11642,130 +11658,130 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 	EditingHostPage * self;
 	gboolean _tmp0_ = FALSE;
 	EditingToolsEditingTool* _tmp1_ = NULL;
-#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (old_dim != NULL);
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 11651 "PhotoPage.c"
+#line 11667 "PhotoPage.c"
 		SinglePhotoPageUpdateReason _tmp2_ = 0;
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = reason;
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 11657 "PhotoPage.c"
+#line 11673 "PhotoPage.c"
 	} else {
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 11661 "PhotoPage.c"
+#line 11677 "PhotoPage.c"
 	}
-#line 1813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 11665 "PhotoPage.c"
+#line 11681 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp3_ = NULL;
 		EditingToolsPhotoCanvas* _tmp4_ = NULL;
 		Dimensions _tmp5_ = {0};
 		GdkPixbuf* _tmp6_ = NULL;
 		GdkRectangle _tmp7_ = {0};
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->current_tool;
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_->canvas;
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = *old_dim;
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = pixbuf;
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_);
-#line 1814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_photo_canvas_resized_pixbuf (_tmp4_, &_tmp5_, _tmp6_, &_tmp7_);
-#line 1815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->cancel_editing_pixbuf);
-#line 1815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->cancel_editing_pixbuf = NULL;
-#line 11687 "PhotoPage.c"
+#line 11703 "PhotoPage.c"
 	}
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11698 "PhotoPage.c"
+#line 11714 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gint scale) {
-#line 1819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale);
-#line 11707 "PhotoPage.c"
+#line 11723 "PhotoPage.c"
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11717 "PhotoPage.c"
+#line 11733 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint scale) {
-#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale);
-#line 11726 "PhotoPage.c"
+#line 11742 "PhotoPage.c"
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11736 "PhotoPage.c"
+#line 11752 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint scale) {
-#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale);
-#line 11745 "PhotoPage.c"
+#line 11761 "PhotoPage.c"
 }
 
 
 static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self, gint scale) {
 	GdkPixbuf* result = NULL;
-#line 1832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
-#line 1832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11755 "PhotoPage.c"
+#line 11771 "PhotoPage.c"
 }
 
 
 GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gint scale) {
-#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
-#line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale);
-#line 11764 "PhotoPage.c"
+#line 11780 "PhotoPage.c"
 }
 
 
@@ -11789,48 +11805,48 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	GdkPixbuf* _tmp74_ = NULL;
 	GdkPixbuf* _tmp98_ = NULL;
 	GdkPixbuf* _tmp99_ = NULL;
-#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (ctx != NULL);
-#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (ctx_dim != NULL);
-#line 1836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 1836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11798 "PhotoPage.c"
+#line 11814 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_ = NULL;
 		cairo_t* _tmp2_ = NULL;
-#line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
-#line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = ctx;
-#line 1837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_editing_tool_paint (_tmp1_, _tmp2_);
-#line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11809 "PhotoPage.c"
+#line 11825 "PhotoPage.c"
 	}
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = self->priv->photo_missing;
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 11815 "PhotoPage.c"
+#line 11831 "PhotoPage.c"
 		gboolean _tmp5_ = FALSE;
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = editing_host_page_has_photo (self);
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp5_;
-#line 11821 "PhotoPage.c"
+#line 11837 "PhotoPage.c"
 	} else {
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = FALSE;
-#line 11825 "PhotoPage.c"
+#line 11841 "PhotoPage.c"
 	}
-#line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 11829 "PhotoPage.c"
+#line 11845 "PhotoPage.c"
 		cairo_t* _tmp6_ = NULL;
 		cairo_t* _tmp7_ = NULL;
 		Dimensions _tmp8_ = {0};
@@ -11848,91 +11864,91 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gchar* _tmp20_ = NULL;
 		gchar* _tmp21_ = NULL;
 		gchar* _tmp22_ = NULL;
-#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = ctx;
-#line 1843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		set_source_color_from_string (_tmp6_, "#000");
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = ctx;
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp8_.width;
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_.height;
-#line 1844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp7_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp9_, (gdouble) _tmp11_);
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = ctx;
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp12_);
-#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = ctx;
-#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_paint (_tmp13_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _ ("Photo source file missing: %s");
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = editing_host_page_get_photo (self);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = g_strdup_printf (_tmp14_, _tmp20_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_draw_message (self, _tmp22_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp22_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp20_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11901 "PhotoPage.c"
+#line 11917 "PhotoPage.c"
 	}
-#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = ctx;
-#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = *ctx_dim;
-#line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_);
-#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp25_);
-#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = zoom_state_is_default (&_tmp25_);
-#line 1853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp26_) {
-#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11917 "PhotoPage.c"
+#line 11933 "PhotoPage.c"
 	}
-#line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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), &_tmp27_);
-#line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaled_rect = _tmp27_;
-#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp28_;
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp29_ = trinket;
-#line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp29_ != NULL) {
-#line 11931 "PhotoPage.c"
+#line 11947 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp30_ = {0};
 		gint _tmp31_ = 0;
@@ -11958,75 +11974,75 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp50_ = 0;
 		gint _tmp51_ = 0;
 		cairo_t* _tmp52_ = NULL;
-#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = scaled_rect;
-#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = _tmp30_.x;
-#line 1861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = _tmp31_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = scaled_rect;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = _tmp32_.y;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = scaled_rect;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp35_ = _tmp34_.height;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = trinket;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = gdk_pixbuf_get_height (_tmp36_);
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = _tmp37_;
-#line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = ((_tmp33_ + _tmp35_) - _tmp38_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = ctx;
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = trinket;
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp41_ = x;
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp42_ = y;
-#line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp39_, _tmp40_, (gdouble) _tmp41_, (gdouble) _tmp42_);
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp43_ = ctx;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp44_ = x;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp45_ = y;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp46_ = trinket;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = gdk_pixbuf_get_width (_tmp46_);
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = _tmp47_;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp49_ = trinket;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp50_ = gdk_pixbuf_get_height (_tmp49_);
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = _tmp50_;
-#line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp43_, (gdouble) _tmp44_, (gdouble) _tmp45_, (gdouble) _tmp48_, (gdouble) _tmp51_);
-#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = ctx;
-#line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp52_);
-#line 12013 "PhotoPage.c"
+#line 12029 "PhotoPage.c"
 	}
-#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp53_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp53_;
-#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp54_ = trinket;
-#line 1869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp54_ != NULL) {
-#line 12025 "PhotoPage.c"
+#line 12041 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp55_ = {0};
 		gint _tmp56_ = 0;
@@ -12047,65 +12063,65 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp70_ = 0;
 		gint _tmp71_ = 0;
 		cairo_t* _tmp72_ = NULL;
-#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = scaled_rect;
-#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp56_ = _tmp55_.x;
-#line 1870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = _tmp56_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp57_ = scaled_rect;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp58_ = _tmp57_.y;
-#line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = _tmp58_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp59_ = ctx;
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp60_ = trinket;
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp61_ = x;
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp62_ = y;
-#line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp59_, _tmp60_, (gdouble) _tmp61_, (gdouble) _tmp62_);
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp63_ = ctx;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp64_ = x;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp65_ = y;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp66_ = trinket;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp67_ = gdk_pixbuf_get_width (_tmp66_);
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp68_ = _tmp67_;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp69_ = trinket;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp70_ = gdk_pixbuf_get_height (_tmp69_);
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp71_ = _tmp70_;
-#line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp63_, (gdouble) _tmp64_, (gdouble) _tmp65_, (gdouble) _tmp68_, (gdouble) _tmp71_);
-#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp72_ = ctx;
-#line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp72_);
-#line 12092 "PhotoPage.c"
+#line 12108 "PhotoPage.c"
 	}
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp73_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp73_;
-#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp74_ = trinket;
-#line 1878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp74_ != NULL) {
-#line 12104 "PhotoPage.c"
+#line 12120 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp75_ = {0};
 		gint _tmp76_ = 0;
@@ -12131,75 +12147,75 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp95_ = 0;
 		gint _tmp96_ = 0;
 		cairo_t* _tmp97_ = NULL;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp75_ = scaled_rect;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp76_ = _tmp75_.x;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp77_ = scaled_rect;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp78_ = _tmp77_.width;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp79_ = trinket;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp80_ = gdk_pixbuf_get_width (_tmp79_);
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp81_ = _tmp80_;
-#line 1879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = ((_tmp76_ + _tmp78_) - _tmp81_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp82_ = scaled_rect;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp83_ = _tmp82_.y;
-#line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = _tmp83_ + EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp84_ = ctx;
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp85_ = trinket;
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp86_ = x;
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp87_ = y;
-#line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp84_, _tmp85_, (gdouble) _tmp86_, (gdouble) _tmp87_);
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp88_ = ctx;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp89_ = x;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp90_ = y;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp91_ = trinket;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp92_ = gdk_pixbuf_get_width (_tmp91_);
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp93_ = _tmp92_;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp94_ = trinket;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp95_ = gdk_pixbuf_get_height (_tmp94_);
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp96_ = _tmp95_;
-#line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp93_, (gdouble) _tmp96_);
-#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp97_ = ctx;
-#line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp97_);
-#line 12186 "PhotoPage.c"
+#line 12202 "PhotoPage.c"
 	}
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp98_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	trinket = _tmp98_;
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp99_ = trinket;
-#line 1887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp99_ != NULL) {
-#line 12198 "PhotoPage.c"
+#line 12214 "PhotoPage.c"
 		gint x = 0;
 		GdkRectangle _tmp100_ = {0};
 		gint _tmp101_ = 0;
@@ -12230,94 +12246,94 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 		gint _tmp125_ = 0;
 		gint _tmp126_ = 0;
 		cairo_t* _tmp127_ = NULL;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp100_ = scaled_rect;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp101_ = _tmp100_.x;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp102_ = scaled_rect;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp103_ = _tmp102_.width;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp104_ = trinket;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp105_ = gdk_pixbuf_get_width (_tmp104_);
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp106_ = _tmp105_;
-#line 1888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		x = ((_tmp101_ + _tmp103_) - _tmp106_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp107_ = scaled_rect;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp108_ = _tmp107_.y;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp109_ = scaled_rect;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp110_ = _tmp109_.height;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp111_ = trinket;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp112_ = gdk_pixbuf_get_height (_tmp111_);
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp113_ = _tmp112_;
-#line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		y = ((_tmp108_ + _tmp110_) - _tmp113_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp114_ = ctx;
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp115_ = trinket;
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp116_ = x;
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp117_ = y;
-#line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gdk_cairo_set_source_pixbuf (_tmp114_, _tmp115_, (gdouble) _tmp116_, (gdouble) _tmp117_);
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp118_ = ctx;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp119_ = x;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp120_ = y;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp121_ = trinket;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp122_ = gdk_pixbuf_get_width (_tmp121_);
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp123_ = _tmp122_;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp124_ = trinket;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp125_ = gdk_pixbuf_get_height (_tmp124_);
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp126_ = _tmp125_;
-#line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_rectangle (_tmp118_, (gdouble) _tmp119_, (gdouble) _tmp120_, (gdouble) _tmp123_, (gdouble) _tmp126_);
-#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp127_ = ctx;
-#line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		cairo_fill (_tmp127_);
-#line 12295 "PhotoPage.c"
+#line 12311 "PhotoPage.c"
 	}
-#line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 12299 "PhotoPage.c"
+#line 12315 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 1896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 1896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp0_;
-#line 1897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 12316 "PhotoPage.c"
+#line 12332 "PhotoPage.c"
 }
 
 
@@ -12335,93 +12351,93 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 	CommandManager* _tmp9_ = NULL;
 	CommandManager* _tmp10_ = NULL;
 	RotateSingleCommand* _tmp11_ = NULL;
-#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (name != NULL);
-#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (description != NULL);
-#line 1901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 1905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 1905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12352 "PhotoPage.c"
+#line 12368 "PhotoPage.c"
 	}
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = rotation;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = name;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = description;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = rotate_single_command_new (_tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp8_;
-#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = command;
-#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 1910 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp10_);
-#line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12384 "PhotoPage.c"
+#line 12400 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_rotate_clockwise (EditingHostPage* self) {
-#line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 12393 "PhotoPage.c"
+#line 12409 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) {
-#line 1917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 12402 "PhotoPage.c"
+#line 12418 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_flip_horizontally (EditingHostPage* self) {
-#line 1921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1922 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "");
-#line 12411 "PhotoPage.c"
+#line 12427 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_flip_vertically (EditingHostPage* self) {
-#line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "");
-#line 12420 "PhotoPage.c"
+#line 12436 "PhotoPage.c"
 }
 
 
@@ -12441,41 +12457,41 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	CommandManager* _tmp21_ = NULL;
 	CommandManager* _tmp22_ = NULL;
 	RevertSingleCommand* _tmp23_ = NULL;
-#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 1930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 1931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12448 "PhotoPage.c"
+#line 12464 "PhotoPage.c"
 	}
-#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
-#line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
-#line 1935 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 1935 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12460 "PhotoPage.c"
+#line 12476 "PhotoPage.c"
 	}
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (self);
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = photo_has_editable (_tmp4_);
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 12474 "PhotoPage.c"
+#line 12490 "PhotoPage.c"
 		AppWindow* _tmp7_ = NULL;
 		AppWindow* _tmp8_ = NULL;
 		ViewCollection* _tmp9_ = NULL;
@@ -12486,73 +12502,73 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 		gboolean _tmp14_ = FALSE;
 		Photo* _tmp15_ = NULL;
 		Photo* _tmp16_ = NULL;
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = app_window_get_instance ();
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = view_collection_get_sources (_tmp10_);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp12_);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = !_tmp13_;
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp10_);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp14_) {
-#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 12511 "PhotoPage.c"
+#line 12527 "PhotoPage.c"
 		}
-#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = editing_host_page_get_photo (self);
-#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_revert_to_master (_tmp16_, TRUE);
-#line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 12521 "PhotoPage.c"
+#line 12537 "PhotoPage.c"
 	}
-#line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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));
-#line 1949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, FALSE);
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = editing_host_page_get_photo (self);
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = _tmp17_;
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = revert_single_command_new (_tmp18_);
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = _tmp19_;
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp18_);
-#line 1951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp20_;
-#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = command;
-#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp22_);
-#line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12551 "PhotoPage.c"
+#line 12567 "PhotoPage.c"
 }
 
 
@@ -12578,104 +12594,104 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	CommandManager* _tmp16_ = NULL;
 	CommandManager* _tmp17_ = NULL;
 	EditTitleCommand* _tmp18_ = NULL;
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_LIBRARY_PHOTO);
-#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12589 "PhotoPage.c"
+#line 12605 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp3_) : NULL;
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ == NULL) {
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12600 "PhotoPage.c"
+#line 12616 "PhotoPage.c"
 		}
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12606 "PhotoPage.c"
+#line 12622 "PhotoPage.c"
 	} else {
-#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12612 "PhotoPage.c"
+#line 12628 "PhotoPage.c"
 	}
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = media_source_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = edit_title_dialog_new (_tmp7_);
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp7_);
-#line 1962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	edit_title_dialog = _tmp9_;
-#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = edit_title_dialog;
-#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = edit_title_dialog_execute (_tmp10_);
-#line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_title = _tmp11_;
-#line 1964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = new_title;
-#line 1964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_ == NULL) {
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (new_title);
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_text_entry_dialog_mediator_unref0 (edit_title_dialog);
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12646 "PhotoPage.c"
+#line 12662 "PhotoPage.c"
 	}
-#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
-#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_title;
-#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = edit_title_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), _tmp14_);
-#line 1967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp15_;
-#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = command;
-#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command));
-#line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp17_);
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (new_title);
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
-#line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12674 "PhotoPage.c"
+#line 12690 "PhotoPage.c"
 }
 
 
@@ -12701,104 +12717,104 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	CommandManager* _tmp16_ = NULL;
 	CommandManager* _tmp17_ = NULL;
 	EditCommentCommand* _tmp18_ = NULL;
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (self);
-#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_LIBRARY_PHOTO);
-#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12712 "PhotoPage.c"
+#line 12728 "PhotoPage.c"
 		Photo* _tmp3_ = NULL;
 		LibraryPhoto* _tmp4_ = NULL;
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (self);
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, TYPE_LIBRARY_PHOTO) ? ((LibraryPhoto*) _tmp3_) : NULL;
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ == NULL) {
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12723 "PhotoPage.c"
+#line 12739 "PhotoPage.c"
 		}
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12729 "PhotoPage.c"
+#line 12745 "PhotoPage.c"
 	} else {
-#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12735 "PhotoPage.c"
+#line 12751 "PhotoPage.c"
 	}
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = media_source_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = edit_comment_dialog_new (_tmp7_, FALSE);
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp7_);
-#line 1978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	edit_comment_dialog = _tmp9_;
-#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = edit_comment_dialog;
-#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = edit_comment_dialog_execute (_tmp10_);
-#line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_comment = _tmp11_;
-#line 1980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = new_comment;
-#line 1980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_ == NULL) {
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (new_comment);
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
-#line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12769 "PhotoPage.c"
+#line 12785 "PhotoPage.c"
 	}
-#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
-#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_comment;
-#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = edit_comment_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), _tmp14_);
-#line 1983 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp15_;
-#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = command;
-#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command));
-#line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp17_);
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (new_comment);
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
-#line 1971 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12797 "PhotoPage.c"
+#line 12813 "PhotoPage.c"
 }
 
 
@@ -12817,43 +12833,43 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
 	gboolean _tmp9_ = FALSE;
-#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 1988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 1988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 1989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12824 "PhotoPage.c"
+#line 12840 "PhotoPage.c"
 	}
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = adjust_date_time_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATEABLE, Dateable), 1, !G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE), FALSE, FALSE);
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp3_);
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp4_;
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = dialog;
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = adjust_date_time_dialog_execute (_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	time_shift = _tmp6_;
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	keep_relativity = _tmp7_;
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	modify_originals = _tmp8_;
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp9_) {
-#line 12852 "PhotoPage.c"
+#line 12868 "PhotoPage.c"
 		ViewCollection* _tmp10_ = NULL;
 		ViewCollection* _tmp11_ = NULL;
 		GeeList* _tmp12_ = NULL;
@@ -12868,63 +12884,63 @@ void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
 		CommandManager* _tmp20_ = NULL;
 		CommandManager* _tmp21_ = NULL;
 		AdjustDateTimePhotoCommand* _tmp22_ = NULL;
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = view_collection_get_selected (_tmp11_);
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = _tmp12_;
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp13_);
-#line 1996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp11_);
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = editing_host_page_get_photo (self);
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = time_shift;
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = modify_originals;
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = adjust_date_time_photo_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATEABLE, Dateable), _tmp16_, _tmp17_);
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command = _tmp19_;
-#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = command;
-#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command));
-#line 2000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp21_);
-#line 1995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 12907 "PhotoPage.c"
+#line 12923 "PhotoPage.c"
 	}
-#line 1987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (dialog);
-#line 12911 "PhotoPage.c"
+#line 12927 "PhotoPage.c"
 }
 
 
 void editing_host_page_on_set_background (EditingHostPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 12923 "PhotoPage.c"
+#line 12939 "PhotoPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
 		SetBackgroundPhotoDialog* _tmp1_ = NULL;
 		gboolean desktop = FALSE;
@@ -12933,23 +12949,23 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
-#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = set_background_photo_dialog_new ();
-#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_object_ref_sink (_tmp1_);
-#line 2006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dialog = _tmp1_;
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = dialog;
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = set_background_photo_dialog_execute (_tmp2_, &_tmp3_, &_tmp4_);
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		desktop = _tmp3_;
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		screensaver = _tmp4_;
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_) {
-#line 12948 "PhotoPage.c"
+#line 12964 "PhotoPage.c"
 			AppWindow* _tmp6_ = NULL;
 			AppWindow* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
@@ -12958,47 +12974,47 @@ void editing_host_page_on_set_background (EditingHostPage* self) {
 			gboolean _tmp11_ = FALSE;
 			AppWindow* _tmp12_ = NULL;
 			AppWindow* _tmp13_ = NULL;
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp6_ = app_window_get_instance ();
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = _tmp6_;
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp7_);
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = editing_host_page_get_photo (self);
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = _tmp8_;
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp10_ = desktop;
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp11_ = screensaver;
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			desktop_integration_set_background (_tmp9_, _tmp10_, _tmp11_);
-#line 2010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp9_);
-#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp12_ = app_window_get_instance ();
-#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = _tmp12_;
-#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp13_);
-#line 12985 "PhotoPage.c"
+#line 13001 "PhotoPage.c"
 		}
-#line 2005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (dialog);
-#line 12989 "PhotoPage.c"
+#line 13005 "PhotoPage.c"
 	}
 }
 
 
 static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
-#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 12997 "PhotoPage.c"
+#line 13013 "PhotoPage.c"
 }
 
 
@@ -13014,47 +13030,47 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	EditingToolsEditingTool* _tmp6_ = NULL;
 	GdkEventKey* _tmp7_ = NULL;
 	gboolean _tmp8_ = FALSE;
-#line 2016 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->rotate_button;
-#line 2017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_icon_name (_tmp0_, RESOURCES_COUNTERCLOCKWISE);
-#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->rotate_button;
-#line 2018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_label (_tmp1_, RESOURCES_ROTATE_CCW_LABEL);
-#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->rotate_button;
-#line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->rotate_button;
-#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("clicked", gtk_tool_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self);
-#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = self->priv->rotate_button;
-#line 2021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked, self, 0);
-#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->current_tool;
-#line 2023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ == NULL) {
-#line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2027 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 13043 "PhotoPage.c"
+#line 13059 "PhotoPage.c"
 	}
-#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = event;
-#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_);
-#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp8_;
-#line 2026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13053 "PhotoPage.c"
+#line 13069 "PhotoPage.c"
 }
 
 
@@ -13072,75 +13088,75 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	EditingToolsEditingTool* _tmp8_ = NULL;
 	GdkEventKey* _tmp11_ = NULL;
 	gboolean _tmp12_ = FALSE;
-#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->rotate_button;
-#line 2030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_icon_name (_tmp0_, RESOURCES_CLOCKWISE);
-#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->rotate_button;
-#line 2031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_button_set_label (_tmp1_, RESOURCES_ROTATE_CW_LABEL);
-#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->rotate_button;
-#line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
-#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->rotate_button;
-#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("clicked", gtk_tool_button_get_type (), &_tmp4_, NULL, FALSE);
-#line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked, self);
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = self->priv->rotate_button;
-#line 2034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp5_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0);
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = self->priv->current_tool;
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ == NULL) {
-#line 13099 "PhotoPage.c"
+#line 13115 "PhotoPage.c"
 		gboolean _tmp9_ = FALSE;
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp9_;
-#line 13105 "PhotoPage.c"
+#line 13121 "PhotoPage.c"
 	} else {
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = FALSE;
-#line 13109 "PhotoPage.c"
+#line 13125 "PhotoPage.c"
 	}
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 13113 "PhotoPage.c"
+#line 13129 "PhotoPage.c"
 		gboolean _tmp10_ = FALSE;
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = !_tmp10_;
-#line 13119 "PhotoPage.c"
+#line 13135 "PhotoPage.c"
 	} else {
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 13123 "PhotoPage.c"
+#line 13139 "PhotoPage.c"
 	}
-#line 2036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 2037 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 13129 "PhotoPage.c"
+#line 13145 "PhotoPage.c"
 	}
-#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = event;
-#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp11_);
-#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp12_;
-#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13139 "PhotoPage.c"
+#line 13155 "PhotoPage.c"
 }
 
 
@@ -13163,92 +13179,92 @@ void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleT
 	EditingToolsEditingTool* _tmp15_ = NULL;
 	EditingToolsEditingTool* _tmp16_ = NULL;
 	EditingToolsEditingTool* _tmp17_ = NULL;
-#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_return_if_fail (GTK_IS_TOGGLE_TOOL_BUTTON (toggle));
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	g_return_if_fail (GTK_IS_TOGGLE_TOOL_BUTTON (toggle));
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = toggle;
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp3_) {
-#line 13174 "PhotoPage.c"
+#line 13190 "PhotoPage.c"
 		GtkToggleToolButton* _tmp4_ = NULL;
 		GtkToggleToolButton* _tmp5_ = NULL;
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = self->priv->current_editing_toggle;
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = toggle;
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp4_ == _tmp5_;
-#line 13183 "PhotoPage.c"
+#line 13199 "PhotoPage.c"
 	} else {
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 13187 "PhotoPage.c"
+#line 13203 "PhotoPage.c"
 	}
-#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	deactivating_only = _tmp0_;
-#line 2046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp6_, 0, 0);
-#line 2046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp6_, FALSE);
-#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = deactivating_only;
-#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13203 "PhotoPage.c"
+#line 13219 "PhotoPage.c"
 	}
-#line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = toggle;
-#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->current_editing_toggle);
-#line 2055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->current_editing_toggle = _tmp9_;
 #line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self->priv->current_editing_toggle = _tmp9_;
+#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = factory;
-#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = _tmp10_ ();
-#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool = _tmp11_;
-#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = tool;
-#line 2059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp12_, "activated", (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self, 0);
-#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = tool;
-#line 2060 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp13_, "deactivated", (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self, 0);
-#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = tool;
-#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp14_, "applied", (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self, 0);
-#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = tool;
-#line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp15_, "cancelled", (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self, 0);
-#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = tool;
-#line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (_tmp16_, "aborted", (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self, 0);
-#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = tool;
-#line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_activate_tool (self, _tmp17_);
-#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 13247 "PhotoPage.c"
+#line 13263 "PhotoPage.c"
 }
 
 
@@ -13256,21 +13272,21 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkScale* _tmp1_ = NULL;
 	GtkToggleToolButton* _tmp2_ = NULL;
-#line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_editing_toggle;
-#line 2069 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2072 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp0_ != NULL, "current_editing_toggle != null");
-#line 2070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 2070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2073 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->current_editing_toggle;
-#line 2071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, TRUE);
-#line 13269 "PhotoPage.c"
+#line 13285 "PhotoPage.c"
 }
 
 
@@ -13278,21 +13294,21 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkScale* _tmp1_ = NULL;
 	GtkToggleToolButton* _tmp2_ = NULL;
-#line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_editing_toggle;
-#line 2075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp0_ != NULL, "current_editing_toggle != null");
-#line 2076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
-#line 2076 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->current_editing_toggle;
-#line 2077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, FALSE);
-#line 13291 "PhotoPage.c"
+#line 13307 "PhotoPage.c"
 }
 
 
@@ -13301,55 +13317,55 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c
 	GdkPixbuf* _tmp1_ = NULL;
 	Dimensions _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((command == NULL) || IS_COMMAND (command));
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((new_pixbuf == NULL) || GDK_IS_PIXBUF (new_pixbuf));
-#line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (new_max_dim != NULL);
-#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = command;
-#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = new_pixbuf;
-#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = *new_max_dim;
-#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = needs_improvement;
-#line 2082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_);
-#line 13318 "PhotoPage.c"
+#line 13334 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_tool_cancelled (EditingHostPage* self) {
 	Dimensions _tmp0_ = {0};
-#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 2088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 2089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 13334 "PhotoPage.c"
+#line 13350 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_tool_aborted (EditingHostPage* self) {
 	Dimensions _tmp0_ = {0};
-#line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 2094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, TRUE);
-#line 13348 "PhotoPage.c"
+#line 13364 "PhotoPage.c"
 }
 
 
@@ -13357,17 +13373,17 @@ void editing_host_page_toggle_crop (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->crop_button;
-#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->crop_button;
-#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13366 "PhotoPage.c"
+#line 13382 "PhotoPage.c"
 }
 
 
@@ -13375,17 +13391,17 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->straighten_button;
-#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->straighten_button;
-#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13384 "PhotoPage.c"
+#line 13400 "PhotoPage.c"
 }
 
 
@@ -13393,17 +13409,17 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->redeye_button;
-#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->redeye_button;
-#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13402 "PhotoPage.c"
+#line 13418 "PhotoPage.c"
 }
 
 
@@ -13411,118 +13427,118 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
 	GtkToggleToolButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->adjust_button;
-#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->adjust_button;
-#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2110 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13420 "PhotoPage.c"
+#line 13436 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_straighten_tool_factory ();
-#line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13429 "PhotoPage.c"
+#line 13445 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_straighten_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->straighten_button;
-#line 2114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 13441 "PhotoPage.c"
+#line 13457 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_crop_tool_factory ();
-#line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13450 "PhotoPage.c"
+#line 13466 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_crop_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->crop_button;
-#line 2118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 13462 "PhotoPage.c"
+#line 13478 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_redeye_tool_factory ();
-#line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13471 "PhotoPage.c"
+#line 13487 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_redeye_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->redeye_button;
-#line 2122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 13483 "PhotoPage.c"
+#line 13499 "PhotoPage.c"
 }
 
 
 static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory (void) {
 	EditingToolsEditingTool* result;
 	result = editing_tools_adjust_tool_factory ();
-#line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13492 "PhotoPage.c"
+#line 13508 "PhotoPage.c"
 }
 
 
 static void editing_host_page_on_adjust_toggled (EditingHostPage* self) {
 	GtkToggleToolButton* _tmp0_ = NULL;
-#line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->adjust_button;
-#line 2126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 13504 "PhotoPage.c"
+#line 13520 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
-#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
-#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = !_tmp0_;
-#line 2130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13521 "PhotoPage.c"
+#line 13537 "PhotoPage.c"
 }
 
 
@@ -13541,79 +13557,79 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 	CommandManager* _tmp11_ = NULL;
 	CommandManager* _tmp12_ = NULL;
 	EnhanceSingleCommand* _tmp13_ = NULL;
-#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 2137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 13546 "PhotoPage.c"
+#line 13562 "PhotoPage.c"
 		Dimensions _tmp1_ = {0};
-#line 2138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dimensions_init (&_tmp1_, 0, 0);
-#line 2138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
-#line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 13554 "PhotoPage.c"
+#line 13570 "PhotoPage.c"
 	}
-#line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 2144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13562 "PhotoPage.c"
+#line 13578 "PhotoPage.c"
 	}
-#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
-#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _editing_tools_editing_tool_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EDITING_TOOLS_TYPE_ADJUST_TOOL) ? ((EditingToolsAdjustTool*) _tmp3_) : NULL);
-#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	adjust_tool = _tmp4_;
-#line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = adjust_tool;
-#line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 13574 "PhotoPage.c"
+#line 13590 "PhotoPage.c"
 		EditingToolsAdjustTool* _tmp6_ = NULL;
-#line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = adjust_tool;
-#line 2148 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_tools_adjust_tool_enhance (_tmp6_);
-#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13584 "PhotoPage.c"
+#line 13600 "PhotoPage.c"
 	}
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (self);
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = enhance_single_command_new (_tmp8_);
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp10_;
-#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = command;
-#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command));
-#line 2154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 13612 "PhotoPage.c"
+#line 13628 "PhotoPage.c"
 }
 
 
@@ -13623,33 +13639,33 @@ void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
 	Photo* _tmp2_ = NULL;
 	PixelTransformationBundle* _tmp3_ = NULL;
 	PixelTransformationBundle* _tmp4_ = NULL;
-#line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (self);
-#line 2158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13630 "PhotoPage.c"
+#line 13646 "PhotoPage.c"
 	}
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_get_photo (self);
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo_get_color_adjustments (_tmp2_);
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixel_transformation_bundle_set_copied_color_adjustments (_tmp4_);
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformation_bundle_unref0 (_tmp4_);
-#line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 13648 "PhotoPage.c"
+#line 13664 "PhotoPage.c"
 }
 
 
@@ -13667,64 +13683,64 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 	CommandManager* _tmp9_ = NULL;
 	CommandManager* _tmp10_ = NULL;
 	AdjustColorsSingleCommand* _tmp11_ = NULL;
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = pixel_transformation_bundle_get_copied_color_adjustments ();
-#line 2165 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	copied_adjustments = _tmp0_;
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_has_photo (self);
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 13678 "PhotoPage.c"
+#line 13694 "PhotoPage.c"
 	} else {
 		PixelTransformationBundle* _tmp3_ = NULL;
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = copied_adjustments;
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = _tmp3_ == NULL;
-#line 13685 "PhotoPage.c"
+#line 13701 "PhotoPage.c"
 	}
-#line 2166 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13693 "PhotoPage.c"
+#line 13709 "PhotoPage.c"
 	}
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = editing_host_page_get_photo (self);
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = copied_adjustments;
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = adjust_colors_single_command_new (_tmp5_, _tmp6_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP);
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp8_;
-#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = command;
-#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
-#line 2171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp10_);
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 13723 "PhotoPage.c"
+#line 13739 "PhotoPage.c"
 }
 
 
@@ -13735,458 +13751,471 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	EditingToolsEditingToolWindow* _tmp2_ = NULL;
 	EditingToolsEditingToolWindow* _tmp3_ = NULL;
 	EditingToolsEditingToolWindow* _tmp4_ = NULL;
-	EditingToolsEditingToolWindow* _tmp5_ = NULL;
+	AppWindow* _tmp5_ = NULL;
+	AppWindow* _tmp6_ = NULL;
+	EditingToolsEditingToolWindow* _tmp7_ = NULL;
+	EditingToolsEditingToolWindow* _tmp8_ = NULL;
 	GtkAllocation tool_alloc = {0};
-	EditingToolsEditingToolWindow* _tmp6_ = NULL;
-	GtkAllocation _tmp7_ = {0};
+	EditingToolsEditingToolWindow* _tmp9_ = NULL;
+	GtkAllocation _tmp10_ = {0};
 	gint x = 0;
 	gint y = 0;
-	GeeHashMap* _tmp8_ = NULL;
-	EditingToolsEditingTool* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
-	gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	gboolean _tmp13_ = FALSE;
-	gboolean _tmp14_ = FALSE;
+	GeeHashMap* _tmp11_ = NULL;
+	EditingToolsEditingTool* _tmp12_ = NULL;
+	const gchar* _tmp13_ = NULL;
+	gchar* _tmp14_ = NULL;
+	gchar* _tmp15_ = NULL;
+	gboolean _tmp16_ = FALSE;
+	gboolean _tmp17_ = FALSE;
 	GdkScreen* screen = NULL;
-	GtkWindow* _tmp84_ = NULL;
-	GtkWindow* _tmp85_ = NULL;
-	GdkScreen* _tmp86_ = NULL;
-	GdkScreen* _tmp87_ = NULL;
-	GdkScreen* _tmp88_ = NULL;
-	gint _tmp89_ = 0;
+	GtkWindow* _tmp87_ = NULL;
+	GtkWindow* _tmp88_ = NULL;
+	GdkScreen* _tmp89_ = NULL;
 	GdkScreen* _tmp90_ = NULL;
-	gint _tmp91_ = 0;
-	GtkAllocation _tmp92_ = {0};
-	gint _tmp93_ = 0;
+	GdkScreen* _tmp91_ = NULL;
+	gint _tmp92_ = 0;
+	GdkScreen* _tmp93_ = NULL;
 	gint _tmp94_ = 0;
-	gint _tmp95_ = 0;
-	GdkScreen* _tmp96_ = NULL;
+	GtkAllocation _tmp95_ = {0};
+	gint _tmp96_ = 0;
 	gint _tmp97_ = 0;
-	GtkAllocation _tmp98_ = {0};
-	gint _tmp99_ = 0;
+	gint _tmp98_ = 0;
+	GdkScreen* _tmp99_ = NULL;
 	gint _tmp100_ = 0;
-	EditingToolsEditingToolWindow* _tmp101_ = NULL;
+	GtkAllocation _tmp101_ = {0};
 	gint _tmp102_ = 0;
 	gint _tmp103_ = 0;
 	EditingToolsEditingToolWindow* _tmp104_ = NULL;
-	EditingToolsEditingToolWindow* _tmp105_ = NULL;
-#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gint _tmp105_ = 0;
+	gint _tmp106_ = 0;
+	EditingToolsEditingToolWindow* _tmp107_ = NULL;
+	EditingToolsEditingToolWindow* _tmp108_ = NULL;
+#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 2175 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 2176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13778 "PhotoPage.c"
+#line 13797 "PhotoPage.c"
 	}
-#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
-#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_tools_editing_tool_get_tool_window (_tmp1_);
-#line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	tool_window = _tmp2_;
-#line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = tool_window;
-#line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2182 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 2180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 2180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13794 "PhotoPage.c"
+#line 13813 "PhotoPage.c"
 	}
-#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = tool_window;
-#line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 2184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = tool_window;
-#line 2184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = tool_window;
+#line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp5_ = app_window_get_instance ();
+#line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp6_ = _tmp5_;
+#line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_window_get_type (), GtkWindow), G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow));
+#line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp6_);
 #line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), &_tmp7_);
+	_tmp7_ = tool_window;
 #line 2187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	tool_alloc = _tmp7_;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = self->priv->last_locations;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = self->priv->current_tool;
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
+#line 2188 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp8_ = tool_window;
+#line 2188 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
 #line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_->name;
+	_tmp9_ = tool_window;
 #line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = g_strconcat (_tmp10_, "_x", NULL);
+	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), &_tmp10_);
 #line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp12_);
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = _tmp13_;
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_free0 (_tmp12_);
-#line 2191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp14_) {
-#line 13828 "PhotoPage.c"
-		GeeHashMap* _tmp15_ = NULL;
-		EditingToolsEditingTool* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
-		gchar* _tmp18_ = NULL;
-		gchar* _tmp19_ = NULL;
-		gpointer _tmp20_ = NULL;
-		GeeHashMap* _tmp21_ = NULL;
-		EditingToolsEditingTool* _tmp22_ = NULL;
-		const gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		gpointer _tmp26_ = NULL;
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = self->priv->last_locations;
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = self->priv->current_tool;
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = _tmp16_->name;
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = g_strconcat (_tmp17_, "_x", NULL);
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp18_;
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp19_);
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		x = (gint) ((gintptr) _tmp20_);
-#line 2192 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp19_);
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = self->priv->last_locations;
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = self->priv->current_tool;
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = _tmp22_->name;
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp24_ = g_strconcat (_tmp23_, "_y", NULL);
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = _tmp24_;
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp26_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp25_);
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		y = (gint) ((gintptr) _tmp26_);
-#line 2193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp25_);
-#line 13873 "PhotoPage.c"
-	} else {
-		GtkWindow* _tmp27_ = NULL;
-		GtkWindow* _tmp28_ = NULL;
-		AppWindow* _tmp29_ = NULL;
-		AppWindow* _tmp30_ = NULL;
-		gboolean _tmp31_ = FALSE;
+	tool_alloc = _tmp10_;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp11_ = self->priv->last_locations;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp12_ = self->priv->current_tool;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp13_ = _tmp12_->name;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp14_ = g_strconcat (_tmp13_, "_x", NULL);
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp15_ = _tmp14_;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp16_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_);
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp17_ = _tmp16_;
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_free0 (_tmp15_);
+#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	if (_tmp17_) {
+#line 13857 "PhotoPage.c"
+		GeeHashMap* _tmp18_ = NULL;
+		EditingToolsEditingTool* _tmp19_ = NULL;
+		const gchar* _tmp20_ = NULL;
+		gchar* _tmp21_ = NULL;
+		gchar* _tmp22_ = NULL;
+		gpointer _tmp23_ = NULL;
+		GeeHashMap* _tmp24_ = NULL;
+		EditingToolsEditingTool* _tmp25_ = NULL;
+		const gchar* _tmp26_ = NULL;
+		gchar* _tmp27_ = NULL;
+		gchar* _tmp28_ = NULL;
+		gpointer _tmp29_ = NULL;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp27_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp18_ = self->priv->last_locations;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp28_ = _tmp27_;
+		_tmp19_ = self->priv->current_tool;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp29_ = app_window_get_instance ();
+		_tmp20_ = _tmp19_->name;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp30_ = _tmp29_;
+		_tmp21_ = g_strconcat (_tmp20_, "_x", NULL);
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = _tmp28_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_window_get_type (), GtkWindow);
+		_tmp22_ = _tmp21_;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp30_);
+		_tmp23_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_);
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp28_);
+		x = (gint) ((gintptr) _tmp23_);
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp31_) {
-#line 13896 "PhotoPage.c"
+		_g_free0 (_tmp22_);
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp24_ = self->priv->last_locations;
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp25_ = self->priv->current_tool;
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp26_ = _tmp25_->name;
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp27_ = g_strconcat (_tmp26_, "_y", NULL);
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp28_ = _tmp27_;
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp29_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_);
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		y = (gint) ((gintptr) _tmp29_);
+#line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_g_free0 (_tmp28_);
+#line 13902 "PhotoPage.c"
+	} else {
+		GtkWindow* _tmp30_ = NULL;
+		GtkWindow* _tmp31_ = NULL;
+		AppWindow* _tmp32_ = NULL;
+		AppWindow* _tmp33_ = NULL;
+		gboolean _tmp34_ = FALSE;
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp30_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp31_ = _tmp30_;
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp32_ = app_window_get_instance ();
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp33_ = _tmp32_;
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp34_ = _tmp31_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow);
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_g_object_unref0 (_tmp33_);
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_g_object_unref0 (_tmp31_);
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		if (_tmp34_) {
+#line 13925 "PhotoPage.c"
 			gint rx = 0;
 			gint ry = 0;
-			GtkWindow* _tmp32_ = NULL;
-			GtkWindow* _tmp33_ = NULL;
-			GdkWindow* _tmp34_ = NULL;
-			gint _tmp35_ = 0;
-			gint _tmp36_ = 0;
+			GtkWindow* _tmp35_ = NULL;
+			GtkWindow* _tmp36_ = NULL;
+			GdkWindow* _tmp37_ = NULL;
+			gint _tmp38_ = 0;
+			gint _tmp39_ = 0;
 			GtkAllocation viewport_allocation = {0};
-			GtkViewport* _tmp37_ = NULL;
-			GtkAllocation _tmp38_ = {0};
+			GtkViewport* _tmp40_ = NULL;
+			GtkAllocation _tmp41_ = {0};
 			gint cx = 0;
 			gint cy = 0;
 			gint cwidth = 0;
 			gint cheight = 0;
-			GtkAllocation _tmp39_ = {0};
-			gint _tmp40_ = 0;
-			GtkAllocation _tmp41_ = {0};
-			gint _tmp42_ = 0;
-			GtkAllocation _tmp43_ = {0};
-			gint _tmp44_ = 0;
-			GtkAllocation _tmp45_ = {0};
-			gint _tmp46_ = 0;
+			GtkAllocation _tmp42_ = {0};
+			gint _tmp43_ = 0;
+			GtkAllocation _tmp44_ = {0};
+			gint _tmp45_ = 0;
+			GtkAllocation _tmp46_ = {0};
 			gint _tmp47_ = 0;
-			gint _tmp56_ = 0;
-			gint _tmp57_ = 0;
-			gint _tmp58_ = 0;
-			GtkAllocation _tmp59_ = {0};
+			GtkAllocation _tmp48_ = {0};
+			gint _tmp49_ = 0;
+			gint _tmp50_ = 0;
+			gint _tmp59_ = 0;
 			gint _tmp60_ = 0;
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp32_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp33_ = _tmp32_;
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp34_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget));
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			gdk_window_get_root_origin (_tmp34_, &_tmp35_, &_tmp36_);
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			rx = _tmp35_;
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			ry = _tmp36_;
-#line 2201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp33_);
-#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport;
-#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), &_tmp38_);
-#line 2204 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			viewport_allocation = _tmp38_;
-#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp39_ = viewport_allocation;
-#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp40_ = _tmp39_.x;
-#line 2207 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cx = _tmp40_;
+			gint _tmp61_ = 0;
+			GtkAllocation _tmp62_ = {0};
+			gint _tmp63_ = 0;
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp36_ = _tmp35_;
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp37_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			gdk_window_get_root_origin (_tmp37_, &_tmp38_, &_tmp39_);
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			rx = _tmp38_;
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			ry = _tmp39_;
+#line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_g_object_unref0 (_tmp36_);
 #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp41_ = viewport_allocation;
+			_tmp40_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport;
 #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp42_ = _tmp41_.y;
+			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), &_tmp41_);
 #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cy = _tmp42_;
-#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp43_ = viewport_allocation;
-#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp44_ = _tmp43_.width;
-#line 2209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cwidth = _tmp44_;
-#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp45_ = viewport_allocation;
-#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp46_ = _tmp45_.height;
-#line 2210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cheight = _tmp46_;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) {
-#line 13971 "PhotoPage.c"
-				gint _tmp48_ = 0;
-				gint _tmp49_ = 0;
-				gint _tmp50_ = 0;
-				GtkAllocation _tmp51_ = {0};
-				gint _tmp52_ = 0;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp48_ = rx;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp49_ = cx;
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp50_ = cwidth;
+			viewport_allocation = _tmp41_;
+#line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp42_ = viewport_allocation;
+#line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp43_ = _tmp42_.x;
+#line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			cx = _tmp43_;
+#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp44_ = viewport_allocation;
+#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp45_ = _tmp44_.y;
+#line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			cy = _tmp45_;
+#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp46_ = viewport_allocation;
+#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp47_ = _tmp46_.width;
+#line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			cwidth = _tmp47_;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp51_ = tool_alloc;
+			_tmp48_ = viewport_allocation;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp52_ = _tmp51_.width;
+			_tmp49_ = _tmp48_.height;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp47_ = ((_tmp48_ + _tmp49_) + (_tmp50_ / 2)) - (_tmp52_ / 2);
-#line 13989 "PhotoPage.c"
-			} else {
+			cheight = _tmp49_;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) {
+#line 14000 "PhotoPage.c"
+				gint _tmp51_ = 0;
+				gint _tmp52_ = 0;
 				gint _tmp53_ = 0;
-				gint _tmp54_ = 0;
+				GtkAllocation _tmp54_ = {0};
 				gint _tmp55_ = 0;
-#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp53_ = rx;
-#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp54_ = cx;
-#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp55_ = cwidth;
-#line 2215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp47_ = (_tmp53_ + _tmp54_) + (_tmp55_ / 2);
-#line 14002 "PhotoPage.c"
-			}
-#line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			x = _tmp47_;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp56_ = ry;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp57_ = cy;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp58_ = cheight;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp59_ = tool_alloc;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp60_ = _tmp59_.height;
-#line 2216 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			y = ((_tmp56_ + _tmp57_) + _tmp58_) - ((_tmp60_ / 4) * 3);
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp51_ = rx;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp52_ = cx;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp53_ = cwidth;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp54_ = tool_alloc;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp55_ = _tmp54_.width;
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp50_ = ((_tmp51_ + _tmp52_) + (_tmp53_ / 2)) - (_tmp55_ / 2);
 #line 14018 "PhotoPage.c"
+			} else {
+				gint _tmp56_ = 0;
+				gint _tmp57_ = 0;
+				gint _tmp58_ = 0;
+#line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp56_ = rx;
+#line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp57_ = cx;
+#line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp58_ = cwidth;
+#line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp50_ = (_tmp56_ + _tmp57_) + (_tmp58_ / 2);
+#line 14031 "PhotoPage.c"
+			}
+#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			x = _tmp50_;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp59_ = ry;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp60_ = cy;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp61_ = cheight;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp62_ = tool_alloc;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp63_ = _tmp62_.height;
+#line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			y = ((_tmp59_ + _tmp60_) + _tmp61_) - ((_tmp63_ / 4) * 3);
+#line 14047 "PhotoPage.c"
 		} else {
-			GtkWindow* _tmp61_ = NULL;
-			GtkWindow* _tmp62_ = NULL;
+			GtkWindow* _tmp64_ = NULL;
+			GtkWindow* _tmp65_ = NULL;
 			GtkAllocation toolbar_alloc = {0};
-			GtkToolbar* _tmp63_ = NULL;
-			GtkToolbar* _tmp64_ = NULL;
-			GtkAllocation _tmp65_ = {0};
+			GtkToolbar* _tmp66_ = NULL;
+			GtkToolbar* _tmp67_ = NULL;
+			GtkAllocation _tmp68_ = {0};
 			GdkScreen* screen = NULL;
-			GtkWindow* _tmp66_ = NULL;
-			GtkWindow* _tmp67_ = NULL;
-			GdkScreen* _tmp68_ = NULL;
-			GdkScreen* _tmp69_ = NULL;
-			GdkScreen* _tmp70_ = NULL;
+			GtkWindow* _tmp69_ = NULL;
+			GtkWindow* _tmp70_ = NULL;
 			GdkScreen* _tmp71_ = NULL;
-			gint _tmp72_ = 0;
+			GdkScreen* _tmp72_ = NULL;
 			GdkScreen* _tmp73_ = NULL;
-			gint _tmp74_ = 0;
-			GtkAllocation _tmp75_ = {0};
-			gint _tmp76_ = 0;
-			GtkAllocation _tmp77_ = {0};
-			gint _tmp78_ = 0;
-			EditingToolsEditingTool* _tmp79_ = NULL;
-#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp61_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp62_ = _tmp61_;
-#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp62_, TYPE_FULLSCREEN_WINDOW), "get_container() is FullscreenWindow");
-#line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp62_);
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp63_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp64_ = _tmp63_;
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), &_tmp65_);
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			toolbar_alloc = _tmp65_;
-#line 2223 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp64_);
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp66_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp67_ = _tmp66_;
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp68_ = gtk_window_get_screen (_tmp67_);
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp69_ = _g_object_ref0 (_tmp68_);
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp70_ = _tmp69_;
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp67_);
-#line 2225 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			screen = _tmp70_;
-#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp71_ = screen;
-#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp72_ = gdk_screen_get_width (_tmp71_);
-#line 2226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			x = _tmp72_;
-#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp73_ = screen;
-#line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp74_ = gdk_screen_get_height (_tmp73_);
+			GdkScreen* _tmp74_ = NULL;
+			gint _tmp75_ = 0;
+			GdkScreen* _tmp76_ = NULL;
+			gint _tmp77_ = 0;
+			GtkAllocation _tmp78_ = {0};
+			gint _tmp79_ = 0;
+			GtkAllocation _tmp80_ = {0};
+			gint _tmp81_ = 0;
+			EditingToolsEditingTool* _tmp82_ = NULL;
+#line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp64_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp65_ = _tmp64_;
+#line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp65_, TYPE_FULLSCREEN_WINDOW), "get_container() is FullscreenWindow");
+#line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_g_object_unref0 (_tmp65_);
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp75_ = toolbar_alloc;
+			_tmp66_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp76_ = _tmp75_.height;
+			_tmp67_ = _tmp66_;
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp77_ = tool_alloc;
+			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), &_tmp68_);
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp78_ = _tmp77_.height;
+			toolbar_alloc = _tmp68_;
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			y = ((_tmp74_ - _tmp76_) - _tmp78_) - EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR;
+			_g_object_unref0 (_tmp67_);
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp69_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp70_ = _tmp69_;
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp71_ = gtk_window_get_screen (_tmp70_);
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp72_ = _g_object_ref0 (_tmp71_);
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp73_ = _tmp72_;
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_g_object_unref0 (_tmp70_);
+#line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			screen = _tmp73_;
+#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp74_ = screen;
+#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp75_ = gdk_screen_get_width (_tmp74_);
+#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			x = _tmp75_;
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp79_ = self->priv->current_tool;
+			_tmp76_ = screen;
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 14097 "PhotoPage.c"
-				gint _tmp80_ = 0;
-#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp80_ = x;
-#line 2232 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				x = (_tmp80_ * 3) / 4;
-#line 14103 "PhotoPage.c"
-			} else {
-				gint _tmp81_ = 0;
-				GtkAllocation _tmp82_ = {0};
+			_tmp77_ = gdk_screen_get_height (_tmp76_);
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp78_ = toolbar_alloc;
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp79_ = _tmp78_.height;
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp80_ = tool_alloc;
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_tmp81_ = _tmp80_.height;
+#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			y = ((_tmp77_ - _tmp79_) - _tmp81_) - EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR;
+#line 2235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+			_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 14126 "PhotoPage.c"
 				gint _tmp83_ = 0;
-#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp81_ = x;
-#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp82_ = tool_alloc;
-#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp83_ = _tmp82_.width;
-#line 2234 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				x = (_tmp81_ - _tmp83_) / 2;
-#line 14116 "PhotoPage.c"
+#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 14132 "PhotoPage.c"
+			} else {
+				gint _tmp84_ = 0;
+				GtkAllocation _tmp85_ = {0};
+				gint _tmp86_ = 0;
+#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp84_ = x;
+#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp85_ = tool_alloc;
+#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				_tmp86_ = _tmp85_.width;
+#line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+				x = (_tmp84_ - _tmp86_) / 2;
+#line 14145 "PhotoPage.c"
 			}
-#line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (screen);
-#line 14120 "PhotoPage.c"
+#line 14149 "PhotoPage.c"
 		}
 	}
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp84_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp85_ = _tmp84_;
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp86_ = gtk_window_get_screen (_tmp85_);
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp87_ = _g_object_ref0 (_tmp86_);
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp87_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp88_ = _tmp87_;
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp85_);
-#line 2240 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	screen = _tmp88_;
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp89_ = x;
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp90_ = screen;
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp91_ = gdk_screen_get_width (_tmp90_);
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp92_ = tool_alloc;
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp93_ = _tmp92_.width;
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp94_ = CLAMP (_tmp89_, 0, _tmp91_ - _tmp93_);
-#line 2241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	x = _tmp94_;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp95_ = y;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp96_ = screen;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp97_ = gdk_screen_get_height (_tmp96_);
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp98_ = tool_alloc;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp99_ = _tmp98_.height;
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp100_ = CLAMP (_tmp95_, 0, _tmp97_ - _tmp99_);
-#line 2242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	y = _tmp100_;
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp101_ = tool_window;
+	_tmp89_ = gtk_window_get_screen (_tmp88_);
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp102_ = x;
+	_tmp90_ = _g_object_ref0 (_tmp89_);
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp103_ = y;
+	_tmp91_ = _tmp90_;
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_window_get_type (), GtkWindow), _tmp102_, _tmp103_);
+	_g_object_unref0 (_tmp88_);
+#line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	screen = _tmp91_;
 #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp104_ = tool_window;
+	_tmp92_ = x;
 #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_widget_get_type (), GtkWidget));
+	_tmp93_ = screen;
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp94_ = gdk_screen_get_width (_tmp93_);
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp95_ = tool_alloc;
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp96_ = _tmp95_.width;
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp97_ = CLAMP (_tmp92_, 0, _tmp94_ - _tmp96_);
+#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	x = _tmp97_;
 #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp105_ = tool_window;
+	_tmp98_ = y;
 #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_window_get_type (), GtkWindow));
-#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp99_ = screen;
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp100_ = gdk_screen_get_height (_tmp99_);
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp101_ = tool_alloc;
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp102_ = _tmp101_.height;
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp103_ = CLAMP (_tmp98_, 0, _tmp100_ - _tmp102_);
+#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	y = _tmp103_;
+#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp104_ = tool_window;
+#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp105_ = x;
+#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp106_ = y;
+#line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_window_get_type (), GtkWindow), _tmp105_, _tmp106_);
+#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp107_ = tool_window;
+#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_widget_get_type (), GtkWidget));
+#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp108_ = tool_window;
+#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_window_get_type (), GtkWindow));
+#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (screen);
-#line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (tool_window);
-#line 14185 "PhotoPage.c"
+#line 14214 "PhotoPage.c"
 }
 
 
@@ -14208,72 +14237,72 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	DataView* next = NULL;
 	DataView* _tmp11_ = NULL;
 	DataView* _tmp12_ = NULL;
-#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 2252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 2252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14219 "PhotoPage.c"
+#line 14248 "PhotoPage.c"
 	}
-#line 2255 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 2255 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current_photo = _tmp2_;
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = current_photo;
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp3_ != NULL, "current_photo != null");
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_get_photo (self);
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 2258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current = _tmp9_;
-#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = current;
-#line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ == NULL) {
-#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current);
-#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current_photo);
-#line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14257 "PhotoPage.c"
+#line 14286 "PhotoPage.c"
 	}
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	next = _tmp12_;
-#line 14265 "PhotoPage.c"
+#line 14294 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
-#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14272 "PhotoPage.c"
+#line 14301 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14287,88 +14316,88 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 			Photo* _tmp23_ = NULL;
 			Photo* _tmp24_ = NULL;
 			Photo* _tmp25_ = NULL;
-#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14288 "PhotoPage.c"
+#line 14317 "PhotoPage.c"
 			}
-#line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = _tmp14_;
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp16_ = next;
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = view_collection_get_next (_tmp15_, _tmp16_);
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (next);
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			next = _tmp17_;
-#line 2265 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_data_collection_unref0 (_tmp15_);
-#line 2266 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = next;
-#line 2266 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp18_ == NULL) {
-#line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14312 "PhotoPage.c"
+#line 14341 "PhotoPage.c"
 			}
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = next;
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = data_view_get_source (_tmp19_);
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL;
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp21_ == NULL) {
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14324 "PhotoPage.c"
+#line 14353 "PhotoPage.c"
 			}
-#line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			next_photo = _tmp21_;
-#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = next_photo;
-#line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp22_ == NULL) {
-#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (next_photo);
-#line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14336 "PhotoPage.c"
+#line 14365 "PhotoPage.c"
 			}
-#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = next_photo;
-#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = current_photo;
-#line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp23_ == _tmp24_) {
-#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (next_photo);
-#line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14348 "PhotoPage.c"
+#line 14377 "PhotoPage.c"
 			}
-#line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = next_photo;
-#line 2276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_replace_photo (self, _tmp25_);
-#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (next_photo);
-#line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14358 "PhotoPage.c"
+#line 14387 "PhotoPage.c"
 		}
 	}
-#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next);
-#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current);
-#line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14367 "PhotoPage.c"
+#line 14396 "PhotoPage.c"
 }
 
 
@@ -14390,72 +14419,72 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	DataView* previous = NULL;
 	DataView* _tmp11_ = NULL;
 	DataView* _tmp12_ = NULL;
-#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 2283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp0_, 0, 0);
-#line 2283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
-#line 2285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (self);
-#line 2285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14401 "PhotoPage.c"
+#line 14430 "PhotoPage.c"
 	}
-#line 2288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (self);
-#line 2288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current_photo = _tmp2_;
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = current_photo;
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp3_ != NULL, "current_photo != null");
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_get_photo (self);
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 2291 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	current = _tmp9_;
-#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = current;
-#line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ == NULL) {
-#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current);
-#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current_photo);
-#line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14439 "PhotoPage.c"
+#line 14468 "PhotoPage.c"
 	}
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = current;
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _g_object_ref0 (_tmp11_);
-#line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	previous = _tmp12_;
-#line 14447 "PhotoPage.c"
+#line 14476 "PhotoPage.c"
 	{
 		gboolean _tmp13_ = FALSE;
-#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14454 "PhotoPage.c"
+#line 14483 "PhotoPage.c"
 			ViewCollection* _tmp14_ = NULL;
 			ViewCollection* _tmp15_ = NULL;
 			DataView* _tmp16_ = NULL;
@@ -14469,114 +14498,114 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 			Photo* _tmp23_ = NULL;
 			Photo* _tmp24_ = NULL;
 			Photo* _tmp25_ = NULL;
-#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (!_tmp13_) {
-#line 14470 "PhotoPage.c"
+#line 14499 "PhotoPage.c"
 			}
-#line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp13_ = FALSE;
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp15_ = _tmp14_;
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp16_ = previous;
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp17_ = view_collection_get_previous (_tmp15_, _tmp16_);
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (previous);
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			previous = _tmp17_;
-#line 2298 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_data_collection_unref0 (_tmp15_);
-#line 2299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = previous;
-#line 2299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp18_ == NULL) {
-#line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14494 "PhotoPage.c"
+#line 14523 "PhotoPage.c"
 			}
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = previous;
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp20_ = data_view_get_source (_tmp19_);
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL;
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp21_ == NULL) {
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp20_);
-#line 14506 "PhotoPage.c"
+#line 14535 "PhotoPage.c"
 			}
-#line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			previous_photo = _tmp21_;
-#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = previous_photo;
-#line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp22_ == NULL) {
-#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (previous_photo);
-#line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14518 "PhotoPage.c"
+#line 14547 "PhotoPage.c"
 			}
-#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp23_ = previous_photo;
-#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp24_ = current_photo;
-#line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (_tmp23_ == _tmp24_) {
-#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (previous_photo);
-#line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14530 "PhotoPage.c"
+#line 14559 "PhotoPage.c"
 			}
-#line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp25_ = previous_photo;
-#line 2309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_replace_photo (self, _tmp25_);
-#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (previous_photo);
-#line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14540 "PhotoPage.c"
+#line 14569 "PhotoPage.c"
 		}
 	}
-#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (previous);
-#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current);
-#line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14549 "PhotoPage.c"
+#line 14578 "PhotoPage.c"
 }
 
 
 gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_ = NULL;
-#line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
-#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
-#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_ != NULL;
-#line 2316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 14564 "PhotoPage.c"
+#line 14593 "PhotoPage.c"
 }
 
 
 void editing_host_page_unset_view_collection (EditingHostPage* self) {
-#line 2319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
-#line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
-#line 14575 "PhotoPage.c"
+#line 14604 "PhotoPage.c"
 }
 
 
@@ -14663,14 +14692,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 14662 "PhotoPage.c"
+#line 14691 "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 14669 "PhotoPage.c"
+#line 14698 "PhotoPage.c"
 }
 
 
@@ -14683,7 +14712,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 14682 "PhotoPage.c"
+#line 14711 "PhotoPage.c"
 }
 
 
@@ -14696,14 +14725,14 @@ static void editing_host_page_editing_host_canvas_class_init (EditingHostPageEdi
 	g_type_class_add_private (klass, sizeof (EditingHostPageEditingHostCanvasPrivate));
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingToolsPhotoCanvasClass *) klass)->repaint = editing_host_page_editing_host_canvas_real_repaint;
-#line 14695 "PhotoPage.c"
+#line 14724 "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 14702 "PhotoPage.c"
+#line 14731 "PhotoPage.c"
 }
 
 
@@ -14715,7 +14744,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 14714 "PhotoPage.c"
+#line 14743 "PhotoPage.c"
 }
 
 
@@ -14834,7 +14863,7 @@ static void editing_host_page_class_init (EditingHostPageClass * klass) {
 	((SinglePhotoPageClass *) klass)->on_previous_photo = editing_host_page_real_on_previous_photo;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_host_page_finalize;
-#line 14833 "PhotoPage.c"
+#line 14862 "PhotoPage.c"
 }
 
 
@@ -14902,7 +14931,7 @@ static void editing_host_page_instance_init (EditingHostPage * self) {
 	_tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->last_locations = _tmp2_;
-#line 14901 "PhotoPage.c"
+#line 14930 "PhotoPage.c"
 }
 
 
@@ -14918,31 +14947,31 @@ static void editing_host_page_finalize (GObject* obj) {
 	guint _tmp7_ = 0U;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_EDITING_HOST_PAGE, EditingHostPage);
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->sources;
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_host_page_on_photos_altered_data_collection_items_altered, self);
-#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("contents-altered", TYPE_DATA_COLLECTION, &_tmp4_, NULL, FALSE);
-#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered, self);
-#line 550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("ordering-changed", TYPE_DATA_COLLECTION, &_tmp7_, NULL, FALSE);
-#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed, self);
-#line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp6_);
 #line 390 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->sources);
@@ -14986,7 +15015,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 14985 "PhotoPage.c"
+#line 15014 "PhotoPage.c"
 }
 
 
@@ -15003,366 +15032,366 @@ GType editing_host_page_get_type (void) {
 
 
 static void _library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source);
-#line 15004 "PhotoPage.c"
+#line 15033 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items);
-#line 15011 "PhotoPage.c"
+#line 15040 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) {
-#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self);
-#line 15018 "PhotoPage.c"
+#line 15047 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_export ((LibraryPhotoPage*) self);
-#line 15025 "PhotoPage.c"
+#line 15054 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_print ((LibraryPhotoPage*) self);
-#line 15032 "PhotoPage.c"
+#line 15061 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_publish ((LibraryPhotoPage*) self);
-#line 15039 "PhotoPage.c"
+#line 15068 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_remove_from_library ((LibraryPhotoPage*) self);
-#line 15046 "PhotoPage.c"
+#line 15075 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_move_to_trash ((LibraryPhotoPage*) self);
-#line 15053 "PhotoPage.c"
+#line 15082 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 15060 "PhotoPage.c"
+#line 15089 "PhotoPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 15067 "PhotoPage.c"
+#line 15096 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 15074 "PhotoPage.c"
+#line 15103 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 15081 "PhotoPage.c"
+#line 15110 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 15088 "PhotoPage.c"
+#line 15117 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 15095 "PhotoPage.c"
+#line 15124 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 15102 "PhotoPage.c"
+#line 15131 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_copy_adjustments ((EditingHostPage*) self);
-#line 15109 "PhotoPage.c"
+#line 15138 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_paste_adjustments ((EditingHostPage*) self);
-#line 15116 "PhotoPage.c"
+#line 15145 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 15123 "PhotoPage.c"
+#line 15152 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 15130 "PhotoPage.c"
+#line 15159 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 15137 "PhotoPage.c"
+#line 15166 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 15144 "PhotoPage.c"
+#line 15173 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_revert ((EditingHostPage*) self);
-#line 15151 "PhotoPage.c"
+#line 15180 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_title ((EditingHostPage*) self);
-#line 15158 "PhotoPage.c"
+#line 15187 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_comment ((EditingHostPage*) self);
-#line 15165 "PhotoPage.c"
+#line 15194 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 15172 "PhotoPage.c"
+#line 15201 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit ((LibraryPhotoPage*) self);
-#line 15179 "PhotoPage.c"
+#line 15208 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit_raw ((LibraryPhotoPage*) self);
-#line 15186 "PhotoPage.c"
+#line 15215 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_send_to ((LibraryPhotoPage*) self);
-#line 15193 "PhotoPage.c"
+#line 15222 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 15200 "PhotoPage.c"
+#line 15229 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_flag_unflag ((LibraryPhotoPage*) self);
-#line 15207 "PhotoPage.c"
+#line 15236 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_increase_rating ((LibraryPhotoPage*) self);
-#line 15214 "PhotoPage.c"
+#line 15243 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_decrease_rating ((LibraryPhotoPage*) self);
-#line 15221 "PhotoPage.c"
+#line 15250 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_rejected ((LibraryPhotoPage*) self);
-#line 15228 "PhotoPage.c"
+#line 15257 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_unrated ((LibraryPhotoPage*) self);
-#line 15235 "PhotoPage.c"
+#line 15264 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_one ((LibraryPhotoPage*) self);
-#line 15242 "PhotoPage.c"
+#line 15271 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_two ((LibraryPhotoPage*) self);
-#line 15249 "PhotoPage.c"
+#line 15278 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_three ((LibraryPhotoPage*) self);
-#line 15256 "PhotoPage.c"
+#line 15285 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_four ((LibraryPhotoPage*) self);
-#line 15263 "PhotoPage.c"
+#line 15292 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_five ((LibraryPhotoPage*) self);
-#line 15270 "PhotoPage.c"
+#line 15299 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 15277 "PhotoPage.c"
+#line 15306 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 15284 "PhotoPage.c"
+#line 15313 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 15291 "PhotoPage.c"
+#line 15320 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 15298 "PhotoPage.c"
+#line 15327 "PhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 15305 "PhotoPage.c"
+#line 15334 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_add_tags ((LibraryPhotoPage*) self);
-#line 15312 "PhotoPage.c"
+#line 15341 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_modify_tags ((LibraryPhotoPage*) self);
-#line 15319 "PhotoPage.c"
+#line 15348 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_slideshow ((LibraryPhotoPage*) self);
-#line 15326 "PhotoPage.c"
+#line 15355 "PhotoPage.c"
 }
 
 
 static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_on_action_toggle ((Page*) self, action, parameter);
-#line 15333 "PhotoPage.c"
+#line 15362 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action, value);
-#line 15340 "PhotoPage.c"
+#line 15369 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
-#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photos_altered ((LibraryPhotoPage*) self);
-#line 15347 "PhotoPage.c"
+#line 15376 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) {
-#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking);
-#line 15354 "PhotoPage.c"
+#line 15383 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) {
-#line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked);
-#line 15361 "PhotoPage.c"
+#line 15390 "PhotoPage.c"
 }
 
 
@@ -15380,62 +15409,62 @@ LibraryPhotoPage* library_photo_page_construct (GType object_type) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp9_ = NULL;
 	LibraryPhotoSourceCollection* _tmp10_ = NULL;
 	LibraryPhotoSourceCollection* _tmp11_ = NULL;
-#line 2341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_global;
-#line 2341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2345 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = (LibraryPhotoPage*) editing_host_page_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), "Photo");
-#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_photos_altered_data_collection_items_altered, self, 0);
-#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp2_);
-#line 2347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = library_photo_global;
-#line 2347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SOURCE_COLLECTION, SourceCollection), "item-destroyed", (GCallback) _library_photo_page_on_photo_destroyed_source_collection_item_destroyed, self, 0);
-#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = library_photo_global;
-#line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _library_photo_page_on_metadata_altered_data_collection_items_altered, self, 0);
-#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), "external-app-changed", (GCallback) _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed, self, 0);
-#line 2351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = self->priv->filter;
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view_collection_install_view_filter (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_VIEW_FILTER, ViewFilter));
-#line 2354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp8_);
-#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = library_photo_global;
-#line 2355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-unlinking", (GCallback) _library_photo_page_on_photo_unlinking_source_collection_items_unlinking, self, 0);
-#line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = library_photo_global;
-#line 2356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-relinked", (GCallback) _library_photo_page_on_photo_relinked_source_collection_items_relinked, self, 0);
-#line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 15427 "PhotoPage.c"
+#line 15456 "PhotoPage.c"
 }
 
 
 LibraryPhotoPage* library_photo_page_new (void) {
-#line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE);
-#line 15434 "PhotoPage.c"
+#line 15463 "PhotoPage.c"
 }
 
 
@@ -15446,55 +15475,55 @@ gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, Dat
 	MediaSource* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), FALSE);
-#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = view;
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = data_view_get_source (_tmp0_);
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = media_source_is_trashed (_tmp2_);
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp4_;
-#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15465 "PhotoPage.c"
+#line 15494 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
-#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (unlinking));
-#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->filter;
-#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 15479 "PhotoPage.c"
+#line 15508 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
-#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (relinked));
-#line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->filter;
-#line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 15493 "PhotoPage.c"
+#line 15522 "PhotoPage.c"
 }
 
 
@@ -15503,44 +15532,44 @@ static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeLi
 	GeeList* _tmp0_ = NULL;
 	GeeList* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
-#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = ui_filenames;
-#line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 2380 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = ui_filenames;
-#line 2380 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
-#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = ui_filenames;
-#line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 15518 "PhotoPage.c"
+#line 15547 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new16 (gboolean value) {
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 15525 "PhotoPage.c"
+#line 15554 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new17 (const gchar* value) {
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 15532 "PhotoPage.c"
+#line 15561 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
-#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, _sender, value);
-#line 15539 "PhotoPage.c"
+#line 15568 "PhotoPage.c"
 }
 
 
@@ -15568,137 +15597,137 @@ static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	GSimpleAction* _tmp17_ = NULL;
 	GSimpleAction* _tmp18_ = NULL;
 	GActionMap* _tmp19_ = NULL;
-#line 2436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = map;
-#line 2437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 2439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = map;
-#line 2439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_action_map_add_action_entries (_tmp1_, LIBRARY_PHOTO_PAGE_entries, G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries), self);
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 15587 "PhotoPage.c"
+#line 15616 "PhotoPage.c"
 	}
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = config_facade_get_instance ();
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _variant_new16 (_tmp7_);
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_emit_by_name (_tmp4_, "change-state", _tmp8_);
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_variant_unref0 (_tmp8_);
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = config_facade_get_instance ();
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	d = _tmp12_;
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = d;
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_ == RAW_DEVELOPER_SHOTWELL) {
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = "Shotwell";
-#line 15625 "PhotoPage.c"
+#line 15654 "PhotoPage.c"
 	} else {
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = "Camera";
-#line 15629 "PhotoPage.c"
+#line 15658 "PhotoPage.c"
 	}
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = G_VARIANT_TYPE_STRING;
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _variant_new17 (_tmp13_);
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = g_simple_action_new_stateful ("RawDeveloper", _tmp15_, _tmp16_);
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = _tmp17_;
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_variant_unref0 (_tmp16_);
-#line 2442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp18_;
-#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (action, "change-state", (GCallback) _library_photo_page_on_raw_developer_changed_g_simple_action_change_state, self, 0);
-#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_enabled (action, TRUE);
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = map;
-#line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_action_map_add_action (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
-#line 2436 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15653 "PhotoPage.c"
+#line 15682 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) {
 	LibraryPhotoPage * self;
 	GActionMap* _tmp0_ = NULL;
-#line 2449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
-#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = map;
-#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 15668 "PhotoPage.c"
+#line 15697 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
 		gint _entry_collection_size_ = 0;
 		gint entry_it = 0;
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		entry_collection = LIBRARY_PHOTO_PAGE_entries;
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 15680 "PhotoPage.c"
+#line 15709 "PhotoPage.c"
 			GActionEntry entry = {0};
-#line 2451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 15684 "PhotoPage.c"
+#line 15713 "PhotoPage.c"
 			{
 				GActionMap* _tmp1_ = NULL;
 				GActionEntry _tmp2_ = {0};
 				const gchar* _tmp3_ = NULL;
-#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp1_ = map;
-#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp2_ = entry;
-#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp3_ = _tmp2_.name;
-#line 2452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 15697 "PhotoPage.c"
+#line 15726 "PhotoPage.c"
 			}
 		}
 	}
@@ -15706,60 +15735,60 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
 
 
 static gpointer _injection_group_ref0 (gpointer self) {
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 15707 "PhotoPage.c"
+#line 15736 "PhotoPage.c"
 }
 
 
 static void _vala_array_add82 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15718 "PhotoPage.c"
+#line 15747 "PhotoPage.c"
 	}
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15724 "PhotoPage.c"
+#line 15753 "PhotoPage.c"
 }
 
 
 static void _vala_array_add83 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15735 "PhotoPage.c"
+#line 15764 "PhotoPage.c"
 	}
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15741 "PhotoPage.c"
+#line 15770 "PhotoPage.c"
 }
 
 
 static void _vala_array_add84 (InjectionGroup*** array, int* length, int* size, InjectionGroup* value) {
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15752 "PhotoPage.c"
+#line 15781 "PhotoPage.c"
 	}
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15758 "PhotoPage.c"
+#line 15787 "PhotoPage.c"
 }
 
 
@@ -15791,85 +15820,85 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	InjectionGroup* _tmp13_ = NULL;
 	InjectionGroup** _tmp14_ = NULL;
 	gint _tmp14__length1 = 0;
-#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = PAGE_CLASS (library_photo_page_parent_class)->init_collect_injection_groups (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), &_tmp0_);
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	groups = _tmp1_;
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	groups_length1 = _tmp0_;
-#line 2457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_groups_size_ = groups_length1;
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = injection_group_new ("PrintPlaceholder");
-#line 2459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	print_group = _tmp2_;
-#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _ ("_Print");
-#line 2460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	injection_group_add_menu_item (print_group, _tmp3_, "Print", "<Primary>p");
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = groups;
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4__length1 = groups_length1;
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _injection_group_ref0 (print_group);
-#line 2462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_array_add82 (&groups, &groups_length1, &_groups_size_, _tmp5_);
-#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = injection_group_new ("PublishPlaceholder");
-#line 2464 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	publish_group = _tmp6_;
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _ ("_Publish");
-#line 2465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	injection_group_add_menu_item (publish_group, _tmp7_, "Publish", "<Primary><Shift>p");
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = groups;
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8__length1 = groups_length1;
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _injection_group_ref0 (publish_group);
-#line 2467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_array_add83 (&groups, &groups_length1, &_groups_size_, _tmp9_);
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = injection_group_new ("SetBackgroundPlaceholder");
-#line 2469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2473 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	bg_group = _tmp10_;
-#line 2470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = _ ("Set as _Desktop Background");
-#line 2470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	injection_group_add_menu_item (bg_group, _tmp11_, "SetBackground", "<Primary>b");
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = groups;
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12__length1 = groups_length1;
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _injection_group_ref0 (bg_group);
-#line 2472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_array_add84 (&groups, &groups_length1, &_groups_size_, _tmp13_);
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = groups;
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14__length1 = groups_length1;
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (result_length1) {
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*result_length1 = _tmp14__length1;
-#line 15856 "PhotoPage.c"
+#line 15885 "PhotoPage.c"
 	}
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp14_;
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (bg_group);
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (publish_group);
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_injection_group_unref0 (print_group);
-#line 2474 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15868 "PhotoPage.c"
+#line 15897 "PhotoPage.c"
 }
 
 
@@ -15881,33 +15910,33 @@ static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimp
 	ConfigFacade* _tmp3_ = NULL;
 	GSimpleAction* _tmp4_ = NULL;
 	GVariant* _tmp5_ = NULL;
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = value;
-#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	display = _tmp1_;
-#line 2480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_set_display_ratings (self, display);
-#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
-#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = action;
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = value;
-#line 2483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 15906 "PhotoPage.c"
+#line 15935 "PhotoPage.c"
 }
 
 
@@ -15916,38 +15945,38 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 	GAction* _tmp0_ = NULL;
 	GSimpleAction* _tmp1_ = NULL;
 	GSimpleAction* _tmp2_ = NULL;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
-#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL;
-#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 15925 "PhotoPage.c"
+#line 15954 "PhotoPage.c"
 	}
-#line 2488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp1_;
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = action;
-#line 2489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 15933 "PhotoPage.c"
+#line 15962 "PhotoPage.c"
 		GSimpleAction* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = action;
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = display;
-#line 2490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_simple_action_set_enabled (_tmp3_, _tmp4_);
-#line 15942 "PhotoPage.c"
+#line 15971 "PhotoPage.c"
 	}
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15946 "PhotoPage.c"
+#line 15975 "PhotoPage.c"
 }
 
 
@@ -15985,241 +16014,241 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 	gboolean _tmp56_ = FALSE;
 	gint _tmp61_ = 0;
 	gint _tmp62_ = 0;
-#line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 1;
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	multiple = _tmp3_;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 16002 "PhotoPage.c"
+#line 16031 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		gboolean _tmp8_ = FALSE;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp7_);
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp8_;
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 16016 "PhotoPage.c"
+#line 16045 "PhotoPage.c"
 	} else {
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 16020 "PhotoPage.c"
+#line 16049 "PhotoPage.c"
 	}
-#line 2495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	rotate_possible = _tmp4_;
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_) {
-#line 16028 "PhotoPage.c"
+#line 16057 "PhotoPage.c"
 		Photo* _tmp11_ = NULL;
 		Photo* _tmp12_ = NULL;
 		PhotoFileFormat _tmp13_ = 0;
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = photo_get_master_file_format (_tmp12_);
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 16042 "PhotoPage.c"
+#line 16071 "PhotoPage.c"
 	} else {
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = FALSE;
-#line 16046 "PhotoPage.c"
+#line 16075 "PhotoPage.c"
 	}
-#line 2496 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	is_raw = _tmp9_;
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_) {
-#line 16054 "PhotoPage.c"
+#line 16083 "PhotoPage.c"
 		ConfigFacade* _tmp16_ = NULL;
 		ConfigFacade* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
 		gchar* _tmp19_ = NULL;
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = config_facade_get_instance ();
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = _tmp16_;
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp18_;
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = g_strcmp0 (_tmp19_, "") != 0;
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp19_);
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 16073 "PhotoPage.c"
+#line 16102 "PhotoPage.c"
 	} else {
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 16077 "PhotoPage.c"
+#line 16106 "PhotoPage.c"
 	}
-#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_);
-#line 2501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp21_) {
-#line 16085 "PhotoPage.c"
+#line 16114 "PhotoPage.c"
 		gboolean _tmp22_ = FALSE;
 		Photo* _tmp23_ = NULL;
 		Photo* _tmp24_ = NULL;
 		gboolean _tmp25_ = FALSE;
 		gboolean _tmp26_ = FALSE;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = photo_has_transformations (_tmp24_);
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp24_);
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp26_) {
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = TRUE;
-#line 16105 "PhotoPage.c"
+#line 16134 "PhotoPage.c"
 		} else {
 			Photo* _tmp27_ = NULL;
 			Photo* _tmp28_ = NULL;
 			gboolean _tmp29_ = FALSE;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp27_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp28_ = _tmp27_;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp29_ = photo_has_editable (_tmp28_);
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp22_ = _tmp29_;
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp28_);
-#line 16120 "PhotoPage.c"
+#line 16149 "PhotoPage.c"
 		}
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp22_;
-#line 16124 "PhotoPage.c"
+#line 16153 "PhotoPage.c"
 	} else {
-#line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = FALSE;
-#line 16128 "PhotoPage.c"
+#line 16157 "PhotoPage.c"
 	}
-#line 2501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_);
-#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp31_) {
-#line 16136 "PhotoPage.c"
+#line 16165 "PhotoPage.c"
 		gboolean _tmp32_ = FALSE;
-#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = !_tmp32_;
-#line 16142 "PhotoPage.c"
+#line 16171 "PhotoPage.c"
 	} else {
-#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = FALSE;
-#line 16146 "PhotoPage.c"
+#line 16175 "PhotoPage.c"
 	}
-#line 2504 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp30_) {
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 16154 "PhotoPage.c"
+#line 16183 "PhotoPage.c"
 	}
-#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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));
-#line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp33_);
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp35_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp35_) {
-#line 16164 "PhotoPage.c"
+#line 16193 "PhotoPage.c"
 		Photo* _tmp36_ = NULL;
 		Photo* _tmp37_ = NULL;
 		gboolean _tmp38_ = FALSE;
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = _tmp36_;
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = photo_has_color_adjustments (_tmp37_);
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = _tmp38_;
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 16178 "PhotoPage.c"
+#line 16207 "PhotoPage.c"
 	} else {
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = FALSE;
-#line 16182 "PhotoPage.c"
+#line 16211 "PhotoPage.c"
 	}
-#line 2511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_);
-#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp39_ = pixel_transformation_bundle_has_copied_color_adjustments ();
-#line 2512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp39_);
-#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp40_ = multiple;
-#line 2514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp40_);
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp41_ = multiple;
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp41_);
-#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp42_ = rotate_possible;
-#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp42_);
-#line 2517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp43_ = rotate_possible;
-#line 2517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp43_);
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp44_ = rotate_possible;
-#line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp44_);
-#line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp45_ = rotate_possible;
-#line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp45_);
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp46_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp46_) {
-#line 16218 "PhotoPage.c"
+#line 16247 "PhotoPage.c"
 		Photo* _tmp47_ = NULL;
 		Photo* _tmp48_ = NULL;
 		Scaling _tmp49_ = {0};
@@ -16228,134 +16257,134 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 		Photo* _tmp52_ = NULL;
 		Scaling _tmp53_ = {0};
 		gboolean _tmp54_ = FALSE;
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp47_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp48_ = _tmp47_;
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		scaling_for_original (&_tmp49_);
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp50_ = editing_tools_crop_tool_is_available (_tmp48_, &_tmp49_);
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp50_);
-#line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp48_);
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp51_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp52_ = _tmp51_;
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		scaling_for_original (&_tmp53_);
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp54_ = editing_tools_redeye_tool_is_available (_tmp52_, &_tmp53_);
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp54_);
-#line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp52_);
-#line 16251 "PhotoPage.c"
+#line 16280 "PhotoPage.c"
 	}
-#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp56_ = is_raw;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp56_) {
-#line 16259 "PhotoPage.c"
+#line 16288 "PhotoPage.c"
 		ConfigFacade* _tmp57_ = NULL;
 		ConfigFacade* _tmp58_ = NULL;
 		gchar* _tmp59_ = NULL;
 		gchar* _tmp60_ = NULL;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp57_ = config_facade_get_instance ();
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp58_ = _tmp57_;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp59_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp60_ = _tmp59_;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = g_strcmp0 (_tmp60_, "") != 0;
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp60_);
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp58_);
-#line 16278 "PhotoPage.c"
+#line 16307 "PhotoPage.c"
 	} else {
-#line 2530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp55_ = FALSE;
-#line 16282 "PhotoPage.c"
+#line 16311 "PhotoPage.c"
 	}
-#line 2529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_visible (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_);
-#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp61_ = selected_count;
-#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp62_ = count;
-#line 2532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 16292 "PhotoPage.c"
+#line 16321 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 16305 "PhotoPage.c"
+#line 16334 "PhotoPage.c"
 		gboolean _tmp2_ = FALSE;
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 		gboolean _tmp6_ = FALSE;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = photo_has_transformations (_tmp4_);
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp6_) {
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = TRUE;
-#line 16325 "PhotoPage.c"
+#line 16354 "PhotoPage.c"
 		} else {
 			Photo* _tmp7_ = NULL;
 			Photo* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp8_ = _tmp7_;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp9_ = photo_has_editable (_tmp8_);
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp2_ = _tmp9_;
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp8_);
-#line 16340 "PhotoPage.c"
+#line 16369 "PhotoPage.c"
 		}
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 16344 "PhotoPage.c"
+#line 16373 "PhotoPage.c"
 	} else {
-#line 2537 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 16348 "PhotoPage.c"
+#line 16377 "PhotoPage.c"
 	}
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 2538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 16354 "PhotoPage.c"
+#line 16383 "PhotoPage.c"
 }
 
 
@@ -16365,78 +16394,78 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	GQuark _tmp4_ = 0U;
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp3_label0 = 0;
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp3_label1 = 0;
-#line 16368 "PhotoPage.c"
+#line 16397 "PhotoPage.c"
 	RawDeveloper _tmp5_ = 0;
 	GSimpleAction* _tmp6_ = NULL;
 	GVariant* _tmp7_ = NULL;
-#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
-#line 2543 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	developer = RAW_DEVELOPER_SHOTWELL;
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = value;
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = g_variant_get_string (_tmp0_, NULL);
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16390 "PhotoPage.c"
+#line 16419 "PhotoPage.c"
 			default:
 			{
-#line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
-#line 2548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16397 "PhotoPage.c"
+#line 16426 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16403 "PhotoPage.c"
+#line 16432 "PhotoPage.c"
 			default:
 			{
-#line 2550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
-#line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16410 "PhotoPage.c"
+#line 16439 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16416 "PhotoPage.c"
+#line 16445 "PhotoPage.c"
 			default:
 			{
-#line 2553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16421 "PhotoPage.c"
+#line 16450 "PhotoPage.c"
 			}
 		}
 	}
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = developer;
-#line 2556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_developer_changed (self, _tmp5_);
-#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = action;
-#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = value;
-#line 2558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 16435 "PhotoPage.c"
+#line 16464 "PhotoPage.c"
 }
 
 
@@ -16460,106 +16489,106 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 	gboolean _tmp19_ = FALSE;
 	Photo* _tmp20_ = NULL;
 	gboolean _tmp21_ = FALSE;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ != 1;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 2563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16473 "PhotoPage.c"
+#line 16502 "PhotoPage.c"
 	}
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = view_collection_get_selected (_tmp5_);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = gee_list_get (_tmp7_, 0);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = (DataView*) _tmp8_;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = data_view_get_source (_tmp9_);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO) ? ((Photo*) _tmp10_) : NULL;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp11_ == NULL) {
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 16495 "PhotoPage.c"
+#line 16524 "PhotoPage.c"
 	}
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp5_);
-#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp12_;
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = photo;
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp14_ == NULL) {
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = TRUE;
-#line 16513 "PhotoPage.c"
+#line 16542 "PhotoPage.c"
 	} else {
 		RawDeveloper _tmp15_ = 0;
 		Photo* _tmp16_ = NULL;
 		RawDeveloper _tmp17_ = 0;
 		gboolean _tmp18_ = FALSE;
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = rd;
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = photo;
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = photo_get_raw_developer (_tmp16_);
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_);
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = _tmp18_;
-#line 16529 "PhotoPage.c"
+#line 16558 "PhotoPage.c"
 	}
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_) {
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16537 "PhotoPage.c"
+#line 16566 "PhotoPage.c"
 	}
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = photo;
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = photo_has_transformations (_tmp20_);
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp21_) {
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = TRUE;
-#line 16547 "PhotoPage.c"
+#line 16576 "PhotoPage.c"
 	} else {
 		gboolean _tmp22_ = FALSE;
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = dialogs_confirm_warn_developer_changed (1);
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = _tmp22_;
-#line 16554 "PhotoPage.c"
+#line 16583 "PhotoPage.c"
 	}
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 16558 "PhotoPage.c"
+#line 16587 "PhotoPage.c"
 		SetRawDeveloperCommand* command = NULL;
 		ViewCollection* _tmp23_ = NULL;
 		ViewCollection* _tmp24_ = NULL;
@@ -16571,73 +16600,73 @@ static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, R
 		CommandManager* _tmp30_ = NULL;
 		CommandManager* _tmp31_ = NULL;
 		SetRawDeveloperCommand* _tmp32_ = NULL;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = view_collection_get_selected (_tmp24_);
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = rd;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable), _tmp27_);
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = _tmp28_;
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp24_);
-#line 2572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command = _tmp29_;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = _tmp30_;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = command;
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_COMMAND, Command));
-#line 2574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp31_);
-#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 16604 "PhotoPage.c"
+#line 16633 "PhotoPage.c"
 	}
-#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16608 "PhotoPage.c"
+#line 16637 "PhotoPage.c"
 }
 
 
 void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper rd) {
-#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 16617 "PhotoPage.c"
+#line 16646 "PhotoPage.c"
 }
 
 
 static void library_photo_page_update_flag_action (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 16629 "PhotoPage.c"
+#line 16658 "PhotoPage.c"
 }
 
 
 static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
-#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self);
-#line 16636 "PhotoPage.c"
+#line 16665 "PhotoPage.c"
 }
 
 
@@ -16648,75 +16677,75 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 	ViewCollection* _tmp3_ = NULL;
 	ViewCollection* _tmp4_ = NULL;
 	Photo* _tmp9_ = NULL;
-#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_COLLECTION_PAGE (return_page));
-#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((view == NULL) || IS_VIEW_COLLECTION (view));
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = return_page;
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = _tmp1_;
-#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = return_page;
-#line 2591 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _library_photo_page_on_page_destroyed_gtk_widget_destroy, self, 0);
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = view;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 16671 "PhotoPage.c"
+#line 16700 "PhotoPage.c"
 		ViewCollection* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = view;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _data_collection_ref0 (_tmp5_);
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp6_;
-#line 16682 "PhotoPage.c"
+#line 16711 "PhotoPage.c"
 	} else {
 		CollectionPage* _tmp7_ = NULL;
 		ViewCollection* _tmp8_ = NULL;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = return_page;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page));
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp3_);
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp8_;
-#line 16694 "PhotoPage.c"
+#line 16723 "PhotoPage.c"
 	}
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = photo;
-#line 2593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp9_);
-#line 2588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp3_);
-#line 16702 "PhotoPage.c"
+#line 16731 "PhotoPage.c"
 }
 
 
 void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) {
-#line 2596 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = NULL;
-#line 2600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 16715 "PhotoPage.c"
+#line 16744 "PhotoPage.c"
 }
 
 
@@ -16724,17 +16753,17 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self)
 	CollectionPage* result = NULL;
 	CollectionPage* _tmp0_ = NULL;
 	CollectionPage* _tmp1_ = NULL;
-#line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
-#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_page;
-#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp1_;
-#line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16733 "PhotoPage.c"
+#line 16762 "PhotoPage.c"
 }
 
 
@@ -16745,77 +16774,77 @@ static void library_photo_page_real_switched_to (Page* base) {
 	ConfigFacade* _tmp2_ = NULL;
 	ConfigFacade* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
+#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (_tmp1_ != NULL, "get_photo() != null");
-#line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->switched_to (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page));
-#line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 2616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_set_display_ratings (self, _tmp4_);
-#line 2618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 16770 "PhotoPage.c"
+#line 16799 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_switching_from (Page* base) {
 	LibraryPhotoPage * self;
-#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2623 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 16780 "PhotoPage.c"
+#line 16809 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
 		gint _entry_collection_size_ = 0;
 		gint entry_it = 0;
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		entry_collection = LIBRARY_PHOTO_PAGE_entries;
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 16792 "PhotoPage.c"
+#line 16821 "PhotoPage.c"
 			GActionEntry entry = {0};
-#line 2624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 16796 "PhotoPage.c"
+#line 16825 "PhotoPage.c"
 			{
 				AppWindow* _tmp0_ = NULL;
 				AppWindow* _tmp1_ = NULL;
 				GActionEntry _tmp2_ = {0};
 				const gchar* _tmp3_ = NULL;
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp0_ = app_window_get_instance ();
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp1_ = _tmp0_;
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp2_ = entry;
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp3_ = _tmp2_.name;
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_map_remove_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), _tmp3_);
-#line 2625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp1_);
-#line 16814 "PhotoPage.c"
+#line 16843 "PhotoPage.c"
 			}
 		}
 	}
@@ -16833,58 +16862,58 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 	gint _tmp8_ = 0;
 	GdkPixbuf* _tmp9_ = NULL;
 	GdkPixbuf* _tmp10_ = NULL;
-#line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16840 "PhotoPage.c"
+#line 16869 "PhotoPage.c"
 	} else {
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16855 "PhotoPage.c"
+#line 16884 "PhotoPage.c"
 	}
-#line 2630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 2631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16863 "PhotoPage.c"
+#line 16892 "PhotoPage.c"
 	}
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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));
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = scale;
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = resources_get_rating_trinket (_tmp7_, _tmp8_);
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp10_;
-#line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16883 "PhotoPage.c"
+#line 16912 "PhotoPage.c"
 }
 
 
@@ -16894,46 +16923,46 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GdkPixbuf* _tmp5_ = NULL;
-#line 2636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16901 "PhotoPage.c"
+#line 16930 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
 		LibraryPhoto* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FLAGGABLE, Flaggable));
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp4_;
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 16916 "PhotoPage.c"
+#line 16945 "PhotoPage.c"
 	}
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
-#line 2638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16924 "PhotoPage.c"
+#line 16953 "PhotoPage.c"
 	}
-#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
-#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp5_;
-#line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16932 "PhotoPage.c"
+#line 16961 "PhotoPage.c"
 }
 
 
@@ -16949,51 +16978,51 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 	LibraryPhoto* _tmp7_ = NULL;
 	SlideshowPage* _tmp8_ = NULL;
 	SlideshowPage* _tmp9_ = NULL;
-#line 2643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 2645 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 2646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16962 "PhotoPage.c"
+#line 16991 "PhotoPage.c"
 	}
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = app_window_get_instance ();
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = library_photo_global;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = slideshow_page_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_SOURCE_COLLECTION, SourceCollection), _tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo));
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp8_);
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	app_window_go_fullscreen (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PAGE, Page));
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp6_);
-#line 2648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 2643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16992 "PhotoPage.c"
+#line 17021 "PhotoPage.c"
 }
 
 
@@ -17004,73 +17033,73 @@ static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPa
 	gboolean _tmp4_ = FALSE;
 	ZoomState _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
-#line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp2_) {
-#line 17011 "PhotoPage.c"
+#line 17040 "PhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 17017 "PhotoPage.c"
+#line 17046 "PhotoPage.c"
 	} else {
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17021 "PhotoPage.c"
+#line 17050 "PhotoPage.c"
 	}
-#line 2653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp6_) {
-#line 17031 "PhotoPage.c"
+#line 17060 "PhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 17037 "PhotoPage.c"
+#line 17066 "PhotoPage.c"
 	} else {
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 17041 "PhotoPage.c"
+#line 17070 "PhotoPage.c"
 	}
-#line 2654 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 17045 "PhotoPage.c"
+#line 17074 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_on_increase_size (EditingHostPage* base) {
 	LibraryPhotoPage * self;
-#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2662 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2660 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17057 "PhotoPage.c"
+#line 17086 "PhotoPage.c"
 }
 
 
 static void library_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	LibraryPhotoPage * self;
-#line 2663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17069 "PhotoPage.c"
+#line 17098 "PhotoPage.c"
 }
 
 
@@ -17082,43 +17111,43 @@ static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPag
 	GdkEventKey* _tmp2_ = NULL;
 	guint _tmp3_ = 0U;
 	const gchar* _tmp4_ = NULL;
-#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = event;
-#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_zoom_slider_key_press (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_);
-#line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17095 "PhotoPage.c"
+#line 17124 "PhotoPage.c"
 	}
-#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_->keyval;
-#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (g_strcmp0 (_tmp4_, "Escape") == 0) {
-#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_return_to_collection (self);
-#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17111 "PhotoPage.c"
+#line 17140 "PhotoPage.c"
 	} else {
-#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
-#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17117 "PhotoPage.c"
+#line 17146 "PhotoPage.c"
 	}
 }
 
@@ -17128,77 +17157,77 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m
 	gboolean sensitivity = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 2682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	sensitivity = !_tmp0_;
-#line 2684 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", sensitivity);
-#line 2685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2689 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", sensitivity);
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", sensitivity);
-#line 2687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2691 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", sensitivity);
-#line 2689 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", sensitivity);
-#line 2690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", sensitivity);
-#line 2692 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", sensitivity);
-#line 2693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", sensitivity);
-#line 2694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", sensitivity);
-#line 2695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", sensitivity);
-#line 2696 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", sensitivity);
-#line 2697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Slideshow", sensitivity);
-#line 2699 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", sensitivity);
-#line 2700 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", sensitivity);
-#line 2701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", sensitivity);
-#line 2702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", sensitivity);
-#line 2703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", sensitivity);
-#line 2704 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", sensitivity);
-#line 2705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", sensitivity);
-#line 2706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", sensitivity);
-#line 2707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "EditTitle", sensitivity);
-#line 2708 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", sensitivity);
-#line 2709 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", sensitivity);
-#line 2710 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", sensitivity);
-#line 2711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", sensitivity);
-#line 2713 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Rate", sensitivity);
-#line 2714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", sensitivity);
-#line 2715 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2719 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AddTags", sensitivity);
-#line 2716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ModifyTags", sensitivity);
-#line 2718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", sensitivity);
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = missing;
-#line 2720 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 17197 "PhotoPage.c"
+#line 17226 "PhotoPage.c"
 }
 
 
@@ -17207,36 +17236,36 @@ static void library_photo_page_real_notify_photo_backing_missing (EditingHostPag
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = missing;
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 17214 "PhotoPage.c"
+#line 17243 "PhotoPage.c"
 		Photo* _tmp1_ = NULL;
-#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = photo;
-#line 2725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 17220 "PhotoPage.c"
+#line 17249 "PhotoPage.c"
 	} else {
 		Photo* _tmp2_ = NULL;
-#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
-#line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 17227 "PhotoPage.c"
+#line 17256 "PhotoPage.c"
 	}
-#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo;
-#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = missing;
-#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 17235 "PhotoPage.c"
+#line 17264 "PhotoPage.c"
 }
 
 
@@ -17250,300 +17279,300 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
 	GQuark _tmp8_ = 0U;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label0 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label1 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label2 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label3 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label4 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label5 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label6 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label7 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label8 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label9 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label10 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label11 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label12 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label13 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label14 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label15 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label16 = 0;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	static GQuark _tmp7_label17 = 0;
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) {
-#line 17291 "PhotoPage.c"
+#line 17320 "PhotoPage.c"
 		GdkEventKey* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = event;
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_ == TRUE;
-#line 17300 "PhotoPage.c"
+#line 17329 "PhotoPage.c"
 	} else {
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17304 "PhotoPage.c"
+#line 17333 "PhotoPage.c"
 	}
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17312 "PhotoPage.c"
+#line 17341 "PhotoPage.c"
 	}
-#line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = event;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_->keyval;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = gdk_keyval_name (_tmp4_);
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Escape")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("Return"))))) || (_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("KP_Enter"))))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17330 "PhotoPage.c"
+#line 17359 "PhotoPage.c"
 			default:
 			{
 				GtkWindow* _tmp9_ = NULL;
 				GtkWindow* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp9_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = _tmp9_;
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_FULLSCREEN_WINDOW);
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp10_);
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (_tmp11_) {
-#line 2742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					library_photo_page_return_to_collection (self);
-#line 17348 "PhotoPage.c"
+#line 17377 "PhotoPage.c"
 				}
-#line 2743 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17352 "PhotoPage.c"
+#line 17381 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17358 "PhotoPage.c"
+#line 17387 "PhotoPage.c"
 			default:
 			{
-#line 2749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash");
-#line 2750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17365 "PhotoPage.c"
+#line 17394 "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 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17371 "PhotoPage.c"
+#line 17400 "PhotoPage.c"
 			default:
 			{
-#line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
-#line 2755 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17378 "PhotoPage.c"
+#line 17407 "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 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17384 "PhotoPage.c"
+#line 17413 "PhotoPage.c"
 			default:
 			{
-#line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
-#line 2760 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17391 "PhotoPage.c"
+#line 17420 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17397 "PhotoPage.c"
+#line 17426 "PhotoPage.c"
 			default:
 			{
-#line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
-#line 2764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17404 "PhotoPage.c"
+#line 17433 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17410 "PhotoPage.c"
+#line 17439 "PhotoPage.c"
 			default:
 			{
-#line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
-#line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17417 "PhotoPage.c"
+#line 17446 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17423 "PhotoPage.c"
+#line 17452 "PhotoPage.c"
 			default:
 			{
-#line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
-#line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2776 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17430 "PhotoPage.c"
+#line 17459 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17436 "PhotoPage.c"
+#line 17465 "PhotoPage.c"
 			default:
 			{
-#line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
-#line 2776 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17443 "PhotoPage.c"
+#line 17472 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17449 "PhotoPage.c"
+#line 17478 "PhotoPage.c"
 			default:
 			{
-#line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
-#line 2780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2784 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17456 "PhotoPage.c"
+#line 17485 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17462 "PhotoPage.c"
+#line 17491 "PhotoPage.c"
 			default:
 			{
-#line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
-#line 2784 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2788 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17469 "PhotoPage.c"
+#line 17498 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17475 "PhotoPage.c"
+#line 17504 "PhotoPage.c"
 			default:
 			{
-#line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
-#line 2788 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17482 "PhotoPage.c"
+#line 17511 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17488 "PhotoPage.c"
+#line 17517 "PhotoPage.c"
 			default:
 			{
-#line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17495 "PhotoPage.c"
+#line 17524 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17501 "PhotoPage.c"
+#line 17530 "PhotoPage.c"
 			default:
 			{
-#line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2799 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
-#line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17508 "PhotoPage.c"
+#line 17537 "PhotoPage.c"
 			}
 		}
 	} else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17514 "PhotoPage.c"
+#line 17543 "PhotoPage.c"
 			default:
 			{
-#line 2799 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
-#line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17521 "PhotoPage.c"
+#line 17550 "PhotoPage.c"
 			}
 		}
 	} else {
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17527 "PhotoPage.c"
+#line 17556 "PhotoPage.c"
 			default:
 			{
-#line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
-#line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17534 "PhotoPage.c"
+#line 17563 "PhotoPage.c"
 			}
 		}
 	}
-#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = handled;
-#line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17542 "PhotoPage.c"
+#line 17571 "PhotoPage.c"
 }
 
 
@@ -17554,44 +17583,44 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	GtkWindow* _tmp0_ = NULL;
 	FullscreenWindow* _tmp1_ = NULL;
 	FullscreenWindow* _tmp2_ = NULL;
-#line 2810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2810 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2814 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL;
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 17565 "PhotoPage.c"
+#line 17594 "PhotoPage.c"
 	}
-#line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	fs = _tmp1_;
-#line 2812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = fs;
-#line 2812 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 2813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = TRUE;
-#line 17575 "PhotoPage.c"
+#line 17604 "PhotoPage.c"
 	} else {
 		FullscreenWindow* _tmp3_ = NULL;
-#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = fs;
-#line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 17582 "PhotoPage.c"
+#line 17611 "PhotoPage.c"
 	}
-#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (fs);
-#line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17590 "PhotoPage.c"
+#line 17619 "PhotoPage.c"
 }
 
 
@@ -17601,33 +17630,33 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
 	gboolean _tmp0_ = FALSE;
 	GdkEventButton* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2820 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_to_collection_on_release;
-#line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = FALSE;
-#line 2823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_return_to_collection (self);
-#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
-#line 2825 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17616 "PhotoPage.c"
+#line 17645 "PhotoPage.c"
 	}
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = event;
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = PAGE_CLASS (library_photo_page_parent_class)->on_left_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp1_);
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp2_;
-#line 2828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17626 "PhotoPage.c"
+#line 17655 "PhotoPage.c"
 }
 
 
@@ -17636,13 +17665,13 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp7_ = NULL;
 	GtkMenu* _tmp8_ = NULL;
-#line 2833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), NULL);
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 17641 "PhotoPage.c"
+#line 17670 "PhotoPage.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_ = NULL;
 		GObject* _tmp2_ = NULL;
@@ -17650,41 +17679,41 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 		GMenuModel* _tmp4_ = NULL;
 		GtkMenu* _tmp5_ = NULL;
 		GtkMenu* _tmp6_ = NULL;
-#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
-#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = gtk_builder_get_object (_tmp1_, "PhotoContextMenu");
-#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp2_) : NULL);
-#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		model = _tmp3_;
-#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = model;
-#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_);
-#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_object_ref_sink (_tmp5_);
-#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->context_menu);
-#line 2837 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->context_menu = _tmp5_;
-#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = self->priv->context_menu;
-#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 2834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (model);
-#line 17673 "PhotoPage.c"
+#line 17702 "PhotoPage.c"
 	}
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->context_menu;
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _g_object_ref0 (_tmp7_);
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp8_;
-#line 2841 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17683 "PhotoPage.c"
+#line 17712 "PhotoPage.c"
 }
 
 
@@ -17694,25 +17723,25 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
 	GdkEventButton* _tmp2_ = NULL;
-#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2844 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_page_get_context_menu (self);
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = event;
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_);
-#line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17711 "PhotoPage.c"
+#line 17740 "PhotoPage.c"
 }
 
 
@@ -17721,59 +17750,59 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) {
 	gboolean result = FALSE;
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
-#line 2850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_page_get_context_menu (self);
-#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, NULL);
-#line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2855 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
-#line 2853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17734 "PhotoPage.c"
+#line 17763 "PhotoPage.c"
 }
 
 
 static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 	CollectionPage* _tmp0_ = NULL;
-#line 2856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->return_page;
-#line 2858 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (NULL != _tmp0_) {
-#line 17746 "PhotoPage.c"
+#line 17775 "PhotoPage.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
 		CollectionPage* _tmp3_ = NULL;
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = library_window_get_app ();
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->return_page;
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page));
-#line 2859 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 17760 "PhotoPage.c"
+#line 17789 "PhotoPage.c"
 	} else {
 		LibraryWindow* _tmp4_ = NULL;
 		LibraryWindow* _tmp5_ = NULL;
-#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = library_window_get_app ();
-#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp5_);
-#line 2861 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 17772 "PhotoPage.c"
+#line 17801 "PhotoPage.c"
 	}
 }
 
@@ -17785,29 +17814,29 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
 	GeeArrayList* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
-#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (photos, photo);
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _ ("Remove From Library");
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _ ("Removing Photo From Library");
-#line 2870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	remove_from_app (photos, _tmp2_, _tmp3_);
-#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
-#line 2864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17806 "PhotoPage.c"
+#line 17835 "PhotoPage.c"
 }
 
 
@@ -17832,64 +17861,64 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 	TrashUntrashPhotosCommand* _tmp26_ = NULL;
 	LibraryWindow* _tmp27_ = NULL;
 	LibraryWindow* _tmp28_ = NULL;
-#line 2873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 17839 "PhotoPage.c"
+#line 17868 "PhotoPage.c"
 	}
-#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->return_page;
-#line 2882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) {
-#line 17845 "PhotoPage.c"
+#line 17874 "PhotoPage.c"
 		LibraryWindow* _tmp2_ = NULL;
 		LibraryWindow* _tmp3_ = NULL;
-#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = library_window_get_app ();
-#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_set_page_switching_enabled (_tmp3_, FALSE);
-#line 2883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 17856 "PhotoPage.c"
+#line 17885 "PhotoPage.c"
 	}
-#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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));
-#line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2888 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = photos;
-#line 2889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = photo;
-#line 2889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gee_collection_add (_tmp6_, _tmp7_);
-#line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
+#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = photo;
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource));
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
-#line 17888 "PhotoPage.c"
+#line 17917 "PhotoPage.c"
 		LibraryWindow* _tmp13_ = NULL;
 		LibraryWindow* _tmp14_ = NULL;
 		GtkWindow* _tmp15_ = NULL;
@@ -17897,88 +17926,88 @@ static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
 		gboolean _tmp17_ = FALSE;
 		LibraryWindow* _tmp20_ = NULL;
 		LibraryWindow* _tmp21_ = NULL;
-#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = library_window_get_app ();
-#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_set_page_switching_enabled (_tmp14_, TRUE);
-#line 2899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp14_);
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = _tmp15_;
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_FULLSCREEN_WINDOW);
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 2901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp17_) {
-#line 17914 "PhotoPage.c"
+#line 17943 "PhotoPage.c"
 			GtkWindow* _tmp18_ = NULL;
 			FullscreenWindow* _tmp19_ = NULL;
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp18_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			fullscreen_window_close (_tmp19_);
-#line 2902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp19_);
-#line 17925 "PhotoPage.c"
+#line 17954 "PhotoPage.c"
 		}
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp21_);
-#line 2904 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 17935 "PhotoPage.c"
+#line 17964 "PhotoPage.c"
 	}
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = _tmp22_;
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = photos;
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = trash_untrash_photos_command_new (_tmp24_, TRUE);
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_;
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_COMMAND, Command));
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 2907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp23_);
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = library_window_get_app ();
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = _tmp27_;
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_window_set_page_switching_enabled (_tmp28_, TRUE);
-#line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp28_);
-#line 2873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
-#line 2873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17965 "PhotoPage.c"
+#line 17994 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 17977 "PhotoPage.c"
+#line 18006 "PhotoPage.c"
 		GeeArrayList* photo_list = NULL;
 		GeeArrayList* _tmp1_ = NULL;
 		GeeArrayList* _tmp2_ = NULL;
@@ -17992,62 +18021,62 @@ static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
 		gboolean _tmp10_ = FALSE;
 		FlagUnflagCommand* _tmp11_ = NULL;
 		FlagUnflagCommand* _tmp12_ = NULL;
-#line 2913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 2913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_list = _tmp1_;
-#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo_list;
-#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 2914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = photo_list;
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_FLAGGABLE, Flaggable));
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), !_tmp10_);
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo_list);
-#line 18031 "PhotoPage.c"
+#line 18060 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source) {
 	DataSource* _tmp0_ = NULL;
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
-#line 2921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = source;
-#line 2921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 18046 "PhotoPage.c"
+#line 18075 "PhotoPage.c"
 }
 
 
@@ -18069,100 +18098,100 @@ static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, Library
 	Photo* _tmp17_ = NULL;
 	gboolean _tmp18_ = FALSE;
 	gboolean _tmp19_ = FALSE;
-#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = photo;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18078 "PhotoPage.c"
+#line 18107 "PhotoPage.c"
 	} else {
 		LibraryPhoto* _tmp2_ = NULL;
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = photo;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = !_tmp5_;
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 18096 "PhotoPage.c"
+#line 18125 "PhotoPage.c"
 	}
-#line 2926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 2927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18102 "PhotoPage.c"
+#line 18131 "PhotoPage.c"
 	}
-#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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));
-#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view = _tmp6_;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = view;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = view;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = view;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = photo;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = view_collection_get_view_for_source (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource));
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), _tmp14_);
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 2933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = photo;
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = _tmp16_;
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource));
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp17_);
-#line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp19_) {
-#line 18146 "PhotoPage.c"
+#line 18175 "PhotoPage.c"
 		LibraryWindow* _tmp20_ = NULL;
 		LibraryWindow* _tmp21_ = NULL;
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = library_window_get_app ();
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = _tmp20_;
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_window_switch_to_library_page (_tmp21_);
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp21_);
-#line 18157 "PhotoPage.c"
+#line 18186 "PhotoPage.c"
 	}
-#line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (view);
-#line 18161 "PhotoPage.c"
+#line 18190 "PhotoPage.c"
 }
 
 
@@ -18171,48 +18200,48 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 2942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18184 "PhotoPage.c"
+#line 18213 "PhotoPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 2943 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 18211 "PhotoPage.c"
+#line 18240 "PhotoPage.c"
 	}
 }
 
@@ -18220,55 +18249,55 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 2948 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 18225 "PhotoPage.c"
+#line 18254 "PhotoPage.c"
 		ConfigFacade* _tmp2_ = NULL;
 		ConfigFacade* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = config_facade_get_instance ();
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = _tmp2_;
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = g_strcmp0 (_tmp5_, "") != 0;
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp5_);
-#line 2950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp3_);
-#line 18244 "PhotoPage.c"
+#line 18273 "PhotoPage.c"
 	} else {
-#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 18248 "PhotoPage.c"
+#line 18277 "PhotoPage.c"
 	}
-#line 2949 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 18252 "PhotoPage.c"
+#line 18281 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18267 "PhotoPage.c"
+#line 18296 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp1_ = NULL;
@@ -18277,39 +18306,39 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		Photo* _tmp4_ = NULL;
 		AppWindow* _tmp5_ = NULL;
 		AppWindow* _tmp6_ = NULL;
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = app_window_get_instance ();
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_open_with_external_editor (_tmp4_, &_inner_error_);
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18294 "PhotoPage.c"
-			goto __catch250_g_error;
+#line 18323 "PhotoPage.c"
+			goto __catch251_g_error;
 		}
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 18305 "PhotoPage.c"
+#line 18334 "PhotoPage.c"
 	}
-	goto __finally250;
-	__catch250_g_error:
+	goto __finally251;
+	__catch251_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp7_ = NULL;
@@ -18317,42 +18346,42 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		GError* _tmp9_ = NULL;
 		Photo* _tmp10_ = NULL;
 		Photo* _tmp11_ = NULL;
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = app_window_get_instance ();
-#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = err;
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = _tmp10_;
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		open_external_editor_error_dialog (_tmp9_, _tmp11_);
-#line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp11_);
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18340 "PhotoPage.c"
+#line 18369 "PhotoPage.c"
 	}
-	__finally250:
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally251:
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18351 "PhotoPage.c"
+#line 18380 "PhotoPage.c"
 	}
 }
 
@@ -18364,31 +18393,31 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 	PhotoFileFormat _tmp3_ = 0;
 	gboolean _tmp4_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 2968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2969 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18371 "PhotoPage.c"
+#line 18400 "PhotoPage.c"
 	}
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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));
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = _tmp1_;
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = photo_get_master_file_format (_tmp2_);
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_ != PHOTO_FILE_FORMAT_RAW;
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_) {
-#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18387 "PhotoPage.c"
+#line 18416 "PhotoPage.c"
 	}
 	{
 		AppWindow* _tmp5_ = NULL;
@@ -18397,39 +18426,39 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		Photo* _tmp8_ = NULL;
 		AppWindow* _tmp9_ = NULL;
 		AppWindow* _tmp10_ = NULL;
-#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = app_window_get_instance ();
-#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_open_with_raw_external_editor (_tmp8_, &_inner_error_);
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18414 "PhotoPage.c"
-			goto __catch251_g_error;
+#line 18443 "PhotoPage.c"
+			goto __catch252_g_error;
 		}
-#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = app_window_get_instance ();
-#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp10_);
-#line 18425 "PhotoPage.c"
+#line 18454 "PhotoPage.c"
 	}
-	goto __finally251;
-	__catch251_g_error:
+	goto __finally252;
+	__catch252_g_error:
 	{
 		GError* err = NULL;
 		AppWindow* _tmp11_ = NULL;
@@ -18437,74 +18466,74 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		GError* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gchar* _tmp15_ = NULL;
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = app_window_get_instance ();
-#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE_WINDOW, PageWindow));
-#line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp12_);
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = err;
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = resources_launch_editor_failed (_tmp13_);
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		app_window_error_message (_tmp15_, NULL);
-#line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp15_);
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18460 "PhotoPage.c"
+#line 18489 "PhotoPage.c"
 	}
-	__finally251:
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally252:
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 2975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18471 "PhotoPage.c"
+#line 18500 "PhotoPage.c"
 	}
 }
 
 
 static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 18484 "PhotoPage.c"
+#line 18513 "PhotoPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		desktop_integration_send_to (_tmp4_);
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 2987 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 18503 "PhotoPage.c"
+#line 18532 "PhotoPage.c"
 	}
 }
 
@@ -18536,85 +18565,85 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 	gint _tmp17_ = 0;
 	Scaling _tmp18_ = {0};
 	GError * _inner_error_ = NULL;
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp0_) {
-#line 2992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18543 "PhotoPage.c"
+#line 18572 "PhotoPage.c"
 	}
-#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _ ("Export Photo");
-#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = export_dialog_new (_tmp1_);
-#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_object_ref_sink (_tmp2_);
-#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	export_dialog = _tmp2_;
 #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	export_dialog = _tmp2_;
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_format_parameters_last (&_tmp3_);
-#line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	export_params = _tmp3_;
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = export_dialog;
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = export_dialog_execute (_tmp4_, &_tmp5_, &_tmp6_, &export_params);
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scale = _tmp5_;
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	constraint = _tmp6_;
-#line 2999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp7_) {
-#line 3000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 3000 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18571 "PhotoPage.c"
+#line 18600 "PhotoPage.c"
 	}
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = export_params;
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = photo_get_export_basename_for_parameters (_tmp9_, &_tmp10_);
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = export_ui_choose_file (_tmp12_);
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp12_);
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp9_);
-#line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	save_as = _tmp14_;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = save_as;
-#line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp15_ == NULL) {
-#line 3005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
-#line 3005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 3005 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18603 "PhotoPage.c"
+#line 18632 "PhotoPage.c"
 	}
-#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = constraint;
-#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = scale;
-#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling_for_constraint (_tmp16_, _tmp17_, FALSE, &_tmp18_);
-#line 3007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	scaling = _tmp18_;
-#line 18613 "PhotoPage.c"
+#line 18642 "PhotoPage.c"
 	{
 		Photo* _tmp19_ = NULL;
 		Photo* _tmp20_ = NULL;
@@ -18630,48 +18659,48 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		ExportFormatMode _tmp30_ = 0;
 		ExportFormatParameters _tmp31_ = {0};
 		gboolean _tmp32_ = FALSE;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp21_ = save_as;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp22_ = scaling;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = export_params;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp24_ = _tmp23_.quality;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp25_;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp27_ = export_params;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = photo_get_export_format_for_parameters (_tmp26_, &_tmp27_);
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp29_ = export_params;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp30_ = _tmp29_.mode;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp31_ = export_params;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp32_ = _tmp31_.export_metadata;
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		photo_export (_tmp20_, _tmp21_, &_tmp22_, _tmp24_, _tmp28_, _tmp30_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp32_, &_inner_error_);
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp26_);
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 3010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18665 "PhotoPage.c"
-			goto __catch252_g_error;
+#line 18694 "PhotoPage.c"
+			goto __catch253_g_error;
 		}
 	}
-	goto __finally252;
-	__catch252_g_error:
+	goto __finally253;
+	__catch253_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp33_ = NULL;
@@ -18682,56 +18711,56 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		const gchar* _tmp38_ = NULL;
 		gchar* _tmp39_ = NULL;
 		gchar* _tmp40_ = NULL;
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp33_ = _ ("Unable to export %s: %s");
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp34_ = save_as;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp35_ = g_file_get_path (_tmp34_);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp36_ = _tmp35_;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp37_ = err;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp38_ = _tmp37_->message;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp39_ = g_strdup_printf (_tmp33_, _tmp36_, _tmp38_);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp40_ = _tmp39_;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		app_window_error_message (_tmp40_, NULL);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp40_);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_free0 (_tmp36_);
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18709 "PhotoPage.c"
+#line 18738 "PhotoPage.c"
 	}
-	__finally252:
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	__finally253:
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18724 "PhotoPage.c"
+#line 18753 "PhotoPage.c"
 	}
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (save_as);
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 18730 "PhotoPage.c"
+#line 18759 "PhotoPage.c"
 }
 
 
@@ -18740,40 +18769,40 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_) {
-#line 18753 "PhotoPage.c"
+#line 18782 "PhotoPage.c"
 		ViewCollection* _tmp4_ = NULL;
 		ViewCollection* _tmp5_ = NULL;
 		GeeList* _tmp6_ = NULL;
 		GeeCollection* _tmp7_ = NULL;
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		publishing_ui_publishing_dialog_go (_tmp7_);
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp5_);
-#line 18772 "PhotoPage.c"
+#line 18801 "PhotoPage.c"
 	}
 }
 
@@ -18789,56 +18818,56 @@ static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
 	SetRatingSingleCommand* _tmp9_ = NULL;
-#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18796 "PhotoPage.c"
+#line 18825 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18803 "PhotoPage.c"
+#line 18832 "PhotoPage.c"
 	}
-#line 3025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18809 "PhotoPage.c"
+#line 18838 "PhotoPage.c"
 	}
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), TRUE);
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp6_;
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = command;
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 3031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18837 "PhotoPage.c"
+#line 18866 "PhotoPage.c"
 }
 
 
@@ -18853,56 +18882,56 @@ static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
 	CommandManager* _tmp7_ = NULL;
 	CommandManager* _tmp8_ = NULL;
 	SetRatingSingleCommand* _tmp9_ = NULL;
-#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18860 "PhotoPage.c"
+#line 18889 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18867 "PhotoPage.c"
+#line 18896 "PhotoPage.c"
 	}
-#line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3036 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18873 "PhotoPage.c"
+#line 18902 "PhotoPage.c"
 	}
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), FALSE);
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp6_;
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = command;
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 3041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3034 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18901 "PhotoPage.c"
+#line 18930 "PhotoPage.c"
 }
 
 
@@ -18918,121 +18947,121 @@ static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rat
 	CommandManager* _tmp8_ = NULL;
 	CommandManager* _tmp9_ = NULL;
 	SetRatingSingleCommand* _tmp10_ = NULL;
-#line 3044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp1_) {
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18925 "PhotoPage.c"
+#line 18954 "PhotoPage.c"
 	} else {
 		gboolean _tmp2_ = FALSE;
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp2_;
-#line 18932 "PhotoPage.c"
+#line 18961 "PhotoPage.c"
 	}
-#line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3046 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18938 "PhotoPage.c"
+#line 18967 "PhotoPage.c"
 	}
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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));
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = rating;
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = set_rating_single_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), _tmp5_);
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command = _tmp7_;
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = command;
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp9_);
-#line 3051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
-#line 3044 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18968 "PhotoPage.c"
+#line 18997 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) {
-#line 3054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_REJECTED);
-#line 18977 "PhotoPage.c"
+#line 19006 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) {
-#line 3058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_UNRATED);
-#line 18986 "PhotoPage.c"
+#line 19015 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_one (LibraryPhotoPage* self) {
-#line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_ONE);
-#line 18995 "PhotoPage.c"
+#line 19024 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_two (LibraryPhotoPage* self) {
-#line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_TWO);
-#line 19004 "PhotoPage.c"
+#line 19033 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_three (LibraryPhotoPage* self) {
-#line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_THREE);
-#line 19013 "PhotoPage.c"
+#line 19042 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_four (LibraryPhotoPage* self) {
-#line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FOUR);
-#line 19022 "PhotoPage.c"
+#line 19051 "PhotoPage.c"
 }
 
 
 static void library_photo_page_on_rate_five (LibraryPhotoPage* self) {
-#line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FIVE);
-#line 19031 "PhotoPage.c"
+#line 19060 "PhotoPage.c"
 }
 
 
@@ -19066,117 +19095,117 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto
 	Photo* _tmp26_ = NULL;
 	Rating _tmp27_ = 0;
 	gboolean _tmp28_ = FALSE;
-#line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", _tmp2_ != RATING_REJECTED);
-#line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = _tmp3_;
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", _tmp5_ != RATING_UNRATED);
-#line 3084 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = _tmp6_;
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", _tmp8_ != RATING_ONE);
-#line 3085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp7_);
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = _tmp9_;
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", _tmp11_ != RATING_TWO);
-#line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp10_);
-#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", _tmp14_ != RATING_THREE);
-#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp13_);
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", _tmp17_ != RATING_FOUR);
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp20_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", _tmp20_ != RATING_FIVE);
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp19_);
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp24_ = rating_can_increase (_tmp23_);
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp24_);
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp22_);
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp26_ = _tmp25_;
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = rating_can_decrease (_tmp27_);
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_);
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp26_);
-#line 19161 "PhotoPage.c"
+#line 19190 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new18 (const gchar* value) {
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19168 "PhotoPage.c"
+#line 19197 "PhotoPage.c"
 }
 
 
 static GVariant* _variant_new19 (const gchar* value) {
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19175 "PhotoPage.c"
+#line 19204 "PhotoPage.c"
 }
 
 
@@ -19188,98 +19217,98 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 	PhotoFileFormat _tmp3_ = 0;
 	PhotoFileFormat _tmp4_ = 0;
 	PhotoFileFormat _tmp5_ = 0;
-#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo_get_master_file_format (_tmp1_);
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	format = _tmp3_;
-#line 3096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = format;
-#line 3096 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp4_ == PHOTO_FILE_FORMAT_RAW);
-#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = format;
-#line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) {
-#line 19209 "PhotoPage.c"
+#line 19238 "PhotoPage.c"
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		RawDeveloper _tmp8_ = 0;
 		RawDeveloper _tmp9_ = 0;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = photo_get_raw_developer (_tmp7_);
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = _tmp8_;
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (_tmp9_) {
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_SHOTWELL:
-#line 19228 "PhotoPage.c"
+#line 19257 "PhotoPage.c"
 			{
 				GAction* _tmp10_ = NULL;
 				GAction* _tmp11_ = NULL;
 				GVariant* _tmp12_ = NULL;
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp11_ = _tmp10_;
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp12_ = _variant_new18 ("Shotwell");
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_change_state (_tmp11_, _tmp12_);
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_variant_unref0 (_tmp12_);
-#line 3103 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp11_);
-#line 3104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19247 "PhotoPage.c"
+#line 19276 "PhotoPage.c"
 			}
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_CAMERA:
-#line 3101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_EMBEDDED:
-#line 19253 "PhotoPage.c"
+#line 19282 "PhotoPage.c"
 			{
 				GAction* _tmp13_ = NULL;
 				GAction* _tmp14_ = NULL;
 				GVariant* _tmp15_ = NULL;
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp14_ = _tmp13_;
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_tmp15_ = _variant_new19 ("Camera");
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_action_change_state (_tmp14_, _tmp15_);
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_variant_unref0 (_tmp15_);
-#line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp14_);
-#line 3109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19272 "PhotoPage.c"
+#line 19301 "PhotoPage.c"
 			}
 			default:
 			{
-#line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_assert_not_reached ();
-#line 19278 "PhotoPage.c"
+#line 19307 "PhotoPage.c"
 			}
 		}
 	}
@@ -19293,60 +19322,60 @@ static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeM
 	Photo* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = map;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = gee_map_has_key (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 19310 "PhotoPage.c"
+#line 19339 "PhotoPage.c"
 		GeeMap* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		gpointer _tmp9_ = NULL;
 		Alteration* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = map;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = gee_map_get (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp10_ = (Alteration*) _tmp9_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = alteration_has_subject (_tmp10_, "metadata");
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = _tmp11_;
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_alteration_unref0 (_tmp10_);
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 19335 "PhotoPage.c"
+#line 19364 "PhotoPage.c"
 	} else {
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 19339 "PhotoPage.c"
+#line 19368 "PhotoPage.c"
 	}
-#line 3118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 3119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 19345 "PhotoPage.c"
+#line 19374 "PhotoPage.c"
 	}
 }
 
@@ -19362,29 +19391,29 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 	gint _names_size_ = 0;
 	gchar** _tmp4_ = NULL;
 	gint _tmp4__length1 = 0;
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = add_tags_dialog_new ();
-#line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp0_;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = dialog;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_);
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = _tmp3_;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names_length1 = _tmp2_;
-#line 3124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_names_size_ = names_length1;
-#line 3125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = names;
-#line 3125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4__length1 = names_length1;
-#line 3125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 19383 "PhotoPage.c"
+#line 19412 "PhotoPage.c"
 		CommandManager* _tmp5_ = NULL;
 		CommandManager* _tmp6_ = NULL;
 		HierarchicalTagIndex* _tmp7_ = NULL;
@@ -19401,57 +19430,57 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 		GeeCollection* _tmp16_ = NULL;
 		AddTagsCommand* _tmp17_ = NULL;
 		AddTagsCommand* _tmp18_ = NULL;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = hierarchical_tag_index_get_global_index ();
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9_ = names;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp9__length1 = names_length1;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp11_ = hierarchical_tag_index_get_paths_for_names_array (_tmp8_, _tmp9_, _tmp9__length1, &_tmp10_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp11_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12__length1 = _tmp10_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp15_ = view_collection_get_selected_sources (_tmp14_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp17_ = add_tags_command_new (_tmp12_, _tmp10_, _tmp16_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_COMMAND, Command));
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp18_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp16_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (_tmp14_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = (_vala_array_free (_tmp12_, _tmp12__length1, (GDestroyNotify) g_free), NULL);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_hierarchical_tag_index_unref0 (_tmp8_);
-#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 19444 "PhotoPage.c"
+#line 19473 "PhotoPage.c"
 	}
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 19450 "PhotoPage.c"
+#line 19479 "PhotoPage.c"
 }
 
 
@@ -19476,77 +19505,77 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 	GeeArrayList* _tmp14_ = NULL;
 	ModifyTagsCommand* _tmp15_ = NULL;
 	ModifyTagsCommand* _tmp16_ = NULL;
-#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_at (_tmp1_, 0);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = data_view_get_source (_tmp3_);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 3133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	photo = _tmp5_;
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = photo;
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = modify_tags_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dialog = _tmp7_;
-#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp8_ = dialog;
-#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = modify_tags_dialog_execute (_tmp8_);
-#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	new_tags = _tmp9_;
-#line 3138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp10_ = new_tags;
-#line 3138 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp10_ == NULL) {
-#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (new_tags);
-#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 3139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 19519 "PhotoPage.c"
+#line 19548 "PhotoPage.c"
 	}
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = photo;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp14_ = new_tags;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = modify_tags_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 3141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_tags);
-#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 3132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 19545 "PhotoPage.c"
+#line 19574 "PhotoPage.c"
 }
 
 
@@ -19558,53 +19587,53 @@ static gboolean library_photo_page_library_photo_page_view_filter_real_predicate
 	MediaSource* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 2331 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER, LibraryPhotoPageLibraryPhotoPageViewFilter);
-#line 2331 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = view;
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = data_view_get_source (_tmp0_);
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = media_source_is_trashed (_tmp2_);
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = !_tmp3_;
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp2_);
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp4_;
-#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 19577 "PhotoPage.c"
+#line 19606 "PhotoPage.c"
 }
 
 
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_construct (GType object_type) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* self = NULL;
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type);
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 19587 "PhotoPage.c"
+#line 19616 "PhotoPage.c"
 }
 
 
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) {
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#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 19594 "PhotoPage.c"
+#line 19623 "PhotoPage.c"
 }
 
 
 static void library_photo_page_library_photo_page_view_filter_class_init (LibraryPhotoPageLibraryPhotoPageViewFilterClass * klass) {
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_library_photo_page_view_filter_parent_class = g_type_class_peek_parent (klass);
-#line 2330 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((ViewFilterClass *) klass)->predicate = library_photo_page_library_photo_page_view_filter_real_predicate;
-#line 19603 "PhotoPage.c"
+#line 19632 "PhotoPage.c"
 }
 
 
@@ -19625,69 +19654,69 @@ static GType library_photo_page_library_photo_page_view_filter_get_type (void) {
 
 
 static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_type_class_add_private (klass, sizeof (LibraryPhotoPagePrivate));
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = library_photo_page_real_init_collect_ui_filenames;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->add_actions = library_photo_page_real_add_actions;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->remove_actions = library_photo_page_real_remove_actions;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->init_collect_injection_groups = library_photo_page_real_init_collect_injection_groups;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->update_actions = library_photo_page_real_update_actions;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((LibraryPhotoPageClass *) klass)->developer_changed = library_photo_page_real_developer_changed;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->switched_to = library_photo_page_real_switched_to;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->switching_from = library_photo_page_real_switching_from;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->get_bottom_left_trinket = library_photo_page_real_get_bottom_left_trinket;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->get_top_right_trinket = library_photo_page_real_get_top_right_trinket;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_increase_size = library_photo_page_real_on_increase_size;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_decrease_size = library_photo_page_real_on_decrease_size;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_zoom_slider_key_press = library_photo_page_real_on_zoom_slider_key_press;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->update_ui = library_photo_page_real_update_ui;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->notify_photo_backing_missing = library_photo_page_real_notify_photo_backing_missing;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((GtkWidgetClass *) klass)->key_press_event = library_photo_page_real_key_press_event;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingHostPageClass *) klass)->on_double_click = library_photo_page_real_on_double_click;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->on_left_released = library_photo_page_real_on_left_released;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->on_context_buttonpress = library_photo_page_real_on_context_buttonpress;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((PageClass *) klass)->on_context_keypress = library_photo_page_real_on_context_keypress;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize;
-#line 19670 "PhotoPage.c"
+#line 19699 "PhotoPage.c"
 }
 
 
 static void library_photo_page_instance_init (LibraryPhotoPage * self) {
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_ = NULL;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = LIBRARY_PHOTO_PAGE_GET_PRIVATE (self);
-#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_page = NULL;
-#line 2337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->return_to_collection_on_release = FALSE;
-#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_page_library_photo_page_view_filter_new ();
-#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->filter = _tmp0_;
-#line 19686 "PhotoPage.c"
+#line 19715 "PhotoPage.c"
 }
 
 
@@ -19700,39 +19729,39 @@ static void library_photo_page_finalize (GObject* obj) {
 	ConfigFacade* _tmp4_ = NULL;
 	ConfigFacade* _tmp5_ = NULL;
 	guint _tmp6_ = 0U;
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = library_photo_global;
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("item-destroyed", TYPE_SOURCE_COLLECTION, &_tmp1_, NULL, FALSE);
-#line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SOURCE_COLLECTION, SourceCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _library_photo_page_on_photo_destroyed_source_collection_item_destroyed, self);
-#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = library_photo_global;
-#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp3_, NULL, FALSE);
-#line 2361 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _library_photo_page_on_metadata_altered_data_collection_items_altered, self);
-#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = config_facade_get_instance ();
-#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = _tmp4_;
-#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_parse_name ("external-app-changed", TYPE_CONFIGURATION_FACADE, &_tmp6_, NULL, FALSE);
-#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp6_, 0, NULL, (GCallback) _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed, self);
-#line 2362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp5_);
-#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
-#line 2338 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_view_filter_unref0 (self->priv->filter);
-#line 2831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->context_menu);
-#line 2328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+#line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (library_photo_page_parent_class)->finalize (obj);
-#line 19731 "PhotoPage.c"
+#line 19760 "PhotoPage.c"
 }
 
 
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index 962c80e..9bed855 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -440,6 +440,9 @@ public abstract class EditingHostPage : SinglePhotoPage {
         rotate_button.clicked.connect(on_rotate_clockwise);
         rotate_button.is_important = true;
         toolbar.insert(rotate_button, -1);
+        unowned Gtk.BindingSet binding_set = Gtk.BindingSet.by_class(rotate_button.get_class());
+        Gtk.BindingEntry.add_signal(binding_set, Gdk.Key.KP_Space, Gdk.ModifierType.CONTROL_MASK, "clicked", 0);
+        Gtk.BindingEntry.add_signal(binding_set, Gdk.Key.space, Gdk.ModifierType.CONTROL_MASK, "clicked", 0);
         
         // crop tool
         crop_button = new Gtk.ToggleToolButton ();
@@ -2180,6 +2183,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
             return;
         
         // do this so window size is properly allocated, but window not shown
+        tool_window.set_transient_for(AppWindow.get_instance());
         tool_window.show_all();
         tool_window.hide();
         
diff --git a/src/PixbufCache.c b/src/PixbufCache.c
index cc407c0..229c57a 100644
--- a/src/PixbufCache.c
+++ b/src/PixbufCache.c
@@ -2288,7 +2288,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2291 "PixbufCache.c"
-			goto __catch452_g_error;
+			goto __catch453_g_error;
 		}
 #line 50 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2302,8 +2302,8 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp0_);
 #line 2304 "PixbufCache.c"
 	}
-	goto __finally452;
-	__catch452_g_error:
+	goto __finally453;
+	__catch453_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2324,7 +2324,7 @@ static void pixbuf_cache_baseline_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2326 "PixbufCache.c"
 	}
-	__finally452:
+	__finally453:
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 49 "/home/jens/Source/shotwell/src/PixbufCache.vala"
@@ -2427,7 +2427,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2430 "PixbufCache.c"
-			goto __catch453_g_error;
+			goto __catch454_g_error;
 		}
 #line 65 "/home/jens/Source/shotwell/src/PixbufCache.vala"
 		_tmp4_ = _tmp0_;
@@ -2441,8 +2441,8 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp0_);
 #line 2443 "PixbufCache.c"
 	}
-	goto __finally453;
-	__catch453_g_error:
+	goto __finally454;
+	__catch454_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2463,7 +2463,7 @@ static void pixbuf_cache_master_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 2465 "PixbufCache.c"
 	}
-	__finally453:
+	__finally454:
 #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 3d74121..8847e70 100644
--- a/src/Printing.c
+++ b/src/Printing.c
@@ -112,6 +112,8 @@ typedef struct _CustomPrintTabPrivate CustomPrintTabPrivate;
 typedef struct _PrintJob PrintJob;
 typedef struct _PrintJobClass PrintJobClass;
 #define _standard_print_size_unref0(var) ((var == NULL) ? NULL : (var = (standard_print_size_unref (var), NULL)))
+
+#define RESOURCES_TYPE_UNIT_SYSTEM (resources_unit_system_get_type ())
 #define _print_settings_unref0(var) ((var == NULL) ? NULL : (var = (print_settings_unref (var), NULL)))
 typedef struct _PrintJobPrivate PrintJobPrivate;
 
@@ -293,21 +295,20 @@ typedef enum  {
 } PrintLayout;
 
 struct _CustomPrintTab {
-	GtkFixed parent_instance;
+	GtkBox parent_instance;
 	CustomPrintTabPrivate * priv;
 };
 
 struct _CustomPrintTabClass {
-	GtkFixedClass parent_class;
+	GtkBoxClass parent_class;
 };
 
 struct _CustomPrintTabPrivate {
-	GtkBox* custom_image_settings_pane;
 	GtkRadioButton* standard_size_radio;
 	GtkRadioButton* custom_size_radio;
 	GtkRadioButton* image_per_page_radio;
-	GtkComboBox* image_per_page_combo;
-	GtkComboBox* standard_sizes_combo;
+	GtkComboBoxText* image_per_page_combo;
+	GtkComboBoxText* standard_sizes_combo;
 	GtkComboBoxText* units_combo;
 	GtkEntry* custom_width_entry;
 	GtkEntry* custom_height_entry;
@@ -322,6 +323,12 @@ struct _CustomPrintTabPrivate {
 	PrintJob* source_job;
 };
 
+typedef enum  {
+	RESOURCES_UNIT_SYSTEM_IMPERIAL,
+	RESOURCES_UNIT_SYSTEM_METRIC,
+	RESOURCES_UNIT_SYSTEM_UNKNOWN
+} ResourcesUnitSystem;
+
 struct _PrintJob {
 	GtkPrintOperation parent_instance;
 	PrintJobPrivate * priv;
@@ -372,6 +379,9 @@ struct _PrintManagerPrivate {
 	CustomPrintTab* custom_tab;
 	ProgressDialog* progress_dialog;
 	GCancellable* cancellable;
+	StandardPrintSize** standard_sizes;
+	gint standard_sizes_length1;
+	gint _standard_sizes_size_;
 };
 
 typedef enum  {
@@ -505,11 +515,12 @@ enum  {
 #define CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE 1
 CustomPrintTab* custom_print_tab_new (PrintJob* source_job);
 CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_job);
-GtkBuilder* app_window_create_builder (const gchar* glade_filename, void* user);
 static void custom_print_tab_on_radio_group_click (CustomPrintTab* self, GtkButton* b);
 static void _custom_print_tab_on_radio_group_click_gtk_button_clicked (GtkButton* _sender, gpointer self);
 static gboolean custom_print_tab_standard_sizes_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter);
 static gboolean _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self);
+GType resources_unit_system_get_type (void) G_GNUC_CONST;
+ResourcesUnitSystem resources_get_default_measurement_unit (void);
 static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEditable* editable, const gchar* text, gint length, gint* position);
 static void _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self);
 static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self, GdkEventFocus* event);
@@ -730,14 +741,14 @@ PrintSettings* print_settings_construct (GType object_type) {
 	_g_object_unref0 (config);
 #line 30 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 734 "Printing.c"
+#line 745 "Printing.c"
 }
 
 
 PrintSettings* print_settings_new (void) {
 #line 30 "/home/jens/Source/shotwell/src/Printing.vala"
 	return print_settings_construct (TYPE_PRINT_SETTINGS);
-#line 741 "Printing.c"
+#line 752 "Printing.c"
 }
 
 
@@ -811,7 +822,7 @@ void print_settings_save (PrintSettings* self) {
 	configuration_facade_set_printing_content_ppi (G_TYPE_CHECK_INSTANCE_CAST (config, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp13_);
 #line 46 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (config);
-#line 815 "Printing.c"
+#line 826 "Printing.c"
 }
 
 
@@ -827,18 +838,16 @@ void print_settings_get_content_width (PrintSettings* self, Measurement* result)
 		case CONTENT_LAYOUT_STANDARD_SIZE:
 #line 63 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 831 "Printing.c"
+#line 842 "Printing.c"
 		{
 			PrintManager* _tmp1_ = NULL;
 			PrintManager* _tmp2_ = NULL;
 			gint _tmp3_ = 0;
 			StandardPrintSize** _tmp4_ = NULL;
-			StandardPrintSize** _tmp5_ = NULL;
-			gint _tmp5__length1 = 0;
-			gint _tmp6_ = 0;
-			StandardPrintSize* _tmp7_ = NULL;
+			gint _tmp5_ = 0;
+			StandardPrintSize* _tmp6_ = NULL;
+			Measurement _tmp7_ = {0};
 			Measurement _tmp8_ = {0};
-			Measurement _tmp9_ = {0};
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp1_ = print_manager_get_instance ();
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -846,45 +855,39 @@ void print_settings_get_content_width (PrintSettings* self, Measurement* result)
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp4_ = print_manager_get_standard_sizes (_tmp2_, &_tmp3_);
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5_ = _tmp4_;
+			_tmp5_ = print_settings_get_size_selection (self);
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5__length1 = _tmp3_;
+			_tmp6_ = _tmp4_[_tmp5_];
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp6_ = print_settings_get_size_selection (self);
+			_tmp7_ = _tmp6_->width;
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp7_ = _tmp5_[_tmp6_];
-#line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp8_ = _tmp7_->width;
-#line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp9_ = _tmp8_;
-#line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) standard_print_size_unref), NULL);
+			_tmp8_ = _tmp7_;
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
 			_print_manager_unref0 (_tmp2_);
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
-			*result = _tmp9_;
+			*result = _tmp8_;
 #line 66 "/home/jens/Source/shotwell/src/Printing.vala"
 			return;
-#line 869 "Printing.c"
+#line 872 "Printing.c"
 		}
 #line 63 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 873 "Printing.c"
+#line 876 "Printing.c"
 		{
-			Measurement _tmp10_ = {0};
+			Measurement _tmp9_ = {0};
 #line 70 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp10_ = self->priv->content_width;
+			_tmp9_ = self->priv->content_width;
 #line 70 "/home/jens/Source/shotwell/src/Printing.vala"
-			*result = _tmp10_;
+			*result = _tmp9_;
 #line 70 "/home/jens/Source/shotwell/src/Printing.vala"
 			return;
-#line 882 "Printing.c"
+#line 885 "Printing.c"
 		}
 		default:
 		{
 #line 73 "/home/jens/Source/shotwell/src/Printing.vala"
 			g_error ("Printing.vala:73: unknown ContentLayout enumeration value");
-#line 888 "Printing.c"
+#line 891 "Printing.c"
 		}
 	}
 }
@@ -902,18 +905,16 @@ void print_settings_get_content_height (PrintSettings* self, Measurement* result
 		case CONTENT_LAYOUT_STANDARD_SIZE:
 #line 78 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 906 "Printing.c"
+#line 909 "Printing.c"
 		{
 			PrintManager* _tmp1_ = NULL;
 			PrintManager* _tmp2_ = NULL;
 			gint _tmp3_ = 0;
 			StandardPrintSize** _tmp4_ = NULL;
-			StandardPrintSize** _tmp5_ = NULL;
-			gint _tmp5__length1 = 0;
-			gint _tmp6_ = 0;
-			StandardPrintSize* _tmp7_ = NULL;
+			gint _tmp5_ = 0;
+			StandardPrintSize* _tmp6_ = NULL;
+			Measurement _tmp7_ = {0};
 			Measurement _tmp8_ = {0};
-			Measurement _tmp9_ = {0};
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp1_ = print_manager_get_instance ();
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -921,45 +922,39 @@ void print_settings_get_content_height (PrintSettings* self, Measurement* result
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp4_ = print_manager_get_standard_sizes (_tmp2_, &_tmp3_);
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5_ = _tmp4_;
-#line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5__length1 = _tmp3_;
-#line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp6_ = print_settings_get_size_selection (self);
+			_tmp5_ = print_settings_get_size_selection (self);
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp7_ = _tmp5_[_tmp6_];
+			_tmp6_ = _tmp4_[_tmp5_];
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp8_ = _tmp7_->height;
+			_tmp7_ = _tmp6_->height;
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp9_ = _tmp8_;
-#line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp5_ = (_vala_array_free (_tmp5_, _tmp5__length1, (GDestroyNotify) standard_print_size_unref), NULL);
+			_tmp8_ = _tmp7_;
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
 			_print_manager_unref0 (_tmp2_);
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
-			*result = _tmp9_;
+			*result = _tmp8_;
 #line 81 "/home/jens/Source/shotwell/src/Printing.vala"
 			return;
-#line 944 "Printing.c"
+#line 939 "Printing.c"
 		}
 #line 78 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 948 "Printing.c"
+#line 943 "Printing.c"
 		{
-			Measurement _tmp10_ = {0};
+			Measurement _tmp9_ = {0};
 #line 85 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp10_ = self->priv->content_height;
+			_tmp9_ = self->priv->content_height;
 #line 85 "/home/jens/Source/shotwell/src/Printing.vala"
-			*result = _tmp10_;
+			*result = _tmp9_;
 #line 85 "/home/jens/Source/shotwell/src/Printing.vala"
 			return;
-#line 957 "Printing.c"
+#line 952 "Printing.c"
 		}
 		default:
 		{
 #line 88 "/home/jens/Source/shotwell/src/Printing.vala"
 			g_error ("Printing.vala:88: unknown ContentLayout enumeration value");
-#line 963 "Printing.c"
+#line 958 "Printing.c"
 		}
 	}
 }
@@ -975,7 +970,7 @@ void print_settings_get_minimum_content_dimension (PrintSettings* self, Measurem
 	*result = _tmp0_;
 #line 93 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 979 "Printing.c"
+#line 974 "Printing.c"
 }
 
 
@@ -989,7 +984,7 @@ void print_settings_get_maximum_content_dimension (PrintSettings* self, Measurem
 	*result = _tmp0_;
 #line 97 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 993 "Printing.c"
+#line 988 "Printing.c"
 }
 
 
@@ -1004,7 +999,7 @@ gboolean print_settings_is_match_aspect_ratio_enabled (PrintSettings* self) {
 	result = _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1008 "Printing.c"
+#line 1003 "Printing.c"
 }
 
 
@@ -1019,7 +1014,7 @@ gboolean print_settings_is_print_titles_enabled (PrintSettings* self) {
 	result = _tmp0_;
 #line 105 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1023 "Printing.c"
+#line 1018 "Printing.c"
 }
 
 
@@ -1034,7 +1029,7 @@ gint print_settings_get_content_ppi (PrintSettings* self) {
 	result = _tmp0_;
 #line 109 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1038 "Printing.c"
+#line 1033 "Printing.c"
 }
 
 
@@ -1049,7 +1044,7 @@ gint print_settings_get_image_per_page_selection (PrintSettings* self) {
 	result = _tmp0_;
 #line 113 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1053 "Printing.c"
+#line 1048 "Printing.c"
 }
 
 
@@ -1064,7 +1059,7 @@ gint print_settings_get_size_selection (PrintSettings* self) {
 	result = _tmp0_;
 #line 117 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1068 "Printing.c"
+#line 1063 "Printing.c"
 }
 
 
@@ -1079,7 +1074,7 @@ ContentLayout print_settings_get_content_layout (PrintSettings* self) {
 	result = _tmp0_;
 #line 121 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1083 "Printing.c"
+#line 1078 "Printing.c"
 }
 
 
@@ -1091,7 +1086,7 @@ void print_settings_set_content_layout (PrintSettings* self, ContentLayout conte
 	_tmp0_ = content_layout;
 #line 125 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->content_layout = _tmp0_;
-#line 1095 "Printing.c"
+#line 1090 "Printing.c"
 }
 
 
@@ -1105,7 +1100,7 @@ void print_settings_set_content_width (PrintSettings* self, Measurement* content
 	_tmp0_ = *content_width;
 #line 129 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->content_width = _tmp0_;
-#line 1109 "Printing.c"
+#line 1104 "Printing.c"
 }
 
 
@@ -1119,7 +1114,7 @@ void print_settings_set_content_height (PrintSettings* self, Measurement* conten
 	_tmp0_ = *content_height;
 #line 133 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->content_height = _tmp0_;
-#line 1123 "Printing.c"
+#line 1118 "Printing.c"
 }
 
 
@@ -1131,7 +1126,7 @@ void print_settings_set_content_ppi (PrintSettings* self, gint content_ppi) {
 	_tmp0_ = content_ppi;
 #line 137 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->content_ppi = _tmp0_;
-#line 1135 "Printing.c"
+#line 1130 "Printing.c"
 }
 
 
@@ -1143,7 +1138,7 @@ void print_settings_set_image_per_page_selection (PrintSettings* self, gint imag
 	_tmp0_ = image_per_page_selection;
 #line 141 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->image_per_page_selection = _tmp0_;
-#line 1147 "Printing.c"
+#line 1142 "Printing.c"
 }
 
 
@@ -1155,7 +1150,7 @@ void print_settings_set_size_selection (PrintSettings* self, gint size_selection
 	_tmp0_ = size_selection;
 #line 145 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->size_selection = _tmp0_;
-#line 1159 "Printing.c"
+#line 1154 "Printing.c"
 }
 
 
@@ -1167,7 +1162,7 @@ void print_settings_set_match_aspect_ratio_enabled (PrintSettings* self, gboolea
 	_tmp0_ = enable_state;
 #line 149 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->match_aspect_ratio = _tmp0_;
-#line 1171 "Printing.c"
+#line 1166 "Printing.c"
 }
 
 
@@ -1179,7 +1174,7 @@ void print_settings_set_print_titles_enabled (PrintSettings* self, gboolean prin
 	_tmp0_ = print_titles;
 #line 153 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->print_titles = _tmp0_;
-#line 1183 "Printing.c"
+#line 1178 "Printing.c"
 }
 
 
@@ -1198,7 +1193,7 @@ void print_settings_set_print_titles_font (PrintSettings* self, const gchar* fon
 	_g_free0 (self->priv->print_titles_font);
 #line 157 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->print_titles_font = _tmp1_;
-#line 1202 "Printing.c"
+#line 1197 "Printing.c"
 }
 
 
@@ -1216,14 +1211,14 @@ gchar* print_settings_get_print_titles_font (PrintSettings* self) {
 	result = _tmp1_;
 #line 161 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1220 "Printing.c"
+#line 1215 "Printing.c"
 }
 
 
 static void value_print_settings_init (GValue* value) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	value->data[0].v_pointer = NULL;
-#line 1227 "Printing.c"
+#line 1222 "Printing.c"
 }
 
 
@@ -1232,7 +1227,7 @@ static void value_print_settings_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_unref (value->data[0].v_pointer);
-#line 1236 "Printing.c"
+#line 1231 "Printing.c"
 	}
 }
 
@@ -1242,11 +1237,11 @@ static void value_print_settings_copy_value (const GValue* src_value, GValue* de
 	if (src_value->data[0].v_pointer) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = print_settings_ref (src_value->data[0].v_pointer);
-#line 1246 "Printing.c"
+#line 1241 "Printing.c"
 	} else {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1250 "Printing.c"
+#line 1245 "Printing.c"
 	}
 }
 
@@ -1254,37 +1249,37 @@ static void value_print_settings_copy_value (const GValue* src_value, GValue* de
 static gpointer value_print_settings_peek_pointer (const GValue* value) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 1258 "Printing.c"
+#line 1253 "Printing.c"
 }
 
 
 static gchar* value_print_settings_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (collect_values[0].v_pointer) {
-#line 1265 "Printing.c"
+#line 1260 "Printing.c"
 		PrintSettings* object;
 		object = collect_values[0].v_pointer;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1272 "Printing.c"
+#line 1267 "Printing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.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 1276 "Printing.c"
+#line 1271 "Printing.c"
 		}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = print_settings_ref (object);
-#line 1280 "Printing.c"
+#line 1275 "Printing.c"
 	} else {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1284 "Printing.c"
+#line 1279 "Printing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 1288 "Printing.c"
+#line 1283 "Printing.c"
 }
 
 
@@ -1295,25 +1290,25 @@ static gchar* value_print_settings_lcopy_value (const GValue* value, guint n_col
 	if (!object_p) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1299 "Printing.c"
+#line 1294 "Printing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!value->data[0].v_pointer) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = NULL;
-#line 1305 "Printing.c"
+#line 1300 "Printing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1309 "Printing.c"
+#line 1304 "Printing.c"
 	} else {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = print_settings_ref (value->data[0].v_pointer);
-#line 1313 "Printing.c"
+#line 1308 "Printing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 1317 "Printing.c"
+#line 1312 "Printing.c"
 }
 
 
@@ -1327,7 +1322,7 @@ GParamSpec* param_spec_print_settings (const gchar* name, const gchar* nick, con
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return G_PARAM_SPEC (spec);
-#line 1331 "Printing.c"
+#line 1326 "Printing.c"
 }
 
 
@@ -1336,7 +1331,7 @@ gpointer value_get_print_settings (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_SETTINGS), NULL);
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 1340 "Printing.c"
+#line 1335 "Printing.c"
 }
 
 
@@ -1356,17 +1351,17 @@ void value_set_print_settings (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_ref (value->data[0].v_pointer);
-#line 1360 "Printing.c"
+#line 1355 "Printing.c"
 	} else {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1364 "Printing.c"
+#line 1359 "Printing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_unref (old);
-#line 1370 "Printing.c"
+#line 1365 "Printing.c"
 	}
 }
 
@@ -1385,17 +1380,17 @@ void value_take_print_settings (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 1389 "Printing.c"
+#line 1384 "Printing.c"
 	} else {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 1393 "Printing.c"
+#line 1388 "Printing.c"
 	}
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_unref (old);
-#line 1399 "Printing.c"
+#line 1394 "Printing.c"
 	}
 }
 
@@ -1407,7 +1402,7 @@ static void print_settings_class_init (PrintSettingsClass * klass) {
 	((PrintSettingsClass *) klass)->finalize = print_settings_finalize;
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_type_class_add_private (klass, sizeof (PrintSettingsPrivate));
-#line 1411 "Printing.c"
+#line 1406 "Printing.c"
 }
 
 
@@ -1416,7 +1411,7 @@ static void print_settings_instance_init (PrintSettings * self) {
 	self->priv = PRINT_SETTINGS_GET_PRIVATE (self);
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->ref_count = 1;
-#line 1420 "Printing.c"
+#line 1415 "Printing.c"
 }
 
 
@@ -1428,7 +1423,7 @@ static void print_settings_finalize (PrintSettings* obj) {
 	g_signal_handlers_destroy (self);
 #line 28 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (self->priv->print_titles_font);
-#line 1432 "Printing.c"
+#line 1427 "Printing.c"
 }
 
 
@@ -1453,7 +1448,7 @@ gpointer print_settings_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 	return instance;
-#line 1457 "Printing.c"
+#line 1452 "Printing.c"
 }
 
 
@@ -1466,7 +1461,7 @@ void print_settings_unref (gpointer instance) {
 		PRINT_SETTINGS_GET_CLASS (self)->finalize (self);
 #line 13 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1470 "Printing.c"
+#line 1465 "Printing.c"
 	}
 }
 
@@ -1496,7 +1491,7 @@ void measurement_init (Measurement *self, gdouble value, MeasurementUnit unit) {
 	_tmp1_ = unit;
 #line 187 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*self).unit = _tmp1_;
-#line 1500 "Printing.c"
+#line 1495 "Printing.c"
 }
 
 
@@ -1514,13 +1509,13 @@ void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measure
 		*result = (*self);
 #line 192 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 1518 "Printing.c"
+#line 1513 "Printing.c"
 	}
 #line 194 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = to_unit;
 #line 194 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ == MEASUREMENT_UNIT_INCHES) {
-#line 1524 "Printing.c"
+#line 1519 "Printing.c"
 		gdouble _tmp3_ = 0.0;
 		Measurement _tmp4_ = {0};
 #line 195 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1531,14 +1526,14 @@ void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measure
 		*result = _tmp4_;
 #line 195 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 1535 "Printing.c"
+#line 1530 "Printing.c"
 	} else {
 		MeasurementUnit _tmp5_ = 0;
 #line 196 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = to_unit;
 #line 196 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp5_ == MEASUREMENT_UNIT_CENTIMETERS) {
-#line 1542 "Printing.c"
+#line 1537 "Printing.c"
 			gdouble _tmp6_ = 0.0;
 			Measurement _tmp7_ = {0};
 #line 197 "/home/jens/Source/shotwell/src/Printing.vala"
@@ -1549,11 +1544,11 @@ void measurement_convert_to (Measurement *self, MeasurementUnit to_unit, Measure
 			*result = _tmp7_;
 #line 197 "/home/jens/Source/shotwell/src/Printing.vala"
 			return;
-#line 1553 "Printing.c"
+#line 1548 "Printing.c"
 		} else {
 #line 199 "/home/jens/Source/shotwell/src/Printing.vala"
 			g_error ("Printing.vala:199: unrecognized unit");
-#line 1557 "Printing.c"
+#line 1552 "Printing.c"
 		}
 	}
 }
@@ -1579,13 +1574,13 @@ gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) {
 	_tmp3_ = _tmp2_.unit;
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ == _tmp3_) {
-#line 1583 "Printing.c"
+#line 1578 "Printing.c"
 		Measurement _tmp4_ = {0};
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *rhs;
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp4_;
-#line 1589 "Printing.c"
+#line 1584 "Printing.c"
 	} else {
 		MeasurementUnit _tmp5_ = 0;
 		Measurement _tmp6_ = {0};
@@ -1595,7 +1590,7 @@ gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) {
 		measurement_convert_to (rhs, _tmp5_, &_tmp6_);
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp6_;
-#line 1599 "Printing.c"
+#line 1594 "Printing.c"
 	}
 #line 204 "/home/jens/Source/shotwell/src/Printing.vala"
 	converted_rhs = _tmp0_;
@@ -1609,7 +1604,7 @@ gboolean measurement_is_less_than (Measurement *self, Measurement* rhs) {
 	result = _tmp7_ < _tmp9_;
 #line 205 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1613 "Printing.c"
+#line 1608 "Printing.c"
 }
 
 
@@ -1633,13 +1628,13 @@ gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) {
 	_tmp3_ = _tmp2_.unit;
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ == _tmp3_) {
-#line 1637 "Printing.c"
+#line 1632 "Printing.c"
 		Measurement _tmp4_ = {0};
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *rhs;
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp4_;
-#line 1643 "Printing.c"
+#line 1638 "Printing.c"
 	} else {
 		MeasurementUnit _tmp5_ = 0;
 		Measurement _tmp6_ = {0};
@@ -1649,7 +1644,7 @@ gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) {
 		measurement_convert_to (rhs, _tmp5_, &_tmp6_);
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp6_;
-#line 1653 "Printing.c"
+#line 1648 "Printing.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/Printing.vala"
 	converted_rhs = _tmp0_;
@@ -1663,7 +1658,7 @@ gboolean measurement_is_greater_than (Measurement *self, Measurement* rhs) {
 	result = _tmp7_ > _tmp9_;
 #line 210 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1667 "Printing.c"
+#line 1662 "Printing.c"
 }
 
 
@@ -1675,14 +1670,14 @@ Measurement* measurement_dup (const Measurement* self) {
 	memcpy (dup, self, sizeof (Measurement));
 #line 178 "/home/jens/Source/shotwell/src/Printing.vala"
 	return dup;
-#line 1679 "Printing.c"
+#line 1674 "Printing.c"
 }
 
 
 void measurement_free (Measurement* self) {
 #line 178 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_free (self);
-#line 1686 "Printing.c"
+#line 1681 "Printing.c"
 }
 
 
@@ -1726,13 +1721,13 @@ PrintLayout* print_layout_get_all (int* result_length1) {
 	if (result_length1) {
 #line 224 "/home/jens/Source/shotwell/src/Printing.vala"
 		*result_length1 = _tmp1__length1;
-#line 1730 "Printing.c"
+#line 1725 "Printing.c"
 	}
 #line 224 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
 #line 224 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1736 "Printing.c"
+#line 1731 "Printing.c"
 }
 
 
@@ -1773,7 +1768,7 @@ gint print_layout_get_per_page (PrintLayout self) {
 	per_page = (g_free (per_page), NULL);
 #line 238 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1777 "Printing.c"
+#line 1772 "Printing.c"
 }
 
 
@@ -1814,7 +1809,7 @@ gint print_layout_get_x (PrintLayout self) {
 	x = (g_free (x), NULL);
 #line 244 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1818 "Printing.c"
+#line 1813 "Printing.c"
 }
 
 
@@ -1855,7 +1850,7 @@ gint print_layout_get_y (PrintLayout self) {
 	y = (g_free (y), NULL);
 #line 250 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1859 "Printing.c"
+#line 1854 "Printing.c"
 }
 
 
@@ -1941,7 +1936,7 @@ gchar* print_layout_to_string (PrintLayout self) {
 	labels = (_vala_array_free (labels, labels_length1, (GDestroyNotify) g_free), NULL);
 #line 264 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1945 "Printing.c"
+#line 1940 "Printing.c"
 }
 
 
@@ -1958,87 +1953,87 @@ GType print_layout_get_type (void) {
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 305 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1964 "Printing.c"
+#line 1959 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_radio_group_click_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 299 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 307 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_radio_group_click ((CustomPrintTab*) self, _sender);
-#line 1971 "Printing.c"
+#line 1966 "Printing.c"
 }
 
 
 static gboolean _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self) {
 	gboolean result;
 	result = custom_print_tab_standard_sizes_combo_separator_func (model, iter);
-#line 329 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 316 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 1980 "Printing.c"
+#line 1975 "Printing.c"
 }
 
 
 static gpointer _standard_print_size_ref0 (gpointer self) {
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? standard_print_size_ref (self) : NULL;
-#line 1987 "Printing.c"
+#line 1982 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 340 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 323 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_entry_insert_text ((CustomPrintTab*) self, _sender, new_text, new_text_length, position);
-#line 1994 "Printing.c"
+#line 1989 "Printing.c"
 }
 
 
 static gboolean _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = custom_print_tab_on_width_entry_focus_out ((CustomPrintTab*) self, event);
-#line 341 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 324 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2003 "Printing.c"
+#line 1998 "Printing.c"
 }
 
 
 static gboolean _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = custom_print_tab_on_height_entry_focus_out ((CustomPrintTab*) self, event);
-#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 327 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2012 "Printing.c"
+#line 2007 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
-#line 351 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 329 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_units_combo_changed ((CustomPrintTab*) self);
-#line 2019 "Printing.c"
+#line 2014 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
-#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_ppi_entry_insert_text ((CustomPrintTab*) self, _sender, new_text, new_text_length, position);
-#line 2026 "Printing.c"
+#line 2021 "Printing.c"
 }
 
 
 static gboolean _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
 	gboolean result;
 	result = custom_print_tab_on_ppi_entry_focus_out ((CustomPrintTab*) self, event);
-#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 333 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2035 "Printing.c"
+#line 2030 "Printing.c"
 }
 
 
 static void _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
-#line 368 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 340 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_on_aspect_ratio_check_clicked ((CustomPrintTab*) self);
-#line 2042 "Printing.c"
+#line 2037 "Printing.c"
 }
 
 
@@ -2046,548 +2041,242 @@ CustomPrintTab* custom_print_tab_construct (GType object_type, PrintJob* source_
 	CustomPrintTab * self = NULL;
 	PrintJob* _tmp0_ = NULL;
 	PrintJob* _tmp1_ = NULL;
-	GtkBuilder* builder = NULL;
-	GtkBuilder* _tmp2_ = NULL;
-	GtkBuilder* _tmp3_ = NULL;
-	GObject* _tmp4_ = NULL;
-	GtkBox* _tmp5_ = NULL;
-	GtkBuilder* _tmp6_ = NULL;
-	GObject* _tmp7_ = NULL;
-	GtkRadioButton* _tmp8_ = NULL;
-	GtkRadioButton* _tmp9_ = NULL;
-	GtkBuilder* _tmp10_ = NULL;
-	GObject* _tmp11_ = NULL;
-	GtkRadioButton* _tmp12_ = NULL;
-	GtkRadioButton* _tmp13_ = NULL;
-	GtkBuilder* _tmp14_ = NULL;
-	GObject* _tmp15_ = NULL;
-	GtkRadioButton* _tmp16_ = NULL;
-	GtkRadioButton* _tmp17_ = NULL;
-	GtkBuilder* _tmp18_ = NULL;
-	GObject* _tmp19_ = NULL;
-	GtkComboBox* _tmp20_ = NULL;
-	GtkCellRendererText* image_per_page_combo_text_renderer = NULL;
-	GtkCellRendererText* _tmp21_ = NULL;
-	GtkComboBox* _tmp22_ = NULL;
-	GtkCellRendererText* _tmp23_ = NULL;
-	GtkComboBox* _tmp24_ = NULL;
-	GtkCellRendererText* _tmp25_ = NULL;
-	GtkListStore* image_per_page_combo_store = NULL;
-	GtkListStore* _tmp26_ = NULL;
-	gint _tmp27_ = 0;
-	PrintLayout* _tmp28_ = NULL;
-	GtkComboBox* _tmp36_ = NULL;
-	GtkListStore* _tmp37_ = NULL;
+	GtkRadioButton* _tmp2_ = NULL;
+	GtkRadioButton* _tmp3_ = NULL;
+	GtkRadioButton* _tmp4_ = NULL;
+	gint _tmp5_ = 0;
+	PrintLayout* _tmp6_ = NULL;
 	StandardPrintSize** standard_sizes = NULL;
-	PrintManager* _tmp38_ = NULL;
-	PrintManager* _tmp39_ = NULL;
-	gint _tmp40_ = 0;
-	StandardPrintSize** _tmp41_ = NULL;
-	StandardPrintSize** _tmp42_ = NULL;
-	gint _tmp42__length1 = 0;
+	PrintManager* _tmp11_ = NULL;
+	PrintManager* _tmp12_ = NULL;
+	gint _tmp13_ = 0;
+	StandardPrintSize** _tmp14_ = NULL;
+	StandardPrintSize** _tmp15_ = NULL;
+	gint _tmp15__length1 = 0;
 	gint standard_sizes_length1 = 0;
 	gint _standard_sizes_size_ = 0;
-	GtkBuilder* _tmp43_ = NULL;
-	GObject* _tmp44_ = NULL;
-	GtkComboBox* _tmp45_ = NULL;
-	GtkCellRendererText* standard_sizes_combo_text_renderer = NULL;
-	GtkCellRendererText* _tmp46_ = NULL;
-	GtkComboBox* _tmp47_ = NULL;
-	GtkCellRendererText* _tmp48_ = NULL;
-	GtkComboBox* _tmp49_ = NULL;
-	GtkCellRendererText* _tmp50_ = NULL;
-	GtkComboBox* _tmp51_ = NULL;
-	GtkListStore* standard_sizes_combo_store = NULL;
-	GtkListStore* _tmp52_ = NULL;
-	StandardPrintSize** _tmp53_ = NULL;
-	gint _tmp53__length1 = 0;
-	GtkComboBox* _tmp62_ = NULL;
-	GtkListStore* _tmp63_ = NULL;
-	GtkBuilder* _tmp64_ = NULL;
-	GObject* _tmp65_ = NULL;
-	GtkEntry* _tmp66_ = NULL;
-	GtkEntry* _tmp67_ = NULL;
-	GtkEntry* _tmp68_ = NULL;
-	GtkBuilder* _tmp69_ = NULL;
-	GObject* _tmp70_ = NULL;
-	GtkEntry* _tmp71_ = NULL;
-	GtkEntry* _tmp72_ = NULL;
-	GtkEntry* _tmp73_ = NULL;
-	GtkBuilder* _tmp74_ = NULL;
-	GObject* _tmp75_ = NULL;
-	GtkComboBoxText* _tmp76_ = NULL;
-	GtkComboBoxText* _tmp77_ = NULL;
-	const gchar* _tmp78_ = NULL;
-	GtkComboBoxText* _tmp79_ = NULL;
-	const gchar* _tmp80_ = NULL;
-	GtkComboBoxText* _tmp81_ = NULL;
-	GtkComboBoxText* _tmp82_ = NULL;
-	GtkBuilder* _tmp83_ = NULL;
-	GObject* _tmp84_ = NULL;
-	GtkCheckButton* _tmp85_ = NULL;
-	GtkBuilder* _tmp86_ = NULL;
-	GObject* _tmp87_ = NULL;
-	GtkCheckButton* _tmp88_ = NULL;
-	GtkBuilder* _tmp89_ = NULL;
-	GObject* _tmp90_ = NULL;
-	GtkFontButton* _tmp91_ = NULL;
-	GtkBuilder* _tmp92_ = NULL;
-	GObject* _tmp93_ = NULL;
-	GtkEntry* _tmp94_ = NULL;
-	GtkEntry* _tmp95_ = NULL;
-	GtkEntry* _tmp96_ = NULL;
-	GtkBox* _tmp97_ = NULL;
-	PrintJob* _tmp98_ = NULL;
-	GtkCheckButton* _tmp99_ = NULL;
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
+	GtkComboBoxText* _tmp16_ = NULL;
+	StandardPrintSize** _tmp17_ = NULL;
+	gint _tmp17__length1 = 0;
+	GtkComboBoxText* _tmp22_ = NULL;
+	ResourcesUnitSystem _tmp23_ = 0;
+	GtkEntry* _tmp24_ = NULL;
+	GtkEntry* _tmp25_ = NULL;
+	GtkEntry* _tmp26_ = NULL;
+	GtkEntry* _tmp27_ = NULL;
+	GtkComboBoxText* _tmp28_ = NULL;
+	GtkComboBoxText* _tmp29_ = NULL;
+	ResourcesUnitSystem _tmp30_ = 0;
+	GtkEntry* _tmp31_ = NULL;
+	GtkEntry* _tmp32_ = NULL;
+	PrintJob* _tmp33_ = NULL;
+	GtkCheckButton* _tmp34_ = NULL;
+#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (source_job), NULL);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = (CustomPrintTab*) g_object_new (object_type, NULL);
-#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 305 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = source_job;
-#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 305 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->source_job);
-#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->source_job = _tmp1_;
-#line 293 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp2_ = app_window_create_builder ("shotwell.ui", NULL);
-#line 293 "/home/jens/Source/shotwell/src/Printing.vala"
-	builder = _tmp2_;
-#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp3_ = builder;
-#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp4_ = gtk_builder_get_object (_tmp3_, "box_ImgSettingsPane");
-#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp4_, gtk_box_get_type ()) ? ((GtkBox*) _tmp4_) : NULL);
-#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->custom_image_settings_pane);
-#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_image_settings_pane = _tmp5_;
-#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp6_ = builder;
-#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp7_ = gtk_builder_get_object (_tmp6_, "radio_UseStandardSize");
-#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp7_) : NULL);
-#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->standard_size_radio);
-#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->standard_size_radio = _tmp8_;
-#line 299 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp9_ = self->priv->standard_size_radio;
-#line 299 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
-#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp10_ = builder;
-#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp11_ = gtk_builder_get_object (_tmp10_, "radio_UseCustomSize");
-#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp11_) : NULL);
-#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->custom_size_radio);
-#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_size_radio = _tmp12_;
-#line 302 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp13_ = self->priv->custom_size_radio;
-#line 302 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
-#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp14_ = builder;
-#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp15_ = gtk_builder_get_object (_tmp14_, "radio_Autosize");
-#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp16_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp15_, gtk_radio_button_get_type ()) ? ((GtkRadioButton*) _tmp15_) : NULL);
-#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->image_per_page_radio);
-#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->image_per_page_radio = _tmp16_;
 #line 305 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp17_ = self->priv->image_per_page_radio;
+	_g_object_unref0 (self->priv->source_job);
 #line 305 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
-#line 307 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp18_ = builder;
-#line 307 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp19_ = gtk_builder_get_object (_tmp18_, "combo_Autosize");
+	self->priv->source_job = _tmp1_;
 #line 307 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp20_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp19_) : NULL);
+	_tmp2_ = self->priv->standard_size_radio;
 #line 307 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->image_per_page_combo);
-#line 307 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->image_per_page_combo = _tmp20_;
-#line 308 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp21_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
 #line 308 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_object_ref_sink (_tmp21_);
+	_tmp3_ = self->priv->custom_size_radio;
 #line 308 "/home/jens/Source/shotwell/src/Printing.vala"
-	image_per_page_combo_text_renderer = _tmp21_;
-#line 310 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp22_ = self->priv->image_per_page_combo;
-#line 310 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp23_ = image_per_page_combo_text_renderer;
-#line 310 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp24_ = self->priv->image_per_page_combo;
-#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp25_ = image_per_page_combo_text_renderer;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
+#line 309 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp4_ = self->priv->image_per_page_radio;
+#line 309 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_radio_group_click_gtk_button_clicked, self, 0);
 #line 311 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
-#line 313 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp26_ = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING, -1);
-#line 313 "/home/jens/Source/shotwell/src/Printing.vala"
-	image_per_page_combo_store = _tmp26_;
-#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp28_ = print_layout_get_all (&_tmp27_);
-#line 2245 "Printing.c"
+	_tmp6_ = print_layout_get_all (&_tmp5_);
+#line 2101 "Printing.c"
 	{
 		PrintLayout* layout_collection = NULL;
 		gint layout_collection_length1 = 0;
 		gint _layout_collection_size_ = 0;
 		gint layout_it = 0;
+#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
+		layout_collection = _tmp6_;
+#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
+		layout_collection_length1 = _tmp5_;
+#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
+		for (layout_it = 0; layout_it < _tmp5_; layout_it = layout_it + 1) {
+#line 2113 "Printing.c"
+			PrintLayout layout = 0;
+#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
+			layout = layout_collection[layout_it];
+#line 2117 "Printing.c"
+			{
+				GtkComboBoxText* _tmp7_ = NULL;
+				PrintLayout _tmp8_ = 0;
+				gchar* _tmp9_ = NULL;
+				gchar* _tmp10_ = NULL;
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp7_ = self->priv->image_per_page_combo;
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp8_ = layout;
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp9_ = print_layout_to_string (_tmp8_);
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp10_ = _tmp9_;
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				gtk_combo_box_text_append_text (_tmp7_, _tmp10_);
+#line 312 "/home/jens/Source/shotwell/src/Printing.vala"
+				_g_free0 (_tmp10_);
+#line 2135 "Printing.c"
+			}
+		}
+#line 311 "/home/jens/Source/shotwell/src/Printing.vala"
+		layout_collection = (g_free (layout_collection), NULL);
+#line 2140 "Printing.c"
+	}
 #line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-		layout_collection = _tmp28_;
+	_tmp11_ = print_manager_get_instance ();
 #line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-		layout_collection_length1 = _tmp27_;
+	_tmp12_ = _tmp11_;
 #line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-		for (layout_it = 0; layout_it < _tmp27_; layout_it = layout_it + 1) {
-#line 2257 "Printing.c"
-			PrintLayout layout = 0;
+	_tmp14_ = print_manager_get_standard_sizes (_tmp12_, &_tmp13_);
 #line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-			layout = layout_collection[layout_it];
-#line 2261 "Printing.c"
-			{
-				GtkTreeIter iter = {0};
-				GtkListStore* _tmp29_ = NULL;
-				GtkTreeIter _tmp30_ = {0};
-				GtkListStore* _tmp31_ = NULL;
-				GtkTreeIter _tmp32_ = {0};
-				PrintLayout _tmp33_ = 0;
-				gchar* _tmp34_ = NULL;
-				GValue _tmp35_ = {0};
+	_tmp15_ = _tmp14_;
+#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp15__length1 = _tmp13_;
+#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
+	_print_manager_unref0 (_tmp12_);
+#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
+	standard_sizes = _tmp15_;
+#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
+	standard_sizes_length1 = _tmp15__length1;
+#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
+	_standard_sizes_size_ = standard_sizes_length1;
+#line 316 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp16_ = self->priv->standard_sizes_combo;
+#line 316 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_combo_box_set_row_separator_func (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_combo_box_get_type (), GtkComboBox), _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp17_ = standard_sizes;
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp17__length1 = standard_sizes_length1;
+#line 2168 "Printing.c"
+	{
+		StandardPrintSize** size_collection = NULL;
+		gint size_collection_length1 = 0;
+		gint _size_collection_size_ = 0;
+		gint size_it = 0;
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp29_ = image_per_page_combo_store;
+		size_collection = _tmp17_;
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
-				gtk_list_store_append (_tmp29_, &_tmp30_);
+		size_collection_length1 = _tmp17__length1;
 #line 317 "/home/jens/Source/shotwell/src/Printing.vala"
-				iter = _tmp30_;
-#line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp31_ = image_per_page_combo_store;
-#line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp32_ = iter;
-#line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp33_ = layout;
-#line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp34_ = print_layout_to_string (_tmp33_);
+		for (size_it = 0; size_it < _tmp17__length1; size_it = size_it + 1) {
+#line 2180 "Printing.c"
+			StandardPrintSize* _tmp18_ = NULL;
+			StandardPrintSize* size = NULL;
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp18_ = _standard_print_size_ref0 (size_collection[size_it]);
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
+			size = _tmp18_;
+#line 2187 "Printing.c"
+			{
+				GtkComboBoxText* _tmp19_ = NULL;
+				StandardPrintSize* _tmp20_ = NULL;
+				const gchar* _tmp21_ = NULL;
 #line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				g_value_init (&_tmp35_, G_TYPE_STRING);
+				_tmp19_ = self->priv->standard_sizes_combo;
 #line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				g_value_take_string (&_tmp35_, _tmp34_);
+				_tmp20_ = size;
 #line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				gtk_list_store_set_value (_tmp31_, &_tmp32_, 0, &_tmp35_);
+				_tmp21_ = _tmp20_->name;
 #line 318 "/home/jens/Source/shotwell/src/Printing.vala"
-				G_IS_VALUE (&_tmp35_) ? (g_value_unset (&_tmp35_), NULL) : NULL;
-#line 2293 "Printing.c"
+				gtk_combo_box_text_append_text (_tmp19_, _tmp21_);
+#line 317 "/home/jens/Source/shotwell/src/Printing.vala"
+				_standard_print_size_unref0 (size);
+#line 2202 "Printing.c"
 			}
 		}
-#line 315 "/home/jens/Source/shotwell/src/Printing.vala"
-		layout_collection = (g_free (layout_collection), NULL);
-#line 2298 "Printing.c"
 	}
-#line 320 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp36_ = self->priv->image_per_page_combo;
-#line 320 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp37_ = image_per_page_combo_store;
-#line 320 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_model (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp38_ = print_manager_get_instance ();
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp39_ = _tmp38_;
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp41_ = print_manager_get_standard_sizes (_tmp39_, &_tmp40_);
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp42_ = _tmp41_;
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp42__length1 = _tmp40_;
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_print_manager_unref0 (_tmp39_);
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	standard_sizes = _tmp42_;
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	standard_sizes_length1 = _tmp42__length1;
-#line 322 "/home/jens/Source/shotwell/src/Printing.vala"
-	_standard_sizes_size_ = standard_sizes_length1;
-#line 323 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp43_ = builder;
+#line 321 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp22_ = self->priv->standard_sizes_combo;
+#line 321 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp23_ = resources_get_default_measurement_unit ();
+#line 321 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_combo_box_get_type (), GtkComboBox), 9 * _tmp23_);
 #line 323 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp44_ = gtk_builder_get_object (_tmp43_, "combo_StdSizes");
+	_tmp24_ = self->priv->custom_width_entry;
 #line 323 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp45_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp44_, gtk_combo_box_get_type ()) ? ((GtkComboBox*) _tmp44_) : NULL);
-#line 323 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->standard_sizes_combo);
-#line 323 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->standard_sizes_combo = _tmp45_;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0);
 #line 324 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp46_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp25_ = self->priv->custom_width_entry;
 #line 324 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_object_ref_sink (_tmp46_);
-#line 324 "/home/jens/Source/shotwell/src/Printing.vala"
-	standard_sizes_combo_text_renderer = _tmp46_;
-#line 326 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp47_ = self->priv->standard_sizes_combo;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event, self, 0);
 #line 326 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp48_ = standard_sizes_combo_text_renderer;
+	_tmp26_ = self->priv->custom_height_entry;
 #line 326 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0);
 #line 327 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp49_ = self->priv->standard_sizes_combo;
+	_tmp27_ = self->priv->custom_height_entry;
 #line 327 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp50_ = standard_sizes_combo_text_renderer;
-#line 327 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event, self, 0);
 #line 329 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp51_ = self->priv->standard_sizes_combo;
+	_tmp28_ = self->priv->units_combo;
 #line 329 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_row_separator_func (_tmp51_, _custom_print_tab_standard_sizes_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed, self, 0);
 #line 330 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp52_ = gtk_list_store_new (1, G_TYPE_STRING, G_TYPE_STRING, -1);
+	_tmp29_ = self->priv->units_combo;
 #line 330 "/home/jens/Source/shotwell/src/Printing.vala"
-	standard_sizes_combo_store = _tmp52_;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp53_ = standard_sizes;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp53__length1 = standard_sizes_length1;
-#line 2364 "Printing.c"
-	{
-		StandardPrintSize** size_collection = NULL;
-		gint size_collection_length1 = 0;
-		gint _size_collection_size_ = 0;
-		gint size_it = 0;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-		size_collection = _tmp53_;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-		size_collection_length1 = _tmp53__length1;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-		for (size_it = 0; size_it < _tmp53__length1; size_it = size_it + 1) {
-#line 2376 "Printing.c"
-			StandardPrintSize* _tmp54_ = NULL;
-			StandardPrintSize* size = NULL;
+	_tmp30_ = resources_get_default_measurement_unit ();
+#line 330 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_combo_box_get_type (), GtkComboBox), (gint) _tmp30_);
 #line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp54_ = _standard_print_size_ref0 (size_collection[size_it]);
+	_tmp31_ = self->priv->ppi_entry;
 #line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-			size = _tmp54_;
-#line 2383 "Printing.c"
-			{
-				GtkTreeIter iter = {0};
-				GtkListStore* _tmp55_ = NULL;
-				GtkTreeIter _tmp56_ = {0};
-				GtkListStore* _tmp57_ = NULL;
-				GtkTreeIter _tmp58_ = {0};
-				StandardPrintSize* _tmp59_ = NULL;
-				const gchar* _tmp60_ = NULL;
-				GValue _tmp61_ = {0};
-#line 334 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp55_ = standard_sizes_combo_store;
-#line 334 "/home/jens/Source/shotwell/src/Printing.vala"
-				gtk_list_store_append (_tmp55_, &_tmp56_);
-#line 334 "/home/jens/Source/shotwell/src/Printing.vala"
-				iter = _tmp56_;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text, self, 0);
+#line 333 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp32_ = self->priv->ppi_entry;
+#line 333 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event, self, 0);
 #line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp57_ = standard_sizes_combo_store;
+	_tmp33_ = source_job;
 #line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp58_ = iter;
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp59_ = size;
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp60_ = _tmp59_->name;
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				g_value_init (&_tmp61_, G_TYPE_STRING);
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				g_value_set_string (&_tmp61_, _tmp60_);
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				gtk_list_store_set_value (_tmp57_, &_tmp58_, 0, &_tmp61_);
-#line 335 "/home/jens/Source/shotwell/src/Printing.vala"
-				G_IS_VALUE (&_tmp61_) ? (g_value_unset (&_tmp61_), NULL) : NULL;
-#line 332 "/home/jens/Source/shotwell/src/Printing.vala"
-				_standard_print_size_unref0 (size);
-#line 2417 "Printing.c"
-			}
-		}
-	}
-#line 337 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp62_ = self->priv->standard_sizes_combo;
-#line 337 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp63_ = standard_sizes_combo_store;
+	custom_print_tab_sync_state_from_job (self, _tmp33_);
 #line 337 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_model (_tmp62_, G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 339 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp64_ = builder;
-#line 339 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp65_ = gtk_builder_get_object (_tmp64_, "entry_CustomWidth");
-#line 339 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp66_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp65_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp65_) : NULL);
-#line 339 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->custom_width_entry);
-#line 339 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_width_entry = _tmp66_;
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 340 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp67_ = self->priv->custom_width_entry;
+	_tmp34_ = self->priv->aspect_ratio_check;
 #line 340 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0);
-#line 341 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp68_ = self->priv->custom_width_entry;
-#line 341 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_width_entry_focus_out_gtk_widget_focus_out_event, self, 0);
-#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp69_ = builder;
-#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp70_ = gtk_builder_get_object (_tmp69_, "entry_CustomHeight");
-#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp71_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp70_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp70_) : NULL);
-#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->custom_height_entry);
-#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_height_entry = _tmp71_;
-#line 344 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp72_ = self->priv->custom_height_entry;
-#line 344 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_entry_insert_text_gtk_editable_insert_text, self, 0);
-#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp73_ = self->priv->custom_height_entry;
-#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_height_entry_focus_out_gtk_widget_focus_out_event, self, 0);
-#line 347 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp74_ = builder;
-#line 347 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp75_ = gtk_builder_get_object (_tmp74_, "combo_Units");
-#line 347 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp76_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp75_, gtk_combo_box_text_get_type ()) ? ((GtkComboBoxText*) _tmp75_) : NULL);
-#line 347 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->units_combo);
-#line 347 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->units_combo = _tmp76_;
-#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp77_ = self->priv->units_combo;
-#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp78_ = _ ("in.");
-#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_text_append_text (_tmp77_, _tmp78_);
-#line 349 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp79_ = self->priv->units_combo;
-#line 349 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp80_ = _ ("cm");
-#line 349 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_text_append_text (_tmp79_, _tmp80_);
-#line 350 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp81_ = self->priv->units_combo;
-#line 350 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp81_, gtk_combo_box_get_type (), GtkComboBox), 0);
-#line 351 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp82_ = self->priv->units_combo;
-#line 351 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_combo_box_get_type (), GtkComboBox), "changed", (GCallback) _custom_print_tab_on_units_combo_changed_gtk_combo_box_changed, self, 0);
-#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp83_ = builder;
-#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp84_ = gtk_builder_get_object (_tmp83_, "check_MatchAspectRatio");
-#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp85_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp84_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp84_) : NULL);
-#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->aspect_ratio_check);
-#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->aspect_ratio_check = _tmp85_;
-#line 354 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp86_ = builder;
-#line 354 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp87_ = gtk_builder_get_object (_tmp86_, "check_PrintImageTitle");
-#line 354 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp88_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp87_, gtk_check_button_get_type ()) ? ((GtkCheckButton*) _tmp87_) : NULL);
-#line 354 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->title_print_check);
-#line 354 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->title_print_check = _tmp88_;
-#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp89_ = builder;
-#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp90_ = gtk_builder_get_object (_tmp89_, "fntbn_TitleFont");
-#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp91_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp90_, gtk_font_button_get_type ()) ? ((GtkFontButton*) _tmp90_) : NULL);
-#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->title_print_font);
-#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->title_print_font = _tmp91_;
-#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp92_ = builder;
-#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp93_ = gtk_builder_get_object (_tmp92_, "entry_PixelsPerInch");
-#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp94_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp93_, gtk_entry_get_type ()) ? ((GtkEntry*) _tmp93_) : NULL);
-#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->ppi_entry);
-#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->ppi_entry = _tmp94_;
-#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp95_ = self->priv->ppi_entry;
-#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp95_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _custom_print_tab_on_ppi_entry_insert_text_gtk_editable_insert_text, self, 0);
-#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp96_ = self->priv->ppi_entry;
-#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp96_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _custom_print_tab_on_ppi_entry_focus_out_gtk_widget_focus_out_event, self, 0);
-#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp97_ = self->priv->custom_image_settings_pane;
-#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, gtk_widget_get_type (), GtkWidget));
-#line 363 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp98_ = source_job;
-#line 363 "/home/jens/Source/shotwell/src/Printing.vala"
-	custom_print_tab_sync_state_from_job (self, _tmp98_);
-#line 365 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 368 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp99_ = self->priv->aspect_ratio_check;
-#line 368 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp99_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked, self, 0);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (standard_sizes_combo_store);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (standard_sizes_combo_text_renderer);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	standard_sizes = (_vala_array_free (standard_sizes, standard_sizes_length1, (GDestroyNotify) standard_print_size_unref), NULL);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (image_per_page_combo_store);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (image_per_page_combo_text_renderer);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (builder);
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_button_get_type (), GtkButton), "clicked", (GCallback) _custom_print_tab_on_aspect_ratio_check_clicked_gtk_button_clicked, self, 0);
+#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 2569 "Printing.c"
+#line 2258 "Printing.c"
 }
 
 
 CustomPrintTab* custom_print_tab_new (PrintJob* source_job) {
-#line 291 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 304 "/home/jens/Source/shotwell/src/Printing.vala"
 	return custom_print_tab_construct (TYPE_CUSTOM_PRINT_TAB, source_job);
-#line 2576 "Printing.c"
+#line 2265 "Printing.c"
 }
 
 
 static void custom_print_tab_on_aspect_ratio_check_clicked (CustomPrintTab* self) {
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 343 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 372 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 344 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->aspect_ratio_check;
-#line 372 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 344 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 372 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 344 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_) {
-#line 2591 "Printing.c"
+#line 2280 "Printing.c"
 		Measurement _tmp2_ = {0};
 		gdouble _tmp3_ = 0.0;
 		PrintJob* _tmp4_ = NULL;
@@ -2598,33 +2287,33 @@ static void custom_print_tab_on_aspect_ratio_check_clicked (CustomPrintTab* self
 		Measurement _tmp9_ = {0};
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = self->priv->local_content_height;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp3_ = _tmp2_.value;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = self->priv->source_job;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = print_job_get_source_aspect_ratio (_tmp4_);
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = self->priv->local_content_height;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp7_ = _tmp6_.unit;
-#line 373 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 345 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_init (&self->priv->local_content_width, _tmp3_ * _tmp5_, _tmp7_);
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp8_ = self->priv->custom_width_entry;
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = self->priv->local_content_width;
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp10_ = custom_print_tab_format_measurement (self, &_tmp9_);
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp11_ = _tmp10_;
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp8_, _tmp11_);
-#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 348 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp11_);
-#line 2628 "Printing.c"
+#line 2317 "Printing.c"
 	}
 }
 
@@ -2661,116 +2350,116 @@ static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self,
 	Measurement _tmp41_ = {0};
 	gchar* _tmp42_ = NULL;
 	gchar* _tmp43_ = NULL;
-#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 352 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
-#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 352 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->custom_width_entry;
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->local_content_width;
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_get_user_unit_choice (self);
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = custom_print_tab_format_measurement_as (self, &_tmp2_, _tmp3_);
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = g_strcmp0 (_tmp1_, _tmp5_) == 0;
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp5_);
-#line 381 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 353 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp6_) {
-#line 383 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = FALSE;
-#line 383 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 355 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 2691 "Printing.c"
+#line 2380 "Printing.c"
 	}
-#line 385 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_get_width_entry_value (self, &_tmp7_);
-#line 385 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 357 "/home/jens/Source/shotwell/src/Printing.vala"
 	new_width = _tmp7_;
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = self->priv->source_job;
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = print_job_get_local_settings (_tmp8_);
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_minimum_content_dimension (_tmp10_, &_tmp11_);
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = _tmp11_;
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp10_);
-#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 358 "/home/jens/Source/shotwell/src/Printing.vala"
 	min_width = _tmp12_;
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = self->priv->source_job;
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = print_job_get_local_settings (_tmp13_);
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = _tmp14_;
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_maximum_content_dimension (_tmp15_, &_tmp16_);
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _tmp16_;
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp15_);
-#line 387 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 359 "/home/jens/Source/shotwell/src/Printing.vala"
 	max_width = _tmp17_;
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp19_ = min_width;
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp20_ = measurement_is_less_than (&new_width, &_tmp19_);
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp20_) {
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = TRUE;
-#line 2733 "Printing.c"
+#line 2422 "Printing.c"
 	} else {
 		Measurement _tmp21_ = {0};
 		gboolean _tmp22_ = FALSE;
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = max_width;
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = measurement_is_greater_than (&new_width, &_tmp21_);
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = _tmp22_;
-#line 2743 "Printing.c"
+#line 2432 "Printing.c"
 	}
-#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 361 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp18_) {
-#line 2747 "Printing.c"
+#line 2436 "Printing.c"
 		GtkEntry* _tmp23_ = NULL;
 		Measurement _tmp24_ = {0};
 		gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = self->priv->custom_width_entry;
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = self->priv->local_content_width;
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = custom_print_tab_format_measurement (self, &_tmp24_);
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = _tmp25_;
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp23_, _tmp26_);
-#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 362 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp26_);
-#line 391 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 363 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = FALSE;
-#line 391 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 363 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 2768 "Printing.c"
+#line 2457 "Printing.c"
 	}
-#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 366 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp27_ = custom_print_tab_is_match_aspect_ratio_enabled (self);
-#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 366 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp27_) {
-#line 2774 "Printing.c"
+#line 2463 "Printing.c"
 		Measurement new_height = {0};
 		Measurement _tmp28_ = {0};
 		gdouble _tmp29_ = 0.0;
@@ -2783,59 +2472,59 @@ static gboolean custom_print_tab_on_width_entry_focus_out (CustomPrintTab* self,
 		Measurement _tmp36_ = {0};
 		gchar* _tmp37_ = NULL;
 		gchar* _tmp38_ = NULL;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = new_width;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = _tmp28_.value;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp30_ = self->priv->source_job;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp31_ = print_job_get_source_aspect_ratio (_tmp30_);
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp32_ = new_width;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp33_ = _tmp32_.unit;
-#line 395 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 367 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_init (&new_height, _tmp29_ / _tmp31_, _tmp33_);
-#line 398 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 370 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp34_ = new_height;
-#line 398 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 370 "/home/jens/Source/shotwell/src/Printing.vala"
 		self->priv->local_content_height = _tmp34_;
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp35_ = self->priv->custom_height_entry;
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp36_ = new_height;
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp37_ = custom_print_tab_format_measurement (self, &_tmp36_);
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp38_ = _tmp37_;
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp35_, _tmp38_);
-#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 371 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp38_);
-#line 2817 "Printing.c"
+#line 2506 "Printing.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 374 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp39_ = new_width;
-#line 402 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 374 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->local_content_width = _tmp39_;
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp40_ = self->priv->custom_width_entry;
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp41_ = new_width;
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp42_ = custom_print_tab_format_measurement (self, &_tmp41_);
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp43_ = _tmp42_;
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp40_, _tmp43_);
-#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 375 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp43_);
-#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = FALSE;
-#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 376 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2839 "Printing.c"
+#line 2528 "Printing.c"
 }
 
 
@@ -2844,21 +2533,21 @@ static gchar* custom_print_tab_format_measurement (CustomPrintTab* self, Measure
 	Measurement _tmp0_ = {0};
 	gdouble _tmp1_ = 0.0;
 	gchar* _tmp2_ = NULL;
-#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 379 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
-#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 379 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (measurement != NULL, NULL);
-#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = *measurement;
-#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _tmp0_.value;
-#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = g_strdup_printf ("%.2f", _tmp1_);
-#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp2_;
-#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 380 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2862 "Printing.c"
+#line 2551 "Printing.c"
 }
 
 
@@ -2871,47 +2560,47 @@ static gchar* custom_print_tab_format_measurement_as (CustomPrintTab* self, Meas
 	Measurement converted_measurement = {0};
 	Measurement _tmp7_ = {0};
 	gchar* _tmp8_ = NULL;
-#line 411 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 383 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
-#line 411 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 383 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (measurement != NULL, NULL);
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = *measurement;
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = _tmp1_.unit;
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = to_unit;
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ == _tmp3_) {
-#line 2887 "Printing.c"
+#line 2576 "Printing.c"
 		Measurement _tmp4_ = {0};
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *measurement;
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp4_;
-#line 2893 "Printing.c"
+#line 2582 "Printing.c"
 	} else {
 		MeasurementUnit _tmp5_ = 0;
 		Measurement _tmp6_ = {0};
-#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 385 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = to_unit;
-#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 385 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_convert_to (measurement, _tmp5_, &_tmp6_);
-#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 385 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp0_ = _tmp6_;
-#line 2903 "Printing.c"
+#line 2592 "Printing.c"
 	}
-#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 384 "/home/jens/Source/shotwell/src/Printing.vala"
 	converted_measurement = _tmp0_;
-#line 414 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = converted_measurement;
-#line 414 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = custom_print_tab_format_measurement (self, &_tmp7_);
-#line 414 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp8_;
-#line 414 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 386 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2915 "Printing.c"
+#line 2604 "Printing.c"
 }
 
 
@@ -2920,23 +2609,23 @@ static gboolean custom_print_tab_on_ppi_entry_focus_out (CustomPrintTab* self, G
 	GtkEntry* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
-#line 417 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
-#line 417 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 389 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 418 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->ppi_entry;
-#line 418 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 418 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = atoi (_tmp1_);
-#line 418 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 390 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_ppi (self, _tmp2_);
-#line 419 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 391 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = FALSE;
-#line 419 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 391 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 2940 "Printing.c"
+#line 2629 "Printing.c"
 }
 
 
@@ -2954,7 +2643,7 @@ static gchar string_get (const gchar* self, glong index) {
 	result = _tmp1_;
 #line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2958 "Printing.c"
+#line 2647 "Printing.c"
 }
 
 
@@ -2970,104 +2659,104 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 	gint _tmp24_ = 0;
 	gint _tmp25_ = 0;
 	GtkEntry* _tmp31_ = NULL;
-#line 422 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 422 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_EDITABLE (editable));
-#line 422 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (text != NULL);
-#line 424 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 396 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = editable;
-#line 424 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 396 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry));
-#line 424 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 396 "/home/jens/Source/shotwell/src/Printing.vala"
 	sender = _tmp1_;
-#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 398 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->is_text_insertion_in_progress;
-#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 398 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_) {
-#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (sender);
-#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 399 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 2994 "Printing.c"
+#line 2683 "Printing.c"
 	}
-#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 401 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = TRUE;
-#line 431 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = length;
-#line 431 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 403 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ == -1) {
-#line 3002 "Printing.c"
+#line 2691 "Printing.c"
 		const gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 432 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = text;
-#line 432 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = strlen (_tmp4_);
-#line 432 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = _tmp5_;
-#line 432 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 404 "/home/jens/Source/shotwell/src/Printing.vala"
 		length = (gint) _tmp6_;
-#line 3014 "Printing.c"
+#line 2703 "Printing.c"
 	}
-#line 434 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 406 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = g_strdup ("");
-#line 434 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 406 "/home/jens/Source/shotwell/src/Printing.vala"
 	new_text = _tmp7_;
-#line 3020 "Printing.c"
+#line 2709 "Printing.c"
 	{
 		gint ctr = 0;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 		ctr = 0;
-#line 3025 "Printing.c"
+#line 2714 "Printing.c"
 		{
 			gboolean _tmp8_ = FALSE;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp8_ = TRUE;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 			while (TRUE) {
-#line 3032 "Printing.c"
+#line 2721 "Printing.c"
 				gint _tmp10_ = 0;
 				gint _tmp11_ = 0;
 				const gchar* _tmp12_ = NULL;
 				gint _tmp13_ = 0;
 				gchar _tmp14_ = '\0';
 				gboolean _tmp15_ = FALSE;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (!_tmp8_) {
-#line 3041 "Printing.c"
+#line 2730 "Printing.c"
 					gint _tmp9_ = 0;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp9_ = ctr;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 					ctr = _tmp9_ + 1;
-#line 3047 "Printing.c"
+#line 2736 "Printing.c"
 				}
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp8_ = FALSE;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp10_ = ctr;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp11_ = length;
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (!(_tmp10_ < _tmp11_)) {
-#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 407 "/home/jens/Source/shotwell/src/Printing.vala"
 					break;
-#line 3059 "Printing.c"
+#line 2748 "Printing.c"
 				}
-#line 436 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp12_ = text;
-#line 436 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp13_ = ctr;
-#line 436 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp14_ = string_get (_tmp12_, (glong) _tmp13_);
-#line 436 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp15_ = g_ascii_isdigit (_tmp14_);
-#line 436 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 408 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (_tmp15_) {
-#line 3071 "Printing.c"
+#line 2760 "Printing.c"
 					const gchar* _tmp16_ = NULL;
 					const gchar* _tmp17_ = NULL;
 					gint _tmp18_ = 0;
@@ -3075,70 +2764,70 @@ static void custom_print_tab_on_ppi_entry_insert_text (CustomPrintTab* self, Gtk
 					gchar* _tmp20_ = NULL;
 					gchar* _tmp21_ = NULL;
 					gchar* _tmp22_ = NULL;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp16_ = new_text;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp17_ = text;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp18_ = ctr;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp19_ = string_get (_tmp17_, (glong) _tmp18_);
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp20_ = g_strdup_printf ("%c", (gchar) _tmp19_);
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp21_ = _tmp20_;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp22_ = g_strconcat (_tmp16_, _tmp21_, NULL);
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_g_free0 (new_text);
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					new_text = _tmp22_;
-#line 437 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 409 "/home/jens/Source/shotwell/src/Printing.vala"
 					_g_free0 (_tmp21_);
-#line 3099 "Printing.c"
+#line 2788 "Printing.c"
 				}
 			}
 		}
 	}
-#line 440 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp23_ = new_text;
-#line 440 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp24_ = strlen (_tmp23_);
-#line 440 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp25_ = _tmp24_;
-#line 440 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 412 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp25_ > 0) {
-#line 3112 "Printing.c"
+#line 2801 "Printing.c"
 		GtkEntry* _tmp26_ = NULL;
 		const gchar* _tmp27_ = NULL;
 		const gchar* _tmp28_ = NULL;
 		gint _tmp29_ = 0;
 		gint _tmp30_ = 0;
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = sender;
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp27_ = new_text;
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = new_text;
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = strlen (_tmp28_);
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp30_ = _tmp29_;
-#line 441 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 413 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GTK_TYPE_EDITABLE, GtkEditable), _tmp27_, (gint) _tmp30_, position);
-#line 3130 "Printing.c"
+#line 2819 "Printing.c"
 	}
-#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 415 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp31_ = sender;
-#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 415 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_stop_emission_by_name (_tmp31_, "insert-text");
-#line 445 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 417 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = FALSE;
-#line 422 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (new_text);
-#line 422 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 394 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (sender);
-#line 3142 "Printing.c"
+#line 2831 "Printing.c"
 }
 
 
@@ -3174,116 +2863,116 @@ static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self
 	Measurement _tmp41_ = {0};
 	gchar* _tmp42_ = NULL;
 	gchar* _tmp43_ = NULL;
-#line 448 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 420 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
-#line 448 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 420 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->custom_height_entry;
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->local_content_height;
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_get_user_unit_choice (self);
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = custom_print_tab_format_measurement_as (self, &_tmp2_, _tmp3_);
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = g_strcmp0 (_tmp1_, _tmp5_) == 0;
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp5_);
-#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 421 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp6_) {
-#line 451 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 423 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = FALSE;
-#line 451 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 423 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 3204 "Printing.c"
+#line 2893 "Printing.c"
 	}
-#line 453 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 425 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_get_height_entry_value (self, &_tmp7_);
-#line 453 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 425 "/home/jens/Source/shotwell/src/Printing.vala"
 	new_height = _tmp7_;
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = self->priv->source_job;
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = print_job_get_local_settings (_tmp8_);
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_minimum_content_dimension (_tmp10_, &_tmp11_);
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = _tmp11_;
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp10_);
-#line 454 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 426 "/home/jens/Source/shotwell/src/Printing.vala"
 	min_height = _tmp12_;
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = self->priv->source_job;
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = print_job_get_local_settings (_tmp13_);
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = _tmp14_;
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_maximum_content_dimension (_tmp15_, &_tmp16_);
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _tmp16_;
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp15_);
-#line 455 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 427 "/home/jens/Source/shotwell/src/Printing.vala"
 	max_height = _tmp17_;
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp19_ = min_height;
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp20_ = measurement_is_less_than (&new_height, &_tmp19_);
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp20_) {
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = TRUE;
-#line 3246 "Printing.c"
+#line 2935 "Printing.c"
 	} else {
 		Measurement _tmp21_ = {0};
 		gboolean _tmp22_ = FALSE;
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = max_height;
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = measurement_is_greater_than (&new_height, &_tmp21_);
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = _tmp22_;
-#line 3256 "Printing.c"
+#line 2945 "Printing.c"
 	}
-#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 429 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp18_) {
-#line 3260 "Printing.c"
+#line 2949 "Printing.c"
 		GtkEntry* _tmp23_ = NULL;
 		Measurement _tmp24_ = {0};
 		gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = self->priv->custom_height_entry;
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = self->priv->local_content_height;
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = custom_print_tab_format_measurement (self, &_tmp24_);
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = _tmp25_;
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp23_, _tmp26_);
-#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 430 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp26_);
-#line 459 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 431 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = FALSE;
-#line 459 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 431 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 3281 "Printing.c"
+#line 2970 "Printing.c"
 	}
-#line 462 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 434 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp27_ = custom_print_tab_is_match_aspect_ratio_enabled (self);
-#line 462 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 434 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp27_) {
-#line 3287 "Printing.c"
+#line 2976 "Printing.c"
 		Measurement new_width = {0};
 		Measurement _tmp28_ = {0};
 		gdouble _tmp29_ = 0.0;
@@ -3296,59 +2985,59 @@ static gboolean custom_print_tab_on_height_entry_focus_out (CustomPrintTab* self
 		Measurement _tmp36_ = {0};
 		gchar* _tmp37_ = NULL;
 		gchar* _tmp38_ = NULL;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = new_height;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = _tmp28_.value;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp30_ = self->priv->source_job;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp31_ = print_job_get_source_aspect_ratio (_tmp30_);
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp32_ = new_height;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp33_ = _tmp32_.unit;
-#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 435 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_init (&new_width, _tmp29_ * _tmp31_, _tmp33_);
-#line 466 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 438 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp34_ = new_width;
-#line 466 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 438 "/home/jens/Source/shotwell/src/Printing.vala"
 		self->priv->local_content_width = _tmp34_;
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp35_ = self->priv->custom_width_entry;
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp36_ = new_width;
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp37_ = custom_print_tab_format_measurement (self, &_tmp36_);
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp38_ = _tmp37_;
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp35_, _tmp38_);
-#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 439 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp38_);
-#line 3330 "Printing.c"
+#line 3019 "Printing.c"
 	}
-#line 470 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 442 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp39_ = new_height;
-#line 470 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 442 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->local_content_height = _tmp39_;
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp40_ = self->priv->custom_height_entry;
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp41_ = new_height;
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp42_ = custom_print_tab_format_measurement (self, &_tmp41_);
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp43_ = _tmp42_;
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp40_, _tmp43_);
-#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 443 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp43_);
-#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 444 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = FALSE;
-#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 444 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 3352 "Printing.c"
+#line 3041 "Printing.c"
 }
 
 
@@ -3356,37 +3045,37 @@ static MeasurementUnit custom_print_tab_get_user_unit_choice (CustomPrintTab* se
 	MeasurementUnit result = 0;
 	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 447 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
-#line 476 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 448 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->units_combo;
-#line 476 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 448 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
-#line 476 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 448 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ == CUSTOM_PRINT_TAB_INCHES_COMBO_CHOICE) {
-#line 477 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = MEASUREMENT_UNIT_INCHES;
-#line 477 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 449 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 3372 "Printing.c"
+#line 3061 "Printing.c"
 	} else {
 		GtkComboBoxText* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
-#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 450 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = self->priv->units_combo;
-#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 450 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp3_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_combo_box_get_type (), GtkComboBox));
-#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 450 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp3_ == CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE) {
-#line 479 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 451 "/home/jens/Source/shotwell/src/Printing.vala"
 			result = MEASUREMENT_UNIT_CENTIMETERS;
-#line 479 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 451 "/home/jens/Source/shotwell/src/Printing.vala"
 			return result;
-#line 3386 "Printing.c"
+#line 3075 "Printing.c"
 		} else {
-#line 481 "/home/jens/Source/shotwell/src/Printing.vala"
-			g_error ("Printing.vala:481: unknown unit combo box choice");
-#line 3390 "Printing.c"
+#line 453 "/home/jens/Source/shotwell/src/Printing.vala"
+			g_error ("Printing.vala:453: unknown unit combo box choice");
+#line 3079 "Printing.c"
 		}
 	}
 }
@@ -3394,36 +3083,36 @@ static MeasurementUnit custom_print_tab_get_user_unit_choice (CustomPrintTab* se
 
 static void custom_print_tab_set_user_unit_choice (CustomPrintTab* self, MeasurementUnit unit) {
 	MeasurementUnit _tmp0_ = 0;
-#line 485 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 457 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = unit;
-#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 458 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp0_ == MEASUREMENT_UNIT_INCHES) {
-#line 3404 "Printing.c"
+#line 3093 "Printing.c"
 		GtkComboBoxText* _tmp1_ = NULL;
-#line 487 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 459 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp1_ = self->priv->units_combo;
-#line 487 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 459 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_combo_box_get_type (), GtkComboBox), CUSTOM_PRINT_TAB_INCHES_COMBO_CHOICE);
-#line 3410 "Printing.c"
+#line 3099 "Printing.c"
 	} else {
 		MeasurementUnit _tmp2_ = 0;
-#line 488 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 460 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = unit;
-#line 488 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 460 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp2_ == MEASUREMENT_UNIT_CENTIMETERS) {
-#line 3417 "Printing.c"
+#line 3106 "Printing.c"
 			GtkComboBoxText* _tmp3_ = NULL;
-#line 489 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 461 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp3_ = self->priv->units_combo;
-#line 489 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 461 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_combo_box_get_type (), GtkComboBox), CUSTOM_PRINT_TAB_CENTIMETERS_COMBO_CHOICE);
-#line 3423 "Printing.c"
+#line 3112 "Printing.c"
 		} else {
-#line 491 "/home/jens/Source/shotwell/src/Printing.vala"
-			g_error ("Printing.vala:491: unknown MeasurementUnit enumeration");
-#line 3427 "Printing.c"
+#line 463 "/home/jens/Source/shotwell/src/Printing.vala"
+			g_error ("Printing.vala:463: unknown MeasurementUnit enumeration");
+#line 3116 "Printing.c"
 		}
 	}
 }
@@ -3443,7 +3132,7 @@ static gdouble double_parse (const gchar* str) {
 	result = _tmp1_;
 #line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3447 "Printing.c"
+#line 3136 "Printing.c"
 }
 
 
@@ -3453,23 +3142,23 @@ static void custom_print_tab_get_width_entry_value (CustomPrintTab* self, Measur
 	gdouble _tmp2_ = 0.0;
 	MeasurementUnit _tmp3_ = 0;
 	Measurement _tmp4_ = {0};
-#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 467 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->custom_width_entry;
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = double_parse (_tmp1_);
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_get_user_unit_choice (self);
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	measurement_init (&_tmp4_, _tmp2_, _tmp3_);
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	*result = _tmp4_;
-#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 468 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 3473 "Printing.c"
+#line 3162 "Printing.c"
 }
 
 
@@ -3479,23 +3168,23 @@ static void custom_print_tab_get_height_entry_value (CustomPrintTab* self, Measu
 	gdouble _tmp2_ = 0.0;
 	MeasurementUnit _tmp3_ = 0;
 	Measurement _tmp4_ = {0};
-#line 499 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 471 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->custom_height_entry;
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_entry_get_text (_tmp0_);
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = double_parse (_tmp1_);
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_get_user_unit_choice (self);
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	measurement_init (&_tmp4_, _tmp2_, _tmp3_);
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	*result = _tmp4_;
-#line 500 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 472 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 3499 "Printing.c"
+#line 3188 "Printing.c"
 }
 
 
@@ -3515,7 +3204,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 3519 "Printing.c"
+#line 3208 "Printing.c"
 }
 
 
@@ -3538,118 +3227,118 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 	gint _tmp43_ = 0;
 	gint _tmp44_ = 0;
 	GtkEntry* _tmp50_ = NULL;
-#line 503 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 503 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_EDITABLE (editable));
-#line 503 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (text != NULL);
-#line 506 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = editable;
-#line 506 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_entry_get_type (), GtkEntry));
-#line 506 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 478 "/home/jens/Source/shotwell/src/Printing.vala"
 	sender = _tmp1_;
-#line 508 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 480 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->is_text_insertion_in_progress;
-#line 508 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 480 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_) {
-#line 509 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 481 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (sender);
-#line 509 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 481 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 3562 "Printing.c"
+#line 3251 "Printing.c"
 	}
-#line 511 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 483 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = TRUE;
-#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 485 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = length;
-#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 485 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ == -1) {
-#line 3570 "Printing.c"
+#line 3259 "Printing.c"
 		const gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = text;
-#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = strlen (_tmp4_);
-#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = _tmp5_;
-#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 486 "/home/jens/Source/shotwell/src/Printing.vala"
 		length = (gint) _tmp6_;
-#line 3582 "Printing.c"
+#line 3271 "Printing.c"
 	}
-#line 516 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 488 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = nl_langinfo (RADIXCHAR);
-#line 516 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 488 "/home/jens/Source/shotwell/src/Printing.vala"
 	decimal_point = _tmp7_;
-#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 490 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = sender;
-#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 490 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = gtk_entry_get_text (_tmp8_);
-#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 490 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = decimal_point;
-#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 490 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = string_contains (_tmp9_, _tmp10_);
-#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 490 "/home/jens/Source/shotwell/src/Printing.vala"
 	contains_decimal_point = _tmp11_;
-#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 492 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = g_strdup ("");
-#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 492 "/home/jens/Source/shotwell/src/Printing.vala"
 	new_text = _tmp12_;
-#line 3602 "Printing.c"
+#line 3291 "Printing.c"
 	{
 		gint ctr = 0;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 		ctr = 0;
-#line 3607 "Printing.c"
+#line 3296 "Printing.c"
 		{
 			gboolean _tmp13_ = FALSE;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp13_ = TRUE;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 			while (TRUE) {
-#line 3614 "Printing.c"
+#line 3303 "Printing.c"
 				gint _tmp15_ = 0;
 				gint _tmp16_ = 0;
 				const gchar* _tmp17_ = NULL;
 				gint _tmp18_ = 0;
 				gchar _tmp19_ = '\0';
 				gboolean _tmp20_ = FALSE;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (!_tmp13_) {
-#line 3623 "Printing.c"
+#line 3312 "Printing.c"
 					gint _tmp14_ = 0;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp14_ = ctr;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 					ctr = _tmp14_ + 1;
-#line 3629 "Printing.c"
+#line 3318 "Printing.c"
 				}
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp13_ = FALSE;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp15_ = ctr;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp16_ = length;
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (!(_tmp15_ < _tmp16_)) {
-#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 493 "/home/jens/Source/shotwell/src/Printing.vala"
 					break;
-#line 3641 "Printing.c"
+#line 3330 "Printing.c"
 				}
-#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp17_ = text;
-#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp18_ = ctr;
-#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp19_ = string_get (_tmp17_, (glong) _tmp18_);
-#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp20_ = g_ascii_isdigit (_tmp19_);
-#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 494 "/home/jens/Source/shotwell/src/Printing.vala"
 				if (_tmp20_) {
-#line 3653 "Printing.c"
+#line 3342 "Printing.c"
 					const gchar* _tmp21_ = NULL;
 					const gchar* _tmp22_ = NULL;
 					gint _tmp23_ = 0;
@@ -3657,61 +3346,61 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 					gchar* _tmp25_ = NULL;
 					gchar* _tmp26_ = NULL;
 					gchar* _tmp27_ = NULL;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp21_ = new_text;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp22_ = text;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp23_ = ctr;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp24_ = string_get (_tmp22_, (glong) _tmp23_);
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp25_ = g_strdup_printf ("%c", (gchar) _tmp24_);
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp26_ = _tmp25_;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp27_ = g_strconcat (_tmp21_, _tmp26_, NULL);
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_g_free0 (new_text);
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					new_text = _tmp27_;
-#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 495 "/home/jens/Source/shotwell/src/Printing.vala"
 					_g_free0 (_tmp26_);
-#line 3681 "Printing.c"
+#line 3370 "Printing.c"
 				} else {
 					gboolean _tmp28_ = FALSE;
 					gboolean _tmp29_ = FALSE;
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 					_tmp29_ = contains_decimal_point;
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 					if (!_tmp29_) {
-#line 3689 "Printing.c"
+#line 3378 "Printing.c"
 						const gchar* _tmp30_ = NULL;
 						gint _tmp31_ = 0;
 						gchar _tmp32_ = '\0';
 						const gchar* _tmp33_ = NULL;
 						gchar _tmp34_ = '\0';
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp30_ = text;
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp31_ = ctr;
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp32_ = string_get (_tmp30_, (glong) _tmp31_);
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp33_ = decimal_point;
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp34_ = string_get (_tmp33_, (glong) 0);
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp28_ = _tmp32_ == _tmp34_;
-#line 3707 "Printing.c"
+#line 3396 "Printing.c"
 					} else {
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp28_ = FALSE;
-#line 3711 "Printing.c"
+#line 3400 "Printing.c"
 					}
-#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 496 "/home/jens/Source/shotwell/src/Printing.vala"
 					if (_tmp28_) {
-#line 3715 "Printing.c"
+#line 3404 "Printing.c"
 						const gchar* _tmp35_ = NULL;
 						const gchar* _tmp36_ = NULL;
 						gint _tmp37_ = 0;
@@ -3719,71 +3408,71 @@ static void custom_print_tab_on_entry_insert_text (CustomPrintTab* self, GtkEdit
 						gchar* _tmp39_ = NULL;
 						gchar* _tmp40_ = NULL;
 						gchar* _tmp41_ = NULL;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp35_ = new_text;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp36_ = text;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp37_ = ctr;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp38_ = string_get (_tmp36_, (glong) _tmp37_);
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp39_ = g_strdup_printf ("%c", (gchar) _tmp38_);
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp40_ = _tmp39_;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_tmp41_ = g_strconcat (_tmp35_, _tmp40_, NULL);
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_g_free0 (new_text);
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						new_text = _tmp41_;
-#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 497 "/home/jens/Source/shotwell/src/Printing.vala"
 						_g_free0 (_tmp40_);
-#line 3743 "Printing.c"
+#line 3432 "Printing.c"
 					}
 				}
 			}
 		}
 	}
-#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 501 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp42_ = new_text;
-#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 501 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp43_ = strlen (_tmp42_);
-#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 501 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp44_ = _tmp43_;
-#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 501 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp44_ > 0) {
-#line 3757 "Printing.c"
+#line 3446 "Printing.c"
 		GtkEntry* _tmp45_ = NULL;
 		const gchar* _tmp46_ = NULL;
 		const gchar* _tmp47_ = NULL;
 		gint _tmp48_ = 0;
 		gint _tmp49_ = 0;
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp45_ = sender;
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp46_ = new_text;
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp47_ = new_text;
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp48_ = strlen (_tmp47_);
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp49_ = _tmp48_;
-#line 530 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 502 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, GTK_TYPE_EDITABLE, GtkEditable), _tmp46_, (gint) _tmp49_, position);
-#line 3775 "Printing.c"
+#line 3464 "Printing.c"
 	}
-#line 532 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 504 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp50_ = sender;
-#line 532 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 504 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_stop_emission_by_name (_tmp50_, "insert-text");
-#line 534 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 506 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = FALSE;
-#line 503 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (new_text);
-#line 503 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 475 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (sender);
-#line 3787 "Printing.c"
+#line 3476 "Printing.c"
 }
 
 
@@ -3843,65 +3532,65 @@ static void custom_print_tab_sync_state_from_job (CustomPrintTab* self, PrintJob
 	PrintSettings* _tmp63_ = NULL;
 	gchar* _tmp64_ = NULL;
 	gchar* _tmp65_ = NULL;
-#line 537 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 509 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 537 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 509 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_JOB (job));
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = job;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = print_job_get_local_settings (_tmp0_);
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = _tmp1_;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_content_width (_tmp2_, &_tmp3_);
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = _tmp3_.unit;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = job;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = print_job_get_local_settings (_tmp5_);
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = _tmp6_;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_content_height (_tmp7_, &_tmp8_);
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = _tmp8_.unit;
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_vala_assert (_tmp4_ == _tmp9_, "job.get_local_settings().get_content_width().unit ==             job.get_local_settings().get_content_height().unit");
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp7_);
-#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 510 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp2_);
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = job;
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = print_job_get_local_settings (_tmp10_);
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = _tmp11_;
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_content_width (_tmp12_, &_tmp13_);
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = _tmp13_;
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp12_);
-#line 541 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 513 "/home/jens/Source/shotwell/src/Printing.vala"
 	constrained_width = _tmp14_;
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = job;
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16_ = print_job_get_local_settings (_tmp15_);
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _tmp16_;
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp18_ = print_settings_is_match_aspect_ratio_enabled (_tmp17_);
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp19_ = _tmp18_;
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp17_);
-#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 514 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp19_) {
-#line 3905 "Printing.c"
+#line 3594 "Printing.c"
 		PrintJob* _tmp20_ = NULL;
 		PrintSettings* _tmp21_ = NULL;
 		PrintSettings* _tmp22_ = NULL;
@@ -3914,143 +3603,143 @@ static void custom_print_tab_sync_state_from_job (CustomPrintTab* self, PrintJob
 		PrintSettings* _tmp29_ = NULL;
 		Measurement _tmp30_ = {0};
 		MeasurementUnit _tmp31_ = 0;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp20_ = job;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = print_job_get_local_settings (_tmp20_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = _tmp21_;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_get_content_height (_tmp22_, &_tmp23_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = _tmp23_.value;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = job;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = print_job_get_source_aspect_ratio (_tmp25_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp27_ = job;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = print_job_get_local_settings (_tmp27_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = _tmp28_;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_settings_get_content_height (_tmp29_, &_tmp30_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp31_ = _tmp30_.unit;
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_init (&constrained_width, _tmp24_ * _tmp26_, _tmp31_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_print_settings_unref0 (_tmp29_);
-#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 515 "/home/jens/Source/shotwell/src/Printing.vala"
 		_print_settings_unref0 (_tmp22_);
-#line 3948 "Printing.c"
+#line 3637 "Printing.c"
 	}
-#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 517 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp32_ = constrained_width;
-#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 517 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_width (self, &_tmp32_);
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp33_ = job;
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp34_ = print_job_get_local_settings (_tmp33_);
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp35_ = _tmp34_;
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_get_content_height (_tmp35_, &_tmp36_);
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_height (self, &_tmp36_);
-#line 546 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 518 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp35_);
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp37_ = job;
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp38_ = print_job_get_local_settings (_tmp37_);
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp39_ = _tmp38_;
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp40_ = print_settings_get_content_layout (_tmp39_);
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_layout (self, _tmp40_);
-#line 547 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 519 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp39_);
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp41_ = job;
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp42_ = print_job_get_local_settings (_tmp41_);
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp43_ = _tmp42_;
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp44_ = print_settings_get_content_ppi (_tmp43_);
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_ppi (self, _tmp44_);
-#line 548 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 520 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp43_);
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp45_ = job;
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp46_ = print_job_get_local_settings (_tmp45_);
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp47_ = _tmp46_;
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp48_ = print_settings_get_image_per_page_selection (_tmp47_);
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_image_per_page_selection (self, _tmp48_);
-#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 521 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp47_);
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp49_ = job;
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp50_ = print_job_get_local_settings (_tmp49_);
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp51_ = _tmp50_;
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp52_ = print_settings_get_size_selection (_tmp51_);
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_size_selection (self, _tmp52_);
-#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 522 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp51_);
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp53_ = job;
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp54_ = print_job_get_local_settings (_tmp53_);
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp55_ = _tmp54_;
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp56_ = print_settings_is_match_aspect_ratio_enabled (_tmp55_);
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_match_aspect_ratio_enabled (self, _tmp56_);
-#line 551 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 523 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp55_);
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp57_ = job;
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp58_ = print_job_get_local_settings (_tmp57_);
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp59_ = _tmp58_;
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp60_ = print_settings_is_print_titles_enabled (_tmp59_);
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_print_titles_enabled (self, _tmp60_);
-#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 524 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp59_);
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp61_ = job;
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp62_ = print_job_get_local_settings (_tmp61_);
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp63_ = _tmp62_;
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp64_ = print_settings_get_print_titles_font (_tmp63_);
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp65_ = _tmp64_;
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_print_titles_font (self, _tmp65_);
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp65_);
-#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 525 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp63_);
-#line 4054 "Printing.c"
+#line 3743 "Printing.c"
 }
 
 
@@ -4060,67 +3749,67 @@ static void custom_print_tab_on_radio_group_click (CustomPrintTab* self, GtkButt
 	GtkRadioButton* _tmp1_ = NULL;
 	GtkRadioButton* _tmp2_ = NULL;
 	GtkRadioButton* _tmp3_ = NULL;
-#line 556 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 528 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 556 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 528 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_BUTTON (b));
-#line 557 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = b;
-#line 557 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_radio_button_get_type (), GtkRadioButton));
-#line 557 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 529 "/home/jens/Source/shotwell/src/Printing.vala"
 	sender = _tmp1_;
-#line 559 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 531 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = sender;
-#line 559 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 531 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->standard_size_radio;
-#line 559 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 531 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ == _tmp3_) {
-#line 4080 "Printing.c"
-		GtkComboBox* _tmp4_ = NULL;
-#line 560 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 3769 "Printing.c"
+		GtkComboBoxText* _tmp4_ = NULL;
+#line 532 "/home/jens/Source/shotwell/src/Printing.vala"
 		custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_STANDARD_SIZE);
-#line 561 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 533 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = self->priv->standard_sizes_combo;
-#line 561 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 533 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 4088 "Printing.c"
+#line 3777 "Printing.c"
 	} else {
 		GtkRadioButton* _tmp5_ = NULL;
 		GtkRadioButton* _tmp6_ = NULL;
-#line 562 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 534 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = sender;
-#line 562 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 534 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = self->priv->custom_size_radio;
-#line 562 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 534 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp5_ == _tmp6_) {
-#line 4098 "Printing.c"
+#line 3787 "Printing.c"
 			GtkEntry* _tmp7_ = NULL;
-#line 563 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 535 "/home/jens/Source/shotwell/src/Printing.vala"
 			custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_CUSTOM_SIZE);
-#line 564 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 536 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp7_ = self->priv->custom_height_entry;
-#line 564 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 536 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_grab_focus (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
-#line 4106 "Printing.c"
+#line 3795 "Printing.c"
 		} else {
 			GtkRadioButton* _tmp8_ = NULL;
 			GtkRadioButton* _tmp9_ = NULL;
-#line 565 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 537 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp8_ = sender;
-#line 565 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 537 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp9_ = self->priv->image_per_page_radio;
-#line 565 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 537 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (_tmp8_ == _tmp9_) {
-#line 566 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 538 "/home/jens/Source/shotwell/src/Printing.vala"
 				custom_print_tab_set_content_layout_control_state (self, CONTENT_LAYOUT_IMAGE_PER_PAGE);
-#line 4118 "Printing.c"
+#line 3807 "Printing.c"
 			}
 		}
 	}
-#line 556 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 528 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (sender);
-#line 4124 "Printing.c"
+#line 3813 "Printing.c"
 }
 
 
@@ -4135,167 +3824,167 @@ static void custom_print_tab_on_units_combo_changed (CustomPrintTab* self) {
 	MeasurementUnit _tmp7_ = 0;
 	gchar* _tmp8_ = NULL;
 	gchar* _tmp9_ = NULL;
-#line 570 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 542 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->custom_height_entry;
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = self->priv->local_content_height;
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = custom_print_tab_get_user_unit_choice (self);
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_format_measurement_as (self, &_tmp1_, _tmp2_);
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = _tmp3_;
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp0_, _tmp4_);
-#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 543 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp4_);
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = self->priv->custom_width_entry;
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = self->priv->local_content_width;
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = custom_print_tab_get_user_unit_choice (self);
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = custom_print_tab_format_measurement_as (self, &_tmp6_, _tmp7_);
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = _tmp8_;
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp5_, _tmp9_);
-#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 545 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp9_);
-#line 4169 "Printing.c"
+#line 3858 "Printing.c"
 }
 
 
 static void custom_print_tab_set_content_layout_control_state (CustomPrintTab* self, ContentLayout layout) {
 	ContentLayout _tmp0_ = 0;
-#line 577 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 549 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 578 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = layout;
-#line 578 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 	switch (_tmp0_) {
-#line 578 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_STANDARD_SIZE:
-#line 4183 "Printing.c"
+#line 3872 "Printing.c"
 		{
-			GtkComboBox* _tmp1_ = NULL;
+			GtkComboBoxText* _tmp1_ = NULL;
 			GtkComboBoxText* _tmp2_ = NULL;
 			GtkEntry* _tmp3_ = NULL;
 			GtkEntry* _tmp4_ = NULL;
 			GtkCheckButton* _tmp5_ = NULL;
-			GtkComboBox* _tmp6_ = NULL;
-#line 580 "/home/jens/Source/shotwell/src/Printing.vala"
+			GtkComboBoxText* _tmp6_ = NULL;
+#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp1_ = self->priv->standard_sizes_combo;
-#line 580 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 552 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 581 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp2_ = self->priv->units_combo;
-#line 581 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 553 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 582 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 554 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp3_ = self->priv->custom_width_entry;
-#line 582 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 554 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 583 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 555 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp4_ = self->priv->custom_height_entry;
-#line 583 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 555 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 584 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 556 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp5_ = self->priv->aspect_ratio_check;
-#line 584 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 556 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 585 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 557 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp6_ = self->priv->image_per_page_combo;
-#line 585 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 557 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 558 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4217 "Printing.c"
+#line 3906 "Printing.c"
 		}
-#line 578 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 4221 "Printing.c"
+#line 3910 "Printing.c"
 		{
-			GtkComboBox* _tmp7_ = NULL;
+			GtkComboBoxText* _tmp7_ = NULL;
 			GtkComboBoxText* _tmp8_ = NULL;
 			GtkEntry* _tmp9_ = NULL;
 			GtkEntry* _tmp10_ = NULL;
 			GtkCheckButton* _tmp11_ = NULL;
-			GtkComboBox* _tmp12_ = NULL;
-#line 589 "/home/jens/Source/shotwell/src/Printing.vala"
+			GtkComboBoxText* _tmp12_ = NULL;
+#line 561 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp7_ = self->priv->standard_sizes_combo;
-#line 589 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 561 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 590 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 562 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp8_ = self->priv->units_combo;
-#line 590 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 562 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 591 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 563 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp9_ = self->priv->custom_width_entry;
-#line 591 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 563 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 592 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 564 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp10_ = self->priv->custom_height_entry;
-#line 592 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 564 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 565 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp11_ = self->priv->aspect_ratio_check;
-#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 565 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 594 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 566 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp12_ = self->priv->image_per_page_combo;
-#line 594 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 566 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 595 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 567 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4255 "Printing.c"
+#line 3944 "Printing.c"
 		}
-#line 578 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 550 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 4259 "Printing.c"
+#line 3948 "Printing.c"
 		{
-			GtkComboBox* _tmp13_ = NULL;
+			GtkComboBoxText* _tmp13_ = NULL;
 			GtkComboBoxText* _tmp14_ = NULL;
 			GtkEntry* _tmp15_ = NULL;
 			GtkEntry* _tmp16_ = NULL;
 			GtkCheckButton* _tmp17_ = NULL;
-			GtkComboBox* _tmp18_ = NULL;
-#line 598 "/home/jens/Source/shotwell/src/Printing.vala"
+			GtkComboBoxText* _tmp18_ = NULL;
+#line 570 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp13_ = self->priv->standard_sizes_combo;
-#line 598 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 570 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 599 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp14_ = self->priv->units_combo;
-#line 599 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 571 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 600 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 572 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp15_ = self->priv->custom_width_entry;
-#line 600 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 572 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 601 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp16_ = self->priv->custom_height_entry;
-#line 601 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 573 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 602 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 574 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp17_ = self->priv->aspect_ratio_check;
-#line 602 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 574 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), FALSE);
-#line 603 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 575 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp18_ = self->priv->image_per_page_combo;
-#line 603 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 575 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), TRUE);
-#line 604 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 576 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4293 "Printing.c"
+#line 3982 "Printing.c"
 		}
 		default:
 		{
-#line 607 "/home/jens/Source/shotwell/src/Printing.vala"
-			g_error ("Printing.vala:607: unknown ContentLayout enumeration value");
-#line 4299 "Printing.c"
+#line 579 "/home/jens/Source/shotwell/src/Printing.vala"
+			g_error ("Printing.vala:579: unknown ContentLayout enumeration value");
+#line 3988 "Printing.c"
 		}
 	}
 }
@@ -4307,98 +3996,90 @@ static gboolean custom_print_tab_standard_sizes_combo_separator_func (GtkTreeMod
 	GtkTreeModel* _tmp0_ = NULL;
 	GtkTreeIter _tmp1_ = {0};
 	GValue _tmp2_ = {0};
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gboolean _tmp5_ = FALSE;
-#line 611 "/home/jens/Source/shotwell/src/Printing.vala"
+	const gchar* _tmp3_ = NULL;
+#line 583 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 611 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 583 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = model;
-#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = *iter;
-#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_tree_model_get_value (_tmp0_, &_tmp1_, 0, &_tmp2_);
-#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 586 "/home/jens/Source/shotwell/src/Printing.vala"
 	val = _tmp2_;
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp3_ = g_value_dup_string (&val);
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp4_ = _tmp3_;
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp5_ = g_strcmp0 (_tmp4_, "-") == 0;
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_free0 (_tmp4_);
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
-	result = _tmp5_;
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 588 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp3_ = g_value_get_string (&val);
+#line 588 "/home/jens/Source/shotwell/src/Printing.vala"
+	result = g_strcmp0 (_tmp3_, "-") == 0;
+#line 588 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 588 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4342 "Printing.c"
+#line 4023 "Printing.c"
 }
 
 
 static void custom_print_tab_set_content_layout (CustomPrintTab* self, ContentLayout content_layout) {
 	ContentLayout _tmp0_ = 0;
 	ContentLayout _tmp1_ = 0;
-#line 619 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 591 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 620 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 592 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = content_layout;
-#line 620 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 592 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_set_content_layout_control_state (self, _tmp0_);
-#line 621 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = content_layout;
-#line 621 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 	switch (_tmp1_) {
-#line 621 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_STANDARD_SIZE:
-#line 4361 "Printing.c"
+#line 4042 "Printing.c"
 		{
 			GtkRadioButton* _tmp2_ = NULL;
-#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 595 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp2_ = self->priv->standard_size_radio;
-#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 595 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 624 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 596 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4370 "Printing.c"
+#line 4051 "Printing.c"
 		}
-#line 621 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 4374 "Printing.c"
+#line 4055 "Printing.c"
 		{
 			GtkRadioButton* _tmp3_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 599 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp3_ = self->priv->custom_size_radio;
-#line 627 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 599 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 628 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 600 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4383 "Printing.c"
+#line 4064 "Printing.c"
 		}
-#line 621 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 593 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 4387 "Printing.c"
+#line 4068 "Printing.c"
 		{
 			GtkRadioButton* _tmp4_ = NULL;
-#line 631 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 603 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp4_ = self->priv->image_per_page_radio;
-#line 631 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 603 "/home/jens/Source/shotwell/src/Printing.vala"
 			gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton), TRUE);
-#line 632 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 604 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 4396 "Printing.c"
+#line 4077 "Printing.c"
 		}
 		default:
 		{
-#line 635 "/home/jens/Source/shotwell/src/Printing.vala"
-			g_error ("Printing.vala:635: unknown ContentLayout enumeration value");
-#line 4402 "Printing.c"
+#line 607 "/home/jens/Source/shotwell/src/Printing.vala"
+			g_error ("Printing.vala:607: unknown ContentLayout enumeration value");
+#line 4083 "Printing.c"
 		}
 	}
 }
@@ -4412,48 +4093,48 @@ static ContentLayout custom_print_tab_get_content_layout (CustomPrintTab* self)
 	gboolean _tmp3_ = FALSE;
 	GtkRadioButton* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 639 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 611 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
-#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 612 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->standard_size_radio;
-#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 612 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 612 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_) {
-#line 641 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 613 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = CONTENT_LAYOUT_STANDARD_SIZE;
-#line 641 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 613 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 4428 "Printing.c"
+#line 4109 "Printing.c"
 	}
-#line 642 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->custom_size_radio;
-#line 642 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 642 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 614 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_) {
-#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 615 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = CONTENT_LAYOUT_CUSTOM_SIZE;
-#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 615 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 4440 "Printing.c"
+#line 4121 "Printing.c"
 	}
-#line 644 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = self->priv->image_per_page_radio;
-#line 644 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 644 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 616 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp5_) {
-#line 645 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 617 "/home/jens/Source/shotwell/src/Printing.vala"
 		result = CONTENT_LAYOUT_IMAGE_PER_PAGE;
-#line 645 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 617 "/home/jens/Source/shotwell/src/Printing.vala"
 		return result;
-#line 4452 "Printing.c"
+#line 4133 "Printing.c"
 	}
-#line 647 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_error ("Printing.vala:647: inconsistent content layout radio button group stat" \
+#line 619 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_error ("Printing.vala:619: inconsistent content layout radio button group stat" \
 "e");
-#line 4456 "Printing.c"
+#line 4137 "Printing.c"
 }
 
 
@@ -4467,21 +4148,21 @@ static void custom_print_tab_set_content_width (CustomPrintTab* self, Measuremen
 	Measurement _tmp15_ = {0};
 	gchar* _tmp16_ = NULL;
 	gchar* _tmp17_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 622 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 650 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 622 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (content_width != NULL);
-#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = *content_width;
-#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _tmp0_.unit;
-#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->local_content_height;
-#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = _tmp2_.unit;
-#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 623 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ != _tmp3_) {
-#line 4484 "Printing.c"
+#line 4165 "Printing.c"
 		Measurement _tmp4_ = {0};
 		MeasurementUnit _tmp5_ = 0;
 		Measurement _tmp6_ = {0};
@@ -4491,65 +4172,65 @@ static void custom_print_tab_set_content_width (CustomPrintTab* self, Measuremen
 		Measurement _tmp10_ = {0};
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 652 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 624 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *content_width;
-#line 652 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 624 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = _tmp4_.unit;
-#line 652 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 624 "/home/jens/Source/shotwell/src/Printing.vala"
 		custom_print_tab_set_user_unit_choice (self, _tmp5_);
-#line 653 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 625 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = *content_width;
-#line 653 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 625 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp7_ = _tmp6_.unit;
-#line 653 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 625 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_convert_to (&self->priv->local_content_height, _tmp7_, &_tmp8_);
-#line 653 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 625 "/home/jens/Source/shotwell/src/Printing.vala"
 		self->priv->local_content_height = _tmp8_;
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = self->priv->custom_height_entry;
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp10_ = self->priv->local_content_height;
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp11_ = custom_print_tab_format_measurement (self, &_tmp10_);
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp12_ = _tmp11_;
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp9_, _tmp12_);
-#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 626 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp12_);
-#line 4520 "Printing.c"
+#line 4201 "Printing.c"
 	}
-#line 656 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 628 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = *content_width;
-#line 656 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 628 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->local_content_width = _tmp13_;
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = self->priv->custom_width_entry;
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = *content_width;
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16_ = custom_print_tab_format_measurement (self, &_tmp15_);
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _tmp16_;
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp14_, _tmp17_);
-#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 629 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp17_);
-#line 4538 "Printing.c"
+#line 4219 "Printing.c"
 }
 
 
 static void custom_print_tab_get_content_width (CustomPrintTab* self, Measurement* result) {
 	Measurement _tmp0_ = {0};
-#line 660 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 632 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 661 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 633 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->local_content_width;
-#line 661 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 633 "/home/jens/Source/shotwell/src/Printing.vala"
 	*result = _tmp0_;
-#line 661 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 633 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 4552 "Printing.c"
+#line 4233 "Printing.c"
 }
 
 
@@ -4563,21 +4244,21 @@ static void custom_print_tab_set_content_height (CustomPrintTab* self, Measureme
 	Measurement _tmp15_ = {0};
 	gchar* _tmp16_ = NULL;
 	gchar* _tmp17_ = NULL;
-#line 664 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 636 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 664 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 636 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (content_height != NULL);
-#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 637 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = *content_height;
-#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 637 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _tmp0_.unit;
-#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 637 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->local_content_width;
-#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 637 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = _tmp2_.unit;
-#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 637 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp1_ != _tmp3_) {
-#line 4580 "Printing.c"
+#line 4261 "Printing.c"
 		Measurement _tmp4_ = {0};
 		MeasurementUnit _tmp5_ = 0;
 		Measurement _tmp6_ = {0};
@@ -4587,65 +4268,65 @@ static void custom_print_tab_set_content_height (CustomPrintTab* self, Measureme
 		Measurement _tmp10_ = {0};
 		gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 638 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = *content_height;
-#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 638 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = _tmp4_.unit;
-#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 638 "/home/jens/Source/shotwell/src/Printing.vala"
 		custom_print_tab_set_user_unit_choice (self, _tmp5_);
-#line 667 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 639 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = *content_height;
-#line 667 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 639 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp7_ = _tmp6_.unit;
-#line 667 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 639 "/home/jens/Source/shotwell/src/Printing.vala"
 		measurement_convert_to (&self->priv->local_content_width, _tmp7_, &_tmp8_);
-#line 667 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 639 "/home/jens/Source/shotwell/src/Printing.vala"
 		self->priv->local_content_width = _tmp8_;
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = self->priv->custom_width_entry;
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp10_ = self->priv->local_content_width;
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp11_ = custom_print_tab_format_measurement (self, &_tmp10_);
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp12_ = _tmp11_;
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_entry_set_text (_tmp9_, _tmp12_);
-#line 668 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 640 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp12_);
-#line 4616 "Printing.c"
+#line 4297 "Printing.c"
 	}
-#line 670 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 642 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = *content_height;
-#line 670 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 642 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->local_content_height = _tmp13_;
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = self->priv->custom_height_entry;
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = *content_height;
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16_ = custom_print_tab_format_measurement (self, &_tmp15_);
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _tmp16_;
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp14_, _tmp17_);
-#line 671 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 643 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp17_);
-#line 4634 "Printing.c"
+#line 4315 "Printing.c"
 }
 
 
 static void custom_print_tab_get_content_height (CustomPrintTab* self, Measurement* result) {
 	Measurement _tmp0_ = {0};
-#line 674 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 646 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 675 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 647 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->local_content_height;
-#line 675 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 647 "/home/jens/Source/shotwell/src/Printing.vala"
 	*result = _tmp0_;
-#line 675 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 647 "/home/jens/Source/shotwell/src/Printing.vala"
 	return;
-#line 4648 "Printing.c"
+#line 4329 "Printing.c"
 }
 
 
@@ -4656,155 +4337,155 @@ static void custom_print_tab_set_content_ppi (CustomPrintTab* self, gint content
 	gint _tmp3_ = 0;
 	gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
-#line 678 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 650 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 679 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = content_ppi;
-#line 679 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = CLAMP (_tmp0_, PRINT_SETTINGS_MIN_CONTENT_PPI, PRINT_SETTINGS_MAX_CONTENT_PPI);
-#line 679 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 651 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->local_content_ppi = _tmp1_;
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->ppi_entry;
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->local_content_ppi;
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = g_strdup_printf ("%d", _tmp3_);
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_entry_set_text (_tmp2_, _tmp5_);
-#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 654 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp5_);
-#line 4679 "Printing.c"
+#line 4360 "Printing.c"
 }
 
 
 static gint custom_print_tab_get_content_ppi (CustomPrintTab* self) {
 	gint result = 0;
 	gint _tmp0_ = 0;
-#line 685 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 657 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
-#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 658 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->local_content_ppi;
-#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 658 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp0_;
-#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 658 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4694 "Printing.c"
+#line 4375 "Printing.c"
 }
 
 
 static void custom_print_tab_set_image_per_page_selection (CustomPrintTab* self, gint image_per_page) {
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 689 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 661 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 690 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 662 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->image_per_page_combo;
-#line 690 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 662 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = image_per_page;
-#line 690 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_active (_tmp0_, _tmp1_);
-#line 4709 "Printing.c"
+#line 662 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), _tmp1_);
+#line 4390 "Printing.c"
 }
 
 
 static gint custom_print_tab_get_image_per_page_selection (CustomPrintTab* self) {
 	gint result = 0;
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 693 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 665 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
-#line 694 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->image_per_page_combo;
-#line 694 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp1_ = gtk_combo_box_get_active (_tmp0_);
-#line 694 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
+#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 694 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 666 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4727 "Printing.c"
+#line 4408 "Printing.c"
 }
 
 
 static void custom_print_tab_set_size_selection (CustomPrintTab* self, gint size_selection) {
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 697 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 669 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 698 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 670 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->standard_sizes_combo;
-#line 698 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 670 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = size_selection;
-#line 698 "/home/jens/Source/shotwell/src/Printing.vala"
-	gtk_combo_box_set_active (_tmp0_, _tmp1_);
-#line 4742 "Printing.c"
+#line 670 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_combo_box_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox), _tmp1_);
+#line 4423 "Printing.c"
 }
 
 
 static gint custom_print_tab_get_size_selection (CustomPrintTab* self) {
 	gint result = 0;
-	GtkComboBox* _tmp0_ = NULL;
+	GtkComboBoxText* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 701 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 673 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), 0);
-#line 702 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 674 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->standard_sizes_combo;
-#line 702 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp1_ = gtk_combo_box_get_active (_tmp0_);
-#line 702 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 674 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp1_ = gtk_combo_box_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_combo_box_get_type (), GtkComboBox));
+#line 674 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 702 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 674 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4760 "Printing.c"
+#line 4441 "Printing.c"
 }
 
 
 static void custom_print_tab_set_match_aspect_ratio_enabled (CustomPrintTab* self, gboolean enable_state) {
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 705 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 677 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 706 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 678 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->aspect_ratio_check;
-#line 706 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 678 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = enable_state;
-#line 706 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 678 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp1_);
-#line 4775 "Printing.c"
+#line 4456 "Printing.c"
 }
 
 
 static void custom_print_tab_set_print_titles_enabled (CustomPrintTab* self, gboolean print_titles) {
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 709 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 681 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 710 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->title_print_check;
-#line 710 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = print_titles;
-#line 710 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 682 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_toggle_button_set_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton), _tmp1_);
-#line 4790 "Printing.c"
+#line 4471 "Printing.c"
 }
 
 
 static void custom_print_tab_set_print_titles_font (CustomPrintTab* self, const gchar* fontname) {
 	GtkFontButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
-#line 713 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 685 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_CUSTOM_PRINT_TAB (self));
-#line 713 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 685 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (fontname != NULL);
-#line 714 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->title_print_font;
-#line 714 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = fontname;
-#line 714 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 686 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_font_button_set_font_name (_tmp0_, _tmp1_);
-#line 4807 "Printing.c"
+#line 4488 "Printing.c"
 }
 
 
@@ -4812,17 +4493,17 @@ static gboolean custom_print_tab_is_match_aspect_ratio_enabled (CustomPrintTab*
 	gboolean result = FALSE;
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 718 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 690 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
-#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 691 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->aspect_ratio_check;
-#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 691 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 691 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 691 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4825 "Printing.c"
+#line 4506 "Printing.c"
 }
 
 
@@ -4830,17 +4511,17 @@ static gboolean custom_print_tab_is_print_titles_enabled (CustomPrintTab* self)
 	gboolean result = FALSE;
 	GtkCheckButton* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 722 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 694 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), FALSE);
-#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 695 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->title_print_check;
-#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 695 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_toggle_button_get_active (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_toggle_button_get_type (), GtkToggleButton));
-#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 695 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 695 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4843 "Printing.c"
+#line 4524 "Printing.c"
 }
 
 
@@ -4849,19 +4530,19 @@ static gchar* custom_print_tab_get_print_titles_font (CustomPrintTab* self) {
 	GtkFontButton* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 726 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 698 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
-#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 699 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->title_print_font;
-#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 699 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_font_button_get_font_name (_tmp0_);
-#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 699 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 699 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp2_;
-#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 699 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4864 "Printing.c"
+#line 4545 "Printing.c"
 }
 
 
@@ -4869,17 +4550,17 @@ PrintJob* custom_print_tab_get_source_job (CustomPrintTab* self) {
 	PrintJob* result = NULL;
 	PrintJob* _tmp0_ = NULL;
 	PrintJob* _tmp1_ = NULL;
-#line 730 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 702 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
-#line 731 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 703 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->source_job;
-#line 731 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 703 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 731 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 703 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 731 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 703 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4882 "Printing.c"
+#line 4563 "Printing.c"
 }
 
 
@@ -4897,143 +4578,148 @@ PrintSettings* custom_print_tab_get_local_settings (CustomPrintTab* self) {
 	gboolean _tmp8_ = FALSE;
 	gchar* _tmp9_ = NULL;
 	gchar* _tmp10_ = NULL;
-#line 734 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 706 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_CUSTOM_PRINT_TAB (self), NULL);
-#line 735 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 707 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = print_settings_new ();
-#line 735 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 707 "/home/jens/Source/shotwell/src/Printing.vala"
 	_result_ = _tmp0_;
-#line 737 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 709 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_get_content_width (self, &_tmp1_);
-#line 737 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 709 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_content_width (_result_, &_tmp1_);
-#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 710 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_get_content_height (self, &_tmp2_);
-#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 710 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_content_height (_result_, &_tmp2_);
-#line 739 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 711 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = custom_print_tab_get_content_layout (self);
-#line 739 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 711 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_content_layout (_result_, _tmp3_);
-#line 740 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 712 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = custom_print_tab_get_content_ppi (self);
-#line 740 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 712 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_content_ppi (_result_, _tmp4_);
-#line 741 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 713 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = custom_print_tab_get_image_per_page_selection (self);
-#line 741 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 713 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_image_per_page_selection (_result_, _tmp5_);
-#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 714 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = custom_print_tab_get_size_selection (self);
-#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 714 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_size_selection (_result_, _tmp6_);
-#line 743 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 715 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = custom_print_tab_is_match_aspect_ratio_enabled (self);
-#line 743 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 715 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_match_aspect_ratio_enabled (_result_, _tmp7_);
-#line 744 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 716 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = custom_print_tab_is_print_titles_enabled (self);
-#line 744 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 716 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_print_titles_enabled (_result_, _tmp8_);
-#line 745 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 717 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = custom_print_tab_get_print_titles_font (self);
-#line 745 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 717 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 745 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 717 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_set_print_titles_font (_result_, _tmp10_);
-#line 745 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 717 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp10_);
-#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _result_;
-#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 719 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 4950 "Printing.c"
+#line 4631 "Printing.c"
 }
 
 
 static void custom_print_tab_class_init (CustomPrintTabClass * klass) {
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+	gint CustomPrintTab_private_offset;
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	custom_print_tab_parent_class = g_type_class_peek_parent (klass);
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_type_class_add_private (klass, sizeof (CustomPrintTabPrivate));
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_OBJECT_CLASS (klass)->finalize = custom_print_tab_finalize;
-#line 4961 "Printing.c"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	CustomPrintTab_private_offset = g_type_class_get_instance_private_offset (klass);
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/Shotwell/ui/printing_widget.ui");
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "standard_size_radio", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, standard_size_radio));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "custom_size_radio", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, custom_size_radio));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "image_per_page_radio", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, image_per_page_radio));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "image_per_page_combo", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, image_per_page_combo));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "standard_sizes_combo", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, standard_sizes_combo));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "units_combo", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, units_combo));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "custom_width_entry", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, custom_width_entry));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "custom_height_entry", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, custom_height_entry));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "ppi_entry", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, ppi_entry));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "aspect_ratio_check", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, aspect_ratio_check));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "title_print_check", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, title_print_check));
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_class_bind_template_child_full (GTK_WIDGET_CLASS (klass), "title_print_font", FALSE, CustomPrintTab_private_offset + G_STRUCT_OFFSET (CustomPrintTabPrivate, title_print_font));
+#line 4671 "Printing.c"
 }
 
 
 static void custom_print_tab_instance_init (CustomPrintTab * self) {
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv = CUSTOM_PRINT_TAB_GET_PRIVATE (self);
-#line 272 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_image_settings_pane = NULL;
-#line 273 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->standard_size_radio = NULL;
-#line 274 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_size_radio = NULL;
-#line 275 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->image_per_page_radio = NULL;
-#line 276 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->image_per_page_combo = NULL;
-#line 277 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->standard_sizes_combo = NULL;
-#line 278 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->units_combo = NULL;
-#line 279 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_width_entry = NULL;
-#line 280 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->custom_height_entry = NULL;
-#line 282 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->aspect_ratio_check = NULL;
-#line 283 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->title_print_check = NULL;
-#line 284 "/home/jens/Source/shotwell/src/Printing.vala"
-	self->priv->title_print_font = NULL;
-#line 285 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 298 "/home/jens/Source/shotwell/src/Printing.vala"
 	measurement_init (&self->priv->local_content_width, 5.0, MEASUREMENT_UNIT_INCHES);
-#line 286 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 299 "/home/jens/Source/shotwell/src/Printing.vala"
 	measurement_init (&self->priv->local_content_height, 5.0, MEASUREMENT_UNIT_INCHES);
-#line 288 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 301 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->is_text_insertion_in_progress = FALSE;
-#line 4998 "Printing.c"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
+	gtk_widget_init_template (GTK_WIDGET (self));
+#line 4686 "Printing.c"
 }
 
 
 static void custom_print_tab_finalize (GObject* obj) {
 	CustomPrintTab * self;
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_CUSTOM_PRINT_TAB, CustomPrintTab);
-#line 272 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->custom_image_settings_pane);
-#line 273 "/home/jens/Source/shotwell/src/Printing.vala"
-	_g_object_unref0 (self->priv->standard_size_radio);
 #line 274 "/home/jens/Source/shotwell/src/Printing.vala"
+	_g_object_unref0 (self->priv->standard_size_radio);
+#line 276 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->custom_size_radio);
-#line 275 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 278 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->image_per_page_radio);
-#line 276 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 280 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->image_per_page_combo);
-#line 277 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 282 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->standard_sizes_combo);
-#line 278 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 284 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->units_combo);
-#line 279 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 286 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->custom_width_entry);
-#line 280 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 288 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->custom_height_entry);
-#line 281 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 290 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->ppi_entry);
-#line 282 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 292 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->aspect_ratio_check);
-#line 283 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 294 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->title_print_check);
-#line 284 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 296 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->title_print_font);
-#line 289 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 302 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->source_job);
-#line 268 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 269 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_OBJECT_CLASS (custom_print_tab_parent_class)->finalize (obj);
-#line 5036 "Printing.c"
+#line 4722 "Printing.c"
 }
 
 
@@ -5042,7 +4728,7 @@ GType custom_print_tab_get_type (void) {
 	if (g_once_init_enter (&custom_print_tab_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (CustomPrintTabClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) custom_print_tab_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (CustomPrintTab), 0, (GInstanceInitFunc) custom_print_tab_instance_init, NULL };
 		GType custom_print_tab_type_id;
-		custom_print_tab_type_id = g_type_register_static (gtk_fixed_get_type (), "CustomPrintTab", &g_define_type_info, 0);
+		custom_print_tab_type_id = g_type_register_static (gtk_box_get_type (), "CustomPrintTab", &g_define_type_info, 0);
 		g_once_init_leave (&custom_print_tab_type_id__volatile, custom_print_tab_type_id);
 	}
 	return custom_print_tab_type_id__volatile;
@@ -5064,68 +4750,68 @@ PrintJob* print_job_construct (GType object_type, GeeCollection* to_print) {
 	gdouble _tmp9_ = 0.0;
 	gdouble _tmp10_ = 0.0;
 	gdouble _tmp11_ = 0.0;
-#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (to_print), NULL);
-#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = (PrintJob*) g_object_new (object_type, NULL);
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = print_manager_get_instance ();
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _tmp0_;
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = print_manager_get_global_settings (_tmp1_);
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->settings = _tmp2_;
-#line 756 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 728 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_manager_unref0 (_tmp1_);
-#line 757 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 729 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->photos;
-#line 757 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 729 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = to_print;
-#line 757 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 729 "/home/jens/Source/shotwell/src/Printing.vala"
 	gee_array_list_add_all (_tmp3_, _tmp4_);
-#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 731 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_embed_page_setup (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_print_operation_get_type (), GtkPrintOperation), TRUE);
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = self->priv->photos;
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = (Photo*) _tmp6_;
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp8_);
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = dimensions_get_aspect_ratio (&_tmp8_);
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp7_);
-#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 732 "/home/jens/Source/shotwell/src/Printing.vala"
 	photo_aspect_ratio = _tmp10_;
-#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 733 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = photo_aspect_ratio;
-#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 733 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp11_ < 1.0) {
-#line 5111 "Printing.c"
+#line 4797 "Printing.c"
 		gdouble _tmp12_ = 0.0;
-#line 762 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 734 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp12_ = photo_aspect_ratio;
-#line 762 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 734 "/home/jens/Source/shotwell/src/Printing.vala"
 		photo_aspect_ratio = 1.0 / _tmp12_;
-#line 5117 "Printing.c"
+#line 4803 "Printing.c"
 	}
-#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 5121 "Printing.c"
+#line 4807 "Printing.c"
 }
 
 
 PrintJob* print_job_new (GeeCollection* to_print) {
-#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 727 "/home/jens/Source/shotwell/src/Printing.vala"
 	return print_job_construct (TYPE_PRINT_JOB, to_print);
-#line 5128 "Printing.c"
+#line 4814 "Printing.c"
 }
 
 
@@ -5133,17 +4819,17 @@ GeeList* print_job_get_photos (PrintJob* self) {
 	GeeList* result = NULL;
 	GeeArrayList* _tmp0_ = NULL;
 	GeeList* _tmp1_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 737 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), NULL);
-#line 766 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->photos;
-#line 766 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_LIST, GeeList));
-#line 766 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 766 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 738 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 5146 "Printing.c"
+#line 4832 "Printing.c"
 }
 
 
@@ -5151,17 +4837,17 @@ Photo* print_job_get_source_photo (PrintJob* self) {
 	Photo* result = NULL;
 	GeeArrayList* _tmp0_ = NULL;
 	gpointer _tmp1_ = NULL;
-#line 769 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 741 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), NULL);
-#line 770 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->photos;
-#line 770 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 770 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = (Photo*) _tmp1_;
-#line 770 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 742 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 5164 "Printing.c"
+#line 4850 "Printing.c"
 }
 
 
@@ -5176,55 +4862,55 @@ gdouble print_job_get_source_aspect_ratio (PrintJob* self) {
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
 	gdouble _tmp7_ = 0.0;
-#line 773 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 745 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), 0.0);
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->photos;
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), 0);
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = (Photo*) _tmp1_;
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = dimensions_get_aspect_ratio (&_tmp3_);
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp2_);
-#line 774 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 746 "/home/jens/Source/shotwell/src/Printing.vala"
 	aspect_ratio = _tmp5_;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = aspect_ratio;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp7_ < 1.0) {
-#line 5201 "Printing.c"
+#line 4887 "Printing.c"
 		gdouble _tmp8_ = 0.0;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp8_ = aspect_ratio;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = 1.0 / _tmp8_;
-#line 5207 "Printing.c"
+#line 4893 "Printing.c"
 	} else {
 		gdouble _tmp9_ = 0.0;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp9_ = aspect_ratio;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = _tmp9_;
-#line 5214 "Printing.c"
+#line 4900 "Printing.c"
 	}
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp6_;
-#line 775 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 747 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 5220 "Printing.c"
+#line 4906 "Printing.c"
 }
 
 
 static gpointer _print_settings_ref0 (gpointer self) {
-#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? print_settings_ref (self) : NULL;
-#line 5227 "Printing.c"
+#line 4913 "Printing.c"
 }
 
 
@@ -5232,73 +4918,73 @@ PrintSettings* print_job_get_local_settings (PrintJob* self) {
 	PrintSettings* result = NULL;
 	PrintSettings* _tmp0_ = NULL;
 	PrintSettings* _tmp1_ = NULL;
-#line 778 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 750 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_JOB (self), NULL);
-#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->settings;
-#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _print_settings_ref0 (_tmp0_);
-#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 5245 "Printing.c"
+#line 4931 "Printing.c"
 }
 
 
 void print_job_set_local_settings (PrintJob* self, PrintSettings* settings) {
 	PrintSettings* _tmp0_ = NULL;
 	PrintSettings* _tmp1_ = NULL;
-#line 782 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 754 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_JOB (self));
-#line 782 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 754 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (settings));
-#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = settings;
-#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _print_settings_ref0 (_tmp0_);
-#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 755 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->settings = _tmp1_;
-#line 5264 "Printing.c"
+#line 4950 "Printing.c"
 }
 
 
 static void print_job_class_init (PrintJobClass * klass) {
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_job_parent_class = g_type_class_peek_parent (klass);
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_type_class_add_private (klass, sizeof (PrintJobPrivate));
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_OBJECT_CLASS (klass)->finalize = print_job_finalize;
-#line 5275 "Printing.c"
+#line 4961 "Printing.c"
 }
 
 
 static void print_job_instance_init (PrintJob * self) {
 	GeeArrayList* _tmp0_ = NULL;
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv = PRINT_JOB_GET_PRIVATE (self);
-#line 753 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 725 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = gee_array_list_new (TYPE_PHOTO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 753 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 725 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->photos = _tmp0_;
-#line 5287 "Printing.c"
+#line 4973 "Printing.c"
 }
 
 
 static void print_job_finalize (GObject* obj) {
 	PrintJob * self;
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PRINT_JOB, PrintJob);
-#line 752 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 724 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 753 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 725 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->photos);
-#line 751 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 723 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_OBJECT_CLASS (print_job_parent_class)->finalize (obj);
-#line 5301 "Printing.c"
+#line 4987 "Printing.c"
 }
 
 
@@ -5320,248 +5006,248 @@ StandardPrintSize* standard_print_size_construct (GType object_type, const gchar
 	gchar* _tmp1_ = NULL;
 	Measurement _tmp2_ = {0};
 	Measurement _tmp3_ = {0};
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (width != NULL, NULL);
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (height != NULL, NULL);
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = (StandardPrintSize*) g_type_create_instance (object_type);
-#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = name;
-#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (self->name);
-#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 761 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->name = _tmp1_;
-#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 762 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = *width;
-#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 762 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->width = _tmp2_;
-#line 791 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 763 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = *height;
-#line 791 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 763 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->height = _tmp3_;
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 5349 "Printing.c"
+#line 5035 "Printing.c"
 }
 
 
 StandardPrintSize* standard_print_size_new (const gchar* name, Measurement* width, Measurement* height) {
-#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 760 "/home/jens/Source/shotwell/src/Printing.vala"
 	return standard_print_size_construct (TYPE_STANDARD_PRINT_SIZE, name, width, height);
-#line 5356 "Printing.c"
+#line 5042 "Printing.c"
 }
 
 
 static void value_standard_print_size_init (GValue* value) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	value->data[0].v_pointer = NULL;
-#line 5363 "Printing.c"
+#line 5049 "Printing.c"
 }
 
 
 static void value_standard_print_size_free_value (GValue* value) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (value->data[0].v_pointer) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_unref (value->data[0].v_pointer);
-#line 5372 "Printing.c"
+#line 5058 "Printing.c"
 	}
 }
 
 
 static void value_standard_print_size_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = standard_print_size_ref (src_value->data[0].v_pointer);
-#line 5382 "Printing.c"
+#line 5068 "Printing.c"
 	} else {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 5386 "Printing.c"
+#line 5072 "Printing.c"
 	}
 }
 
 
 static gpointer value_standard_print_size_peek_pointer (const GValue* value) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 5394 "Printing.c"
+#line 5080 "Printing.c"
 }
 
 
 static gchar* value_standard_print_size_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (collect_values[0].v_pointer) {
-#line 5401 "Printing.c"
+#line 5087 "Printing.c"
 		StandardPrintSize* object;
 		object = collect_values[0].v_pointer;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 5408 "Printing.c"
+#line 5094 "Printing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.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 5412 "Printing.c"
+#line 5098 "Printing.c"
 		}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = standard_print_size_ref (object);
-#line 5416 "Printing.c"
+#line 5102 "Printing.c"
 	} else {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5420 "Printing.c"
+#line 5106 "Printing.c"
 	}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 5424 "Printing.c"
+#line 5110 "Printing.c"
 }
 
 
 static gchar* value_standard_print_size_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	StandardPrintSize** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!object_p) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 5435 "Printing.c"
+#line 5121 "Printing.c"
 	}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!value->data[0].v_pointer) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = NULL;
-#line 5441 "Printing.c"
+#line 5127 "Printing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 5445 "Printing.c"
+#line 5131 "Printing.c"
 	} else {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = standard_print_size_ref (value->data[0].v_pointer);
-#line 5449 "Printing.c"
+#line 5135 "Printing.c"
 	}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 5453 "Printing.c"
+#line 5139 "Printing.c"
 }
 
 
 GParamSpec* param_spec_standard_print_size (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecStandardPrintSize* spec;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_STANDARD_PRINT_SIZE), NULL);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return G_PARAM_SPEC (spec);
-#line 5467 "Printing.c"
+#line 5153 "Printing.c"
 }
 
 
 gpointer value_get_standard_print_size (const GValue* value) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE), NULL);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 5476 "Printing.c"
+#line 5162 "Printing.c"
 }
 
 
 void value_set_standard_print_size (GValue* value, gpointer v_object) {
 	StandardPrintSize* old;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	old = value->data[0].v_pointer;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (v_object) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_STANDARD_PRINT_SIZE));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_ref (value->data[0].v_pointer);
-#line 5496 "Printing.c"
+#line 5182 "Printing.c"
 	} else {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5500 "Printing.c"
+#line 5186 "Printing.c"
 	}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_unref (old);
-#line 5506 "Printing.c"
+#line 5192 "Printing.c"
 	}
 }
 
 
 void value_take_standard_print_size (GValue* value, gpointer v_object) {
 	StandardPrintSize* old;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_STANDARD_PRINT_SIZE));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	old = value->data[0].v_pointer;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (v_object) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_STANDARD_PRINT_SIZE));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 5525 "Printing.c"
+#line 5211 "Printing.c"
 	} else {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 5529 "Printing.c"
+#line 5215 "Printing.c"
 	}
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		standard_print_size_unref (old);
-#line 5535 "Printing.c"
+#line 5221 "Printing.c"
 	}
 }
 
 
 static void standard_print_size_class_init (StandardPrintSizeClass * klass) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	standard_print_size_parent_class = g_type_class_peek_parent (klass);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	((StandardPrintSizeClass *) klass)->finalize = standard_print_size_finalize;
-#line 5545 "Printing.c"
+#line 5231 "Printing.c"
 }
 
 
 static void standard_print_size_instance_init (StandardPrintSize * self) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->ref_count = 1;
-#line 5552 "Printing.c"
+#line 5238 "Printing.c"
 }
 
 
 static void standard_print_size_finalize (StandardPrintSize* obj) {
 	StandardPrintSize * self;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_STANDARD_PRINT_SIZE, StandardPrintSize);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_handlers_destroy (self);
-#line 794 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 766 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (self->name);
-#line 5564 "Printing.c"
+#line 5250 "Printing.c"
 }
 
 
@@ -5582,24 +5268,24 @@ GType standard_print_size_get_type (void) {
 gpointer standard_print_size_ref (gpointer instance) {
 	StandardPrintSize* self;
 	self = instance;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	return instance;
-#line 5589 "Printing.c"
+#line 5275 "Printing.c"
 }
 
 
 void standard_print_size_unref (gpointer instance) {
 	StandardPrintSize* self;
 	self = instance;
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		STANDARD_PRINT_SIZE_GET_CLASS (self)->finalize (self);
-#line 787 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 759 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 5602 "Printing.c"
+#line 5288 "Printing.c"
 	}
 }
 
@@ -5608,625 +5294,641 @@ static PrintManager* print_manager_construct (GType object_type) {
 	PrintManager* self = NULL;
 	GtkPageSetup* _tmp0_ = NULL;
 	PrintSettings* _tmp1_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = (PrintManager*) g_type_create_instance (object_type);
-#line 811 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 784 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = gtk_page_setup_new ();
-#line 811 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 784 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->user_page_setup);
-#line 811 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 784 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->user_page_setup = _tmp0_;
-#line 812 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 785 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = print_settings_new ();
-#line 812 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 785 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 812 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 785 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->settings = _tmp1_;
-#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self;
-#line 5627 "Printing.c"
+#line 5313 "Printing.c"
 }
 
 
 static PrintManager* print_manager_new (void) {
-#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 783 "/home/jens/Source/shotwell/src/Printing.vala"
 	return print_manager_construct (TYPE_PRINT_MANAGER);
-#line 5634 "Printing.c"
+#line 5320 "Printing.c"
 }
 
 
 static void _vala_array_add112 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5645 "Printing.c"
+#line 5331 "Printing.c"
 	}
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5651 "Printing.c"
+#line 5337 "Printing.c"
 }
 
 
 static void _vala_array_add113 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5662 "Printing.c"
+#line 5348 "Printing.c"
 	}
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5668 "Printing.c"
+#line 5354 "Printing.c"
 }
 
 
 static void _vala_array_add114 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5679 "Printing.c"
+#line 5365 "Printing.c"
 	}
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5685 "Printing.c"
+#line 5371 "Printing.c"
 }
 
 
 static void _vala_array_add115 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5696 "Printing.c"
+#line 5382 "Printing.c"
 	}
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5702 "Printing.c"
+#line 5388 "Printing.c"
 }
 
 
 static void _vala_array_add116 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5713 "Printing.c"
+#line 5399 "Printing.c"
 	}
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5719 "Printing.c"
+#line 5405 "Printing.c"
 }
 
 
 static void _vala_array_add117 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5730 "Printing.c"
+#line 5416 "Printing.c"
 	}
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5736 "Printing.c"
+#line 5422 "Printing.c"
 }
 
 
 static void _vala_array_add118 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5747 "Printing.c"
+#line 5433 "Printing.c"
 	}
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5753 "Printing.c"
+#line 5439 "Printing.c"
 }
 
 
 static void _vala_array_add119 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5764 "Printing.c"
+#line 5450 "Printing.c"
 	}
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5770 "Printing.c"
+#line 5456 "Printing.c"
 }
 
 
 static void _vala_array_add120 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5781 "Printing.c"
+#line 5467 "Printing.c"
 	}
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5787 "Printing.c"
+#line 5473 "Printing.c"
 }
 
 
 static void _vala_array_add121 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5798 "Printing.c"
+#line 5484 "Printing.c"
 	}
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5804 "Printing.c"
+#line 5490 "Printing.c"
 }
 
 
 static void _vala_array_add122 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5815 "Printing.c"
+#line 5501 "Printing.c"
 	}
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5821 "Printing.c"
+#line 5507 "Printing.c"
 }
 
 
 static void _vala_array_add123 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5832 "Printing.c"
+#line 5518 "Printing.c"
 	}
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5838 "Printing.c"
+#line 5524 "Printing.c"
 }
 
 
 static void _vala_array_add124 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5849 "Printing.c"
+#line 5535 "Printing.c"
 	}
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5855 "Printing.c"
+#line 5541 "Printing.c"
 }
 
 
 static void _vala_array_add125 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5866 "Printing.c"
+#line 5552 "Printing.c"
 	}
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5872 "Printing.c"
+#line 5558 "Printing.c"
 }
 
 
 static void _vala_array_add126 (StandardPrintSize*** array, int* length, int* size, StandardPrintSize* value) {
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 	if ((*length) == (*size)) {
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 		*array = g_renew (StandardPrintSize*, *array, (*size) + 1);
-#line 5883 "Printing.c"
+#line 5569 "Printing.c"
 	}
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[(*length)++] = value;
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
 	(*array)[*length] = NULL;
-#line 5889 "Printing.c"
+#line 5575 "Printing.c"
 }
 
 
 StandardPrintSize** print_manager_get_standard_sizes (PrintManager* self, int* result_length1) {
 	StandardPrintSize** result = NULL;
-	StandardPrintSize** _result_ = NULL;
 	StandardPrintSize** _tmp0_ = NULL;
-	gint _result__length1 = 0;
-	gint __result__size_ = 0;
-	StandardPrintSize** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	const gchar* _tmp2_ = NULL;
-	Measurement _tmp3_ = {0};
-	Measurement _tmp4_ = {0};
-	StandardPrintSize* _tmp5_ = NULL;
-	StandardPrintSize** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	const gchar* _tmp7_ = NULL;
-	Measurement _tmp8_ = {0};
-	Measurement _tmp9_ = {0};
-	StandardPrintSize* _tmp10_ = NULL;
-	StandardPrintSize** _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	const gchar* _tmp12_ = NULL;
-	Measurement _tmp13_ = {0};
-	Measurement _tmp14_ = {0};
-	StandardPrintSize* _tmp15_ = NULL;
-	StandardPrintSize** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	const gchar* _tmp17_ = NULL;
-	Measurement _tmp18_ = {0};
-	Measurement _tmp19_ = {0};
-	StandardPrintSize* _tmp20_ = NULL;
-	StandardPrintSize** _tmp21_ = NULL;
-	gint _tmp21__length1 = 0;
-	const gchar* _tmp22_ = NULL;
-	Measurement _tmp23_ = {0};
-	Measurement _tmp24_ = {0};
-	StandardPrintSize* _tmp25_ = NULL;
-	StandardPrintSize** _tmp26_ = NULL;
-	gint _tmp26__length1 = 0;
-	const gchar* _tmp27_ = NULL;
-	Measurement _tmp28_ = {0};
-	Measurement _tmp29_ = {0};
-	StandardPrintSize* _tmp30_ = NULL;
-	StandardPrintSize** _tmp31_ = NULL;
-	gint _tmp31__length1 = 0;
-	const gchar* _tmp32_ = NULL;
-	Measurement _tmp33_ = {0};
-	Measurement _tmp34_ = {0};
-	StandardPrintSize* _tmp35_ = NULL;
-	StandardPrintSize** _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
-	Measurement _tmp37_ = {0};
-	Measurement _tmp38_ = {0};
-	StandardPrintSize* _tmp39_ = NULL;
-	StandardPrintSize** _tmp40_ = NULL;
-	gint _tmp40__length1 = 0;
-	const gchar* _tmp41_ = NULL;
-	Measurement _tmp42_ = {0};
-	Measurement _tmp43_ = {0};
-	StandardPrintSize* _tmp44_ = NULL;
-	StandardPrintSize** _tmp45_ = NULL;
-	gint _tmp45__length1 = 0;
-	const gchar* _tmp46_ = NULL;
-	Measurement _tmp47_ = {0};
-	Measurement _tmp48_ = {0};
-	StandardPrintSize* _tmp49_ = NULL;
-	StandardPrintSize** _tmp50_ = NULL;
-	gint _tmp50__length1 = 0;
-	const gchar* _tmp51_ = NULL;
-	Measurement _tmp52_ = {0};
-	Measurement _tmp53_ = {0};
-	StandardPrintSize* _tmp54_ = NULL;
-	StandardPrintSize** _tmp55_ = NULL;
-	gint _tmp55__length1 = 0;
-	const gchar* _tmp56_ = NULL;
-	Measurement _tmp57_ = {0};
-	Measurement _tmp58_ = {0};
-	StandardPrintSize* _tmp59_ = NULL;
-	StandardPrintSize** _tmp60_ = NULL;
-	gint _tmp60__length1 = 0;
-	const gchar* _tmp61_ = NULL;
-	Measurement _tmp62_ = {0};
-	Measurement _tmp63_ = {0};
-	StandardPrintSize* _tmp64_ = NULL;
-	StandardPrintSize** _tmp65_ = NULL;
-	gint _tmp65__length1 = 0;
-	const gchar* _tmp66_ = NULL;
-	Measurement _tmp67_ = {0};
-	Measurement _tmp68_ = {0};
-	StandardPrintSize* _tmp69_ = NULL;
-	StandardPrintSize** _tmp70_ = NULL;
-	gint _tmp70__length1 = 0;
-	const gchar* _tmp71_ = NULL;
-	Measurement _tmp72_ = {0};
-	Measurement _tmp73_ = {0};
-	StandardPrintSize* _tmp74_ = NULL;
-	StandardPrintSize** _tmp75_ = NULL;
-	gint _tmp75__length1 = 0;
-#line 815 "/home/jens/Source/shotwell/src/Printing.vala"
+	gint _tmp0__length1 = 0;
+	StandardPrintSize** _tmp76_ = NULL;
+	gint _tmp76__length1 = 0;
+	StandardPrintSize** _tmp77_ = NULL;
+	gint _tmp77__length1 = 0;
+#line 788 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), NULL);
+#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp0_ = self->priv->standard_sizes;
+#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+	_tmp0__length1 = self->priv->standard_sizes_length1;
+#line 789 "/home/jens/Source/shotwell/src/Printing.vala"
+	if (_tmp0_ == NULL) {
+#line 5595 "Printing.c"
+		StandardPrintSize** _tmp1_ = NULL;
+		StandardPrintSize** _tmp2_ = NULL;
+		gint _tmp2__length1 = 0;
+		const gchar* _tmp3_ = NULL;
+		Measurement _tmp4_ = {0};
+		Measurement _tmp5_ = {0};
+		StandardPrintSize* _tmp6_ = NULL;
+		StandardPrintSize** _tmp7_ = NULL;
+		gint _tmp7__length1 = 0;
+		const gchar* _tmp8_ = NULL;
+		Measurement _tmp9_ = {0};
+		Measurement _tmp10_ = {0};
+		StandardPrintSize* _tmp11_ = NULL;
+		StandardPrintSize** _tmp12_ = NULL;
+		gint _tmp12__length1 = 0;
+		const gchar* _tmp13_ = NULL;
+		Measurement _tmp14_ = {0};
+		Measurement _tmp15_ = {0};
+		StandardPrintSize* _tmp16_ = NULL;
+		StandardPrintSize** _tmp17_ = NULL;
+		gint _tmp17__length1 = 0;
+		const gchar* _tmp18_ = NULL;
+		Measurement _tmp19_ = {0};
+		Measurement _tmp20_ = {0};
+		StandardPrintSize* _tmp21_ = NULL;
+		StandardPrintSize** _tmp22_ = NULL;
+		gint _tmp22__length1 = 0;
+		const gchar* _tmp23_ = NULL;
+		Measurement _tmp24_ = {0};
+		Measurement _tmp25_ = {0};
+		StandardPrintSize* _tmp26_ = NULL;
+		StandardPrintSize** _tmp27_ = NULL;
+		gint _tmp27__length1 = 0;
+		const gchar* _tmp28_ = NULL;
+		Measurement _tmp29_ = {0};
+		Measurement _tmp30_ = {0};
+		StandardPrintSize* _tmp31_ = NULL;
+		StandardPrintSize** _tmp32_ = NULL;
+		gint _tmp32__length1 = 0;
+		const gchar* _tmp33_ = NULL;
+		Measurement _tmp34_ = {0};
+		Measurement _tmp35_ = {0};
+		StandardPrintSize* _tmp36_ = NULL;
+		StandardPrintSize** _tmp37_ = NULL;
+		gint _tmp37__length1 = 0;
+		Measurement _tmp38_ = {0};
+		Measurement _tmp39_ = {0};
+		StandardPrintSize* _tmp40_ = NULL;
+		StandardPrintSize** _tmp41_ = NULL;
+		gint _tmp41__length1 = 0;
+		const gchar* _tmp42_ = NULL;
+		Measurement _tmp43_ = {0};
+		Measurement _tmp44_ = {0};
+		StandardPrintSize* _tmp45_ = NULL;
+		StandardPrintSize** _tmp46_ = NULL;
+		gint _tmp46__length1 = 0;
+		const gchar* _tmp47_ = NULL;
+		Measurement _tmp48_ = {0};
+		Measurement _tmp49_ = {0};
+		StandardPrintSize* _tmp50_ = NULL;
+		StandardPrintSize** _tmp51_ = NULL;
+		gint _tmp51__length1 = 0;
+		const gchar* _tmp52_ = NULL;
+		Measurement _tmp53_ = {0};
+		Measurement _tmp54_ = {0};
+		StandardPrintSize* _tmp55_ = NULL;
+		StandardPrintSize** _tmp56_ = NULL;
+		gint _tmp56__length1 = 0;
+		const gchar* _tmp57_ = NULL;
+		Measurement _tmp58_ = {0};
+		Measurement _tmp59_ = {0};
+		StandardPrintSize* _tmp60_ = NULL;
+		StandardPrintSize** _tmp61_ = NULL;
+		gint _tmp61__length1 = 0;
+		const gchar* _tmp62_ = NULL;
+		Measurement _tmp63_ = {0};
+		Measurement _tmp64_ = {0};
+		StandardPrintSize* _tmp65_ = NULL;
+		StandardPrintSize** _tmp66_ = NULL;
+		gint _tmp66__length1 = 0;
+		const gchar* _tmp67_ = NULL;
+		Measurement _tmp68_ = {0};
+		Measurement _tmp69_ = {0};
+		StandardPrintSize* _tmp70_ = NULL;
+		StandardPrintSize** _tmp71_ = NULL;
+		gint _tmp71__length1 = 0;
+		const gchar* _tmp72_ = NULL;
+		Measurement _tmp73_ = {0};
+		Measurement _tmp74_ = {0};
+		StandardPrintSize* _tmp75_ = NULL;
+#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp1_ = g_new0 (StandardPrintSize*, 0 + 1);
+#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+		self->priv->standard_sizes = (_vala_array_free (self->priv->standard_sizes, self->priv->standard_sizes_length1, (GDestroyNotify) standard_print_size_unref), NULL);
+#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+		self->priv->standard_sizes = _tmp1_;
+#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+		self->priv->standard_sizes_length1 = 0;
+#line 790 "/home/jens/Source/shotwell/src/Printing.vala"
+		self->priv->_standard_sizes_size_ = self->priv->standard_sizes_length1;
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp2_ = self->priv->standard_sizes;
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp2__length1 = self->priv->standard_sizes_length1;
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp3_ = _ ("Wallet (2 × 3 in.)");
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp4_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp5_, (gdouble) 2, MEASUREMENT_UNIT_INCHES);
+#line 792 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp6_ = standard_print_size_new (_tmp3_, &_tmp4_, &_tmp5_);
+#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_, _tmp6_);
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp7_ = self->priv->standard_sizes;
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp7__length1 = self->priv->standard_sizes_length1;
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp8_ = _ ("Notecard (3 × 5 in.)");
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp9_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp10_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
+#line 795 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp11_ = standard_print_size_new (_tmp8_, &_tmp9_, &_tmp10_);
+#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_, _tmp11_);
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp12_ = self->priv->standard_sizes;
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp12__length1 = self->priv->standard_sizes_length1;
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp13_ = _ ("4 × 6 in.");
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp14_, (gdouble) 6, MEASUREMENT_UNIT_INCHES);
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp15_, (gdouble) 4, MEASUREMENT_UNIT_INCHES);
+#line 798 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp16_ = standard_print_size_new (_tmp13_, &_tmp14_, &_tmp15_);
+#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_, _tmp16_);
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp17_ = self->priv->standard_sizes;
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp17__length1 = self->priv->standard_sizes_length1;
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp18_ = _ ("5 × 7 in.");
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp19_, (gdouble) 7, MEASUREMENT_UNIT_INCHES);
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp20_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
+#line 801 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp21_ = standard_print_size_new (_tmp18_, &_tmp19_, &_tmp20_);
+#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_, _tmp21_);
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp22_ = self->priv->standard_sizes;
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp22__length1 = self->priv->standard_sizes_length1;
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp23_ = _ ("8 × 10 in.");
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp24_, (gdouble) 10, MEASUREMENT_UNIT_INCHES);
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp25_, (gdouble) 8, MEASUREMENT_UNIT_INCHES);
+#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp26_ = standard_print_size_new (_tmp23_, &_tmp24_, &_tmp25_);
+#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_, _tmp26_);
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp27_ = self->priv->standard_sizes;
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp27__length1 = self->priv->standard_sizes_length1;
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp28_ = _ ("11 × 14 in.");
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp29_, (gdouble) 14, MEASUREMENT_UNIT_INCHES);
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp30_, (gdouble) 11, MEASUREMENT_UNIT_INCHES);
+#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp31_ = standard_print_size_new (_tmp28_, &_tmp29_, &_tmp30_);
+#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_, _tmp31_);
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp32_ = self->priv->standard_sizes;
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp32__length1 = self->priv->standard_sizes_length1;
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp33_ = _ ("16 × 20 in.");
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp34_, (gdouble) 20, MEASUREMENT_UNIT_INCHES);
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp35_, (gdouble) 16, MEASUREMENT_UNIT_INCHES);
+#line 810 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp36_ = standard_print_size_new (_tmp33_, &_tmp34_, &_tmp35_);
+#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_, _tmp36_);
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp37_ = self->priv->standard_sizes;
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp37__length1 = self->priv->standard_sizes_length1;
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp38_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp39_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
+#line 813 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp40_ = standard_print_size_new ("-", &_tmp38_, &_tmp39_);
+#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_, _tmp40_);
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp0_ = g_new0 (StandardPrintSize*, 0 + 1);
+		_tmp41_ = self->priv->standard_sizes;
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-	_result_ = _tmp0_;
+		_tmp41__length1 = self->priv->standard_sizes_length1;
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-	_result__length1 = 0;
+		_tmp42_ = _ ("Metric Wallet (9 × 13 cm)");
 #line 816 "/home/jens/Source/shotwell/src/Printing.vala"
-	__result__size_ = _result__length1;
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp1_ = _result_;
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp1__length1 = _result__length1;
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp2_ = _ ("Wallet (2 × 3 in.)");
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp3_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp4_, (gdouble) 2, MEASUREMENT_UNIT_INCHES);
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp5_ = standard_print_size_new (_tmp2_, &_tmp3_, &_tmp4_);
-#line 818 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add112 (&_result_, &_result__length1, &__result__size_, _tmp5_);
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp6_ = _result_;
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp6__length1 = _result__length1;
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp7_ = _ ("Notecard (3 × 5 in.)");
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp8_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp9_, (gdouble) 3, MEASUREMENT_UNIT_INCHES);
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp10_ = standard_print_size_new (_tmp7_, &_tmp8_, &_tmp9_);
-#line 821 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add113 (&_result_, &_result__length1, &__result__size_, _tmp10_);
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp11_ = _result_;
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp11__length1 = _result__length1;
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp12_ = _ ("4 × 6 in.");
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp13_, (gdouble) 6, MEASUREMENT_UNIT_INCHES);
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp14_, (gdouble) 4, MEASUREMENT_UNIT_INCHES);
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp15_ = standard_print_size_new (_tmp12_, &_tmp13_, &_tmp14_);
-#line 824 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add114 (&_result_, &_result__length1, &__result__size_, _tmp15_);
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp16_ = _result_;
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp16__length1 = _result__length1;
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp17_ = _ ("5 × 7 in.");
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp18_, (gdouble) 7, MEASUREMENT_UNIT_INCHES);
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp19_, (gdouble) 5, MEASUREMENT_UNIT_INCHES);
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp20_ = standard_print_size_new (_tmp17_, &_tmp18_, &_tmp19_);
-#line 827 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add115 (&_result_, &_result__length1, &__result__size_, _tmp20_);
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp21_ = _result_;
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp21__length1 = _result__length1;
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp22_ = _ ("8 × 10 in.");
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp23_, (gdouble) 10, MEASUREMENT_UNIT_INCHES);
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp24_, (gdouble) 8, MEASUREMENT_UNIT_INCHES);
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp25_ = standard_print_size_new (_tmp22_, &_tmp23_, &_tmp24_);
-#line 830 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add116 (&_result_, &_result__length1, &__result__size_, _tmp25_);
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp26_ = _result_;
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp26__length1 = _result__length1;
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp27_ = _ ("11 × 14 in.");
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp28_, (gdouble) 14, MEASUREMENT_UNIT_INCHES);
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp29_, (gdouble) 11, MEASUREMENT_UNIT_INCHES);
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp30_ = standard_print_size_new (_tmp27_, &_tmp28_, &_tmp29_);
-#line 833 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add117 (&_result_, &_result__length1, &__result__size_, _tmp30_);
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp31_ = _result_;
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp31__length1 = _result__length1;
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp32_ = _ ("16 × 20 in.");
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp33_, (gdouble) 20, MEASUREMENT_UNIT_INCHES);
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp34_, (gdouble) 16, MEASUREMENT_UNIT_INCHES);
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp35_ = standard_print_size_new (_tmp32_, &_tmp33_, &_tmp34_);
-#line 836 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add118 (&_result_, &_result__length1, &__result__size_, _tmp35_);
-#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp36_ = _result_;
+		measurement_init (&_tmp43_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp44_, (gdouble) 9, MEASUREMENT_UNIT_CENTIMETERS);
+#line 816 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp45_ = standard_print_size_new (_tmp42_, &_tmp43_, &_tmp44_);
+#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_, _tmp45_);
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp46_ = self->priv->standard_sizes;
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp46__length1 = self->priv->standard_sizes_length1;
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp47_ = _ ("Postcard (10 × 15 cm)");
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp48_, (gdouble) 15, MEASUREMENT_UNIT_CENTIMETERS);
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp49_, (gdouble) 10, MEASUREMENT_UNIT_CENTIMETERS);
+#line 819 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp50_ = standard_print_size_new (_tmp47_, &_tmp48_, &_tmp49_);
+#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_, _tmp50_);
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp51_ = self->priv->standard_sizes;
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp51__length1 = self->priv->standard_sizes_length1;
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp52_ = _ ("13 × 18 cm");
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp53_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp54_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
+#line 822 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp55_ = standard_print_size_new (_tmp52_, &_tmp53_, &_tmp54_);
+#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_, _tmp55_);
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp56_ = self->priv->standard_sizes;
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp56__length1 = self->priv->standard_sizes_length1;
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp57_ = _ ("18 × 24 cm");
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp58_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp59_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
+#line 825 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp60_ = standard_print_size_new (_tmp57_, &_tmp58_, &_tmp59_);
+#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_, _tmp60_);
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp61_ = self->priv->standard_sizes;
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp61__length1 = self->priv->standard_sizes_length1;
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp62_ = _ ("20 × 30 cm");
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp63_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp64_, (gdouble) 20, MEASUREMENT_UNIT_CENTIMETERS);
+#line 828 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp65_ = standard_print_size_new (_tmp62_, &_tmp63_, &_tmp64_);
+#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_, _tmp65_);
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp66_ = self->priv->standard_sizes;
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp66__length1 = self->priv->standard_sizes_length1;
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp67_ = _ ("24 × 40 cm");
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp68_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp69_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
+#line 831 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp70_ = standard_print_size_new (_tmp67_, &_tmp68_, &_tmp69_);
+#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_, _tmp70_);
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp71_ = self->priv->standard_sizes;
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp71__length1 = self->priv->standard_sizes_length1;
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp72_ = _ ("30 × 40 cm");
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp73_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		measurement_init (&_tmp74_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
+#line 834 "/home/jens/Source/shotwell/src/Printing.vala"
+		_tmp75_ = standard_print_size_new (_tmp72_, &_tmp73_, &_tmp74_);
+#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_, _tmp75_);
+#line 5904 "Printing.c"
+	}
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp36__length1 = _result__length1;
+	_tmp76_ = self->priv->standard_sizes;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp37_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
+	_tmp76__length1 = self->priv->standard_sizes_length1;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp38_, (gdouble) 0, MEASUREMENT_UNIT_INCHES);
+	_tmp77_ = _tmp76_;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp39_ = standard_print_size_new ("-", &_tmp37_, &_tmp38_);
+	_tmp77__length1 = _tmp76__length1;
 #line 839 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add119 (&_result_, &_result__length1, &__result__size_, _tmp39_);
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp40_ = _result_;
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp40__length1 = _result__length1;
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp41_ = _ ("Metric Wallet (9 × 13 cm)");
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp42_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp43_, (gdouble) 9, MEASUREMENT_UNIT_CENTIMETERS);
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp44_ = standard_print_size_new (_tmp41_, &_tmp42_, &_tmp43_);
-#line 842 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add120 (&_result_, &_result__length1, &__result__size_, _tmp44_);
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp45_ = _result_;
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp45__length1 = _result__length1;
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp46_ = _ ("Postcard (10 × 15 cm)");
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp47_, (gdouble) 15, MEASUREMENT_UNIT_CENTIMETERS);
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp48_, (gdouble) 10, MEASUREMENT_UNIT_CENTIMETERS);
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp49_ = standard_print_size_new (_tmp46_, &_tmp47_, &_tmp48_);
-#line 845 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add121 (&_result_, &_result__length1, &__result__size_, _tmp49_);
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp50_ = _result_;
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp50__length1 = _result__length1;
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp51_ = _ ("13 × 18 cm");
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp52_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp53_, (gdouble) 13, MEASUREMENT_UNIT_CENTIMETERS);
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp54_ = standard_print_size_new (_tmp51_, &_tmp52_, &_tmp53_);
-#line 848 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add122 (&_result_, &_result__length1, &__result__size_, _tmp54_);
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp55_ = _result_;
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp55__length1 = _result__length1;
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp56_ = _ ("18 × 24 cm");
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp57_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp58_, (gdouble) 18, MEASUREMENT_UNIT_CENTIMETERS);
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp59_ = standard_print_size_new (_tmp56_, &_tmp57_, &_tmp58_);
-#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add123 (&_result_, &_result__length1, &__result__size_, _tmp59_);
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp60_ = _result_;
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp60__length1 = _result__length1;
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp61_ = _ ("20 × 30 cm");
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp62_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp63_, (gdouble) 20, MEASUREMENT_UNIT_CENTIMETERS);
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp64_ = standard_print_size_new (_tmp61_, &_tmp62_, &_tmp63_);
-#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add124 (&_result_, &_result__length1, &__result__size_, _tmp64_);
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp65_ = _result_;
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp65__length1 = _result__length1;
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp66_ = _ ("24 × 40 cm");
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp67_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp68_, (gdouble) 24, MEASUREMENT_UNIT_CENTIMETERS);
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp69_ = standard_print_size_new (_tmp66_, &_tmp67_, &_tmp68_);
-#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add125 (&_result_, &_result__length1, &__result__size_, _tmp69_);
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp70_ = _result_;
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp70__length1 = _result__length1;
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp71_ = _ ("30 × 40 cm");
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp72_, (gdouble) 40, MEASUREMENT_UNIT_CENTIMETERS);
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	measurement_init (&_tmp73_, (gdouble) 30, MEASUREMENT_UNIT_CENTIMETERS);
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp74_ = standard_print_size_new (_tmp71_, &_tmp72_, &_tmp73_);
-#line 860 "/home/jens/Source/shotwell/src/Printing.vala"
-	_vala_array_add126 (&_result_, &_result__length1, &__result__size_, _tmp74_);
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp75_ = _result_;
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	_tmp75__length1 = _result__length1;
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (result_length1) {
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-		*result_length1 = _tmp75__length1;
-#line 6216 "Printing.c"
+#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+		*result_length1 = _tmp77__length1;
+#line 5918 "Printing.c"
 	}
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
-	result = _tmp75_;
-#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
+	result = _tmp77_;
+#line 839 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 6222 "Printing.c"
+#line 5924 "Printing.c"
 }
 
 
 static gpointer _print_manager_ref0 (gpointer self) {
-#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? print_manager_ref (self) : NULL;
-#line 6229 "Printing.c"
+#line 5931 "Printing.c"
 }
 
 
@@ -6235,59 +5937,59 @@ PrintManager* print_manager_get_instance (void) {
 	PrintManager* _tmp0_ = NULL;
 	PrintManager* _tmp2_ = NULL;
 	PrintManager* _tmp3_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 843 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = print_manager_instance;
-#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 843 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp0_ == NULL) {
-#line 6242 "Printing.c"
+#line 5944 "Printing.c"
 		PrintManager* _tmp1_ = NULL;
-#line 869 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 844 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp1_ = print_manager_new ();
-#line 869 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 844 "/home/jens/Source/shotwell/src/Printing.vala"
 		_print_manager_unref0 (print_manager_instance);
-#line 869 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 844 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_instance = _tmp1_;
-#line 6250 "Printing.c"
+#line 5952 "Printing.c"
 	}
-#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = print_manager_instance;
-#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = _print_manager_ref0 (_tmp2_);
-#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp3_;
-#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 846 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 6260 "Printing.c"
+#line 5962 "Printing.c"
 }
 
 
 static void _print_manager_on_begin_print_gtk_print_operation_begin_print (GtkPrintOperation* _sender, GtkPrintContext* context, gpointer self) {
-#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 856 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_begin_print ((PrintManager*) self, _sender, context);
-#line 6267 "Printing.c"
+#line 5969 "Printing.c"
 }
 
 
 static void _print_manager_on_draw_page_gtk_print_operation_draw_page (GtkPrintOperation* _sender, GtkPrintContext* context, gint page_nr, gpointer self) {
-#line 882 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_draw_page ((PrintManager*) self, _sender, context, page_nr);
-#line 6274 "Printing.c"
+#line 5976 "Printing.c"
 }
 
 
 static GObject* _print_manager_on_create_custom_widget_gtk_print_operation_create_custom_widget (GtkPrintOperation* _sender, gpointer self) {
 	GObject* result;
 	result = print_manager_on_create_custom_widget ((PrintManager*) self, _sender);
-#line 883 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 858 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 6283 "Printing.c"
+#line 5985 "Printing.c"
 }
 
 
 static void _print_manager_on_status_changed_gtk_print_operation_status_changed (GtkPrintOperation* _sender, gpointer self) {
-#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 859 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_status_changed ((PrintManager*) self, _sender);
-#line 6290 "Printing.c"
+#line 5992 "Printing.c"
 }
 
 
@@ -6315,214 +6017,214 @@ void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print) {
 	AppWindow* _tmp27_ = NULL;
 	const gchar* _tmp28_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 849 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 849 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (to_print));
-#line 875 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 850 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = to_print;
-#line 875 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 850 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = print_job_new (_tmp0_);
-#line 875 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 850 "/home/jens/Source/shotwell/src/Printing.vala"
 	job = _tmp1_;
-#line 876 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = _ ("Image Settings");
-#line 876 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 851 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_custom_tab_label (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp2_);
-#line 877 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 852 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_unit (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), GTK_UNIT_INCH);
-#line 878 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 853 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), 1);
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = print_job_get_source_photo (job);
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = _tmp3_;
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_OBJECT, DataObject));
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = _tmp5_;
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_job_name (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp6_);
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp6_);
-#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 854 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp4_);
-#line 880 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 855 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = self->priv->user_page_setup;
-#line 880 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 855 "/home/jens/Source/shotwell/src/Printing.vala"
 	gtk_print_operation_set_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), _tmp7_);
-#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 856 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "begin-print", (GCallback) _print_manager_on_begin_print_gtk_print_operation_begin_print, self);
-#line 882 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 857 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "draw-page", (GCallback) _print_manager_on_draw_page_gtk_print_operation_draw_page, self);
-#line 883 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 858 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "create-custom-widget", (GCallback) _print_manager_on_create_custom_widget_gtk_print_operation_create_custom_widget, self);
-#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 859 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), "status-changed", (GCallback) _print_manager_on_status_changed_gtk_print_operation_status_changed, self);
-#line 886 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 861 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = app_window_get_instance ();
-#line 886 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 861 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = _tmp8_;
-#line 886 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 861 "/home/jens/Source/shotwell/src/Printing.vala"
 	page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PAGE_WINDOW, PageWindow));
-#line 886 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 861 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp9_);
-#line 888 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 863 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = g_cancellable_new ();
-#line 888 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 863 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 888 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 863 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->cancellable = _tmp10_;
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = app_window_get_instance ();
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = _tmp11_;
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = _ ("Printing…");
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = self->priv->cancellable;
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = progress_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_window_get_type (), GtkWindow), _tmp13_, _tmp14_);
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_object_ref_sink (_tmp15_);
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->progress_dialog = _tmp15_;
-#line 889 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 864 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp12_);
-#line 891 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 866 "/home/jens/Source/shotwell/src/Printing.vala"
 	err_msg = NULL;
-#line 6396 "Printing.c"
+#line 6098 "Printing.c"
 	{
 		GtkPrintOperationResult _result_ = 0;
 		AppWindow* _tmp16_ = NULL;
 		AppWindow* _tmp17_ = NULL;
 		GtkPrintOperationResult _tmp18_ = 0;
 		GtkPrintOperationResult _tmp19_ = 0;
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp16_ = app_window_get_instance ();
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp17_ = _tmp16_;
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = gtk_print_operation_run (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation), GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_window_get_type (), GtkWindow), &_inner_error_);
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp19_ = _tmp18_;
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (_tmp17_);
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		_result_ = _tmp19_;
-#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 868 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6417 "Printing.c"
-			goto __catch467_g_error;
+#line 6119 "Printing.c"
+			goto __catch468_g_error;
 		}
-#line 895 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 870 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_result_ == GTK_PRINT_OPERATION_RESULT_APPLY) {
-#line 6422 "Printing.c"
+#line 6124 "Printing.c"
 			GtkPageSetup* _tmp20_ = NULL;
 			GtkPageSetup* _tmp21_ = NULL;
-#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp20_ = gtk_print_operation_get_default_page_setup (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation));
-#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp21_ = _g_object_ref0 (_tmp20_);
-#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (self->priv->user_page_setup);
-#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 871 "/home/jens/Source/shotwell/src/Printing.vala"
 			self->priv->user_page_setup = _tmp21_;
-#line 6433 "Printing.c"
+#line 6135 "Printing.c"
 		}
 	}
-	goto __finally467;
-	__catch467_g_error:
+	goto __finally468;
+	__catch468_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp22_ = NULL;
 		const gchar* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		e = _inner_error_;
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		_inner_error_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 873 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (job, gtk_print_operation_get_type (), GtkPrintOperation));
-#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = e;
-#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = _tmp22_->message;
-#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = g_strdup (_tmp23_);
-#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (err_msg);
-#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
 		err_msg = _tmp24_;
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_error_free0 (e);
-#line 6461 "Printing.c"
+#line 6163 "Printing.c"
 	}
-	__finally467:
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+	__finally468:
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (err_msg);
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (job);
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_critical ("file %s: line %d: uncaught 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/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_clear_error (&_inner_error_);
-#line 892 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 867 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 6476 "Printing.c"
+#line 6178 "Printing.c"
 	}
-#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 877 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp25_ = self->priv->progress_dialog;
-#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 877 "/home/jens/Source/shotwell/src/Printing.vala"
 	progress_dialog_close (_tmp25_);
-#line 903 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 878 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 903 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 878 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->progress_dialog = NULL;
-#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 879 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->cancellable = NULL;
-#line 906 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp26_ = app_window_get_instance ();
-#line 906 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp27_ = _tmp26_;
-#line 906 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
 	page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PAGE_WINDOW, PageWindow));
-#line 906 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 881 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp27_);
-#line 908 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 883 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp28_ = err_msg;
-#line 908 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 883 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp28_ != NULL) {
-#line 6502 "Printing.c"
+#line 6204 "Printing.c"
 		const gchar* _tmp29_ = NULL;
 		const gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
 		gchar* _tmp32_ = NULL;
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = _ ("Unable to print photo:\n\n%s");
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp30_ = err_msg;
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp31_ = g_strdup_printf (_tmp29_, _tmp30_);
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp32_ = _tmp31_;
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		app_window_error_message (_tmp32_, NULL);
-#line 909 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 884 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp32_);
-#line 6519 "Printing.c"
+#line 6221 "Printing.c"
 	}
-#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 849 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (err_msg);
-#line 874 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 849 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (job);
-#line 6525 "Printing.c"
+#line 6227 "Printing.c"
 }
 
 
@@ -6540,74 +6242,74 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation*
 	PrintSettings* _tmp11_ = NULL;
 	ContentLayout _tmp12_ = 0;
 	gboolean _tmp13_ = FALSE;
-#line 912 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 912 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_OPERATION (emitting_object));
-#line 912 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_CONTEXT (job_context));
-#line 913 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_debug ("Printing.vala:913: on_begin_print");
-#line 915 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 888 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_debug ("Printing.vala:888: on_begin_print");
+#line 890 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = emitting_object;
-#line 915 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 890 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PRINT_JOB, PrintJob));
-#line 915 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 890 "/home/jens/Source/shotwell/src/Printing.vala"
 	job = _tmp1_;
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->cancellable;
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ != NULL) {
-#line 6561 "Printing.c"
+#line 6263 "Printing.c"
 		GCancellable* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = self->priv->cancellable;
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = g_cancellable_is_cancelled (_tmp4_);
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = _tmp5_;
-#line 6570 "Printing.c"
+#line 6272 "Printing.c"
 	} else {
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = FALSE;
-#line 6574 "Printing.c"
+#line 6276 "Printing.c"
 	}
-#line 918 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 893 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_) {
-#line 6578 "Printing.c"
+#line 6280 "Printing.c"
 		PrintJob* _tmp6_ = NULL;
-#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 894 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = job;
-#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 894 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_print_operation_get_type (), GtkPrintOperation));
-#line 921 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (job);
-#line 921 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 896 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 6588 "Printing.c"
+#line 6290 "Printing.c"
 	}
-#line 924 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = job;
-#line 924 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = print_job_get_photos (_tmp7_);
-#line 924 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 899 "/home/jens/Source/shotwell/src/Printing.vala"
 	photos = _tmp8_;
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = job;
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = print_job_get_local_settings (_tmp9_);
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = _tmp10_;
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = print_settings_get_content_layout (_tmp11_);
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = _tmp12_ == CONTENT_LAYOUT_IMAGE_PER_PAGE;
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp11_);
-#line 925 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 900 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp13_) {
-#line 6610 "Printing.c"
+#line 6312 "Printing.c"
 		PrintLayout layout = 0;
 		PrintJob* _tmp14_ = NULL;
 		PrintSettings* _tmp15_ = NULL;
@@ -6621,61 +6323,61 @@ static void print_manager_on_begin_print (PrintManager* self, GtkPrintOperation*
 		PrintLayout _tmp23_ = 0;
 		gint _tmp24_ = 0;
 		gdouble _tmp25_ = 0.0;
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp14_ = job;
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp15_ = print_job_get_local_settings (_tmp14_);
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp16_ = _tmp15_;
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp17_ = print_settings_get_image_per_page_selection (_tmp16_);
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp18_ = (PrintLayout) _tmp17_;
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		_print_settings_unref0 (_tmp16_);
-#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 901 "/home/jens/Source/shotwell/src/Printing.vala"
 		layout = _tmp18_;
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp19_ = job;
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp20_ = photos;
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp21_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = _tmp21_;
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = layout;
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = print_layout_get_per_page (_tmp23_);
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = ceil (((gdouble) _tmp22_) / ((gdouble) _tmp24_));
-#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 902 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_print_operation_get_type (), GtkPrintOperation), (gint) _tmp25_);
-#line 6654 "Printing.c"
+#line 6356 "Printing.c"
 	} else {
 		PrintJob* _tmp26_ = NULL;
 		GeeList* _tmp27_ = NULL;
 		gint _tmp28_ = 0;
 		gint _tmp29_ = 0;
-#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = job;
-#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp27_ = photos;
-#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp28_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp29_ = _tmp28_;
-#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 904 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_set_n_pages (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_print_operation_get_type (), GtkPrintOperation), _tmp29_);
-#line 6670 "Printing.c"
+#line 6372 "Printing.c"
 	}
-#line 932 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 907 "/home/jens/Source/shotwell/src/Printing.vala"
 	spin_event_loop ();
-#line 912 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (photos);
-#line 912 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 887 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (job);
-#line 6678 "Printing.c"
+#line 6380 "Printing.c"
 }
 
 
@@ -6683,43 +6385,43 @@ static void print_manager_on_status_changed (PrintManager* self, GtkPrintOperati
 	GtkPrintOperation* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	ProgressDialog* _tmp2_ = NULL;
-#line 935 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 910 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 935 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 910 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_OPERATION (job));
-#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 911 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = job;
-#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 911 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_print_operation_get_status_string (_tmp0_);
-#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_debug ("Printing.vala:936: on_status_changed: %s", _tmp1_);
-#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 911 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_debug ("Printing.vala:911: on_status_changed: %s", _tmp1_);
+#line 913 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = self->priv->progress_dialog;
-#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 913 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_ != NULL) {
-#line 6700 "Printing.c"
+#line 6402 "Printing.c"
 		ProgressDialog* _tmp3_ = NULL;
 		GtkPrintOperation* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
-#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 914 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp3_ = self->priv->progress_dialog;
-#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 914 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = job;
-#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 914 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = gtk_print_operation_get_status_string (_tmp4_);
-#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 914 "/home/jens/Source/shotwell/src/Printing.vala"
 		progress_dialog_set_status (_tmp3_, _tmp5_);
-#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 915 "/home/jens/Source/shotwell/src/Printing.vala"
 		spin_event_loop ();
-#line 6714 "Printing.c"
+#line 6416 "Printing.c"
 	}
 }
 
 
 static gpointer _cairo_reference0 (gpointer self) {
-#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 6722 "Printing.c"
+#line 6424 "Printing.c"
 }
 
 
@@ -6764,828 +6466,812 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 	ContentLayout _tmp31_ = 0;
 	ContentLayout _tmp32_ = 0;
 	ContentLayout _tmp33_ = 0;
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_OPERATION (emitting_object));
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_CONTEXT (job_context));
-#line 946 "/home/jens/Source/shotwell/src/Printing.vala"
-	g_debug ("Printing.vala:946: on_draw_page");
-#line 948 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 921 "/home/jens/Source/shotwell/src/Printing.vala"
+	g_debug ("Printing.vala:921: on_draw_page");
+#line 923 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = emitting_object;
-#line 948 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 923 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PRINT_JOB, PrintJob));
-#line 948 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 923 "/home/jens/Source/shotwell/src/Printing.vala"
 	job = _tmp1_;
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->cancellable;
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp3_ != NULL) {
-#line 6785 "Printing.c"
+#line 6487 "Printing.c"
 		GCancellable* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp4_ = self->priv->cancellable;
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp5_ = g_cancellable_is_cancelled (_tmp4_);
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = _tmp5_;
-#line 6794 "Printing.c"
+#line 6496 "Printing.c"
 	} else {
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp2_ = FALSE;
-#line 6798 "Printing.c"
+#line 6500 "Printing.c"
 	}
-#line 951 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 926 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (_tmp2_) {
-#line 6802 "Printing.c"
+#line 6504 "Printing.c"
 		PrintJob* _tmp6_ = NULL;
-#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp6_ = job;
-#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 927 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_print_operation_get_type (), GtkPrintOperation));
-#line 954 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_object_unref0 (job);
-#line 954 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 929 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 6812 "Printing.c"
+#line 6514 "Printing.c"
 	}
-#line 957 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 932 "/home/jens/Source/shotwell/src/Printing.vala"
 	spin_event_loop ();
-#line 959 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 934 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = job_context;
-#line 959 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 934 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = gtk_print_context_get_page_setup (_tmp7_);
-#line 959 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 934 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 959 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 934 "/home/jens/Source/shotwell/src/Printing.vala"
 	page_setup = _tmp9_;
-#line 960 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 935 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = page_setup;
-#line 960 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 935 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = gtk_page_setup_get_page_width (_tmp10_, GTK_UNIT_INCH);
-#line 960 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 935 "/home/jens/Source/shotwell/src/Printing.vala"
 	page_width = _tmp11_;
-#line 961 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = page_setup;
-#line 961 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = gtk_page_setup_get_page_height (_tmp12_, GTK_UNIT_INCH);
-#line 961 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 936 "/home/jens/Source/shotwell/src/Printing.vala"
 	page_height = _tmp13_;
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = job;
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = print_job_get_local_settings (_tmp14_);
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16_ = _tmp15_;
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = print_settings_get_content_ppi (_tmp16_);
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp18_ = (gdouble) _tmp17_;
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp16_);
-#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 938 "/home/jens/Source/shotwell/src/Printing.vala"
 	dpi = _tmp18_;
-#line 964 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp19_ = dpi;
-#line 964 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 939 "/home/jens/Source/shotwell/src/Printing.vala"
 	inv_dpi = 1.0 / _tmp19_;
-#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp20_ = job_context;
-#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp21_ = gtk_print_context_get_cairo_context (_tmp20_);
-#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp22_ = _cairo_reference0 (_tmp21_);
-#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 940 "/home/jens/Source/shotwell/src/Printing.vala"
 	dc = _tmp22_;
-#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 941 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp23_ = dc;
-#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 941 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp24_ = inv_dpi;
-#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 941 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp25_ = inv_dpi;
-#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 941 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_scale (_tmp23_, _tmp24_, _tmp25_);
-#line 967 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 942 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp26_ = job;
-#line 967 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 942 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp27_ = print_job_get_photos (_tmp26_);
-#line 967 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 942 "/home/jens/Source/shotwell/src/Printing.vala"
 	photos = _tmp27_;
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp28_ = job;
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp29_ = print_job_get_local_settings (_tmp28_);
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp30_ = _tmp29_;
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp31_ = print_settings_get_content_layout (_tmp30_);
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp32_ = _tmp31_;
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp30_);
-#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
 	content_layout = _tmp32_;
-#line 970 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 945 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp33_ = content_layout;
-#line 970 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 945 "/home/jens/Source/shotwell/src/Printing.vala"
 	switch (_tmp33_) {
-#line 970 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 945 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_STANDARD_SIZE:
-#line 970 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 945 "/home/jens/Source/shotwell/src/Printing.vala"
 		case CONTENT_LAYOUT_CUSTOM_SIZE:
-#line 6898 "Printing.c"
+#line 6600 "Printing.c"
 		{
 			gdouble canvas_width = 0.0;
 			gdouble canvas_height = 0.0;
 			ContentLayout _tmp34_ = 0;
+			gint _tmp66_ = 0;
+			GeeList* _tmp67_ = NULL;
 			gint _tmp68_ = 0;
-			GeeList* _tmp69_ = NULL;
-			gint _tmp70_ = 0;
-			gint _tmp71_ = 0;
-			ProgressDialog* _tmp117_ = NULL;
-#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+			gint _tmp69_ = 0;
+			ProgressDialog* _tmp115_ = NULL;
+#line 949 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp34_ = content_layout;
-#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 949 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (_tmp34_ == CONTENT_LAYOUT_STANDARD_SIZE) {
-#line 6912 "Printing.c"
+#line 6614 "Printing.c"
 				gint _tmp35_ = 0;
 				StandardPrintSize** _tmp36_ = NULL;
-				StandardPrintSize** _tmp37_ = NULL;
-				gint _tmp37__length1 = 0;
-				PrintJob* _tmp38_ = NULL;
+				PrintJob* _tmp37_ = NULL;
+				PrintSettings* _tmp38_ = NULL;
 				PrintSettings* _tmp39_ = NULL;
-				PrintSettings* _tmp40_ = NULL;
-				gint _tmp41_ = 0;
-				StandardPrintSize* _tmp42_ = NULL;
-				Measurement _tmp43_ = {0};
-				gdouble _tmp44_ = 0.0;
-				gint _tmp45_ = 0;
-				StandardPrintSize** _tmp46_ = NULL;
-				StandardPrintSize** _tmp47_ = NULL;
-				gint _tmp47__length1 = 0;
-				PrintJob* _tmp48_ = NULL;
-				PrintSettings* _tmp49_ = NULL;
-				PrintSettings* _tmp50_ = NULL;
-				gint _tmp51_ = 0;
-				StandardPrintSize* _tmp52_ = NULL;
-				Measurement _tmp53_ = {0};
-				gdouble _tmp54_ = 0.0;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
+				gint _tmp40_ = 0;
+				StandardPrintSize* _tmp41_ = NULL;
+				Measurement _tmp42_ = {0};
+				gdouble _tmp43_ = 0.0;
+				gint _tmp44_ = 0;
+				StandardPrintSize** _tmp45_ = NULL;
+				PrintJob* _tmp46_ = NULL;
+				PrintSettings* _tmp47_ = NULL;
+				PrintSettings* _tmp48_ = NULL;
+				gint _tmp49_ = 0;
+				StandardPrintSize* _tmp50_ = NULL;
+				Measurement _tmp51_ = {0};
+				gdouble _tmp52_ = 0.0;
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp36_ = print_manager_get_standard_sizes (self, &_tmp35_);
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp37_ = _tmp36_;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp37__length1 = _tmp35_;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp38_ = job;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp39_ = print_job_get_local_settings (_tmp38_);
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp40_ = _tmp39_;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp41_ = print_settings_get_size_selection (_tmp40_);
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp42_ = _tmp37_[_tmp41_];
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				measurement_convert_to (&_tmp42_->width, MEASUREMENT_UNIT_INCHES, &_tmp43_);
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp44_ = _tmp43_.value;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				canvas_width = _tmp44_;
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_print_settings_unref0 (_tmp40_);
-#line 975 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp37_ = (_vala_array_free (_tmp37_, _tmp37__length1, (GDestroyNotify) standard_print_size_unref), NULL);
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp37_ = job;
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp38_ = print_job_get_local_settings (_tmp37_);
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp39_ = _tmp38_;
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp40_ = print_settings_get_size_selection (_tmp39_);
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp41_ = _tmp36_[_tmp40_];
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				measurement_convert_to (&_tmp41_->width, MEASUREMENT_UNIT_INCHES, &_tmp42_);
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp43_ = _tmp42_.value;
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				canvas_width = _tmp43_;
+#line 950 "/home/jens/Source/shotwell/src/Printing.vala"
+				_print_settings_unref0 (_tmp39_);
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp45_ = print_manager_get_standard_sizes (self, &_tmp44_);
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp46_ = job;
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp47_ = print_job_get_local_settings (_tmp46_);
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp48_ = _tmp47_;
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp49_ = print_settings_get_size_selection (_tmp48_);
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp50_ = _tmp45_[_tmp49_];
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				measurement_convert_to (&_tmp50_->height, MEASUREMENT_UNIT_INCHES, &_tmp51_);
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp52_ = _tmp51_.value;
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				canvas_height = _tmp52_;
+#line 952 "/home/jens/Source/shotwell/src/Printing.vala"
+				_print_settings_unref0 (_tmp48_);
+#line 6673 "Printing.c"
+			} else {
+				ContentLayout _tmp53_ = 0;
+				PrintJob* _tmp54_ = NULL;
+				PrintSettings* _tmp55_ = NULL;
+				PrintSettings* _tmp56_ = NULL;
+				Measurement _tmp57_ = {0};
+				Measurement _tmp58_ = {0};
+				gdouble _tmp59_ = 0.0;
+				PrintJob* _tmp60_ = NULL;
+				PrintSettings* _tmp61_ = NULL;
+				PrintSettings* _tmp62_ = NULL;
+				Measurement _tmp63_ = {0};
+				Measurement _tmp64_ = {0};
+				gdouble _tmp65_ = 0.0;
+#line 955 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp53_ = content_layout;
+#line 955 "/home/jens/Source/shotwell/src/Printing.vala"
+				_vala_assert (_tmp53_ == CONTENT_LAYOUT_CUSTOM_SIZE, "content_layout == ContentLayout.CUSTOM_SIZE");
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp54_ = job;
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp55_ = print_job_get_local_settings (_tmp54_);
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp56_ = _tmp55_;
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				print_settings_get_content_width (_tmp56_, &_tmp57_);
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				measurement_convert_to (&_tmp57_, MEASUREMENT_UNIT_INCHES, &_tmp58_);
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp59_ = _tmp58_.value;
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				canvas_width = _tmp59_;
+#line 956 "/home/jens/Source/shotwell/src/Printing.vala"
+				_print_settings_unref0 (_tmp56_);
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp60_ = job;
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp61_ = print_job_get_local_settings (_tmp60_);
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp62_ = _tmp61_;
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				print_settings_get_content_height (_tmp62_, &_tmp63_);
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				measurement_convert_to (&_tmp63_, MEASUREMENT_UNIT_INCHES, &_tmp64_);
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp65_ = _tmp64_.value;
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				canvas_height = _tmp65_;
+#line 958 "/home/jens/Source/shotwell/src/Printing.vala"
+				_print_settings_unref0 (_tmp62_);
+#line 6724 "Printing.c"
+			}
+#line 962 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp66_ = page_num;
+#line 962 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp67_ = photos;
+#line 962 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp68_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 962 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp69_ = _tmp68_;
+#line 962 "/home/jens/Source/shotwell/src/Printing.vala"
+			if (_tmp66_ < _tmp69_) {
+#line 6736 "Printing.c"
+				Dimensions photo_dimensions = {0};
+				GeeList* _tmp70_ = NULL;
+				gint _tmp71_ = 0;
+				gpointer _tmp72_ = NULL;
+				Photo* _tmp73_ = NULL;
+				Dimensions _tmp74_ = {0};
+				Dimensions _tmp75_ = {0};
+				gdouble photo_aspect_ratio = 0.0;
+				gdouble _tmp76_ = 0.0;
+				gdouble canvas_aspect_ratio = 0.0;
+				gdouble _tmp77_ = 0.0;
+				gdouble _tmp78_ = 0.0;
+				gdouble _tmp79_ = 0.0;
+				gdouble _tmp80_ = 0.0;
+				gdouble _tmp81_ = 0.0;
+				gdouble _tmp82_ = 0.0;
+				gdouble dx = 0.0;
+				gdouble _tmp86_ = 0.0;
+				gdouble _tmp87_ = 0.0;
+				gdouble dy = 0.0;
+				gdouble _tmp88_ = 0.0;
+				gdouble _tmp89_ = 0.0;
+				GeeList* _tmp90_ = NULL;
+				gint _tmp91_ = 0;
+				gpointer _tmp92_ = NULL;
+				Photo* _tmp93_ = NULL;
+				gdouble _tmp94_ = 0.0;
+				gdouble _tmp95_ = 0.0;
+				gdouble _tmp96_ = 0.0;
+				gdouble _tmp97_ = 0.0;
+				PrintJob* _tmp98_ = NULL;
+				GtkPrintContext* _tmp99_ = NULL;
+				PrintJob* _tmp100_ = NULL;
+				PrintSettings* _tmp101_ = NULL;
+				PrintSettings* _tmp102_ = NULL;
+				gboolean _tmp103_ = FALSE;
+				gboolean _tmp104_ = FALSE;
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp70_ = photos;
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp71_ = page_num;
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp72_ = gee_list_get (_tmp70_, _tmp71_);
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp73_ = (Photo*) _tmp72_;
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp74_);
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp75_ = _tmp74_;
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				_g_object_unref0 (_tmp73_);
+#line 963 "/home/jens/Source/shotwell/src/Printing.vala"
+				photo_dimensions = _tmp75_;
+#line 964 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp76_ = dimensions_get_aspect_ratio (&photo_dimensions);
+#line 964 "/home/jens/Source/shotwell/src/Printing.vala"
+				photo_aspect_ratio = _tmp76_;
+#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp77_ = canvas_width;
+#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp78_ = canvas_height;
+#line 965 "/home/jens/Source/shotwell/src/Printing.vala"
+				canvas_aspect_ratio = ((gdouble) _tmp77_) / _tmp78_;
+#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp79_ = canvas_aspect_ratio;
+#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp80_ = floor (_tmp79_);
+#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp81_ = photo_aspect_ratio;
+#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp82_ = floor (_tmp81_);
+#line 966 "/home/jens/Source/shotwell/src/Printing.vala"
+				if (_tmp80_ != _tmp82_) {
+#line 6810 "Printing.c"
+					gdouble canvas_tmp = 0.0;
+					gdouble _tmp83_ = 0.0;
+					gdouble _tmp84_ = 0.0;
+					gdouble _tmp85_ = 0.0;
+#line 967 "/home/jens/Source/shotwell/src/Printing.vala"
+					_tmp83_ = canvas_width;
+#line 967 "/home/jens/Source/shotwell/src/Printing.vala"
+					canvas_tmp = _tmp83_;
+#line 968 "/home/jens/Source/shotwell/src/Printing.vala"
+					_tmp84_ = canvas_height;
+#line 968 "/home/jens/Source/shotwell/src/Printing.vala"
+					canvas_width = _tmp84_;
+#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+					_tmp85_ = canvas_tmp;
+#line 969 "/home/jens/Source/shotwell/src/Printing.vala"
+					canvas_height = _tmp85_;
+#line 6827 "Printing.c"
+				}
+#line 972 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp86_ = page_width;
+#line 972 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp87_ = canvas_width;
+#line 972 "/home/jens/Source/shotwell/src/Printing.vala"
+				dx = (_tmp86_ - _tmp87_) / 2.0;
+#line 973 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp88_ = page_height;
+#line 973 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp89_ = canvas_height;
+#line 973 "/home/jens/Source/shotwell/src/Printing.vala"
+				dy = (_tmp88_ - _tmp89_) / 2.0;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp90_ = photos;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp91_ = page_num;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp92_ = gee_list_get (_tmp90_, _tmp91_);
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp93_ = (Photo*) _tmp92_;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp94_ = dx;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp95_ = dy;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp96_ = canvas_width;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp97_ = canvas_height;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp98_ = job;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp99_ = job_context;
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				print_manager_fit_image_to_canvas (self, _tmp93_, _tmp94_, _tmp95_, _tmp96_, _tmp97_, TRUE, _tmp98_, _tmp99_);
+#line 974 "/home/jens/Source/shotwell/src/Printing.vala"
+				_g_object_unref0 (_tmp93_);
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp100_ = job;
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp101_ = print_job_get_local_settings (_tmp100_);
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp102_ = _tmp101_;
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp103_ = print_settings_is_print_titles_enabled (_tmp102_);
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_tmp104_ = _tmp103_;
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				_print_settings_unref0 (_tmp102_);
+#line 976 "/home/jens/Source/shotwell/src/Printing.vala"
+				if (_tmp104_) {
+#line 6879 "Printing.c"
+					gdouble _tmp105_ = 0.0;
+					gdouble _tmp106_ = 0.0;
+					GeeList* _tmp107_ = NULL;
+					gint _tmp108_ = 0;
+					gpointer _tmp109_ = NULL;
+					Photo* _tmp110_ = NULL;
+					gchar* _tmp111_ = NULL;
+					gchar* _tmp112_ = NULL;
+					PrintJob* _tmp113_ = NULL;
+					GtkPrintContext* _tmp114_ = NULL;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp46_ = print_manager_get_standard_sizes (self, &_tmp45_);
+					_tmp105_ = page_width;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp47_ = _tmp46_;
+					_tmp106_ = page_height;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp47__length1 = _tmp45_;
+					_tmp107_ = photos;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp48_ = job;
+					_tmp108_ = page_num;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp49_ = print_job_get_local_settings (_tmp48_);
+					_tmp109_ = gee_list_get (_tmp107_, _tmp108_);
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp50_ = _tmp49_;
+					_tmp110_ = (Photo*) _tmp109_;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp51_ = print_settings_get_size_selection (_tmp50_);
+					_tmp111_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, TYPE_DATA_OBJECT, DataObject));
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp52_ = _tmp47_[_tmp51_];
+					_tmp112_ = _tmp111_;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				measurement_convert_to (&_tmp52_->height, MEASUREMENT_UNIT_INCHES, &_tmp53_);
+					_tmp113_ = job;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp54_ = _tmp53_.value;
+					_tmp114_ = job_context;
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				canvas_height = _tmp54_;
+					print_manager_add_title_to_canvas (self, _tmp105_ / 2, _tmp106_, _tmp112_, _tmp113_, _tmp114_);
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_print_settings_unref0 (_tmp50_);
+					_g_free0 (_tmp112_);
 #line 977 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp47_ = (_vala_array_free (_tmp47_, _tmp47__length1, (GDestroyNotify) standard_print_size_unref), NULL);
-#line 6987 "Printing.c"
-			} else {
-				ContentLayout _tmp55_ = 0;
-				PrintJob* _tmp56_ = NULL;
-				PrintSettings* _tmp57_ = NULL;
-				PrintSettings* _tmp58_ = NULL;
-				Measurement _tmp59_ = {0};
-				Measurement _tmp60_ = {0};
-				gdouble _tmp61_ = 0.0;
-				PrintJob* _tmp62_ = NULL;
-				PrintSettings* _tmp63_ = NULL;
-				PrintSettings* _tmp64_ = NULL;
-				Measurement _tmp65_ = {0};
-				Measurement _tmp66_ = {0};
-				gdouble _tmp67_ = 0.0;
-#line 980 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp55_ = content_layout;
-#line 980 "/home/jens/Source/shotwell/src/Printing.vala"
-				_vala_assert (_tmp55_ == CONTENT_LAYOUT_CUSTOM_SIZE, "content_layout == ContentLayout.CUSTOM_SIZE");
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp56_ = job;
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp57_ = print_job_get_local_settings (_tmp56_);
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp58_ = _tmp57_;
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				print_settings_get_content_width (_tmp58_, &_tmp59_);
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				measurement_convert_to (&_tmp59_, MEASUREMENT_UNIT_INCHES, &_tmp60_);
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp61_ = _tmp60_.value;
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				canvas_width = _tmp61_;
-#line 981 "/home/jens/Source/shotwell/src/Printing.vala"
-				_print_settings_unref0 (_tmp58_);
-#line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp62_ = job;
-#line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp63_ = print_job_get_local_settings (_tmp62_);
+					_g_object_unref0 (_tmp110_);
+#line 6916 "Printing.c"
+				}
+			}
+#line 982 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp115_ = self->priv->progress_dialog;
+#line 982 "/home/jens/Source/shotwell/src/Printing.vala"
+			if (_tmp115_ != NULL) {
+#line 6923 "Printing.c"
+				ProgressDialog* _tmp116_ = NULL;
+				gint _tmp117_ = 0;
+				GeeList* _tmp118_ = NULL;
+				gint _tmp119_ = 0;
+				gint _tmp120_ = 0;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp64_ = _tmp63_;
+				_tmp116_ = self->priv->progress_dialog;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				print_settings_get_content_height (_tmp64_, &_tmp65_);
+				_tmp117_ = page_num;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				measurement_convert_to (&_tmp65_, MEASUREMENT_UNIT_INCHES, &_tmp66_);
+				_tmp118_ = photos;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp67_ = _tmp66_.value;
+				_tmp119_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				canvas_height = _tmp67_;
+				_tmp120_ = _tmp119_;
 #line 983 "/home/jens/Source/shotwell/src/Printing.vala"
-				_print_settings_unref0 (_tmp64_);
-#line 7038 "Printing.c"
+				progress_dialog_monitor (_tmp116_, (guint64) _tmp117_, (guint64) _tmp120_, TRUE);
+#line 6941 "Printing.c"
 			}
+#line 984 "/home/jens/Source/shotwell/src/Printing.vala"
+			break;
+#line 6945 "Printing.c"
+		}
+#line 945 "/home/jens/Source/shotwell/src/Printing.vala"
+		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
+#line 6949 "Printing.c"
+		{
+			PrintLayout layout = 0;
+			PrintJob* _tmp121_ = NULL;
+			PrintSettings* _tmp122_ = NULL;
+			PrintSettings* _tmp123_ = NULL;
+			gint _tmp124_ = 0;
+			PrintLayout _tmp125_ = 0;
+			gint nx = 0;
+			PrintLayout _tmp126_ = 0;
+			gint _tmp127_ = 0;
+			gint ny = 0;
+			PrintLayout _tmp128_ = 0;
+			gint _tmp129_ = 0;
+			gint start = 0;
+			gint _tmp130_ = 0;
+			PrintLayout _tmp131_ = 0;
+			gint _tmp132_ = 0;
+			gdouble canvas_width = 0.0;
+			gdouble _tmp133_ = 0.0;
+			gint _tmp134_ = 0;
+			gint _tmp135_ = 0;
+			gdouble canvas_height = 0.0;
+			gdouble _tmp136_ = 0.0;
+			gint _tmp137_ = 0;
+			gint _tmp138_ = 0;
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp68_ = page_num;
+			_tmp121_ = job;
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp69_ = photos;
+			_tmp122_ = print_job_get_local_settings (_tmp121_);
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp70_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, GEE_TYPE_COLLECTION, GeeCollection));
+			_tmp123_ = _tmp122_;
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp71_ = _tmp70_;
+			_tmp124_ = print_settings_get_image_per_page_selection (_tmp123_);
 #line 987 "/home/jens/Source/shotwell/src/Printing.vala"
-			if (_tmp68_ < _tmp71_) {
-#line 7050 "Printing.c"
-				Dimensions photo_dimensions = {0};
-				GeeList* _tmp72_ = NULL;
-				gint _tmp73_ = 0;
-				gpointer _tmp74_ = NULL;
-				Photo* _tmp75_ = NULL;
-				Dimensions _tmp76_ = {0};
-				Dimensions _tmp77_ = {0};
-				gdouble photo_aspect_ratio = 0.0;
-				gdouble _tmp78_ = 0.0;
-				gdouble canvas_aspect_ratio = 0.0;
-				gdouble _tmp79_ = 0.0;
-				gdouble _tmp80_ = 0.0;
-				gdouble _tmp81_ = 0.0;
-				gdouble _tmp82_ = 0.0;
-				gdouble _tmp83_ = 0.0;
-				gdouble _tmp84_ = 0.0;
-				gdouble dx = 0.0;
-				gdouble _tmp88_ = 0.0;
-				gdouble _tmp89_ = 0.0;
-				gdouble dy = 0.0;
-				gdouble _tmp90_ = 0.0;
-				gdouble _tmp91_ = 0.0;
-				GeeList* _tmp92_ = NULL;
-				gint _tmp93_ = 0;
-				gpointer _tmp94_ = NULL;
-				Photo* _tmp95_ = NULL;
-				gdouble _tmp96_ = 0.0;
-				gdouble _tmp97_ = 0.0;
-				gdouble _tmp98_ = 0.0;
-				gdouble _tmp99_ = 0.0;
-				PrintJob* _tmp100_ = NULL;
-				GtkPrintContext* _tmp101_ = NULL;
-				PrintJob* _tmp102_ = NULL;
-				PrintSettings* _tmp103_ = NULL;
-				PrintSettings* _tmp104_ = NULL;
-				gboolean _tmp105_ = FALSE;
-				gboolean _tmp106_ = FALSE;
-#line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp72_ = photos;
-#line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp73_ = page_num;
-#line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp74_ = gee_list_get (_tmp72_, _tmp73_);
-#line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp75_ = (Photo*) _tmp74_;
-#line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp76_);
+			_tmp125_ = (PrintLayout) _tmp124_;
+#line 987 "/home/jens/Source/shotwell/src/Printing.vala"
+			_print_settings_unref0 (_tmp123_);
+#line 987 "/home/jens/Source/shotwell/src/Printing.vala"
+			layout = _tmp125_;
 #line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp77_ = _tmp76_;
+			_tmp126_ = layout;
 #line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				_g_object_unref0 (_tmp75_);
+			_tmp127_ = print_layout_get_x (_tmp126_);
 #line 988 "/home/jens/Source/shotwell/src/Printing.vala"
-				photo_dimensions = _tmp77_;
+			nx = _tmp127_;
+#line 989 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp128_ = layout;
 #line 989 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp78_ = dimensions_get_aspect_ratio (&photo_dimensions);
+			_tmp129_ = print_layout_get_y (_tmp128_);
 #line 989 "/home/jens/Source/shotwell/src/Printing.vala"
-				photo_aspect_ratio = _tmp78_;
+			ny = _tmp129_;
+#line 990 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp130_ = page_num;
 #line 990 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp79_ = canvas_width;
+			_tmp131_ = layout;
 #line 990 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp80_ = canvas_height;
+			_tmp132_ = print_layout_get_per_page (_tmp131_);
 #line 990 "/home/jens/Source/shotwell/src/Printing.vala"
-				canvas_aspect_ratio = ((gdouble) _tmp79_) / _tmp80_;
+			start = _tmp130_ * _tmp132_;
 #line 991 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp81_ = canvas_aspect_ratio;
+			_tmp133_ = page_width;
 #line 991 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp82_ = floor (_tmp81_);
+			_tmp134_ = nx;
 #line 991 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp83_ = photo_aspect_ratio;
+			_tmp135_ = nx;
 #line 991 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp84_ = floor (_tmp83_);
-#line 991 "/home/jens/Source/shotwell/src/Printing.vala"
-				if (_tmp82_ != _tmp84_) {
-#line 7124 "Printing.c"
-					gdouble canvas_tmp = 0.0;
-					gdouble _tmp85_ = 0.0;
-					gdouble _tmp86_ = 0.0;
-					gdouble _tmp87_ = 0.0;
+			canvas_width = ((gdouble) (_tmp133_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp134_ - 1)))) / _tmp135_;
+#line 992 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp136_ = page_height;
+#line 992 "/home/jens/Source/shotwell/src/Printing.vala"
+			_tmp137_ = ny;
 #line 992 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp85_ = canvas_width;
+			_tmp138_ = ny;
 #line 992 "/home/jens/Source/shotwell/src/Printing.vala"
-					canvas_tmp = _tmp85_;
+			canvas_height = ((gdouble) (_tmp136_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp137_ - 1)))) / _tmp138_;
+#line 7025 "Printing.c"
+			{
+				gint y = 0;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+				y = 0;
+#line 7030 "Printing.c"
+				{
+					gboolean _tmp139_ = FALSE;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+					_tmp139_ = TRUE;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+					while (TRUE) {
+#line 7037 "Printing.c"
+						gint _tmp141_ = 0;
+						gint _tmp142_ = 0;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+						if (!_tmp139_) {
+#line 7042 "Printing.c"
+							gint _tmp140_ = 0;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+							_tmp140_ = y;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+							y = _tmp140_ + 1;
+#line 7048 "Printing.c"
+						}
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp86_ = canvas_height;
+						_tmp139_ = FALSE;
 #line 993 "/home/jens/Source/shotwell/src/Printing.vala"
-					canvas_width = _tmp86_;
+						_tmp141_ = y;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+						_tmp142_ = ny;
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+						if (!(_tmp141_ < _tmp142_)) {
+#line 993 "/home/jens/Source/shotwell/src/Printing.vala"
+							break;
+#line 7060 "Printing.c"
+						}
+						{
+							gint x = 0;
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp87_ = canvas_tmp;
+							x = 0;
+#line 7066 "Printing.c"
+							{
+								gboolean _tmp143_ = FALSE;
 #line 994 "/home/jens/Source/shotwell/src/Printing.vala"
-					canvas_height = _tmp87_;
-#line 7141 "Printing.c"
-				}
+								_tmp143_ = TRUE;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+								while (TRUE) {
+#line 7073 "Printing.c"
+									gint _tmp145_ = 0;
+									gint _tmp146_ = 0;
+									gint i = 0;
+									gint _tmp147_ = 0;
+									gint _tmp148_ = 0;
+									gint _tmp149_ = 0;
+									gint _tmp150_ = 0;
+									gint _tmp151_ = 0;
+									GeeList* _tmp152_ = NULL;
+									gint _tmp153_ = 0;
+									gint _tmp154_ = 0;
+									ProgressDialog* _tmp188_ = NULL;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+									if (!_tmp143_) {
+#line 7088 "Printing.c"
+										gint _tmp144_ = 0;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+										_tmp144_ = x;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+										x = _tmp144_ + 1;
+#line 7094 "Printing.c"
+									}
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp143_ = FALSE;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp145_ = x;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp146_ = nx;
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+									if (!(_tmp145_ < _tmp146_)) {
+#line 994 "/home/jens/Source/shotwell/src/Printing.vala"
+										break;
+#line 7106 "Printing.c"
+									}
+#line 995 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp147_ = start;
+#line 995 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp148_ = y;
+#line 995 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp149_ = nx;
+#line 995 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp150_ = x;
+#line 995 "/home/jens/Source/shotwell/src/Printing.vala"
+									i = (_tmp147_ + (_tmp148_ * _tmp149_)) + _tmp150_;
+#line 996 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp151_ = i;
+#line 996 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp152_ = photos;
+#line 996 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp153_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp152_, GEE_TYPE_COLLECTION, GeeCollection));
+#line 996 "/home/jens/Source/shotwell/src/Printing.vala"
+									_tmp154_ = _tmp153_;
+#line 996 "/home/jens/Source/shotwell/src/Printing.vala"
+									if (_tmp151_ < _tmp154_) {
+#line 7128 "Printing.c"
+										gdouble dx = 0.0;
+										gint _tmp155_ = 0;
+										gdouble _tmp156_ = 0.0;
+										gint _tmp157_ = 0;
+										gdouble dy = 0.0;
+										gint _tmp158_ = 0;
+										gdouble _tmp159_ = 0.0;
+										gint _tmp160_ = 0;
+										GeeList* _tmp161_ = NULL;
+										gint _tmp162_ = 0;
+										gpointer _tmp163_ = NULL;
+										Photo* _tmp164_ = NULL;
+										gdouble _tmp165_ = 0.0;
+										gdouble _tmp166_ = 0.0;
+										gdouble _tmp167_ = 0.0;
+										gdouble _tmp168_ = 0.0;
+										PrintJob* _tmp169_ = NULL;
+										GtkPrintContext* _tmp170_ = NULL;
+										PrintJob* _tmp171_ = NULL;
+										PrintSettings* _tmp172_ = NULL;
+										PrintSettings* _tmp173_ = NULL;
+										gboolean _tmp174_ = FALSE;
+										gboolean _tmp175_ = FALSE;
 #line 997 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp88_ = page_width;
+										_tmp155_ = x;
 #line 997 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp89_ = canvas_width;
+										_tmp156_ = canvas_width;
 #line 997 "/home/jens/Source/shotwell/src/Printing.vala"
-				dx = (_tmp88_ - _tmp89_) / 2.0;
+										_tmp157_ = x;
+#line 997 "/home/jens/Source/shotwell/src/Printing.vala"
+										dx = (_tmp155_ * _tmp156_) + (_tmp157_ * PRINT_MANAGER_IMAGE_DISTANCE);
+#line 998 "/home/jens/Source/shotwell/src/Printing.vala"
+										_tmp158_ = y;
 #line 998 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp90_ = page_height;
+										_tmp159_ = canvas_height;
 #line 998 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp91_ = canvas_height;
+										_tmp160_ = y;
 #line 998 "/home/jens/Source/shotwell/src/Printing.vala"
-				dy = (_tmp90_ - _tmp91_) / 2.0;
+										dy = (_tmp158_ * _tmp159_) + (_tmp160_ * PRINT_MANAGER_IMAGE_DISTANCE);
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp92_ = photos;
+										_tmp161_ = photos;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp93_ = page_num;
+										_tmp162_ = i;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp94_ = gee_list_get (_tmp92_, _tmp93_);
+										_tmp163_ = gee_list_get (_tmp161_, _tmp162_);
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp95_ = (Photo*) _tmp94_;
+										_tmp164_ = (Photo*) _tmp163_;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp96_ = dx;
+										_tmp165_ = dx;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp97_ = dy;
+										_tmp166_ = dy;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp98_ = canvas_width;
+										_tmp167_ = canvas_width;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp99_ = canvas_height;
+										_tmp168_ = canvas_height;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp100_ = job;
+										_tmp169_ = job;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp101_ = job_context;
+										_tmp170_ = job_context;
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				print_manager_fit_image_to_canvas (self, _tmp95_, _tmp96_, _tmp97_, _tmp98_, _tmp99_, TRUE, _tmp100_, _tmp101_);
+										print_manager_fit_image_to_canvas (self, _tmp164_, _tmp165_, _tmp166_, _tmp167_, _tmp168_, FALSE, _tmp169_, _tmp170_);
 #line 999 "/home/jens/Source/shotwell/src/Printing.vala"
-				_g_object_unref0 (_tmp95_);
+										_g_object_unref0 (_tmp164_);
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp102_ = job;
+										_tmp171_ = job;
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp103_ = print_job_get_local_settings (_tmp102_);
+										_tmp172_ = print_job_get_local_settings (_tmp171_);
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp104_ = _tmp103_;
+										_tmp173_ = _tmp172_;
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp105_ = print_settings_is_print_titles_enabled (_tmp104_);
+										_tmp174_ = print_settings_is_print_titles_enabled (_tmp173_);
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp106_ = _tmp105_;
+										_tmp175_ = _tmp174_;
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				_print_settings_unref0 (_tmp104_);
+										_print_settings_unref0 (_tmp173_);
 #line 1001 "/home/jens/Source/shotwell/src/Printing.vala"
-				if (_tmp106_) {
-#line 7193 "Printing.c"
-					gdouble _tmp107_ = 0.0;
-					gdouble _tmp108_ = 0.0;
-					GeeList* _tmp109_ = NULL;
-					gint _tmp110_ = 0;
-					gpointer _tmp111_ = NULL;
-					Photo* _tmp112_ = NULL;
-					gchar* _tmp113_ = NULL;
-					gchar* _tmp114_ = NULL;
-					PrintJob* _tmp115_ = NULL;
-					GtkPrintContext* _tmp116_ = NULL;
+										if (_tmp175_) {
+#line 7206 "Printing.c"
+											gdouble _tmp176_ = 0.0;
+											gdouble _tmp177_ = 0.0;
+											gdouble _tmp178_ = 0.0;
+											gdouble _tmp179_ = 0.0;
+											GeeList* _tmp180_ = NULL;
+											gint _tmp181_ = 0;
+											gpointer _tmp182_ = NULL;
+											Photo* _tmp183_ = NULL;
+											gchar* _tmp184_ = NULL;
+											gchar* _tmp185_ = NULL;
+											PrintJob* _tmp186_ = NULL;
+											GtkPrintContext* _tmp187_ = NULL;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp107_ = page_width;
+											_tmp176_ = dx;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp108_ = page_height;
+											_tmp177_ = canvas_width;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp109_ = photos;
+											_tmp178_ = dy;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp110_ = page_num;
+											_tmp179_ = canvas_height;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp111_ = gee_list_get (_tmp109_, _tmp110_);
+											_tmp180_ = photos;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp112_ = (Photo*) _tmp111_;
+											_tmp181_ = i;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp113_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_DATA_OBJECT, DataObject));
+											_tmp182_ = gee_list_get (_tmp180_, _tmp181_);
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp114_ = _tmp113_;
+											_tmp183_ = (Photo*) _tmp182_;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp115_ = job;
+											_tmp184_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp183_, TYPE_DATA_OBJECT, DataObject));
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp116_ = job_context;
+											_tmp185_ = _tmp184_;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					print_manager_add_title_to_canvas (self, _tmp107_ / 2, _tmp108_, _tmp114_, _tmp115_, _tmp116_);
+											_tmp186_ = job;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_g_free0 (_tmp114_);
+											_tmp187_ = job_context;
 #line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
-					_g_object_unref0 (_tmp112_);
-#line 7230 "Printing.c"
-				}
-			}
+											print_manager_add_title_to_canvas (self, _tmp176_ + (_tmp177_ / 2), _tmp178_ + _tmp179_, _tmp185_, _tmp186_, _tmp187_);
+#line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
+											_g_free0 (_tmp185_);
+#line 1002 "/home/jens/Source/shotwell/src/Printing.vala"
+											_g_object_unref0 (_tmp183_);
+#line 7249 "Printing.c"
+										}
+									}
 #line 1007 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp117_ = self->priv->progress_dialog;
+									_tmp188_ = self->priv->progress_dialog;
 #line 1007 "/home/jens/Source/shotwell/src/Printing.vala"
-			if (_tmp117_ != NULL) {
-#line 7237 "Printing.c"
-				ProgressDialog* _tmp118_ = NULL;
-				gint _tmp119_ = 0;
-				GeeList* _tmp120_ = NULL;
-				gint _tmp121_ = 0;
-				gint _tmp122_ = 0;
+									if (_tmp188_ != NULL) {
+#line 7256 "Printing.c"
+										ProgressDialog* _tmp189_ = NULL;
+										gint _tmp190_ = 0;
+										GeeList* _tmp191_ = NULL;
+										gint _tmp192_ = 0;
+										gint _tmp193_ = 0;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp118_ = self->priv->progress_dialog;
+										_tmp189_ = self->priv->progress_dialog;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp119_ = page_num;
+										_tmp190_ = i;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp120_ = photos;
+										_tmp191_ = photos;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp121_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, GEE_TYPE_COLLECTION, GeeCollection));
+										_tmp192_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp191_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				_tmp122_ = _tmp121_;
+										_tmp193_ = _tmp192_;
 #line 1008 "/home/jens/Source/shotwell/src/Printing.vala"
-				progress_dialog_monitor (_tmp118_, (guint64) _tmp119_, (guint64) _tmp122_, TRUE);
-#line 7255 "Printing.c"
-			}
-#line 1009 "/home/jens/Source/shotwell/src/Printing.vala"
-			break;
-#line 7259 "Printing.c"
-		}
-#line 970 "/home/jens/Source/shotwell/src/Printing.vala"
-		case CONTENT_LAYOUT_IMAGE_PER_PAGE:
-#line 7263 "Printing.c"
-		{
-			PrintLayout layout = 0;
-			PrintJob* _tmp123_ = NULL;
-			PrintSettings* _tmp124_ = NULL;
-			PrintSettings* _tmp125_ = NULL;
-			gint _tmp126_ = 0;
-			PrintLayout _tmp127_ = 0;
-			gint nx = 0;
-			PrintLayout _tmp128_ = 0;
-			gint _tmp129_ = 0;
-			gint ny = 0;
-			PrintLayout _tmp130_ = 0;
-			gint _tmp131_ = 0;
-			gint start = 0;
-			gint _tmp132_ = 0;
-			PrintLayout _tmp133_ = 0;
-			gint _tmp134_ = 0;
-			gdouble canvas_width = 0.0;
-			gdouble _tmp135_ = 0.0;
-			gint _tmp136_ = 0;
-			gint _tmp137_ = 0;
-			gdouble canvas_height = 0.0;
-			gdouble _tmp138_ = 0.0;
-			gint _tmp139_ = 0;
-			gint _tmp140_ = 0;
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp123_ = job;
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp124_ = print_job_get_local_settings (_tmp123_);
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp125_ = _tmp124_;
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp126_ = print_settings_get_image_per_page_selection (_tmp125_);
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp127_ = (PrintLayout) _tmp126_;
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			_print_settings_unref0 (_tmp125_);
-#line 1012 "/home/jens/Source/shotwell/src/Printing.vala"
-			layout = _tmp127_;
-#line 1013 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp128_ = layout;
-#line 1013 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp129_ = print_layout_get_x (_tmp128_);
-#line 1013 "/home/jens/Source/shotwell/src/Printing.vala"
-			nx = _tmp129_;
-#line 1014 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp130_ = layout;
-#line 1014 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp131_ = print_layout_get_y (_tmp130_);
-#line 1014 "/home/jens/Source/shotwell/src/Printing.vala"
-			ny = _tmp131_;
-#line 1015 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp132_ = page_num;
-#line 1015 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp133_ = layout;
-#line 1015 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp134_ = print_layout_get_per_page (_tmp133_);
-#line 1015 "/home/jens/Source/shotwell/src/Printing.vala"
-			start = _tmp132_ * _tmp134_;
-#line 1016 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp135_ = page_width;
-#line 1016 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp136_ = nx;
-#line 1016 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp137_ = nx;
-#line 1016 "/home/jens/Source/shotwell/src/Printing.vala"
-			canvas_width = ((gdouble) (_tmp135_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp136_ - 1)))) / _tmp137_;
-#line 1017 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp138_ = page_height;
-#line 1017 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp139_ = ny;
-#line 1017 "/home/jens/Source/shotwell/src/Printing.vala"
-			_tmp140_ = ny;
-#line 1017 "/home/jens/Source/shotwell/src/Printing.vala"
-			canvas_height = ((gdouble) (_tmp138_ - (PRINT_MANAGER_IMAGE_DISTANCE * (_tmp139_ - 1)))) / _tmp140_;
-#line 7339 "Printing.c"
-			{
-				gint y = 0;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-				y = 0;
-#line 7344 "Printing.c"
-				{
-					gboolean _tmp141_ = FALSE;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-					_tmp141_ = TRUE;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-					while (TRUE) {
-#line 7351 "Printing.c"
-						gint _tmp143_ = 0;
-						gint _tmp144_ = 0;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-						if (!_tmp141_) {
-#line 7356 "Printing.c"
-							gint _tmp142_ = 0;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-							_tmp142_ = y;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-							y = _tmp142_ + 1;
-#line 7362 "Printing.c"
-						}
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-						_tmp141_ = FALSE;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-						_tmp143_ = y;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-						_tmp144_ = ny;
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-						if (!(_tmp143_ < _tmp144_)) {
-#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
-							break;
-#line 7374 "Printing.c"
-						}
-						{
-							gint x = 0;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-							x = 0;
-#line 7380 "Printing.c"
-							{
-								gboolean _tmp145_ = FALSE;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-								_tmp145_ = TRUE;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-								while (TRUE) {
-#line 7387 "Printing.c"
-									gint _tmp147_ = 0;
-									gint _tmp148_ = 0;
-									gint i = 0;
-									gint _tmp149_ = 0;
-									gint _tmp150_ = 0;
-									gint _tmp151_ = 0;
-									gint _tmp152_ = 0;
-									gint _tmp153_ = 0;
-									GeeList* _tmp154_ = NULL;
-									gint _tmp155_ = 0;
-									gint _tmp156_ = 0;
-									ProgressDialog* _tmp190_ = NULL;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-									if (!_tmp145_) {
-#line 7402 "Printing.c"
-										gint _tmp146_ = 0;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp146_ = x;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-										x = _tmp146_ + 1;
-#line 7408 "Printing.c"
-									}
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp145_ = FALSE;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp147_ = x;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp148_ = nx;
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-									if (!(_tmp147_ < _tmp148_)) {
-#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
-										break;
-#line 7420 "Printing.c"
-									}
-#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp149_ = start;
-#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp150_ = y;
-#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp151_ = nx;
-#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp152_ = x;
-#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
-									i = (_tmp149_ + (_tmp150_ * _tmp151_)) + _tmp152_;
-#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp153_ = i;
-#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp154_ = photos;
-#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp155_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp154_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp156_ = _tmp155_;
-#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
-									if (_tmp153_ < _tmp156_) {
-#line 7442 "Printing.c"
-										gdouble dx = 0.0;
-										gint _tmp157_ = 0;
-										gdouble _tmp158_ = 0.0;
-										gint _tmp159_ = 0;
-										gdouble dy = 0.0;
-										gint _tmp160_ = 0;
-										gdouble _tmp161_ = 0.0;
-										gint _tmp162_ = 0;
-										GeeList* _tmp163_ = NULL;
-										gint _tmp164_ = 0;
-										gpointer _tmp165_ = NULL;
-										Photo* _tmp166_ = NULL;
-										gdouble _tmp167_ = 0.0;
-										gdouble _tmp168_ = 0.0;
-										gdouble _tmp169_ = 0.0;
-										gdouble _tmp170_ = 0.0;
-										PrintJob* _tmp171_ = NULL;
-										GtkPrintContext* _tmp172_ = NULL;
-										PrintJob* _tmp173_ = NULL;
-										PrintSettings* _tmp174_ = NULL;
-										PrintSettings* _tmp175_ = NULL;
-										gboolean _tmp176_ = FALSE;
-										gboolean _tmp177_ = FALSE;
-#line 1022 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp157_ = x;
-#line 1022 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp158_ = canvas_width;
-#line 1022 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp159_ = x;
-#line 1022 "/home/jens/Source/shotwell/src/Printing.vala"
-										dx = (_tmp157_ * _tmp158_) + (_tmp159_ * PRINT_MANAGER_IMAGE_DISTANCE);
-#line 1023 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp160_ = y;
-#line 1023 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp161_ = canvas_height;
-#line 1023 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp162_ = y;
-#line 1023 "/home/jens/Source/shotwell/src/Printing.vala"
-										dy = (_tmp160_ * _tmp161_) + (_tmp162_ * PRINT_MANAGER_IMAGE_DISTANCE);
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp163_ = photos;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp164_ = i;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp165_ = gee_list_get (_tmp163_, _tmp164_);
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp166_ = (Photo*) _tmp165_;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp167_ = dx;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp168_ = dy;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp169_ = canvas_width;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp170_ = canvas_height;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp171_ = job;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp172_ = job_context;
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										print_manager_fit_image_to_canvas (self, _tmp166_, _tmp167_, _tmp168_, _tmp169_, _tmp170_, FALSE, _tmp171_, _tmp172_);
-#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
-										_g_object_unref0 (_tmp166_);
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp173_ = job;
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp174_ = print_job_get_local_settings (_tmp173_);
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp175_ = _tmp174_;
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp176_ = print_settings_is_print_titles_enabled (_tmp175_);
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp177_ = _tmp176_;
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										_print_settings_unref0 (_tmp175_);
-#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
-										if (_tmp177_) {
-#line 7520 "Printing.c"
-											gdouble _tmp178_ = 0.0;
-											gdouble _tmp179_ = 0.0;
-											gdouble _tmp180_ = 0.0;
-											gdouble _tmp181_ = 0.0;
-											GeeList* _tmp182_ = NULL;
-											gint _tmp183_ = 0;
-											gpointer _tmp184_ = NULL;
-											Photo* _tmp185_ = NULL;
-											gchar* _tmp186_ = NULL;
-											gchar* _tmp187_ = NULL;
-											PrintJob* _tmp188_ = NULL;
-											GtkPrintContext* _tmp189_ = NULL;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp178_ = dx;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp179_ = canvas_width;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp180_ = dy;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp181_ = canvas_height;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp182_ = photos;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp183_ = i;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp184_ = gee_list_get (_tmp182_, _tmp183_);
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp185_ = (Photo*) _tmp184_;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp186_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp185_, TYPE_DATA_OBJECT, DataObject));
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp187_ = _tmp186_;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp188_ = job;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_tmp189_ = job_context;
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											print_manager_add_title_to_canvas (self, _tmp178_ + (_tmp179_ / 2), _tmp180_ + _tmp181_, _tmp187_, _tmp188_, _tmp189_);
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_g_free0 (_tmp187_);
-#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
-											_g_object_unref0 (_tmp185_);
-#line 7563 "Printing.c"
-										}
-									}
-#line 1032 "/home/jens/Source/shotwell/src/Printing.vala"
-									_tmp190_ = self->priv->progress_dialog;
-#line 1032 "/home/jens/Source/shotwell/src/Printing.vala"
-									if (_tmp190_ != NULL) {
-#line 7570 "Printing.c"
-										ProgressDialog* _tmp191_ = NULL;
-										gint _tmp192_ = 0;
-										GeeList* _tmp193_ = NULL;
-										gint _tmp194_ = 0;
-										gint _tmp195_ = 0;
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp191_ = self->priv->progress_dialog;
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp192_ = i;
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp193_ = photos;
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp194_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp193_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										_tmp195_ = _tmp194_;
-#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
-										progress_dialog_monitor (_tmp191_, (guint64) _tmp192_, (guint64) _tmp195_, TRUE);
-#line 7588 "Printing.c"
+										progress_dialog_monitor (_tmp189_, (guint64) _tmp190_, (guint64) _tmp193_, TRUE);
+#line 7274 "Printing.c"
 									}
 								}
 							}
@@ -7593,33 +7279,33 @@ static void print_manager_on_draw_page (PrintManager* self, GtkPrintOperation* e
 					}
 				}
 			}
-#line 1036 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Printing.vala"
 			break;
-#line 7598 "Printing.c"
+#line 7284 "Printing.c"
 		}
 		default:
 		{
-#line 1039 "/home/jens/Source/shotwell/src/Printing.vala"
-			g_error ("Printing.vala:1039: unknown or unsupported layout mode");
-#line 7604 "Printing.c"
+#line 1014 "/home/jens/Source/shotwell/src/Printing.vala"
+			g_error ("Printing.vala:1014: unknown or unsupported layout mode");
+#line 7290 "Printing.c"
 		}
 	}
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (photos);
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	_cairo_destroy0 (dc);
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (page_setup);
-#line 944 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 919 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (job);
-#line 7615 "Printing.c"
+#line 7301 "Printing.c"
 }
 
 
 static void _print_manager_on_custom_widget_apply_gtk_print_operation_custom_widget_apply (GtkPrintOperation* _sender, GtkWidget* widget, gpointer self) {
-#line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_on_custom_widget_apply ((PrintManager*) self, widget);
-#line 7622 "Printing.c"
+#line 7308 "Printing.c"
 }
 
 
@@ -7629,31 +7315,31 @@ static GObject* print_manager_on_create_custom_widget (PrintManager* self, GtkPr
 	CustomPrintTab* _tmp1_ = NULL;
 	GtkPrintOperation* _tmp2_ = NULL;
 	CustomPrintTab* _tmp3_ = NULL;
-#line 1043 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), NULL);
-#line 1043 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (GTK_IS_PRINT_OPERATION (emitting_object), NULL);
-#line 1044 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = emitting_object;
-#line 1044 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = custom_print_tab_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PRINT_JOB, PrintJob));
-#line 1044 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_object_ref_sink (_tmp1_);
-#line 1044 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->custom_tab);
-#line 1044 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->custom_tab = _tmp1_;
-#line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = emitting_object;
-#line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PRINT_JOB, PrintJob), gtk_print_operation_get_type (), GtkPrintOperation), "custom-widget-apply", (GCallback) _print_manager_on_custom_widget_apply_gtk_print_operation_custom_widget_apply, self);
-#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = self->priv->custom_tab;
-#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, G_TYPE_OBJECT, GObject);
-#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1021 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 7656 "Printing.c"
+#line 7342 "Printing.c"
 }
 
 
@@ -7667,41 +7353,41 @@ static void print_manager_on_custom_widget_apply (PrintManager* self, GtkWidget*
 	PrintSettings* _tmp5_ = NULL;
 	PrintSettings* _tmp6_ = NULL;
 	PrintSettings* _tmp7_ = NULL;
-#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_WIDGET (custom_widget));
-#line 1050 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = custom_widget;
-#line 1050 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_CUSTOM_PRINT_TAB, CustomPrintTab));
-#line 1050 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Printing.vala"
 	tab = _tmp1_;
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = custom_print_tab_get_source_job (tab);
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = _tmp2_;
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = custom_print_tab_get_local_settings (tab);
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_job_set_local_settings (_tmp3_, _tmp5_);
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp5_);
-#line 1051 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1026 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (_tmp3_);
-#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = custom_print_tab_get_local_settings (tab);
-#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = _tmp6_;
-#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_set_global_settings (self, _tmp7_);
-#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp7_);
-#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1024 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (tab);
-#line 7704 "Printing.c"
+#line 7390 "Printing.c"
 }
 
 
@@ -7748,61 +7434,61 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 	gint _tmp41_ = 0;
 	cairo_t* _tmp96_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_JOB (job));
-#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_CONTEXT (job_context));
-#line 1056 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = job_context;
-#line 1056 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1056 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1056 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1031 "/home/jens/Source/shotwell/src/Printing.vala"
 	dc = _tmp2_;
-#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = photo;
-#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Printing.vala"
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp4_);
-#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1032 "/home/jens/Source/shotwell/src/Printing.vala"
 	photo_dimensions = _tmp4_;
-#line 1058 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = dimensions_get_aspect_ratio (&photo_dimensions);
-#line 1058 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1033 "/home/jens/Source/shotwell/src/Printing.vala"
 	photo_aspect_ratio = _tmp5_;
-#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = canvas_width;
-#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = canvas_height;
-#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Printing.vala"
 	canvas_aspect_ratio = ((gdouble) _tmp6_) / _tmp7_;
-#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1036 "/home/jens/Source/shotwell/src/Printing.vala"
 	target_width = 0.0;
-#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Printing.vala"
 	target_height = 0.0;
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = job;
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = print_job_get_local_settings (_tmp8_);
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = print_settings_get_content_ppi (_tmp10_);
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = (gdouble) _tmp11_;
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp10_);
-#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1038 "/home/jens/Source/shotwell/src/Printing.vala"
 	dpi = _tmp12_;
-#line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = crop;
-#line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!_tmp13_) {
-#line 7805 "Printing.c"
+#line 7491 "Printing.c"
 		gdouble _tmp14_ = 0.0;
 		gdouble _tmp15_ = 0.0;
 		gdouble _tmp22_ = 0.0;
@@ -7811,133 +7497,133 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		gdouble _tmp25_ = 0.0;
 		gdouble _tmp26_ = 0.0;
 		gdouble _tmp27_ = 0.0;
-#line 1066 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp14_ = canvas_aspect_ratio;
-#line 1066 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp15_ = photo_aspect_ratio;
-#line 1066 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1041 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp14_ < _tmp15_) {
-#line 7820 "Printing.c"
+#line 7506 "Printing.c"
 			gdouble _tmp16_ = 0.0;
 			gdouble _tmp17_ = 0.0;
 			gdouble _tmp18_ = 0.0;
-#line 1067 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp16_ = canvas_width;
-#line 1067 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1042 "/home/jens/Source/shotwell/src/Printing.vala"
 			target_width = _tmp16_;
-#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp17_ = target_width;
-#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp18_ = photo_aspect_ratio;
-#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1043 "/home/jens/Source/shotwell/src/Printing.vala"
 			target_height = _tmp17_ * (1.0 / _tmp18_);
-#line 7834 "Printing.c"
+#line 7520 "Printing.c"
 		} else {
 			gdouble _tmp19_ = 0.0;
 			gdouble _tmp20_ = 0.0;
 			gdouble _tmp21_ = 0.0;
-#line 1070 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp19_ = canvas_height;
-#line 1070 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1045 "/home/jens/Source/shotwell/src/Printing.vala"
 			target_height = _tmp19_;
-#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp20_ = target_height;
-#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp21_ = photo_aspect_ratio;
-#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1046 "/home/jens/Source/shotwell/src/Printing.vala"
 			target_width = _tmp20_ * _tmp21_;
-#line 7849 "Printing.c"
+#line 7535 "Printing.c"
 		}
-#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp22_ = x;
-#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp23_ = canvas_width;
-#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp24_ = target_width;
-#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1048 "/home/jens/Source/shotwell/src/Printing.vala"
 		x = _tmp22_ + ((_tmp23_ - _tmp24_) / 2.0);
-#line 1074 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp25_ = y;
-#line 1074 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp26_ = canvas_height;
-#line 1074 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp27_ = target_height;
-#line 1074 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1049 "/home/jens/Source/shotwell/src/Printing.vala"
 		y = _tmp25_ + ((_tmp26_ - _tmp27_) / 2.0);
-#line 7867 "Printing.c"
+#line 7553 "Printing.c"
 	}
-#line 1077 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp28_ = dpi;
-#line 1077 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp29_ = x;
-#line 1077 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1052 "/home/jens/Source/shotwell/src/Printing.vala"
 	x_offset = _tmp28_ * _tmp29_;
-#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp30_ = dpi;
-#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp31_ = y;
-#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1053 "/home/jens/Source/shotwell/src/Printing.vala"
 	y_offset = _tmp30_ * _tmp31_;
-#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp32_ = dc;
-#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1054 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_save (_tmp32_);
-#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp33_ = dc;
-#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp34_ = x_offset;
-#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp35_ = y_offset;
-#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_translate (_tmp33_, _tmp34_, _tmp35_);
-#line 1082 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp36_ = dpi;
-#line 1082 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp37_ = canvas_width;
-#line 1082 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1057 "/home/jens/Source/shotwell/src/Printing.vala"
 	w = (gint) (_tmp36_ * _tmp37_);
-#line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp38_ = dpi;
-#line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp39_ = canvas_height;
-#line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1058 "/home/jens/Source/shotwell/src/Printing.vala"
 	h = (gint) (_tmp38_ * _tmp39_);
-#line 1084 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp40_ = w;
-#line 1084 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp41_ = h;
-#line 1084 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1059 "/home/jens/Source/shotwell/src/Printing.vala"
 	dimensions_init (&viewport, _tmp40_, _tmp41_);
-#line 7911 "Printing.c"
+#line 7597 "Printing.c"
 	{
 		gboolean _tmp42_ = FALSE;
 		gboolean _tmp43_ = FALSE;
 		cairo_t* _tmp89_ = NULL;
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp43_ = crop;
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp43_) {
-#line 7920 "Printing.c"
+#line 7606 "Printing.c"
 			gdouble _tmp44_ = 0.0;
 			gdouble _tmp45_ = 0.0;
 			gboolean _tmp46_ = FALSE;
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp44_ = canvas_aspect_ratio;
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp45_ = photo_aspect_ratio;
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp46_ = print_manager_are_approximately_equal (self, _tmp44_, _tmp45_);
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp42_ = !_tmp46_;
-#line 7932 "Printing.c"
+#line 7618 "Printing.c"
 		} else {
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp42_ = FALSE;
-#line 7936 "Printing.c"
+#line 7622 "Printing.c"
 		}
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (_tmp42_) {
-#line 7940 "Printing.c"
+#line 7626 "Printing.c"
 			Scaling pixbuf_scaling = {0};
 			Dimensions _tmp47_ = {0};
 			Scaling _tmp48_ = {0};
@@ -7967,121 +7653,121 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			GdkPixbuf* _tmp77_ = NULL;
 			cairo_t* _tmp78_ = NULL;
 			GdkPixbuf* _tmp79_ = NULL;
-#line 1088 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp47_ = viewport;
-#line 1088 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
 			scaling_to_fill_viewport (&_tmp47_, &_tmp48_);
-#line 1088 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1063 "/home/jens/Source/shotwell/src/Printing.vala"
 			pixbuf_scaling = _tmp48_;
-#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp49_ = photo;
-#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp50_ = pixbuf_scaling;
-#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp51_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp50_, &_inner_error_);
-#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			photo_pixbuf = _tmp51_;
-#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1064 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7986 "Printing.c"
-				goto __catch468_g_error;
+#line 7672 "Printing.c"
+				goto __catch469_g_error;
 			}
-#line 1090 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp52_ = photo_pixbuf;
-#line 1090 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
 			dimensions_for_pixbuf (_tmp52_, &_tmp53_);
-#line 1090 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1065 "/home/jens/Source/shotwell/src/Printing.vala"
 			scaled_photo_dimensions = _tmp53_;
-#line 1091 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1066 "/home/jens/Source/shotwell/src/Printing.vala"
 			shave_vertical = 0;
-#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1067 "/home/jens/Source/shotwell/src/Printing.vala"
 			shave_horizontal = 0;
-#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp54_ = canvas_aspect_ratio;
-#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp55_ = photo_aspect_ratio;
-#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1068 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (_tmp54_ < _tmp55_) {
-#line 8005 "Printing.c"
+#line 7691 "Printing.c"
 				Dimensions _tmp56_ = {0};
 				gint _tmp57_ = 0;
 				Dimensions _tmp58_ = {0};
 				gint _tmp59_ = 0;
 				gdouble _tmp60_ = 0.0;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp56_ = scaled_photo_dimensions;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp57_ = _tmp56_.width;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp58_ = scaled_photo_dimensions;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp59_ = _tmp58_.height;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp60_ = canvas_aspect_ratio;
-#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1069 "/home/jens/Source/shotwell/src/Printing.vala"
 				shave_vertical = (gint) ((_tmp57_ - (_tmp59_ * _tmp60_)) / 2.0);
-#line 8023 "Printing.c"
+#line 7709 "Printing.c"
 			} else {
 				Dimensions _tmp61_ = {0};
 				gint _tmp62_ = 0;
 				Dimensions _tmp63_ = {0};
 				gint _tmp64_ = 0;
 				gdouble _tmp65_ = 0.0;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp61_ = scaled_photo_dimensions;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp62_ = _tmp61_.height;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp63_ = scaled_photo_dimensions;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp64_ = _tmp63_.width;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				_tmp65_ = canvas_aspect_ratio;
-#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1071 "/home/jens/Source/shotwell/src/Printing.vala"
 				shave_horizontal = (gint) ((_tmp62_ - (_tmp64_ * (1.0 / _tmp65_))) / 2.0);
-#line 8042 "Printing.c"
+#line 7728 "Printing.c"
 			}
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp66_ = photo_pixbuf;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp67_ = shave_vertical;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp68_ = shave_horizontal;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp69_ = scaled_photo_dimensions;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp70_ = _tmp69_.width;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp71_ = shave_vertical;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp72_ = scaled_photo_dimensions;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp73_ = _tmp72_.height;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp74_ = shave_horizontal;
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp75_ = gdk_pixbuf_new_subpixbuf (_tmp66_, _tmp67_, _tmp68_, _tmp70_ - (2 * _tmp71_), _tmp73_ - (2 * _tmp74_));
-#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1073 "/home/jens/Source/shotwell/src/Printing.vala"
 			shaved_pixbuf = _tmp75_;
-#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp76_ = shaved_pixbuf;
-#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp77_ = scaling_perform_on_pixbuf (&pixbuf_scaling, _tmp76_, GDK_INTERP_HYPER, TRUE);
-#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (photo_pixbuf);
-#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1075 "/home/jens/Source/shotwell/src/Printing.vala"
 			photo_pixbuf = _tmp77_;
-#line 1101 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp78_ = dc;
-#line 1101 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp79_ = photo_pixbuf;
-#line 1101 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1076 "/home/jens/Source/shotwell/src/Printing.vala"
 			gdk_cairo_set_source_pixbuf (_tmp78_, _tmp79_, 0.0, 0.0);
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (shaved_pixbuf);
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (photo_pixbuf);
-#line 8084 "Printing.c"
+#line 7770 "Printing.c"
 		} else {
 			Scaling pixbuf_scaling = {0};
 			Dimensions _tmp80_ = {0};
@@ -8094,51 +7780,51 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 			GdkPixbuf* _tmp86_ = NULL;
 			cairo_t* _tmp87_ = NULL;
 			GdkPixbuf* _tmp88_ = NULL;
-#line 1103 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp80_ = viewport;
-#line 1103 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
 			scaling_for_viewport (&_tmp80_, TRUE, &_tmp81_);
-#line 1103 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1078 "/home/jens/Source/shotwell/src/Printing.vala"
 			pixbuf_scaling = _tmp81_;
-#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp82_ = photo;
-#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp83_ = pixbuf_scaling;
-#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp84_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp83_, &_inner_error_);
-#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			photo_pixbuf = _tmp84_;
-#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1079 "/home/jens/Source/shotwell/src/Printing.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8113 "Printing.c"
-				goto __catch468_g_error;
+#line 7799 "Printing.c"
+				goto __catch469_g_error;
 			}
-#line 1105 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp85_ = photo_pixbuf;
-#line 1105 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp86_ = scaling_perform_on_pixbuf (&pixbuf_scaling, _tmp85_, GDK_INTERP_HYPER, TRUE);
-#line 1105 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (photo_pixbuf);
-#line 1105 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1080 "/home/jens/Source/shotwell/src/Printing.vala"
 			photo_pixbuf = _tmp86_;
-#line 1106 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp87_ = dc;
-#line 1106 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Printing.vala"
 			_tmp88_ = photo_pixbuf;
-#line 1106 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1081 "/home/jens/Source/shotwell/src/Printing.vala"
 			gdk_cairo_set_source_pixbuf (_tmp87_, _tmp88_, 0.0, 0.0);
-#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1062 "/home/jens/Source/shotwell/src/Printing.vala"
 			_g_object_unref0 (photo_pixbuf);
-#line 8132 "Printing.c"
+#line 7818 "Printing.c"
 		}
-#line 1108 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp89_ = dc;
-#line 1108 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1083 "/home/jens/Source/shotwell/src/Printing.vala"
 		cairo_paint (_tmp89_);
-#line 8138 "Printing.c"
+#line 7824 "Printing.c"
 	}
-	goto __finally468;
-	__catch468_g_error:
+	goto __finally469;
+	__catch469_g_error:
 	{
 		GError* e = NULL;
 		PrintJob* _tmp90_ = NULL;
@@ -8147,59 +7833,59 @@ static void print_manager_fit_image_to_canvas (PrintManager* self, Photo* photo,
 		const gchar* _tmp93_ = NULL;
 		gchar* _tmp94_ = NULL;
 		gchar* _tmp95_ = NULL;
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		e = _inner_error_;
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		_inner_error_ = NULL;
-#line 1111 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp90_ = job;
-#line 1111 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
 		gtk_print_operation_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, gtk_print_operation_get_type (), GtkPrintOperation));
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp91_ = _ ("Unable to print photo:\n\n%s");
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp92_ = e;
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp93_ = _tmp92_->message;
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp94_ = g_strdup_printf (_tmp91_, _tmp93_);
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_tmp95_ = _tmp94_;
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		app_window_error_message (_tmp95_, NULL);
-#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1087 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_free0 (_tmp95_);
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		_g_error_free0 (e);
-#line 8174 "Printing.c"
+#line 7860 "Printing.c"
 	}
-	__finally468:
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+	__finally469:
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		_cairo_destroy0 (dc);
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_clear_error (&_inner_error_);
-#line 1086 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1061 "/home/jens/Source/shotwell/src/Printing.vala"
 		return;
-#line 8187 "Printing.c"
+#line 7873 "Printing.c"
 	}
-#line 1114 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp96_ = dc;
-#line 1114 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1089 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_restore (_tmp96_);
-#line 1055 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Printing.vala"
 	_cairo_destroy0 (dc);
-#line 8195 "Printing.c"
+#line 7881 "Printing.c"
 }
 
 
 static void _vala_PangoFontDescription_free (PangoFontDescription* self) {
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_boxed_free (pango_font_description_get_type (), self);
-#line 8202 "Printing.c"
+#line 7888 "Printing.c"
 }
 
 
@@ -8236,115 +7922,115 @@ static void print_manager_add_title_to_canvas (PrintManager* self, gdouble x, gd
 	gdouble _tmp21_ = 0.0;
 	gdouble ty = 0.0;
 	gdouble _tmp22_ = 0.0;
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (title != NULL);
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_JOB (job));
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (GTK_IS_PRINT_CONTEXT (job_context));
-#line 1118 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = job_context;
-#line 1118 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = gtk_print_context_get_cairo_context (_tmp0_);
-#line 1118 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = _cairo_reference0 (_tmp1_);
-#line 1118 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1093 "/home/jens/Source/shotwell/src/Printing.vala"
 	dc = _tmp2_;
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp3_ = job;
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp4_ = print_job_get_local_settings (_tmp3_);
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp5_ = _tmp4_;
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp6_ = print_settings_get_content_ppi (_tmp5_);
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp7_ = (gdouble) _tmp6_;
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp5_);
-#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1094 "/home/jens/Source/shotwell/src/Printing.vala"
 	dpi = _tmp7_;
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp8_ = job;
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp9_ = print_job_get_local_settings (_tmp8_);
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp10_ = _tmp9_;
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp11_ = print_settings_get_print_titles_font (_tmp10_);
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp12_ = _tmp11_;
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp13_ = pango_font_description_from_string (_tmp12_);
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp14_ = _tmp13_;
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_free0 (_tmp12_);
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (_tmp10_);
-#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1095 "/home/jens/Source/shotwell/src/Printing.vala"
 	title_font_description = _tmp14_;
-#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp15_ = pango_cairo_create_layout (dc);
-#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1096 "/home/jens/Source/shotwell/src/Printing.vala"
 	title_layout = _tmp15_;
-#line 1122 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp16_ = pango_layout_get_context (title_layout);
-#line 1122 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp17_ = _g_object_ref0 (_tmp16_);
-#line 1122 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1097 "/home/jens/Source/shotwell/src/Printing.vala"
 	context = _tmp17_;
-#line 1123 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1098 "/home/jens/Source/shotwell/src/Printing.vala"
 	pango_cairo_context_set_resolution (context, dpi);
-#line 1124 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1099 "/home/jens/Source/shotwell/src/Printing.vala"
 	pango_layout_set_font_description (title_layout, title_font_description);
-#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp18_ = title;
-#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1100 "/home/jens/Source/shotwell/src/Printing.vala"
 	pango_layout_set_text (title_layout, _tmp18_, -1);
-#line 1127 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Printing.vala"
 	pango_layout_get_pixel_size (title_layout, &_tmp19_, &_tmp20_);
-#line 1127 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Printing.vala"
 	title_width = _tmp19_;
-#line 1127 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1102 "/home/jens/Source/shotwell/src/Printing.vala"
 	title_height = _tmp20_;
-#line 1128 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp21_ = x;
-#line 1128 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1103 "/home/jens/Source/shotwell/src/Printing.vala"
 	tx = (dpi * _tmp21_) - (title_width / 2);
-#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp22_ = y;
-#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1104 "/home/jens/Source/shotwell/src/Printing.vala"
 	ty = (dpi * _tmp22_) - title_height;
-#line 1132 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1107 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_rectangle (dc, tx - 10, ty + 2, (gdouble) (title_width + 20), (gdouble) title_height);
-#line 1133 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1108 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_set_source_rgba (dc, (gdouble) 1, (gdouble) 1, (gdouble) 1, (gdouble) 1);
-#line 1134 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1109 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_set_line_width (dc, (gdouble) 2);
-#line 1135 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1110 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_stroke_preserve (dc);
-#line 1136 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1111 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_set_source_rgba (dc, (gdouble) 1, (gdouble) 1, (gdouble) 1, 0.5);
-#line 1137 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1112 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_fill (dc);
-#line 1138 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1113 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_set_source_rgba (dc, (gdouble) 0, (gdouble) 0, (gdouble) 0, (gdouble) 1);
-#line 1140 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1115 "/home/jens/Source/shotwell/src/Printing.vala"
 	cairo_move_to (dc, tx, ty + 2);
-#line 1141 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1116 "/home/jens/Source/shotwell/src/Printing.vala"
 	pango_cairo_show_layout (dc, title_layout);
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (context);
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (title_layout);
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	__vala_PangoFontDescription_free0 (title_font_description);
-#line 1117 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1092 "/home/jens/Source/shotwell/src/Printing.vala"
 	_cairo_destroy0 (dc);
-#line 8347 "Printing.c"
+#line 8033 "Printing.c"
 }
 
 
@@ -8354,21 +8040,21 @@ static gboolean print_manager_are_approximately_equal (PrintManager* self, gdoub
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-#line 1144 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1119 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), FALSE);
-#line 1145 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1120 "/home/jens/Source/shotwell/src/Printing.vala"
 	accept_err = 0.005;
-#line 1146 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = val1;
-#line 1146 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = val2;
-#line 1146 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = fabs (_tmp0_ - _tmp1_);
-#line 1146 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp2_ <= accept_err;
-#line 1146 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1121 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 8371 "Printing.c"
+#line 8057 "Printing.c"
 }
 
 
@@ -8376,17 +8062,17 @@ PrintSettings* print_manager_get_global_settings (PrintManager* self) {
 	PrintSettings* result = NULL;
 	PrintSettings* _tmp0_ = NULL;
 	PrintSettings* _tmp1_ = NULL;
-#line 1149 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1124 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (IS_PRINT_MANAGER (self), NULL);
-#line 1150 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = self->priv->settings;
-#line 1150 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _print_settings_ref0 (_tmp0_);
-#line 1150 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
 	result = _tmp1_;
-#line 1150 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1125 "/home/jens/Source/shotwell/src/Printing.vala"
 	return result;
-#line 8389 "Printing.c"
+#line 8075 "Printing.c"
 }
 
 
@@ -8394,247 +8080,255 @@ void print_manager_set_global_settings (PrintManager* self, PrintSettings* setti
 	PrintSettings* _tmp0_ = NULL;
 	PrintSettings* _tmp1_ = NULL;
 	PrintSettings* _tmp2_ = NULL;
-#line 1153 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_MANAGER (self));
-#line 1153 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1128 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (IS_PRINT_SETTINGS (settings));
-#line 1154 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp0_ = settings;
-#line 1154 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp1_ = _print_settings_ref0 (_tmp0_);
-#line 1154 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 1154 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1129 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->settings = _tmp1_;
-#line 1155 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Printing.vala"
 	_tmp2_ = settings;
-#line 1155 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 1130 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_settings_save (_tmp2_);
-#line 8413 "Printing.c"
+#line 8099 "Printing.c"
 }
 
 
 static void value_print_manager_init (GValue* value) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	value->data[0].v_pointer = NULL;
-#line 8420 "Printing.c"
+#line 8106 "Printing.c"
 }
 
 
 static void value_print_manager_free_value (GValue* value) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (value->data[0].v_pointer) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_unref (value->data[0].v_pointer);
-#line 8429 "Printing.c"
+#line 8115 "Printing.c"
 	}
 }
 
 
 static void value_print_manager_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (src_value->data[0].v_pointer) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = print_manager_ref (src_value->data[0].v_pointer);
-#line 8439 "Printing.c"
+#line 8125 "Printing.c"
 	} else {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 8443 "Printing.c"
+#line 8129 "Printing.c"
 	}
 }
 
 
 static gpointer value_print_manager_peek_pointer (const GValue* value) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 8451 "Printing.c"
+#line 8137 "Printing.c"
 }
 
 
 static gchar* value_print_manager_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (collect_values[0].v_pointer) {
-#line 8458 "Printing.c"
+#line 8144 "Printing.c"
 		PrintManager* object;
 		object = collect_values[0].v_pointer;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 8465 "Printing.c"
+#line 8151 "Printing.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.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 8469 "Printing.c"
+#line 8155 "Printing.c"
 		}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = print_manager_ref (object);
-#line 8473 "Printing.c"
+#line 8159 "Printing.c"
 	} else {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8477 "Printing.c"
+#line 8163 "Printing.c"
 	}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 8481 "Printing.c"
+#line 8167 "Printing.c"
 }
 
 
 static gchar* value_print_manager_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	PrintManager** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!object_p) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 8492 "Printing.c"
+#line 8178 "Printing.c"
 	}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (!value->data[0].v_pointer) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = NULL;
-#line 8498 "Printing.c"
+#line 8184 "Printing.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = value->data[0].v_pointer;
-#line 8502 "Printing.c"
+#line 8188 "Printing.c"
 	} else {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		*object_p = print_manager_ref (value->data[0].v_pointer);
-#line 8506 "Printing.c"
+#line 8192 "Printing.c"
 	}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return NULL;
-#line 8510 "Printing.c"
+#line 8196 "Printing.c"
 }
 
 
 GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	ParamSpecPrintManager* spec;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, TYPE_PRINT_MANAGER), NULL);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return G_PARAM_SPEC (spec);
-#line 8524 "Printing.c"
+#line 8210 "Printing.c"
 }
 
 
 gpointer value_get_print_manager (const GValue* value) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER), NULL);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return value->data[0].v_pointer;
-#line 8533 "Printing.c"
+#line 8219 "Printing.c"
 }
 
 
 void value_set_print_manager (GValue* value, gpointer v_object) {
 	PrintManager* old;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	old = value->data[0].v_pointer;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (v_object) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PRINT_MANAGER));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_ref (value->data[0].v_pointer);
-#line 8553 "Printing.c"
+#line 8239 "Printing.c"
 	} else {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8557 "Printing.c"
+#line 8243 "Printing.c"
 	}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_unref (old);
-#line 8563 "Printing.c"
+#line 8249 "Printing.c"
 	}
 }
 
 
 void value_take_print_manager (GValue* value, gpointer v_object) {
 	PrintManager* old;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PRINT_MANAGER));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	old = value->data[0].v_pointer;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (v_object) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, TYPE_PRINT_MANAGER));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = v_object;
-#line 8582 "Printing.c"
+#line 8268 "Printing.c"
 	} else {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		value->data[0].v_pointer = NULL;
-#line 8586 "Printing.c"
+#line 8272 "Printing.c"
 	}
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (old) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		print_manager_unref (old);
-#line 8592 "Printing.c"
+#line 8278 "Printing.c"
 	}
 }
 
 
 static void print_manager_class_init (PrintManagerClass * klass) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	print_manager_parent_class = g_type_class_peek_parent (klass);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	((PrintManagerClass *) klass)->finalize = print_manager_finalize;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_type_class_add_private (klass, sizeof (PrintManagerPrivate));
-#line 8604 "Printing.c"
+#line 8290 "Printing.c"
 }
 
 
 static void print_manager_instance_init (PrintManager * self) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv = PRINT_MANAGER_GET_PRIVATE (self);
-#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->progress_dialog = NULL;
-#line 808 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 780 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->priv->cancellable = NULL;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 781 "/home/jens/Source/shotwell/src/Printing.vala"
+	self->priv->standard_sizes = NULL;
+#line 781 "/home/jens/Source/shotwell/src/Printing.vala"
+	self->priv->standard_sizes_length1 = 0;
+#line 781 "/home/jens/Source/shotwell/src/Printing.vala"
+	self->priv->_standard_sizes_size_ = self->priv->standard_sizes_length1;
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	self->ref_count = 1;
-#line 8617 "Printing.c"
+#line 8309 "Printing.c"
 }
 
 
 static void print_manager_finalize (PrintManager* obj) {
 	PrintManager * self;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PRINT_MANAGER, PrintManager);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_signal_handlers_destroy (self);
-#line 804 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 776 "/home/jens/Source/shotwell/src/Printing.vala"
 	_print_settings_unref0 (self->priv->settings);
-#line 805 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 777 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->user_page_setup);
-#line 806 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 778 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->custom_tab);
-#line 807 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 779 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->progress_dialog);
-#line 808 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 780 "/home/jens/Source/shotwell/src/Printing.vala"
 	_g_object_unref0 (self->priv->cancellable);
-#line 8637 "Printing.c"
+#line 781 "/home/jens/Source/shotwell/src/Printing.vala"
+	self->priv->standard_sizes = (_vala_array_free (self->priv->standard_sizes, self->priv->standard_sizes_length1, (GDestroyNotify) standard_print_size_unref), NULL);
+#line 8331 "Printing.c"
 }
 
 
@@ -8655,24 +8349,24 @@ GType print_manager_get_type (void) {
 gpointer print_manager_ref (gpointer instance) {
 	PrintManager* self;
 	self = instance;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	return instance;
-#line 8662 "Printing.c"
+#line 8356 "Printing.c"
 }
 
 
 void print_manager_unref (gpointer instance) {
 	PrintManager* self;
 	self = instance;
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		PRINT_MANAGER_GET_CLASS (self)->finalize (self);
-#line 799 "/home/jens/Source/shotwell/src/Printing.vala"
+#line 771 "/home/jens/Source/shotwell/src/Printing.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 8675 "Printing.c"
+#line 8369 "Printing.c"
 	}
 }
 
diff --git a/src/Printing.vala b/src/Printing.vala
index d5a84e5..988a456 100644
--- a/src/Printing.vala
+++ b/src/Printing.vala
@@ -265,23 +265,36 @@ private enum PrintLayout {
     }
 }
 
-public class CustomPrintTab : Gtk.Fixed {
+[GtkTemplate (ui = "/org/gnome/Shotwell/ui/printing_widget.ui")]
+public class CustomPrintTab : Gtk.Box {
     private const int INCHES_COMBO_CHOICE = 0;
     private const int CENTIMETERS_COMBO_CHOICE = 1;
 
-    private Gtk.Box custom_image_settings_pane = null;
-    private Gtk.RadioButton standard_size_radio = null;
-    private Gtk.RadioButton custom_size_radio = null;
-    private Gtk.RadioButton image_per_page_radio = null;
-    private Gtk.ComboBox image_per_page_combo = null;
-    private Gtk.ComboBox standard_sizes_combo = null;
-    private Gtk.ComboBoxText units_combo = null;
-    private Gtk.Entry custom_width_entry = null;
-    private Gtk.Entry custom_height_entry = null;
+    [GtkChild]
+    private Gtk.RadioButton standard_size_radio;
+    [GtkChild]
+    private Gtk.RadioButton custom_size_radio;
+    [GtkChild]
+    private Gtk.RadioButton image_per_page_radio;
+    [GtkChild]
+    private Gtk.ComboBoxText image_per_page_combo;
+    [GtkChild]
+    private Gtk.ComboBoxText standard_sizes_combo;
+    [GtkChild]
+    private Gtk.ComboBoxText units_combo;
+    [GtkChild]
+    private Gtk.Entry custom_width_entry;
+    [GtkChild]
+    private Gtk.Entry custom_height_entry;
+    [GtkChild]
     private Gtk.Entry ppi_entry;
-    private Gtk.CheckButton aspect_ratio_check = null;
-    private Gtk.CheckButton title_print_check = null;
-    private Gtk.FontButton title_print_font = null;
+    [GtkChild]
+    private Gtk.CheckButton aspect_ratio_check;
+    [GtkChild]
+    private Gtk.CheckButton title_print_check;
+    [GtkChild]
+    private Gtk.FontButton title_print_font;
+
     private Measurement local_content_width = Measurement(5.0, MeasurementUnit.INCHES);
     private Measurement local_content_height = Measurement(5.0, MeasurementUnit.INCHES);
     private int local_content_ppi;
@@ -290,76 +303,35 @@ public class CustomPrintTab : Gtk.Fixed {
 
     public CustomPrintTab(PrintJob source_job) {
         this.source_job = source_job;
-        Gtk.Builder builder = AppWindow.create_builder();
-
-        // an enclosing box for every widget on this tab...
-        custom_image_settings_pane = builder.get_object("box_ImgSettingsPane") as Gtk.Box;
 
-        standard_size_radio = builder.get_object("radio_UseStandardSize") as Gtk.RadioButton;
         standard_size_radio.clicked.connect(on_radio_group_click);
-        
-        custom_size_radio = builder.get_object("radio_UseCustomSize") as Gtk.RadioButton;
         custom_size_radio.clicked.connect(on_radio_group_click);
-
-        image_per_page_radio = builder.get_object("radio_Autosize") as Gtk.RadioButton;
         image_per_page_radio.clicked.connect(on_radio_group_click);
 
-        image_per_page_combo = builder.get_object("combo_Autosize") as Gtk.ComboBox;
-        Gtk.CellRendererText image_per_page_combo_text_renderer =
-            new Gtk.CellRendererText();
-        image_per_page_combo.pack_start(image_per_page_combo_text_renderer, true);
-        image_per_page_combo.add_attribute(image_per_page_combo_text_renderer,
-            "text", 0);
-        Gtk.ListStore image_per_page_combo_store = new Gtk.ListStore(2, typeof(string),
-            typeof(string));
         foreach (PrintLayout layout in PrintLayout.get_all()) {
-            Gtk.TreeIter iter;
-            image_per_page_combo_store.append(out iter);
-            image_per_page_combo_store.set_value(iter, 0, layout.to_string());
+            image_per_page_combo.append_text(layout.to_string());
         }
-        image_per_page_combo.set_model(image_per_page_combo_store);
-
-        StandardPrintSize[] standard_sizes = PrintManager.get_instance().get_standard_sizes();
-        standard_sizes_combo = builder.get_object("combo_StdSizes") as Gtk.ComboBox;
-        Gtk.CellRendererText standard_sizes_combo_text_renderer =
-            new Gtk.CellRendererText();
-        standard_sizes_combo.pack_start(standard_sizes_combo_text_renderer, true);
-        standard_sizes_combo.add_attribute(standard_sizes_combo_text_renderer,
-            "text", 0);
+
+        unowned StandardPrintSize[] standard_sizes = PrintManager.get_instance().get_standard_sizes();
         standard_sizes_combo.set_row_separator_func(standard_sizes_combo_separator_func);
-        Gtk.ListStore standard_sizes_combo_store = new Gtk.ListStore(1, typeof(string),
-            typeof(string));
         foreach (StandardPrintSize size in standard_sizes) {
-            Gtk.TreeIter iter;
-            standard_sizes_combo_store.append(out iter);
-            standard_sizes_combo_store.set_value(iter, 0, size.name);
+            standard_sizes_combo.append_text(size.name);
         }
-        standard_sizes_combo.set_model(standard_sizes_combo_store);
 
-        custom_width_entry = builder.get_object("entry_CustomWidth") as Gtk.Entry;
+        standard_sizes_combo.set_active(9 * Resources.get_default_measurement_unit());
+
         custom_width_entry.insert_text.connect(on_entry_insert_text);
         custom_width_entry.focus_out_event.connect(on_width_entry_focus_out);
 
-        custom_height_entry = builder.get_object("entry_CustomHeight") as Gtk.Entry;
         custom_height_entry.insert_text.connect(on_entry_insert_text);
         custom_height_entry.focus_out_event.connect(on_height_entry_focus_out);
 
-        units_combo = builder.get_object("combo_Units") as Gtk.ComboBoxText;
-        units_combo.append_text(_("in."));
-        units_combo.append_text(_("cm"));
-        units_combo.set_active(0);
         units_combo.changed.connect(on_units_combo_changed);
+        units_combo.set_active(Resources.get_default_measurement_unit());
 
-        aspect_ratio_check = builder.get_object("check_MatchAspectRatio") as Gtk.CheckButton;
-        title_print_check = builder.get_object("check_PrintImageTitle") as Gtk.CheckButton;
-        title_print_font = builder.get_object("fntbn_TitleFont") as Gtk.FontButton;
-
-        ppi_entry = builder.get_object("entry_PixelsPerInch") as Gtk.Entry;
         ppi_entry.insert_text.connect(on_ppi_entry_insert_text);
         ppi_entry.focus_out_event.connect(on_ppi_entry_focus_out);
 
-        this.add(custom_image_settings_pane);
-
         sync_state_from_job(source_job);
 
         show_all();
@@ -613,7 +585,7 @@ public class CustomPrintTab : Gtk.Fixed {
         Value val;
         model.get_value(iter, 0, out val);
 
-        return (val.dup_string() == "-");
+        return (val.get_string() == "-");
     }
 
     private void set_content_layout(ContentLayout content_layout) {
@@ -806,62 +778,65 @@ public class PrintManager {
     private CustomPrintTab custom_tab;
     private ProgressDialog? progress_dialog = null;
     private Cancellable? cancellable = null;
+    private StandardPrintSize[] standard_sizes = null;
     
     private PrintManager() {
         user_page_setup = new Gtk.PageSetup();
         settings = new PrintSettings();
     }
 
-    public StandardPrintSize[] get_standard_sizes() {
-        StandardPrintSize[] result = new StandardPrintSize[0];
-
-        result += new StandardPrintSize(_("Wallet (2 × 3 in.)"),
-            Measurement(3, MeasurementUnit.INCHES),
-            Measurement(2, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("Notecard (3 × 5 in.)"),
-            Measurement(5, MeasurementUnit.INCHES),
-            Measurement(3, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("4 × 6 in."),
-            Measurement(6, MeasurementUnit.INCHES),
-            Measurement(4, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("5 × 7 in."),
-            Measurement(7, MeasurementUnit.INCHES),
-            Measurement(5, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("8 × 10 in."),
-            Measurement(10, MeasurementUnit.INCHES),
-            Measurement(8, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("11 × 14 in."),
-            Measurement(14, MeasurementUnit.INCHES),
-            Measurement(11, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("16 × 20 in."),
-            Measurement(20, MeasurementUnit.INCHES),
-            Measurement(16, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(("-"),
-            Measurement(0, MeasurementUnit.INCHES),
-            Measurement(0, MeasurementUnit.INCHES));
-        result += new StandardPrintSize(_("Metric Wallet (9 × 13 cm)"),
-            Measurement(13, MeasurementUnit.CENTIMETERS),
-            Measurement(9, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("Postcard (10 × 15 cm)"),
-            Measurement(15, MeasurementUnit.CENTIMETERS),
-            Measurement(10, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("13 × 18 cm"),
-            Measurement(18, MeasurementUnit.CENTIMETERS),
-            Measurement(13, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("18 × 24 cm"),
-            Measurement(24, MeasurementUnit.CENTIMETERS),
-            Measurement(18, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("20 × 30 cm"),
-            Measurement(30, MeasurementUnit.CENTIMETERS),
-            Measurement(20, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("24 × 40 cm"),
-            Measurement(40, MeasurementUnit.CENTIMETERS),
-            Measurement(24, MeasurementUnit.CENTIMETERS));
-        result += new StandardPrintSize(_("30 × 40 cm"),
-            Measurement(40, MeasurementUnit.CENTIMETERS),
-            Measurement(30, MeasurementUnit.CENTIMETERS));
+    public unowned StandardPrintSize[] get_standard_sizes() {
+        if (standard_sizes == null) {
+            standard_sizes = new StandardPrintSize[0];
+
+            standard_sizes += new StandardPrintSize(_("Wallet (2 × 3 in.)"),
+                    Measurement(3, MeasurementUnit.INCHES),
+                    Measurement(2, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("Notecard (3 × 5 in.)"),
+                    Measurement(5, MeasurementUnit.INCHES),
+                    Measurement(3, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("4 × 6 in."),
+                    Measurement(6, MeasurementUnit.INCHES),
+                    Measurement(4, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("5 × 7 in."),
+                    Measurement(7, MeasurementUnit.INCHES),
+                    Measurement(5, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("8 × 10 in."),
+                    Measurement(10, MeasurementUnit.INCHES),
+                    Measurement(8, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("11 × 14 in."),
+                    Measurement(14, MeasurementUnit.INCHES),
+                    Measurement(11, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("16 × 20 in."),
+                    Measurement(20, MeasurementUnit.INCHES),
+                    Measurement(16, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(("-"),
+                    Measurement(0, MeasurementUnit.INCHES),
+                    Measurement(0, MeasurementUnit.INCHES));
+            standard_sizes += new StandardPrintSize(_("Metric Wallet (9 × 13 cm)"),
+                    Measurement(13, MeasurementUnit.CENTIMETERS),
+                    Measurement(9, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("Postcard (10 × 15 cm)"),
+                    Measurement(15, MeasurementUnit.CENTIMETERS),
+                    Measurement(10, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("13 × 18 cm"),
+                    Measurement(18, MeasurementUnit.CENTIMETERS),
+                    Measurement(13, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("18 × 24 cm"),
+                    Measurement(24, MeasurementUnit.CENTIMETERS),
+                    Measurement(18, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("20 × 30 cm"),
+                    Measurement(30, MeasurementUnit.CENTIMETERS),
+                    Measurement(20, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("24 × 40 cm"),
+                    Measurement(40, MeasurementUnit.CENTIMETERS),
+                    Measurement(24, MeasurementUnit.CENTIMETERS));
+            standard_sizes += new StandardPrintSize(_("30 × 40 cm"),
+                    Measurement(40, MeasurementUnit.CENTIMETERS),
+                    Measurement(30, MeasurementUnit.CENTIMETERS));
+        }
 
-        return result;
+        return standard_sizes;
     }
 
     public static PrintManager get_instance() {
diff --git a/src/Properties.c b/src/Properties.c
index 4acfb1b..eee82c8 100644
--- a/src/Properties.c
+++ b/src/Properties.c
@@ -4512,7 +4512,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4515 "Properties.c"
-				goto __catch432_g_error;
+				goto __catch433_g_error;
 			}
 #line 543 "/home/jens/Source/shotwell/src/Properties.vala"
 			_tmp23_ = _tmp20_;
@@ -4526,8 +4526,8 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_media_metadata_unref0 (_tmp20_);
 #line 4528 "Properties.c"
 		}
-		goto __finally432;
-		__catch432_g_error:
+		goto __finally433;
+		__catch433_g_error:
 		{
 			GError* e = NULL;
 			Photo* _tmp24_ = NULL;
@@ -4548,7 +4548,7 @@ static void extended_properties_window_extended_properties_real_get_single_prope
 			_g_error_free0 (e);
 #line 4550 "Properties.c"
 		}
-		__finally432:
+		__finally433:
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 538 "/home/jens/Source/shotwell/src/Properties.vala"
@@ -4840,7 +4840,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4843 "Properties.c"
-				goto __catch433_g_regex_error;
+				goto __catch434_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4865,7 +4865,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 4868 "Properties.c"
-				goto __catch433_g_regex_error;
+				goto __catch434_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -4891,8 +4891,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 4893 "Properties.c"
 	}
-	goto __finally433;
-	__catch433_g_regex_error:
+	goto __finally434;
+	__catch434_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4905,7 +4905,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 4907 "Properties.c"
 	}
-	__finally433:
+	__finally434:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/src/Resources.c b/src/Resources.c
index 1682cda..dd4b18c 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -18,9 +18,9 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gee.h>
 #include <gtk/gtk.h>
-#include <gio/gio.h>
 #include <locale.h>
 #include <langinfo.h>
+#include <gio/gio.h>
 #include <gdk/gdk.h>
 
 #define _g_free0(var) (var = (g_free (var), NULL))
@@ -29,6 +29,8 @@
 
 #define TYPE_RATING_FILTER (rating_filter_get_type ())
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
+
+#define RESOURCES_TYPE_UNIT_SYSTEM (resources_unit_system_get_type ())
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 typedef enum  {
@@ -59,6 +61,12 @@ typedef enum  {
 	RATING_FILTER_FIVE_ONLY = 14
 } RatingFilter;
 
+typedef enum  {
+	RESOURCES_UNIT_SYSTEM_IMPERIAL,
+	RESOURCES_UNIT_SYSTEM_METRIC,
+	RESOURCES_UNIT_SYSTEM_UNKNOWN
+} ResourcesUnitSystem;
+
 
 extern gchar* resources_RATE_ONE_LABEL;
 extern gchar* resources_RATE_TWO_LABEL;
@@ -148,6 +156,10 @@ extern gchar* resources_START_MULTIMONTH_DATE_FORMAT_STRING;
 gchar* resources_START_MULTIMONTH_DATE_FORMAT_STRING = NULL;
 extern gchar* resources_END_MULTIMONTH_DATE_FORMAT_STRING;
 gchar* resources_END_MULTIMONTH_DATE_FORMAT_STRING = NULL;
+extern gchar* resources_lc_measurement;
+gchar* resources_lc_measurement = NULL;
+extern ResourcesUnitSystem resources_unit_system;
+ResourcesUnitSystem resources_unit_system = RESOURCES_UNIT_SYSTEM_UNKNOWN;
 extern GdkPixbuf* resources_noninterpretable_badge_pixbuf;
 GdkPixbuf* resources_noninterpretable_badge_pixbuf = NULL;
 extern GeeMap* resources_providers;
@@ -209,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 "shotwell-street.jpg"
+#define RESOURCES_ICON_ABOUT_LOGO "about-aachen.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"
@@ -448,9 +460,12 @@ gchar* resources_jump_to_file_failed (GError* err);
 #define RESOURCES_SELECT_ALL_MENU _ ("Select _All")
 #define RESOURCES_SELECT_ALL_TOOLTIP _ ("Select all items")
 void resources_init (void);
-GFile* app_dirs_get_resources_dir (void);
+GtkIconTheme* resources_get_icon_theme_engine (void);
 void resources_terminate (void);
 void resources_fetch_lc_time_format (void);
+GType resources_unit_system_get_type (void) G_GNUC_CONST;
+ResourcesUnitSystem resources_get_default_measurement_unit (void);
+static gboolean _vala_string_array_contains (const gchar** stack, int stack_length, const gchar* needle);
 gchar* resources_get_hh_mm_format_string (void);
 gchar* resources_get_hh_mm_ss_format_string (void);
 gchar* resources_get_long_date_format_string (void);
@@ -458,10 +473,9 @@ gchar* resources_get_start_multiday_span_format_string (void);
 gchar* resources_get_end_multiday_span_format_string (void);
 gchar* resources_get_start_multimonth_span_format_string (void);
 gchar* resources_get_end_multimonth_span_format_string (void);
-GFile* resources_get_ui (const gchar* filename);
+gchar* resources_get_ui (const gchar* filename);
 #define RESOURCES_NONINTERPRETABLE_BADGE_FILE "noninterpretable-video.png"
 GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void);
-GtkIconTheme* resources_get_icon_theme_engine (void);
 GdkPixbuf* resources_load_icon (const gchar* name, gint scale);
 GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up);
 gchar* resources_get_help_path (void);
@@ -483,9 +497,11 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet);
 #define RESOURCES_ONIMAGE_FONT_BACKGROUND "rgba(255,255,255,0.5)"
 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 gchar* RESOURCES_AUTHORS[6] = {"Jim Nelson <jim@yorba.org>", "Lucas Beeler <lucas@yorba.org>", "Allison Barlow <allison@yorba.org>", "Eric Gregory <eric@yorba.org>", "Clinton Rogers <clinton@yorba.org>", NULL};
 const gint RESOURCES_rating_thresholds[6] = {0, 1, 25, 50, 75, 99};
+const gchar* RESOURCES_IMPERIAL_COUNTRIES[4] = {"unm_US", "es_US", "en_US", "yi_US"};
 
 gchar* resources_launch_editor_failed (GError* err) {
 	gchar* result = NULL;
@@ -493,19 +509,19 @@ gchar* resources_launch_editor_failed (GError* err) {
 	GError* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Unable to launch editor: %s");
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = err;
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = _tmp1_->message;
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 335 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 336 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 481 "Resources.c"
+#line 497 "Resources.c"
 }
 
 
@@ -513,13 +529,13 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 	gchar* result = NULL;
 	gchar** _tmp0_ = NULL;
 	gint _tmp0__length1 = 0;
-#line 339 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = names;
-#line 339 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0__length1 = names_length1;
-#line 339 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0__length1 == 1) {
-#line 495 "Resources.c"
+#line 511 "Resources.c"
 		const gchar* _tmp1_ = NULL;
 		gchar** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
@@ -528,39 +544,39 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = _ ("Add Tag “%s”");
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = names;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2__length1 = names_length1;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp3_ = _tmp2_[0];
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = hierarchical_tag_utilities_get_basename (_tmp3_);
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = _tmp4_;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = g_strdup_printf (_tmp1_, _tmp5_);
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = _tmp6_;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp5_);
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = _tmp7_;
-#line 340 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 526 "Resources.c"
+#line 542 "Resources.c"
 	} else {
 		gchar** _tmp8_ = NULL;
 		gint _tmp8__length1 = 0;
-#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 342 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = names;
-#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 342 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8__length1 = names_length1;
-#line 341 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 342 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp8__length1 == 2) {
-#line 536 "Resources.c"
+#line 552 "Resources.c"
 			const gchar* _tmp9_ = NULL;
 			gchar** _tmp10_ = NULL;
 			gint _tmp10__length1 = 0;
@@ -574,53 +590,53 @@ gchar* resources_add_tags_label (gchar** names, int names_length1) {
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
 			gchar* _tmp19_ = NULL;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = _ ("Add Tags “%s” and “%s”");
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = names;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10__length1 = names_length1;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = _tmp10_[0];
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = hierarchical_tag_utilities_get_basename (_tmp11_);
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = _tmp12_;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp14_ = names;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp14__length1 = names_length1;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp15_ = _tmp14_[1];
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp16_ = hierarchical_tag_utilities_get_basename (_tmp15_);
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp17_ = _tmp16_;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp18_ = g_strdup_printf (_tmp9_, _tmp13_, _tmp17_);
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp19_ = _tmp18_;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (_tmp17_);
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (_tmp13_);
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp19_;
-#line 343 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 344 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 584 "Resources.c"
+#line 600 "Resources.c"
 		} else {
 			const gchar* _tmp20_ = NULL;
 			gchar* _tmp21_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp20_ = C_ ("UndoRedo menu entry", "Add Tags");
-#line 348 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp21_ = g_strdup (_tmp20_);
-#line 348 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp21_;
-#line 348 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 349 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 596 "Resources.c"
+#line 612 "Resources.c"
 		}
 	}
 }
@@ -631,19 +647,19 @@ gchar* resources_delete_tag_menu (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 352 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 353 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("_Delete Tag “%s”");
-#line 353 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 353 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 353 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 353 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 354 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 619 "Resources.c"
+#line 635 "Resources.c"
 }
 
 
@@ -652,19 +668,19 @@ gchar* resources_delete_tag_label (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 356 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 357 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Delete Tag “%s”");
-#line 357 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 357 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 357 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 357 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 358 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 640 "Resources.c"
+#line 656 "Resources.c"
 }
 
 
@@ -673,19 +689,19 @@ gchar* resources_rename_tag_menu (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 365 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 366 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Re_name Tag “%s”…");
-#line 366 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 366 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 366 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 366 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 367 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 661 "Resources.c"
+#line 677 "Resources.c"
 }
 
 
@@ -695,23 +711,23 @@ gchar* resources_rename_tag_label (const gchar* old_name, const gchar* new_name)
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 369 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (old_name != NULL, NULL);
-#line 369 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (new_name != NULL, NULL);
 #line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (new_name != NULL, NULL);
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Rename Tag “%s” to “%s”");
-#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = old_name;
-#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = new_name;
-#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp1_, _tmp2_);
-#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 370 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 371 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 687 "Resources.c"
+#line 703 "Resources.c"
 }
 
 
@@ -721,21 +737,21 @@ gchar* resources_tag_photos_label (const gchar* name, gint count) {
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 378 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = ngettext ("Tag Photo as “%s”", "Tag Photos as “%s”", (gulong) _tmp0_);
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = name;
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 379 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 380 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 711 "Resources.c"
+#line 727 "Resources.c"
 }
 
 
@@ -745,21 +761,21 @@ gchar* resources_tag_photos_tooltip (const gchar* name, gint count) {
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 384 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
-#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = ngettext ("Tag the selected photo as “%s”", "Tag the selected photos as “%s”", (gulong) _tmp0_);
-#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = name;
-#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
-#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 385 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 386 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 735 "Resources.c"
+#line 751 "Resources.c"
 }
 
 
@@ -769,21 +785,21 @@ gchar* resources_untag_photos_menu (const gchar* name, gint count) {
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 390 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
-#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = ngettext ("Remove Tag “%s” From _Photo", "Remove Tag “%s” From _Photos", (gulong) _tmp0_);
-#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = name;
-#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
-#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 391 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 392 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 759 "Resources.c"
+#line 775 "Resources.c"
 }
 
 
@@ -793,21 +809,21 @@ gchar* resources_untag_photos_label (const gchar* name, gint count) {
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 396 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = count;
-#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = ngettext ("Remove Tag “%s” From Photo", "Remove Tag “%s” From Photos", (gulong) _tmp0_);
-#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = name;
-#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp1_, _tmp2_);
-#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 397 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 398 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 783 "Resources.c"
+#line 799 "Resources.c"
 }
 
 
@@ -816,19 +832,19 @@ gchar* resources_rename_tag_exists_message (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 402 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 403 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Unable to rename tag to “%s” because the tag already exists.");
-#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 403 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 404 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 804 "Resources.c"
+#line 820 "Resources.c"
 }
 
 
@@ -837,19 +853,19 @@ gchar* resources_rename_search_exists_message (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 406 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 407 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Unable to rename search to “%s” because the search already exists.");
-#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 407 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 408 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 825 "Resources.c"
+#line 841 "Resources.c"
 }
 
 
@@ -859,23 +875,23 @@ gchar* resources_rename_search_label (const gchar* old_name, const gchar* new_na
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 418 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (old_name != NULL, NULL);
-#line 418 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (new_name != NULL, NULL);
 #line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (new_name != NULL, NULL);
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Rename Search “%s” to “%s”");
-#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = old_name;
-#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = new_name;
-#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp1_, _tmp2_);
-#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 419 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 420 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 851 "Resources.c"
+#line 867 "Resources.c"
 }
 
 
@@ -884,121 +900,121 @@ gchar* resources_delete_search_label (const gchar* name) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 422 "/home/jens/Source/shotwell/src/Resources.vala"
-	g_return_val_if_fail (name != NULL, NULL);
 #line 423 "/home/jens/Source/shotwell/src/Resources.vala"
+	g_return_val_if_fail (name != NULL, NULL);
+#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Delete Search “%s”");
-#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = name;
-#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup_printf (_tmp0_, _tmp1_);
-#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 423 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 424 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 872 "Resources.c"
+#line 888 "Resources.c"
 }
 
 
 const gchar* resources_rating_label (Rating rating) {
 	const gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 885 "Resources.c"
+#line 901 "Resources.c"
 		{
-#line 429 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 430 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_LABEL;
-#line 429 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 430 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 891 "Resources.c"
+#line 907 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 895 "Resources.c"
+#line 911 "Resources.c"
 		{
-#line 431 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 432 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_LABEL;
-#line 431 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 432 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 901 "Resources.c"
+#line 917 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 905 "Resources.c"
+#line 921 "Resources.c"
 		{
 			const gchar* _tmp1_ = NULL;
-#line 433 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = resources_RATE_ONE_LABEL;
-#line 433 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 433 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 434 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 914 "Resources.c"
+#line 930 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 918 "Resources.c"
+#line 934 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
-#line 435 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_RATE_TWO_LABEL;
-#line 435 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 435 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 436 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 927 "Resources.c"
+#line 943 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 931 "Resources.c"
+#line 947 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
-#line 437 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 438 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_THREE_LABEL;
-#line 437 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 438 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 437 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 438 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 940 "Resources.c"
+#line 956 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 944 "Resources.c"
+#line 960 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
-#line 439 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 440 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_RATE_FOUR_LABEL;
-#line 439 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 440 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 439 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 440 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 953 "Resources.c"
+#line 969 "Resources.c"
 		}
-#line 427 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 428 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 957 "Resources.c"
+#line 973 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
-#line 441 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 442 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_FIVE_LABEL;
-#line 441 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 442 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 441 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 442 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 966 "Resources.c"
+#line 982 "Resources.c"
 		}
 		default:
 		{
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 444 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_LABEL;
-#line 443 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 444 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 974 "Resources.c"
+#line 990 "Resources.c"
 		}
 	}
 }
@@ -1007,102 +1023,102 @@ const gchar* resources_rating_label (Rating rating) {
 const gchar* resources_rating_combo_box (Rating rating) {
 	const gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 989 "Resources.c"
+#line 1005 "Resources.c"
 		{
-#line 450 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 451 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_REJECTED_COMBO_BOX;
-#line 450 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 451 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 995 "Resources.c"
+#line 1011 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 999 "Resources.c"
+#line 1015 "Resources.c"
 		{
-#line 452 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 453 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_COMBO_BOX;
-#line 452 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 453 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1005 "Resources.c"
+#line 1021 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1009 "Resources.c"
+#line 1025 "Resources.c"
 		{
 			const gchar* _tmp1_ = NULL;
-#line 454 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = resources_RATE_ONE_MENU;
-#line 454 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 454 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 455 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1018 "Resources.c"
+#line 1034 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1022 "Resources.c"
+#line 1038 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
-#line 456 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_RATE_TWO_MENU;
-#line 456 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 456 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 457 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1031 "Resources.c"
+#line 1047 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1035 "Resources.c"
+#line 1051 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
-#line 458 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 459 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_THREE_MENU;
-#line 458 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 459 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 458 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 459 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1044 "Resources.c"
+#line 1060 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1048 "Resources.c"
+#line 1064 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
-#line 460 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 461 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_RATE_FOUR_MENU;
-#line 460 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 461 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 460 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 461 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1057 "Resources.c"
+#line 1073 "Resources.c"
 		}
-#line 448 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 449 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1061 "Resources.c"
+#line 1077 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
-#line 462 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 463 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_FIVE_MENU;
-#line 462 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 463 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 462 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 463 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1070 "Resources.c"
+#line 1086 "Resources.c"
 		}
 		default:
 		{
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 465 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = RESOURCES_RATE_UNRATED_MENU;
-#line 464 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 465 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1078 "Resources.c"
+#line 1094 "Resources.c"
 		}
 	}
 }
@@ -1111,131 +1127,131 @@ const gchar* resources_rating_combo_box (Rating rating) {
 gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 	gchar* result = NULL;
 	RatingFilter _tmp0_ = 0;
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = filter;
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1093 "Resources.c"
+#line 1109 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 471 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup (RESOURCES_DISPLAY_REJECTED_OR_HIGHER_TOOLTIP);
-#line 471 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 471 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 472 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1102 "Resources.c"
+#line 1118 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1106 "Resources.c"
+#line 1122 "Resources.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP;
-#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 474 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 475 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1118 "Resources.c"
+#line 1134 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1122 "Resources.c"
+#line 1138 "Resources.c"
 		{
 			const gchar* _tmp4_ = NULL;
 			gchar* _tmp5_ = NULL;
-#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP;
-#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strdup (_tmp4_);
-#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 477 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 478 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1134 "Resources.c"
+#line 1150 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1138 "Resources.c"
+#line 1154 "Resources.c"
 		{
 			const gchar* _tmp6_ = NULL;
 			gchar* _tmp7_ = NULL;
-#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP;
-#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = g_strdup (_tmp6_);
-#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp7_;
-#line 480 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 481 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1150 "Resources.c"
+#line 1166 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1154 "Resources.c"
+#line 1170 "Resources.c"
 		{
 			const gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
-#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP;
-#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = g_strdup (_tmp8_);
-#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp9_;
-#line 483 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 484 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1166 "Resources.c"
+#line 1182 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1172 "Resources.c"
+#line 1188 "Resources.c"
 		{
 			const gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
-#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP;
-#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = g_strdup (_tmp10_);
-#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp11_;
-#line 487 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 488 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1184 "Resources.c"
+#line 1200 "Resources.c"
 		}
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 1188 "Resources.c"
+#line 1204 "Resources.c"
 		{
 			gchar* _tmp12_ = NULL;
-#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 491 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = g_strdup (RESOURCES_DISPLAY_REJECTED_ONLY_TOOLTIP);
-#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 491 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp12_;
-#line 490 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 491 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1197 "Resources.c"
+#line 1213 "Resources.c"
 		}
 		default:
-#line 469 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 470 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1202 "Resources.c"
+#line 1218 "Resources.c"
 		{
 			gchar* _tmp13_ = NULL;
-#line 494 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 495 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = g_strdup (RESOURCES_DISPLAY_UNRATED_OR_HIGHER_TOOLTIP);
-#line 494 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 495 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp13_;
-#line 494 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 495 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1211 "Resources.c"
+#line 1227 "Resources.c"
 		}
 	}
 }
@@ -1244,126 +1260,126 @@ gchar* resources_get_rating_filter_tooltip (RatingFilter filter) {
 gchar* resources_rating_progress (Rating rating) {
 	gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1226 "Resources.c"
+#line 1242 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 501 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 502 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup (RESOURCES_RATE_REJECTED_PROGRESS);
-#line 501 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 502 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 501 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 502 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1235 "Resources.c"
+#line 1251 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_UNRATED:
-#line 1239 "Resources.c"
+#line 1255 "Resources.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 504 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
-#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 504 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 503 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 504 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1248 "Resources.c"
+#line 1264 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1252 "Resources.c"
+#line 1268 "Resources.c"
 		{
 			const gchar* _tmp3_ = NULL;
 			gchar* _tmp4_ = NULL;
-#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = resources_RATE_ONE_PROGRESS;
-#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = g_strdup (_tmp3_);
-#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 505 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 506 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1264 "Resources.c"
+#line 1280 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1268 "Resources.c"
+#line 1284 "Resources.c"
 		{
 			const gchar* _tmp5_ = NULL;
 			gchar* _tmp6_ = NULL;
-#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = resources_RATE_TWO_PROGRESS;
-#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = g_strdup (_tmp5_);
-#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp6_;
-#line 507 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 508 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1280 "Resources.c"
+#line 1296 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1284 "Resources.c"
+#line 1300 "Resources.c"
 		{
 			const gchar* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
-#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = resources_RATE_THREE_PROGRESS;
-#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = g_strdup (_tmp7_);
-#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp8_;
-#line 509 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 510 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1296 "Resources.c"
+#line 1312 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1300 "Resources.c"
+#line 1316 "Resources.c"
 		{
 			const gchar* _tmp9_ = NULL;
 			gchar* _tmp10_ = NULL;
-#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = resources_RATE_FOUR_PROGRESS;
-#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = g_strdup (_tmp9_);
-#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp10_;
-#line 511 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 512 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1312 "Resources.c"
+#line 1328 "Resources.c"
 		}
-#line 499 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 500 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1316 "Resources.c"
+#line 1332 "Resources.c"
 		{
 			const gchar* _tmp11_ = NULL;
 			gchar* _tmp12_ = NULL;
-#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = resources_RATE_FIVE_PROGRESS;
-#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = g_strdup (_tmp11_);
-#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp12_;
-#line 513 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 514 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1328 "Resources.c"
+#line 1344 "Resources.c"
 		}
 		default:
 		{
 			gchar* _tmp13_ = NULL;
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 516 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp13_ = g_strdup (RESOURCES_RATE_UNRATED_PROGRESS);
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 516 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp13_;
-#line 515 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 516 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1339 "Resources.c"
+#line 1355 "Resources.c"
 		}
 	}
 }
@@ -1372,85 +1388,85 @@ gchar* resources_rating_progress (Rating rating) {
 gchar* resources_get_stars (Rating rating) {
 	gchar* result = NULL;
 	Rating _tmp0_ = 0;
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1354 "Resources.c"
+#line 1370 "Resources.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 524 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = g_strdup ("\xE2\x98\x85");
-#line 524 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp1_;
-#line 524 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 525 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1363 "Resources.c"
+#line 1379 "Resources.c"
 		}
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1367 "Resources.c"
+#line 1383 "Resources.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 526 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85");
-#line 526 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 526 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 527 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1376 "Resources.c"
+#line 1392 "Resources.c"
 		}
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1380 "Resources.c"
+#line 1396 "Resources.c"
 		{
 			gchar* _tmp3_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
-#line 528 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp3_;
-#line 528 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 529 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1389 "Resources.c"
+#line 1405 "Resources.c"
 		}
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1393 "Resources.c"
+#line 1409 "Resources.c"
 		{
 			gchar* _tmp4_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
-#line 530 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 530 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 531 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1402 "Resources.c"
+#line 1418 "Resources.c"
 		}
-#line 522 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 523 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1406 "Resources.c"
+#line 1422 "Resources.c"
 		{
 			gchar* _tmp5_ = NULL;
-#line 532 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 533 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strdup ("\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85\xE2\x98\x85");
-#line 532 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 533 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp5_;
-#line 532 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 533 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1415 "Resources.c"
+#line 1431 "Resources.c"
 		}
 		default:
 		{
 			gchar* _tmp6_ = NULL;
-#line 534 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 535 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = g_strdup ("");
-#line 534 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 535 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp6_;
-#line 534 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 535 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1426 "Resources.c"
+#line 1442 "Resources.c"
 		}
 	}
 }
@@ -1459,113 +1475,113 @@ gchar* resources_get_stars (Rating rating) {
 GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale) {
 	GdkPixbuf* result = NULL;
 	Rating _tmp0_ = 0;
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = rating;
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 	switch (_tmp0_) {
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_REJECTED:
-#line 1441 "Resources.c"
+#line 1457 "Resources.c"
 		{
 			gint _tmp1_ = 0;
 			GdkPixbuf* _tmp2_ = NULL;
-#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp1_ = scale;
-#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp2_ = resources_get_icon (RESOURCES_ICON_RATING_REJECTED, _tmp1_);
-#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp2_;
-#line 541 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 542 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1453 "Resources.c"
+#line 1469 "Resources.c"
 		}
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_ONE:
-#line 1457 "Resources.c"
+#line 1473 "Resources.c"
 		{
 			gint _tmp3_ = 0;
 			GdkPixbuf* _tmp4_ = NULL;
-#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = scale;
-#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = resources_get_icon (RESOURCES_ICON_RATING_ONE, _tmp3_);
-#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp4_;
-#line 544 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 545 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1469 "Resources.c"
+#line 1485 "Resources.c"
 		}
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_TWO:
-#line 1473 "Resources.c"
+#line 1489 "Resources.c"
 		{
 			gint _tmp5_ = 0;
 			GdkPixbuf* _tmp6_ = NULL;
-#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = scale;
-#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp6_ = resources_get_icon (RESOURCES_ICON_RATING_TWO, _tmp5_ * 2);
-#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp6_;
-#line 546 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 547 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1485 "Resources.c"
+#line 1501 "Resources.c"
 		}
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_THREE:
-#line 1489 "Resources.c"
+#line 1505 "Resources.c"
 		{
 			gint _tmp7_ = 0;
 			GdkPixbuf* _tmp8_ = NULL;
-#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = scale;
-#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = resources_get_icon (RESOURCES_ICON_RATING_THREE, _tmp7_ * 3);
-#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp8_;
-#line 548 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 549 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1501 "Resources.c"
+#line 1517 "Resources.c"
 		}
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FOUR:
-#line 1505 "Resources.c"
+#line 1521 "Resources.c"
 		{
 			gint _tmp9_ = 0;
 			GdkPixbuf* _tmp10_ = NULL;
-#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = scale;
-#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp10_ = resources_get_icon (RESOURCES_ICON_RATING_FOUR, _tmp9_ * 4);
-#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp10_;
-#line 550 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 551 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1517 "Resources.c"
+#line 1533 "Resources.c"
 		}
-#line 539 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 540 "/home/jens/Source/shotwell/src/Resources.vala"
 		case RATING_FIVE:
-#line 1521 "Resources.c"
+#line 1537 "Resources.c"
 		{
 			gint _tmp11_ = 0;
 			GdkPixbuf* _tmp12_ = NULL;
-#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp11_ = scale;
-#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp12_ = resources_get_icon (RESOURCES_ICON_RATING_FIVE, _tmp11_ * 5);
-#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = _tmp12_;
-#line 552 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 553 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1533 "Resources.c"
+#line 1549 "Resources.c"
 		}
 		default:
 		{
-#line 554 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = NULL;
-#line 554 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 555 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 1541 "Resources.c"
+#line 1557 "Resources.c"
 		}
 	}
 }
@@ -1705,503 +1721,503 @@ void resources_generate_rating_strings (void) {
 	gchar* _tmp120_ = NULL;
 	gchar* _tmp121_ = NULL;
 	gchar* _tmp122_ = NULL;
-#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = g_strdup ("%s");
-#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
-	menu_base = _tmp0_;
 #line 560 "/home/jens/Source/shotwell/src/Resources.vala"
+	menu_base = _tmp0_;
+#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _ ("Rate %s");
-#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 560 "/home/jens/Source/shotwell/src/Resources.vala"
-	label_base = _tmp2_;
 #line 561 "/home/jens/Source/shotwell/src/Resources.vala"
+	label_base = _tmp2_;
+#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _ ("Set rating to %s");
-#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = g_strdup (_tmp3_);
-#line 561 "/home/jens/Source/shotwell/src/Resources.vala"
-	tooltip_base = _tmp4_;
 #line 562 "/home/jens/Source/shotwell/src/Resources.vala"
+	tooltip_base = _tmp4_;
+#line 563 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _ ("Setting rating to %s");
-#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 563 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_strdup (_tmp5_);
-#line 562 "/home/jens/Source/shotwell/src/Resources.vala"
-	progress_base = _tmp6_;
 #line 563 "/home/jens/Source/shotwell/src/Resources.vala"
+	progress_base = _tmp6_;
+#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = g_strdup ("%s");
-#line 563 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_menu_base = _tmp7_;
 #line 564 "/home/jens/Source/shotwell/src/Resources.vala"
+	display_rating_menu_base = _tmp7_;
+#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp8_ = _ ("Display %s");
-#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_strdup (_tmp8_);
-#line 564 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_label_base = _tmp9_;
 #line 565 "/home/jens/Source/shotwell/src/Resources.vala"
+	display_rating_label_base = _tmp9_;
+#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = _ ("Only show photos with a rating of %s");
-#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = g_strdup (_tmp10_);
-#line 565 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_tooltip_base = _tmp11_;
 #line 566 "/home/jens/Source/shotwell/src/Resources.vala"
+	display_rating_tooltip_base = _tmp11_;
+#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = _ ("%s or Better");
-#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp13_ = g_strdup (_tmp12_);
-#line 566 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_or_higher_menu_base = _tmp13_;
 #line 567 "/home/jens/Source/shotwell/src/Resources.vala"
+	display_rating_or_higher_menu_base = _tmp13_;
+#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp14_ = _ ("Display %s or Better");
-#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = g_strdup (_tmp14_);
-#line 567 "/home/jens/Source/shotwell/src/Resources.vala"
-	display_rating_or_higher_label_base = _tmp15_;
 #line 568 "/home/jens/Source/shotwell/src/Resources.vala"
+	display_rating_or_higher_label_base = _tmp15_;
+#line 569 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp16_ = _ ("Only show photos with a rating of %s or better");
-#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 569 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = g_strdup (_tmp16_);
-#line 568 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 569 "/home/jens/Source/shotwell/src/Resources.vala"
 	display_rating_or_higher_tooltip_base = _tmp17_;
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = resources_get_stars (RATING_ONE);
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = _tmp18_;
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp20_ = g_strdup_printf (menu_base, _tmp19_);
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_MENU);
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_MENU = _tmp20_;
-#line 570 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp19_);
 #line 571 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp19_);
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp21_ = resources_get_stars (RATING_TWO);
-#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = _tmp21_;
-#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp23_ = g_strdup_printf (menu_base, _tmp22_);
-#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_MENU);
-#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_MENU = _tmp23_;
-#line 571 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp22_);
 #line 572 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp22_);
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = resources_get_stars (RATING_THREE);
-#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp25_ = _tmp24_;
-#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp26_ = g_strdup_printf (menu_base, _tmp25_);
-#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_MENU);
-#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_MENU = _tmp26_;
-#line 572 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp25_);
 #line 573 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp25_);
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp27_ = resources_get_stars (RATING_FOUR);
-#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp28_ = _tmp27_;
-#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp29_ = g_strdup_printf (menu_base, _tmp28_);
-#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_MENU);
-#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_MENU = _tmp29_;
-#line 573 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp28_);
 #line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp28_);
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp30_ = resources_get_stars (RATING_FIVE);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp31_ = _tmp30_;
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp32_ = g_strdup_printf (menu_base, _tmp31_);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_MENU);
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_MENU = _tmp32_;
-#line 574 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 575 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp31_);
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp33_ = resources_get_stars (RATING_ONE);
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp34_ = _tmp33_;
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp35_ = g_strdup_printf (label_base, _tmp34_);
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_LABEL);
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_LABEL = _tmp35_;
-#line 576 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp34_);
 #line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp34_);
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp36_ = resources_get_stars (RATING_TWO);
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp37_ = _tmp36_;
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp38_ = g_strdup_printf (label_base, _tmp37_);
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_LABEL);
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_LABEL = _tmp38_;
-#line 577 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp37_);
 #line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp37_);
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp39_ = resources_get_stars (RATING_THREE);
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp40_ = _tmp39_;
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp41_ = g_strdup_printf (label_base, _tmp40_);
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_LABEL);
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_LABEL = _tmp41_;
-#line 578 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp40_);
 #line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp40_);
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp42_ = resources_get_stars (RATING_FOUR);
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp43_ = _tmp42_;
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp44_ = g_strdup_printf (label_base, _tmp43_);
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_LABEL);
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_LABEL = _tmp44_;
-#line 579 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp43_);
 #line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp43_);
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp45_ = resources_get_stars (RATING_FIVE);
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp46_ = _tmp45_;
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp47_ = g_strdup_printf (label_base, _tmp46_);
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_LABEL);
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_LABEL = _tmp47_;
-#line 580 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 581 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp46_);
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp48_ = resources_get_stars (RATING_ONE);
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp49_ = _tmp48_;
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp50_ = g_strdup_printf (tooltip_base, _tmp49_);
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_TOOLTIP);
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_TOOLTIP = _tmp50_;
-#line 582 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp49_);
 #line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp49_);
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp51_ = resources_get_stars (RATING_TWO);
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp52_ = _tmp51_;
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp53_ = g_strdup_printf (tooltip_base, _tmp52_);
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_TOOLTIP);
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_TOOLTIP = _tmp53_;
-#line 583 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp52_);
 #line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp52_);
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp54_ = resources_get_stars (RATING_THREE);
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp55_ = _tmp54_;
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp56_ = g_strdup_printf (tooltip_base, _tmp55_);
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_TOOLTIP);
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_TOOLTIP = _tmp56_;
-#line 584 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp55_);
 #line 585 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp55_);
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp57_ = resources_get_stars (RATING_FOUR);
-#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp58_ = _tmp57_;
-#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp59_ = g_strdup_printf (tooltip_base, _tmp58_);
-#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_TOOLTIP);
-#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_TOOLTIP = _tmp59_;
-#line 585 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp58_);
 #line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp58_);
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp60_ = resources_get_stars (RATING_FIVE);
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp61_ = _tmp60_;
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp62_ = g_strdup_printf (tooltip_base, _tmp61_);
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_TOOLTIP);
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_TOOLTIP = _tmp62_;
-#line 586 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 587 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp61_);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp63_ = resources_get_stars (RATING_ONE);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp64_ = _tmp63_;
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp65_ = g_strdup_printf (progress_base, _tmp64_);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_ONE_PROGRESS);
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_ONE_PROGRESS = _tmp65_;
-#line 588 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp64_);
 #line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp64_);
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp66_ = resources_get_stars (RATING_TWO);
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp67_ = _tmp66_;
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp68_ = g_strdup_printf (progress_base, _tmp67_);
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_TWO_PROGRESS);
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_TWO_PROGRESS = _tmp68_;
-#line 589 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp67_);
 #line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp67_);
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp69_ = resources_get_stars (RATING_THREE);
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp70_ = _tmp69_;
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp71_ = g_strdup_printf (progress_base, _tmp70_);
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_THREE_PROGRESS);
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_THREE_PROGRESS = _tmp71_;
-#line 590 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp70_);
 #line 591 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp70_);
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp72_ = resources_get_stars (RATING_FOUR);
-#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp73_ = _tmp72_;
-#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp74_ = g_strdup_printf (progress_base, _tmp73_);
-#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FOUR_PROGRESS);
-#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FOUR_PROGRESS = _tmp74_;
-#line 591 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp73_);
 #line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp73_);
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp75_ = resources_get_stars (RATING_FIVE);
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp76_ = _tmp75_;
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp77_ = g_strdup_printf (progress_base, _tmp76_);
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_RATE_FIVE_PROGRESS);
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_RATE_FIVE_PROGRESS = _tmp77_;
-#line 592 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 593 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp76_);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp78_ = resources_get_stars (RATING_ONE);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp79_ = _tmp78_;
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp80_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp79_);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_MENU);
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_ONE_OR_HIGHER_MENU = _tmp80_;
-#line 594 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp79_);
 #line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp79_);
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp81_ = resources_get_stars (RATING_TWO);
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp82_ = _tmp81_;
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp83_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp82_);
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_MENU);
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_TWO_OR_HIGHER_MENU = _tmp83_;
-#line 595 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp82_);
 #line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp82_);
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp84_ = resources_get_stars (RATING_THREE);
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp85_ = _tmp84_;
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp86_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp85_);
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_MENU);
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_THREE_OR_HIGHER_MENU = _tmp86_;
-#line 596 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp85_);
 #line 597 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp85_);
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp87_ = resources_get_stars (RATING_FOUR);
-#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp88_ = _tmp87_;
-#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp89_ = g_strdup_printf (display_rating_or_higher_menu_base, _tmp88_);
-#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_MENU);
-#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FOUR_OR_HIGHER_MENU = _tmp89_;
-#line 597 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp88_);
 #line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp88_);
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp90_ = resources_get_stars (RATING_FIVE);
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp91_ = _tmp90_;
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp92_ = g_strdup_printf (display_rating_menu_base, _tmp91_);
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_MENU);
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FIVE_OR_HIGHER_MENU = _tmp92_;
-#line 598 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 599 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp91_);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp93_ = resources_get_stars (RATING_ONE);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp94_ = _tmp93_;
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp95_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp94_);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_LABEL);
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_ONE_OR_HIGHER_LABEL = _tmp95_;
-#line 600 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp94_);
 #line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp94_);
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp96_ = resources_get_stars (RATING_TWO);
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp97_ = _tmp96_;
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp98_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp97_);
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_LABEL);
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_TWO_OR_HIGHER_LABEL = _tmp98_;
-#line 601 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp97_);
 #line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp97_);
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp99_ = resources_get_stars (RATING_THREE);
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp100_ = _tmp99_;
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp101_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp100_);
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_LABEL);
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_THREE_OR_HIGHER_LABEL = _tmp101_;
-#line 602 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp100_);
 #line 603 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp100_);
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp102_ = resources_get_stars (RATING_FOUR);
-#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp103_ = _tmp102_;
-#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp104_ = g_strdup_printf (display_rating_or_higher_label_base, _tmp103_);
-#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_LABEL);
-#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FOUR_OR_HIGHER_LABEL = _tmp104_;
-#line 603 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp103_);
 #line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp103_);
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp105_ = resources_get_stars (RATING_FIVE);
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp106_ = _tmp105_;
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp107_ = g_strdup_printf (display_rating_label_base, _tmp106_);
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_LABEL);
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FIVE_OR_HIGHER_LABEL = _tmp107_;
-#line 604 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 605 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp106_);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp108_ = resources_get_stars (RATING_ONE);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp109_ = _tmp108_;
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp110_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp109_);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP);
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_ONE_OR_HIGHER_TOOLTIP = _tmp110_;
-#line 606 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp109_);
 #line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp109_);
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp111_ = resources_get_stars (RATING_TWO);
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp112_ = _tmp111_;
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp113_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp112_);
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP);
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_TWO_OR_HIGHER_TOOLTIP = _tmp113_;
-#line 607 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp112_);
 #line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp112_);
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp114_ = resources_get_stars (RATING_THREE);
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp115_ = _tmp114_;
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp116_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp115_);
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP);
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_THREE_OR_HIGHER_TOOLTIP = _tmp116_;
-#line 608 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp115_);
 #line 609 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp115_);
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp117_ = resources_get_stars (RATING_FOUR);
-#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp118_ = _tmp117_;
-#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp119_ = g_strdup_printf (display_rating_or_higher_tooltip_base, _tmp118_);
-#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP);
-#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FOUR_OR_HIGHER_TOOLTIP = _tmp119_;
-#line 609 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp118_);
 #line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (_tmp118_);
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp120_ = resources_get_stars (RATING_FIVE);
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp121_ = _tmp120_;
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp122_ = g_strdup_printf (display_rating_tooltip_base, _tmp121_);
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP);
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_DISPLAY_FIVE_OR_HIGHER_TOOLTIP = _tmp122_;
-#line 610 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 611 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp121_);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_or_higher_tooltip_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_or_higher_label_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_or_higher_menu_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_tooltip_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_label_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (display_rating_menu_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (progress_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (tooltip_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (label_base);
-#line 558 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 559 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (menu_base);
-#line 2177 "Resources.c"
+#line 2193 "Resources.c"
 }
 
 
@@ -2211,70 +2227,34 @@ gchar* resources_jump_to_file_failed (GError* err) {
 	GError* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = _ ("Unable to open in file manager: %s");
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = err;
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = _tmp1_->message;
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = g_strdup_printf (_tmp0_, _tmp2_);
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp3_;
-#line 669 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 670 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2199 "Resources.c"
-}
-
-
-static gpointer _g_object_ref0 (gpointer self) {
-#line 691 "/home/jens/Source/shotwell/src/Resources.vala"
-	return self ? g_object_ref (self) : NULL;
-#line 2206 "Resources.c"
+#line 2215 "Resources.c"
 }
 
 
 void resources_init (void) {
-	GtkIconTheme* icon_theme = NULL;
 	GtkIconTheme* _tmp0_ = NULL;
 	GtkIconTheme* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-#line 691 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = gtk_icon_theme_get_default ();
-#line 691 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 691 "/home/jens/Source/shotwell/src/Resources.vala"
-	icon_theme = _tmp1_;
-#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = app_dirs_get_resources_dir ();
-#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = _tmp2_;
-#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = g_file_get_child (_tmp3_, "icons");
-#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = _tmp4_;
-#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp6_ = g_file_get_path (_tmp5_);
-#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp7_ = _tmp6_;
-#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	gtk_icon_theme_append_search_path (icon_theme, _tmp7_);
-#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp7_);
-#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp5_);
-#line 693 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp3_);
+#line 692 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp0_ = resources_get_icon_theme_engine ();
+#line 692 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp1_ = _tmp0_;
+#line 692 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_object_unref0 (_tmp1_);
 #line 694 "/home/jens/Source/shotwell/src/Resources.vala"
 	resources_generate_rating_strings ();
-#line 690 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (icon_theme);
-#line 2250 "Resources.c"
+#line 2230 "Resources.c"
 }
 
 
@@ -2331,7 +2311,7 @@ void resources_fetch_lc_time_format (void) {
 	if (_tmp2_ != NULL) {
 #line 715 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_unsetenv ("LANGUAGE");
-#line 2307 "Resources.c"
+#line 2287 "Resources.c"
 	}
 #line 719 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = setlocale (LC_MESSAGES, NULL);
@@ -2349,13 +2329,13 @@ void resources_fetch_lc_time_format (void) {
 	_tmp7_ = lc_time;
 #line 722 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp7_ != NULL) {
-#line 2325 "Resources.c"
+#line 2305 "Resources.c"
 		const gchar* _tmp8_ = NULL;
 #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 2331 "Resources.c"
+#line 2311 "Resources.c"
 	}
 #line 730 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_strdup ("%X");
@@ -2415,25 +2395,25 @@ void resources_fetch_lc_time_format (void) {
 	_tmp22_ = old_messages;
 #line 762 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp22_ != NULL) {
-#line 2391 "Resources.c"
+#line 2371 "Resources.c"
 		const gchar* _tmp23_ = NULL;
 #line 763 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp23_ = old_messages;
 #line 763 "/home/jens/Source/shotwell/src/Resources.vala"
 		setlocale (LC_MESSAGES, _tmp23_);
-#line 2397 "Resources.c"
+#line 2377 "Resources.c"
 	}
 #line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = old_language;
 #line 766 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp24_ != NULL) {
-#line 2403 "Resources.c"
+#line 2383 "Resources.c"
 		const gchar* _tmp25_ = NULL;
 #line 767 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25_ = old_language;
 #line 767 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_setenv ("LANGUAGE", _tmp25_, TRUE);
-#line 2409 "Resources.c"
+#line 2389 "Resources.c"
 	}
 #line 710 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (lc_time);
@@ -2441,7 +2421,345 @@ 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 2417 "Resources.c"
+#line 2397 "Resources.c"
+}
+
+
+GType resources_unit_system_get_type (void) {
+	static volatile gsize resources_unit_system_type_id__volatile = 0;
+	if (g_once_init_enter (&resources_unit_system_type_id__volatile)) {
+		static const GEnumValue values[] = {{RESOURCES_UNIT_SYSTEM_IMPERIAL, "RESOURCES_UNIT_SYSTEM_IMPERIAL", "imperial"}, {RESOURCES_UNIT_SYSTEM_METRIC, "RESOURCES_UNIT_SYSTEM_METRIC", "metric"}, {RESOURCES_UNIT_SYSTEM_UNKNOWN, "RESOURCES_UNIT_SYSTEM_UNKNOWN", "unknown"}, {0, NULL, NULL}};
+		GType resources_unit_system_type_id;
+		resources_unit_system_type_id = g_enum_register_static ("ResourcesUnitSystem", values);
+		g_once_init_leave (&resources_unit_system_type_id__volatile, resources_unit_system_type_id);
+	}
+	return resources_unit_system_type_id__volatile;
+}
+
+
+static gint string_last_index_of_char (const gchar* self, gunichar c, gint start_index) {
+	gint result = 0;
+	gchar* _result_ = NULL;
+	gint _tmp0_ = 0;
+	gunichar _tmp1_ = 0U;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, 0);
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = start_index;
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = c;
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
+#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_result_ = _tmp2_;
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp3_ = _result_;
+#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp3_ != NULL) {
+#line 2434 "Resources.c"
+		gchar* _tmp4_ = NULL;
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = _result_;
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = (gint) (_tmp4_ - ((gchar*) self));
+#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 2442 "Resources.c"
+	} else {
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = -1;
+#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 2448 "Resources.c"
+	}
+}
+
+
+static glong string_strnlen (gchar* str, glong maxlen) {
+	glong result = 0L;
+	gchar* end = NULL;
+	gchar* _tmp0_ = NULL;
+	glong _tmp1_ = 0L;
+	gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp0_ = str;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = maxlen;
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
+#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	end = _tmp2_;
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp3_ = end;
+#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp3_ == NULL) {
+#line 2472 "Resources.c"
+		glong _tmp4_ = 0L;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = maxlen;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = _tmp4_;
+#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 2480 "Resources.c"
+	} else {
+		gchar* _tmp5_ = NULL;
+		gchar* _tmp6_ = NULL;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp5_ = end;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp6_ = str;
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp5_ - _tmp6_);
+#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		return result;
+#line 2492 "Resources.c"
+	}
+}
+
+
+static gchar* string_substring (const gchar* self, glong offset, glong len) {
+	gchar* result = NULL;
+	glong string_length = 0L;
+	gboolean _tmp0_ = FALSE;
+	glong _tmp1_ = 0L;
+	glong _tmp8_ = 0L;
+	glong _tmp14_ = 0L;
+	glong _tmp17_ = 0L;
+	glong _tmp18_ = 0L;
+	glong _tmp19_ = 0L;
+	glong _tmp20_ = 0L;
+	glong _tmp21_ = 0L;
+	gchar* _tmp22_ = NULL;
+#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail (self != NULL, NULL);
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp1_ = offset;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp1_ >= ((glong) 0)) {
+#line 2516 "Resources.c"
+		glong _tmp2_ = 0L;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp2_ = len;
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp0_ = _tmp2_ >= ((glong) 0);
+#line 2522 "Resources.c"
+	} else {
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp0_ = FALSE;
+#line 2526 "Resources.c"
+	}
+#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp0_) {
+#line 2530 "Resources.c"
+		glong _tmp3_ = 0L;
+		glong _tmp4_ = 0L;
+		glong _tmp5_ = 0L;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp3_ = offset;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp4_ = len;
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
+#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		string_length = _tmp5_;
+#line 2542 "Resources.c"
+	} else {
+		gint _tmp6_ = 0;
+		gint _tmp7_ = 0;
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp6_ = strlen (self);
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp6_;
+#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp7_;
+#line 2552 "Resources.c"
+	}
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp8_ = offset;
+#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp8_ < ((glong) 0)) {
+#line 2558 "Resources.c"
+		glong _tmp9_ = 0L;
+		glong _tmp10_ = 0L;
+		glong _tmp11_ = 0L;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp9_ = string_length;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp10_ = offset;
+#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		offset = _tmp9_ + _tmp10_;
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp11_ = offset;
+#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
+#line 2572 "Resources.c"
+	} else {
+		glong _tmp12_ = 0L;
+		glong _tmp13_ = 0L;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp12_ = offset;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp13_ = string_length;
+#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
+#line 2582 "Resources.c"
+	}
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp14_ = len;
+#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	if (_tmp14_ < ((glong) 0)) {
+#line 2588 "Resources.c"
+		glong _tmp15_ = 0L;
+		glong _tmp16_ = 0L;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp15_ = string_length;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		_tmp16_ = offset;
+#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		len = _tmp15_ - _tmp16_;
+#line 2597 "Resources.c"
+	}
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp17_ = offset;
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp18_ = len;
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp19_ = string_length;
+#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp20_ = offset;
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp21_ = len;
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	result = _tmp22_;
+#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	return result;
+#line 2617 "Resources.c"
+}
+
+
+static gboolean _vala_string_array_contains (const gchar** stack, int stack_length, const gchar* needle) {
+	int i;
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+	for (i = 0; i < stack_length; i++) {
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+		if (g_strcmp0 (stack[i], needle) == 0) {
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+			return TRUE;
+#line 2629 "Resources.c"
+		}
+	}
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+	return FALSE;
+#line 2634 "Resources.c"
+}
+
+
+ResourcesUnitSystem resources_get_default_measurement_unit (void) {
+	ResourcesUnitSystem result = 0;
+	ResourcesUnitSystem _tmp0_ = 0;
+	const gchar* _tmp2_ = NULL;
+	gchar* _tmp3_ = NULL;
+	const gchar* _tmp4_ = NULL;
+	gint index = 0;
+	const gchar* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
+	gint _tmp11_ = 0;
+	const gchar* _tmp15_ = NULL;
+	ResourcesUnitSystem _tmp16_ = 0;
+#line 783 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp0_ = resources_unit_system;
+#line 783 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp0_ != RESOURCES_UNIT_SYSTEM_UNKNOWN) {
+#line 2654 "Resources.c"
+		ResourcesUnitSystem _tmp1_ = 0;
+#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp1_ = resources_unit_system;
+#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
+		result = _tmp1_;
+#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
+		return result;
+#line 2662 "Resources.c"
+	}
+#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp2_ = g_getenv ("LC_MEASUREMENT");
+#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp3_ = g_strdup (_tmp2_);
+#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+	_g_free0 (resources_lc_measurement);
+#line 787 "/home/jens/Source/shotwell/src/Resources.vala"
+	resources_lc_measurement = _tmp3_;
+#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp4_ = resources_lc_measurement;
+#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp4_ == NULL) {
+#line 2676 "Resources.c"
+		gchar** _tmp5_ = NULL;
+		gchar** _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp6_ = _tmp5_ = g_get_language_names ();
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp7_ = _tmp6_[0];
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp8_ = g_strdup (_tmp7_);
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_free0 (resources_lc_measurement);
+#line 789 "/home/jens/Source/shotwell/src/Resources.vala"
+		resources_lc_measurement = _tmp8_;
+#line 2691 "Resources.c"
+	}
+#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp9_ = resources_lc_measurement;
+#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp10_ = string_last_index_of_char (_tmp9_, (gunichar) '.', 0);
+#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+	index = _tmp10_;
+#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp11_ = index;
+#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp11_ > 0) {
+#line 2703 "Resources.c"
+		const gchar* _tmp12_ = NULL;
+		gint _tmp13_ = 0;
+		gchar* _tmp14_ = NULL;
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp12_ = resources_lc_measurement;
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp13_ = index;
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp14_ = string_substring (_tmp12_, (glong) 0, (glong) _tmp13_);
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_free0 (resources_lc_measurement);
+#line 794 "/home/jens/Source/shotwell/src/Resources.vala"
+		resources_lc_measurement = _tmp14_;
+#line 2717 "Resources.c"
+	}
+#line 797 "/home/jens/Source/shotwell/src/Resources.vala"
+	resources_unit_system = RESOURCES_UNIT_SYSTEM_METRIC;
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp15_ = resources_lc_measurement;
+#line 798 "/home/jens/Source/shotwell/src/Resources.vala"
+	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 2727 "Resources.c"
+	}
+#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp16_ = resources_unit_system;
+#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp16_;
+#line 802 "/home/jens/Source/shotwell/src/Resources.vala"
+	return result;
+#line 2735 "Resources.c"
 }
 
 
@@ -2454,23 +2772,23 @@ gchar* resources_get_hh_mm_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 810 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_HH_MM_FORMAT_STRING;
-#line 776 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 810 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 777 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 811 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2436 "Resources.c"
+#line 2754 "Resources.c"
 	}
-#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_FORMAT_STRING;
-#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 780 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 814 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2446 "Resources.c"
+#line 2764 "Resources.c"
 }
 
 
@@ -2479,23 +2797,23 @@ gchar* resources_get_hh_mm_ss_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 818 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_HH_MM_SS_FORMAT_STRING;
-#line 784 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 818 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 785 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 819 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2461 "Resources.c"
+#line 2779 "Resources.c"
 	}
-#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_HH_MM_SS_FORMAT_STRING;
-#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 788 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 822 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2471 "Resources.c"
+#line 2789 "Resources.c"
 }
 
 
@@ -2504,23 +2822,23 @@ gchar* resources_get_long_date_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 826 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_LONG_DATE_FORMAT_STRING;
-#line 792 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 826 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 793 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 827 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2486 "Resources.c"
+#line 2804 "Resources.c"
 	}
-#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_LONG_DATE_FORMAT_STRING;
-#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 796 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 830 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2496 "Resources.c"
+#line 2814 "Resources.c"
 }
 
 
@@ -2529,23 +2847,23 @@ gchar* resources_get_start_multiday_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 800 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 834 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
-#line 800 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 834 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 801 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 835 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2511 "Resources.c"
+#line 2829 "Resources.c"
 	}
-#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIDAY_DATE_FORMAT_STRING;
-#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 804 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 838 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2521 "Resources.c"
+#line 2839 "Resources.c"
 }
 
 
@@ -2554,23 +2872,23 @@ gchar* resources_get_end_multiday_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 808 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 842 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
-#line 808 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 842 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 809 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 843 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2536 "Resources.c"
+#line 2854 "Resources.c"
 	}
-#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIDAY_DATE_FORMAT_STRING;
-#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 812 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 846 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2546 "Resources.c"
+#line 2864 "Resources.c"
 }
 
 
@@ -2579,23 +2897,23 @@ gchar* resources_get_start_multimonth_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 850 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
-#line 816 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 850 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 817 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 851 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2561 "Resources.c"
+#line 2879 "Resources.c"
 	}
-#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_START_MULTIMONTH_DATE_FORMAT_STRING;
-#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 820 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 854 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2571 "Resources.c"
+#line 2889 "Resources.c"
 }
 
 
@@ -2604,173 +2922,139 @@ gchar* resources_get_end_multimonth_span_format_string (void) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-#line 824 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 858 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
-#line 824 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 858 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 825 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 859 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_fetch_lc_time_format ();
-#line 2586 "Resources.c"
+#line 2904 "Resources.c"
 	}
-#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = resources_END_MULTIMONTH_DATE_FORMAT_STRING;
-#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_strdup (_tmp1_);
-#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp2_;
-#line 828 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2596 "Resources.c"
+#line 2914 "Resources.c"
 }
 
 
-GFile* resources_get_ui (const gchar* filename) {
-	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	const gchar* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-#line 831 "/home/jens/Source/shotwell/src/Resources.vala"
+gchar* resources_get_ui (const gchar* filename) {
+	gchar* result = NULL;
+	const gchar* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+#line 865 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = app_dirs_get_resources_dir ();
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = _tmp0_;
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_file_get_child (_tmp1_, "ui");
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = _tmp2_;
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = filename;
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = g_file_get_child (_tmp3_, _tmp4_);
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp6_ = _tmp5_;
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp3_);
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp1_);
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp6_;
-#line 832 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp0_ = filename;
+#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp1_ = g_strdup_printf ("/org/gnome/Shotwell/ui/%s", _tmp0_);
+#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp1_;
+#line 866 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2633 "Resources.c"
+#line 2932 "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 2939 "Resources.c"
 }
 
 
 GdkPixbuf* resources_get_noninterpretable_badge_pixbuf (void) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
-	GdkPixbuf* _tmp14_ = NULL;
-	GdkPixbuf* _tmp15_ = NULL;
+	GdkPixbuf* _tmp7_ = NULL;
+	GdkPixbuf* _tmp8_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_noninterpretable_badge_pixbuf;
-#line 839 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 2647 "Resources.c"
+#line 2953 "Resources.c"
 		{
-			GdkPixbuf* _tmp1_ = NULL;
-			GFile* _tmp2_ = NULL;
-			GFile* _tmp3_ = NULL;
-			GFile* _tmp4_ = NULL;
-			GFile* _tmp5_ = NULL;
-			GFile* _tmp6_ = NULL;
-			GFile* _tmp7_ = NULL;
-			gchar* _tmp8_ = NULL;
-			gchar* _tmp9_ = NULL;
-			GdkPixbuf* _tmp10_ = NULL;
-			GdkPixbuf* _tmp11_ = NULL;
-			GdkPixbuf* _tmp12_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp2_ = app_dirs_get_resources_dir ();
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp3_ = _tmp2_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp4_ = g_file_get_child (_tmp3_, "icons");
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp5_ = _tmp4_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp6_ = g_file_get_child (_tmp5_, RESOURCES_NONINTERPRETABLE_BADGE_FILE);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp7_ = _tmp6_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp8_ = g_file_get_path (_tmp7_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp9_ = _tmp8_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp10_ = gdk_pixbuf_new_from_file (_tmp9_, &_inner_error_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp11_ = _tmp10_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_free0 (_tmp9_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_object_unref0 (_tmp7_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_object_unref0 (_tmp5_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_object_unref0 (_tmp3_);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp1_ = _tmp11_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
+			gchar* path = NULL;
+			gchar* _tmp1_ = NULL;
+			GdkPixbuf* _tmp2_ = NULL;
+			const gchar* _tmp3_ = NULL;
+			GdkPixbuf* _tmp4_ = NULL;
+			GdkPixbuf* _tmp5_ = NULL;
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp1_ = g_strdup ("/org/gnome/Shotwell/icons/" RESOURCES_NONINTERPRETABLE_BADGE_FILE);
+#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+			path = _tmp1_;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp3_ = path;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp4_ = gdk_pixbuf_new_from_resource (_tmp3_, &_inner_error_);
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp2_ = _tmp4_;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2693 "Resources.c"
-				goto __catch428_g_error;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+				_g_free0 (path);
+#line 2975 "Resources.c"
+				goto __catch429_g_error;
 			}
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp12_ = _tmp1_;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp1_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp5_ = _tmp2_;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp2_ = NULL;
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (resources_noninterpretable_badge_pixbuf);
-#line 841 "/home/jens/Source/shotwell/src/Resources.vala"
-			resources_noninterpretable_badge_pixbuf = _tmp12_;
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
-			_g_object_unref0 (_tmp1_);
-#line 2706 "Resources.c"
+#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+			resources_noninterpretable_badge_pixbuf = _tmp5_;
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
+			_g_object_unref0 (_tmp2_);
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
+			_g_free0 (path);
+#line 2990 "Resources.c"
 		}
-		goto __finally428;
-		__catch428_g_error:
+		goto __finally429;
+		__catch429_g_error:
 		{
 			GError* err = NULL;
-			const gchar* _tmp13_ = NULL;
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
+			const gchar* _tmp6_ = NULL;
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			err = _inner_error_;
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			_inner_error_ = NULL;
-#line 844 "/home/jens/Source/shotwell/src/Resources.vala"
-			_tmp13_ = err->message;
-#line 844 "/home/jens/Source/shotwell/src/Resources.vala"
-			g_error ("Resources.vala:844: VideoReader can't load noninterpretable badge imag" \
-"e: %s", _tmp13_);
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 878 "/home/jens/Source/shotwell/src/Resources.vala"
+			_tmp6_ = err->message;
+#line 878 "/home/jens/Source/shotwell/src/Resources.vala"
+			g_error ("Resources.vala:878: VideoReader can't load noninterpretable badge imag" \
+"e: %s", _tmp6_);
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_error_free0 (err);
-#line 2723 "Resources.c"
+#line 3007 "Resources.c"
 		}
-		__finally428:
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
+		__finally429:
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 874 "/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 840 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_clear_error (&_inner_error_);
-#line 840 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
 			return NULL;
-#line 2734 "Resources.c"
+#line 3018 "Resources.c"
 		}
 	}
-#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp14_ = resources_noninterpretable_badge_pixbuf;
-#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp15_;
-#line 848 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp7_ = resources_noninterpretable_badge_pixbuf;
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp8_ = _g_object_ref0 (_tmp7_);
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp8_;
+#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2745 "Resources.c"
+#line 3029 "Resources.c"
 }
 
 
@@ -2779,43 +3063,19 @@ GtkIconTheme* resources_get_icon_theme_engine (void) {
 	GtkIconTheme* icon_theme = NULL;
 	GtkIconTheme* _tmp0_ = NULL;
 	GtkIconTheme* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 886 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = gtk_icon_theme_get_default ();
-#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 886 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 852 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 886 "/home/jens/Source/shotwell/src/Resources.vala"
 	icon_theme = _tmp1_;
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = app_dirs_get_resources_dir ();
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = _tmp2_;
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp4_ = g_file_get_child (_tmp3_, "icons");
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp5_ = _tmp4_;
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp6_ = g_file_get_path (_tmp5_);
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp7_ = _tmp6_;
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	gtk_icon_theme_append_search_path (icon_theme, _tmp7_);
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_free0 (_tmp7_);
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp5_);
-#line 853 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp3_);
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
+	gtk_icon_theme_add_resource_path (icon_theme, "/org/gnome/Shotwell/icons");
+#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = icon_theme;
-#line 855 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 889 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2790 "Resources.c"
+#line 3050 "Resources.c"
 }
 
 
@@ -2840,13 +3100,13 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 	gchar* _tmp31_ = NULL;
 	gchar* _tmp32_ = NULL;
 	GdkPixbuf* _tmp33_ = NULL;
-#line 860 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 894 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 861 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_scaled_icon_cache;
-#line 861 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ != NULL) {
-#line 2821 "Resources.c"
+#line 3081 "Resources.c"
 		gchar* scaled_name = NULL;
 		const gchar* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
@@ -2854,334 +3114,302 @@ GdkPixbuf* resources_get_icon (const gchar* name, gint scale) {
 		GeeHashMap* _tmp4_ = NULL;
 		const gchar* _tmp5_ = NULL;
 		gboolean _tmp6_ = FALSE;
-#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = name;
-#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = scale;
-#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp3_ = g_strdup_printf ("%s-%d", _tmp1_, _tmp2_);
-#line 862 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
 		scaled_name = _tmp3_;
-#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp4_ = resources_scaled_icon_cache;
-#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = scaled_name;
-#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
-#line 863 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 897 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp6_) {
-#line 2845 "Resources.c"
+#line 3105 "Resources.c"
 			GeeHashMap* _tmp7_ = NULL;
 			const gchar* _tmp8_ = NULL;
 			gpointer _tmp9_ = NULL;
-#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp7_ = resources_scaled_icon_cache;
-#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp8_ = scaled_name;
-#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp9_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp8_);
-#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = (GdkPixbuf*) _tmp9_;
-#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (scaled_name);
-#line 864 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 2861 "Resources.c"
+#line 3121 "Resources.c"
 		}
-#line 861 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (scaled_name);
-#line 2865 "Resources.c"
+#line 3125 "Resources.c"
 	}
-#line 869 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 903 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp10_ = resources_icon_cache;
-#line 869 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 903 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp10_ == NULL) {
-#line 2871 "Resources.c"
+#line 3131 "Resources.c"
 		GeeHashMap* _tmp11_ = NULL;
-#line 870 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 870 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_icon_cache);
-#line 870 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 904 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_icon_cache = _tmp11_;
-#line 2879 "Resources.c"
+#line 3139 "Resources.c"
 	}
-#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp12_ = resources_icon_cache;
-#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp13_ = name;
-#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_);
-#line 873 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 907 "/home/jens/Source/shotwell/src/Resources.vala"
 	pixbuf = (GdkPixbuf*) _tmp14_;
-#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp15_ = pixbuf;
-#line 874 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp15_ == NULL) {
-#line 2893 "Resources.c"
+#line 3153 "Resources.c"
 		const gchar* _tmp16_ = NULL;
 		GdkPixbuf* _tmp17_ = NULL;
 		GdkPixbuf* _tmp18_ = NULL;
 		GeeHashMap* _tmp19_ = NULL;
 		const gchar* _tmp20_ = NULL;
 		GdkPixbuf* _tmp21_ = NULL;
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = name;
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = resources_load_icon (_tmp16_, 0);
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 875 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 909 "/home/jens/Source/shotwell/src/Resources.vala"
 		pixbuf = _tmp17_;
-#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 910 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp18_ = pixbuf;
-#line 876 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 910 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp18_ == NULL) {
-#line 877 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 911 "/home/jens/Source/shotwell/src/Resources.vala"
 			result = NULL;
-#line 877 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 911 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_object_unref0 (pixbuf);
-#line 877 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 911 "/home/jens/Source/shotwell/src/Resources.vala"
 			return result;
-#line 2918 "Resources.c"
+#line 3178 "Resources.c"
 		}
-#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = resources_icon_cache;
-#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = name;
-#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 913 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = pixbuf;
-#line 879 "/home/jens/Source/shotwell/src/Resources.vala"
+#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 2928 "Resources.c"
+#line 3188 "Resources.c"
 	}
-#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 916 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = scale;
-#line 882 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 916 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp22_ <= 0) {
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = pixbuf;
-#line 883 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 917 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 2938 "Resources.c"
+#line 3198 "Resources.c"
 	}
-#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp23_ = pixbuf;
-#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp24_ = scale;
-#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp25_ = scale_pixbuf (_tmp23_, _tmp24_, GDK_INTERP_BILINEAR, FALSE);
-#line 885 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
 	scaled_pixbuf = _tmp25_;
-#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 921 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp26_ = resources_scaled_icon_cache;
-#line 887 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 921 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp26_ == NULL) {
-#line 2952 "Resources.c"
+#line 3212 "Resources.c"
 		GeeHashMap* _tmp27_ = NULL;
-#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp27_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, gdk_pixbuf_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_scaled_icon_cache);
-#line 888 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_scaled_icon_cache = _tmp27_;
-#line 2960 "Resources.c"
+#line 3220 "Resources.c"
 	}
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp28_ = resources_scaled_icon_cache;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp29_ = name;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp30_ = scale;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp31_ = g_strdup_printf ("%s-%d", _tmp29_, _tmp30_);
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp32_ = _tmp31_;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp33_ = scaled_pixbuf;
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp32_, _tmp33_);
-#line 890 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 924 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (_tmp32_);
-#line 892 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = scaled_pixbuf;
-#line 892 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (pixbuf);
-#line 892 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 926 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 2984 "Resources.c"
+#line 3244 "Resources.c"
 }
 
 
 GdkPixbuf* resources_load_icon (const gchar* name, gint scale) {
 	GdkPixbuf* result = NULL;
-	GFile* icons_dir = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
 	GdkPixbuf* pixbuf = NULL;
-	GdkPixbuf* _tmp16_ = NULL;
-	GdkPixbuf* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
+	GdkPixbuf* _tmp8_ = NULL;
+	GdkPixbuf* _tmp9_ = NULL;
+	gint _tmp10_ = 0;
 	GError * _inner_error_ = NULL;
-#line 895 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 929 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (name != NULL, NULL);
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp0_ = app_dirs_get_resources_dir ();
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp1_ = _tmp0_;
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp2_ = g_file_get_child (_tmp1_, "icons");
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp3_ = _tmp2_;
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (_tmp1_);
-#line 896 "/home/jens/Source/shotwell/src/Resources.vala"
-	icons_dir = _tmp3_;
-#line 898 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 930 "/home/jens/Source/shotwell/src/Resources.vala"
 	pixbuf = NULL;
-#line 3016 "Resources.c"
+#line 3259 "Resources.c"
 	{
+		gchar* path = NULL;
+		const gchar* _tmp0_ = NULL;
+		gchar* _tmp1_ = NULL;
+		GdkPixbuf* _tmp2_ = NULL;
+		GdkPixbuf* _tmp3_ = NULL;
 		GdkPixbuf* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		GFile* _tmp6_ = NULL;
-		GFile* _tmp7_ = NULL;
-		gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		GdkPixbuf* _tmp10_ = NULL;
-		GdkPixbuf* _tmp11_ = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp5_ = name;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp6_ = g_file_get_child (icons_dir, _tmp5_);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp7_ = _tmp6_;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp8_ = g_file_get_path (_tmp7_);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp9_ = _tmp8_;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp10_ = gdk_pixbuf_new_from_file (_tmp9_, &_inner_error_);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp11_ = _tmp10_;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_free0 (_tmp9_);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (_tmp7_);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp4_ = _tmp11_;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp0_ = name;
+#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp1_ = g_strdup_printf ("/org/gnome/Shotwell/icons/%s", _tmp0_);
+#line 932 "/home/jens/Source/shotwell/src/Resources.vala"
+		path = _tmp1_;
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp3_ = gdk_pixbuf_new_from_resource (path, &_inner_error_);
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp2_ = _tmp3_;
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3049 "Resources.c"
-			goto __catch429_g_error;
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+			_g_free0 (path);
+#line 3281 "Resources.c"
+			goto __catch430_g_error;
 		}
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp12_ = _tmp4_;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp4_ = NULL;
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp4_ = _tmp2_;
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp2_ = NULL;
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 900 "/home/jens/Source/shotwell/src/Resources.vala"
-		pixbuf = _tmp12_;
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (_tmp4_);
-#line 3062 "Resources.c"
+#line 933 "/home/jens/Source/shotwell/src/Resources.vala"
+		pixbuf = _tmp4_;
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_object_unref0 (_tmp2_);
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_free0 (path);
+#line 3296 "Resources.c"
 	}
-	goto __finally429;
-	__catch429_g_error:
+	goto __finally430;
+	__catch430_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp13_ = NULL;
-		GError* _tmp14_ = NULL;
-		const gchar* _tmp15_ = NULL;
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+		const gchar* _tmp5_ = NULL;
+		GError* _tmp6_ = NULL;
+		const gchar* _tmp7_ = NULL;
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		err = _inner_error_;
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		_inner_error_ = NULL;
-#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp13_ = name;
-#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp14_ = err;
-#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp15_ = _tmp14_->message;
-#line 902 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_critical ("Resources.vala:902: Unable to load icon %s: %s", _tmp13_, _tmp15_);
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp5_ = name;
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp6_ = err;
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp7_ = _tmp6_->message;
+#line 935 "/home/jens/Source/shotwell/src/Resources.vala"
+		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 3085 "Resources.c"
+#line 3319 "Resources.c"
 	}
-	__finally429:
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+	__finally430:
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (icons_dir);
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/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 899 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_clear_error (&_inner_error_);
-#line 899 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
 		return NULL;
-#line 3100 "Resources.c"
+#line 3332 "Resources.c"
 	}
-#line 905 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp16_ = pixbuf;
-#line 905 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp16_ == NULL) {
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
+	_tmp8_ = pixbuf;
+#line 938 "/home/jens/Source/shotwell/src/Resources.vala"
+	if (_tmp8_ == NULL) {
+#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = NULL;
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (pixbuf);
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (icons_dir);
-#line 906 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 939 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3114 "Resources.c"
+#line 3344 "Resources.c"
 	}
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-	_tmp18_ = scale;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-	if (_tmp18_ > 0) {
-#line 3120 "Resources.c"
-		GdkPixbuf* _tmp19_ = NULL;
-		gint _tmp20_ = 0;
-		GdkPixbuf* _tmp21_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp19_ = pixbuf;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp20_ = scale;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp21_ = scale_pixbuf (_tmp19_, _tmp20_, GDK_INTERP_BILINEAR, FALSE);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (_tmp17_);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp17_ = _tmp21_;
-#line 3134 "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 3350 "Resources.c"
+		GdkPixbuf* _tmp11_ = NULL;
+		gint _tmp12_ = 0;
+		GdkPixbuf* _tmp13_ = NULL;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp11_ = pixbuf;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp12_ = scale;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp13_ = scale_pixbuf (_tmp11_, _tmp12_, GDK_INTERP_BILINEAR, FALSE);
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_object_unref0 (_tmp9_);
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp9_ = _tmp13_;
+#line 3364 "Resources.c"
 	} else {
-		GdkPixbuf* _tmp22_ = NULL;
-		GdkPixbuf* _tmp23_ = NULL;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp22_ = pixbuf;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_g_object_unref0 (_tmp17_);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-		_tmp17_ = _tmp23_;
-#line 3146 "Resources.c"
+		GdkPixbuf* _tmp14_ = NULL;
+		GdkPixbuf* _tmp15_ = NULL;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp14_ = pixbuf;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp15_ = _g_object_ref0 (_tmp14_);
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_g_object_unref0 (_tmp9_);
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+		_tmp9_ = _tmp15_;
+#line 3376 "Resources.c"
 	}
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-	result = _tmp17_;
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+	result = _tmp9_;
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (pixbuf);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
-	_g_object_unref0 (icons_dir);
-#line 908 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3156 "Resources.c"
+#line 3384 "Resources.c"
 }
 
 
@@ -3199,88 +3427,88 @@ gchar* resources_get_help_path (void) {
 	GFile* _tmp7_ = NULL;
 	GFile* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = app_dirs_get_exec_dir ();
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_;
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = g_file_get_child (_tmp1_, "help");
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_;
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = g_file_get_child (_tmp3_, "C");
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _tmp4_;
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp3_);
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (_tmp1_);
-#line 919 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_dir = _tmp5_;
-#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = help_dir;
-#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp7_ = g_file_get_child (_tmp6_, "index.page");
-#line 920 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_index = _tmp7_;
-#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp8_ = help_index;
-#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp9_ = g_file_query_exists (_tmp8_, NULL);
-#line 922 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 955 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp9_) {
-#line 3204 "Resources.c"
+#line 3432 "Resources.c"
 		gchar* help_path = NULL;
 		GFile* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
-#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = help_dir;
-#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = g_file_get_path (_tmp10_);
-#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (help_path);
-#line 925 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 958 "/home/jens/Source/shotwell/src/Resources.vala"
 		help_path = _tmp11_;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = help_path;
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = g_str_has_suffix (_tmp12_, "/");
-#line 927 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 960 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (!_tmp13_) {
-#line 3224 "Resources.c"
+#line 3452 "Resources.c"
 			const gchar* _tmp14_ = NULL;
 			gchar* _tmp15_ = NULL;
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp14_ = help_path;
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp15_ = g_strconcat (_tmp14_, "/", NULL);
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 928 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 961 "/home/jens/Source/shotwell/src/Resources.vala"
 			help_path = _tmp15_;
-#line 3235 "Resources.c"
+#line 3463 "Resources.c"
 		}
-#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		result = help_path;
-#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (help_index);
-#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (help_dir);
-#line 931 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 964 "/home/jens/Source/shotwell/src/Resources.vala"
 		return result;
-#line 3245 "Resources.c"
+#line 3473 "Resources.c"
 	}
-#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = NULL;
-#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (help_index);
-#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (help_dir);
-#line 937 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 970 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3255 "Resources.c"
+#line 3483 "Resources.c"
 }
 
 
@@ -3290,17 +3518,17 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 	const gchar* _tmp1_ = NULL;
 	const gchar* _tmp27_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GDK_IS_SCREEN (screen));
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_get_help_path ();
-#line 941 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
 	help_path = _tmp0_;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = help_path;
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp1_ != NULL) {
-#line 3275 "Resources.c"
+#line 3503 "Resources.c"
 		const gchar* _tmp2_ = NULL;
 		gchar** argv = NULL;
 		gchar** _tmp6_ = NULL;
@@ -3332,179 +3560,179 @@ void resources_launch_help (GdkScreen* screen, const gchar* anchor, GError** err
 		gchar** _tmp25_ = NULL;
 		gint _tmp25__length1 = 0;
 		const gchar* _tmp26_ = NULL;
-#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp2_ = anchor;
-#line 947 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 980 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp2_ != NULL) {
-#line 3311 "Resources.c"
+#line 3539 "Resources.c"
 			const gchar* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
 			gchar* _tmp5_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp3_ = help_path;
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp4_ = anchor;
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			_tmp5_ = g_strconcat (_tmp3_, _tmp4_, NULL);
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 948 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 981 "/home/jens/Source/shotwell/src/Resources.vala"
 			help_path = _tmp5_;
-#line 3325 "Resources.c"
+#line 3553 "Resources.c"
 		}
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = g_new0 (gchar*, 3 + 1);
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv = _tmp6_;
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 		argv_length1 = 3;
-#line 951 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 984 "/home/jens/Source/shotwell/src/Resources.vala"
 		_argv_size_ = argv_length1;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = argv;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7__length1 = argv_length1;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = g_strdup ("yelp");
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp7_[0]);
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_[0] = _tmp8_;
-#line 952 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = _tmp7_[0];
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = argv;
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10__length1 = argv_length1;
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp11_ = help_path;
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = g_strdup (_tmp11_);
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp10_[1]);
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_[1] = _tmp12_;
-#line 953 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = _tmp10_[1];
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = argv;
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14__length1 = argv_length1;
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp14_[2]);
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_[2] = NULL;
-#line 954 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = _tmp14_[2];
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp17_ = app_dirs_get_exec_dir ();
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp18_ = _tmp17_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp19_ = g_file_get_path (_tmp18_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp20_ = _tmp19_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21_ = argv;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp21__length1 = argv_length1;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/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 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		pid = _tmp22_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp24_ = _tmp23_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp20_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp18_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = _tmp24_;
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 			argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3405 "Resources.c"
+#line 3633 "Resources.c"
 		}
-#line 957 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (_tmp16_) {
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 			argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 959 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3415 "Resources.c"
+#line 3643 "Resources.c"
 		}
-#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25_ = argv;
-#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp25__length1 = argv_length1;
-#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp26_ = _tmp25_[0];
-#line 962 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_warning ("Resources.vala:962: Unable to launch %s", _tmp26_);
-#line 943 "/home/jens/Source/shotwell/src/Resources.vala"
+#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"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 3427 "Resources.c"
+#line 3655 "Resources.c"
 	}
-#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 999 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp27_ = anchor;
-#line 966 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 999 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp27_ != NULL) {
-#line 3433 "Resources.c"
+#line 3661 "Resources.c"
 		GdkScreen* _tmp28_ = NULL;
 		const gchar* _tmp29_ = NULL;
 		gchar* _tmp30_ = NULL;
 		gchar* _tmp31_ = NULL;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp28_ = screen;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp29_ = anchor;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp30_ = g_strconcat ("help:shotwell", _tmp29_, NULL);
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp31_ = _tmp30_;
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		sys_show_uri (_tmp28_, _tmp31_, &_inner_error_);
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_free0 (_tmp31_);
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 967 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1000 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3458 "Resources.c"
+#line 3686 "Resources.c"
 		}
 	} else {
 		GdkScreen* _tmp32_ = NULL;
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp32_ = screen;
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 		sys_show_uri (_tmp32_, "help:shotwell", &_inner_error_);
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 			g_propagate_error (error, _inner_error_);
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 			_g_free0 (help_path);
-#line 969 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1002 "/home/jens/Source/shotwell/src/Resources.vala"
 			return;
-#line 3474 "Resources.c"
+#line 3702 "Resources.c"
 		}
 	}
-#line 940 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_free0 (help_path);
-#line 3479 "Resources.c"
+#line 3707 "Resources.c"
 }
 
 
@@ -3520,33 +3748,33 @@ gchar* resources_to_css_color (GdkRGBA* color) {
 	GdkRGBA _tmp4_ = {0};
 	gdouble _tmp5_ = 0.0;
 	gchar* _tmp6_ = NULL;
-#line 973 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1006 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_val_if_fail (color != NULL, NULL);
-#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = *color;
-#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp1_ = _tmp0_.red;
-#line 974 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
 	r = (gint) (_tmp1_ * 255);
-#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = *color;
-#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = _tmp2_.green;
-#line 975 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1008 "/home/jens/Source/shotwell/src/Resources.vala"
 	g = (gint) (_tmp3_ * 255);
-#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = *color;
-#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp5_ = _tmp4_.blue;
-#line 976 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1009 "/home/jens/Source/shotwell/src/Resources.vala"
 	b = (gint) (_tmp5_ * 255);
-#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp6_ = g_strdup_printf ("rgb(%d, %d, %d)", r, g, b);
-#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Resources.vala"
 	result = _tmp6_;
-#line 978 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1011 "/home/jens/Source/shotwell/src/Resources.vala"
 	return result;
-#line 3521 "Resources.c"
+#line 3749 "Resources.c"
 }
 
 
@@ -3564,136 +3792,136 @@ void resources_style_widget (GtkWidget* widget, const gchar* stylesheet) {
 	GtkWidget* _tmp21_ = NULL;
 	GtkCssProvider* _tmp22_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (GTK_IS_WIDGET (widget));
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 	g_return_if_fail (stylesheet != NULL);
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp0_ = resources_providers;
-#line 986 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1019 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp0_ == NULL) {
-#line 3547 "Resources.c"
+#line 3775 "Resources.c"
 		GeeHashMap* _tmp1_ = NULL;
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp1_ = gee_hash_map_new (gtk_widget_get_type (), (GBoxedCopyFunc) g_object_ref, g_object_unref, GTK_TYPE_CSS_PROVIDER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (resources_providers);
-#line 987 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1020 "/home/jens/Source/shotwell/src/Resources.vala"
 		resources_providers = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_MAP, GeeMap);
-#line 3555 "Resources.c"
+#line 3783 "Resources.c"
 	}
-#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp2_ = resources_providers;
-#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp3_ = widget;
-#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp4_ = gee_map_has_key (_tmp2_, _tmp3_);
-#line 989 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1022 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (_tmp4_) {
-#line 3565 "Resources.c"
+#line 3793 "Resources.c"
 		GtkWidget* _tmp5_ = NULL;
 		GtkStyleContext* _tmp6_ = NULL;
 		GeeMap* _tmp7_ = NULL;
 		GtkWidget* _tmp8_ = NULL;
 		gpointer _tmp9_ = NULL;
 		GtkCssProvider* _tmp10_ = NULL;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp5_ = widget;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp6_ = gtk_widget_get_style_context (_tmp5_);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp7_ = resources_providers;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp8_ = widget;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp9_ = gee_map_get (_tmp7_, _tmp8_);
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp10_ = (GtkCssProvider*) _tmp9_;
-#line 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/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 990 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1023 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (_tmp10_);
-#line 3588 "Resources.c"
+#line 3816 "Resources.c"
 	}
-#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp11_ = gtk_css_provider_new ();
-#line 992 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1025 "/home/jens/Source/shotwell/src/Resources.vala"
 	styler = _tmp11_;
-#line 3594 "Resources.c"
+#line 3822 "Resources.c"
 	{
 		GtkCssProvider* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp12_ = styler;
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp13_ = stylesheet;
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		gtk_css_provider_load_from_data (_tmp12_, _tmp13_, (gssize) RESOURCES_ALL_DATA, &_inner_error_);
-#line 995 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1028 "/home/jens/Source/shotwell/src/Resources.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3606 "Resources.c"
-			goto __catch430_g_error;
+#line 3834 "Resources.c"
+			goto __catch431_g_error;
 		}
 	}
-	goto __finally430;
-	__catch430_g_error:
+	goto __finally431;
+	__catch431_g_error:
 	{
 		GError* e = NULL;
 		const gchar* _tmp14_ = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		e = _inner_error_;
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		_inner_error_ = NULL;
-#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp14_ = stylesheet;
-#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp15_ = e;
-#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1030 "/home/jens/Source/shotwell/src/Resources.vala"
 		_tmp16_ = _tmp15_->message;
-#line 997 "/home/jens/Source/shotwell/src/Resources.vala"
-		g_warning ("Resources.vala:997: couldn't parse widget stylesheet '%s': %s", _tmp14_, _tmp16_);
-#line 1001 "/home/jens/Source/shotwell/src/Resources.vala"
+#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"
 		_g_error_free0 (e);
-#line 1001 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (styler);
-#line 1001 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1034 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 3635 "Resources.c"
+#line 3863 "Resources.c"
 	}
-	__finally430:
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+	__finally431:
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		_g_object_unref0 (styler);
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/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 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		g_clear_error (&_inner_error_);
-#line 994 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1027 "/home/jens/Source/shotwell/src/Resources.vala"
 		return;
-#line 3648 "Resources.c"
+#line 3876 "Resources.c"
 	}
-#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp17_ = widget;
-#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp18_ = gtk_widget_get_style_context (_tmp17_);
-#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1037 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp19_ = styler;
-#line 1004 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1037 "/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 1007 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp20_ = resources_providers;
-#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp21_ = widget;
-#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
 	_tmp22_ = styler;
-#line 1007 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1040 "/home/jens/Source/shotwell/src/Resources.vala"
 	gee_map_set (_tmp20_, _tmp21_, _tmp22_);
-#line 985 "/home/jens/Source/shotwell/src/Resources.vala"
+#line 1018 "/home/jens/Source/shotwell/src/Resources.vala"
 	_g_object_unref0 (styler);
-#line 3668 "Resources.c"
+#line 3896 "Resources.c"
 }
 
 
@@ -3715,4 +3943,16 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 }
 
 
+static gint _vala_array_length (gpointer array) {
+	int length;
+	length = 0;
+	if (array) {
+		while (((gpointer*) array)[length]) {
+			length++;
+		}
+	}
+	return length;
+}
+
+
 
diff --git a/src/Resources.vala b/src/Resources.vala
index feb568b..e26448a 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -87,7 +87,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string GO_PREVIOUS = "go-previous";
 
     
-    public const string ICON_ABOUT_LOGO = "shotwell-street.jpg";
+    //public const string ICON_ABOUT_LOGO = "shotwell-street.jpg";
+    public const string ICON_ABOUT_LOGO = "about-aachen.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";
@@ -686,11 +687,10 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     private string END_MULTIDAY_DATE_FORMAT_STRING = null;
     private string START_MULTIMONTH_DATE_FORMAT_STRING = null;
     private string END_MULTIMONTH_DATE_FORMAT_STRING = null;
-        
+
     public void init () {
-        var icon_theme = Gtk.IconTheme.get_default();
+        get_icon_theme_engine();
         // load application-wide stock icons as IconSets
-        icon_theme.append_search_path(AppDirs.get_resources_dir().get_child("icons").get_path());
         generate_rating_strings();
     }
     
@@ -766,6 +766,40 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         if (old_language != null) {
             Environment.set_variable("LANGUAGE", old_language, true);
         }
+
+    }
+
+    public enum UnitSystem {
+        IMPERIAL,
+        METRIC,
+        UNKNOWN
+    }
+
+    private string lc_measurement = null;
+    private UnitSystem unit_system = UnitSystem.UNKNOWN;
+    private const string IMPERIAL_COUNTRIES[] = {"unm_US", "es_US", "en_US", "yi_US" };
+
+    public UnitSystem get_default_measurement_unit() {
+        if (unit_system != UnitSystem.UNKNOWN) {
+            return unit_system;
+        }
+
+        lc_measurement = Environment.get_variable("LC_MEASUREMENT");
+        if (lc_measurement == null) {
+            lc_measurement = Intl.get_language_names()[0];
+        }
+
+        var index = lc_measurement.last_index_of_char('.');
+        if (index > 0) {
+            lc_measurement = lc_measurement.substring(0, index);
+        }
+
+        unit_system = UnitSystem.METRIC;
+        if (lc_measurement in IMPERIAL_COUNTRIES) {
+            unit_system = UnitSystem.IMPERIAL;
+        }
+
+        return unit_system;
     }
     
     /**
@@ -828,8 +862,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
         return END_MULTIMONTH_DATE_FORMAT_STRING;
     }
 
-    public File get_ui(string filename) {
-        return AppDirs.get_resources_dir().get_child("ui").get_child(filename);
+    public string get_ui(string filename) {
+        return "/org/gnome/Shotwell/ui/%s".printf(filename);
     }
 
     private const string NONINTERPRETABLE_BADGE_FILE = "noninterpretable-video.png";
@@ -838,8 +872,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public Gdk.Pixbuf? get_noninterpretable_badge_pixbuf() {
         if (noninterpretable_badge_pixbuf == null) {
             try {
-                noninterpretable_badge_pixbuf = new Gdk.Pixbuf.from_file(AppDirs.get_resources_dir().get_child(
-                    "icons").get_child(NONINTERPRETABLE_BADGE_FILE).get_path());
+                var path = "/org/gnome/Shotwell/icons/" + NONINTERPRETABLE_BADGE_FILE;
+                noninterpretable_badge_pixbuf = new Gdk.Pixbuf.from_resource(path);
             } catch (Error err) {
                 error("VideoReader can't load noninterpretable badge image: %s", err.message);
             }
@@ -850,7 +884,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     
     public Gtk.IconTheme get_icon_theme_engine() {
         Gtk.IconTheme icon_theme = Gtk.IconTheme.get_default();
-        icon_theme.append_search_path(AppDirs.get_resources_dir().get_child("icons").get_path());
+        icon_theme.add_resource_path("/org/gnome/Shotwell/icons");
         
         return icon_theme;
     }
@@ -893,18 +927,17 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     }
     
     public Gdk.Pixbuf? load_icon(string name, int scale = DEFAULT_ICON_SCALE) {
-        File icons_dir = AppDirs.get_resources_dir().get_child("icons");
-        
         Gdk.Pixbuf pixbuf = null;
         try {
-            pixbuf = new Gdk.Pixbuf.from_file(icons_dir.get_child(name).get_path());
+            var path = "/org/gnome/Shotwell/icons/%s".printf(name);
+            pixbuf = new Gdk.Pixbuf.from_resource(path);
         } catch (Error err) {
             critical("Unable to load icon %s: %s", name, err.message);
         }
 
         if (pixbuf == null)
             return null;
-        
+
         return (scale > 0) ? scale_pixbuf(pixbuf, scale, Gdk.InterpType.BILINEAR, false) : pixbuf;
     }
     
diff --git a/src/SearchFilter.c b/src/SearchFilter.c
index 6d1e92f..11e314e 100644
--- a/src/SearchFilter.c
+++ b/src/SearchFilter.c
@@ -1266,6 +1266,7 @@ SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions);
 SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchFilterActions* actions);
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_new (TextAction* action);
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_construct (GType object_type, TextAction* action);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_panic (const gchar* msg);
 static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterToolbar* self);
 static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self);
@@ -1480,7 +1481,7 @@ static guint search_view_filter_real_get_criteria (SearchViewFilter* self) {
 	g_critical ("Type `%s' does not implement abstract method `search_view_filter_get_criteria'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 65 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return 0U;
-#line 1484 "SearchFilter.c"
+#line 1485 "SearchFilter.c"
 }
 
 
@@ -1489,7 +1490,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 1493 "SearchFilter.c"
+#line 1494 "SearchFilter.c"
 }
 
 
@@ -1508,7 +1509,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 1512 "SearchFilter.c"
+#line 1513 "SearchFilter.c"
 		{
 #line 71 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1516,11 +1517,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 1520 "SearchFilter.c"
+#line 1521 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 1524 "SearchFilter.c"
+#line 1525 "SearchFilter.c"
 		{
 #line 76 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_REJECTED;
@@ -1528,11 +1529,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 1532 "SearchFilter.c"
+#line 1533 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 1536 "SearchFilter.c"
+#line 1537 "SearchFilter.c"
 		{
 #line 81 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1540,11 +1541,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 1544 "SearchFilter.c"
+#line 1545 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_ONLY:
-#line 1548 "SearchFilter.c"
+#line 1549 "SearchFilter.c"
 		{
 #line 86 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_ONE;
@@ -1552,11 +1553,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 1556 "SearchFilter.c"
+#line 1557 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 1560 "SearchFilter.c"
+#line 1561 "SearchFilter.c"
 		{
 #line 91 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1564,11 +1565,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 1568 "SearchFilter.c"
+#line 1569 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_ONLY:
-#line 1572 "SearchFilter.c"
+#line 1573 "SearchFilter.c"
 		{
 #line 96 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_TWO;
@@ -1576,11 +1577,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 1580 "SearchFilter.c"
+#line 1581 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 1584 "SearchFilter.c"
+#line 1585 "SearchFilter.c"
 		{
 #line 101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1588,11 +1589,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 1592 "SearchFilter.c"
+#line 1593 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_ONLY:
-#line 1596 "SearchFilter.c"
+#line 1597 "SearchFilter.c"
 		{
 #line 106 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_THREE;
@@ -1600,11 +1601,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 1604 "SearchFilter.c"
+#line 1605 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 1608 "SearchFilter.c"
+#line 1609 "SearchFilter.c"
 		{
 #line 111 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1612,11 +1613,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 1616 "SearchFilter.c"
+#line 1617 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_ONLY:
-#line 1620 "SearchFilter.c"
+#line 1621 "SearchFilter.c"
 		{
 #line 116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FOUR;
@@ -1624,11 +1625,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 1628 "SearchFilter.c"
+#line 1629 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 1632 "SearchFilter.c"
+#line 1633 "SearchFilter.c"
 		{
 #line 121 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1636,11 +1637,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 1640 "SearchFilter.c"
+#line 1641 "SearchFilter.c"
 		}
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 1644 "SearchFilter.c"
+#line 1645 "SearchFilter.c"
 		{
 #line 126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_FIVE;
@@ -1648,12 +1649,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 1652 "SearchFilter.c"
+#line 1653 "SearchFilter.c"
 		}
 		default:
 #line 69 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 1657 "SearchFilter.c"
+#line 1658 "SearchFilter.c"
 		{
 #line 132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			self->priv->rating = RATING_UNRATED;
@@ -1661,7 +1662,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 1665 "SearchFilter.c"
+#line 1666 "SearchFilter.c"
 		}
 	}
 }
@@ -1681,7 +1682,7 @@ gboolean search_view_filter_has_search_filter (SearchViewFilter* self) {
 	result = !_tmp1_;
 #line 139 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1685 "SearchFilter.c"
+#line 1686 "SearchFilter.c"
 }
 
 
@@ -1696,7 +1697,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 1700 "SearchFilter.c"
+#line 1701 "SearchFilter.c"
 }
 
 
@@ -1720,13 +1721,13 @@ 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 1724 "SearchFilter.c"
+#line 1725 "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 1730 "SearchFilter.c"
+#line 1731 "SearchFilter.c"
 }
 
 
@@ -1737,17 +1738,17 @@ static gchar** _vala_array_dup32 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	for (i = 0; i < length; i++) {
-#line 1741 "SearchFilter.c"
+#line 1742 "SearchFilter.c"
 		gchar* _tmp0_ = NULL;
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = g_strdup (self[i]);
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		result[i] = _tmp0_;
-#line 1747 "SearchFilter.c"
+#line 1748 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1751 "SearchFilter.c"
+#line 1752 "SearchFilter.c"
 }
 
 
@@ -1770,7 +1771,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 1774 "SearchFilter.c"
+#line 1775 "SearchFilter.c"
 		const gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -1781,13 +1782,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 1785 "SearchFilter.c"
+#line 1786 "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 1791 "SearchFilter.c"
+#line 1792 "SearchFilter.c"
 	}
 #line 151 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = g_strdup (_tmp0_);
@@ -1799,7 +1800,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 1803 "SearchFilter.c"
+#line 1804 "SearchFilter.c"
 		const gchar* _tmp8_ = NULL;
 		gchar** _tmp9_ = NULL;
 		gchar** _tmp10_ = NULL;
@@ -1815,7 +1816,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 1819 "SearchFilter.c"
+#line 1820 "SearchFilter.c"
 	} else {
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp6_ = (_vala_array_free (_tmp6_, _tmp6__length1, (GDestroyNotify) g_free), NULL);
@@ -1825,7 +1826,7 @@ 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 1829 "SearchFilter.c"
+#line 1830 "SearchFilter.c"
 	}
 #line 152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = (_tmp6_ != NULL) ? _vala_array_dup32 (_tmp6_, _tmp6__length1) : ((gpointer) _tmp6_);
@@ -1843,7 +1844,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 1847 "SearchFilter.c"
+#line 1848 "SearchFilter.c"
 }
 
 
@@ -1862,7 +1863,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 1866 "SearchFilter.c"
+#line 1867 "SearchFilter.c"
 }
 
 
@@ -1877,7 +1878,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 1881 "SearchFilter.c"
+#line 1882 "SearchFilter.c"
 }
 
 
@@ -1892,7 +1893,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 1896 "SearchFilter.c"
+#line 1897 "SearchFilter.c"
 }
 
 
@@ -1907,7 +1908,7 @@ Rating search_view_filter_get_rating (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 169 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 1911 "SearchFilter.c"
+#line 1912 "SearchFilter.c"
 }
 
 
@@ -1925,31 +1926,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 1929 "SearchFilter.c"
+#line 1930 "SearchFilter.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = self->priv->_show_media_photos;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp4_;
-#line 1936 "SearchFilter.c"
+#line 1937 "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 1942 "SearchFilter.c"
+#line 1943 "SearchFilter.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->_show_media_raw;
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = _tmp5_;
-#line 1949 "SearchFilter.c"
+#line 1950 "SearchFilter.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 1953 "SearchFilter.c"
+#line 1954 "SearchFilter.c"
 		gboolean _tmp6_ = FALSE;
 		gboolean _tmp7_ = FALSE;
 		gboolean _tmp8_ = FALSE;
@@ -1957,45 +1958,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 1961 "SearchFilter.c"
+#line 1962 "SearchFilter.c"
 			gboolean _tmp9_ = FALSE;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp9_ = self->priv->_show_media_photos;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = _tmp9_;
-#line 1967 "SearchFilter.c"
+#line 1968 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp7_ = FALSE;
-#line 1971 "SearchFilter.c"
+#line 1972 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp7_) {
-#line 1975 "SearchFilter.c"
+#line 1976 "SearchFilter.c"
 			gboolean _tmp10_ = FALSE;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp10_ = self->priv->_show_media_raw;
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = _tmp10_;
-#line 1981 "SearchFilter.c"
+#line 1982 "SearchFilter.c"
 		} else {
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp6_ = FALSE;
-#line 1985 "SearchFilter.c"
+#line 1986 "SearchFilter.c"
 		}
 #line 174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = !_tmp6_;
-#line 1989 "SearchFilter.c"
+#line 1990 "SearchFilter.c"
 	} else {
 #line 173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 1993 "SearchFilter.c"
+#line 1994 "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 1999 "SearchFilter.c"
+#line 2000 "SearchFilter.c"
 }
 
 
@@ -2005,7 +2006,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 2009 "SearchFilter.c"
+#line 2010 "SearchFilter.c"
 }
 
 
@@ -2020,7 +2021,7 @@ gboolean search_view_filter_get_flagged (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 48 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2024 "SearchFilter.c"
+#line 2025 "SearchFilter.c"
 }
 
 
@@ -2032,7 +2033,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 2036 "SearchFilter.c"
+#line 2037 "SearchFilter.c"
 }
 
 
@@ -2047,7 +2048,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 2051 "SearchFilter.c"
+#line 2052 "SearchFilter.c"
 }
 
 
@@ -2059,7 +2060,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 2063 "SearchFilter.c"
+#line 2064 "SearchFilter.c"
 }
 
 
@@ -2074,7 +2075,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 2078 "SearchFilter.c"
+#line 2079 "SearchFilter.c"
 }
 
 
@@ -2086,7 +2087,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 2090 "SearchFilter.c"
+#line 2091 "SearchFilter.c"
 }
 
 
@@ -2101,7 +2102,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 2105 "SearchFilter.c"
+#line 2106 "SearchFilter.c"
 }
 
 
@@ -2113,7 +2114,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 2117 "SearchFilter.c"
+#line 2118 "SearchFilter.c"
 }
 
 
@@ -2128,14 +2129,14 @@ SavedSearch* search_view_filter_get_saved_search (SearchViewFilter* self) {
 	result = _tmp0_;
 #line 60 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2132 "SearchFilter.c"
+#line 2133 "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 2139 "SearchFilter.c"
+#line 2140 "SearchFilter.c"
 }
 
 
@@ -2152,7 +2153,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 2156 "SearchFilter.c"
+#line 2157 "SearchFilter.c"
 }
 
 
@@ -2165,7 +2166,7 @@ static void search_view_filter_class_init (SearchViewFilterClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchViewFilterPrivate));
 #line 39 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = search_view_filter_real_get_criteria;
-#line 2169 "SearchFilter.c"
+#line 2170 "SearchFilter.c"
 }
 
 
@@ -2196,7 +2197,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 2200 "SearchFilter.c"
+#line 2201 "SearchFilter.c"
 }
 
 
@@ -2212,7 +2213,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 2216 "SearchFilter.c"
+#line 2217 "SearchFilter.c"
 }
 
 
@@ -2244,7 +2245,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2248 "SearchFilter.c"
+#line 2249 "SearchFilter.c"
 }
 
 
@@ -2282,14 +2283,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 2286 "SearchFilter.c"
+#line 2287 "SearchFilter.c"
 		gboolean _tmp4_ = FALSE;
 		gboolean _tmp5_ = FALSE;
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = search_view_filter_get_rating_allow_higher (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp5_) {
-#line 2293 "SearchFilter.c"
+#line 2294 "SearchFilter.c"
 			MediaSource* _tmp6_ = NULL;
 			Rating _tmp7_ = 0;
 			Rating _tmp8_ = 0;
@@ -2301,11 +2302,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 2305 "SearchFilter.c"
+#line 2306 "SearchFilter.c"
 		} else {
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp4_ = FALSE;
-#line 2309 "SearchFilter.c"
+#line 2310 "SearchFilter.c"
 		}
 #line 187 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp4_) {
@@ -2315,7 +2316,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 2319 "SearchFilter.c"
+#line 2320 "SearchFilter.c"
 		} else {
 			gboolean _tmp9_ = FALSE;
 			gboolean _tmp10_ = FALSE;
@@ -2323,7 +2324,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 2327 "SearchFilter.c"
+#line 2328 "SearchFilter.c"
 				MediaSource* _tmp11_ = NULL;
 				Rating _tmp12_ = 0;
 				Rating _tmp13_ = 0;
@@ -2335,11 +2336,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 2339 "SearchFilter.c"
+#line 2340 "SearchFilter.c"
 			} else {
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_tmp9_ = FALSE;
-#line 2343 "SearchFilter.c"
+#line 2344 "SearchFilter.c"
 			}
 #line 189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp9_) {
@@ -2349,7 +2350,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 2353 "SearchFilter.c"
+#line 2354 "SearchFilter.c"
 			}
 		}
 	}
@@ -2357,7 +2358,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 2361 "SearchFilter.c"
+#line 2362 "SearchFilter.c"
 		gboolean _tmp15_ = FALSE;
 		gboolean _tmp16_ = FALSE;
 		gboolean _tmp17_ = FALSE;
@@ -2368,21 +2369,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 2372 "SearchFilter.c"
+#line 2373 "SearchFilter.c"
 			MediaSource* _tmp19_ = NULL;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp19_ = source;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_FLAGGABLE);
-#line 2378 "SearchFilter.c"
+#line 2379 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp16_ = FALSE;
-#line 2382 "SearchFilter.c"
+#line 2383 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp16_) {
-#line 2386 "SearchFilter.c"
+#line 2387 "SearchFilter.c"
 			MediaSource* _tmp20_ = NULL;
 			gboolean _tmp21_ = FALSE;
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2391,11 +2392,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 2395 "SearchFilter.c"
+#line 2396 "SearchFilter.c"
 		} else {
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp15_ = FALSE;
-#line 2399 "SearchFilter.c"
+#line 2400 "SearchFilter.c"
 		}
 #line 195 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp15_) {
@@ -2405,34 +2406,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 2409 "SearchFilter.c"
+#line 2410 "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 2416 "SearchFilter.c"
+#line 2417 "SearchFilter.c"
 		gboolean _tmp24_ = FALSE;
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp24_ = search_view_filter_filter_by_media_type (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp22_ = _tmp24_;
-#line 2422 "SearchFilter.c"
+#line 2423 "SearchFilter.c"
 	} else {
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp22_ = FALSE;
-#line 2426 "SearchFilter.c"
+#line 2427 "SearchFilter.c"
 	}
 #line 200 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp22_) {
-#line 2430 "SearchFilter.c"
+#line 2431 "SearchFilter.c"
 		MediaSource* _tmp25_ = NULL;
 #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp25_ = source;
 #line 201 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp25_, TYPE_VIDEO_SOURCE)) {
-#line 2436 "SearchFilter.c"
+#line 2437 "SearchFilter.c"
 			gboolean _tmp26_ = FALSE;
 			gboolean _tmp27_ = FALSE;
 #line 202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2447,7 +2448,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 2451 "SearchFilter.c"
+#line 2452 "SearchFilter.c"
 			}
 		} else {
 			MediaSource* _tmp28_ = NULL;
@@ -2455,7 +2456,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 2459 "SearchFilter.c"
+#line 2460 "SearchFilter.c"
 				Photo* photo = NULL;
 				MediaSource* _tmp29_ = NULL;
 				Photo* _tmp30_ = NULL;
@@ -2473,7 +2474,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 2477 "SearchFilter.c"
+#line 2478 "SearchFilter.c"
 					Photo* _tmp33_ = NULL;
 					gboolean _tmp34_ = FALSE;
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2482,7 +2483,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_tmp34_ = photo_is_raw_developer_available (_tmp33_, RAW_DEVELOPER_CAMERA);
 #line 207 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp34_) {
-#line 2486 "SearchFilter.c"
+#line 2487 "SearchFilter.c"
 						gboolean _tmp35_ = FALSE;
 						gboolean _tmp36_ = FALSE;
 						gboolean _tmp37_ = FALSE;
@@ -2492,7 +2493,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp37_ = _tmp36_;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						if (!_tmp37_) {
-#line 2496 "SearchFilter.c"
+#line 2497 "SearchFilter.c"
 							gboolean _tmp38_ = FALSE;
 							gboolean _tmp39_ = FALSE;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2501,11 +2502,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 							_tmp39_ = _tmp38_;
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							_tmp35_ = !_tmp39_;
-#line 2505 "SearchFilter.c"
+#line 2506 "SearchFilter.c"
 						} else {
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							_tmp35_ = FALSE;
-#line 2509 "SearchFilter.c"
+#line 2510 "SearchFilter.c"
 						}
 #line 208 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						if (_tmp35_) {
@@ -2517,7 +2518,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 							_g_object_unref0 (source);
 #line 209 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							return result;
-#line 2521 "SearchFilter.c"
+#line 2522 "SearchFilter.c"
 						}
 					} else {
 						gboolean _tmp40_ = FALSE;
@@ -2536,7 +2537,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 							_g_object_unref0 (source);
 #line 211 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							return result;
-#line 2540 "SearchFilter.c"
+#line 2541 "SearchFilter.c"
 						}
 					}
 				} else {
@@ -2556,12 +2557,12 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_g_object_unref0 (source);
 #line 214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						return result;
-#line 2560 "SearchFilter.c"
+#line 2561 "SearchFilter.c"
 					}
 				}
 #line 204 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (photo);
-#line 2565 "SearchFilter.c"
+#line 2566 "SearchFilter.c"
 			}
 		}
 	}
@@ -2569,21 +2570,21 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_tmp45_ = criteria;
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_TEXT & _tmp45_) != 0) {
-#line 2573 "SearchFilter.c"
+#line 2574 "SearchFilter.c"
 		gboolean _tmp46_ = FALSE;
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp46_ = search_view_filter_has_search_filter (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp44_ = _tmp46_;
-#line 2579 "SearchFilter.c"
+#line 2580 "SearchFilter.c"
 	} else {
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp44_ = FALSE;
-#line 2583 "SearchFilter.c"
+#line 2584 "SearchFilter.c"
 	}
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp44_) {
-#line 2587 "SearchFilter.c"
+#line 2588 "SearchFilter.c"
 		const gchar* media_keywords = NULL;
 		MediaSource* _tmp47_ = NULL;
 		const gchar* _tmp48_ = NULL;
@@ -2619,7 +2620,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_tmp51_ = event;
 #line 224 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp51_ != NULL) {
-#line 2623 "SearchFilter.c"
+#line 2624 "SearchFilter.c"
 			Event* _tmp52_ = NULL;
 			const gchar* _tmp53_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2628,7 +2629,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp53_ = indexable_get_indexable_keywords (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, TYPE_INDEXABLE, Indexable));
 #line 225 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			event_keywords = _tmp53_;
-#line 2632 "SearchFilter.c"
+#line 2633 "SearchFilter.c"
 		}
 #line 227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp54_ = tag_global;
@@ -2642,7 +2643,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_tmp58_ = tags;
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp58_ != NULL) {
-#line 2646 "SearchFilter.c"
+#line 2647 "SearchFilter.c"
 			GeeList* _tmp59_ = NULL;
 			gint _tmp60_ = 0;
 			gint _tmp61_ = 0;
@@ -2654,17 +2655,17 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			_tmp61_ = _tmp60_;
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp57_ = _tmp61_;
-#line 2658 "SearchFilter.c"
+#line 2659 "SearchFilter.c"
 		} else {
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp57_ = 0;
-#line 2662 "SearchFilter.c"
+#line 2663 "SearchFilter.c"
 		}
 #line 228 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		tags_size = _tmp57_;
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp63_ = search_view_filter_get_search_filter_words (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter), &_tmp62_);
-#line 2668 "SearchFilter.c"
+#line 2669 "SearchFilter.c"
 		{
 			gchar** word_collection = NULL;
 			gint word_collection_length1 = 0;
@@ -2676,11 +2677,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 			word_collection_length1 = _tmp62_;
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			for (word_it = 0; word_it < _tmp62_; word_it = word_it + 1) {
-#line 2680 "SearchFilter.c"
+#line 2681 "SearchFilter.c"
 				const gchar* word = NULL;
 #line 230 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				word = word_collection[word_it];
-#line 2684 "SearchFilter.c"
+#line 2685 "SearchFilter.c"
 				{
 					gboolean _tmp64_ = FALSE;
 					const gchar* _tmp65_ = NULL;
@@ -2691,7 +2692,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_tmp65_ = media_keywords;
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp65_ != NULL) {
-#line 2695 "SearchFilter.c"
+#line 2696 "SearchFilter.c"
 						const gchar* _tmp66_ = NULL;
 						const gchar* _tmp67_ = NULL;
 						gboolean _tmp68_ = FALSE;
@@ -2703,23 +2704,23 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp68_ = string_contains (_tmp66_, _tmp67_);
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp64_ = _tmp68_;
-#line 2707 "SearchFilter.c"
+#line 2708 "SearchFilter.c"
 					} else {
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp64_ = FALSE;
-#line 2711 "SearchFilter.c"
+#line 2712 "SearchFilter.c"
 					}
 #line 231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp64_) {
 #line 232 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2717 "SearchFilter.c"
+#line 2718 "SearchFilter.c"
 					}
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					_tmp70_ = event_keywords;
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp70_ != NULL) {
-#line 2723 "SearchFilter.c"
+#line 2724 "SearchFilter.c"
 						const gchar* _tmp71_ = NULL;
 						const gchar* _tmp72_ = NULL;
 						gboolean _tmp73_ = FALSE;
@@ -2731,40 +2732,40 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						_tmp73_ = string_contains (_tmp71_, _tmp72_);
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp69_ = _tmp73_;
-#line 2735 "SearchFilter.c"
+#line 2736 "SearchFilter.c"
 					} else {
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						_tmp69_ = FALSE;
-#line 2739 "SearchFilter.c"
+#line 2740 "SearchFilter.c"
 					}
 #line 234 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp69_) {
 #line 235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						continue;
-#line 2745 "SearchFilter.c"
+#line 2746 "SearchFilter.c"
 					}
 #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					_tmp74_ = tags_size;
 #line 237 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					if (_tmp74_ > 0) {
-#line 2751 "SearchFilter.c"
+#line 2752 "SearchFilter.c"
 						gboolean found = FALSE;
 						gboolean _tmp90_ = FALSE;
 #line 238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 						found = FALSE;
-#line 2756 "SearchFilter.c"
+#line 2757 "SearchFilter.c"
 						{
 							gint ctr = 0;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							ctr = 0;
-#line 2761 "SearchFilter.c"
+#line 2762 "SearchFilter.c"
 							{
 								gboolean _tmp75_ = FALSE;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 								_tmp75_ = TRUE;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 								while (TRUE) {
-#line 2768 "SearchFilter.c"
+#line 2769 "SearchFilter.c"
 									gint _tmp77_ = 0;
 									gint _tmp78_ = 0;
 									const gchar* tag_keywords = NULL;
@@ -2778,13 +2779,13 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									const gchar* _tmp86_ = NULL;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (!_tmp75_) {
-#line 2782 "SearchFilter.c"
+#line 2783 "SearchFilter.c"
 										gint _tmp76_ = 0;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp76_ = ctr;
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										ctr = _tmp76_ + 1;
-#line 2788 "SearchFilter.c"
+#line 2789 "SearchFilter.c"
 									}
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp75_ = FALSE;
@@ -2796,7 +2797,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									if (!(_tmp77_ < _tmp78_)) {
 #line 239 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										break;
-#line 2800 "SearchFilter.c"
+#line 2801 "SearchFilter.c"
 									}
 #line 240 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									_tmp79_ = tags;
@@ -2818,7 +2819,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 									_tmp86_ = tag_keywords;
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (_tmp86_ != NULL) {
-#line 2822 "SearchFilter.c"
+#line 2823 "SearchFilter.c"
 										const gchar* _tmp87_ = NULL;
 										const gchar* _tmp88_ = NULL;
 										gboolean _tmp89_ = FALSE;
@@ -2830,11 +2831,11 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 										_tmp89_ = string_contains (_tmp87_, _tmp88_);
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp85_ = _tmp89_;
-#line 2834 "SearchFilter.c"
+#line 2835 "SearchFilter.c"
 									} else {
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										_tmp85_ = FALSE;
-#line 2838 "SearchFilter.c"
+#line 2839 "SearchFilter.c"
 									}
 #line 241 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 									if (_tmp85_) {
@@ -2842,7 +2843,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 										found = TRUE;
 #line 244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 										break;
-#line 2846 "SearchFilter.c"
+#line 2847 "SearchFilter.c"
 									}
 								}
 							}
@@ -2853,7 +2854,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 						if (_tmp90_) {
 #line 249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 							continue;
-#line 2857 "SearchFilter.c"
+#line 2858 "SearchFilter.c"
 						}
 					}
 #line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -2866,7 +2867,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 					_g_object_unref0 (source);
 #line 254 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 					return result;
-#line 2870 "SearchFilter.c"
+#line 2871 "SearchFilter.c"
 				}
 			}
 		}
@@ -2874,27 +2875,27 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_g_object_unref0 (tags);
 #line 219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (event);
-#line 2878 "SearchFilter.c"
+#line 2879 "SearchFilter.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp92_ = criteria;
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if ((SEARCH_FILTER_CRITERIA_SAVEDSEARCH & _tmp92_) != 0) {
-#line 2884 "SearchFilter.c"
+#line 2885 "SearchFilter.c"
 		gboolean _tmp93_ = FALSE;
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp93_ = search_view_filter_has_saved_search (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SEARCH_VIEW_FILTER, SearchViewFilter));
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp91_ = _tmp93_;
-#line 2890 "SearchFilter.c"
+#line 2891 "SearchFilter.c"
 	} else {
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp91_ = FALSE;
-#line 2894 "SearchFilter.c"
+#line 2895 "SearchFilter.c"
 	}
 #line 259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp91_) {
-#line 2898 "SearchFilter.c"
+#line 2899 "SearchFilter.c"
 		SavedSearch* _tmp94_ = NULL;
 		SavedSearch* _tmp95_ = NULL;
 		MediaSource* _tmp96_ = NULL;
@@ -2913,7 +2914,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 		_g_object_unref0 (source);
 #line 260 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 2917 "SearchFilter.c"
+#line 2918 "SearchFilter.c"
 	}
 #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
@@ -2921,7 +2922,7 @@ static gboolean default_search_view_filter_real_predicate (ViewFilter* base, Dat
 	_g_object_unref0 (source);
 #line 263 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2925 "SearchFilter.c"
+#line 2926 "SearchFilter.c"
 }
 
 
@@ -2931,7 +2932,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 2935 "SearchFilter.c"
+#line 2936 "SearchFilter.c"
 }
 
 
@@ -2940,7 +2941,7 @@ static void default_search_view_filter_class_init (DefaultSearchViewFilterClass
 	default_search_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 180 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((ViewFilterClass *) klass)->predicate = default_search_view_filter_real_predicate;
-#line 2944 "SearchFilter.c"
+#line 2945 "SearchFilter.c"
 }
 
 
@@ -2971,7 +2972,7 @@ static gboolean disabled_view_filter_real_predicate (ViewFilter* base, DataView*
 	result = TRUE;
 #line 269 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2975 "SearchFilter.c"
+#line 2976 "SearchFilter.c"
 }
 
 
@@ -2984,7 +2985,7 @@ static guint disabled_view_filter_real_get_criteria (SearchViewFilter* base) {
 	result = (guint) SEARCH_FILTER_CRITERIA_RATING;
 #line 273 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 2988 "SearchFilter.c"
+#line 2989 "SearchFilter.c"
 }
 
 
@@ -2994,14 +2995,14 @@ DisabledViewFilter* disabled_view_filter_construct (GType object_type) {
 	self = (DisabledViewFilter*) search_view_filter_construct (object_type);
 #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 2998 "SearchFilter.c"
+#line 2999 "SearchFilter.c"
 }
 
 
 DisabledViewFilter* disabled_view_filter_new (void) {
 #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return disabled_view_filter_construct (TYPE_DISABLED_VIEW_FILTER);
-#line 3005 "SearchFilter.c"
+#line 3006 "SearchFilter.c"
 }
 
 
@@ -3012,7 +3013,7 @@ static void disabled_view_filter_class_init (DisabledViewFilterClass * klass) {
 	((ViewFilterClass *) klass)->predicate = disabled_view_filter_real_predicate;
 #line 267 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	((SearchViewFilterClass *) klass)->get_criteria = disabled_view_filter_real_get_criteria;
-#line 3016 "SearchFilter.c"
+#line 3017 "SearchFilter.c"
 }
 
 
@@ -3048,14 +3049,14 @@ TextAction* text_action_construct (GType object_type, const gchar* init) {
 	self->priv->text = _tmp1_;
 #line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 3052 "SearchFilter.c"
+#line 3053 "SearchFilter.c"
 }
 
 
 TextAction* text_action_new (const gchar* init) {
 #line 294 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return text_action_construct (TYPE_TEXT_ACTION, init);
-#line 3059 "SearchFilter.c"
+#line 3060 "SearchFilter.c"
 }
 
 
@@ -3070,7 +3071,7 @@ void text_action_set_text (TextAction* self, const gchar* text) {
 	_tmp1_ = text;
 #line 299 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_strcmp0 (_tmp0_, _tmp1_) != 0) {
-#line 3074 "SearchFilter.c"
+#line 3075 "SearchFilter.c"
 		const gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
@@ -3086,7 +3087,7 @@ void text_action_set_text (TextAction* self, const gchar* text) {
 		_tmp4_ = text;
 #line 301 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (self, "text-changed", _tmp4_);
-#line 3090 "SearchFilter.c"
+#line 3091 "SearchFilter.c"
 	}
 }
 
@@ -3096,7 +3097,7 @@ void text_action_clear (TextAction* self) {
 	g_return_if_fail (IS_TEXT_ACTION (self));
 #line 306 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	text_action_set_text (self, NULL);
-#line 3100 "SearchFilter.c"
+#line 3101 "SearchFilter.c"
 }
 
 
@@ -3111,7 +3112,7 @@ gboolean text_action_is_sensitive (TextAction* self) {
 	result = _tmp0_;
 #line 310 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3115 "SearchFilter.c"
+#line 3116 "SearchFilter.c"
 }
 
 
@@ -3126,7 +3127,7 @@ void text_action_set_sensitive (TextAction* self, gboolean sensitive) {
 	_tmp1_ = sensitive;
 #line 314 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 3130 "SearchFilter.c"
+#line 3131 "SearchFilter.c"
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 #line 315 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3137,7 +3138,7 @@ void text_action_set_sensitive (TextAction* self, gboolean sensitive) {
 		_tmp3_ = sensitive;
 #line 316 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (self, "sensitivity-changed", _tmp3_);
-#line 3141 "SearchFilter.c"
+#line 3142 "SearchFilter.c"
 	}
 }
 
@@ -3153,7 +3154,7 @@ gboolean text_action_is_visible (TextAction* self) {
 	result = _tmp0_;
 #line 321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3157 "SearchFilter.c"
+#line 3158 "SearchFilter.c"
 }
 
 
@@ -3168,7 +3169,7 @@ void text_action_set_visible (TextAction* self, gboolean visible) {
 	_tmp1_ = visible;
 #line 325 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_ != _tmp1_) {
-#line 3172 "SearchFilter.c"
+#line 3173 "SearchFilter.c"
 		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
 #line 326 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3179,7 +3180,7 @@ void text_action_set_visible (TextAction* self, gboolean visible) {
 		_tmp3_ = visible;
 #line 327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_signal_emit_by_name (self, "visibility-changed", _tmp3_);
-#line 3183 "SearchFilter.c"
+#line 3184 "SearchFilter.c"
 	}
 }
 
@@ -3195,14 +3196,14 @@ const gchar* text_action_get_value (TextAction* self) {
 	result = _tmp0_;
 #line 280 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3199 "SearchFilter.c"
+#line 3200 "SearchFilter.c"
 }
 
 
 static void value_text_action_init (GValue* value) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 3206 "SearchFilter.c"
+#line 3207 "SearchFilter.c"
 }
 
 
@@ -3211,7 +3212,7 @@ static void value_text_action_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (value->data[0].v_pointer);
-#line 3215 "SearchFilter.c"
+#line 3216 "SearchFilter.c"
 	}
 }
 
@@ -3221,11 +3222,11 @@ static void value_text_action_copy_value (const GValue* src_value, GValue* dest_
 	if (src_value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = text_action_ref (src_value->data[0].v_pointer);
-#line 3225 "SearchFilter.c"
+#line 3226 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3229 "SearchFilter.c"
+#line 3230 "SearchFilter.c"
 	}
 }
 
@@ -3233,37 +3234,37 @@ static void value_text_action_copy_value (const GValue* src_value, GValue* dest_
 static gpointer value_text_action_peek_pointer (const GValue* value) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 3237 "SearchFilter.c"
+#line 3238 "SearchFilter.c"
 }
 
 
 static gchar* value_text_action_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 3244 "SearchFilter.c"
+#line 3245 "SearchFilter.c"
 		TextAction* object;
 		object = collect_values[0].v_pointer;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3251 "SearchFilter.c"
+#line 3252 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3255 "SearchFilter.c"
+#line 3256 "SearchFilter.c"
 		}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = text_action_ref (object);
-#line 3259 "SearchFilter.c"
+#line 3260 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3263 "SearchFilter.c"
+#line 3264 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3267 "SearchFilter.c"
+#line 3268 "SearchFilter.c"
 }
 
 
@@ -3274,25 +3275,25 @@ static gchar* value_text_action_lcopy_value (const GValue* value, guint n_collec
 	if (!object_p) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3278 "SearchFilter.c"
+#line 3279 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 3284 "SearchFilter.c"
+#line 3285 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3288 "SearchFilter.c"
+#line 3289 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = text_action_ref (value->data[0].v_pointer);
-#line 3292 "SearchFilter.c"
+#line 3293 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 3296 "SearchFilter.c"
+#line 3297 "SearchFilter.c"
 }
 
 
@@ -3306,7 +3307,7 @@ GParamSpec* param_spec_text_action (const gchar* name, const gchar* nick, const
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 3310 "SearchFilter.c"
+#line 3311 "SearchFilter.c"
 }
 
 
@@ -3315,7 +3316,7 @@ gpointer value_get_text_action (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_TEXT_ACTION), NULL);
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 3319 "SearchFilter.c"
+#line 3320 "SearchFilter.c"
 }
 
 
@@ -3335,17 +3336,17 @@ void value_set_text_action (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_ref (value->data[0].v_pointer);
-#line 3339 "SearchFilter.c"
+#line 3340 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3343 "SearchFilter.c"
+#line 3344 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (old);
-#line 3349 "SearchFilter.c"
+#line 3350 "SearchFilter.c"
 	}
 }
 
@@ -3364,17 +3365,17 @@ void value_take_text_action (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 3368 "SearchFilter.c"
+#line 3369 "SearchFilter.c"
 	} else {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 3372 "SearchFilter.c"
+#line 3373 "SearchFilter.c"
 	}
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_unref (old);
-#line 3378 "SearchFilter.c"
+#line 3379 "SearchFilter.c"
 	}
 }
 
@@ -3392,7 +3393,7 @@ static void text_action_class_init (TextActionClass * klass) {
 	g_signal_new ("sensitivity_changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("visibility_changed", TYPE_TEXT_ACTION, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 3396 "SearchFilter.c"
+#line 3397 "SearchFilter.c"
 }
 
 
@@ -3407,7 +3408,7 @@ static void text_action_instance_init (TextAction * self) {
 	self->priv->visible = TRUE;
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 3411 "SearchFilter.c"
+#line 3412 "SearchFilter.c"
 }
 
 
@@ -3419,7 +3420,7 @@ static void text_action_finalize (TextAction* obj) {
 	g_signal_handlers_destroy (self);
 #line 284 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_free0 (self->priv->text);
-#line 3423 "SearchFilter.c"
+#line 3424 "SearchFilter.c"
 }
 
 
@@ -3444,7 +3445,7 @@ gpointer text_action_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 3448 "SearchFilter.c"
+#line 3449 "SearchFilter.c"
 }
 
 
@@ -3457,7 +3458,7 @@ void text_action_unref (gpointer instance) {
 		TEXT_ACTION_GET_CLASS (self)->finalize (self);
 #line 277 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3461 "SearchFilter.c"
+#line 3462 "SearchFilter.c"
 	}
 }
 
@@ -3465,56 +3466,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 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_action_radio ((SearchFilterActions*) self, action, parameter);
-#line 3469 "SearchFilter.c"
+#line 3470 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_rating_changed_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_rating_changed ((SearchFilterActions*) self, action, value);
-#line 3476 "SearchFilter.c"
+#line 3477 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_action_toggle ((SearchFilterActions*) self, action, parameter);
-#line 3483 "SearchFilter.c"
+#line 3484 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_flagged_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_flagged_toggled ((SearchFilterActions*) self, action, value);
-#line 3490 "SearchFilter.c"
+#line 3491 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_photos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_photos_toggled ((SearchFilterActions*) self, action, value);
-#line 3497 "SearchFilter.c"
+#line 3498 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_videos_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_videos_toggled ((SearchFilterActions*) self, action, value);
-#line 3504 "SearchFilter.c"
+#line 3505 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_raw_toggled_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
 #line 532 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_raw_toggled ((SearchFilterActions*) self, action, value);
-#line 3511 "SearchFilter.c"
+#line 3512 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_text_changed_text_action_text_changed (TextAction* _sender, const gchar* text, gpointer self) {
 #line 410 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_text_changed ((SearchFilterActions*) self, _sender, text);
-#line 3518 "SearchFilter.c"
+#line 3519 "SearchFilter.c"
 }
 
 
@@ -3534,14 +3535,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 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 3538 "SearchFilter.c"
+#line 3539 "SearchFilter.c"
 }
 
 
 SearchFilterActions* search_filter_actions_new (void) {
 #line 406 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_actions_construct (TYPE_SEARCH_FILTER_ACTIONS);
-#line 3545 "SearchFilter.c"
+#line 3546 "SearchFilter.c"
 }
 
 
@@ -3556,7 +3557,7 @@ SearchFilterCriteria search_filter_actions_get_criteria (SearchFilterActions* se
 	result = _tmp0_;
 #line 414 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3560 "SearchFilter.c"
+#line 3561 "SearchFilter.c"
 }
 
 
@@ -3574,13 +3575,13 @@ GActionEntry* search_filter_actions_get_actions (SearchFilterActions* self, int*
 	if (result_length1) {
 #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*result_length1 = _tmp0__length1;
-#line 3578 "SearchFilter.c"
+#line 3579 "SearchFilter.c"
 	}
 #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = _tmp0_;
 #line 418 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3584 "SearchFilter.c"
+#line 3585 "SearchFilter.c"
 }
 
 
@@ -3602,7 +3603,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 	if (_tmp1_ == NULL) {
 #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp0_);
-#line 3606 "SearchFilter.c"
+#line 3607 "SearchFilter.c"
 	}
 #line 422 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	lw = _tmp1_;
@@ -3610,7 +3611,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 	_tmp2_ = lw;
 #line 423 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_ != NULL) {
-#line 3614 "SearchFilter.c"
+#line 3615 "SearchFilter.c"
 		LibraryWindow* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
 		GAction* _tmp5_ = NULL;
@@ -3626,7 +3627,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 		_g_object_unref0 (lw);
 #line 424 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 3630 "SearchFilter.c"
+#line 3631 "SearchFilter.c"
 	}
 #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = NULL;
@@ -3634,7 +3635,7 @@ GSimpleAction* search_filter_actions_get_action (SearchFilterActions* self, cons
 	_g_object_unref0 (lw);
 #line 427 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 3638 "SearchFilter.c"
+#line 3639 "SearchFilter.c"
 }
 
 
@@ -3660,7 +3661,7 @@ void search_filter_actions_set_action_sensitive (SearchFilterActions* self, cons
 	_tmp3_ = action;
 #line 433 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_ != NULL) {
-#line 3664 "SearchFilter.c"
+#line 3665 "SearchFilter.c"
 		GSimpleAction* _tmp4_ = NULL;
 		gboolean _tmp5_ = FALSE;
 #line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3669,46 +3670,46 @@ void search_filter_actions_set_action_sensitive (SearchFilterActions* self, cons
 		_tmp5_ = sensitive;
 #line 434 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_simple_action_set_enabled (_tmp4_, _tmp5_);
-#line 3673 "SearchFilter.c"
+#line 3674 "SearchFilter.c"
 	}
 #line 431 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
-#line 3677 "SearchFilter.c"
+#line 3678 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new32 (gboolean value) {
 #line 439 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3684 "SearchFilter.c"
+#line 3685 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new33 (gboolean value) {
 #line 440 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3691 "SearchFilter.c"
+#line 3692 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new34 (gboolean value) {
 #line 441 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3698 "SearchFilter.c"
+#line 3699 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new35 (gboolean value) {
 #line 442 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 3705 "SearchFilter.c"
+#line 3706 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new36 (gchar* value) {
 #line 443 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 3712 "SearchFilter.c"
+#line 3713 "SearchFilter.c"
 }
 
 
@@ -3802,7 +3803,7 @@ void search_filter_actions_reset (SearchFilterActions* self) {
 	text_action_set_text (_tmp19_, NULL);
 #line 438 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (v);
-#line 3806 "SearchFilter.c"
+#line 3807 "SearchFilter.c"
 }
 
 
@@ -3818,21 +3819,21 @@ void search_filter_actions_set_sensitive_for_search_criteria (SearchFilterAction
 	search_filter_actions_update_sensitivities (self);
 #line 454 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "criteria-changed");
-#line 3822 "SearchFilter.c"
+#line 3823 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_media_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) {
 #line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_media_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3829 "SearchFilter.c"
+#line 3830 "SearchFilter.c"
 }
 
 
 static void _search_filter_actions_on_camera_tracker_updated_core_tracker_updated (CoreTracker* _sender, gpointer self) {
 #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_actions_on_camera_tracker_updated ((SearchFilterActions*) self, _sender);
-#line 3836 "SearchFilter.c"
+#line 3837 "SearchFilter.c"
 }
 
 
@@ -3861,7 +3862,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 	_tmp2_ = old_tracked_page;
 #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_ != NULL) {
-#line 3865 "SearchFilter.c"
+#line 3866 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp3_ = NULL;
 		CoreViewTracker* _tmp4_ = NULL;
@@ -3876,7 +3877,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 		_tmp5_ = tracker;
 #line 461 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, TYPE_MEDIA_VIEW_TRACKER)) {
-#line 3880 "SearchFilter.c"
+#line 3881 "SearchFilter.c"
 			CoreViewTracker* _tmp6_ = NULL;
 			guint _tmp7_ = 0U;
 #line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3885,14 +3886,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 			g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp7_, NULL, FALSE);
 #line 462 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _search_filter_actions_on_media_tracker_updated_core_tracker_updated, self);
-#line 3889 "SearchFilter.c"
+#line 3890 "SearchFilter.c"
 		} else {
 			CoreViewTracker* _tmp8_ = NULL;
 #line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp8_ = tracker;
 #line 463 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp8_, TYPE_CAMERA_VIEW_TRACKER)) {
-#line 3896 "SearchFilter.c"
+#line 3897 "SearchFilter.c"
 				CoreViewTracker* _tmp9_ = NULL;
 				guint _tmp10_ = 0U;
 #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3901,12 +3902,12 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 				g_signal_parse_name ("updated", CORE_TYPE_TRACKER, &_tmp10_, NULL, FALSE);
 #line 464 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, CORE_TYPE_TRACKER, CoreTracker), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _search_filter_actions_on_camera_tracker_updated_core_tracker_updated, self);
-#line 3905 "SearchFilter.c"
+#line 3906 "SearchFilter.c"
 			}
 		}
 #line 459 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3910 "SearchFilter.c"
+#line 3911 "SearchFilter.c"
 	}
 #line 467 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = new_page;
@@ -3918,7 +3919,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 	_tmp13_ = new_tracked_page;
 #line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp13_ != NULL) {
-#line 3922 "SearchFilter.c"
+#line 3923 "SearchFilter.c"
 		CoreViewTracker* tracker = NULL;
 		CheckerboardPage* _tmp14_ = NULL;
 		CoreViewTracker* _tmp15_ = NULL;
@@ -3935,7 +3936,7 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 		_tmp16_ = tracker;
 #line 472 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_MEDIA_VIEW_TRACKER)) {
-#line 3939 "SearchFilter.c"
+#line 3940 "SearchFilter.c"
 			CoreViewTracker* _tmp17_ = NULL;
 			CoreViewTracker* _tmp18_ = NULL;
 #line 473 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3954,14 +3955,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 			_g_object_unref0 (old_tracked_page);
 #line 476 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return;
-#line 3958 "SearchFilter.c"
+#line 3959 "SearchFilter.c"
 		} else {
 			CoreViewTracker* _tmp19_ = NULL;
 #line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp19_ = tracker;
 #line 477 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_CAMERA_VIEW_TRACKER)) {
-#line 3965 "SearchFilter.c"
+#line 3966 "SearchFilter.c"
 				CoreViewTracker* _tmp20_ = NULL;
 				CoreViewTracker* _tmp21_ = NULL;
 #line 478 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -3980,12 +3981,12 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 				_g_object_unref0 (old_tracked_page);
 #line 481 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				return;
-#line 3984 "SearchFilter.c"
+#line 3985 "SearchFilter.c"
 			}
 		}
 #line 468 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_core_tracker_unref0 (tracker);
-#line 3989 "SearchFilter.c"
+#line 3990 "SearchFilter.c"
 	}
 #line 486 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->has_flagged = FALSE;
@@ -4003,14 +4004,14 @@ void search_filter_actions_monitor_page_contents (SearchFilterActions* self, Pag
 	_g_object_unref0 (new_tracked_page);
 #line 457 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (old_tracked_page);
-#line 4007 "SearchFilter.c"
+#line 4008 "SearchFilter.c"
 }
 
 
 static gpointer _core_tracker_ref0 (gpointer self) {
 #line 496 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? core_tracker_ref (self) : NULL;
-#line 4014 "SearchFilter.c"
+#line 4015 "SearchFilter.c"
 }
 
 
@@ -4064,7 +4065,7 @@ static void search_filter_actions_on_media_tracker_updated (SearchFilterActions*
 	search_filter_actions_update_sensitivities (self);
 #line 495 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_core_tracker_unref0 (tracker);
-#line 4068 "SearchFilter.c"
+#line 4069 "SearchFilter.c"
 }
 
 
@@ -4121,7 +4122,7 @@ static void search_filter_actions_on_camera_tracker_updated (SearchFilterActions
 	search_filter_actions_update_sensitivities (self);
 #line 506 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_core_tracker_unref0 (tracker);
-#line 4125 "SearchFilter.c"
+#line 4126 "SearchFilter.c"
 }
 
 
@@ -4161,7 +4162,7 @@ static void search_filter_actions_update_sensitivities (SearchFilterActions* sel
 	_tmp7_ = self->priv->has_flagged;
 #line 525 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "media-context-changed", _tmp4_, _tmp5_, _tmp6_, _tmp7_);
-#line 4165 "SearchFilter.c"
+#line 4166 "SearchFilter.c"
 }
 
 
@@ -4175,7 +4176,7 @@ static void search_filter_actions_on_text_changed (SearchFilterActions* self, Te
 	_tmp0_ = text;
 #line 529 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "text-changed", _tmp0_);
-#line 4179 "SearchFilter.c"
+#line 4180 "SearchFilter.c"
 }
 
 
@@ -4192,21 +4193,21 @@ static void search_filter_actions_on_action_radio (SearchFilterActions* self, GS
 	_tmp1_ = parameter;
 #line 542 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (_tmp0_, "change-state", _tmp1_);
-#line 4196 "SearchFilter.c"
+#line 4197 "SearchFilter.c"
 }
 
 
 static gboolean _variant_get37 (GVariant* value) {
 #line 547 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_get_boolean (value);
-#line 4203 "SearchFilter.c"
+#line 4204 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new38 (gboolean value) {
 #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 4210 "SearchFilter.c"
+#line 4211 "SearchFilter.c"
 }
 
 
@@ -4245,7 +4246,7 @@ static void search_filter_actions_on_action_toggle (SearchFilterActions* self, G
 	g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
 #line 548 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_variant_unref0 (_tmp6_);
-#line 4249 "SearchFilter.c"
+#line 4250 "SearchFilter.c"
 }
 
 
@@ -4259,7 +4260,7 @@ static void search_filter_actions_register (SearchFilterActions* self) {
 	_text_action_unref0 (self->priv->_text);
 #line 552 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_text = _tmp0_;
-#line 4263 "SearchFilter.c"
+#line 4264 "SearchFilter.c"
 }
 
 
@@ -4304,7 +4305,7 @@ static void search_filter_actions_on_rating_changed (SearchFilterActions* self,
 	if (_tmp6_) {
 #line 558 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 4308 "SearchFilter.c"
+#line 4309 "SearchFilter.c"
 	}
 #line 560 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp7_ = value;
@@ -4324,7 +4325,7 @@ static void search_filter_actions_on_rating_changed (SearchFilterActions* self,
 	_tmp12_ = filter;
 #line 562 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "rating-changed", _tmp12_);
-#line 4328 "SearchFilter.c"
+#line 4329 "SearchFilter.c"
 }
 
 
@@ -4351,7 +4352,7 @@ static void search_filter_actions_on_flagged_toggled (SearchFilterActions* self,
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 568 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "flagged-toggled", _tmp3_);
-#line 4355 "SearchFilter.c"
+#line 4356 "SearchFilter.c"
 }
 
 
@@ -4378,7 +4379,7 @@ static void search_filter_actions_on_photos_toggled (SearchFilterActions* self,
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 574 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "photos-toggled", _tmp3_);
-#line 4382 "SearchFilter.c"
+#line 4383 "SearchFilter.c"
 }
 
 
@@ -4405,7 +4406,7 @@ static void search_filter_actions_on_videos_toggled (SearchFilterActions* self,
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 580 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "videos-toggled", _tmp3_);
-#line 4409 "SearchFilter.c"
+#line 4410 "SearchFilter.c"
 }
 
 
@@ -4432,7 +4433,7 @@ static void search_filter_actions_on_raw_toggled (SearchFilterActions* self, GSi
 	_tmp3_ = g_variant_get_boolean (_tmp2_);
 #line 586 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "raw-toggled", _tmp3_);
-#line 4436 "SearchFilter.c"
+#line 4437 "SearchFilter.c"
 }
 
 
@@ -4447,7 +4448,7 @@ gboolean search_filter_actions_get_has_photos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 590 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4451 "SearchFilter.c"
+#line 4452 "SearchFilter.c"
 }
 
 
@@ -4462,7 +4463,7 @@ gboolean search_filter_actions_get_has_videos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 594 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4466 "SearchFilter.c"
+#line 4467 "SearchFilter.c"
 }
 
 
@@ -4477,7 +4478,7 @@ gboolean search_filter_actions_get_has_raw (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 598 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4481 "SearchFilter.c"
+#line 4482 "SearchFilter.c"
 }
 
 
@@ -4492,7 +4493,7 @@ gboolean search_filter_actions_get_has_flagged (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 602 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4496 "SearchFilter.c"
+#line 4497 "SearchFilter.c"
 }
 
 
@@ -4507,7 +4508,7 @@ GSimpleAction* search_filter_actions_get_flagged (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 336 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4511 "SearchFilter.c"
+#line 4512 "SearchFilter.c"
 }
 
 
@@ -4522,7 +4523,7 @@ GSimpleAction* search_filter_actions_get_photos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 342 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4526 "SearchFilter.c"
+#line 4527 "SearchFilter.c"
 }
 
 
@@ -4537,7 +4538,7 @@ GSimpleAction* search_filter_actions_get_videos (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4541 "SearchFilter.c"
+#line 4542 "SearchFilter.c"
 }
 
 
@@ -4552,7 +4553,7 @@ GSimpleAction* search_filter_actions_get_raw (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4556 "SearchFilter.c"
+#line 4557 "SearchFilter.c"
 }
 
 
@@ -4567,7 +4568,7 @@ GSimpleAction* search_filter_actions_get_rating (SearchFilterActions* self) {
 	result = _tmp0_;
 #line 360 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4571 "SearchFilter.c"
+#line 4572 "SearchFilter.c"
 }
 
 
@@ -4587,7 +4588,7 @@ TextAction* search_filter_actions_get_text (SearchFilterActions* self) {
 	result = _tmp1_;
 #line 367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4591 "SearchFilter.c"
+#line 4592 "SearchFilter.c"
 }
 
 
@@ -4606,26 +4607,26 @@ static void g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN (GClos
 		data1 = closure->data;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4610 "SearchFilter.c"
+#line 4611 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		data2 = closure->data;
-#line 4616 "SearchFilter.c"
+#line 4617 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	callback = (GMarshalFunc_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	callback (data1, g_value_get_boolean (param_values + 1), g_value_get_boolean (param_values + 2), g_value_get_boolean (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 4622 "SearchFilter.c"
+#line 4623 "SearchFilter.c"
 }
 
 
 static void value_search_filter_actions_init (GValue* value) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 4629 "SearchFilter.c"
+#line 4630 "SearchFilter.c"
 }
 
 
@@ -4634,7 +4635,7 @@ static void value_search_filter_actions_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (value->data[0].v_pointer);
-#line 4638 "SearchFilter.c"
+#line 4639 "SearchFilter.c"
 	}
 }
 
@@ -4644,11 +4645,11 @@ static void value_search_filter_actions_copy_value (const GValue* src_value, GVa
 	if (src_value->data[0].v_pointer) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = search_filter_actions_ref (src_value->data[0].v_pointer);
-#line 4648 "SearchFilter.c"
+#line 4649 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4652 "SearchFilter.c"
+#line 4653 "SearchFilter.c"
 	}
 }
 
@@ -4656,37 +4657,37 @@ static void value_search_filter_actions_copy_value (const GValue* src_value, GVa
 static gpointer value_search_filter_actions_peek_pointer (const GValue* value) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 4660 "SearchFilter.c"
+#line 4661 "SearchFilter.c"
 }
 
 
 static gchar* value_search_filter_actions_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 4667 "SearchFilter.c"
+#line 4668 "SearchFilter.c"
 		SearchFilterActions* object;
 		object = collect_values[0].v_pointer;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4674 "SearchFilter.c"
+#line 4675 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4678 "SearchFilter.c"
+#line 4679 "SearchFilter.c"
 		}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_actions_ref (object);
-#line 4682 "SearchFilter.c"
+#line 4683 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4686 "SearchFilter.c"
+#line 4687 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4690 "SearchFilter.c"
+#line 4691 "SearchFilter.c"
 }
 
 
@@ -4697,25 +4698,25 @@ static gchar* value_search_filter_actions_lcopy_value (const GValue* value, guin
 	if (!object_p) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4701 "SearchFilter.c"
+#line 4702 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 4707 "SearchFilter.c"
+#line 4708 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4711 "SearchFilter.c"
+#line 4712 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_actions_ref (value->data[0].v_pointer);
-#line 4715 "SearchFilter.c"
+#line 4716 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 4719 "SearchFilter.c"
+#line 4720 "SearchFilter.c"
 }
 
 
@@ -4729,7 +4730,7 @@ GParamSpec* param_spec_search_filter_actions (const gchar* name, const gchar* ni
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 4733 "SearchFilter.c"
+#line 4734 "SearchFilter.c"
 }
 
 
@@ -4738,7 +4739,7 @@ gpointer value_get_search_filter_actions (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_SEARCH_FILTER_ACTIONS), NULL);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 4742 "SearchFilter.c"
+#line 4743 "SearchFilter.c"
 }
 
 
@@ -4758,17 +4759,17 @@ void value_set_search_filter_actions (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_ref (value->data[0].v_pointer);
-#line 4762 "SearchFilter.c"
+#line 4763 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4766 "SearchFilter.c"
+#line 4767 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (old);
-#line 4772 "SearchFilter.c"
+#line 4773 "SearchFilter.c"
 	}
 }
 
@@ -4787,17 +4788,17 @@ void value_take_search_filter_actions (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 4791 "SearchFilter.c"
+#line 4792 "SearchFilter.c"
 	} else {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 4795 "SearchFilter.c"
+#line 4796 "SearchFilter.c"
 	}
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_actions_unref (old);
-#line 4801 "SearchFilter.c"
+#line 4802 "SearchFilter.c"
 	}
 }
 
@@ -4821,7 +4822,7 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass)
 	g_signal_new ("rating_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__ENUM, G_TYPE_NONE, 1, TYPE_RATING_FILTER);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("text_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__STRING, G_TYPE_NONE, 1, G_TYPE_STRING);
-#line 4825 "SearchFilter.c"
+#line 4826 "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
@@ -4831,7 +4832,7 @@ static void search_filter_actions_class_init (SearchFilterActionsClass * klass)
 	g_signal_new ("media_context_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOOLEAN_BOOLEAN_BOOLEAN_BOOLEAN, G_TYPE_NONE, 4, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN, G_TYPE_BOOLEAN);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("criteria_changed", TYPE_SEARCH_FILTER_ACTIONS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4835 "SearchFilter.c"
+#line 4836 "SearchFilter.c"
 }
 
 
@@ -4854,7 +4855,7 @@ static void search_filter_actions_instance_init (SearchFilterActions * self) {
 	self->priv->can_filter_by_stars = TRUE;
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 4858 "SearchFilter.c"
+#line 4859 "SearchFilter.c"
 }
 
 
@@ -4866,7 +4867,7 @@ static void search_filter_actions_finalize (SearchFilterActions* obj) {
 	g_signal_handlers_destroy (self);
 #line 372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_text_action_unref0 (self->priv->_text);
-#line 4870 "SearchFilter.c"
+#line 4871 "SearchFilter.c"
 }
 
 
@@ -4891,7 +4892,7 @@ gpointer search_filter_actions_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 4895 "SearchFilter.c"
+#line 4896 "SearchFilter.c"
 }
 
 
@@ -4904,7 +4905,7 @@ void search_filter_actions_unref (gpointer instance) {
 		SEARCH_FILTER_ACTIONS_GET_CLASS (self)->finalize (self);
 #line 333 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4908 "SearchFilter.c"
+#line 4909 "SearchFilter.c"
 	}
 }
 
@@ -4912,56 +4913,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 1158 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_media_context_changed ((SearchFilterToolbar*) self, has_photos, has_videos, has_raw, has_flagged);
-#line 4916 "SearchFilter.c"
+#line 4917 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1160 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_flagged_toggled ((SearchFilterToolbar*) self);
-#line 4923 "SearchFilter.c"
+#line 4924 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1161 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_photos_toggled ((SearchFilterToolbar*) self);
-#line 4930 "SearchFilter.c"
+#line 4931 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1162 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_videos_toggled ((SearchFilterToolbar*) self);
-#line 4937 "SearchFilter.c"
+#line 4938 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled (SearchFilterActions* _sender, gboolean on, gpointer self) {
 #line 1163 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_raw_toggled ((SearchFilterToolbar*) self);
-#line 4944 "SearchFilter.c"
+#line 4945 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed (SearchFilterActions* _sender, RatingFilter filter, gpointer self) {
 #line 1164 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_rating_changed ((SearchFilterToolbar*) self);
-#line 4951 "SearchFilter.c"
+#line 4952 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed (SearchFilterActions* _sender, const gchar* text, gpointer self) {
 #line 1165 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_search_text_changed ((SearchFilterToolbar*) self);
-#line 4958 "SearchFilter.c"
+#line 4959 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed (SearchFilterActions* _sender, gpointer self) {
 #line 1166 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_criteria_changed ((SearchFilterToolbar*) self);
-#line 4965 "SearchFilter.c"
+#line 4966 "SearchFilter.c"
 }
 
 
@@ -4970,28 +4971,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 1168 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 4974 "SearchFilter.c"
+#line 4975 "SearchFilter.c"
 }
 
 
 static gpointer _search_filter_actions_ref0 (gpointer self) {
 #line 1053 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? search_filter_actions_ref (self) : NULL;
-#line 4981 "SearchFilter.c"
+#line 4982 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate (GtkMenuItem* _sender, gpointer self) {
 #line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_context_menu_close_chosen ((SearchFilterToolbar*) self);
-#line 4988 "SearchFilter.c"
+#line 4989 "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 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_saved_search_button_clicked ((SearchFilterToolbar*) self);
-#line 4995 "SearchFilter.c"
+#line 4996 "SearchFilter.c"
 }
 
 
@@ -5007,87 +5008,87 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 	SearchFilterToolbarSearchBox* _tmp7_ = NULL;
 	GtkToolbar* _tmp8_ = NULL;
 	GtkToolbar* _tmp9_ = NULL;
-	GtkMenuItem* _tmp16_ = NULL;
-	const gchar* _tmp17_ = NULL;
 	GtkMenuItem* _tmp18_ = NULL;
-	GtkMenuItem* _tmp19_ = NULL;
-	GtkMenu* _tmp20_ = NULL;
+	const gchar* _tmp19_ = NULL;
+	GtkMenuItem* _tmp20_ = NULL;
 	GtkMenuItem* _tmp21_ = NULL;
-	const gchar* _tmp22_ = NULL;
-	SearchFilterToolbarLabelToolItem* _tmp23_ = NULL;
-	GtkToolbar* _tmp24_ = NULL;
+	GtkMenu* _tmp22_ = NULL;
+	GtkMenuItem* _tmp23_ = NULL;
+	const gchar* _tmp24_ = NULL;
 	SearchFilterToolbarLabelToolItem* _tmp25_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp26_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp27_ = NULL;
-	const gchar* _tmp28_ = NULL;
+	GtkToolbar* _tmp26_ = NULL;
+	SearchFilterToolbarLabelToolItem* _tmp27_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp28_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp29_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp30_ = NULL;
-	const gchar* _tmp31_ = NULL;
+	const gchar* _tmp30_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp31_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp32_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp33_ = NULL;
-	const gchar* _tmp34_ = NULL;
-	GtkToolbar* _tmp35_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp36_ = NULL;
+	const gchar* _tmp33_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp34_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp35_ = NULL;
+	const gchar* _tmp36_ = NULL;
 	GtkToolbar* _tmp37_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp38_ = NULL;
 	GtkToolbar* _tmp39_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp40_ = NULL;
-	GtkSeparatorToolItem* _tmp41_ = NULL;
-	GtkToolbar* _tmp42_ = NULL;
+	GtkToolbar* _tmp41_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp42_ = NULL;
 	GtkSeparatorToolItem* _tmp43_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp44_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp45_ = NULL;
-	const gchar* _tmp46_ = NULL;
+	GtkToolbar* _tmp44_ = NULL;
+	GtkSeparatorToolItem* _tmp45_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp46_ = NULL;
 	SearchFilterToolbarToggleActionToolButton* _tmp47_ = NULL;
 	const gchar* _tmp48_ = NULL;
-	GtkToolbar* _tmp49_ = NULL;
-	SearchFilterToolbarToggleActionToolButton* _tmp50_ = NULL;
-	GtkSeparatorToolItem* _tmp51_ = NULL;
-	GtkToolbar* _tmp52_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp49_ = NULL;
+	const gchar* _tmp50_ = NULL;
+	GtkToolbar* _tmp51_ = NULL;
+	SearchFilterToolbarToggleActionToolButton* _tmp52_ = NULL;
 	GtkSeparatorToolItem* _tmp53_ = NULL;
+	GtkToolbar* _tmp54_ = NULL;
+	GtkSeparatorToolItem* _tmp55_ = NULL;
 	GMenuModel* model = NULL;
-	GtkBuilder* _tmp54_ = NULL;
-	GObject* _tmp55_ = NULL;
-	GMenuModel* _tmp56_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp57_ = NULL;
-	SearchFilterToolbarRatingFilterButton* _tmp58_ = NULL;
-	const gchar* _tmp59_ = NULL;
+	GtkBuilder* _tmp56_ = NULL;
+	GObject* _tmp57_ = NULL;
+	GMenuModel* _tmp58_ = NULL;
+	SearchFilterToolbarRatingFilterButton* _tmp59_ = NULL;
 	SearchFilterToolbarRatingFilterButton* _tmp60_ = NULL;
-	GtkToolbar* _tmp61_ = NULL;
+	const gchar* _tmp61_ = NULL;
 	SearchFilterToolbarRatingFilterButton* _tmp62_ = NULL;
-	GtkSeparatorToolItem* _tmp63_ = NULL;
-	GtkToolbar* _tmp64_ = NULL;
+	GtkToolbar* _tmp63_ = NULL;
+	SearchFilterToolbarRatingFilterButton* _tmp64_ = NULL;
 	GtkSeparatorToolItem* _tmp65_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp66_ = NULL;
-	SearchFilterToolbarSavedSearchFilterButton* _tmp67_ = NULL;
-	const gchar* _tmp68_ = NULL;
+	GtkToolbar* _tmp66_ = NULL;
+	GtkSeparatorToolItem* _tmp67_ = NULL;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp68_ = NULL;
 	SearchFilterToolbarSavedSearchFilterButton* _tmp69_ = NULL;
 	const gchar* _tmp70_ = NULL;
 	SearchFilterToolbarSavedSearchFilterButton* _tmp71_ = NULL;
-	GtkToolbar* _tmp72_ = NULL;
+	const gchar* _tmp72_ = NULL;
 	SearchFilterToolbarSavedSearchFilterButton* _tmp73_ = NULL;
+	GtkToolbar* _tmp74_ = NULL;
+	SearchFilterToolbarSavedSearchFilterButton* _tmp75_ = NULL;
 	GtkSeparatorToolItem* separator_align = NULL;
-	GtkSeparatorToolItem* _tmp74_ = NULL;
-	GtkToolbar* _tmp75_ = NULL;
-	GtkToolbar* _tmp76_ = NULL;
-	SearchFilterToolbarSearchBox* _tmp77_ = NULL;
+	GtkSeparatorToolItem* _tmp76_ = NULL;
+	GtkToolbar* _tmp77_ = NULL;
 	GtkToolbar* _tmp78_ = NULL;
-	SearchFilterActions* _tmp79_ = NULL;
-	SearchFilterActions* _tmp80_ = NULL;
+	SearchFilterToolbarSearchBox* _tmp79_ = NULL;
+	GtkToolbar* _tmp80_ = NULL;
 	SearchFilterActions* _tmp81_ = NULL;
 	SearchFilterActions* _tmp82_ = NULL;
 	SearchFilterActions* _tmp83_ = NULL;
 	SearchFilterActions* _tmp84_ = NULL;
 	SearchFilterActions* _tmp85_ = NULL;
-	GtkToolbar* _tmp86_ = NULL;
+	SearchFilterActions* _tmp86_ = NULL;
 	SearchFilterActions* _tmp87_ = NULL;
-	gboolean _tmp88_ = FALSE;
+	GtkToolbar* _tmp88_ = NULL;
 	SearchFilterActions* _tmp89_ = NULL;
 	gboolean _tmp90_ = FALSE;
 	SearchFilterActions* _tmp91_ = NULL;
 	gboolean _tmp92_ = FALSE;
 	SearchFilterActions* _tmp93_ = NULL;
 	gboolean _tmp94_ = FALSE;
+	SearchFilterActions* _tmp95_ = NULL;
+	gboolean _tmp96_ = FALSE;
 	GError * _inner_error_ = NULL;
 #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_return_val_if_fail (IS_SEARCH_FILTER_ACTIONS (actions), NULL);
@@ -5135,51 +5136,59 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 	_tmp9_ = self->priv->toolbar;
 #line 1059 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toolbar_set_icon_size (_tmp9_, GTK_ICON_SIZE_SMALL_TOOLBAR);
-#line 5139 "SearchFilter.c"
+#line 5140 "SearchFilter.c"
 	{
 		GtkBuilder* _tmp10_ = NULL;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_ = NULL;
 #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = self->builder;
 #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		gtk_builder_add_from_resource (_tmp10_, "/org/gnome/Shotwell/search_bar.ui", &_inner_error_);
+		_tmp11_ = resources_get_ui ("search_bar.ui");
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_tmp12_ = _tmp11_;
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		gtk_builder_add_from_resource (_tmp10_, _tmp12_, &_inner_error_);
+#line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+		_g_free0 (_tmp12_);
 #line 1062 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5148 "SearchFilter.c"
-			goto __catch590_g_error;
+#line 5157 "SearchFilter.c"
+			goto __catch592_g_error;
 		}
 	}
-	goto __finally590;
-	__catch590_g_error:
+	goto __finally592;
+	__catch592_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp11_ = NULL;
-		GError* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
+		GError* _tmp14_ = NULL;
+		const gchar* _tmp15_ = NULL;
+		gchar* _tmp16_ = NULL;
+		gchar* _tmp17_ = NULL;
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		err = _inner_error_;
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_inner_error_ = NULL;
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp11_ = _ ("Error loading search bar UI: %s");
+		_tmp13_ = _ ("Error loading search bar UI: %s");
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp12_ = err;
+		_tmp14_ = err;
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp13_ = _tmp12_->message;
+		_tmp15_ = _tmp14_->message;
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp14_ = g_strdup_printf (_tmp11_, _tmp13_);
+		_tmp16_ = g_strdup_printf (_tmp13_, _tmp15_);
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_tmp15_ = _tmp14_;
+		_tmp17_ = _tmp16_;
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		app_window_panic (_tmp15_);
+		app_window_panic (_tmp17_);
 #line 1064 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-		_g_free0 (_tmp15_);
+		_g_free0 (_tmp17_);
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_error_free0 (err);
-#line 5181 "SearchFilter.c"
+#line 5190 "SearchFilter.c"
 	}
-	__finally590:
+	__finally592:
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5188,318 +5197,318 @@ SearchFilterToolbar* search_filter_toolbar_construct (GType object_type, SearchF
 		g_clear_error (&_inner_error_);
 #line 1061 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return NULL;
-#line 5192 "SearchFilter.c"
+#line 5201 "SearchFilter.c"
 	}
 #line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp16_ = self->priv->close_item;
+	_tmp18_ = self->priv->close_item;
 #line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp17_ = _ ("Close");
+	_tmp19_ = _ ("Close");
 #line 1073 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_menu_item_set_label (_tmp16_, _tmp17_);
+	gtk_menu_item_set_label (_tmp18_, _tmp19_);
 #line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp18_ = self->priv->close_item;
+	_tmp20_ = self->priv->close_item;
 #line 1074 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
 #line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp19_ = self->priv->close_item;
+	_tmp21_ = self->priv->close_item;
 #line 1075 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp19_, "activate", (GCallback) _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate, self, 0);
+	g_signal_connect_object (_tmp21_, "activate", (GCallback) _search_filter_toolbar_on_context_menu_close_chosen_gtk_menu_item_activate, self, 0);
 #line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp20_ = self->priv->close_menu;
+	_tmp22_ = self->priv->close_menu;
 #line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp21_ = self->priv->close_item;
+	_tmp23_ = self->priv->close_item;
 #line 1076 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_menu_shell_get_type (), GtkMenuShell), (GtkWidget*) _tmp21_);
+	gtk_menu_shell_append (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_menu_shell_get_type (), GtkMenuShell), (GtkWidget*) _tmp23_);
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp22_ = _ ("Type");
+	_tmp24_ = _ ("Type");
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp23_ = search_filter_toolbar_label_tool_item_new (_tmp22_, 10, 5);
+	_tmp25_ = search_filter_toolbar_label_tool_item_new (_tmp24_, 10, 5);
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp23_);
+	g_object_ref_sink (_tmp25_);
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->label_type);
 #line 1079 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->label_type = _tmp23_;
+	self->priv->label_type = _tmp25_;
 #line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp24_ = self->priv->toolbar;
+	_tmp26_ = self->priv->toolbar;
 #line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp25_ = self->priv->label_type;
+	_tmp27_ = self->priv->label_type;
 #line 1080 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp26_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.photos");
+	_tmp28_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.photos");
 #line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp26_);
+	g_object_ref_sink (_tmp28_);
 #line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_photos);
 #line 1082 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_photos = _tmp26_;
+	self->priv->toolbtn_photos = _tmp28_;
 #line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp27_ = self->priv->toolbtn_photos;
+	_tmp29_ = self->priv->toolbtn_photos;
 #line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp28_ = _ ("Photos");
+	_tmp30_ = _ ("Photos");
 #line 1083 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_item_get_type (), GtkToolItem), _tmp28_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), _tmp30_);
 #line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp29_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.videos");
+	_tmp31_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.videos");
 #line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp29_);
+	g_object_ref_sink (_tmp31_);
 #line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_videos);
 #line 1085 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_videos = _tmp29_;
+	self->priv->toolbtn_videos = _tmp31_;
 #line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp30_ = self->priv->toolbtn_videos;
+	_tmp32_ = self->priv->toolbtn_videos;
 #line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp31_ = _ ("Videos");
+	_tmp33_ = _ ("Videos");
 #line 1086 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_tool_item_get_type (), GtkToolItem), _tmp31_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_item_get_type (), GtkToolItem), _tmp33_);
 #line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp32_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.raw");
+	_tmp34_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.raw");
 #line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp32_);
+	g_object_ref_sink (_tmp34_);
 #line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_raw);
 #line 1088 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_raw = _tmp32_;
+	self->priv->toolbtn_raw = _tmp34_;
 #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp33_ = self->priv->toolbtn_raw;
+	_tmp35_ = self->priv->toolbtn_raw;
 #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp34_ = _ ("RAW Photos");
+	_tmp36_ = _ ("RAW Photos");
 #line 1089 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), _tmp34_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), _tmp36_);
 #line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp35_ = self->priv->toolbar;
+	_tmp37_ = self->priv->toolbar;
 #line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp36_ = self->priv->toolbtn_photos;
+	_tmp38_ = self->priv->toolbtn_photos;
 #line 1091 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp35_, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp37_ = self->priv->toolbar;
+	_tmp39_ = self->priv->toolbar;
 #line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp38_ = self->priv->toolbtn_videos;
+	_tmp40_ = self->priv->toolbtn_videos;
 #line 1092 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp37_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp39_ = self->priv->toolbar;
+	_tmp41_ = self->priv->toolbar;
 #line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp40_ = self->priv->toolbtn_raw;
+	_tmp42_ = self->priv->toolbtn_raw;
 #line 1093 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp41_, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp41_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	_tmp43_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp41_);
+	g_object_ref_sink (_tmp43_);
 #line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_mediatype_flagged);
 #line 1096 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_mediatype_flagged = _tmp41_;
+	self->priv->sepr_mediatype_flagged = _tmp43_;
 #line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp42_ = self->priv->toolbar;
+	_tmp44_ = self->priv->toolbar;
 #line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp43_ = self->priv->sepr_mediatype_flagged;
+	_tmp45_ = self->priv->sepr_mediatype_flagged;
 #line 1097 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp42_, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp44_, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp44_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.flagged");
+	_tmp46_ = search_filter_toolbar_toggle_action_tool_button_new ("win.display.flagged");
 #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp44_);
+	g_object_ref_sink (_tmp46_);
 #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->toolbtn_flag);
 #line 1101 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->toolbtn_flag = _tmp44_;
+	self->priv->toolbtn_flag = _tmp46_;
 #line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp45_ = self->priv->toolbtn_flag;
+	_tmp47_ = self->priv->toolbtn_flag;
 #line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp46_ = _ ("Flagged");
+	_tmp48_ = _ ("Flagged");
 #line 1102 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_toggle_action_tool_button_set_label (_tmp45_, _tmp46_);
+	search_filter_toolbar_toggle_action_tool_button_set_label (_tmp47_, _tmp48_);
 #line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp47_ = self->priv->toolbtn_flag;
+	_tmp49_ = self->priv->toolbtn_flag;
 #line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp48_ = _ ("Flagged");
+	_tmp50_ = _ ("Flagged");
 #line 1103 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_tool_item_get_type (), GtkToolItem), _tmp48_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), _tmp50_);
 #line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp49_ = self->priv->toolbar;
+	_tmp51_ = self->priv->toolbar;
 #line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp50_ = self->priv->toolbtn_flag;
+	_tmp52_ = self->priv->toolbtn_flag;
 #line 1105 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp49_, G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp51_, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp51_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	_tmp53_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp51_);
+	g_object_ref_sink (_tmp53_);
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_flagged_rating);
 #line 1108 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_flagged_rating = _tmp51_;
+	self->priv->sepr_flagged_rating = _tmp53_;
 #line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp52_ = self->priv->toolbar;
+	_tmp54_ = self->priv->toolbar;
 #line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp53_ = self->priv->sepr_flagged_rating;
+	_tmp55_ = self->priv->sepr_flagged_rating;
 #line 1109 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp52_, G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp54_ = self->builder;
+	_tmp56_ = self->builder;
 #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp55_ = gtk_builder_get_object (_tmp54_, "popup-menu");
+	_tmp57_ = gtk_builder_get_object (_tmp56_, "popup-menu");
 #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp56_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp55_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp55_) : NULL);
+	_tmp58_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp57_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp57_) : NULL);
 #line 1112 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	model = _tmp56_;
+	model = _tmp58_;
 #line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp57_ = search_filter_toolbar_rating_filter_button_new (model);
+	_tmp59_ = search_filter_toolbar_rating_filter_button_new (model);
 #line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp57_);
+	g_object_ref_sink (_tmp59_);
 #line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->rating_button);
 #line 1113 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->rating_button = _tmp57_;
+	self->priv->rating_button = _tmp59_;
 #line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp58_ = self->priv->rating_button;
+	_tmp60_ = self->priv->rating_button;
 #line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp59_ = _ ("Rating");
+	_tmp61_ = _ ("Rating");
 #line 1114 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_rating_filter_button_set_label (_tmp58_, _tmp59_);
+	search_filter_toolbar_rating_filter_button_set_label (_tmp60_, _tmp61_);
 #line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp60_ = self->priv->rating_button;
+	_tmp62_ = self->priv->rating_button;
 #line 1115 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
+	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
 #line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp61_ = self->priv->toolbar;
+	_tmp63_ = self->priv->toolbar;
 #line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp62_ = self->priv->rating_button;
+	_tmp64_ = self->priv->rating_button;
 #line 1116 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp61_, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp63_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	_tmp65_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp63_);
+	g_object_ref_sink (_tmp65_);
 #line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->sepr_rating_saved);
 #line 1119 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	self->priv->sepr_rating_saved = _tmp63_;
+	self->priv->sepr_rating_saved = _tmp65_;
 #line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp64_ = self->priv->toolbar;
+	_tmp66_ = self->priv->toolbar;
 #line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp65_ = self->priv->sepr_rating_saved;
+	_tmp67_ = self->priv->sepr_rating_saved;
 #line 1120 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp64_, G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp66_, G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp66_ = self->priv->saved_search_button;
+	_tmp68_ = self->priv->saved_search_button;
 #line 1123 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
+	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_tool_item_get_type (), GtkToolItem), FALSE);
 #line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp67_ = self->priv->saved_search_button;
+	_tmp69_ = self->priv->saved_search_button;
 #line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp68_ = _ ("Saved Search");
+	_tmp70_ = _ ("Saved Search");
 #line 1124 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_saved_search_filter_button_set_label (_tmp67_, _tmp68_);
+	search_filter_toolbar_saved_search_filter_button_set_label (_tmp69_, _tmp70_);
 #line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp69_ = self->priv->saved_search_button;
+	_tmp71_ = self->priv->saved_search_button;
 #line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp70_ = _ ("Use a saved search to filter items in the current view");
+	_tmp72_ = _ ("Use a saved search to filter items in the current view");
 #line 1125 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_tool_item_get_type (), GtkToolItem), _tmp70_);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp71_, gtk_tool_item_get_type (), GtkToolItem), _tmp72_);
 #line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp71_ = self->priv->saved_search_button;
+	_tmp73_ = self->priv->saved_search_button;
 #line 1126 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp71_, "clicked", (GCallback) _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked, self, 0);
+	g_signal_connect_object (_tmp73_, "clicked", (GCallback) _search_filter_toolbar_on_saved_search_button_clicked_search_filter_toolbar_saved_search_filter_button_clicked, self, 0);
 #line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp72_ = self->priv->toolbar;
+	_tmp74_ = self->priv->toolbar;
 #line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp73_ = self->priv->saved_search_button;
+	_tmp75_ = self->priv->saved_search_button;
 #line 1127 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp72_, G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp74_, G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp74_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	_tmp76_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_object_ref_sink (_tmp74_);
+	g_object_ref_sink (_tmp76_);
 #line 1130 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	separator_align = _tmp74_;
+	separator_align = _tmp76_;
 #line 1131 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 1132 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_separator_tool_item_set_draw (separator_align, FALSE);
 #line 1133 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp75_ = self->priv->toolbar;
+	_tmp77_ = self->priv->toolbar;
 #line 1133 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp75_, G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp77_, G_TYPE_CHECK_INSTANCE_CAST (separator_align, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp76_ = self->priv->toolbar;
+	_tmp78_ = self->priv->toolbar;
 #line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp77_ = self->priv->search_box;
+	_tmp79_ = self->priv->search_box;
 #line 1136 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_toolbar_insert (_tmp76_, G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (_tmp78_, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 1138 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp78_ = self->priv->toolbar;
+	_tmp80_ = self->priv->toolbar;
 #line 1138 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp78_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_widget_get_type (), GtkWidget));
 #line 1141 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp79_ = actions;
+	_tmp81_ = actions;
 #line 1141 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp79_, "flagged-toggled", (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self, 0);
+	g_signal_connect_object (_tmp81_, "flagged-toggled", (GCallback) _search_filter_toolbar_on_flagged_toggled_search_filter_actions_flagged_toggled, self, 0);
 #line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp80_ = actions;
+	_tmp82_ = actions;
 #line 1142 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp80_, "photos-toggled", (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self, 0);
+	g_signal_connect_object (_tmp82_, "photos-toggled", (GCallback) _search_filter_toolbar_on_photos_toggled_search_filter_actions_photos_toggled, self, 0);
 #line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp81_ = actions;
+	_tmp83_ = actions;
 #line 1143 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp81_, "videos-toggled", (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self, 0);
+	g_signal_connect_object (_tmp83_, "videos-toggled", (GCallback) _search_filter_toolbar_on_videos_toggled_search_filter_actions_videos_toggled, self, 0);
 #line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp82_ = actions;
+	_tmp84_ = actions;
 #line 1144 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp82_, "raw-toggled", (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self, 0);
+	g_signal_connect_object (_tmp84_, "raw-toggled", (GCallback) _search_filter_toolbar_on_raw_toggled_search_filter_actions_raw_toggled, self, 0);
 #line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp83_ = actions;
+	_tmp85_ = actions;
 #line 1145 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp83_, "rating-changed", (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self, 0);
+	g_signal_connect_object (_tmp85_, "rating-changed", (GCallback) _search_filter_toolbar_on_rating_changed_search_filter_actions_rating_changed, self, 0);
 #line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp84_ = actions;
+	_tmp86_ = actions;
 #line 1146 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp84_, "text-changed", (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self, 0);
+	g_signal_connect_object (_tmp86_, "text-changed", (GCallback) _search_filter_toolbar_on_search_text_changed_search_filter_actions_text_changed, self, 0);
 #line 1147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp85_ = actions;
+	_tmp87_ = actions;
 #line 1147 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp85_, "criteria-changed", (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self, 0);
+	g_signal_connect_object (_tmp87_, "criteria-changed", (GCallback) _search_filter_toolbar_on_criteria_changed_search_filter_actions_criteria_changed, self, 0);
 #line 1150 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp86_ = self->priv->toolbar;
+	_tmp88_ = self->priv->toolbar;
 #line 1150 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	g_signal_connect_object (_tmp86_, "popup-context-menu", (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self, 0);
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp87_ = actions;
-#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp88_ = search_filter_actions_get_has_photos (_tmp87_);
+	g_signal_connect_object (_tmp88_, "popup-context-menu", (GCallback) _search_filter_toolbar_on_context_menu_requested_gtk_toolbar_popup_context_menu, self, 0);
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp89_ = actions;
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp90_ = search_filter_actions_get_has_videos (_tmp89_);
+	_tmp90_ = search_filter_actions_get_has_photos (_tmp89_);
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp91_ = actions;
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp92_ = search_filter_actions_get_has_raw (_tmp91_);
+	_tmp92_ = search_filter_actions_get_has_videos (_tmp91_);
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp93_ = actions;
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	_tmp94_ = search_filter_actions_get_has_flagged (_tmp93_);
+	_tmp94_ = search_filter_actions_get_has_raw (_tmp93_);
 #line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
-	search_filter_toolbar_on_media_context_changed (self, _tmp88_, _tmp90_, _tmp92_, _tmp94_);
+	_tmp95_ = actions;
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	_tmp96_ = search_filter_actions_get_has_flagged (_tmp95_);
+#line 1152 "/home/jens/Source/shotwell/src/SearchFilter.vala"
+	search_filter_toolbar_on_media_context_changed (self, _tmp90_, _tmp92_, _tmp94_, _tmp96_);
 #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (separator_align);
 #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (model);
 #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 5496 "SearchFilter.c"
+#line 5505 "SearchFilter.c"
 }
 
 
 SearchFilterToolbar* search_filter_toolbar_new (SearchFilterActions* actions) {
 #line 1052 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_construct (TYPE_SEARCH_FILTER_TOOLBAR, actions);
-#line 5503 "SearchFilter.c"
+#line 5512 "SearchFilter.c"
 }
 
 
@@ -5514,77 +5523,77 @@ static void search_filter_toolbar_on_media_context_changed (SearchFilterToolbar*
 	_tmp0_ = has_photos;
 #line 1173 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 5518 "SearchFilter.c"
+#line 5527 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp1_ = NULL;
 #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp1_ = self->priv->toolbtn_photos;
 #line 1174 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp1_, RESOURCES_ICON_FILTER_PHOTOS);
-#line 5524 "SearchFilter.c"
+#line 5533 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp2_ = NULL;
 #line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->toolbtn_photos;
 #line 1176 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp2_, RESOURCES_ICON_FILTER_PHOTOS_DISABLED);
-#line 5531 "SearchFilter.c"
+#line 5540 "SearchFilter.c"
 	}
 #line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = has_videos;
 #line 1178 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
-#line 5537 "SearchFilter.c"
+#line 5546 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp4_ = NULL;
 #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = self->priv->toolbtn_videos;
 #line 1179 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp4_, RESOURCES_ICON_FILTER_VIDEOS);
-#line 5543 "SearchFilter.c"
+#line 5552 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp5_ = NULL;
 #line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp5_ = self->priv->toolbtn_videos;
 #line 1181 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp5_, RESOURCES_ICON_FILTER_VIDEOS_DISABLED);
-#line 5550 "SearchFilter.c"
+#line 5559 "SearchFilter.c"
 	}
 #line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp6_ = has_raw;
 #line 1183 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp6_) {
-#line 5556 "SearchFilter.c"
+#line 5565 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp7_ = NULL;
 #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp7_ = self->priv->toolbtn_raw;
 #line 1184 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp7_, RESOURCES_ICON_FILTER_RAW);
-#line 5562 "SearchFilter.c"
+#line 5571 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp8_ = NULL;
 #line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp8_ = self->priv->toolbtn_raw;
 #line 1186 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp8_, RESOURCES_ICON_FILTER_RAW_DISABLED);
-#line 5569 "SearchFilter.c"
+#line 5578 "SearchFilter.c"
 	}
 #line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp9_ = has_flagged;
 #line 1188 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp9_) {
-#line 5575 "SearchFilter.c"
+#line 5584 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp10_ = NULL;
 #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp10_ = self->priv->toolbtn_flag;
 #line 1189 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp10_, RESOURCES_ICON_FILTER_FLAGGED);
-#line 5581 "SearchFilter.c"
+#line 5590 "SearchFilter.c"
 	} else {
 		SearchFilterToolbarToggleActionToolButton* _tmp11_ = NULL;
 #line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp11_ = self->priv->toolbtn_flag;
 #line 1191 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_toggle_action_tool_button_set_icon_name (_tmp11_, RESOURCES_ICON_FILTER_FLAGGED_DISABLED);
-#line 5588 "SearchFilter.c"
+#line 5597 "SearchFilter.c"
 	}
 }
 
@@ -5608,14 +5617,14 @@ static gboolean search_filter_toolbar_on_context_menu_requested (SearchFilterToo
 	result = FALSE;
 #line 1197 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 5612 "SearchFilter.c"
+#line 5621 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new39 (gboolean value) {
 #line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5619 "SearchFilter.c"
+#line 5628 "SearchFilter.c"
 }
 
 
@@ -5645,7 +5654,7 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool
 	_tmp4_ = action;
 #line 1212 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp4_ != NULL) {
-#line 5649 "SearchFilter.c"
+#line 5658 "SearchFilter.c"
 		GSimpleAction* _tmp5_ = NULL;
 		GVariant* _tmp6_ = NULL;
 #line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5656,13 +5665,13 @@ static void search_filter_toolbar_on_context_menu_close_chosen (SearchFilterTool
 		g_signal_emit_by_name (_tmp5_, "change-state", _tmp6_);
 #line 1214 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp6_);
-#line 5660 "SearchFilter.c"
+#line 5669 "SearchFilter.c"
 	}
 #line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (action);
 #line 1202 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5666 "SearchFilter.c"
+#line 5675 "SearchFilter.c"
 }
 
 
@@ -5671,7 +5680,7 @@ static void search_filter_toolbar_on_flagged_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1219 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5675 "SearchFilter.c"
+#line 5684 "SearchFilter.c"
 }
 
 
@@ -5680,7 +5689,7 @@ static void search_filter_toolbar_on_videos_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1223 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5684 "SearchFilter.c"
+#line 5693 "SearchFilter.c"
 }
 
 
@@ -5689,7 +5698,7 @@ static void search_filter_toolbar_on_photos_toggled (SearchFilterToolbar* self)
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1227 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5693 "SearchFilter.c"
+#line 5702 "SearchFilter.c"
 }
 
 
@@ -5698,7 +5707,7 @@ static void search_filter_toolbar_on_raw_toggled (SearchFilterToolbar* self) {
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1231 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5702 "SearchFilter.c"
+#line 5711 "SearchFilter.c"
 }
 
 
@@ -5707,14 +5716,14 @@ static void search_filter_toolbar_on_search_text_changed (SearchFilterToolbar* s
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1235 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5711 "SearchFilter.c"
+#line 5720 "SearchFilter.c"
 }
 
 
 static GVariant* _variant_new40 (gboolean value) {
 #line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 5718 "SearchFilter.c"
+#line 5727 "SearchFilter.c"
 }
 
 
@@ -5741,7 +5750,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 		_g_object_unref0 (aw);
 #line 1242 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5745 "SearchFilter.c"
+#line 5754 "SearchFilter.c"
 	}
 #line 1244 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = aw;
@@ -5755,7 +5764,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	_tmp5_ = action;
 #line 1248 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp5_ != NULL) {
-#line 5759 "SearchFilter.c"
+#line 5768 "SearchFilter.c"
 		GSimpleAction* _tmp6_ = NULL;
 		GVariant* _tmp7_ = NULL;
 #line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5766,7 +5775,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 		g_signal_emit_by_name (_tmp6_, "change-state", _tmp7_);
 #line 1249 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_variant_unref0 (_tmp7_);
-#line 5770 "SearchFilter.c"
+#line 5779 "SearchFilter.c"
 	}
 #line 1252 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
@@ -5774,7 +5783,7 @@ static void search_filter_toolbar_on_rating_changed (SearchFilterToolbar* self)
 	_g_object_unref0 (action);
 #line 1238 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (aw);
-#line 5778 "SearchFilter.c"
+#line 5787 "SearchFilter.c"
 }
 
 
@@ -5783,14 +5792,14 @@ static void search_filter_toolbar_on_criteria_changed (SearchFilterToolbar* self
 	g_return_if_fail (IS_SEARCH_FILTER_TOOLBAR (self));
 #line 1259 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5787 "SearchFilter.c"
+#line 5796 "SearchFilter.c"
 }
 
 
 static gpointer _view_filter_ref0 (gpointer self) {
 #line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? view_filter_ref (self) : NULL;
-#line 5794 "SearchFilter.c"
+#line 5803 "SearchFilter.c"
 }
 
 
@@ -5817,7 +5826,7 @@ void search_filter_toolbar_set_view_filter (SearchFilterToolbar* self, SearchVie
 	if (_tmp0_ == _tmp1_) {
 #line 1264 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return;
-#line 5821 "SearchFilter.c"
+#line 5830 "SearchFilter.c"
 	}
 #line 1266 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp2_ = search_filter;
@@ -5845,7 +5854,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 1272 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 5849 "SearchFilter.c"
+#line 5858 "SearchFilter.c"
 }
 
 
@@ -5862,7 +5871,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 1276 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_view_filter_unref0 (_tmp1_);
-#line 5866 "SearchFilter.c"
+#line 5875 "SearchFilter.c"
 }
 
 
@@ -5955,7 +5964,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp0_ = self->priv->search_filter;
 #line 1281 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (NULL == _tmp0_) {
-#line 5959 "SearchFilter.c"
+#line 5968 "SearchFilter.c"
 		LibraryWindow* _tmp1_ = NULL;
 		LibraryWindow* _tmp2_ = NULL;
 #line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -5966,7 +5975,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		library_window_show_search_bar (_tmp2_, TRUE);
 #line 1283 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp2_);
-#line 5970 "SearchFilter.c"
+#line 5979 "SearchFilter.c"
 	}
 #line 1286 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_filter;
@@ -6158,7 +6167,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp73_ = _tmp72_;
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp73_) {
-#line 6162 "SearchFilter.c"
+#line 6171 "SearchFilter.c"
 		SearchFilterToolbarToggleActionToolButton* _tmp74_ = NULL;
 		gboolean _tmp75_ = FALSE;
 		gboolean _tmp76_ = FALSE;
@@ -6170,11 +6179,11 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp76_ = _tmp75_;
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = _tmp76_;
-#line 6174 "SearchFilter.c"
+#line 6183 "SearchFilter.c"
 	} else {
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp70_ = FALSE;
-#line 6178 "SearchFilter.c"
+#line 6187 "SearchFilter.c"
 	}
 #line 1321 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp77_ = self->priv->sepr_mediatype_flagged;
@@ -6188,7 +6197,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp82_ = _tmp81_;
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp82_) {
-#line 6192 "SearchFilter.c"
+#line 6201 "SearchFilter.c"
 		SearchFilterToolbarRatingFilterButton* _tmp83_ = NULL;
 		gboolean _tmp84_ = FALSE;
 		gboolean _tmp85_ = FALSE;
@@ -6200,17 +6209,17 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp85_ = _tmp84_;
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = _tmp85_;
-#line 6204 "SearchFilter.c"
+#line 6213 "SearchFilter.c"
 	} else {
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp79_ = FALSE;
-#line 6208 "SearchFilter.c"
+#line 6217 "SearchFilter.c"
 	}
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp79_) {
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = TRUE;
-#line 6214 "SearchFilter.c"
+#line 6223 "SearchFilter.c"
 	} else {
 		gboolean _tmp86_ = FALSE;
 		SearchFilterToolbarToggleActionToolButton* _tmp87_ = NULL;
@@ -6224,7 +6233,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 		_tmp89_ = _tmp88_;
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp89_) {
-#line 6228 "SearchFilter.c"
+#line 6237 "SearchFilter.c"
 			SearchFilterToolbarRatingFilterButton* _tmp90_ = NULL;
 			gboolean _tmp91_ = FALSE;
 			gboolean _tmp92_ = FALSE;
@@ -6236,15 +6245,15 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 			_tmp92_ = _tmp91_;
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = _tmp92_;
-#line 6240 "SearchFilter.c"
+#line 6249 "SearchFilter.c"
 		} else {
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp86_ = FALSE;
-#line 6244 "SearchFilter.c"
+#line 6253 "SearchFilter.c"
 		}
 #line 1324 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp78_ = _tmp86_;
-#line 6248 "SearchFilter.c"
+#line 6257 "SearchFilter.c"
 	}
 #line 1323 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp93_ = self->priv->sepr_flagged_rating;
@@ -6254,7 +6263,7 @@ void search_filter_toolbar_update (SearchFilterToolbar* self) {
 	_tmp94_ = self->priv->search_filter;
 #line 1327 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp94_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 6258 "SearchFilter.c"
+#line 6267 "SearchFilter.c"
 }
 
 
@@ -6275,7 +6284,7 @@ static void search_filter_toolbar_on_savedsearch_selected (SearchFilterToolbar*
 	self->priv->saved_search = _tmp1_;
 #line 1332 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6279 "SearchFilter.c"
+#line 6288 "SearchFilter.c"
 }
 
 
@@ -6288,7 +6297,7 @@ static void search_filter_toolbar_disable_savedsearch (SearchFilterToolbar* self
 	self->priv->saved_search = NULL;
 #line 1337 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_update (self);
-#line 6292 "SearchFilter.c"
+#line 6301 "SearchFilter.c"
 }
 
 
@@ -6318,7 +6327,7 @@ static void search_filter_toolbar_edit_dialog (SearchFilterToolbar* self, SavedS
 	saved_search_dialog_show (ssd);
 #line 1340 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (ssd);
-#line 6322 "SearchFilter.c"
+#line 6331 "SearchFilter.c"
 }
 
 
@@ -6343,7 +6352,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 	_tmp3_ = dialogs_confirm_delete_saved_search (_tmp2_);
 #line 1348 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp3_) {
-#line 6347 "SearchFilter.c"
+#line 6356 "SearchFilter.c"
 		CommandManager* _tmp4_ = NULL;
 		CommandManager* _tmp5_ = NULL;
 		SavedSearch* _tmp6_ = NULL;
@@ -6365,7 +6374,7 @@ static void search_filter_toolbar_delete_dialog (SearchFilterToolbar* self, Save
 		_g_object_unref0 (_tmp8_);
 #line 1349 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_command_manager_unref0 (_tmp5_);
-#line 6369 "SearchFilter.c"
+#line 6378 "SearchFilter.c"
 	}
 }
 
@@ -6391,7 +6400,7 @@ static void search_filter_toolbar_add_dialog (SearchFilterToolbar* self) {
 	saved_search_dialog_show (_tmp3_);
 #line 1354 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_saved_search_dialog_unref0 (_tmp3_);
-#line 6395 "SearchFilter.c"
+#line 6404 "SearchFilter.c"
 }
 
 
@@ -6416,42 +6425,42 @@ static void search_filter_toolbar_on_popover_closed (SearchFilterToolbar* self)
 	_tmp3_ = _tmp2_->filter_popup;
 #line 1361 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_hide (_tmp3_);
-#line 6420 "SearchFilter.c"
+#line 6429 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_edit_dialog_search_filter_toolbar_saved_search_popover_edit_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
 #line 1372 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_edit_dialog ((SearchFilterToolbar*) self, search);
-#line 6427 "SearchFilter.c"
+#line 6436 "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 1373 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_savedsearch_selected ((SearchFilterToolbar*) self, search);
-#line 6434 "SearchFilter.c"
+#line 6443 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_delete_dialog_search_filter_toolbar_saved_search_popover_delete_clicked (SearchFilterToolbarSavedSearchPopover* _sender, SavedSearch* search, gpointer self) {
 #line 1374 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_delete_dialog ((SearchFilterToolbar*) self, search);
-#line 6441 "SearchFilter.c"
+#line 6450 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_add_dialog_search_filter_toolbar_saved_search_popover_add_clicked (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
 #line 1375 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_add_dialog ((SearchFilterToolbar*) self);
-#line 6448 "SearchFilter.c"
+#line 6457 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed (SearchFilterToolbarSavedSearchPopover* _sender, gpointer self) {
 #line 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_on_popover_closed ((SearchFilterToolbar*) self);
-#line 6455 "SearchFilter.c"
+#line 6464 "SearchFilter.c"
 }
 
 
@@ -6464,28 +6473,28 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 	_tmp1_ = self->priv->elide_showing_again;
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 6468 "SearchFilter.c"
+#line 6477 "SearchFilter.c"
 		SavedSearch* _tmp2_ = NULL;
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = self->priv->saved_search;
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 6474 "SearchFilter.c"
+#line 6483 "SearchFilter.c"
 	} else {
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = FALSE;
-#line 6478 "SearchFilter.c"
+#line 6487 "SearchFilter.c"
 	}
 #line 1365 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp0_) {
-#line 6482 "SearchFilter.c"
+#line 6491 "SearchFilter.c"
 	} else {
 		SavedSearch* _tmp3_ = NULL;
 #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->saved_search;
 #line 1366 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (_tmp3_ != NULL) {
-#line 6489 "SearchFilter.c"
+#line 6498 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchFilterButton* _tmp4_ = NULL;
 #line 1367 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (self->priv->saved_search);
@@ -6497,7 +6506,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			search_filter_toolbar_saved_search_filter_button_set_active (_tmp4_, FALSE);
 #line 1369 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_disable_savedsearch (self);
-#line 6501 "SearchFilter.c"
+#line 6510 "SearchFilter.c"
 		} else {
 			SearchFilterToolbarSavedSearchFilterButton* _tmp5_ = NULL;
 			SearchFilterToolbarSavedSearchPopover* _tmp6_ = NULL;
@@ -6522,7 +6531,7 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			_tmp6_ = _tmp5_->filter_popup;
 #line 1371 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			if (_tmp6_ != NULL) {
-#line 6526 "SearchFilter.c"
+#line 6535 "SearchFilter.c"
 				SearchFilterToolbarSavedSearchFilterButton* _tmp7_ = NULL;
 				SearchFilterToolbarSavedSearchPopover* _tmp8_ = NULL;
 				guint _tmp9_ = 0U;
@@ -6578,7 +6587,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 1376 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				g_signal_handlers_disconnect_matched (_tmp20_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp21_, 0, NULL, (GCallback) _search_filter_toolbar_on_popover_closed_search_filter_toolbar_saved_search_popover_closed, self);
-#line 6582 "SearchFilter.c"
+#line 6591 "SearchFilter.c"
 			}
 #line 1378 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp22_ = self->priv->saved_search_button;
@@ -6626,12 +6635,12 @@ static void search_filter_toolbar_on_saved_search_button_clicked (SearchFilterTo
 			_tmp36_ = _tmp35_->filter_popup;
 #line 1385 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			search_filter_toolbar_saved_search_popover_show_all (_tmp36_);
-#line 6630 "SearchFilter.c"
+#line 6639 "SearchFilter.c"
 		}
 	}
 #line 1387 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->elide_showing_again = FALSE;
-#line 6635 "SearchFilter.c"
+#line 6644 "SearchFilter.c"
 }
 
 
@@ -6643,7 +6652,7 @@ void search_filter_toolbar_take_focus (SearchFilterToolbar* self) {
 	_tmp0_ = self->priv->search_box;
 #line 1391 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_get_focus (_tmp0_);
-#line 6647 "SearchFilter.c"
+#line 6656 "SearchFilter.c"
 }
 
 
@@ -6674,18 +6683,18 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 	if (_tmp3_ != 0) {
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = TRUE;
-#line 6678 "SearchFilter.c"
+#line 6687 "SearchFilter.c"
 	} else {
 		gint _tmp4_ = 0;
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp4_ = right_padding;
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = _tmp4_ != 0;
-#line 6685 "SearchFilter.c"
+#line 6694 "SearchFilter.c"
 	}
 #line 622 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp2_) {
-#line 6689 "SearchFilter.c"
+#line 6698 "SearchFilter.c"
 		GtkLabel* _tmp5_ = NULL;
 		GtkLabel* _tmp6_ = NULL;
 		GtkLabel* _tmp7_ = NULL;
@@ -6712,7 +6721,7 @@ static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_c
 		_tmp10_ = right_padding;
 #line 626 "/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 6716 "SearchFilter.c"
+#line 6725 "SearchFilter.c"
 	}
 #line 628 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp11_ = self->priv->label;
@@ -6720,14 +6729,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 620 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 6724 "SearchFilter.c"
+#line 6733 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarLabelToolItem* search_filter_toolbar_label_tool_item_new (const gchar* s, gint left_padding, gint right_padding) {
 #line 620 "/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 6731 "SearchFilter.c"
+#line 6740 "SearchFilter.c"
 }
 
 
@@ -6738,14 +6747,14 @@ static void search_filter_toolbar_label_tool_item_class_init (SearchFilterToolba
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarLabelToolItemPrivate));
 #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_label_tool_item_finalize;
-#line 6742 "SearchFilter.c"
+#line 6751 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_label_tool_item_instance_init (SearchFilterToolbarLabelToolItem * self) {
 #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_LABEL_TOOL_ITEM_GET_PRIVATE (self);
-#line 6749 "SearchFilter.c"
+#line 6758 "SearchFilter.c"
 }
 
 
@@ -6757,7 +6766,7 @@ static void search_filter_toolbar_label_tool_item_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->label);
 #line 617 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_label_tool_item_parent_class)->finalize (obj);
-#line 6761 "SearchFilter.c"
+#line 6770 "SearchFilter.c"
 }
 
 
@@ -6823,14 +6832,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 635 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 6827 "SearchFilter.c"
+#line 6836 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarToggleActionToolButton* search_filter_toolbar_toggle_action_tool_button_new (const gchar* action) {
 #line 635 "/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 6834 "SearchFilter.c"
+#line 6843 "SearchFilter.c"
 }
 
 
@@ -6874,7 +6883,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 646 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (image);
-#line 6878 "SearchFilter.c"
+#line 6887 "SearchFilter.c"
 }
 
 
@@ -6891,7 +6900,7 @@ static void search_filter_toolbar_toggle_action_tool_button_set_label (SearchFil
 	_tmp1_ = label;
 #line 655 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 6895 "SearchFilter.c"
+#line 6904 "SearchFilter.c"
 }
 
 
@@ -6902,14 +6911,14 @@ static void search_filter_toolbar_toggle_action_tool_button_class_init (SearchFi
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarToggleActionToolButtonPrivate));
 #line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_toggle_action_tool_button_finalize;
-#line 6906 "SearchFilter.c"
+#line 6915 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_toggle_action_tool_button_instance_init (SearchFilterToolbarToggleActionToolButton * self) {
 #line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_TOGGLE_ACTION_TOOL_BUTTON_GET_PRIVATE (self);
-#line 6913 "SearchFilter.c"
+#line 6922 "SearchFilter.c"
 }
 
 
@@ -6921,7 +6930,7 @@ static void search_filter_toolbar_toggle_action_tool_button_finalize (GObject* o
 	_g_object_unref0 (self->priv->button);
 #line 632 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_toggle_action_tool_button_parent_class)->finalize (obj);
-#line 6925 "SearchFilter.c"
+#line 6934 "SearchFilter.c"
 }
 
 
@@ -6940,42 +6949,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 690 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_action_text_changed ((SearchFilterToolbarSearchBox*) self, text);
-#line 6944 "SearchFilter.c"
+#line 6953 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_sensitivity_changed_text_action_sensitivity_changed (TextAction* _sender, gboolean sensitive, gpointer self) {
 #line 691 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_sensitivity_changed ((SearchFilterToolbarSearchBox*) self, sensitive);
-#line 6951 "SearchFilter.c"
+#line 6960 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_search_box_on_visibility_changed_text_action_visibility_changed (TextAction* _sender, gboolean visible, gpointer self) {
 #line 692 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_visibility_changed ((SearchFilterToolbarSearchBox*) self, visible);
-#line 6958 "SearchFilter.c"
+#line 6967 "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 694 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self);
-#line 6965 "SearchFilter.c"
+#line 6974 "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 695 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_search_box_on_entry_changed ((SearchFilterToolbarSearchBox*) self);
-#line 6972 "SearchFilter.c"
+#line 6981 "SearchFilter.c"
 }
 
 
 static gpointer _text_action_ref0 (gpointer self) {
 #line 672 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self ? text_action_ref (self) : NULL;
-#line 6979 "SearchFilter.c"
+#line 6988 "SearchFilter.c"
 }
 
 
@@ -6984,7 +6993,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 676 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 6988 "SearchFilter.c"
+#line 6997 "SearchFilter.c"
 }
 
 
@@ -7078,14 +7087,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 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7082 "SearchFilter.c"
+#line 7091 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSearchBox* search_filter_toolbar_search_box_new (TextAction* action) {
 #line 671 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_search_box_construct (SEARCH_FILTER_TOOLBAR_TYPE_SEARCH_BOX, action);
-#line 7089 "SearchFilter.c"
+#line 7098 "SearchFilter.c"
 }
 
 
@@ -7097,7 +7106,7 @@ void search_filter_toolbar_search_box_get_focus (SearchFilterToolbarSearchBox* s
 	_tmp0_ = self->priv->search_entry;
 #line 699 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "has-focus", TRUE, NULL);
-#line 7101 "SearchFilter.c"
+#line 7110 "SearchFilter.c"
 }
 
 
@@ -7118,19 +7127,19 @@ static gboolean search_filter_toolbar_search_box_on_escape_key (SearchFilterTool
 	_tmp2_ = gdk_keyval_name (_tmp1_);
 #line 705 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
-#line 7122 "SearchFilter.c"
+#line 7131 "SearchFilter.c"
 		TextAction* _tmp3_ = NULL;
 #line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp3_ = self->priv->action;
 #line 706 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		text_action_clear (_tmp3_);
-#line 7128 "SearchFilter.c"
+#line 7137 "SearchFilter.c"
 	}
 #line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = FALSE;
 #line 710 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7134 "SearchFilter.c"
+#line 7143 "SearchFilter.c"
 }
 
 
@@ -7192,7 +7201,7 @@ static void search_filter_toolbar_search_box_on_action_text_changed (SearchFilte
 	_tmp14_ = _tmp13_;
 #line 718 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp14_, "inserted-text", (GCallback) _search_filter_toolbar_search_box_on_entry_changed_gtk_entry_buffer_inserted_text, self, 0);
-#line 7196 "SearchFilter.c"
+#line 7205 "SearchFilter.c"
 }
 
 
@@ -7223,7 +7232,7 @@ static void search_filter_toolbar_search_box_on_entry_changed (SearchFilterToolb
 	_tmp5_ = self->priv->action;
 #line 724 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_connect_object (_tmp5_, "text-changed", (GCallback) _search_filter_toolbar_search_box_on_action_text_changed_text_action_text_changed, self, 0);
-#line 7227 "SearchFilter.c"
+#line 7236 "SearchFilter.c"
 }
 
 
@@ -7235,7 +7244,7 @@ static void search_filter_toolbar_search_box_on_sensitivity_changed (SearchFilte
 	_tmp0_ = sensitive;
 #line 728 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7239 "SearchFilter.c"
+#line 7248 "SearchFilter.c"
 }
 
 
@@ -7247,7 +7256,7 @@ static void search_filter_toolbar_search_box_on_visibility_changed (SearchFilter
 	_tmp0_ = visible;
 #line 732 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_set_visible (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 7251 "SearchFilter.c"
+#line 7260 "SearchFilter.c"
 }
 
 
@@ -7261,23 +7270,23 @@ static void search_filter_toolbar_search_box_set_nullable_text (SearchFilterTool
 	_tmp1_ = text;
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_ != NULL) {
-#line 7265 "SearchFilter.c"
+#line 7274 "SearchFilter.c"
 		const gchar* _tmp2_ = NULL;
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp2_ = text;
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = _tmp2_;
-#line 7271 "SearchFilter.c"
+#line 7280 "SearchFilter.c"
 	} else {
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_tmp0_ = "";
-#line 7275 "SearchFilter.c"
+#line 7284 "SearchFilter.c"
 	}
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp3_ = self->priv->search_entry;
 #line 736 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_entry_set_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_entry_get_type (), GtkEntry), _tmp0_);
-#line 7281 "SearchFilter.c"
+#line 7290 "SearchFilter.c"
 }
 
 
@@ -7288,14 +7297,14 @@ static void search_filter_toolbar_search_box_class_init (SearchFilterToolbarSear
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarSearchBoxPrivate));
 #line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_search_box_finalize;
-#line 7292 "SearchFilter.c"
+#line 7301 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_search_box_instance_init (SearchFilterToolbarSearchBox * self) {
 #line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv = SEARCH_FILTER_TOOLBAR_SEARCH_BOX_GET_PRIVATE (self);
-#line 7299 "SearchFilter.c"
+#line 7308 "SearchFilter.c"
 }
 
 
@@ -7361,7 +7370,7 @@ static void search_filter_toolbar_search_box_finalize (GObject* obj) {
 	_text_action_unref0 (self->priv->action);
 #line 667 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_search_box_parent_class)->finalize (obj);
-#line 7365 "SearchFilter.c"
+#line 7374 "SearchFilter.c"
 }
 
 
@@ -7437,14 +7446,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 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7441 "SearchFilter.c"
+#line 7450 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarRatingFilterButton* search_filter_toolbar_rating_filter_button_new (GMenuModel* model) {
 #line 744 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_rating_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_RATING_FILTER_BUTTON, model);
-#line 7448 "SearchFilter.c"
+#line 7457 "SearchFilter.c"
 }
 
 
@@ -7470,7 +7479,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 	switch (_tmp0_) {
 #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 7474 "SearchFilter.c"
+#line 7483 "SearchFilter.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 763 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7481,11 +7490,11 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 			filename = _tmp1_;
 #line 764 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7485 "SearchFilter.c"
+#line 7494 "SearchFilter.c"
 		}
 #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7489 "SearchFilter.c"
+#line 7498 "SearchFilter.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 767 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7496,12 +7505,12 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 			filename = _tmp2_;
 #line 768 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7500 "SearchFilter.c"
+#line 7509 "SearchFilter.c"
 		}
 		default:
 #line 761 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7505 "SearchFilter.c"
+#line 7514 "SearchFilter.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 772 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7512,7 +7521,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 			filename = _tmp3_;
 #line 773 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7516 "SearchFilter.c"
+#line 7525 "SearchFilter.c"
 		}
 	}
 #line 776 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7543,7 +7552,7 @@ static GtkWidget* search_filter_toolbar_rating_filter_button_get_filter_icon (Se
 	_g_free0 (filename);
 #line 780 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7547 "SearchFilter.c"
+#line 7556 "SearchFilter.c"
 }
 
 
@@ -7567,7 +7576,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 	switch (_tmp0_) {
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 7571 "SearchFilter.c"
+#line 7580 "SearchFilter.c"
 		{
 			gint _tmp1_ = 0;
 			gint _tmp2_ = 0;
@@ -7579,11 +7588,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = _tmp1_ + _tmp2_;
 #line 790 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7583 "SearchFilter.c"
+#line 7592 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7587 "SearchFilter.c"
+#line 7596 "SearchFilter.c"
 		{
 			gint _tmp3_ = 0;
 			gint _tmp4_ = 0;
@@ -7595,11 +7604,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = (_tmp3_ * 2) + _tmp4_;
 #line 792 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7599 "SearchFilter.c"
+#line 7608 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7603 "SearchFilter.c"
+#line 7612 "SearchFilter.c"
 		{
 			gint _tmp5_ = 0;
 			gint _tmp6_ = 0;
@@ -7611,11 +7620,11 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = (_tmp5_ * 3) + _tmp6_;
 #line 794 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7615 "SearchFilter.c"
+#line 7624 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7619 "SearchFilter.c"
+#line 7628 "SearchFilter.c"
 		{
 			gint _tmp7_ = 0;
 			gint _tmp8_ = 0;
@@ -7627,13 +7636,13 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = (_tmp7_ * 4) + _tmp8_;
 #line 796 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7631 "SearchFilter.c"
+#line 7640 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
-#line 7637 "SearchFilter.c"
+#line 7646 "SearchFilter.c"
 		{
 			gint _tmp9_ = 0;
 #line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7642,37 +7651,37 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = _tmp9_ * 5;
 #line 799 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7646 "SearchFilter.c"
+#line 7655 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_OR_HIGHER:
-#line 7650 "SearchFilter.c"
+#line 7659 "SearchFilter.c"
 		{
 #line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = RESOURCES_ICON_FILTER_REJECTED_OR_BETTER_FIXED_SIZE;
 #line 801 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7656 "SearchFilter.c"
+#line 7665 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_UNRATED_OR_HIGHER:
-#line 7660 "SearchFilter.c"
+#line 7669 "SearchFilter.c"
 		{
 #line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = RESOURCES_ICON_FILTER_UNRATED_OR_BETTER_FIXED_SIZE;
 #line 803 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7666 "SearchFilter.c"
+#line 7675 "SearchFilter.c"
 		}
 #line 788 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_REJECTED_ONLY:
-#line 7670 "SearchFilter.c"
+#line 7679 "SearchFilter.c"
 		{
 #line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			result = icon_plus;
 #line 805 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7676 "SearchFilter.c"
+#line 7685 "SearchFilter.c"
 		}
 		default:
 		{
@@ -7680,7 +7689,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_icon_size (Sea
 			result = icon_base;
 #line 807 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return result;
-#line 7684 "SearchFilter.c"
+#line 7693 "SearchFilter.c"
 		}
 	}
 }
@@ -7706,7 +7715,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 	switch (_tmp1_) {
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_ONE_OR_HIGHER:
-#line 7710 "SearchFilter.c"
+#line 7719 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp2_ = NULL;
 			const gchar* _tmp3_ = NULL;
@@ -7718,11 +7727,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), _tmp3_);
 #line 816 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7722 "SearchFilter.c"
+#line 7731 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_TWO_OR_HIGHER:
-#line 7726 "SearchFilter.c"
+#line 7735 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp4_ = NULL;
 			const gchar* _tmp5_ = NULL;
@@ -7734,11 +7743,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), _tmp5_);
 #line 819 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7738 "SearchFilter.c"
+#line 7747 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_THREE_OR_HIGHER:
-#line 7742 "SearchFilter.c"
+#line 7751 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp6_ = NULL;
 			const gchar* _tmp7_ = NULL;
@@ -7750,11 +7759,11 @@ 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), _tmp7_);
 #line 822 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7754 "SearchFilter.c"
+#line 7763 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FOUR_OR_HIGHER:
-#line 7758 "SearchFilter.c"
+#line 7767 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp8_ = NULL;
 			const gchar* _tmp9_ = NULL;
@@ -7766,13 +7775,13 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_button_get_type (), GtkButton), _tmp9_);
 #line 825 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7770 "SearchFilter.c"
+#line 7779 "SearchFilter.c"
 		}
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_ONLY:
 #line 813 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		case RATING_FILTER_FIVE_OR_HIGHER:
-#line 7776 "SearchFilter.c"
+#line 7785 "SearchFilter.c"
 		{
 			GtkMenuButton* _tmp10_ = NULL;
 			const gchar* _tmp11_ = NULL;
@@ -7784,7 +7793,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_button_get_type (), GtkButton), _tmp11_);
 #line 829 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7788 "SearchFilter.c"
+#line 7797 "SearchFilter.c"
 		}
 		default:
 		{
@@ -7814,7 +7823,7 @@ void search_filter_toolbar_rating_filter_button_set_filter_icon (SearchFilterToo
 			_g_object_unref0 (_tmp17_);
 #line 833 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			break;
-#line 7818 "SearchFilter.c"
+#line 7827 "SearchFilter.c"
 		}
 	}
 #line 836 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -7837,7 +7846,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 839 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
-#line 7841 "SearchFilter.c"
+#line 7850 "SearchFilter.c"
 }
 
 
@@ -7855,7 +7864,7 @@ static gint search_filter_toolbar_rating_filter_button_get_filter_button_size (S
 	result = _tmp1_ + (2 * SEARCH_FILTER_TOOLBAR_FILTER_BUTTON_MARGIN);
 #line 843 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 7859 "SearchFilter.c"
+#line 7868 "SearchFilter.c"
 }
 
 
@@ -7872,7 +7881,7 @@ void search_filter_toolbar_rating_filter_button_set_label (SearchFilterToolbarRa
 	_tmp1_ = label;
 #line 847 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 7876 "SearchFilter.c"
+#line 7885 "SearchFilter.c"
 }
 
 
@@ -7881,7 +7890,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 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_rating_filter_button_finalize;
-#line 7885 "SearchFilter.c"
+#line 7894 "SearchFilter.c"
 }
 
 
@@ -7897,7 +7906,7 @@ static void search_filter_toolbar_rating_filter_button_finalize (GObject* obj) {
 	_g_object_unref0 (self->button);
 #line 741 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_rating_filter_button_parent_class)->finalize (obj);
-#line 7901 "SearchFilter.c"
+#line 7910 "SearchFilter.c"
 }
 
 
@@ -7916,7 +7925,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 877 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_filter_button_on_clicked ((SearchFilterToolbarSavedSearchFilterButton*) self);
-#line 7920 "SearchFilter.c"
+#line 7929 "SearchFilter.c"
 }
 
 
@@ -7976,14 +7985,14 @@ SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_f
 	_g_object_unref0 (image);
 #line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 7980 "SearchFilter.c"
+#line 7989 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchFilterButton* search_filter_toolbar_saved_search_filter_button_new (void) {
 #line 858 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_filter_button_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON);
-#line 7987 "SearchFilter.c"
+#line 7996 "SearchFilter.c"
 }
 
 
@@ -7992,7 +8001,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 881 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "clicked");
-#line 7996 "SearchFilter.c"
+#line 8005 "SearchFilter.c"
 }
 
 
@@ -8007,7 +8016,7 @@ void search_filter_toolbar_saved_search_filter_button_set_active (SearchFilterTo
 	_tmp1_ = active;
 #line 885 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_toggle_button_set_active (_tmp0_, _tmp1_);
-#line 8011 "SearchFilter.c"
+#line 8020 "SearchFilter.c"
 }
 
 
@@ -8024,7 +8033,7 @@ void search_filter_toolbar_saved_search_filter_button_set_label (SearchFilterToo
 	_tmp1_ = label;
 #line 889 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_button_get_type (), GtkButton), _tmp1_);
-#line 8028 "SearchFilter.c"
+#line 8037 "SearchFilter.c"
 }
 
 
@@ -8041,7 +8050,7 @@ void search_filter_toolbar_saved_search_filter_button_restyle (SearchFilterToolb
 	_tmp1_ = self->button;
 #line 894 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_button_get_type (), GtkButton), GTK_RELIEF_NONE);
-#line 8045 "SearchFilter.c"
+#line 8054 "SearchFilter.c"
 }
 
 
@@ -8052,14 +8061,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 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_FILTER_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 8056 "SearchFilter.c"
+#line 8065 "SearchFilter.c"
 }
 
 
 static void search_filter_toolbar_saved_search_filter_button_instance_init (SearchFilterToolbarSavedSearchFilterButton * self) {
 #line 853 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->filter_popup = NULL;
-#line 8063 "SearchFilter.c"
+#line 8072 "SearchFilter.c"
 }
 
 
@@ -8081,7 +8090,7 @@ static void search_filter_toolbar_saved_search_filter_button_finalize (GObject*
 	_g_object_unref0 (self->button);
 #line 852 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_saved_search_filter_button_parent_class)->finalize (obj);
-#line 8085 "SearchFilter.c"
+#line 8094 "SearchFilter.c"
 }
 
 
@@ -8100,35 +8109,35 @@ 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 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_edit_click ((SearchFilterToolbarSavedSearchPopover*) self, search);
-#line 8104 "SearchFilter.c"
+#line 8113 "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 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_delete_click ((SearchFilterToolbarSavedSearchPopover*) self, search);
-#line 8111 "SearchFilter.c"
+#line 8120 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_add_click_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 981 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_add_click ((SearchFilterToolbarSavedSearchPopover*) self);
-#line 8118 "SearchFilter.c"
+#line 8127 "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 982 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_activate_row ((SearchFilterToolbarSavedSearchPopover*) self, row);
-#line 8125 "SearchFilter.c"
+#line 8134 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_on_popover_closed_gtk_popover_closed (GtkPopover* _sender, gpointer self) {
 #line 983 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_on_popover_closed ((SearchFilterToolbarSavedSearchPopover*) self);
-#line 8132 "SearchFilter.c"
+#line 8141 "SearchFilter.c"
 }
 
 
@@ -8139,13 +8148,13 @@ static void _vala_array_add133 (SearchFilterToolbarSavedSearchPopoverDataButton*
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1);
-#line 8143 "SearchFilter.c"
+#line 8152 "SearchFilter.c"
 	}
 #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[(*length)++] = value;
 #line 959 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[*length] = NULL;
-#line 8149 "SearchFilter.c"
+#line 8158 "SearchFilter.c"
 }
 
 
@@ -8156,13 +8165,13 @@ static void _vala_array_add134 (SearchFilterToolbarSavedSearchPopoverDataButton*
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*array = g_renew (SearchFilterToolbarSavedSearchPopoverDataButton*, *array, (*size) + 1);
-#line 8160 "SearchFilter.c"
+#line 8169 "SearchFilter.c"
 	}
 #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[(*length)++] = value;
 #line 964 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	(*array)[*length] = NULL;
-#line 8166 "SearchFilter.c"
+#line 8175 "SearchFilter.c"
 }
 
 
@@ -8228,7 +8237,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 	self->priv->delete_buttons_length1 = 0;
 #line 947 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->_delete_buttons_size_ = self->priv->delete_buttons_length1;
-#line 8232 "SearchFilter.c"
+#line 8241 "SearchFilter.c"
 	{
 		GeeIterator* _search_it = NULL;
 		SavedSearchTable* _tmp6_ = NULL;
@@ -8257,7 +8266,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 		_search_it = _tmp11_;
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		while (TRUE) {
-#line 8261 "SearchFilter.c"
+#line 8270 "SearchFilter.c"
 			GeeIterator* _tmp12_ = NULL;
 			gboolean _tmp13_ = FALSE;
 			SavedSearch* search = NULL;
@@ -8305,7 +8314,7 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 			if (!_tmp13_) {
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				break;
-#line 8309 "SearchFilter.c"
+#line 8318 "SearchFilter.c"
 			}
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp14_ = _search_it;
@@ -8421,11 +8430,11 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 			_g_object_unref0 (row);
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_g_object_unref0 (search);
-#line 8425 "SearchFilter.c"
+#line 8434 "SearchFilter.c"
 		}
 #line 949 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_search_it);
-#line 8429 "SearchFilter.c"
+#line 8438 "SearchFilter.c"
 	}
 #line 968 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp44_ = (GtkButton*) gtk_button_new_from_icon_name ("list-add-symbolic", GTK_ICON_SIZE_BUTTON);
@@ -8463,14 +8472,14 @@ SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popove
 	search_filter_toolbar_saved_search_popover_restyle (self);
 #line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 8467 "SearchFilter.c"
+#line 8476 "SearchFilter.c"
 }
 
 
 SearchFilterToolbarSavedSearchPopover* search_filter_toolbar_saved_search_popover_new (GtkWidget* relative_to) {
 #line 942 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_popover_construct (SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, relative_to);
-#line 8474 "SearchFilter.c"
+#line 8483 "SearchFilter.c"
 }
 
 
@@ -8490,7 +8499,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 	_tmp1_ = self->priv->edit_buttons;
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1__length1 = self->priv->edit_buttons_length1;
-#line 8494 "SearchFilter.c"
+#line 8503 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -8502,14 +8511,14 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 		button_collection_length1 = _tmp1__length1;
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp1__length1; button_it = button_it + 1) {
-#line 8506 "SearchFilter.c"
+#line 8515 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp2_ = _g_object_ref0 (button_collection[button_it]);
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp2_;
-#line 8513 "SearchFilter.c"
+#line 8522 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp3_ = NULL;
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8518,7 +8527,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 				search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp3_);
 #line 988 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 8522 "SearchFilter.c"
+#line 8531 "SearchFilter.c"
 			}
 		}
 	}
@@ -8526,7 +8535,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 	_tmp4_ = self->priv->delete_buttons;
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4__length1 = self->priv->delete_buttons_length1;
-#line 8530 "SearchFilter.c"
+#line 8539 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -8538,14 +8547,14 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 		button_collection_length1 = _tmp4__length1;
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) {
-#line 8542 "SearchFilter.c"
+#line 8551 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = _g_object_ref0 (button_collection[button_it]);
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp5_;
-#line 8549 "SearchFilter.c"
+#line 8558 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
@@ -8554,7 +8563,7 @@ void search_filter_toolbar_saved_search_popover_restyle (SearchFilterToolbarSave
 				search_filter_toolbar_saved_search_popover_data_button_restyle (_tmp6_);
 #line 989 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 8558 "SearchFilter.c"
+#line 8567 "SearchFilter.c"
 			}
 		}
 	}
@@ -8582,7 +8591,7 @@ static gboolean search_filter_toolbar_saved_search_popover_is_search_row (Search
 		result = FALSE;
 #line 993 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 8586 "SearchFilter.c"
+#line 8595 "SearchFilter.c"
 	}
 #line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp1_ = row;
@@ -8604,13 +8613,13 @@ static gboolean search_filter_toolbar_saved_search_popover_is_search_row (Search
 		result = FALSE;
 #line 994 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return result;
-#line 8608 "SearchFilter.c"
+#line 8617 "SearchFilter.c"
 	}
 #line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	result = TRUE;
 #line 995 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8614 "SearchFilter.c"
+#line 8623 "SearchFilter.c"
 }
 
 
@@ -8681,7 +8690,7 @@ static SavedSearch* search_filter_toolbar_saved_search_popover_get_search (Searc
 	_g_object_unref0 (button);
 #line 1000 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8685 "SearchFilter.c"
+#line 8694 "SearchFilter.c"
 }
 
 
@@ -8699,7 +8708,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 1004 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (_tmp1_) {
-#line 8703 "SearchFilter.c"
+#line 8712 "SearchFilter.c"
 		GtkListBoxRow* _tmp2_ = NULL;
 		SavedSearch* _tmp3_ = NULL;
 		SavedSearch* _tmp4_ = NULL;
@@ -8713,13 +8722,13 @@ static void search_filter_toolbar_saved_search_popover_on_activate_row (SearchFi
 		g_signal_emit_by_name (self, "search-activated", _tmp4_);
 #line 1005 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		_g_object_unref0 (_tmp4_);
-#line 8717 "SearchFilter.c"
+#line 8726 "SearchFilter.c"
 	}
 #line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp5_ = self->priv->popover;
 #line 1006 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget));
-#line 8723 "SearchFilter.c"
+#line 8732 "SearchFilter.c"
 }
 
 
@@ -8733,7 +8742,7 @@ static void search_filter_toolbar_saved_search_popover_on_edit_click (SearchFilt
 	_tmp0_ = search;
 #line 1010 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "edit-clicked", _tmp0_);
-#line 8737 "SearchFilter.c"
+#line 8746 "SearchFilter.c"
 }
 
 
@@ -8747,7 +8756,7 @@ static void search_filter_toolbar_saved_search_popover_on_delete_click (SearchFi
 	_tmp0_ = search;
 #line 1014 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "delete-clicked", _tmp0_);
-#line 8751 "SearchFilter.c"
+#line 8760 "SearchFilter.c"
 }
 
 
@@ -8756,7 +8765,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 1018 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "add-clicked");
-#line 8760 "SearchFilter.c"
+#line 8769 "SearchFilter.c"
 }
 
 
@@ -8765,7 +8774,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 1022 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "closed");
-#line 8769 "SearchFilter.c"
+#line 8778 "SearchFilter.c"
 }
 
 
@@ -8777,7 +8786,7 @@ void search_filter_toolbar_saved_search_popover_show_all (SearchFilterToolbarSav
 	_tmp0_ = self->priv->popover;
 #line 1026 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 8781 "SearchFilter.c"
+#line 8790 "SearchFilter.c"
 }
 
 
@@ -8789,14 +8798,14 @@ void search_filter_toolbar_saved_search_popover_hide (SearchFilterToolbarSavedSe
 	_tmp0_ = self->priv->popover;
 #line 1030 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget));
-#line 8793 "SearchFilter.c"
+#line 8802 "SearchFilter.c"
 }
 
 
 static void _search_filter_toolbar_saved_search_popover_data_button_on_click_gtk_button_clicked (GtkButton* _sender, gpointer self) {
 #line 929 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	search_filter_toolbar_saved_search_popover_data_button_on_click ((SearchFilterToolbarSavedSearchPopoverDataButton*) self);
-#line 8800 "SearchFilter.c"
+#line 8809 "SearchFilter.c"
 }
 
 
@@ -8839,14 +8848,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 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return self;
-#line 8843 "SearchFilter.c"
+#line 8852 "SearchFilter.c"
 }
 
 
 static SearchFilterToolbarSavedSearchPopoverDataButton* search_filter_toolbar_saved_search_popover_data_button_new (SavedSearch* search, const gchar* name) {
 #line 918 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return search_filter_toolbar_saved_search_popover_data_button_construct (SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, search, name);
-#line 8850 "SearchFilter.c"
+#line 8859 "SearchFilter.c"
 }
 
 
@@ -8863,7 +8872,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_restyle (Sear
 	_tmp1_ = self->priv->button;
 #line 934 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	gtk_button_set_relief (_tmp1_, GTK_RELIEF_NONE);
-#line 8867 "SearchFilter.c"
+#line 8876 "SearchFilter.c"
 }
 
 
@@ -8875,7 +8884,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_on_click (Sea
 	_tmp0_ = self->priv->_search;
 #line 938 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_emit_by_name (self, "clicked", _tmp0_);
-#line 8879 "SearchFilter.c"
+#line 8888 "SearchFilter.c"
 }
 
 
@@ -8890,7 +8899,7 @@ static SavedSearch* search_filter_toolbar_saved_search_popover_data_button_get_s
 	result = _tmp0_;
 #line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return result;
-#line 8894 "SearchFilter.c"
+#line 8903 "SearchFilter.c"
 }
 
 
@@ -8909,7 +8918,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_set_search (S
 	self->priv->_search = _tmp1_;
 #line 914 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_object_notify ((GObject *) self, "search");
-#line 8913 "SearchFilter.c"
+#line 8922 "SearchFilter.c"
 }
 
 
@@ -8928,7 +8937,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, 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 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("clicked", SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_TYPE_DATA_BUTTON, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, TYPE_SAVED_SEARCH);
-#line 8932 "SearchFilter.c"
+#line 8941 "SearchFilter.c"
 }
 
 
@@ -8937,7 +8946,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 913 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->button = NULL;
-#line 8941 "SearchFilter.c"
+#line 8950 "SearchFilter.c"
 }
 
 
@@ -8959,7 +8968,7 @@ static void search_filter_toolbar_saved_search_popover_data_button_finalize (GOb
 	_g_object_unref0 (self->priv->_search);
 #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_saved_search_popover_data_button_parent_class)->finalize (obj);
-#line 8963 "SearchFilter.c"
+#line 8972 "SearchFilter.c"
 }
 
 
@@ -8986,13 +8995,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 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 8990 "SearchFilter.c"
+#line 8999 "SearchFilter.c"
 		default:
 #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 8996 "SearchFilter.c"
+#line 9005 "SearchFilter.c"
 	}
 }
 
@@ -9008,13 +9017,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 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 9012 "SearchFilter.c"
+#line 9021 "SearchFilter.c"
 		default:
 #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
 #line 912 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		break;
-#line 9018 "SearchFilter.c"
+#line 9027 "SearchFilter.c"
 	}
 }
 
@@ -9022,7 +9031,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 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	value->data[0].v_pointer = NULL;
-#line 9026 "SearchFilter.c"
+#line 9035 "SearchFilter.c"
 }
 
 
@@ -9031,7 +9040,7 @@ static void search_filter_toolbar_value_saved_search_popover_free_value (GValue*
 	if (value->data[0].v_pointer) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (value->data[0].v_pointer);
-#line 9035 "SearchFilter.c"
+#line 9044 "SearchFilter.c"
 	}
 }
 
@@ -9041,11 +9050,11 @@ static void search_filter_toolbar_value_saved_search_popover_copy_value (const G
 	if (src_value->data[0].v_pointer) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (src_value->data[0].v_pointer);
-#line 9045 "SearchFilter.c"
+#line 9054 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9049 "SearchFilter.c"
+#line 9058 "SearchFilter.c"
 	}
 }
 
@@ -9053,37 +9062,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 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 9057 "SearchFilter.c"
+#line 9066 "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 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (collect_values[0].v_pointer) {
-#line 9064 "SearchFilter.c"
+#line 9073 "SearchFilter.c"
 		SearchFilterToolbarSavedSearchPopover* object;
 		object = collect_values[0].v_pointer;
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9071 "SearchFilter.c"
+#line 9080 "SearchFilter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9075 "SearchFilter.c"
+#line 9084 "SearchFilter.c"
 		}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = search_filter_toolbar_saved_search_popover_ref (object);
-#line 9079 "SearchFilter.c"
+#line 9088 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9083 "SearchFilter.c"
+#line 9092 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9087 "SearchFilter.c"
+#line 9096 "SearchFilter.c"
 }
 
 
@@ -9094,25 +9103,25 @@ static gchar* search_filter_toolbar_value_saved_search_popover_lcopy_value (cons
 	if (!object_p) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9098 "SearchFilter.c"
+#line 9107 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (!value->data[0].v_pointer) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = NULL;
-#line 9104 "SearchFilter.c"
+#line 9113 "SearchFilter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9108 "SearchFilter.c"
+#line 9117 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		*object_p = search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer);
-#line 9112 "SearchFilter.c"
+#line 9121 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return NULL;
-#line 9116 "SearchFilter.c"
+#line 9125 "SearchFilter.c"
 }
 
 
@@ -9126,7 +9135,7 @@ GParamSpec* search_filter_toolbar_param_spec_saved_search_popover (const gchar*
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return G_PARAM_SPEC (spec);
-#line 9130 "SearchFilter.c"
+#line 9139 "SearchFilter.c"
 }
 
 
@@ -9135,7 +9144,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 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return value->data[0].v_pointer;
-#line 9139 "SearchFilter.c"
+#line 9148 "SearchFilter.c"
 }
 
 
@@ -9155,17 +9164,17 @@ void search_filter_toolbar_value_set_saved_search_popover (GValue* value, gpoint
 		value->data[0].v_pointer = v_object;
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_ref (value->data[0].v_pointer);
-#line 9159 "SearchFilter.c"
+#line 9168 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9163 "SearchFilter.c"
+#line 9172 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (old);
-#line 9169 "SearchFilter.c"
+#line 9178 "SearchFilter.c"
 	}
 }
 
@@ -9184,17 +9193,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 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = v_object;
-#line 9188 "SearchFilter.c"
+#line 9197 "SearchFilter.c"
 	} else {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		value->data[0].v_pointer = NULL;
-#line 9192 "SearchFilter.c"
+#line 9201 "SearchFilter.c"
 	}
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	if (old) {
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		search_filter_toolbar_saved_search_popover_unref (old);
-#line 9198 "SearchFilter.c"
+#line 9207 "SearchFilter.c"
 	}
 }
 
@@ -9216,7 +9225,7 @@ static void search_filter_toolbar_saved_search_popover_class_init (SearchFilterT
 	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 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	g_signal_new ("closed", SEARCH_FILTER_TOOLBAR_TYPE_SAVED_SEARCH_POPOVER, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 9220 "SearchFilter.c"
+#line 9229 "SearchFilter.c"
 }
 
 
@@ -9243,7 +9252,7 @@ static void search_filter_toolbar_saved_search_popover_instance_init (SearchFilt
 	self->priv->add = NULL;
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->ref_count = 1;
-#line 9247 "SearchFilter.c"
+#line 9256 "SearchFilter.c"
 }
 
 
@@ -9267,7 +9276,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 	_tmp0_ = self->priv->edit_buttons;
 #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp0__length1 = self->priv->edit_buttons_length1;
-#line 9271 "SearchFilter.c"
+#line 9280 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -9279,14 +9288,14 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 		button_collection_length1 = _tmp0__length1;
 #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp0__length1; button_it = button_it + 1) {
-#line 9283 "SearchFilter.c"
+#line 9292 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp1_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp1_ = _g_object_ref0 (button_collection[button_it]);
 #line 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp1_;
-#line 9290 "SearchFilter.c"
+#line 9299 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp2_ = NULL;
 				guint _tmp3_ = 0U;
@@ -9298,7 +9307,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 979 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 9302 "SearchFilter.c"
+#line 9311 "SearchFilter.c"
 			}
 		}
 	}
@@ -9306,7 +9315,7 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 	_tmp4_ = self->priv->delete_buttons;
 #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_tmp4__length1 = self->priv->delete_buttons_length1;
-#line 9310 "SearchFilter.c"
+#line 9319 "SearchFilter.c"
 	{
 		SearchFilterToolbarSavedSearchPopoverDataButton** button_collection = NULL;
 		gint button_collection_length1 = 0;
@@ -9318,14 +9327,14 @@ static void search_filter_toolbar_saved_search_popover_finalize (SearchFilterToo
 		button_collection_length1 = _tmp4__length1;
 #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		for (button_it = 0; button_it < _tmp4__length1; button_it = button_it + 1) {
-#line 9322 "SearchFilter.c"
+#line 9331 "SearchFilter.c"
 			SearchFilterToolbarSavedSearchPopoverDataButton* _tmp5_ = NULL;
 			SearchFilterToolbarSavedSearchPopoverDataButton* button = NULL;
 #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			_tmp5_ = _g_object_ref0 (button_collection[button_it]);
 #line 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 			button = _tmp5_;
-#line 9329 "SearchFilter.c"
+#line 9338 "SearchFilter.c"
 			{
 				SearchFilterToolbarSavedSearchPopoverDataButton* _tmp6_ = NULL;
 				guint _tmp7_ = 0U;
@@ -9337,7 +9346,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 980 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 				_g_object_unref0 (button);
-#line 9341 "SearchFilter.c"
+#line 9350 "SearchFilter.c"
 			}
 		}
 	}
@@ -9369,7 +9378,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 903 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	_g_object_unref0 (self->priv->add);
-#line 9373 "SearchFilter.c"
+#line 9382 "SearchFilter.c"
 }
 
 
@@ -9394,7 +9403,7 @@ gpointer search_filter_toolbar_saved_search_popover_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	return instance;
-#line 9398 "SearchFilter.c"
+#line 9407 "SearchFilter.c"
 }
 
 
@@ -9407,7 +9416,7 @@ void search_filter_toolbar_saved_search_popover_unref (gpointer instance) {
 		SEARCH_FILTER_TOOLBAR_SAVED_SEARCH_POPOVER_GET_CLASS (self)->finalize (self);
 #line 898 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9411 "SearchFilter.c"
+#line 9420 "SearchFilter.c"
 	}
 }
 
@@ -9419,7 +9428,7 @@ static void search_filter_toolbar_class_init (SearchFilterToolbarClass * klass)
 	g_type_class_add_private (klass, sizeof (SearchFilterToolbarPrivate));
 #line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (klass)->finalize = search_filter_toolbar_finalize;
-#line 9423 "SearchFilter.c"
+#line 9432 "SearchFilter.c"
 }
 
 
@@ -9458,7 +9467,7 @@ static void search_filter_toolbar_instance_init (SearchFilterToolbar * self) {
 	self->priv->elide_showing_again = FALSE;
 #line 1042 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	self->priv->search_filter = NULL;
-#line 9462 "SearchFilter.c"
+#line 9471 "SearchFilter.c"
 }
 
 
@@ -9576,7 +9585,7 @@ static void search_filter_toolbar_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->sepr_rating_saved);
 #line 606 "/home/jens/Source/shotwell/src/SearchFilter.vala"
 	G_OBJECT_CLASS (search_filter_toolbar_parent_class)->finalize (obj);
-#line 9580 "SearchFilter.c"
+#line 9589 "SearchFilter.c"
 }
 
 
diff --git a/src/SearchFilter.vala b/src/SearchFilter.vala
index 137318a..e4c1512 100644
--- a/src/SearchFilter.vala
+++ b/src/SearchFilter.vala
@@ -1059,7 +1059,7 @@ public class SearchFilterToolbar : Gtk.Revealer {
         toolbar.set_icon_size(Gtk.IconSize.SMALL_TOOLBAR);
         
         try {
-            this.builder.add_from_resource ("/org/gnome/Shotwell/search_bar.ui");
+            this.builder.add_from_resource (Resources.get_ui("search_bar.ui"));
         } catch (Error err) {
             AppWindow.panic(_("Error loading search bar UI: %s").printf(
                 err.message));
diff --git a/src/SlideshowPage.c b/src/SlideshowPage.c
index ea177d1..84f1c80 100644
--- a/src/SlideshowPage.c
+++ b/src/SlideshowPage.c
@@ -1108,7 +1108,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1111 "SlideshowPage.c"
-					goto __catch460_g_error;
+					goto __catch461_g_error;
 				}
 #line 225 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 				_tmp7_ = _tmp3_;
@@ -1122,8 +1122,8 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				_g_object_unref0 (_tmp3_);
 #line 1124 "SlideshowPage.c"
 			}
-			goto __finally460;
-			__catch460_g_error:
+			goto __finally461;
+			__catch461_g_error:
 			{
 				GError* err = NULL;
 				Photo* _tmp8_ = NULL;
@@ -1332,7 +1332,7 @@ static gboolean slideshow_page_get_next_photo (SlideshowPage* self, Photo* start
 				continue;
 #line 1334 "SlideshowPage.c"
 			}
-			__finally460:
+			__finally461:
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 223 "/home/jens/Source/shotwell/src/SlideshowPage.vala"
diff --git a/src/Tag.c b/src/Tag.c
index cb70820..9545f23 100644
--- a/src/Tag.c
+++ b/src/Tag.c
@@ -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 __catch469_database_error;
+				goto __catch470_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 __finally469;
-	__catch469_database_error:
+	goto __finally470;
+	__catch470_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -3281,7 +3281,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 		_g_error_free0 (err);
 #line 3283 "Tag.c"
 	}
-	__finally469:
+	__finally470:
 #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 __catch470_database_error;
+								goto __catch471_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 __finally470;
-					__catch470_database_error:
+					goto __finally471;
+					__catch471_database_error:
 					{
 						GError* err = NULL;
 						TagRow* _tmp30_ = NULL;
@@ -3470,7 +3470,7 @@ void tag_init (ProgressMonitor monitor, void* monitor_target) {
 						_g_error_free0 (err);
 #line 3472 "Tag.c"
 					}
-					__finally470:
+					__finally471:
 #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 __catch471_database_error;
+				goto __catch472_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 __finally471;
-	__catch471_database_error:
+	goto __finally472;
+	__catch472_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -4616,7 +4616,7 @@ Tag* tag_for_path (const gchar* name) {
 		_g_error_free0 (err);
 #line 4618 "Tag.c"
 	}
-	__finally471:
+	__finally472:
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 562 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -5532,7 +5532,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 #line 678 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5535 "Tag.c"
-				goto __catch472_database_error;
+				goto __catch473_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 __finally472;
-	__catch472_database_error:
+	goto __finally473;
+	__catch473_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -5566,7 +5566,7 @@ static void tag_set_raw_flat_name (Tag* self, const gchar* name) {
 		return;
 #line 5568 "Tag.c"
 	}
-	__finally472:
+	__finally473:
 #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 __catch473_database_error;
+				goto __catch474_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 __finally473;
-	__catch473_database_error:
+	goto __finally474;
+	__catch474_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp13_ = NULL;
@@ -5712,7 +5712,7 @@ static void tag_set_raw_path (Tag* self, const gchar* path, gboolean suppress_no
 		return;
 #line 5714 "Tag.c"
 	}
-	__finally473:
+	__finally474:
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 699 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -7069,7 +7069,7 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 7072 "Tag.c"
-				goto __catch474_database_error;
+				goto __catch475_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/Tag.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7085,8 +7085,8 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 		_tmp6_->tag_id = _tmp0_;
 #line 7087 "Tag.c"
 	}
-	goto __finally474;
-	__catch474_database_error:
+	goto __finally475;
+	__catch475_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -7102,7 +7102,7 @@ Tag* tag_reconstitute (gint64 object_id, TagRow* row) {
 		_g_error_free0 (err);
 #line 7104 "Tag.c"
 	}
-	__finally474:
+	__finally475:
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9016,7 +9016,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 9019 "Tag.c"
-				goto __catch475_database_error;
+				goto __catch476_database_error;
 			}
 #line 1153 "/home/jens/Source/shotwell/src/Tag.vala"
 			_g_object_unref0 (removed_sources);
@@ -9031,8 +9031,8 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 #line 9032 "Tag.c"
 		}
 	}
-	goto __finally475;
-	__catch475_database_error:
+	goto __finally476;
+	__catch476_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp57_ = NULL;
@@ -9048,7 +9048,7 @@ static void tag_on_media_views_contents_altered (Tag* self, GeeIterable* added,
 		_g_error_free0 (err);
 #line 9050 "Tag.c"
 	}
-	__finally475:
+	__finally476:
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1152 "/home/jens/Source/shotwell/src/Tag.vala"
@@ -9260,7 +9260,7 @@ static void tag_real_destroy (DataSource* base) {
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 9263 "Tag.c"
-				goto __catch476_database_error;
+				goto __catch477_database_error;
 			}
 #line 1194 "/home/jens/Source/shotwell/src/Tag.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9271,8 +9271,8 @@ static void tag_real_destroy (DataSource* base) {
 #line 9272 "Tag.c"
 		}
 	}
-	goto __finally476;
-	__catch476_database_error:
+	goto __finally477;
+	__catch477_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
@@ -9288,7 +9288,7 @@ static void tag_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 9290 "Tag.c"
 	}
-	__finally476:
+	__finally477:
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1193 "/home/jens/Source/shotwell/src/Tag.vala"
diff --git a/src/ThumbnailCache.c b/src/ThumbnailCache.c
index 4e8443f..c65d22e 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 __catch235_g_error;
+			goto __catch236_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 __finally235;
-	__catch235_g_error:
+	goto __finally236;
+	__catch236_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 __finally235;
+			goto __finally236;
 		}
 #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"
 	}
-	__finally235:
+	__finally236:
 #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 __catch236_g_error;
+				goto __catch237_g_error;
 			}
 		}
-		goto __finally236;
-		__catch236_g_error:
+		goto __finally237;
+		__catch237_g_error:
 		{
 			GError* err = NULL;
 			ThumbnailCacheAsyncFetchJob* _tmp14_ = NULL;
@@ -2418,7 +2418,7 @@ static void thumbnail_cache_async_fetch_completion_callback (BackgroundJob* back
 			_g_error_free0 (err);
 #line 2420 "ThumbnailCache.c"
 		}
-		__finally236:
+		__finally237:
 #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 __catch237_g_error;
+			goto __catch238_g_error;
 		}
 	}
-	goto __finally237;
-	__catch237_g_error:
+	goto __finally238;
+	__catch238_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -2802,7 +2802,7 @@ static void _thumbnail_cache_duplicate (ThumbnailCache* self, ThumbnailSource* s
 		_g_error_free0 (err);
 #line 2804 "ThumbnailCache.c"
 	}
-	__finally237:
+	__finally238:
 #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 __catch238_g_error;
+			goto __catch239_g_error;
 		}
 	}
-	goto __finally238;
-	__catch238_g_error:
+	goto __finally239;
+	__catch239_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"
 	}
-	__finally238:
+	__finally239:
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 528 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4079,7 +4079,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4081 "ThumbnailCache.c"
-				goto __catch239_g_error;
+				goto __catch240_g_error;
 			}
 #line 125 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			_tmp6_ = _tmp1_;
@@ -4148,8 +4148,8 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		_g_object_unref0 (_tmp8_);
 #line 4149 "ThumbnailCache.c"
 	}
-	goto __finally239;
-	__catch239_g_error:
+	goto __finally240;
+	__catch240_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp17_ = NULL;
@@ -4168,11 +4168,11 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 #line 137 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4170 "ThumbnailCache.c"
-					goto __catch240_g_error;
+					goto __catch241_g_error;
 				}
 			}
-			goto __finally240;
-			__catch240_g_error:
+			goto __finally241;
+			__catch241_g_error:
 			{
 				GError* generr = NULL;
 				GError* _tmp18_ = NULL;
@@ -4193,7 +4193,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 				_g_error_free0 (generr);
 #line 4194 "ThumbnailCache.c"
 			}
-			__finally240:
+			__finally241:
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 136 "/home/jens/Source/shotwell/src/ThumbnailCache.vala"
@@ -4225,7 +4225,7 @@ static void thumbnail_cache_async_fetch_job_real_execute (BackgroundJob* base) {
 		_g_error_free0 (err);
 #line 4226 "ThumbnailCache.c"
 	}
-	__finally239:
+	__finally240:
 #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 34517c5..2107053 100644
--- a/src/Tombstone.c
+++ b/src/Tombstone.c
@@ -1320,7 +1320,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 1323 "Tombstone.c"
-				goto __catch545_database_error;
+				goto __catch547_database_error;
 			}
 #line 94 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_g_object_unref0 (marker);
@@ -1333,8 +1333,8 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 #line 1334 "Tombstone.c"
 		}
 	}
-	goto __finally545;
-	__catch545_database_error:
+	goto __finally547;
+	__catch547_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -1350,7 +1350,7 @@ void tombstone_source_collection_resurrect_many (TombstoneSourceCollection* self
 		_g_error_free0 (err);
 #line 1352 "Tombstone.c"
 	}
-	__finally545:
+	__finally547:
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 93 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1636,7 +1636,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 1639 "Tombstone.c"
-						goto __catch546_g_error;
+						goto __catch548_g_error;
 					}
 #line 127 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->_tmp22_ = NULL;
@@ -1652,8 +1652,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 					_g_object_unref0 (_data_->_tmp18_);
 #line 1654 "Tombstone.c"
 				}
-				goto __finally546;
-				__catch546_g_error:
+				goto __finally548;
+				__catch548_g_error:
 				{
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 					_data_->err = _data_->_inner_error_;
@@ -1716,7 +1716,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 					_g_error_free0 (_data_->err);
 #line 1717 "Tombstone.c"
 				}
-				__finally546:
+				__finally548:
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 126 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -1818,7 +1818,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				if (_data_->_inner_error_->domain == DATABASE_ERROR) {
 #line 1820 "Tombstone.c"
-					goto __catch547_database_error;
+					goto __catch549_database_error;
 				}
 #line 154 "/home/jens/Source/shotwell/src/Tombstone.vala"
 				_g_object_unref0 (_data_->marker);
@@ -1831,8 +1831,8 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 #line 1831 "Tombstone.c"
 			}
 		}
-		goto __finally547;
-		__catch547_database_error:
+		goto __finally549;
+		__catch549_database_error:
 		{
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			_data_->err2 = _data_->_inner_error_;
@@ -1848,7 +1848,7 @@ static gboolean tombstone_source_collection_async_scan_co (TombstoneSourceCollec
 			_g_error_free0 (_data_->err2);
 #line 1849 "Tombstone.c"
 		}
-		__finally547:
+		__finally549:
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
 		if (G_UNLIKELY (_data_->_inner_error_ != NULL)) {
 #line 153 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -2374,7 +2374,7 @@ void tombstone_init (void) {
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 2376 "Tombstone.c"
-				goto __catch548_database_error;
+				goto __catch550_database_error;
 			}
 #line 211 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			rows = (_vala_array_free (rows, rows_length1, (GDestroyNotify) tombstone_row_unref), NULL);
@@ -2406,8 +2406,8 @@ void tombstone_init (void) {
 		_tmp1_ = (_vala_array_free (_tmp1_, _tmp1__length1, (GDestroyNotify) tombstone_row_unref), NULL);
 #line 2407 "Tombstone.c"
 	}
-	goto __finally548;
-	__catch548_database_error:
+	goto __finally550;
+	__catch550_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp8_ = NULL;
@@ -2423,7 +2423,7 @@ void tombstone_init (void) {
 		_g_error_free0 (err);
 #line 2424 "Tombstone.c"
 	}
-	__finally548:
+	__finally550:
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 210 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3210,7 +3210,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3212 "Tombstone.c"
-				goto __catch549_database_error;
+				goto __catch551_database_error;
 			}
 #line 297 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3221,8 +3221,8 @@ void tombstone_move (Tombstone* self, GFile* file) {
 #line 3221 "Tombstone.c"
 		}
 	}
-	goto __finally549;
-	__catch549_database_error:
+	goto __finally551;
+	__catch551_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -3238,7 +3238,7 @@ void tombstone_move (Tombstone* self, GFile* file) {
 		_g_error_free0 (err);
 #line 3239 "Tombstone.c"
 	}
-	__finally549:
+	__finally551:
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 296 "/home/jens/Source/shotwell/src/Tombstone.vala"
@@ -3457,7 +3457,7 @@ static void tombstone_real_destroy (DataSource* base) {
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 3459 "Tombstone.c"
-				goto __catch550_database_error;
+				goto __catch552_database_error;
 			}
 #line 328 "/home/jens/Source/shotwell/src/Tombstone.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3468,8 +3468,8 @@ static void tombstone_real_destroy (DataSource* base) {
 #line 3468 "Tombstone.c"
 		}
 	}
-	goto __finally550;
-	__catch550_database_error:
+	goto __finally552;
+	__catch552_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -3485,7 +3485,7 @@ static void tombstone_real_destroy (DataSource* base) {
 		_g_error_free0 (err);
 #line 3486 "Tombstone.c"
 	}
-	__finally550:
+	__finally552:
 #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 5a98673..1ebf302 100644
--- a/src/Upgrades.c
+++ b/src/Upgrades.c
@@ -1123,14 +1123,14 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1126 "Upgrades.c"
-			goto __catch591_g_error;
+			goto __catch593_g_error;
 		}
 #line 73 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		self->priv->num_mimics = _tmp0_;
 #line 1131 "Upgrades.c"
 	}
-	goto __finally591;
-	__catch591_g_error:
+	goto __finally593;
+	__catch593_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp3_ = NULL;
@@ -1149,7 +1149,7 @@ static guint64 mimics_removal_task_real_get_step_count (UpgradeTask* base) {
 		_g_error_free0 (e);
 #line 1151 "Upgrades.c"
 	}
-	__finally591:
+	__finally593:
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 72 "/home/jens/Source/shotwell/src/Upgrades.vala"
@@ -1195,7 +1195,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 #line 82 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1198 "Upgrades.c"
-			goto __catch592_g_error;
+			goto __catch594_g_error;
 		}
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		_tmp3_ = self->priv->mimic_dir;
@@ -1204,11 +1204,11 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 #line 83 "/home/jens/Source/shotwell/src/Upgrades.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1207 "Upgrades.c"
-			goto __catch592_g_error;
+			goto __catch594_g_error;
 		}
 	}
-	goto __finally592;
-	__catch592_g_error:
+	goto __finally594;
+	__catch594_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp4_ = NULL;
@@ -1227,7 +1227,7 @@ static void mimics_removal_task_real_execute (UpgradeTask* base, ProgressMonitor
 		_g_error_free0 (e);
 #line 1229 "Upgrades.c"
 	}
-	__finally592:
+	__finally594:
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 81 "/home/jens/Source/shotwell/src/Upgrades.vala"
diff --git a/src/VideoMetadata.c b/src/VideoMetadata.c
index 7228849..f406a1a 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 __catch573_g_error;
+			goto __catch575_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 __catch573_g_error;
+			goto __catch575_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 __catch573_g_error;
+					goto __catch575_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 __catch573_g_error;
+					goto __catch575_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 __finally573;
-	__catch573_g_error:
+	goto __finally575;
+	__catch575_g_error:
 	{
 		GError* e = NULL;
 		GFile* _tmp16_ = NULL;
@@ -865,7 +865,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 866 "VideoMetadata.c"
 	}
-	__finally573:
+	__finally575:
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -887,11 +887,11 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 #line 107 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 889 "VideoMetadata.c"
-			goto __catch574_g_error;
+			goto __catch576_g_error;
 		}
 	}
-	goto __finally574;
-	__catch574_g_error:
+	goto __finally576;
+	__catch576_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp22_ = NULL;
@@ -910,7 +910,7 @@ gboolean quick_time_metadata_loader_is_supported (QuickTimeMetadataLoader* self)
 		_g_error_free0 (e);
 #line 911 "VideoMetadata.c"
 	}
-	__finally574:
+	__finally576:
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -963,7 +963,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 119 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 965 "VideoMetadata.c"
-			goto __catch575_g_error;
+			goto __catch577_g_error;
 		}
 #line 120 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		done = FALSE;
@@ -994,7 +994,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 123 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 996 "VideoMetadata.c"
-				goto __catch575_g_error;
+				goto __catch577_g_error;
 			}
 #line 124 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp5_ = test;
@@ -1058,7 +1058,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 129 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
 #line 1060 "VideoMetadata.c"
-						goto __catch575_g_error;
+						goto __catch577_g_error;
 					}
 #line 130 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 					_tmp16_ = child;
@@ -1114,7 +1114,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 137 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
 #line 1116 "VideoMetadata.c"
-							goto __catch575_g_error;
+							goto __catch577_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_tmp26_ = child;
@@ -1127,7 +1127,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 							_quick_time_atom_unref0 (child);
 #line 1129 "VideoMetadata.c"
-							goto __catch575_g_error;
+							goto __catch577_g_error;
 						}
 #line 139 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						timestamp = _tmp25_ - QUICK_TIME_METADATA_LOADER_QUICKTIME_EPOCH_ADJUSTMENT;
@@ -1146,7 +1146,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 143 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 						_quick_time_atom_unref0 (child);
 #line 1148 "VideoMetadata.c"
-						goto __catch575_g_error;
+						goto __catch577_g_error;
 					}
 				}
 #line 125 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1160,12 +1160,12 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 146 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1162 "VideoMetadata.c"
-				goto __catch575_g_error;
+				goto __catch577_g_error;
 			}
 		}
 	}
-	goto __finally575;
-	__catch575_g_error:
+	goto __finally577;
+	__catch577_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp30_ = NULL;
@@ -1184,7 +1184,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1185 "VideoMetadata.c"
 	}
-	__finally575:
+	__finally577:
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 118 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -1206,11 +1206,11 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 #line 153 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1208 "VideoMetadata.c"
-			goto __catch576_g_error;
+			goto __catch578_g_error;
 		}
 	}
-	goto __finally576;
-	__catch576_g_error:
+	goto __finally578;
+	__catch578_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp33_ = NULL;
@@ -1229,7 +1229,7 @@ static gulong quick_time_metadata_loader_get_creation_date_time_for_quicktime (Q
 		_g_error_free0 (e);
 #line 1230 "VideoMetadata.c"
 	}
-	__finally576:
+	__finally578:
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 152 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2602,7 +2602,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 323 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2604 "VideoMetadata.c"
-			goto __catch577_g_error;
+			goto __catch579_g_error;
 		}
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -2611,7 +2611,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 324 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2613 "VideoMetadata.c"
-			goto __catch577_g_error;
+			goto __catch579_g_error;
 		}
 #line 326 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp5_ = chunk;
@@ -2640,7 +2640,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2642 "VideoMetadata.c"
-				goto __catch577_g_error;
+				goto __catch579_g_error;
 			}
 #line 327 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 			_tmp12_ = _tmp9_;
@@ -2667,8 +2667,8 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 2667 "VideoMetadata.c"
 		}
 	}
-	goto __finally577;
-	__catch577_g_error:
+	goto __finally579;
+	__catch579_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
@@ -2687,7 +2687,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		_g_error_free0 (e);
 #line 2688 "VideoMetadata.c"
 	}
-	__finally577:
+	__finally579:
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 322 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -2709,11 +2709,11 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 #line 335 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2711 "VideoMetadata.c"
-			goto __catch578_g_error;
+			goto __catch580_g_error;
 		}
 	}
-	goto __finally578;
-	__catch578_g_error:
+	goto __finally580;
+	__catch580_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp17_ = NULL;
@@ -2732,7 +2732,7 @@ gboolean avi_metadata_loader_is_supported (AVIMetadataLoader* self) {
 		_g_error_free0 (e);
 #line 2733 "VideoMetadata.c"
 	}
-	__finally578:
+	__finally580:
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 334 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4073,7 +4073,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 515 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4075 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch581_g_error;
 		}
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp3_ = chunk;
@@ -4082,7 +4082,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 516 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4084 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch581_g_error;
 		}
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp4_ = chunk;
@@ -4093,7 +4093,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 517 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4095 "VideoMetadata.c"
-			goto __catch579_g_error;
+			goto __catch581_g_error;
 		}
 #line 518 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		_tmp6_ = sdate;
@@ -4122,8 +4122,8 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_free0 (sdate);
 #line 4123 "VideoMetadata.c"
 	}
-	goto __finally579;
-	__catch579_g_error:
+	goto __finally581;
+	__catch581_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp11_ = NULL;
@@ -4142,7 +4142,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_error_free0 (e);
 #line 4143 "VideoMetadata.c"
 	}
-	__finally579:
+	__finally581:
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 514 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
@@ -4164,11 +4164,11 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 #line 526 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 4166 "VideoMetadata.c"
-			goto __catch580_g_error;
+			goto __catch582_g_error;
 		}
 	}
-	goto __finally580;
-	__catch580_g_error:
+	goto __finally582;
+	__catch582_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp14_ = NULL;
@@ -4187,7 +4187,7 @@ static gulong avi_metadata_loader_get_creation_date_time_for_avi (AVIMetadataLoa
 		_g_error_free0 (e);
 #line 4188 "VideoMetadata.c"
 	}
-	__finally580:
+	__finally582:
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 525 "/home/jens/Source/shotwell/src/VideoMetadata.vala"
diff --git a/src/VideoSupport.c b/src/VideoSupport.c
index 76d8864..d201a2a 100644
--- a/src/VideoSupport.c
+++ b/src/VideoSupport.c
@@ -79,9 +79,9 @@ typedef struct _VideoReader VideoReader;
 typedef struct _VideoReaderClass VideoReaderClass;
 typedef struct _VideoReaderPrivate VideoReaderPrivate;
 #define _g_date_time_unref0(var) ((var == NULL) ? NULL : (var = (g_date_time_unref (var), NULL)))
+#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
 #define TYPE_IMPORT_RESULT (import_result_get_type ())
-#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 #define _video_reader_unref0(var) ((var == NULL) ? NULL : (var = (video_reader_unref (var), NULL)))
 
 #define TYPE_MEDIA_METADATA (media_metadata_get_type ())
@@ -1876,11 +1876,23 @@ VideoReader* video_reader_new (GFile* file) {
 
 gboolean video_reader_is_supported_video_file (GFile* file) {
 	gboolean result = FALSE;
+	gchar* mime_type = NULL;
 	GFile* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
 	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	guchar* _tmp3_ = NULL;
+	guchar* _tmp4_ = NULL;
+	gint _tmp4__length1 = 0;
+	gchar* _tmp5_ = NULL;
+	gchar* _tmp6_ = NULL;
+	gboolean _tmp7_ = FALSE;
+	const gchar* _tmp8_ = NULL;
+	GFile* _tmp22_ = NULL;
+	gchar* _tmp23_ = NULL;
+	gchar* _tmp24_ = NULL;
+	gboolean _tmp25_ = FALSE;
+	gboolean _tmp26_ = FALSE;
+	GError * _inner_error_ = NULL;
 #line 55 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
@@ -1890,16 +1902,164 @@ gboolean video_reader_is_supported_video_file (GFile* file) {
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_tmp3_ = video_reader_is_supported_video_filename (_tmp2_);
+	_tmp3_ = g_new0 (guchar, 0);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	_g_free0 (_tmp2_);
+	_tmp4__length1 = 0;
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	result = _tmp4_;
+	_tmp5_ = g_content_type_guess (_tmp2_, _tmp4_, (gsize) 0, NULL);
 #line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp6_ = _tmp5_;
+#line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp4_ = (g_free (_tmp4_), NULL);
+#line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_free0 (_tmp2_);
+#line 56 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	mime_type = _tmp6_;
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp8_ = mime_type;
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (g_strcmp0 (_tmp8_, "audio/ogg") == 0) {
+#line 1925 "VideoSupport.c"
+		GFile* _tmp9_ = NULL;
+		gboolean _tmp10_ = FALSE;
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp9_ = file;
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp10_ = g_file_has_uri_scheme (_tmp9_, "file");
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp7_ = _tmp10_;
+#line 1934 "VideoSupport.c"
+	} else {
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp7_ = FALSE;
+#line 1938 "VideoSupport.c"
+	}
+#line 58 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	if (_tmp7_) {
+#line 1942 "VideoSupport.c"
+		{
+			GFileInfo* info = NULL;
+			GFile* _tmp11_ = NULL;
+			GFileInfo* _tmp12_ = NULL;
+			gchar* content_type = NULL;
+			GFileInfo* _tmp13_ = NULL;
+			const gchar* _tmp14_ = NULL;
+			gchar* _tmp15_ = NULL;
+			gboolean _tmp16_ = FALSE;
+			const gchar* _tmp17_ = NULL;
+#line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp11_ = file;
+#line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp12_ = g_file_query_info (_tmp11_, G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE, G_FILE_QUERY_INFO_NONE, NULL, &_inner_error_);
+#line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			info = _tmp12_;
+#line 60 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1961 "VideoSupport.c"
+				goto __catch493_g_error;
+			}
+#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp13_ = info;
+#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp14_ = g_file_info_get_content_type (_tmp13_);
+#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp15_ = g_strdup (_tmp14_);
+#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			content_type = _tmp15_;
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp17_ = content_type;
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			if (_tmp17_ != NULL) {
+#line 1976 "VideoSupport.c"
+				const gchar* _tmp18_ = NULL;
+				gboolean _tmp19_ = FALSE;
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp18_ = content_type;
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp19_ = g_str_has_prefix (_tmp18_, "video/");
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp16_ = _tmp19_;
+#line 1985 "VideoSupport.c"
+			} else {
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_tmp16_ = FALSE;
+#line 1989 "VideoSupport.c"
+			}
+#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			if (_tmp16_) {
+#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				result = TRUE;
+#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_g_free0 (content_type);
+#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_g_object_unref0 (info);
+#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				_g_free0 (mime_type);
+#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				return result;
+#line 2003 "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"
+		}
+		goto __finally493;
+		__catch493_g_error:
+		{
+			GError* _error_ = NULL;
+			GError* _tmp20_ = NULL;
+			const gchar* _tmp21_ = NULL;
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_error_ = _inner_error_;
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_inner_error_ = NULL;
+#line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp20_ = _error_;
+#line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_tmp21_ = _tmp20_->message;
+#line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			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"
+		}
+		__finally493:
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			_g_free0 (mime_type);
+#line 59 "/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 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_clear_error (&_inner_error_);
+#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			return FALSE;
+#line 2042 "VideoSupport.c"
+		}
+	}
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp22_ = file;
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp23_ = g_file_get_basename (_tmp22_);
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp24_ = _tmp23_;
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp25_ = video_reader_is_supported_video_filename (_tmp24_);
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_tmp26_ = _tmp25_;
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_free0 (_tmp24_);
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	result = _tmp26_;
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	_g_free0 (mime_type);
+#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 1903 "VideoSupport.c"
+#line 2063 "VideoSupport.c"
 }
 
 
@@ -1932,7 +2092,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1936 "VideoSupport.c"
+#line 2096 "VideoSupport.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1941,13 +2101,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1945 "VideoSupport.c"
+#line 2105 "VideoSupport.c"
 	}
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1951 "VideoSupport.c"
+#line 2111 "VideoSupport.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1956,13 +2116,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1960 "VideoSupport.c"
+#line 2120 "VideoSupport.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1966 "VideoSupport.c"
+#line 2126 "VideoSupport.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1971,11 +2131,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1975 "VideoSupport.c"
+#line 2135 "VideoSupport.c"
 	} else {
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1979 "VideoSupport.c"
+#line 2139 "VideoSupport.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -1983,7 +2143,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1987 "VideoSupport.c"
+#line 2147 "VideoSupport.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1992,11 +2152,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1996 "VideoSupport.c"
+#line 2156 "VideoSupport.c"
 	} else {
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 2000 "VideoSupport.c"
+#line 2160 "VideoSupport.c"
 	}
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -2018,7 +2178,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2022 "VideoSupport.c"
+#line 2182 "VideoSupport.c"
 }
 
 
@@ -2034,167 +2194,175 @@ gboolean video_reader_is_supported_video_filename (const gchar* filename) {
 	const gchar* _tmp5_ = NULL;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (filename != NULL, FALSE);
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = filename;
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_new0 (guchar, 0);
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2__length1 = 0;
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_content_type_guess (_tmp0_, _tmp2_, (gsize) 0, NULL);
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	mime_type = _tmp3_;
-#line 61 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 76 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = (g_free (_tmp2_), NULL);
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = mime_type;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = strlen (_tmp5_);
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = _tmp6_;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ >= 6) {
-#line 2064 "VideoSupport.c"
+#line 2224 "VideoSupport.c"
 		const gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = mime_type;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = string_slice (_tmp8_, (glong) 0, (glong) 6);
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = g_strcmp0 (_tmp10_, "video/") == 0;
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp10_);
-#line 2078 "VideoSupport.c"
+#line 2238 "VideoSupport.c"
 	} else {
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = FALSE;
-#line 2082 "VideoSupport.c"
+#line 2242 "VideoSupport.c"
 	}
-#line 62 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp4_) {
-#line 2086 "VideoSupport.c"
+#line 2246 "VideoSupport.c"
 		gchar* extension = NULL;
 		gchar* name = NULL;
 		const gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		const gchar* _tmp14_ = NULL;
-#line 63 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 78 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		extension = NULL;
-#line 64 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 79 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		name = NULL;
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = filename;
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		disassemble_filename (_tmp11_, &_tmp12_, &_tmp13_);
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (name);
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		name = _tmp12_;
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (extension);
-#line 65 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 80 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		extension = _tmp13_;
-#line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 82 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = extension;
-#line 67 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 82 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp14_ == NULL) {
-#line 68 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = TRUE;
-#line 68 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (name);
-#line 68 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (extension);
-#line 68 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (mime_type);
-#line 68 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 83 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2123 "VideoSupport.c"
+#line 2283 "VideoSupport.c"
 		}
 		{
 			const gchar** s_collection = NULL;
 			gint s_collection_length1 = 0;
 			gint _s_collection_size_ = 0;
 			gint s_it = 0;
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			s_collection = VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS;
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			s_collection_length1 = G_N_ELEMENTS (VIDEO_READER_METADATA_ONLY_FILE_EXTENSIONS);
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/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 2136 "VideoSupport.c"
+#line 2296 "VideoSupport.c"
 				gchar* _tmp15_ = NULL;
 				gchar* s = NULL;
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = g_strdup (s_collection[s_it]);
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				s = _tmp15_;
-#line 2143 "VideoSupport.c"
+#line 2303 "VideoSupport.c"
 				{
 					const gchar* _tmp16_ = NULL;
 					const gchar* _tmp17_ = NULL;
 					gint _tmp18_ = 0;
-#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp16_ = s;
-#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp17_ = extension;
-#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp18_ = utf8_ci_compare (_tmp16_, _tmp17_);
-#line 71 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 86 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_tmp18_ == 0) {
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						result = FALSE;
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_g_free0 (s);
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_g_free0 (name);
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_g_free0 (extension);
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_g_free0 (mime_type);
-#line 72 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						return result;
-#line 2168 "VideoSupport.c"
+#line 2328 "VideoSupport.c"
 					}
-#line 70 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (s);
-#line 2172 "VideoSupport.c"
+#line 2332 "VideoSupport.c"
 				}
 			}
 		}
-#line 75 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = TRUE;
-#line 75 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (name);
-#line 75 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (extension);
-#line 75 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (mime_type);
-#line 75 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 90 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2186 "VideoSupport.c"
+#line 2346 "VideoSupport.c"
 	} else {
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp20_ = NULL;
+#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp19_ = filename;
+#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		_tmp20_ = mime_type;
+#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:92: Skipping %s, unsupported mime type %s", _tmp19_, _tmp20_);
+#line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = FALSE;
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (mime_type);
-#line 77 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 93 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2194 "VideoSupport.c"
+#line 2362 "VideoSupport.c"
 	}
-#line 59 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 74 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (mime_type);
-#line 2198 "VideoSupport.c"
+#line 2366 "VideoSupport.c"
 }
 
 
@@ -2294,288 +2462,288 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 	VideoImportParams* _tmp121_ = NULL;
 	Thumbnails* _tmp122_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 81 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 97 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = params;
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_->file;
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 85 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	file = _tmp2_;
-#line 87 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 103 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	info = NULL;
-#line 2310 "VideoSupport.c"
+#line 2478 "VideoSupport.c"
 	{
 		GFileInfo* _tmp3_ = NULL;
 		GFile* _tmp4_ = NULL;
 		GFileInfo* _tmp5_ = NULL;
 		GFileInfo* _tmp6_ = NULL;
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = file;
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = g_file_query_info (_tmp4_, DIRECTORY_MONITOR_SUPPLIED_ATTRIBUTES, G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS, NULL, &_inner_error_);
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp5_;
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2324 "VideoSupport.c"
-			goto __catch492_g_error;
+#line 2492 "VideoSupport.c"
+			goto __catch494_g_error;
 		}
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp3_;
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = NULL;
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 89 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		info = _tmp6_;
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 2337 "VideoSupport.c"
+#line 2505 "VideoSupport.c"
 	}
-	goto __finally492;
-	__catch492_g_error:
+	goto __finally494;
+	__catch494_g_error:
 	{
 		GError* err = NULL;
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_FILE_ERROR;
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 92 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2357 "VideoSupport.c"
+#line 2525 "VideoSupport.c"
 	}
-	__finally492:
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally494:
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/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 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 88 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 104 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2372 "VideoSupport.c"
+#line 2540 "VideoSupport.c"
 	}
-#line 95 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = info;
-#line 95 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = g_file_info_get_file_type (_tmp7_);
-#line 95 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp8_ != G_FILE_TYPE_REGULAR) {
-#line 96 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_NOT_A_FILE;
-#line 96 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 96 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 96 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2388 "VideoSupport.c"
+#line 2556 "VideoSupport.c"
 	}
-#line 98 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = file;
-#line 98 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = video_reader_is_supported_video_file (_tmp9_);
-#line 98 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp10_) {
-#line 2396 "VideoSupport.c"
+#line 2564 "VideoSupport.c"
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
-#line 99 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = file;
-#line 99 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = g_file_get_path (_tmp11_);
-#line 99 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = _tmp12_;
-#line 99 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_message ("Not importing %s: file is marked as a video file but doesn't have a" "supported extension", _tmp13_);
-#line 99 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp13_);
-#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_UNSUPPORTED_FORMAT;
-#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 2418 "VideoSupport.c"
+#line 2586 "VideoSupport.c"
 	}
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = info;
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp14_, &_tmp15_);
-#line 105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	timestamp = _tmp15_;
-#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = params;
-#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = _tmp16_->md5;
-#line 108 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp17_ != NULL, "params.md5 != null");
-#line 110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = params;
-#line 110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = _tmp18_->exposure_time_override;
-#line 110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exposure_time = _tmp19_;
-#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = g_strdup ("");
-#line 111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	title = _tmp20_;
-#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = g_strdup ("");
-#line 112 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	comment = _tmp21_;
-#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = file;
-#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = video_reader_new (_tmp22_);
-#line 114 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 130 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	reader = _tmp23_;
-#line 115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	is_interpretable = TRUE;
-#line 116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	clip_duration = 0.0;
-#line 117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = reader;
-#line 117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = video_reader_read_preview_frame (_tmp24_);
-#line 117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = _tmp25_;
-#line 2462 "VideoSupport.c"
+#line 2630 "VideoSupport.c"
 	{
 		gdouble _tmp26_ = 0.0;
 		VideoReader* _tmp27_ = NULL;
 		gdouble _tmp28_ = 0.0;
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp27_ = reader;
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp28_ = video_reader_read_clip_duration (_tmp27_, &_inner_error_);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp28_;
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 2477 "VideoSupport.c"
-				goto __catch493_video_error;
+#line 2645 "VideoSupport.c"
+				goto __catch495_video_error;
 			}
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (reader);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (comment);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (title);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (info);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (file);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/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 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 2498 "VideoSupport.c"
+#line 2666 "VideoSupport.c"
 		}
-#line 119 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp26_;
-#line 2502 "VideoSupport.c"
+#line 2670 "VideoSupport.c"
 	}
-	goto __finally493;
-	__catch493_video_error:
+	goto __finally495;
+	__catch495_video_error:
 	{
 		GError* err = NULL;
 		GError* _tmp29_ = NULL;
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp29_ = err;
-#line 121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (g_error_matches (_tmp29_, VIDEO_ERROR, VIDEO_ERROR_FILE)) {
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = IMPORT_RESULT_FILE_ERROR;
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (reader);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (comment);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (title);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (info);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (file);
-#line 122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 2535 "VideoSupport.c"
+#line 2703 "VideoSupport.c"
 		} else {
 			GError* _tmp30_ = NULL;
-#line 123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp30_ = err;
-#line 123 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_error_matches (_tmp30_, VIDEO_ERROR, VIDEO_ERROR_CONTENTS)) {
-#line 124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				is_interpretable = FALSE;
-#line 125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				clip_duration = 0.0;
-#line 2546 "VideoSupport.c"
+#line 2714 "VideoSupport.c"
 			} else {
-#line 127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				g_error ("VideoSupport.vala:127: can't prepare video for import: an unknown kind" \
+#line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				g_error ("VideoSupport.vala:143: can't prepare video for import: an unknown kind" \
 " of video error occurred");
-#line 2550 "VideoSupport.c"
+#line 2718 "VideoSupport.c"
 			}
 		}
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2555 "VideoSupport.c"
+#line 2723 "VideoSupport.c"
 	}
-	__finally493:
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally495:
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (reader);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (comment);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (title);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/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 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 118 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2578 "VideoSupport.c"
+#line 2746 "VideoSupport.c"
 	}
 	{
 		VideoMetadata* metadata = NULL;
@@ -2594,437 +2762,437 @@ ImportResult video_reader_prepare_for_import (VideoImportParams* params) {
 		gchar* _tmp44_ = NULL;
 		const gchar* _tmp45_ = NULL;
 		const gchar* _tmp48_ = NULL;
-#line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp31_ = reader;
-#line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp32_ = video_reader_read_metadata (_tmp31_, &_inner_error_);
-#line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		metadata = _tmp32_;
-#line 132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2605 "VideoSupport.c"
-			goto __catch494_g_error;
+#line 2773 "VideoSupport.c"
+			goto __catch496_g_error;
 		}
-#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = metadata;
-#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp34_ = media_metadata_get_creation_date_time (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		creation_date_time = _tmp34_;
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp36_ = creation_date_time;
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp36_ != NULL) {
-#line 2618 "VideoSupport.c"
+#line 2786 "VideoSupport.c"
 			MetadataDateTime* _tmp37_ = NULL;
 			time_t _tmp38_ = 0;
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp37_ = creation_date_time;
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp38_ = metadata_date_time_get_timestamp (_tmp37_);
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp38_ != ((time_t) 0);
-#line 2627 "VideoSupport.c"
+#line 2795 "VideoSupport.c"
 		} else {
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = FALSE;
-#line 2631 "VideoSupport.c"
+#line 2799 "VideoSupport.c"
 		}
-#line 135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp35_) {
-#line 2635 "VideoSupport.c"
+#line 2803 "VideoSupport.c"
 			MetadataDateTime* _tmp39_ = NULL;
 			time_t _tmp40_ = 0;
-#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp39_ = creation_date_time;
-#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp40_ = metadata_date_time_get_timestamp (_tmp39_);
-#line 136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 152 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			exposure_time = _tmp40_;
-#line 2644 "VideoSupport.c"
+#line 2812 "VideoSupport.c"
 		}
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp41_ = metadata;
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp42_ = media_metadata_get_title (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 138 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_title = _tmp42_;
-#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp43_ = metadata;
-#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp44_ = media_metadata_get_comment (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, TYPE_MEDIA_METADATA, MediaMetadata));
-#line 139 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_comment = _tmp44_;
-#line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp45_ = video_title;
-#line 140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp45_ != NULL) {
-#line 2662 "VideoSupport.c"
+#line 2830 "VideoSupport.c"
 			const gchar* _tmp46_ = NULL;
 			gchar* _tmp47_ = NULL;
-#line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp46_ = video_title;
-#line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp47_ = g_strdup (_tmp46_);
-#line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (title);
-#line 141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			title = _tmp47_;
-#line 2673 "VideoSupport.c"
+#line 2841 "VideoSupport.c"
 		}
-#line 142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp48_ = video_comment;
-#line 142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp48_ != NULL) {
-#line 2679 "VideoSupport.c"
+#line 2847 "VideoSupport.c"
 			const gchar* _tmp49_ = NULL;
 			gchar* _tmp50_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp49_ = video_comment;
-#line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp50_ = g_strdup (_tmp49_);
-#line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (comment);
-#line 143 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			comment = _tmp50_;
-#line 2690 "VideoSupport.c"
+#line 2858 "VideoSupport.c"
 		}
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_comment);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_title);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_metadata_date_time_unref0 (creation_date_time);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 2700 "VideoSupport.c"
+#line 2868 "VideoSupport.c"
 	}
-	goto __finally494;
-	__catch494_g_error:
+	goto __finally496;
+	__catch496_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp51_ = NULL;
 		const gchar* _tmp52_ = NULL;
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp51_ = err;
-#line 145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp52_ = _tmp51_->message;
-#line 145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_warning ("VideoSupport.vala:145: Unable to read video metadata: %s", _tmp52_);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_warning ("VideoSupport.vala:161: Unable to read video metadata: %s", _tmp52_);
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 2720 "VideoSupport.c"
+#line 2888 "VideoSupport.c"
 	}
-	__finally494:
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally496:
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (reader);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (comment);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (title);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (file);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/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 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 131 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 2743 "VideoSupport.c"
+#line 2911 "VideoSupport.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp53_ = exposure_time;
-#line 148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp53_ == ((time_t) 0)) {
-#line 2749 "VideoSupport.c"
+#line 2917 "VideoSupport.c"
 		gint64 _tmp54_ = 0LL;
 		VideoReader* _tmp55_ = NULL;
 		GDateTime* _tmp56_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp55_ = reader;
-#line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp56_ = _tmp55_->priv->_timestamp;
-#line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp56_ != NULL) {
-#line 2759 "VideoSupport.c"
+#line 2927 "VideoSupport.c"
 			VideoReader* _tmp57_ = NULL;
 			GDateTime* _tmp58_ = NULL;
 			gint64 _tmp59_ = 0LL;
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp57_ = reader;
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp58_ = _tmp57_->priv->_timestamp;
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp59_ = g_date_time_to_unix (_tmp58_);
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = _tmp59_;
-#line 2771 "VideoSupport.c"
+#line 2939 "VideoSupport.c"
 		} else {
-#line 151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp54_ = (gint64) 0;
-#line 2775 "VideoSupport.c"
+#line 2943 "VideoSupport.c"
 		}
-#line 150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		exposure_time = (time_t) _tmp54_;
-#line 2779 "VideoSupport.c"
+#line 2947 "VideoSupport.c"
 	}
-#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp60_ = params;
-#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp61_ = _tmp60_->row;
-#line 154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp61_->video_id, VIDEO_ID_INVALID);
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp62_ = params;
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp63_ = _tmp62_->row;
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp64_ = file;
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp65_ = g_file_get_path (_tmp64_);
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp63_->filepath);
-#line 155 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp63_->filepath = _tmp65_;
-#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp66_ = params;
-#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp67_ = _tmp66_->row;
-#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp68_ = info;
-#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp69_ = g_file_info_get_size (_tmp68_);
-#line 156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp67_->filesize = _tmp69_;
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp70_ = params;
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp71_ = _tmp70_->row;
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp72_ = timestamp;
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp73_ = _tmp72_.tv_sec;
-#line 157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp71_->timestamp = (time_t) _tmp73_;
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp74_ = params;
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp75_ = _tmp74_->row;
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp76_ = preview_frame;
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp77_ = gdk_pixbuf_get_width (_tmp76_);
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp78_ = _tmp77_;
-#line 158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp75_->width = _tmp78_;
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp79_ = params;
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp80_ = _tmp79_->row;
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp81_ = preview_frame;
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp82_ = gdk_pixbuf_get_height (_tmp81_);
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp83_ = _tmp82_;
-#line 159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp80_->height = _tmp83_;
-#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp84_ = params;
-#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp85_ = _tmp84_->row;
-#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp86_ = clip_duration;
-#line 160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp85_->clip_duration = _tmp86_;
-#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp87_ = params;
-#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp88_ = _tmp87_->row;
-#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp89_ = is_interpretable;
-#line 161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp88_->is_interpretable = _tmp89_;
-#line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp90_ = params;
-#line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp91_ = _tmp90_->row;
-#line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp92_ = exposure_time;
-#line 162 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp91_->exposure_time = _tmp92_;
-#line 163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp93_ = params;
-#line 163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp94_ = _tmp93_->row;
-#line 163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp95_ = params;
-#line 163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp96_ = _tmp95_->import_id;
-#line 163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp94_->import_id = _tmp96_;
-#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp97_ = params;
-#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp98_ = _tmp97_->row;
-#line 164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	event_id_init (&_tmp98_->event_id, EVENT_ID_INVALID);
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp99_ = params;
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp100_ = _tmp99_->row;
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp101_ = params;
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp102_ = _tmp101_->md5;
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp103_ = g_strdup (_tmp102_);
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp100_->md5);
-#line 165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp100_->md5 = _tmp103_;
-#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp104_ = params;
-#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp105_ = _tmp104_->row;
-#line 166 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 182 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp105_->time_created = (time_t) 0;
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp106_ = params;
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp107_ = _tmp106_->row;
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp108_ = title;
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp109_ = g_strdup (_tmp108_);
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp107_->title);
-#line 167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp107_->title = _tmp109_;
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp110_ = params;
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp111_ = _tmp110_->row;
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp112_ = comment;
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp113_ = g_strdup (_tmp112_);
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp111_->comment);
-#line 168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp111_->comment = _tmp113_;
-#line 169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp114_ = params;
-#line 169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp115_ = _tmp114_->row;
-#line 169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp116_ = g_strdup ("");
-#line 169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp115_->backlinks);
-#line 169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp115_->backlinks = _tmp116_;
-#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp117_ = params;
-#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp118_ = _tmp117_->row;
-#line 170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp118_->time_reimported = (time_t) 0;
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp119_ = params;
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp120_ = _tmp119_->row;
-#line 171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp120_->flags = (guint64) 0;
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp121_ = params;
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp122_ = _tmp121_->thumbnails;
-#line 173 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp122_ != NULL) {
-#line 2955 "VideoSupport.c"
+#line 3123 "VideoSupport.c"
 		VideoImportParams* _tmp123_ = NULL;
 		Thumbnails* _tmp124_ = NULL;
 		VideoImportParams* _tmp125_ = NULL;
 		Thumbnails* _tmp126_ = NULL;
 		GdkPixbuf* _tmp127_ = NULL;
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp123_ = params;
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp124_ = thumbnails_new ();
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_thumbnails_unref0 (_tmp123_->thumbnails);
-#line 174 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp123_->thumbnails = _tmp124_;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp125_ = params;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp126_ = _tmp125_->thumbnails;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp127_ = preview_frame;
-#line 175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		thumbnail_cache_generate_for_video_frame (_tmp126_, _tmp127_);
-#line 2977 "VideoSupport.c"
+#line 3145 "VideoSupport.c"
 	}
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (preview_frame);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (reader);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (comment);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (title);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (info);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (file);
-#line 181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 2995 "VideoSupport.c"
+#line 3163 "VideoSupport.c"
 }
 
 
 static GDate* _g_date_dup (GDate* self) {
 	GDate* dup;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	dup = g_new0 (GDate, 1);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	memcpy (dup, self, sizeof (GDate));
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 3007 "VideoSupport.c"
+#line 3175 "VideoSupport.c"
 }
 
 
 static gpointer __g_date_dup0 (gpointer self) {
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? _g_date_dup (self) : NULL;
-#line 3014 "VideoSupport.c"
+#line 3182 "VideoSupport.c"
 }
 
 
 static void video_reader_read_internal (VideoReader* self, GError** error) {
 	gboolean _tmp0_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 200 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_READER (self));
-#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_reader_does_file_exist (self);
-#line 185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp0_) {
-#line 3027 "VideoSupport.c"
+#line 3195 "VideoSupport.c"
 		GFile* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -3032,41 +3200,41 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		gchar* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
 		GError* _tmp7_ = NULL;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->file;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = g_file_get_path (_tmp1_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = g_strdup_printf ("video file '%s' does not exist or is inaccessible", _tmp3_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_FILE, _tmp5_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = _tmp6_;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp5_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp3_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = _tmp7_;
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_inner_error_->domain == VIDEO_ERROR) {
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3061 "VideoSupport.c"
+#line 3229 "VideoSupport.c"
 		} else {
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/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 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3069 "VideoSupport.c"
+#line 3237 "VideoSupport.c"
 		}
 	}
 	{
@@ -3085,90 +3253,90 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		gboolean _tmp17_ = FALSE;
 		GstDiscovererInfo* _tmp18_ = NULL;
 		GstTagList* _tmp19_ = NULL;
-#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = gst_discoverer_new ((GstClockTime) (GST_SECOND * 5), &_inner_error_);
-#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		d = _tmp8_;
-#line 190 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3094 "VideoSupport.c"
-			goto __catch495_g_error;
+#line 3262 "VideoSupport.c"
+			goto __catch497_g_error;
 		}
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = d;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = self->priv->file;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = g_file_get_uri (_tmp10_);
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = gst_discoverer_discover_uri (_tmp9_, _tmp12_, &_inner_error_);
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = _tmp13_;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp12_);
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		info = _tmp14_;
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (d);
-#line 3117 "VideoSupport.c"
-			goto __catch495_g_error;
+#line 3285 "VideoSupport.c"
+			goto __catch497_g_error;
 		}
-#line 193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = info;
-#line 193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp16_ = gst_discoverer_info_get_duration (_tmp15_);
-#line 193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->clip_duration = ((gdouble) _tmp16_) / 1000000000.0;
-#line 198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_date = NULL;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp18_ = info;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = gst_discoverer_info_get_tags (_tmp18_);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp19_ != NULL) {
-#line 3134 "VideoSupport.c"
+#line 3302 "VideoSupport.c"
 			GstDiscovererInfo* _tmp20_ = NULL;
 			GstTagList* _tmp21_ = NULL;
 			GDate _tmp22_ = {0};
 			gboolean _tmp23_ = FALSE;
 			GDate _tmp24_ = {0};
 			GDate* _tmp25_ = NULL;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp20_ = info;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = gst_discoverer_info_get_tags (_tmp20_);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = gst_tag_list_get_date (_tmp21_, GST_TAG_DATE, &_tmp22_);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (video_date);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp24_ = _tmp22_;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp25_ = __g_date_dup0 (&_tmp24_);
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_date = _tmp25_;
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _tmp23_;
-#line 3157 "VideoSupport.c"
+#line 3325 "VideoSupport.c"
 		} else {
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = FALSE;
-#line 3161 "VideoSupport.c"
+#line 3329 "VideoSupport.c"
 		}
-#line 199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp17_) {
-#line 3165 "VideoSupport.c"
+#line 3333 "VideoSupport.c"
 			GDate* _tmp26_ = NULL;
-#line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp26_ = video_date;
-#line 201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp26_ != NULL) {
-#line 3171 "VideoSupport.c"
+#line 3339 "VideoSupport.c"
 				GDate* _tmp27_ = NULL;
 				GDateYear _tmp28_ = 0U;
 				GDate* _tmp29_ = NULL;
@@ -3177,39 +3345,39 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 				GDateDay _tmp32_ = '\0';
 				GDateTime* _tmp33_ = NULL;
 				GDateTime* _tmp34_ = NULL;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp27_ = video_date;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp28_ = g_date_get_year (_tmp27_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp29_ = video_date;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp30_ = g_date_get_month (_tmp29_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp31_ = video_date;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp32_ = g_date_get_day (_tmp31_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp33_ = g_date_time_new_local ((gint) _tmp28_, (gint) _tmp30_, (gint) _tmp32_, 0, 0, (gdouble) 0);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp34_ = _tmp33_;
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_reader_set_timestamp (self, _tmp34_);
-#line 202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_date_time_unref0 (_tmp34_);
-#line 3200 "VideoSupport.c"
+#line 3368 "VideoSupport.c"
 			}
 		}
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (video_date);
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (info);
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (d);
-#line 3209 "VideoSupport.c"
+#line 3377 "VideoSupport.c"
 	}
-	goto __finally495;
-	__catch495_g_error:
+	goto __finally497;
+	__catch497_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp35_ = NULL;
@@ -3220,55 +3388,55 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 		gchar* _tmp40_ = NULL;
 		GError* _tmp41_ = NULL;
 		GError* _tmp42_ = NULL;
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp35_ = e;
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp36_ = _tmp35_->message;
-#line 207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:207: Video read error: %s", _tmp36_);
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:223: Video read error: %s", _tmp36_);
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp37_ = e;
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp38_ = _tmp37_->message;
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp39_ = g_strdup_printf ("GStreamer couldn't extract clip information: %s", _tmp38_);
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp40_ = _tmp39_;
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp41_ = g_error_new_literal (VIDEO_ERROR, VIDEO_ERROR_CONTENTS, _tmp40_);
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp42_ = _tmp41_;
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp40_);
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = _tmp42_;
-#line 208 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 224 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3251 "VideoSupport.c"
-		goto __finally495;
+#line 3419 "VideoSupport.c"
+		goto __finally497;
 	}
-	__finally495:
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally497:
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_inner_error_->domain == VIDEO_ERROR) {
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_propagate_error (error, _inner_error_);
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3263 "VideoSupport.c"
+#line 3431 "VideoSupport.c"
 		} else {
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/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 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 3271 "VideoSupport.c"
+#line 3439 "VideoSupport.c"
 		}
 	}
 }
@@ -3277,41 +3445,41 @@ static void video_reader_read_internal (VideoReader* self, GError** error) {
 static gboolean video_reader_on_thumbnailer_timer (VideoReader* self) {
 	gboolean result = FALSE;
 	GPid _tmp0_ = 0;
-#line 214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), FALSE);
-#line 215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:215: Thumbnailer timer called");
-#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:231: Thumbnailer timer called");
+#line 232 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->thumbnailer_pid;
-#line 216 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 232 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != ((GPid) 0)) {
-#line 3288 "VideoSupport.c"
+#line 3456 "VideoSupport.c"
 		GPid _tmp1_ = 0;
 		GPid _tmp2_ = 0;
-#line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 233 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->thumbnailer_pid;
-#line 217 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:217: Killing thumbnailer process: %d", (gint) _tmp1_);
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 233 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:233: Killing thumbnailer process: %d", (gint) _tmp1_);
+#line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->thumbnailer_pid;
-#line 218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		kill ((pid_t) _tmp2_, SIGKILL);
-#line 3299 "VideoSupport.c"
+#line 3467 "VideoSupport.c"
 	}
-#line 220 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = FALSE;
-#line 220 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3305 "VideoSupport.c"
+#line 3473 "VideoSupport.c"
 }
 
 
 static gboolean _video_reader_on_thumbnailer_timer_gsource_func (gpointer self) {
 	gboolean result;
 	result = video_reader_on_thumbnailer_timer ((VideoReader*) self);
-#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3314 "VideoSupport.c"
+#line 3482 "VideoSupport.c"
 }
 
 
@@ -3342,137 +3510,137 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 	gint _tmp30_ = 0;
 	GPid _tmp36_ = 0;
 	GError * _inner_error_ = NULL;
-#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
-#line 225 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 241 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (video_file != NULL, NULL);
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = app_dirs_get_thumbnailer_bin ();
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:227: Launching thumbnailer process: %s", _tmp3_);
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:243: Launching thumbnailer process: %s", _tmp3_);
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp3_);
-#line 227 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp1_);
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = app_dirs_get_thumbnailer_bin ();
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = g_file_get_path (_tmp5_);
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_file;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = g_strdup (_tmp7_);
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = g_new0 (gchar*, 2 + 1);
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_[0] = _tmp6_;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_[1] = _tmp8_;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = _tmp9_;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10__length1 = 2;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp5_);
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	argv = _tmp10_;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	argv_length1 = _tmp10__length1;
-#line 228 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_argv_size_ = argv_length1;
-#line 3391 "VideoSupport.c"
+#line 3559 "VideoSupport.c"
 	{
 		gchar** _tmp11_ = NULL;
 		gint _tmp11__length1 = 0;
 		GPid _tmp12_ = 0;
 		gint _tmp13_ = 0;
 		GPid _tmp14_ = 0;
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = argv;
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11__length1 = argv_length1;
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_spawn_async_with_pipes (NULL, _tmp11_, NULL, G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, &_tmp12_, NULL, &_tmp13_, NULL, &_inner_error_);
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->thumbnailer_pid = _tmp12_;
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		child_stdout = _tmp13_;
-#line 231 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3410 "VideoSupport.c"
-			goto __catch496_g_error;
+#line 3578 "VideoSupport.c"
+			goto __catch498_g_error;
 		}
-#line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = self->priv->thumbnailer_pid;
-#line 234 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:234: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
-#line 3417 "VideoSupport.c"
+#line 250 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:250: Spawned thumbnailer, child pid: %d", (gint) _tmp14_);
+#line 3585 "VideoSupport.c"
 	}
-	goto __finally496;
-	__catch496_g_error:
+	goto __finally498;
+	__catch498_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		GPid _tmp17_ = 0;
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = e;
-#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp16_ = _tmp15_->message;
-#line 236 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:236: Error spawning process: %s", _tmp16_);
-#line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:252: Error spawning process: %s", _tmp16_);
+#line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp17_ = self->priv->thumbnailer_pid;
-#line 237 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 253 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp17_ != ((GPid) 0)) {
-#line 3440 "VideoSupport.c"
+#line 3608 "VideoSupport.c"
 			GPid _tmp18_ = 0;
-#line 238 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->thumbnailer_pid;
-#line 238 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 254 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_spawn_close_pid (_tmp18_);
-#line 3446 "VideoSupport.c"
+#line 3614 "VideoSupport.c"
 		}
-#line 239 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 239 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 239 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 239 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 255 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3456 "VideoSupport.c"
+#line 3624 "VideoSupport.c"
 	}
-	__finally496:
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally498:
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/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 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 230 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3469 "VideoSupport.c"
+#line 3637 "VideoSupport.c"
 	}
-#line 243 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_timeout_add_full (G_PRIORITY_DEFAULT, VIDEO_READER_THUMBNAILER_TIMEOUT, _video_reader_on_thumbnailer_timer_gsource_func, video_reader_ref (self), video_reader_unref);
-#line 246 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 262 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	buf = NULL;
-#line 3475 "VideoSupport.c"
+#line 3643 "VideoSupport.c"
 	{
 		GUnixInputStream* unix_input = NULL;
 		gint _tmp19_ = 0;
@@ -3481,141 +3649,141 @@ static GdkPixbuf* video_reader_thumbnailer (VideoReader* self, const gchar* vide
 		GUnixInputStream* _tmp22_ = NULL;
 		GdkPixbuf* _tmp23_ = NULL;
 		GdkPixbuf* _tmp24_ = NULL;
-#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = child_stdout;
-#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = (GUnixInputStream*) g_unix_input_stream_new (_tmp19_, TRUE);
-#line 248 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		unix_input = _tmp20_;
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp22_ = unix_input;
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp23_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp21_ = _tmp23_;
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (unix_input);
-#line 3500 "VideoSupport.c"
-			goto __catch497_g_error;
+#line 3668 "VideoSupport.c"
+			goto __catch499_g_error;
 		}
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = _tmp21_;
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp21_ = NULL;
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 249 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = _tmp24_;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp21_);
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (unix_input);
-#line 3515 "VideoSupport.c"
+#line 3683 "VideoSupport.c"
 	}
-	goto __finally497;
-	__catch497_g_error:
+	goto __finally499;
+	__catch499_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp25_ = NULL;
 		const gchar* _tmp26_ = NULL;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp25_ = e;
-#line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp25_->message;
-#line 251 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:251: Error creating pixbuf: %s", _tmp26_);
-#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:267: Error creating pixbuf: %s", _tmp26_);
+#line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 252 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = NULL;
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 3539 "VideoSupport.c"
+#line 3707 "VideoSupport.c"
 	}
-	__finally497:
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally499:
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/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 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 247 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 263 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3554 "VideoSupport.c"
+#line 3722 "VideoSupport.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 272 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	child_status = 0;
-#line 257 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = self->priv->thumbnailer_pid;
-#line 257 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp29_ = waitpid ((pid_t) _tmp27_, &_tmp28_, 0);
-#line 257 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	child_status = _tmp28_;
-#line 257 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	ret_waitpid = (gint) _tmp29_;
-#line 258 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp30_ = ret_waitpid;
-#line 258 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 274 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp30_ < 0) {
-#line 3570 "VideoSupport.c"
+#line 3738 "VideoSupport.c"
 		gint _tmp31_ = 0;
-#line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp31_ = ret_waitpid;
-#line 259 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_debug ("VideoSupport.vala:259: waitpid returned error code: %d", _tmp31_);
-#line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 275 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_debug ("VideoSupport.vala:275: waitpid returned error code: %d", _tmp31_);
+#line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (buf);
-#line 260 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		buf = NULL;
-#line 3580 "VideoSupport.c"
+#line 3748 "VideoSupport.c"
 	} else {
 		gint _tmp32_ = 0;
 		gint _tmp33_ = 0;
-#line 261 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp32_ = child_status;
-#line 261 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp33_ = WEXITSTATUS (_tmp32_);
-#line 261 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (0 != _tmp33_) {
-#line 3590 "VideoSupport.c"
+#line 3758 "VideoSupport.c"
 			gint _tmp34_ = 0;
 			gint _tmp35_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = child_status;
-#line 262 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = WEXITSTATUS (_tmp34_);
-#line 262 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_debug ("VideoSupport.vala:262: Thumbnailer exited with error code: %d", _tmp35_);
-#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_debug ("VideoSupport.vala:278: Thumbnailer exited with error code: %d", _tmp35_);
+#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (buf);
-#line 264 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			buf = NULL;
-#line 3603 "VideoSupport.c"
+#line 3771 "VideoSupport.c"
 		}
 	}
-#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 283 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp36_ = self->priv->thumbnailer_pid;
-#line 267 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 283 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_spawn_close_pid (_tmp36_);
-#line 268 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->thumbnailer_pid = (GPid) 0;
-#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = buf;
-#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	argv = (_vala_array_free (argv, argv_length1, (GDestroyNotify) g_free), NULL);
-#line 269 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3618 "VideoSupport.c"
+#line 3786 "VideoSupport.c"
 }
 
 
@@ -3626,25 +3794,25 @@ static gboolean video_reader_does_file_exist (VideoReader* self) {
 	gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 272 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), FALSE);
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->file;
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_file_test (_tmp2_, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR);
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp2_);
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 273 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3647 "VideoSupport.c"
+#line 3815 "VideoSupport.c"
 }
 
 
@@ -3659,72 +3827,72 @@ GdkPixbuf* video_reader_read_preview_frame (VideoReader* self) {
 	GdkPixbuf* _tmp8_ = NULL;
 	GdkPixbuf* _tmp10_ = NULL;
 	GdkPixbuf* _tmp11_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 292 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
-#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->preview_frame;
-#line 277 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 3668 "VideoSupport.c"
+#line 3836 "VideoSupport.c"
 		GdkPixbuf* _tmp1_ = NULL;
 		GdkPixbuf* _tmp2_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->preview_frame;
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = _tmp2_;
-#line 278 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 294 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3679 "VideoSupport.c"
+#line 3847 "VideoSupport.c"
 	}
-#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 296 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_does_file_exist (self);
-#line 280 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 296 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp3_) {
-#line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 281 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 3689 "VideoSupport.c"
+#line 3857 "VideoSupport.c"
 	}
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = self->priv->file;
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = g_file_get_path (_tmp4_);
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_reader_thumbnailer (self, _tmp6_);
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->preview_frame);
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->preview_frame = _tmp7_;
-#line 284 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp6_);
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = self->priv->preview_frame;
-#line 285 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 301 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (NULL == _tmp8_) {
-#line 3709 "VideoSupport.c"
+#line 3877 "VideoSupport.c"
 		GdkPixbuf* _tmp9_ = NULL;
-#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = resources_get_noninterpretable_badge_pixbuf ();
-#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (self->priv->preview_frame);
-#line 286 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->preview_frame = _tmp9_;
-#line 3717 "VideoSupport.c"
+#line 3885 "VideoSupport.c"
 	}
-#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = self->priv->preview_frame;
-#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = _g_object_ref0 (_tmp10_);
-#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp11_;
-#line 288 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3727 "VideoSupport.c"
+#line 3895 "VideoSupport.c"
 }
 
 
@@ -3733,41 +3901,41 @@ gdouble video_reader_read_clip_duration (VideoReader* self, GError** error) {
 	gdouble _tmp0_ = 0.0;
 	gdouble _tmp1_ = 0.0;
 	GError * _inner_error_ = NULL;
-#line 291 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 307 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), 0.0);
-#line 292 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 308 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->clip_duration;
-#line 292 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 308 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ == VIDEO_READER_UNKNOWN_CLIP_DURATION) {
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_reader_read_internal (self, &_inner_error_);
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_propagate_error (error, _inner_error_);
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0.0;
-#line 3752 "VideoSupport.c"
+#line 3920 "VideoSupport.c"
 			} else {
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/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 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 293 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 309 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0.0;
-#line 3760 "VideoSupport.c"
+#line 3928 "VideoSupport.c"
 			}
 		}
 	}
-#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = self->priv->clip_duration;
-#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 295 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3770 "VideoSupport.c"
+#line 3938 "VideoSupport.c"
 }
 
 
@@ -3781,43 +3949,43 @@ VideoMetadata* video_reader_read_metadata (VideoReader* self, GError** error) {
 	GFile* _tmp4_ = NULL;
 	GFile* _tmp5_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 298 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_READER (self), NULL);
-#line 299 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 315 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_metadata_new ();
-#line 299 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 315 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	metadata = _tmp0_;
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = self->priv->file;
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_get_path (_tmp1_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = g_file_new_for_path (_tmp3_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (metadata, TYPE_MEDIA_METADATA, MediaMetadata), _tmp5_, &_inner_error_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp5_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp3_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_metadata_unref0 (metadata);
-#line 300 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 3814 "VideoSupport.c"
+#line 3982 "VideoSupport.c"
 	}
-#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 318 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = metadata;
-#line 302 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 318 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3820 "VideoSupport.c"
+#line 3988 "VideoSupport.c"
 }
 
 
@@ -3832,14 +4000,14 @@ GDateTime* video_reader_get_timestamp (VideoReader* self) {
 	result = _tmp0_;
 #line 49 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 3835 "VideoSupport.c"
+#line 4003 "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 3842 "VideoSupport.c"
+#line 4010 "VideoSupport.c"
 }
 
 
@@ -3856,14 +4024,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 3859 "VideoSupport.c"
+#line 4027 "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 3866 "VideoSupport.c"
+#line 4034 "VideoSupport.c"
 }
 
 
@@ -3872,7 +4040,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 3875 "VideoSupport.c"
+#line 4043 "VideoSupport.c"
 	}
 }
 
@@ -3882,11 +4050,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 3885 "VideoSupport.c"
+#line 4053 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3889 "VideoSupport.c"
+#line 4057 "VideoSupport.c"
 	}
 }
 
@@ -3894,37 +4062,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 3897 "VideoSupport.c"
+#line 4065 "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 3904 "VideoSupport.c"
+#line 4072 "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 3911 "VideoSupport.c"
+#line 4079 "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 3915 "VideoSupport.c"
+#line 4083 "VideoSupport.c"
 		}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_reader_ref (object);
-#line 3919 "VideoSupport.c"
+#line 4087 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 3923 "VideoSupport.c"
+#line 4091 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 3927 "VideoSupport.c"
+#line 4095 "VideoSupport.c"
 }
 
 
@@ -3935,25 +4103,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 3938 "VideoSupport.c"
+#line 4106 "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 3944 "VideoSupport.c"
+#line 4112 "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 3948 "VideoSupport.c"
+#line 4116 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_reader_ref (value->data[0].v_pointer);
-#line 3952 "VideoSupport.c"
+#line 4120 "VideoSupport.c"
 	}
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 3956 "VideoSupport.c"
+#line 4124 "VideoSupport.c"
 }
 
 
@@ -3967,7 +4135,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 3970 "VideoSupport.c"
+#line 4138 "VideoSupport.c"
 }
 
 
@@ -3976,7 +4144,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 3979 "VideoSupport.c"
+#line 4147 "VideoSupport.c"
 }
 
 
@@ -3996,17 +4164,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 3999 "VideoSupport.c"
+#line 4167 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4003 "VideoSupport.c"
+#line 4171 "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 4009 "VideoSupport.c"
+#line 4177 "VideoSupport.c"
 	}
 }
 
@@ -4025,17 +4193,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 4028 "VideoSupport.c"
+#line 4196 "VideoSupport.c"
 	} else {
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 4032 "VideoSupport.c"
+#line 4200 "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 4038 "VideoSupport.c"
+#line 4206 "VideoSupport.c"
 	}
 }
 
@@ -4047,7 +4215,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 4050 "VideoSupport.c"
+#line 4218 "VideoSupport.c"
 }
 
 
@@ -4066,7 +4234,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 4069 "VideoSupport.c"
+#line 4237 "VideoSupport.c"
 }
 
 
@@ -4082,7 +4250,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 4085 "VideoSupport.c"
+#line 4253 "VideoSupport.c"
 }
 
 
@@ -4107,7 +4275,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 4110 "VideoSupport.c"
+#line 4278 "VideoSupport.c"
 }
 
 
@@ -4120,15 +4288,15 @@ void video_reader_unref (gpointer instance) {
 		VIDEO_READER_GET_CLASS (self)->finalize (self);
 #line 38 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4123 "VideoSupport.c"
+#line 4291 "VideoSupport.c"
 	}
 }
 
 
 static gpointer _video_row_ref0 (gpointer self) {
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self ? video_row_ref (self) : NULL;
-#line 4131 "VideoSupport.c"
+#line 4299 "VideoSupport.c"
 }
 
 
@@ -4143,76 +4311,76 @@ Video* video_construct (GType object_type, VideoRow* row) {
 	gboolean _tmp6_ = FALSE;
 	VideoRow* _tmp7_ = NULL;
 	guint64 _tmp8_ = 0ULL;
-#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_ROW (row), NULL);
-#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (Video*) video_source_construct (object_type);
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = row;
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _video_row_ref0 (_tmp0_);
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->priv->backing_row);
-#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->backing_row = _tmp1_;
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->backing_row;
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->priv->backing_row;
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_->title;
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = media_source_prep_title (_tmp4_);
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp2_->title);
-#line 353 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 369 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_->title = _tmp5_;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = row;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_->flags;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if ((_tmp8_ & VIDEO_FLAG_TRASH) != ((guint64) 0)) {
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = TRUE;
-#line 4178 "VideoSupport.c"
+#line 4346 "VideoSupport.c"
 	} else {
 		VideoRow* _tmp9_ = NULL;
 		guint64 _tmp10_ = 0ULL;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = row;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_->flags;
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = (_tmp10_ & VIDEO_FLAG_OFFLINE) != ((guint64) 0);
-#line 4188 "VideoSupport.c"
+#line 4356 "VideoSupport.c"
 	}
-#line 355 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp6_) {
-#line 4192 "VideoSupport.c"
+#line 4360 "VideoSupport.c"
 		VideoSourceCollection* _tmp11_ = NULL;
 		VideoRow* _tmp12_ = NULL;
 		const gchar* _tmp13_ = NULL;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = video_global;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = row;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = _tmp12_->backlinks;
-#line 356 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 372 "/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 4204 "VideoSupport.c"
+#line 4372 "VideoSupport.c"
 	}
-#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 4208 "VideoSupport.c"
+#line 4376 "VideoSupport.c"
 }
 
 
 Video* video_new (VideoRow* row) {
-#line 349 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_construct (TYPE_VIDEO, row);
-#line 4215 "VideoSupport.c"
+#line 4383 "VideoSupport.c"
 }
 
 
@@ -4262,168 +4430,168 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 	GeeArrayList* _tmp63_ = NULL;
 	GeeCollection* _tmp64_ = NULL;
 	GeeCollection* _tmp65_ = NULL;
-#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_interpreter_state_changed = FALSE;
-#line 364 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_current_state = -1;
-#line 365 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 381 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_normal_regen_complete = FALSE;
-#line 366 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 382 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_offline_regen_complete = FALSE;
-#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 386 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	args = NULL;
-#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 386 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	args_length1 = 0;
-#line 370 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 386 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_args_size_ = args_length1;
-#line 371 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 387 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	gst_init (&args_length1, &args);
-#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 389 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = gst_registry_get ();
-#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 389 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 373 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 389 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	registry = _tmp1_;
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = config_facade_get_instance ();
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = configuration_facade_get_video_interpreter_state_cookie (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp3_);
-#line 374 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	saved_state = _tmp5_;
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = registry;
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = gst_registry_get_feature_list_cookie (_tmp6_);
-#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 391 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_current_state = (gint) _tmp7_;
-#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = saved_state;
-#line 376 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp8_ == CONFIG_FACADE_NO_VIDEO_INTERPRETER_STATE) {
-#line 377 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_message ("VideoSupport.vala:377: interpreter state cookie not found; assuming al" \
+#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_message ("VideoSupport.vala:393: interpreter state cookie not found; assuming al" \
 "l video thumbnails are out of date");
-#line 378 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 394 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = TRUE;
-#line 4313 "VideoSupport.c"
+#line 4481 "VideoSupport.c"
 	} else {
 		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = saved_state;
-#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = video_current_state;
-#line 379 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 395 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp9_ != _tmp10_) {
-#line 380 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_message ("VideoSupport.vala:380: interpreter state has changed; video thumbnails" \
+#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_message ("VideoSupport.vala:396: interpreter state has changed; video thumbnails" \
 " may be out of date");
-#line 381 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 397 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_interpreter_state_changed = TRUE;
-#line 4327 "VideoSupport.c"
+#line 4495 "VideoSupport.c"
 		}
 	}
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = registry;
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = gst_registry_find_feature (_tmp11_, "vaapidecodebin", gst_element_factory_get_type ());
-#line 390 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	feature = _tmp12_;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = feature;
-#line 392 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_ != NULL) {
-#line 4340 "VideoSupport.c"
+#line 4508 "VideoSupport.c"
 		GstRegistry* _tmp14_ = NULL;
 		GstPluginFeature* _tmp15_ = NULL;
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = registry;
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = feature;
-#line 393 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gst_registry_remove_feature (_tmp14_, _tmp15_);
-#line 4349 "VideoSupport.c"
+#line 4517 "VideoSupport.c"
 	}
-#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = registry;
-#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = gst_registry_find_feature (_tmp16_, "vaapidecode", gst_element_factory_get_type ());
-#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (feature);
-#line 396 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	feature = _tmp17_;
-#line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 414 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = feature;
-#line 398 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 414 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp18_ != NULL) {
-#line 4363 "VideoSupport.c"
+#line 4531 "VideoSupport.c"
 		GstRegistry* _tmp19_ = NULL;
 		GstPluginFeature* _tmp20_ = NULL;
-#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = registry;
-#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = feature;
-#line 399 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gst_registry_remove_feature (_tmp19_, _tmp20_);
-#line 4372 "VideoSupport.c"
+#line 4540 "VideoSupport.c"
 	}
-#line 402 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = video_source_collection_new ();
-#line 402 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_data_collection_unref0 (video_global);
-#line 402 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_global = _tmp21_;
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = video_table_get_instance ();
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = _tmp22_;
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = video_table_get_all (_tmp23_);
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = _tmp24_;
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp23_);
-#line 404 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	all = _tmp25_;
-#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 405 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 421 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	all_videos = _tmp26_;
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 406 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	trashed_videos = _tmp27_;
-#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp28_ = gee_array_list_new (TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 407 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	offline_videos = _tmp28_;
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp29_ = all;
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp30_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp31_ = _tmp30_;
-#line 408 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 424 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	count = _tmp31_;
-#line 4412 "VideoSupport.c"
+#line 4580 "VideoSupport.c"
 	{
 		gint ctr = 0;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		ctr = 0;
-#line 4417 "VideoSupport.c"
+#line 4585 "VideoSupport.c"
 		{
 			gboolean _tmp32_ = FALSE;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp32_ = TRUE;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4424 "VideoSupport.c"
+#line 4592 "VideoSupport.c"
 				gint _tmp34_ = 0;
 				gint _tmp35_ = 0;
 				Video* video = NULL;
@@ -4438,180 +4606,180 @@ void video_init (ProgressMonitor monitor, void* monitor_target) {
 				gboolean _tmp45_ = FALSE;
 				ProgressMonitor _tmp54_ = NULL;
 				void* _tmp54__target = NULL;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp32_) {
-#line 4441 "VideoSupport.c"
+#line 4609 "VideoSupport.c"
 					gint _tmp33_ = 0;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp33_ = ctr;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					ctr = _tmp33_ + 1;
-#line 4447 "VideoSupport.c"
+#line 4615 "VideoSupport.c"
 				}
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp32_ = FALSE;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp34_ = ctr;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp35_ = count;
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!(_tmp34_ < _tmp35_)) {
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4459 "VideoSupport.c"
+#line 4627 "VideoSupport.c"
 				}
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp36_ = all;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp37_ = ctr;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/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 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp39_ = (VideoRow*) _tmp38_;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp40_ = video_new (_tmp39_);
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp41_ = _tmp40_;
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_video_row_unref0 (_tmp39_);
-#line 410 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp41_;
-#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp42_ = video_interpreter_state_changed;
-#line 412 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp42_) {
-#line 4481 "VideoSupport.c"
+#line 4649 "VideoSupport.c"
 					Video* _tmp43_ = NULL;
-#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp43_ = video;
-#line 413 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 429 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					video_set_is_interpretable (_tmp43_, FALSE);
-#line 4487 "VideoSupport.c"
+#line 4655 "VideoSupport.c"
 				}
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp44_ = video;
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp45_ = media_source_is_trashed (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 415 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 431 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp45_) {
-#line 4495 "VideoSupport.c"
+#line 4663 "VideoSupport.c"
 					GeeArrayList* _tmp46_ = NULL;
 					Video* _tmp47_ = NULL;
-#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp46_ = trashed_videos;
-#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp47_ = video;
-#line 416 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp47_);
-#line 4504 "VideoSupport.c"
+#line 4672 "VideoSupport.c"
 				} else {
 					Video* _tmp48_ = NULL;
 					gboolean _tmp49_ = FALSE;
-#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp48_ = video;
-#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp49_ = media_source_is_offline (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 417 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 433 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_tmp49_) {
-#line 4514 "VideoSupport.c"
+#line 4682 "VideoSupport.c"
 						GeeArrayList* _tmp50_ = NULL;
 						Video* _tmp51_ = NULL;
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp50_ = offline_videos;
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp51_ = video;
-#line 418 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 434 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp51_);
-#line 4523 "VideoSupport.c"
+#line 4691 "VideoSupport.c"
 					} else {
 						GeeArrayList* _tmp52_ = NULL;
 						Video* _tmp53_ = NULL;
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp52_ = all_videos;
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp53_ = video;
-#line 420 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp53_);
-#line 4533 "VideoSupport.c"
+#line 4701 "VideoSupport.c"
 					}
 				}
-#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp54_ = monitor;
-#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp54__target = monitor_target;
-#line 422 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 438 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp54_ != NULL) {
-#line 4542 "VideoSupport.c"
+#line 4710 "VideoSupport.c"
 					ProgressMonitor _tmp55_ = NULL;
 					void* _tmp55__target = NULL;
 					gint _tmp56_ = 0;
 					gint _tmp57_ = 0;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55_ = monitor;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55__target = monitor_target;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp56_ = ctr;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp57_ = count;
-#line 423 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp55_ ((guint64) _tmp56_, (guint64) _tmp57_, TRUE, _tmp55__target);
-#line 4557 "VideoSupport.c"
+#line 4725 "VideoSupport.c"
 				}
-#line 409 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 425 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 4561 "VideoSupport.c"
+#line 4729 "VideoSupport.c"
 			}
 		}
 	}
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp58_ = video_global;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp59_ = trashed_videos;
-#line 426 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 442 "/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 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp60_ = video_global;
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp61_ = offline_videos;
-#line 427 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 443 "/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 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp62_ = video_global;
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp63_ = all_videos;
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/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 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp65_ = _tmp64_;
-#line 428 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 444 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp65_);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (offline_videos);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (trashed_videos);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (all_videos);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (all);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (feature);
-#line 359 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 375 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (registry);
-#line 4599 "VideoSupport.c"
+#line 4767 "VideoSupport.c"
 }
 
 
 gboolean video_has_interpreter_state_changed (void) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 432 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 4612 "VideoSupport.c"
+#line 4780 "VideoSupport.c"
 }
 
 
@@ -4619,39 +4787,39 @@ void video_notify_normal_thumbs_regenerated (void) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 452 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_normal_regen_complete;
-#line 436 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 452 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 437 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4626 "VideoSupport.c"
+#line 4794 "VideoSupport.c"
 	}
-#line 439 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:439: normal video thumbnail regeneration completed");
-#line 441 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 455 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:455: normal video thumbnail regeneration completed");
+#line 457 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_normal_regen_complete = TRUE;
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4636 "VideoSupport.c"
+#line 4804 "VideoSupport.c"
 		gboolean _tmp3_ = FALSE;
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4642 "VideoSupport.c"
+#line 4810 "VideoSupport.c"
 	} else {
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4646 "VideoSupport.c"
+#line 4814 "VideoSupport.c"
 	}
-#line 442 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
-#line 443 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4652 "VideoSupport.c"
+#line 4820 "VideoSupport.c"
 	}
 }
 
@@ -4660,69 +4828,69 @@ void video_notify_offline_thumbs_regenerated (void) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 447 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 463 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_offline_regen_complete;
-#line 447 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 463 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 448 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 464 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 4667 "VideoSupport.c"
+#line 4835 "VideoSupport.c"
 	}
-#line 450 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_message ("VideoSupport.vala:450: offline video thumbnail regeneration completed");
-#line 452 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 466 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_message ("VideoSupport.vala:466: offline video thumbnail regeneration completed");
+#line 468 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_offline_regen_complete = TRUE;
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_normal_regen_complete;
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 4677 "VideoSupport.c"
+#line 4845 "VideoSupport.c"
 		gboolean _tmp3_ = FALSE;
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_offline_regen_complete;
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp3_;
-#line 4683 "VideoSupport.c"
+#line 4851 "VideoSupport.c"
 	} else {
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 4687 "VideoSupport.c"
+#line 4855 "VideoSupport.c"
 	}
-#line 453 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_) {
-#line 454 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 470 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_save_interpreter_state ();
-#line 4693 "VideoSupport.c"
+#line 4861 "VideoSupport.c"
 	}
 }
 
 
 static void video_save_interpreter_state (void) {
 	gboolean _tmp0_ = FALSE;
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 474 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpreter_state_changed;
-#line 458 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 474 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 4704 "VideoSupport.c"
+#line 4872 "VideoSupport.c"
 		ConfigFacade* _tmp1_ = NULL;
 		ConfigFacade* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
-#line 459 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_message ("VideoSupport.vala:459: saving video interpreter state to configuration" \
+#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_message ("VideoSupport.vala:475: saving video interpreter state to configuration" \
 " system");
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = config_facade_get_instance ();
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_current_state;
-#line 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/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 461 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 477 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp2_);
-#line 462 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpreter_state_changed = FALSE;
-#line 4722 "VideoSupport.c"
+#line 4890 "VideoSupport.c"
 	}
 }
 
@@ -4757,27 +4925,27 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 	ExporterCompletionCallback _tmp51_ = NULL;
 	void* _tmp51__target = NULL;
 	GError * _inner_error_ = NULL;
-#line 469 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (GEE_IS_COLLECTION (videos), NULL);
-#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = videos;
-#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = gee_collection_get_size (_tmp0_);
-#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 471 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_ == 0) {
-#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 472 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 488 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4771 "VideoSupport.c"
+#line 4939 "VideoSupport.c"
 	}
-#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = export_in_place;
-#line 475 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_) {
-#line 4777 "VideoSupport.c"
+#line 4945 "VideoSupport.c"
 		ExporterUI* temp_exporter = NULL;
 		GeeCollection* _tmp4_ = NULL;
 		Scaling _tmp5_ = {0};
@@ -4789,47 +4957,47 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		ExporterUI* _tmp11_ = NULL;
 		ExporterCompletionCallback _tmp12_ = NULL;
 		void* _tmp12__target = NULL;
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = videos;
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		scaling_for_original (&_tmp5_);
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		export_format_parameters_unmodified (&_tmp6_);
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = exporter_new_for_temp_file (_tmp4_, &_tmp5_, &_tmp6_);
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = _tmp7_;
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = exporter_ui_new (_tmp8_);
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp8_);
-#line 476 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		temp_exporter = _tmp10_;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = temp_exporter;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = done;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12__target = done_target;
-#line 478 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		exporter_ui_export (_tmp11_, _tmp12_, _tmp12__target);
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = temp_exporter;
-#line 479 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 4819 "VideoSupport.c"
+#line 4987 "VideoSupport.c"
 	}
-#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = videos;
-#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp14_ = gee_collection_get_size (_tmp13_);
-#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp15_ = _tmp14_;
-#line 483 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp15_ == 1) {
-#line 4829 "VideoSupport.c"
+#line 4997 "VideoSupport.c"
 		Video* video = NULL;
 		GFile* save_as = NULL;
 		Video* _tmp24_ = NULL;
@@ -4838,22 +5006,22 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 		GFile* _tmp27_ = NULL;
 		GFile* _tmp28_ = NULL;
 		GFile* _tmp29_ = NULL;
-#line 484 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video = NULL;
-#line 4840 "VideoSupport.c"
+#line 5008 "VideoSupport.c"
 		{
 			GeeIterator* _v_it = NULL;
 			GeeCollection* _tmp16_ = NULL;
 			GeeIterator* _tmp17_ = NULL;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = videos;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_v_it = _tmp17_;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 4853 "VideoSupport.c"
+#line 5021 "VideoSupport.c"
 				GeeIterator* _tmp18_ = NULL;
 				gboolean _tmp19_ = FALSE;
 				Video* v = NULL;
@@ -4861,67 +5029,67 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 				gpointer _tmp21_ = NULL;
 				Video* _tmp22_ = NULL;
 				Video* _tmp23_ = NULL;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _v_it;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_next (_tmp18_);
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp19_) {
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 4869 "VideoSupport.c"
+#line 5037 "VideoSupport.c"
 				}
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = _v_it;
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = gee_iterator_get (_tmp20_);
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				v = (Video*) _tmp21_;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = v;
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = _g_object_ref0 (_tmp22_);
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 486 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 502 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp23_;
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (v);
-#line 487 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 4889 "VideoSupport.c"
+#line 5057 "VideoSupport.c"
 			}
-#line 485 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 501 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_v_it);
-#line 4893 "VideoSupport.c"
+#line 5061 "VideoSupport.c"
 		}
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp24_ = video;
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp25_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp26_ = _tmp25_;
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp27_ = export_ui_choose_file (_tmp26_);
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp28_ = _tmp27_;
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp26_);
-#line 490 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 506 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		save_as = _tmp28_;
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp29_ = save_as;
-#line 491 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp29_ == NULL) {
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = NULL;
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 492 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 4921 "VideoSupport.c"
+#line 5089 "VideoSupport.c"
 		}
 		{
 			AppWindow* _tmp30_ = NULL;
@@ -4930,270 +5098,270 @@ ExporterUI* video_export_many (GeeCollection* videos, ExporterCompletionCallback
 			GFile* _tmp33_ = NULL;
 			AppWindow* _tmp34_ = NULL;
 			AppWindow* _tmp35_ = NULL;
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp30_ = app_window_get_instance ();
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp31_ = _tmp30_;
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PAGE_WINDOW, PageWindow));
-#line 495 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp31_);
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp32_ = video;
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp33_ = save_as;
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_export (_tmp32_, _tmp33_, &_inner_error_);
-#line 496 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 512 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 4946 "VideoSupport.c"
-				goto __catch498_g_error;
+#line 5114 "VideoSupport.c"
+				goto __catch500_g_error;
 			}
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp34_ = app_window_get_instance ();
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp35_ = _tmp34_;
-#line 497 "/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 (_tmp35_, TYPE_PAGE_WINDOW, PageWindow));
-#line 497 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp35_);
-#line 4957 "VideoSupport.c"
+#line 5125 "VideoSupport.c"
 		}
-		goto __finally498;
-		__catch498_g_error:
+		goto __finally500;
+		__catch500_g_error:
 		{
 			GError* err = NULL;
 			AppWindow* _tmp36_ = NULL;
 			AppWindow* _tmp37_ = NULL;
 			GFile* _tmp38_ = NULL;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			err = _inner_error_;
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp36_ = app_window_get_instance ();
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp37_ = _tmp36_;
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, TYPE_PAGE_WINDOW, PageWindow));
-#line 499 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp37_);
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp38_ = save_as;
-#line 500 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 516 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			export_error_dialog (_tmp38_, FALSE);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 4984 "VideoSupport.c"
+#line 5152 "VideoSupport.c"
 		}
-		__finally498:
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		__finally500:
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (save_as);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/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 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 494 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 510 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 4999 "VideoSupport.c"
+#line 5167 "VideoSupport.c"
 		}
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (save_as);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (video);
-#line 503 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5009 "VideoSupport.c"
+#line 5177 "VideoSupport.c"
 	}
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp39_ = _ ("Export Videos");
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp40_ = export_ui_choose_dir (_tmp39_);
-#line 507 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 523 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	export_dir = _tmp40_;
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp41_ = export_dir;
-#line 508 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 524 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp41_ == NULL) {
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = NULL;
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (export_dir);
-#line 509 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5027 "VideoSupport.c"
+#line 5195 "VideoSupport.c"
 	}
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp42_ = videos;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp43_ = export_dir;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	scaling_for_original (&_tmp44_);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	export_format_parameters_unmodified (&_tmp45_);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp46_ = exporter_new (_tmp42_, _tmp43_, &_tmp44_, &_tmp45_, FALSE);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp47_ = _tmp46_;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp48_ = exporter_ui_new (_tmp47_);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp49_ = _tmp48_;
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp47_);
-#line 511 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 527 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exporter = _tmp49_;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp50_ = exporter;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp51_ = done;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp51__target = done_target;
-#line 513 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	exporter_ui_export (_tmp50_, _tmp51_, _tmp51__target);
-#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = exporter;
-#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (export_dir);
-#line 515 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5063 "VideoSupport.c"
+#line 5231 "VideoSupport.c"
 }
 
 
 static void video_real_commit_backlinks (DataSource* base, SourceCollection* sources, const gchar* backlinks) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 518 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 518 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((sources == NULL) || IS_SOURCE_COLLECTION (sources));
-#line 5074 "VideoSupport.c"
+#line 5242 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_ = NULL;
 		VideoTable* _tmp1_ = NULL;
 		VideoID _tmp2_ = {0};
 		const gchar* _tmp3_ = NULL;
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp2_);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = backlinks;
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_backlinks (_tmp1_, &_tmp2_, _tmp3_, &_inner_error_);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5096 "VideoSupport.c"
-				goto __catch499_database_error;
+#line 5264 "VideoSupport.c"
+				goto __catch501_database_error;
 			}
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/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 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 520 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5105 "VideoSupport.c"
+#line 5273 "VideoSupport.c"
 		}
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5113 "VideoSupport.c"
+#line 5281 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_ = NULL;
 				const gchar* _tmp6_ = NULL;
 				gchar* _tmp7_ = NULL;
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = backlinks;
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = g_strdup (_tmp6_);
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp5_->backlinks);
-#line 522 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 538 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_->backlinks = _tmp7_;
-#line 5128 "VideoSupport.c"
+#line 5296 "VideoSupport.c"
 			}
-			__finally500:
+			__finally502:
 			{
 				VideoRow* _tmp8_ = NULL;
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5137 "VideoSupport.c"
+#line 5305 "VideoSupport.c"
 			}
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5143 "VideoSupport.c"
-					goto __catch499_database_error;
+#line 5311 "VideoSupport.c"
+					goto __catch501_database_error;
 				}
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 521 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 537 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 5152 "VideoSupport.c"
+#line 5320 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally499;
-	__catch499_database_error:
+	goto __finally501;
+	__catch501_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		GError* _tmp11_ = NULL;
 		const gchar* _tmp12_ = NULL;
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = _tmp9_;
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = err;
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_->message;
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_warning ("VideoSupport.vala:525: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
-#line 525 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_warning ("VideoSupport.vala:541: Unable to update link state for %s: %s", _tmp10_, _tmp12_);
+#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp10_);
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5182 "VideoSupport.c"
+#line 5350 "VideoSupport.c"
 	}
-	__finally499:
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally501:
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/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 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 519 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 535 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5193 "VideoSupport.c"
+#line 5361 "VideoSupport.c"
 	}
 }
 
@@ -5202,18 +5370,18 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 	Video * self;
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 529 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 545 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, FALSE);
-#line 5206 "VideoSupport.c"
+#line 5374 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5213 "VideoSupport.c"
+#line 5381 "VideoSupport.c"
 		{
 			gboolean committed = FALSE;
 			VideoTable* _tmp1_ = NULL;
@@ -5224,70 +5392,70 @@ static gboolean video_real_set_event_id (MediaSource* base, EventID* event_id) {
 			gboolean _tmp6_ = FALSE;
 			gboolean _tmp7_ = FALSE;
 			gboolean _tmp8_ = FALSE;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = video_table_get_instance ();
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->video_id;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = *event_id;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = video_table_set_event (_tmp2_, &_tmp4_, &_tmp5_);
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_;
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_database_table_unref0 (_tmp2_);
-#line 531 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 547 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			committed = _tmp7_;
-#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 549 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = committed;
-#line 533 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 549 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp8_) {
-#line 5246 "VideoSupport.c"
+#line 5414 "VideoSupport.c"
 				VideoRow* _tmp9_ = NULL;
 				EventID _tmp10_ = {0};
-#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = *event_id;
-#line 534 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_->event_id = _tmp10_;
-#line 5255 "VideoSupport.c"
+#line 5423 "VideoSupport.c"
 			}
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 552 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = committed;
-#line 5259 "VideoSupport.c"
+#line 5427 "VideoSupport.c"
 			{
 				VideoRow* _tmp11_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = self->priv->backing_row;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5266 "VideoSupport.c"
+#line 5434 "VideoSupport.c"
 			}
-#line 536 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 552 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5270 "VideoSupport.c"
+#line 5438 "VideoSupport.c"
 		}
-		__finally501:
+		__finally503:
 		{
 			VideoRow* _tmp12_ = NULL;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5279 "VideoSupport.c"
+#line 5447 "VideoSupport.c"
 		}
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/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 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 530 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 546 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 5287 "VideoSupport.c"
+#line 5455 "VideoSupport.c"
 	}
 }
 
@@ -5302,44 +5470,44 @@ gboolean video_is_duplicate (GFile* file, const gchar* full_md5) {
 	const gchar* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp8_ = FALSE;
-#line 540 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 556 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((file == NULL) || G_IS_FILE (file), FALSE);
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = file;
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = TRUE;
-#line 5310 "VideoSupport.c"
+#line 5478 "VideoSupport.c"
 	} else {
 		const gchar* _tmp2_ = NULL;
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = full_md5;
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_ != NULL;
-#line 5317 "VideoSupport.c"
+#line 5485 "VideoSupport.c"
 	}
-#line 541 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp0_, "file != null || full_md5 != null");
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_instance ();
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = full_md5;
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video_table_has_duplicate (_tmp4_, _tmp5_, _tmp6_);
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_;
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp4_);
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp8_;
-#line 543 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 559 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5339 "VideoSupport.c"
+#line 5507 "VideoSupport.c"
 }
 
 
@@ -5350,13 +5518,13 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 	VideoRow* _tmp9_ = NULL;
 	Video* _tmp10_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 549 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 565 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_IMPORT_PARAMS (params), 0);
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 566 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 550 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 566 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = NULL;
-#line 5356 "VideoSupport.c"
+#line 5524 "VideoSupport.c"
 	{
 		VideoID _tmp0_ = {0};
 		VideoTable* _tmp1_ = NULL;
@@ -5366,188 +5534,188 @@ ImportResult video_import_create (VideoImportParams* params, Video** video) {
 		VideoID _tmp5_ = {0};
 		VideoID _tmp6_ = {0};
 		gboolean _tmp7_ = FALSE;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = params;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_->row;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_add (_tmp2_, _tmp4_, &_tmp5_, &_inner_error_);
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp5_;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp6_;
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5386 "VideoSupport.c"
-				goto __catch502_database_error;
+#line 5554 "VideoSupport.c"
+				goto __catch504_database_error;
 			}
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/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 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0;
-#line 5395 "VideoSupport.c"
+#line 5563 "VideoSupport.c"
 		}
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_id_is_invalid (&_tmp0_);
-#line 554 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (_tmp7_) {
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = IMPORT_RESULT_DATABASE_ERROR;
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (video) {
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*video = _vala_video;
-#line 5407 "VideoSupport.c"
+#line 5575 "VideoSupport.c"
 			} else {
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_vala_video);
-#line 5411 "VideoSupport.c"
+#line 5579 "VideoSupport.c"
 			}
-#line 555 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 571 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5415 "VideoSupport.c"
+#line 5583 "VideoSupport.c"
 		}
 	}
-	goto __finally502;
-	__catch502_database_error:
+	goto __finally504;
+	__catch504_database_error:
 	{
 		GError* err = NULL;
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = IMPORT_RESULT_DATABASE_ERROR;
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (video) {
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*video = _vala_video;
-#line 5434 "VideoSupport.c"
+#line 5602 "VideoSupport.c"
 		} else {
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_vala_video);
-#line 5438 "VideoSupport.c"
+#line 5606 "VideoSupport.c"
 		}
-#line 557 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 573 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 5442 "VideoSupport.c"
+#line 5610 "VideoSupport.c"
 	}
-	__finally502:
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally504:
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/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 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 553 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 569 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 5453 "VideoSupport.c"
+#line 5621 "VideoSupport.c"
 	}
-#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = params;
-#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_->row;
-#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = video_new (_tmp9_);
-#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_vala_video);
-#line 561 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_video = _tmp10_;
-#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = IMPORT_RESULT_SUCCESS;
-#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (video) {
-#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*video = _vala_video;
-#line 5471 "VideoSupport.c"
+#line 5639 "VideoSupport.c"
 	} else {
-#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_vala_video);
-#line 5475 "VideoSupport.c"
+#line 5643 "VideoSupport.c"
 	}
-#line 563 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 579 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5479 "VideoSupport.c"
+#line 5647 "VideoSupport.c"
 }
 
 
 void video_import_failed (Video* video) {
 	GError * _inner_error_ = NULL;
-#line 566 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 582 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 5487 "VideoSupport.c"
+#line 5655 "VideoSupport.c"
 	{
 		VideoTable* _tmp0_ = NULL;
 		VideoTable* _tmp1_ = NULL;
 		Video* _tmp2_ = NULL;
 		VideoID _tmp3_ = {0};
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = video_table_get_instance ();
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video;
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (_tmp2_, &_tmp3_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp1_, &_tmp3_, &_inner_error_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp1_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 5509 "VideoSupport.c"
-				goto __catch503_database_error;
+#line 5677 "VideoSupport.c"
+				goto __catch505_database_error;
 			}
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/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 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 568 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5518 "VideoSupport.c"
+#line 5686 "VideoSupport.c"
 		}
 	}
-	goto __finally503;
-	__catch503_database_error:
+	goto __finally505;
+	__catch505_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = err;
-#line 570 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 586 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp4_);
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 5536 "VideoSupport.c"
+#line 5704 "VideoSupport.c"
 	}
-	__finally503:
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally505:
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/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 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 567 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 583 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5547 "VideoSupport.c"
+#line 5715 "VideoSupport.c"
 	}
 }
 
@@ -5562,24 +5730,24 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 	BackingFileState** _tmp13_ = NULL;
 	gint _tmp13__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 574 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_new0 (BackingFileState*, 1 + 1);
-#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing = _tmp0_;
-#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_length1 = 1;
-#line 575 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 591 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_backing_size_ = backing_length1;
-#line 5572 "VideoSupport.c"
+#line 5740 "VideoSupport.c"
 	{
 		VideoRow* _tmp1_ = NULL;
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->priv->backing_row;
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5579 "VideoSupport.c"
+#line 5747 "VideoSupport.c"
 		{
 			VideoRow* _tmp2_ = NULL;
 			const gchar* _tmp3_ = NULL;
@@ -5591,69 +5759,69 @@ static BackingFileState** video_real_get_backing_files_state (MediaSource* base,
 			const gchar* _tmp9_ = NULL;
 			BackingFileState* _tmp10_ = NULL;
 			BackingFileState* _tmp11_ = NULL;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_->filepath;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_->filesize;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->timestamp;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->priv->backing_row;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_->md5;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = backing_file_state_new (_tmp3_, _tmp5_, _tmp7_, _tmp9_);
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_backing_file_state_unref0 (backing[0]);
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing[0] = _tmp10_;
-#line 577 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 593 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = backing[0];
-#line 5615 "VideoSupport.c"
+#line 5783 "VideoSupport.c"
 		}
-		__finally504:
+		__finally506:
 		{
 			VideoRow* _tmp12_ = NULL;
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = self->priv->backing_row;
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5624 "VideoSupport.c"
+#line 5792 "VideoSupport.c"
 		}
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			backing = (_vala_array_free (backing, backing_length1, (GDestroyNotify) backing_file_state_unref), NULL);
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/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 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 576 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 592 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 5636 "VideoSupport.c"
+#line 5804 "VideoSupport.c"
 		}
 	}
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = backing;
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13__length1 = backing_length1;
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (result_length1) {
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*result_length1 = _tmp13__length1;
-#line 5647 "VideoSupport.c"
+#line 5815 "VideoSupport.c"
 	}
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp13_;
-#line 581 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5653 "VideoSupport.c"
+#line 5821 "VideoSupport.c"
 }
 
 
@@ -5665,33 +5833,33 @@ static GdkPixbuf* video_real_get_thumbnail (ThumbnailSource* base, gint scale, G
 	GdkPixbuf* _tmp2_ = NULL;
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 584 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 600 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scale;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/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 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp2_;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5679 "VideoSupport.c"
+#line 5847 "VideoSupport.c"
 	}
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp0_;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp0_);
-#line 585 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5691 "VideoSupport.c"
+#line 5859 "VideoSupport.c"
 }
 
 
@@ -5699,57 +5867,57 @@ static gchar* video_real_get_master_md5 (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 588 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5701 "VideoSupport.c"
+#line 5869 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5708 "VideoSupport.c"
+#line 5876 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->md5;
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 5721 "VideoSupport.c"
+#line 5889 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5728 "VideoSupport.c"
+#line 5896 "VideoSupport.c"
 			}
-#line 590 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 606 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 5732 "VideoSupport.c"
+#line 5900 "VideoSupport.c"
 		}
-		__finally505:
+		__finally507:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5741 "VideoSupport.c"
+#line 5909 "VideoSupport.c"
 		}
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/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 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 589 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 605 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5749 "VideoSupport.c"
+#line 5917 "VideoSupport.c"
 	}
 }
 
@@ -5761,31 +5929,31 @@ static GdkPixbuf* video_real_get_preview_pixbuf (MediaSource* base, Scaling* sca
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 610 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 594 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 610 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (scaling != NULL, NULL);
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/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 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	pixbuf = _tmp0_;
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 595 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 5775 "VideoSupport.c"
+#line 5943 "VideoSupport.c"
 	}
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = scaling_perform_on_pixbuf (scaling, pixbuf, GDK_INTERP_NEAREST, TRUE);
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (pixbuf);
-#line 597 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 613 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5785 "VideoSupport.c"
+#line 5953 "VideoSupport.c"
 }
 
 
@@ -5802,69 +5970,69 @@ static GdkPixbuf* video_real_create_thumbnail (ThumbnailSource* base, gint scale
 	GdkPixbuf* _tmp5_ = NULL;
 	GdkPixbuf* _tmp6_ = NULL;
 	GdkPixbuf* _tmp7_ = NULL;
-#line 600 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_reader_new (_tmp1_);
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp1_);
-#line 601 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	reader = _tmp3_;
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = reader;
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_preview_frame (_tmp4_);
-#line 602 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 618 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	frame = _tmp5_;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = frame;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 5826 "VideoSupport.c"
+#line 5994 "VideoSupport.c"
 		GdkPixbuf* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = frame;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _g_object_ref0 (_tmp8_);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp9_;
-#line 5837 "VideoSupport.c"
+#line 6005 "VideoSupport.c"
 	} else {
 		GdkPixbuf* _tmp10_ = NULL;
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = resources_get_noninterpretable_badge_pixbuf ();
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = _tmp10_;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = gdk_pixbuf_copy (_tmp11_);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp6_);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = _tmp12_;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp11_);
-#line 5854 "VideoSupport.c"
+#line 6022 "VideoSupport.c"
 	}
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp6_;
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (frame);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (reader);
-#line 604 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 620 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5864 "VideoSupport.c"
+#line 6032 "VideoSupport.c"
 }
 
 
@@ -5872,15 +6040,15 @@ static gchar* video_real_get_typename (DataSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 607 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 623 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 608 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 624 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5880 "VideoSupport.c"
+#line 6048 "VideoSupport.c"
 }
 
 
@@ -5889,71 +6057,71 @@ static gint64 video_real_get_instance_id (DataSource* base) {
 	gint64 result = 0LL;
 	VideoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
-#line 611 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 612 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 628 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5899 "VideoSupport.c"
+#line 6067 "VideoSupport.c"
 }
 
 
 static void video_real_get_import_id (MediaSource* base, ImportID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 615 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5908 "VideoSupport.c"
+#line 6076 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5915 "VideoSupport.c"
+#line 6083 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			ImportID _tmp2_ = {0};
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->import_id;
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 5925 "VideoSupport.c"
+#line 6093 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5932 "VideoSupport.c"
+#line 6100 "VideoSupport.c"
 			}
-#line 617 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 633 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 5936 "VideoSupport.c"
+#line 6104 "VideoSupport.c"
 		}
-		__finally506:
+		__finally508:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 5945 "VideoSupport.c"
+#line 6113 "VideoSupport.c"
 		}
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/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 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 616 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 5953 "VideoSupport.c"
+#line 6121 "VideoSupport.c"
 	}
 }
 
@@ -5962,15 +6130,15 @@ static PhotoFileFormat video_real_get_preferred_thumbnail_format (ThumbnailSourc
 	Video * self;
 	PhotoFileFormat result = 0;
 	PhotoFileFormat _tmp0_ = 0;
-#line 621 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 637 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = photo_file_format_get_system_default_format ();
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 622 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 5970 "VideoSupport.c"
+#line 6138 "VideoSupport.c"
 }
 
 
@@ -5978,57 +6146,57 @@ static gchar* video_real_get_title (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 625 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 5980 "VideoSupport.c"
+#line 6148 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 5987 "VideoSupport.c"
+#line 6155 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->title;
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6000 "VideoSupport.c"
+#line 6168 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6007 "VideoSupport.c"
+#line 6175 "VideoSupport.c"
 			}
-#line 627 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 643 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6011 "VideoSupport.c"
+#line 6179 "VideoSupport.c"
 		}
-		__finally507:
+		__finally509:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6020 "VideoSupport.c"
+#line 6188 "VideoSupport.c"
 		}
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/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 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 626 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6028 "VideoSupport.c"
+#line 6196 "VideoSupport.c"
 	}
 }
 
@@ -6041,22 +6209,22 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 	Alteration* _tmp20_ = NULL;
 	Alteration* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = title;
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 632 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 648 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_title = _tmp1_;
-#line 6049 "VideoSupport.c"
+#line 6217 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6056 "VideoSupport.c"
+#line 6224 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
@@ -6064,28 +6232,28 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 			VideoRow* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->title;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_title;
-#line 635 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 651 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 6072 "VideoSupport.c"
+#line 6240 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6079 "VideoSupport.c"
+#line 6247 "VideoSupport.c"
 				}
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 636 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6085 "VideoSupport.c"
+#line 6253 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_ = NULL;
@@ -6093,143 +6261,143 @@ static void video_real_set_title (MediaSource* base, const gchar* title) {
 				VideoRow* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				const gchar* _tmp11_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_title;
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_title (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6111 "VideoSupport.c"
-						goto __catch509_database_error;
+#line 6279 "VideoSupport.c"
+						goto __catch511_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6120 "VideoSupport.c"
+#line 6288 "VideoSupport.c"
 					}
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_title);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 639 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 655 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6130 "VideoSupport.c"
+#line 6298 "VideoSupport.c"
 				}
 			}
-			goto __finally509;
-			__catch509_database_error:
+			goto __finally511;
+			__catch511_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 657 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 641 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 657 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6148 "VideoSupport.c"
+#line 6316 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6155 "VideoSupport.c"
+#line 6323 "VideoSupport.c"
 				}
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 642 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6161 "VideoSupport.c"
+#line 6329 "VideoSupport.c"
 			}
-			__finally509:
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally511:
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6166 "VideoSupport.c"
+#line 6334 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6173 "VideoSupport.c"
+#line 6341 "VideoSupport.c"
 				}
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_title);
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/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 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 638 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6183 "VideoSupport.c"
+#line 6351 "VideoSupport.c"
 			}
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = new_title;
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp16_->title);
-#line 646 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->title = _tmp18_;
-#line 6195 "VideoSupport.c"
+#line 6363 "VideoSupport.c"
 		}
-		__finally508:
+		__finally510:
 		{
 			VideoRow* _tmp19_ = NULL;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = self->priv->backing_row;
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6204 "VideoSupport.c"
+#line 6372 "VideoSupport.c"
 		}
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_title);
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/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 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 634 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 650 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6216 "VideoSupport.c"
+#line 6384 "VideoSupport.c"
 		}
 	}
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = alteration_new ("metadata", "name");
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = _tmp20_;
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 649 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp21_);
-#line 631 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 647 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_title);
-#line 6229 "VideoSupport.c"
+#line 6397 "VideoSupport.c"
 }
 
 
@@ -6237,57 +6405,57 @@ static gchar* video_real_get_comment (MediaSource* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 652 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6239 "VideoSupport.c"
+#line 6407 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6246 "VideoSupport.c"
+#line 6414 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->comment;
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 6259 "VideoSupport.c"
+#line 6427 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6266 "VideoSupport.c"
+#line 6434 "VideoSupport.c"
 			}
-#line 654 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 670 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6270 "VideoSupport.c"
+#line 6438 "VideoSupport.c"
 		}
-		__finally510:
+		__finally512:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6279 "VideoSupport.c"
+#line 6447 "VideoSupport.c"
 		}
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/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 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 653 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 6287 "VideoSupport.c"
+#line 6455 "VideoSupport.c"
 	}
 }
 
@@ -6301,22 +6469,22 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 	Alteration* _tmp20_ = NULL;
 	Alteration* _tmp21_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 658 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 674 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = comment;
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_prep_title (_tmp0_);
-#line 659 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 675 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_comment = _tmp1_;
-#line 6309 "VideoSupport.c"
+#line 6477 "VideoSupport.c"
 	{
 		VideoRow* _tmp2_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6316 "VideoSupport.c"
+#line 6484 "VideoSupport.c"
 		{
 			VideoRow* _tmp3_ = NULL;
 			const gchar* _tmp4_ = NULL;
@@ -6324,30 +6492,30 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 			VideoRow* _tmp16_ = NULL;
 			const gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->comment;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = new_comment;
-#line 662 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = TRUE;
-#line 6334 "VideoSupport.c"
+#line 6502 "VideoSupport.c"
 				{
 					VideoRow* _tmp6_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp6_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6341 "VideoSupport.c"
+#line 6509 "VideoSupport.c"
 				}
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 663 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 679 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6347 "VideoSupport.c"
+#line 6515 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp7_ = NULL;
@@ -6355,149 +6523,149 @@ static gboolean video_real_set_comment (MediaSource* base, const gchar* comment)
 				VideoRow* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				const gchar* _tmp11_ = NULL;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = video_table_get_instance ();
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->backing_row;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = _tmp9_->video_id;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = new_comment;
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_comment (_tmp8_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp8_);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6373 "VideoSupport.c"
-						goto __catch512_database_error;
+#line 6541 "VideoSupport.c"
+						goto __catch514_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6382 "VideoSupport.c"
+#line 6550 "VideoSupport.c"
 					}
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_comment);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 666 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return FALSE;
-#line 6392 "VideoSupport.c"
+#line 6560 "VideoSupport.c"
 				}
 			}
-			goto __finally512;
-			__catch512_database_error:
+			goto __finally514;
+			__catch514_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 668 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = FALSE;
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6412 "VideoSupport.c"
+#line 6580 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6419 "VideoSupport.c"
+#line 6587 "VideoSupport.c"
 				}
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 669 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 685 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 6425 "VideoSupport.c"
+#line 6593 "VideoSupport.c"
 			}
-			__finally512:
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally514:
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6430 "VideoSupport.c"
+#line 6598 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6437 "VideoSupport.c"
+#line 6605 "VideoSupport.c"
 				}
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_comment);
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/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 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 665 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 681 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return FALSE;
-#line 6447 "VideoSupport.c"
+#line 6615 "VideoSupport.c"
 			}
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = new_comment;
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = g_strdup (_tmp17_);
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp16_->comment);
-#line 673 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->comment = _tmp18_;
-#line 6459 "VideoSupport.c"
+#line 6627 "VideoSupport.c"
 		}
-		__finally511:
+		__finally513:
 		{
 			VideoRow* _tmp19_ = NULL;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = self->priv->backing_row;
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6468 "VideoSupport.c"
+#line 6636 "VideoSupport.c"
 		}
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (new_comment);
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/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 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 661 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 677 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return FALSE;
-#line 6480 "VideoSupport.c"
+#line 6648 "VideoSupport.c"
 		}
 	}
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = alteration_new ("metadata", "comment");
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = _tmp20_;
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp21_);
-#line 676 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 692 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp21_);
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = TRUE;
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_comment);
-#line 678 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6497 "VideoSupport.c"
+#line 6665 "VideoSupport.c"
 }
 
 
@@ -6505,54 +6673,54 @@ static Rating video_real_get_rating (MediaSource* base) {
 	Video * self;
 	Rating result = 0;
 	GError * _inner_error_ = NULL;
-#line 682 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 698 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6507 "VideoSupport.c"
+#line 6675 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6514 "VideoSupport.c"
+#line 6682 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 6524 "VideoSupport.c"
+#line 6692 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6531 "VideoSupport.c"
+#line 6699 "VideoSupport.c"
 			}
-#line 684 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 700 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 6535 "VideoSupport.c"
+#line 6703 "VideoSupport.c"
 		}
-		__finally513:
+		__finally515:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6544 "VideoSupport.c"
+#line 6712 "VideoSupport.c"
 		}
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/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 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 683 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 699 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 6552 "VideoSupport.c"
+#line 6720 "VideoSupport.c"
 	}
 }
 
@@ -6562,234 +6730,234 @@ static void video_real_set_rating (MediaSource* base, Rating rating) {
 	Alteration* _tmp19_ = NULL;
 	Alteration* _tmp20_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 688 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6564 "VideoSupport.c"
+#line 6732 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6571 "VideoSupport.c"
+#line 6739 "VideoSupport.c"
 		{
 			gboolean _tmp1_ = FALSE;
 			Rating _tmp2_ = 0;
 			gboolean _tmp3_ = FALSE;
 			VideoRow* _tmp16_ = NULL;
 			Rating _tmp17_ = 0;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = rating;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_is_valid (_tmp2_);
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp3_) {
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = TRUE;
-#line 6586 "VideoSupport.c"
+#line 6754 "VideoSupport.c"
 			} else {
 				Rating _tmp4_ = 0;
 				VideoRow* _tmp5_ = NULL;
 				Rating _tmp6_ = 0;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = rating;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_->rating;
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = _tmp4_ == _tmp6_;
-#line 6599 "VideoSupport.c"
+#line 6767 "VideoSupport.c"
 			}
-#line 690 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 706 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp1_) {
-#line 6603 "VideoSupport.c"
+#line 6771 "VideoSupport.c"
 				{
 					VideoRow* _tmp7_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp7_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6610 "VideoSupport.c"
+#line 6778 "VideoSupport.c"
 				}
-#line 691 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6614 "VideoSupport.c"
+#line 6782 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp8_ = NULL;
 				VideoTable* _tmp9_ = NULL;
 				VideoID _tmp10_ = {0};
 				Rating _tmp11_ = 0;
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp10_);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = rating;
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_rating (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 6637 "VideoSupport.c"
-						goto __catch515_database_error;
+#line 6805 "VideoSupport.c"
+						goto __catch517_database_error;
 					}
 					{
 						VideoRow* _tmp12_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp12_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6646 "VideoSupport.c"
+#line 6814 "VideoSupport.c"
 					}
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 694 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 710 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 6654 "VideoSupport.c"
+#line 6822 "VideoSupport.c"
 				}
 			}
-			goto __finally515;
-			__catch515_database_error:
+			goto __finally517;
+			__catch517_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp13_ = NULL;
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 696 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 712 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = e;
-#line 696 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 712 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp13_);
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 6672 "VideoSupport.c"
+#line 6840 "VideoSupport.c"
 				{
 					VideoRow* _tmp14_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp14_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6679 "VideoSupport.c"
+#line 6847 "VideoSupport.c"
 				}
-#line 697 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6683 "VideoSupport.c"
+#line 6851 "VideoSupport.c"
 			}
-			__finally515:
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally517:
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6688 "VideoSupport.c"
+#line 6856 "VideoSupport.c"
 				{
 					VideoRow* _tmp15_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp15_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6695 "VideoSupport.c"
+#line 6863 "VideoSupport.c"
 				}
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/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 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 693 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 6703 "VideoSupport.c"
+#line 6871 "VideoSupport.c"
 			}
-#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = self->priv->backing_row;
-#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = rating;
-#line 701 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 717 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_->rating = _tmp17_;
-#line 6711 "VideoSupport.c"
+#line 6879 "VideoSupport.c"
 		}
-		__finally514:
+		__finally516:
 		{
 			VideoRow* _tmp18_ = NULL;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = self->priv->backing_row;
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6720 "VideoSupport.c"
+#line 6888 "VideoSupport.c"
 		}
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/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 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 689 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 705 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6730 "VideoSupport.c"
+#line 6898 "VideoSupport.c"
 		}
 	}
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "rating");
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 704 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 6741 "VideoSupport.c"
+#line 6909 "VideoSupport.c"
 }
 
 
 static void video_real_increase_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 707 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6750 "VideoSupport.c"
+#line 6918 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6757 "VideoSupport.c"
+#line 6925 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_increase (_tmp2_);
-#line 709 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 725 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6770 "VideoSupport.c"
+#line 6938 "VideoSupport.c"
 		}
-		__finally516:
+		__finally518:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6779 "VideoSupport.c"
+#line 6947 "VideoSupport.c"
 		}
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/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 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 708 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6789 "VideoSupport.c"
+#line 6957 "VideoSupport.c"
 		}
 	}
 }
@@ -6798,48 +6966,48 @@ static void video_real_increase_rating (MediaSource* base) {
 static void video_real_decrease_rating (MediaSource* base) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 713 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 729 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 6800 "VideoSupport.c"
+#line 6968 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 6807 "VideoSupport.c"
+#line 6975 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			Rating _tmp2_ = 0;
 			Rating _tmp3_ = 0;
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->rating;
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = rating_decrease (_tmp2_);
-#line 715 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media_source_set_rating (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource), _tmp3_);
-#line 6820 "VideoSupport.c"
+#line 6988 "VideoSupport.c"
 		}
-		__finally517:
+		__finally519:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 6829 "VideoSupport.c"
+#line 6997 "VideoSupport.c"
 		}
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/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 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 714 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 730 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 6839 "VideoSupport.c"
+#line 7007 "VideoSupport.c"
 		}
 	}
 }
@@ -6849,15 +7017,15 @@ static gboolean video_real_is_trashed (MediaSource* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 719 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_TRASH);
-#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 720 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 736 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6857 "VideoSupport.c"
+#line 7025 "VideoSupport.c"
 }
 
 
@@ -6865,25 +7033,25 @@ static gboolean video_real_is_offline (Monitorable* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 723 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 739 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_OFFLINE);
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 724 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 740 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6873 "VideoSupport.c"
+#line 7041 "VideoSupport.c"
 }
 
 
 static void video_real_mark_offline (Monitorable* base) {
 	Video * self;
-#line 727 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 743 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 728 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 744 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 6883 "VideoSupport.c"
+#line 7051 "VideoSupport.c"
 }
 
 
@@ -6891,61 +7059,61 @@ static void video_real_mark_online (Monitorable* base) {
 	Video * self;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-#line 731 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 732 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 748 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_OFFLINE, NULL);
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_get_is_interpretable (self);
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!_tmp1_) {
-#line 6899 "VideoSupport.c"
+#line 7067 "VideoSupport.c"
 		gboolean _tmp2_ = FALSE;
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = video_has_interpreter_state_changed ();
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = _tmp2_;
-#line 6905 "VideoSupport.c"
+#line 7073 "VideoSupport.c"
 	} else {
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = FALSE;
-#line 6909 "VideoSupport.c"
+#line 7077 "VideoSupport.c"
 	}
-#line 734 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 6913 "VideoSupport.c"
+#line 7081 "VideoSupport.c"
 		VideoInterpretableResults* _tmp3_ = NULL;
 		VideoInterpretableResults* _tmp4_ = NULL;
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_check_is_interpretable (self);
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = _tmp3_;
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_foreground_finish (_tmp4_);
-#line 735 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (_tmp4_);
-#line 6924 "VideoSupport.c"
+#line 7092 "VideoSupport.c"
 	}
 }
 
 
 static void video_real_trash (MediaSource* base) {
 	Video * self;
-#line 738 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 739 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 6935 "VideoSupport.c"
+#line 7103 "VideoSupport.c"
 }
 
 
 static void video_real_untrash (MediaSource* base) {
 	Video * self;
-#line 742 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 758 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 743 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_TRASH, NULL);
-#line 6945 "VideoSupport.c"
+#line 7113 "VideoSupport.c"
 }
 
 
@@ -6953,15 +7121,15 @@ static gboolean video_real_is_flagged (Flaggable* base) {
 	Video * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 746 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 762 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 763 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_is_flag_set (self, VIDEO_FLAG_FLAGGED);
-#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 763 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 747 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 763 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 6961 "VideoSupport.c"
+#line 7129 "VideoSupport.c"
 }
 
 
@@ -6969,17 +7137,17 @@ static void video_real_mark_flagged (Flaggable* base) {
 	Video * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 750 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_add_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 751 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 767 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 6979 "VideoSupport.c"
+#line 7147 "VideoSupport.c"
 }
 
 
@@ -6987,71 +7155,71 @@ static void video_real_mark_unflagged (Flaggable* base) {
 	Video * self;
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 770 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flagged");
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_remove_flags (self, VIDEO_FLAG_FLAGGED, _tmp1_);
-#line 755 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp1_);
-#line 6997 "VideoSupport.c"
+#line 7165 "VideoSupport.c"
 }
 
 
 static void video_real_get_event_id (MediaSource* base, EventID* result) {
 	Video * self;
 	GError * _inner_error_ = NULL;
-#line 758 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 774 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7006 "VideoSupport.c"
+#line 7174 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7013 "VideoSupport.c"
+#line 7181 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			EventID _tmp2_ = {0};
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->event_id;
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7023 "VideoSupport.c"
+#line 7191 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7030 "VideoSupport.c"
+#line 7198 "VideoSupport.c"
 			}
-#line 760 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7034 "VideoSupport.c"
+#line 7202 "VideoSupport.c"
 		}
-		__finally518:
+		__finally520:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7043 "VideoSupport.c"
+#line 7211 "VideoSupport.c"
 		}
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/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 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 759 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 775 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7051 "VideoSupport.c"
+#line 7219 "VideoSupport.c"
 	}
 }
 
@@ -7060,16 +7228,16 @@ static gchar* video_real_to_string (DataObject* base) {
 	Video * self;
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 764 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 780 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7062 "VideoSupport.c"
+#line 7230 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7069 "VideoSupport.c"
+#line 7237 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			VideoID _tmp2_ = {0};
@@ -7080,111 +7248,111 @@ static gchar* video_real_to_string (DataObject* base) {
 			const gchar* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = _tmp2_.id;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = g_strdup_printf ("%" G_GINT64_FORMAT, _tmp3_);
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = _tmp4_;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = _tmp6_->filepath;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = g_strdup_printf ("[%s] %s", _tmp5_, _tmp7_);
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = _tmp8_;
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp5_);
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp9_;
-#line 7102 "VideoSupport.c"
+#line 7270 "VideoSupport.c"
 			{
 				VideoRow* _tmp10_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7109 "VideoSupport.c"
+#line 7277 "VideoSupport.c"
 			}
-#line 766 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7113 "VideoSupport.c"
+#line 7281 "VideoSupport.c"
 		}
-		__finally519:
+		__finally521:
 		{
 			VideoRow* _tmp11_ = NULL;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7122 "VideoSupport.c"
+#line 7290 "VideoSupport.c"
 		}
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/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 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 765 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 781 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7130 "VideoSupport.c"
+#line 7298 "VideoSupport.c"
 	}
 }
 
 
 void video_get_video_id (Video* self, VideoID* result) {
 	GError * _inner_error_ = NULL;
-#line 770 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 786 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7139 "VideoSupport.c"
+#line 7307 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7146 "VideoSupport.c"
+#line 7314 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			VideoID _tmp2_ = {0};
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->video_id;
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp2_;
-#line 7156 "VideoSupport.c"
+#line 7324 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7163 "VideoSupport.c"
+#line 7331 "VideoSupport.c"
 			}
-#line 772 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 788 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7167 "VideoSupport.c"
+#line 7335 "VideoSupport.c"
 		}
-		__finally520:
+		__finally522:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7176 "VideoSupport.c"
+#line 7344 "VideoSupport.c"
 		}
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/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 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 771 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7184 "VideoSupport.c"
+#line 7352 "VideoSupport.c"
 	}
 }
 
@@ -7193,54 +7361,54 @@ static time_t video_real_get_exposure_time (Dateable* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 776 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7195 "VideoSupport.c"
+#line 7363 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7202 "VideoSupport.c"
+#line 7370 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->exposure_time;
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7212 "VideoSupport.c"
+#line 7380 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7219 "VideoSupport.c"
+#line 7387 "VideoSupport.c"
 			}
-#line 778 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 794 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7223 "VideoSupport.c"
+#line 7391 "VideoSupport.c"
 		}
-		__finally521:
+		__finally523:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7232 "VideoSupport.c"
+#line 7400 "VideoSupport.c"
 		}
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/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 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 777 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 793 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 7240 "VideoSupport.c"
+#line 7408 "VideoSupport.c"
 	}
 }
 
@@ -7250,16 +7418,16 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 	Alteration* _tmp12_ = NULL;
 	Alteration* _tmp13_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 782 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 798 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7252 "VideoSupport.c"
+#line 7420 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7259 "VideoSupport.c"
+#line 7427 "VideoSupport.c"
 		{
 			VideoRow* _tmp9_ = NULL;
 			time_t _tmp10_ = 0;
@@ -7269,165 +7437,165 @@ static void video_real_set_exposure_time (Dateable* base, time_t time) {
 				VideoRow* _tmp3_ = NULL;
 				VideoID _tmp4_ = {0};
 				time_t _tmp5_ = 0;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp1_ = video_table_get_instance ();
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp2_ = _tmp1_;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->video_id;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time;
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_exposure_time (_tmp2_, &_tmp4_, _tmp5_, &_inner_error_);
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp2_);
-#line 785 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7285 "VideoSupport.c"
-					goto __catch523_g_error;
+#line 7453 "VideoSupport.c"
+					goto __catch525_g_error;
 				}
 			}
-			goto __finally523;
-			__catch523_g_error:
+			goto __finally525;
+			__catch525_g_error:
 			{
 				GError* e = NULL;
 				GError* _tmp6_ = NULL;
 				const gchar* _tmp7_ = NULL;
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = e;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = _tmp6_->message;
-#line 787 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-				g_debug ("VideoSupport.vala:787: Warning - %s", _tmp7_);
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 803 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+				g_debug ("VideoSupport.vala:803: Warning - %s", _tmp7_);
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 7307 "VideoSupport.c"
+#line 7475 "VideoSupport.c"
 			}
-			__finally523:
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally525:
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7312 "VideoSupport.c"
+#line 7480 "VideoSupport.c"
 				{
 					VideoRow* _tmp8_ = NULL;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp8_ = self->priv->backing_row;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7319 "VideoSupport.c"
+#line 7487 "VideoSupport.c"
 				}
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/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 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 784 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 800 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7327 "VideoSupport.c"
+#line 7495 "VideoSupport.c"
 			}
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = self->priv->backing_row;
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = time;
-#line 789 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_->exposure_time = _tmp10_;
-#line 7335 "VideoSupport.c"
+#line 7503 "VideoSupport.c"
 		}
-		__finally522:
+		__finally524:
 		{
 			VideoRow* _tmp11_ = NULL;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = self->priv->backing_row;
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7344 "VideoSupport.c"
+#line 7512 "VideoSupport.c"
 		}
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/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 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 783 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 799 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7354 "VideoSupport.c"
+#line 7522 "VideoSupport.c"
 		}
 	}
-#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = alteration_new ("metadata", "exposure-time");
-#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = _tmp12_;
-#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp13_);
-#line 792 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 808 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp13_);
-#line 7365 "VideoSupport.c"
+#line 7533 "VideoSupport.c"
 }
 
 
 void video_get_frame_dimensions (Video* self, Dimensions* result) {
 	GError * _inner_error_ = NULL;
-#line 795 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7373 "VideoSupport.c"
+#line 7541 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7380 "VideoSupport.c"
+#line 7548 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gint _tmp2_ = 0;
 			VideoRow* _tmp3_ = NULL;
 			gint _tmp4_ = 0;
 			Dimensions _tmp5_ = {0};
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->width;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = self->priv->backing_row;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _tmp3_->height;
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			dimensions_init (&_tmp5_, _tmp2_, _tmp4_);
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*result = _tmp5_;
-#line 7399 "VideoSupport.c"
+#line 7567 "VideoSupport.c"
 			{
 				VideoRow* _tmp6_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = self->priv->backing_row;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7406 "VideoSupport.c"
+#line 7574 "VideoSupport.c"
 			}
-#line 797 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 813 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 7410 "VideoSupport.c"
+#line 7578 "VideoSupport.c"
 		}
-		__finally524:
+		__finally526:
 		{
 			VideoRow* _tmp7_ = NULL;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7419 "VideoSupport.c"
+#line 7587 "VideoSupport.c"
 		}
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/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 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 796 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 812 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7427 "VideoSupport.c"
+#line 7595 "VideoSupport.c"
 	}
 }
 
@@ -7435,15 +7603,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 801 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_frame_dimensions (self, &_tmp0_);
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp0_;
-#line 802 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 818 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 7443 "VideoSupport.c"
+#line 7611 "VideoSupport.c"
 }
 
 
@@ -7451,15 +7619,15 @@ static guint64 video_real_get_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
 	guint64 _tmp0_ = 0ULL;
-#line 805 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 806 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7459 "VideoSupport.c"
+#line 7627 "VideoSupport.c"
 }
 
 
@@ -7467,54 +7635,54 @@ static guint64 video_real_get_master_filesize (MediaSource* base) {
 	Video * self;
 	guint64 result = 0ULL;
 	GError * _inner_error_ = NULL;
-#line 809 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7469 "VideoSupport.c"
+#line 7637 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7476 "VideoSupport.c"
+#line 7644 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gint64 _tmp2_ = 0LL;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filesize;
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = (guint64) _tmp2_;
-#line 7486 "VideoSupport.c"
+#line 7654 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7493 "VideoSupport.c"
+#line 7661 "VideoSupport.c"
 			}
-#line 811 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7497 "VideoSupport.c"
+#line 7665 "VideoSupport.c"
 		}
-		__finally525:
+		__finally527:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7506 "VideoSupport.c"
+#line 7674 "VideoSupport.c"
 		}
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/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 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 810 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0ULL;
-#line 7514 "VideoSupport.c"
+#line 7682 "VideoSupport.c"
 	}
 }
 
@@ -7523,54 +7691,54 @@ static time_t video_real_get_timestamp (MediaSource* base) {
 	Video * self;
 	time_t result = 0;
 	GError * _inner_error_ = NULL;
-#line 815 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 831 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 7525 "VideoSupport.c"
+#line 7693 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7532 "VideoSupport.c"
+#line 7700 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			time_t _tmp2_ = 0;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->timestamp;
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7542 "VideoSupport.c"
+#line 7710 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7549 "VideoSupport.c"
+#line 7717 "VideoSupport.c"
 			}
-#line 817 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7553 "VideoSupport.c"
+#line 7721 "VideoSupport.c"
 		}
-		__finally526:
+		__finally528:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7562 "VideoSupport.c"
+#line 7730 "VideoSupport.c"
 		}
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/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 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 816 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 832 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0;
-#line 7570 "VideoSupport.c"
+#line 7738 "VideoSupport.c"
 	}
 }
 
@@ -7583,25 +7751,25 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 	Alteration* _tmp19_ = NULL;
 	Alteration* _tmp20_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 837 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 821 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 837 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = info;
-#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp0_, &_tmp1_);
-#line 822 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	time_val = _tmp1_;
-#line 7593 "VideoSupport.c"
+#line 7761 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7601 "VideoSupport.c"
+#line 7769 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 				time_t _tmp4_ = 0;
@@ -7616,182 +7784,182 @@ static void video_real_set_master_timestamp (Monitorable* base, GFileInfo* info)
 				VideoRow* _tmp14_ = NULL;
 				GTimeVal _tmp15_ = {0};
 				glong _tmp16_ = 0L;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->timestamp;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = time_val;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = _tmp5_.tv_sec;
-#line 826 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_tmp4_ == ((time_t) _tmp6_)) {
-#line 7626 "VideoSupport.c"
+#line 7794 "VideoSupport.c"
 					{
 						VideoRow* _tmp7_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp7_ = self->priv->backing_row;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7633 "VideoSupport.c"
+#line 7801 "VideoSupport.c"
 					}
-#line 827 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 7637 "VideoSupport.c"
+#line 7805 "VideoSupport.c"
 				}
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = video_table_get_instance ();
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_;
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = self->priv->backing_row;
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_->video_id;
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = time_val;
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_.tv_sec;
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_timestamp (_tmp9_, &_tmp11_, (time_t) _tmp13_, &_inner_error_);
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp9_);
-#line 829 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 845 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 7657 "VideoSupport.c"
-					goto __finally528;
+#line 7825 "VideoSupport.c"
+					goto __finally530;
 				}
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = self->priv->backing_row;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = time_val;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _tmp15_.tv_sec;
-#line 830 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 846 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_->timestamp = (time_t) _tmp16_;
-#line 7668 "VideoSupport.c"
+#line 7836 "VideoSupport.c"
 			}
-			__finally528:
+			__finally530:
 			{
 				VideoRow* _tmp17_ = NULL;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7677 "VideoSupport.c"
+#line 7845 "VideoSupport.c"
 			}
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 7683 "VideoSupport.c"
-					goto __catch527_database_error;
+#line 7851 "VideoSupport.c"
+					goto __catch529_database_error;
 				}
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/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 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 825 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 7692 "VideoSupport.c"
+#line 7860 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally527;
-	__catch527_database_error:
+	goto __finally529;
+	__catch529_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp18_ = err;
-#line 833 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 849 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp18_);
-#line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 835 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7713 "VideoSupport.c"
+#line 7881 "VideoSupport.c"
 	}
-	__finally527:
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally529:
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/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 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 824 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 840 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7724 "VideoSupport.c"
+#line 7892 "VideoSupport.c"
 	}
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = alteration_new ("metadata", "master-timestamp");
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = _tmp19_;
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp20_);
-#line 838 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 854 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp20_);
-#line 7734 "VideoSupport.c"
+#line 7902 "VideoSupport.c"
 }
 
 
 gchar* video_get_filename (Video* self) {
 	gchar* result = NULL;
 	GError * _inner_error_ = NULL;
-#line 841 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 7743 "VideoSupport.c"
+#line 7911 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7750 "VideoSupport.c"
+#line 7918 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->filepath;
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp3_;
-#line 7763 "VideoSupport.c"
+#line 7931 "VideoSupport.c"
 			{
 				VideoRow* _tmp4_ = NULL;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = self->priv->backing_row;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7770 "VideoSupport.c"
+#line 7938 "VideoSupport.c"
 			}
-#line 843 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 859 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7774 "VideoSupport.c"
+#line 7942 "VideoSupport.c"
 		}
-		__finally529:
+		__finally531:
 		{
 			VideoRow* _tmp5_ = NULL;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7783 "VideoSupport.c"
+#line 7951 "VideoSupport.c"
 		}
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/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 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 842 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 858 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 7791 "VideoSupport.c"
+#line 7959 "VideoSupport.c"
 	}
 }
 
@@ -7803,23 +7971,23 @@ static GFile* video_real_get_file (MediaSource* base) {
 	gchar* _tmp1_ = NULL;
 	GFile* _tmp2_ = NULL;
 	GFile* _tmp3_ = NULL;
-#line 847 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 848 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 864 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7819 "VideoSupport.c"
+#line 7987 "VideoSupport.c"
 }
 
 
@@ -7827,15 +7995,15 @@ static GFile* video_real_get_master_file (MediaSource* base) {
 	Video * self;
 	GFile* result = NULL;
 	GFile* _tmp0_ = NULL;
-#line 851 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 867 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 852 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 7835 "VideoSupport.c"
+#line 8003 "VideoSupport.c"
 }
 
 
@@ -7847,93 +8015,93 @@ void video_export (Video* self, GFile* dest_file, GError** error) {
 	GFile* _tmp3_ = NULL;
 	GFile* _tmp4_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_get_filename (self);
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp1_);
-#line 856 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 872 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	source_file = _tmp3_;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = dest_file;
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/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 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (source_file);
-#line 857 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 7875 "VideoSupport.c"
+#line 8043 "VideoSupport.c"
 	}
-#line 855 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 871 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (source_file);
-#line 7879 "VideoSupport.c"
+#line 8047 "VideoSupport.c"
 }
 
 
 gdouble video_get_clip_duration (Video* self) {
 	gdouble result = 0.0;
 	GError * _inner_error_ = NULL;
-#line 861 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 877 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0.0);
-#line 7888 "VideoSupport.c"
+#line 8056 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7895 "VideoSupport.c"
+#line 8063 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gdouble _tmp2_ = 0.0;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->clip_duration;
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7905 "VideoSupport.c"
+#line 8073 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7912 "VideoSupport.c"
+#line 8080 "VideoSupport.c"
 			}
-#line 863 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 879 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7916 "VideoSupport.c"
+#line 8084 "VideoSupport.c"
 		}
-		__finally530:
+		__finally532:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7925 "VideoSupport.c"
+#line 8093 "VideoSupport.c"
 		}
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/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 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 862 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return 0.0;
-#line 7933 "VideoSupport.c"
+#line 8101 "VideoSupport.c"
 	}
 }
 
@@ -7941,123 +8109,123 @@ gdouble video_get_clip_duration (Video* self) {
 gboolean video_get_is_interpretable (Video* self) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 867 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 883 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 7943 "VideoSupport.c"
+#line 8111 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 7950 "VideoSupport.c"
+#line 8118 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp2_;
-#line 7960 "VideoSupport.c"
+#line 8128 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7967 "VideoSupport.c"
+#line 8135 "VideoSupport.c"
 			}
-#line 869 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 885 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 7971 "VideoSupport.c"
+#line 8139 "VideoSupport.c"
 		}
-		__finally531:
+		__finally533:
 		{
 			VideoRow* _tmp4_ = NULL;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->priv->backing_row;
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 7980 "VideoSupport.c"
+#line 8148 "VideoSupport.c"
 		}
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/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 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 868 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 7988 "VideoSupport.c"
+#line 8156 "VideoSupport.c"
 	}
 }
 
 
 static void video_set_is_interpretable (Video* self, gboolean is_interpretable) {
 	GError * _inner_error_ = NULL;
-#line 873 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 889 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 7997 "VideoSupport.c"
+#line 8165 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8004 "VideoSupport.c"
+#line 8172 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			gboolean _tmp2_ = FALSE;
 			gboolean _tmp3_ = FALSE;
 			VideoRow* _tmp5_ = NULL;
 			gboolean _tmp6_ = FALSE;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->is_interpretable;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = is_interpretable;
-#line 875 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp2_ == _tmp3_) {
-#line 8019 "VideoSupport.c"
+#line 8187 "VideoSupport.c"
 				{
 					VideoRow* _tmp4_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp4_ = self->priv->backing_row;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8026 "VideoSupport.c"
+#line 8194 "VideoSupport.c"
 				}
-#line 876 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 8030 "VideoSupport.c"
+#line 8198 "VideoSupport.c"
 			}
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = is_interpretable;
-#line 878 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_->is_interpretable = _tmp6_;
-#line 8038 "VideoSupport.c"
+#line 8206 "VideoSupport.c"
 		}
-		__finally532:
+		__finally534:
 		{
 			VideoRow* _tmp7_ = NULL;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->priv->backing_row;
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8047 "VideoSupport.c"
+#line 8215 "VideoSupport.c"
 		}
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/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 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 874 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 890 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8057 "VideoSupport.c"
+#line 8225 "VideoSupport.c"
 		}
 	}
 	{
@@ -8065,61 +8233,61 @@ static void video_set_is_interpretable (Video* self, gboolean is_interpretable)
 		VideoTable* _tmp9_ = NULL;
 		VideoID _tmp10_ = {0};
 		gboolean _tmp11_ = FALSE;
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = video_table_get_instance ();
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = _tmp8_;
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_get_video_id (self, &_tmp10_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = is_interpretable;
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_update_is_interpretable (_tmp9_, &_tmp10_, _tmp11_, &_inner_error_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp9_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8081 "VideoSupport.c"
-				goto __catch533_database_error;
+#line 8249 "VideoSupport.c"
+				goto __catch535_database_error;
 			}
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/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 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 882 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8090 "VideoSupport.c"
+#line 8258 "VideoSupport.c"
 		}
 	}
-	goto __finally533;
-	__catch533_database_error:
+	goto __finally535;
+	__catch535_database_error:
 	{
 		GError* e = NULL;
 		GError* _tmp12_ = NULL;
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = e;
-#line 884 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp12_);
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 8108 "VideoSupport.c"
+#line 8276 "VideoSupport.c"
 	}
-	__finally533:
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally535:
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/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 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 881 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8119 "VideoSupport.c"
+#line 8287 "VideoSupport.c"
 	}
 }
 
@@ -8146,235 +8314,235 @@ VideoInterpretableResults* video_check_is_interpretable (Video* self) {
 	GdkPixbuf* _tmp27_ = NULL;
 	GdkPixbuf* _tmp28_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 891 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_interpretable_results_new (self);
-#line 892 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 908 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	results = _tmp0_;
-#line 894 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 910 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	clip_duration = -1.0;
-#line 895 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	preview_frame = NULL;
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 897 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	backing_file_reader = _tmp4_;
-#line 8168 "VideoSupport.c"
+#line 8336 "VideoSupport.c"
 	{
 		gdouble _tmp5_ = 0.0;
 		VideoReader* _tmp6_ = NULL;
 		gdouble _tmp7_ = 0.0;
 		VideoReader* _tmp8_ = NULL;
 		GdkPixbuf* _tmp9_ = NULL;
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp6_ = backing_file_reader;
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp7_ = video_reader_read_clip_duration (_tmp6_, &_inner_error_);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp7_;
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == VIDEO_ERROR) {
-#line 8185 "VideoSupport.c"
-				goto __catch534_video_error;
+#line 8353 "VideoSupport.c"
+				goto __catch536_video_error;
 			}
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/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 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8200 "VideoSupport.c"
+#line 8368 "VideoSupport.c"
 		}
-#line 899 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		clip_duration = _tmp5_;
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp8_ = backing_file_reader;
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = video_reader_read_preview_frame (_tmp8_);
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 900 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 916 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		preview_frame = _tmp9_;
-#line 8212 "VideoSupport.c"
+#line 8380 "VideoSupport.c"
 	}
-	goto __finally534;
-	__catch534_video_error:
+	goto __finally536;
+	__catch536_video_error:
 	{
 		GError* e = NULL;
 		VideoInterpretableResults* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		VideoInterpretableResults* _tmp12_ = NULL;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		e = _inner_error_;
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = results;
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp11_ = video_get_is_interpretable (self);
-#line 904 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 920 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_->update_interpretable = _tmp11_;
-#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = results;
-#line 905 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_->is_interpretable = FALSE;
-#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (e);
-#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 907 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 923 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8245 "VideoSupport.c"
+#line 8413 "VideoSupport.c"
 	}
-	__finally534:
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally536:
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_interpretable_results_unref0 (results);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/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 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 898 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 914 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 8262 "VideoSupport.c"
+#line 8430 "VideoSupport.c"
 	}
-#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = video_get_is_interpretable (self);
-#line 911 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_) {
-#line 8268 "VideoSupport.c"
+#line 8436 "VideoSupport.c"
 		VideoInterpretableResults* _tmp14_ = NULL;
 		VideoInterpretableResults* _tmp15_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = results;
-#line 912 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 928 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_->update_interpretable = FALSE;
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_ = results;
-#line 913 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp15_->is_interpretable = TRUE;
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = results;
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_reader_unref0 (backing_file_reader);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (preview_frame);
-#line 915 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 931 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 8287 "VideoSupport.c"
+#line 8455 "VideoSupport.c"
 	}
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp17_ = _tmp16_;
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp18_ = g_file_get_basename (_tmp17_);
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp19_ = _tmp18_;
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-	g_debug ("VideoSupport.vala:918: video %s has become interpretable", _tmp19_);
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	g_debug ("VideoSupport.vala:934: video %s has become interpretable", _tmp19_);
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (_tmp19_);
-#line 918 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 934 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp17_);
-#line 8303 "VideoSupport.c"
+#line 8471 "VideoSupport.c"
 	{
 		VideoRow* _tmp20_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp20_ = self->priv->backing_row;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8310 "VideoSupport.c"
+#line 8478 "VideoSupport.c"
 		{
 			VideoRow* _tmp21_ = NULL;
 			gdouble _tmp22_ = 0.0;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = clip_duration;
-#line 922 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->clip_duration = _tmp22_;
-#line 8320 "VideoSupport.c"
+#line 8488 "VideoSupport.c"
 		}
-		__finally535:
+		__finally537:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8329 "VideoSupport.c"
+#line 8497 "VideoSupport.c"
 		}
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_reader_unref0 (backing_file_reader);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (preview_frame);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_video_interpretable_results_unref0 (results);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 921 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return NULL;
-#line 8345 "VideoSupport.c"
+#line 8513 "VideoSupport.c"
 		}
 	}
-#line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = results;
-#line 925 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 941 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_->update_interpretable = TRUE;
-#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 942 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = results;
-#line 926 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 942 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_->is_interpretable = TRUE;
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = results;
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = preview_frame;
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp28_ = _g_object_ref0 (_tmp27_);
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp26_->new_thumbnail);
-#line 927 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_->new_thumbnail = _tmp28_;
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = results;
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (backing_file_reader);
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (preview_frame);
-#line 929 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 945 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8374 "VideoSupport.c"
+#line 8542 "VideoSupport.c"
 }
 
 
@@ -8383,81 +8551,81 @@ static void video_real_destroy (DataSource* base) {
 	VideoID video_id = {0};
 	VideoID _tmp0_ = {0};
 	GError * _inner_error_ = NULL;
-#line 932 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 948 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (self, &_tmp0_);
-#line 933 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 949 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp0_;
-#line 935 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 951 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	thumbnail_cache_remove (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 8391 "VideoSupport.c"
+#line 8559 "VideoSupport.c"
 	{
 		VideoTable* _tmp1_ = NULL;
 		VideoTable* _tmp2_ = NULL;
 		VideoID _tmp3_ = {0};
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = video_table_get_instance ();
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = _tmp1_;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = video_id;
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_table_remove (_tmp2_, &_tmp3_, &_inner_error_);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_database_table_unref0 (_tmp2_);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8410 "VideoSupport.c"
-				goto __catch536_database_error;
+#line 8578 "VideoSupport.c"
+				goto __catch538_database_error;
 			}
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/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 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 938 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 8419 "VideoSupport.c"
+#line 8587 "VideoSupport.c"
 		}
 	}
-	goto __finally536;
-	__catch536_database_error:
+	goto __finally538;
+	__catch538_database_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject));
-#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-		g_error ("VideoSupport.vala:940: failed to remove video %s from video table", _tmp5_);
-#line 940 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		g_error ("VideoSupport.vala:956: failed to remove video %s from video table", _tmp5_);
+#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (_tmp5_);
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 8442 "VideoSupport.c"
+#line 8610 "VideoSupport.c"
 	}
-	__finally536:
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally538:
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/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 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 937 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 8453 "VideoSupport.c"
+#line 8621 "VideoSupport.c"
 	}
-#line 943 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 959 "/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 8457 "VideoSupport.c"
+#line 8625 "VideoSupport.c"
 }
 
 
@@ -8470,39 +8638,39 @@ static gboolean video_real_internal_delete_backing (DataSource* base, GError** e
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 946 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 962 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = media_source_delete_original_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 947 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	ret = _tmp0_;
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/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 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp3_;
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 8486 "VideoSupport.c"
+#line 8654 "VideoSupport.c"
 	}
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_) {
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = ret;
-#line 8492 "VideoSupport.c"
+#line 8660 "VideoSupport.c"
 	} else {
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = FALSE;
-#line 8496 "VideoSupport.c"
+#line 8664 "VideoSupport.c"
 	}
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 950 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8502 "VideoSupport.c"
+#line 8670 "VideoSupport.c"
 }
 
 
@@ -8511,41 +8679,41 @@ static void video_notify_flags_altered (Video* self, Alteration* additional_alte
 	Alteration* _tmp0_ = NULL;
 	Alteration* _tmp1_ = NULL;
 	Alteration* _tmp5_ = NULL;
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (self));
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration));
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = alteration_new ("metadata", "flags");
-#line 954 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 970 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	alteration = _tmp0_;
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = additional_alteration;
-#line 955 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != NULL) {
-#line 8523 "VideoSupport.c"
+#line 8691 "VideoSupport.c"
 		Alteration* _tmp2_ = NULL;
 		Alteration* _tmp3_ = NULL;
 		Alteration* _tmp4_ = NULL;
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = alteration;
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = additional_alteration;
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = alteration_compress (_tmp2_, _tmp3_);
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_alteration_unref0 (alteration);
-#line 956 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		alteration = _tmp4_;
-#line 8537 "VideoSupport.c"
+#line 8705 "VideoSupport.c"
 	}
-#line 958 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = alteration;
-#line 958 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 974 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp5_);
-#line 953 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (alteration);
-#line 8545 "VideoSupport.c"
+#line 8713 "VideoSupport.c"
 }
 
 
@@ -8554,18 +8722,18 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 	guint64 new_flags = 0ULL;
 	Alteration* _tmp24_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 961 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 977 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8558 "VideoSupport.c"
+#line 8726 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8565 "VideoSupport.c"
+#line 8733 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -8576,180 +8744,180 @@ guint64 video_add_flags (Video* self, guint64 flags_to_add, Alteration* addition
 			guint64 _tmp7_ = 0ULL;
 			VideoRow* _tmp21_ = NULL;
 			guint64 _tmp22_ = 0ULL;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_add;
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_add_flags (_tmp2_, _tmp3_);
-#line 964 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			new_flags = _tmp4_;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 965 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 981 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8594 "VideoSupport.c"
+#line 8762 "VideoSupport.c"
 				VideoRow* _tmp8_ = NULL;
 				guint64 _tmp9_ = 0ULL;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8603 "VideoSupport.c"
+#line 8771 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8610 "VideoSupport.c"
+#line 8778 "VideoSupport.c"
 				}
-#line 966 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 982 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8614 "VideoSupport.c"
+#line 8782 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_ = NULL;
 				VideoTable* _tmp12_ = NULL;
 				VideoID _tmp13_ = {0};
 				guint64 _tmp14_ = 0ULL;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8637 "VideoSupport.c"
-						goto __catch538_database_error;
+#line 8805 "VideoSupport.c"
+						goto __catch540_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8646 "VideoSupport.c"
+#line 8814 "VideoSupport.c"
 					}
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 969 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return 0ULL;
-#line 8654 "VideoSupport.c"
+#line 8822 "VideoSupport.c"
 				}
 			}
-			goto __finally538;
-			__catch538_database_error:
+			goto __finally540;
+			__catch540_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
 				VideoRow* _tmp17_ = NULL;
 				guint64 _tmp18_ = 0ULL;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = e;
-#line 971 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp16_);
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _tmp17_->flags;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp18_;
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8680 "VideoSupport.c"
+#line 8848 "VideoSupport.c"
 				{
 					VideoRow* _tmp19_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp19_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8687 "VideoSupport.c"
+#line 8855 "VideoSupport.c"
 				}
-#line 972 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8691 "VideoSupport.c"
+#line 8859 "VideoSupport.c"
 			}
-			__finally538:
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally540:
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8696 "VideoSupport.c"
+#line 8864 "VideoSupport.c"
 				{
 					VideoRow* _tmp20_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8703 "VideoSupport.c"
+#line 8871 "VideoSupport.c"
 				}
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/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 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 968 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 984 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0ULL;
-#line 8711 "VideoSupport.c"
+#line 8879 "VideoSupport.c"
 			}
-#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = new_flags;
-#line 975 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->flags = _tmp22_;
-#line 8719 "VideoSupport.c"
+#line 8887 "VideoSupport.c"
 		}
-		__finally537:
+		__finally539:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8728 "VideoSupport.c"
+#line 8896 "VideoSupport.c"
 		}
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/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 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 963 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 979 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0ULL;
-#line 8738 "VideoSupport.c"
+#line 8906 "VideoSupport.c"
 		}
 	}
-#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = additional_alteration;
-#line 978 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp24_);
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 996 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 980 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 996 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8749 "VideoSupport.c"
+#line 8917 "VideoSupport.c"
 }
 
 
@@ -8758,18 +8926,18 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 	guint64 new_flags = 0ULL;
 	Alteration* _tmp24_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), 0ULL);
-#line 983 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 999 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail ((additional_alteration == NULL) || IS_ALTERATION (additional_alteration), 0ULL);
-#line 8762 "VideoSupport.c"
+#line 8930 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8769 "VideoSupport.c"
+#line 8937 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
@@ -8780,240 +8948,240 @@ guint64 video_remove_flags (Video* self, guint64 flags_to_remove, Alteration* ad
 			guint64 _tmp7_ = 0ULL;
 			VideoRow* _tmp21_ = NULL;
 			guint64 _tmp22_ = 0ULL;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flags_to_remove;
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_remove_flags (_tmp2_, _tmp3_);
-#line 986 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			new_flags = _tmp4_;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->priv->backing_row;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _tmp5_->flags;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = new_flags;
-#line 987 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1003 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp6_ == _tmp7_) {
-#line 8798 "VideoSupport.c"
+#line 8966 "VideoSupport.c"
 				VideoRow* _tmp8_ = NULL;
 				guint64 _tmp9_ = 0ULL;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = self->priv->backing_row;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = _tmp8_->flags;
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp9_;
-#line 8807 "VideoSupport.c"
+#line 8975 "VideoSupport.c"
 				{
 					VideoRow* _tmp10_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp10_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8814 "VideoSupport.c"
+#line 8982 "VideoSupport.c"
 				}
-#line 988 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1004 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8818 "VideoSupport.c"
+#line 8986 "VideoSupport.c"
 			}
 			{
 				VideoTable* _tmp11_ = NULL;
 				VideoTable* _tmp12_ = NULL;
 				VideoID _tmp13_ = {0};
 				guint64 _tmp14_ = 0ULL;
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = video_table_get_instance ();
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = _tmp11_;
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (self, &_tmp13_);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_flags;
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_flags (_tmp12_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp12_);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 8841 "VideoSupport.c"
-						goto __catch540_database_error;
+#line 9009 "VideoSupport.c"
+						goto __catch542_database_error;
 					}
 					{
 						VideoRow* _tmp15_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp15_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8850 "VideoSupport.c"
+#line 9018 "VideoSupport.c"
 					}
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_clear_error (&_inner_error_);
-#line 991 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return 0ULL;
-#line 8858 "VideoSupport.c"
+#line 9026 "VideoSupport.c"
 				}
 			}
-			goto __finally540;
-			__catch540_database_error:
+			goto __finally542;
+			__catch542_database_error:
 			{
 				GError* e = NULL;
 				GError* _tmp16_ = NULL;
 				VideoRow* _tmp17_ = NULL;
 				guint64 _tmp18_ = 0ULL;
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				e = _inner_error_;
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_inner_error_ = NULL;
-#line 993 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1009 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = e;
-#line 993 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1009 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				app_window_database_error (_tmp16_);
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = self->priv->backing_row;
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _tmp17_->flags;
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				result = _tmp18_;
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_error_free0 (e);
-#line 8884 "VideoSupport.c"
+#line 9052 "VideoSupport.c"
 				{
 					VideoRow* _tmp19_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp19_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8891 "VideoSupport.c"
+#line 9059 "VideoSupport.c"
 				}
-#line 994 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1010 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return result;
-#line 8895 "VideoSupport.c"
+#line 9063 "VideoSupport.c"
 			}
-			__finally540:
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			__finally542:
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8900 "VideoSupport.c"
+#line 9068 "VideoSupport.c"
 				{
 					VideoRow* _tmp20_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_tmp20_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8907 "VideoSupport.c"
+#line 9075 "VideoSupport.c"
 				}
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/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 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 990 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return 0ULL;
-#line 8915 "VideoSupport.c"
+#line 9083 "VideoSupport.c"
 			}
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = self->priv->backing_row;
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp22_ = new_flags;
-#line 997 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_->flags = _tmp22_;
-#line 8923 "VideoSupport.c"
+#line 9091 "VideoSupport.c"
 		}
-		__finally539:
+		__finally541:
 		{
 			VideoRow* _tmp23_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp23_ = self->priv->backing_row;
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8932 "VideoSupport.c"
+#line 9100 "VideoSupport.c"
 		}
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/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 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 985 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1001 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return 0ULL;
-#line 8942 "VideoSupport.c"
+#line 9110 "VideoSupport.c"
 		}
 	}
-#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = additional_alteration;
-#line 1000 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_notify_flags_altered (self, _tmp24_);
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = new_flags;
-#line 1002 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1018 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 8953 "VideoSupport.c"
+#line 9121 "VideoSupport.c"
 }
 
 
 gboolean video_is_flag_set (Video* self, guint64 flag) {
 	gboolean result = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1005 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), FALSE);
-#line 8962 "VideoSupport.c"
+#line 9130 "VideoSupport.c"
 	{
 		VideoRow* _tmp0_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->backing_row;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 8969 "VideoSupport.c"
+#line 9137 "VideoSupport.c"
 		{
 			VideoRow* _tmp1_ = NULL;
 			guint64 _tmp2_ = 0ULL;
 			guint64 _tmp3_ = 0ULL;
 			gboolean _tmp4_ = FALSE;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = self->priv->backing_row;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = _tmp1_->flags;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp3_ = flag;
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = media_source_internal_is_flag_set (_tmp2_, _tmp3_);
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			result = _tmp4_;
-#line 8985 "VideoSupport.c"
+#line 9153 "VideoSupport.c"
 			{
 				VideoRow* _tmp5_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = self->priv->backing_row;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 8992 "VideoSupport.c"
+#line 9160 "VideoSupport.c"
 			}
-#line 1007 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1023 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return result;
-#line 8996 "VideoSupport.c"
+#line 9164 "VideoSupport.c"
 		}
-		__finally541:
+		__finally543:
 		{
 			VideoRow* _tmp6_ = NULL;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->priv->backing_row;
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9005 "VideoSupport.c"
+#line 9173 "VideoSupport.c"
 		}
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/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 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1006 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return FALSE;
-#line 9013 "VideoSupport.c"
+#line 9181 "VideoSupport.c"
 	}
 }
 
@@ -9032,27 +9200,27 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 	Alteration* _tmp25_ = NULL;
 	Alteration* _tmp26_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO, Video);
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE (file));
-#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = g_file_get_path (_tmp0_);
-#line 1012 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1028 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	new_filepath = _tmp1_;
-#line 1013 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1029 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old_filepath = NULL;
-#line 9044 "VideoSupport.c"
+#line 9212 "VideoSupport.c"
 	{
 		{
 			VideoRow* _tmp2_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = self->priv->backing_row;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_rec_mutex_lock (&self->priv->__lock_backing_row);
-#line 9052 "VideoSupport.c"
+#line 9220 "VideoSupport.c"
 			{
 				VideoRow* _tmp3_ = NULL;
 				const gchar* _tmp4_ = NULL;
@@ -9068,169 +9236,169 @@ static void video_real_set_master_file (Monitorable* base, GFile* file) {
 				VideoRow* _tmp15_ = NULL;
 				const gchar* _tmp16_ = NULL;
 				gchar* _tmp17_ = NULL;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = self->priv->backing_row;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = _tmp3_->filepath;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = new_filepath;
-#line 1016 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1032 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (g_strcmp0 (_tmp4_, _tmp5_) == 0) {
-#line 9076 "VideoSupport.c"
+#line 9244 "VideoSupport.c"
 					{
 						VideoRow* _tmp6_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						_tmp6_ = self->priv->backing_row;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 						g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9083 "VideoSupport.c"
+#line 9251 "VideoSupport.c"
 					}
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (old_filepath);
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					_g_free0 (new_filepath);
-#line 1017 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					return;
-#line 9091 "VideoSupport.c"
+#line 9259 "VideoSupport.c"
 				}
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = self->priv->backing_row;
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _tmp7_->filepath;
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = g_strdup (_tmp8_);
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 1019 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1035 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				old_filepath = _tmp9_;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video_table_get_instance ();
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = _tmp10_;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = self->priv->backing_row;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp13_ = _tmp12_->video_id;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp14_ = new_filepath;
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_table_set_filepath (_tmp11_, &_tmp13_, _tmp14_, &_inner_error_);
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_database_table_unref0 (_tmp11_);
-#line 1021 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9119 "VideoSupport.c"
-					goto __finally543;
+#line 9287 "VideoSupport.c"
+					goto __finally545;
 				}
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_ = self->priv->backing_row;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = new_filepath;
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = g_strdup (_tmp16_);
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (_tmp15_->filepath);
-#line 1022 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1038 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp15_->filepath = _tmp17_;
-#line 9132 "VideoSupport.c"
+#line 9300 "VideoSupport.c"
 			}
-			__finally543:
+			__finally545:
 			{
 				VideoRow* _tmp18_ = NULL;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = self->priv->backing_row;
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_rec_mutex_unlock (&self->priv->__lock_backing_row);
-#line 9141 "VideoSupport.c"
+#line 9309 "VideoSupport.c"
 			}
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (_inner_error_->domain == DATABASE_ERROR) {
-#line 9147 "VideoSupport.c"
-					goto __catch542_database_error;
+#line 9315 "VideoSupport.c"
+					goto __catch544_database_error;
 				}
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (old_filepath);
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_free0 (new_filepath);
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/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 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				g_clear_error (&_inner_error_);
-#line 1015 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 9160 "VideoSupport.c"
+#line 9328 "VideoSupport.c"
 			}
 		}
 	}
-	goto __finally542;
-	__catch542_database_error:
+	goto __finally544;
+	__catch544_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp19_ = NULL;
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		err = _inner_error_;
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_inner_error_ = NULL;
-#line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp19_ = err;
-#line 1025 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		app_window_database_error (_tmp19_);
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_error_free0 (err);
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1043 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9185 "VideoSupport.c"
+#line 9353 "VideoSupport.c"
 	}
-	__finally542:
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+	__finally544:
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (old_filepath);
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_free0 (new_filepath);
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/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 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_clear_error (&_inner_error_);
-#line 1014 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 9200 "VideoSupport.c"
+#line 9368 "VideoSupport.c"
 	}
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1046 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp20_ = old_filepath;
-#line 1030 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1046 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_assert (_tmp20_ != NULL, "old_filepath != null");
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp21_ = old_filepath;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp22_ = g_file_new_for_path (_tmp21_);
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp23_ = _tmp22_;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp24_ = file;
-#line 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/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 1031 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1047 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp23_);
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp25_ = alteration_new_from_list ("backing:master,metadata:name");
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = _tmp25_;
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	data_object_notify_altered (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_OBJECT, DataObject), _tmp26_);
-#line 1033 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1049 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_alteration_unref0 (_tmp26_);
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (old_filepath);
-#line 1011 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1027 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_free0 (new_filepath);
-#line 9230 "VideoSupport.c"
+#line 9398 "VideoSupport.c"
 }
 
 
@@ -9245,45 +9413,45 @@ VideoMetadata* video_read_metadata (Video* self, GError** error) {
 	VideoMetadata* _tmp6_ = NULL;
 	VideoMetadata* _tmp7_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 1036 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (self), NULL);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = _tmp1_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_reader_new (_tmp2_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = video_reader_read_metadata (_tmp4_, &_inner_error_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = _tmp5_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_reader_unref0 (_tmp4_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (_tmp2_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = _tmp6_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return NULL;
-#line 9271 "VideoSupport.c"
+#line 9439 "VideoSupport.c"
 	}
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = _tmp0_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = NULL;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp7_;
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_media_metadata_unref0 (_tmp0_);
-#line 1037 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1053 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9283 "VideoSupport.c"
+#line 9451 "VideoSupport.c"
 }
 
 
@@ -9291,28 +9459,28 @@ VideoInterpretableResults* video_interpretable_results_construct (GType object_t
 	VideoInterpretableResults* self = NULL;
 	Video* _tmp0_ = NULL;
 	Video* _tmp1_ = NULL;
-#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO (video), NULL);
-#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = (VideoInterpretableResults*) g_type_create_instance (object_type);
-#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video;
-#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->video);
-#line 320 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 336 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->video = _tmp1_;
-#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9305 "VideoSupport.c"
+#line 9473 "VideoSupport.c"
 }
 
 
 VideoInterpretableResults* video_interpretable_results_new (Video* video) {
-#line 319 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 335 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_interpretable_results_construct (VIDEO_TYPE_INTERPRETABLE_RESULTS, video);
-#line 9312 "VideoSupport.c"
+#line 9480 "VideoSupport.c"
 }
 
 
@@ -9320,64 +9488,64 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 	gboolean _tmp0_ = FALSE;
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 323 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 339 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (VIDEO_IS_INTERPRETABLE_RESULTS (self));
-#line 324 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->update_interpretable;
-#line 324 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_) {
-#line 9326 "VideoSupport.c"
+#line 9494 "VideoSupport.c"
 		Video* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = self->video;
-#line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = self->is_interpretable;
-#line 325 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 341 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_set_is_interpretable (_tmp1_, _tmp2_);
-#line 9335 "VideoSupport.c"
+#line 9503 "VideoSupport.c"
 	}
-#line 327 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 343 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = self->new_thumbnail;
-#line 327 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 343 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp3_ != NULL) {
-#line 9341 "VideoSupport.c"
+#line 9509 "VideoSupport.c"
 		{
 			Video* _tmp4_ = NULL;
 			GdkPixbuf* _tmp5_ = NULL;
 			Video* _tmp6_ = NULL;
 			GdkPixbuf* _tmp7_ = NULL;
 			Video* _tmp8_ = NULL;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = self->video;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = self->new_thumbnail;
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_BIG, _tmp5_, &_inner_error_);
-#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 345 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9356 "VideoSupport.c"
-				goto __catch544_g_error;
+#line 9524 "VideoSupport.c"
+				goto __catch546_g_error;
 			}
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = self->video;
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = self->new_thumbnail;
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_cache_replace (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource), THUMBNAIL_CACHE_SIZE_MEDIUM, _tmp7_, &_inner_error_);
-#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 346 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9367 "VideoSupport.c"
-				goto __catch544_g_error;
+#line 9535 "VideoSupport.c"
+				goto __catch546_g_error;
 			}
-#line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = self->video;
-#line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			thumbnail_source_notify_thumbnail_altered (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_THUMBNAIL_SOURCE, ThumbnailSource));
-#line 9374 "VideoSupport.c"
+#line 9542 "VideoSupport.c"
 		}
-		goto __finally544;
-		__catch544_g_error:
+		goto __finally546;
+		__catch546_g_error:
 		{
 			GError* err = NULL;
 			Video* _tmp9_ = NULL;
@@ -9385,256 +9553,256 @@ void video_interpretable_results_foreground_finish (VideoInterpretableResults* s
 			gchar* _tmp11_ = NULL;
 			GError* _tmp12_ = NULL;
 			const gchar* _tmp13_ = NULL;
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			err = _inner_error_;
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_inner_error_ = NULL;
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = self->video;
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = _tmp10_;
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = err;
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = _tmp12_->message;
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
-			g_message ("VideoSupport.vala:334: Unable to update video thumbnails for %s: %s", _tmp11_, _tmp13_);
-#line 334 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+			g_message ("VideoSupport.vala:350: Unable to update video thumbnails for %s: %s", _tmp11_, _tmp13_);
+#line 350 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_free0 (_tmp11_);
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_error_free0 (err);
-#line 9405 "VideoSupport.c"
+#line 9573 "VideoSupport.c"
 		}
-		__finally544:
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+		__finally546:
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/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 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			g_clear_error (&_inner_error_);
-#line 328 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 344 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return;
-#line 9416 "VideoSupport.c"
+#line 9584 "VideoSupport.c"
 		}
 	}
 }
 
 
 static void video_value_interpretable_results_init (GValue* value) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	value->data[0].v_pointer = NULL;
-#line 9425 "VideoSupport.c"
+#line 9593 "VideoSupport.c"
 }
 
 
 static void video_value_interpretable_results_free_value (GValue* value) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (value->data[0].v_pointer) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (value->data[0].v_pointer);
-#line 9434 "VideoSupport.c"
+#line 9602 "VideoSupport.c"
 	}
 }
 
 
 static void video_value_interpretable_results_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (src_value->data[0].v_pointer) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = video_interpretable_results_ref (src_value->data[0].v_pointer);
-#line 9444 "VideoSupport.c"
+#line 9612 "VideoSupport.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 9448 "VideoSupport.c"
+#line 9616 "VideoSupport.c"
 	}
 }
 
 
 static gpointer video_value_interpretable_results_peek_pointer (const GValue* value) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9456 "VideoSupport.c"
+#line 9624 "VideoSupport.c"
 }
 
 
 static gchar* video_value_interpretable_results_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (collect_values[0].v_pointer) {
-#line 9463 "VideoSupport.c"
+#line 9631 "VideoSupport.c"
 		VideoInterpretableResults* object;
 		object = collect_values[0].v_pointer;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 9470 "VideoSupport.c"
+#line 9638 "VideoSupport.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/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 9474 "VideoSupport.c"
+#line 9642 "VideoSupport.c"
 		}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = video_interpretable_results_ref (object);
-#line 9478 "VideoSupport.c"
+#line 9646 "VideoSupport.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9482 "VideoSupport.c"
+#line 9650 "VideoSupport.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9486 "VideoSupport.c"
+#line 9654 "VideoSupport.c"
 }
 
 
 static gchar* video_value_interpretable_results_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	VideoInterpretableResults** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!object_p) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 9497 "VideoSupport.c"
+#line 9665 "VideoSupport.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (!value->data[0].v_pointer) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = NULL;
-#line 9503 "VideoSupport.c"
+#line 9671 "VideoSupport.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = value->data[0].v_pointer;
-#line 9507 "VideoSupport.c"
+#line 9675 "VideoSupport.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*object_p = video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9511 "VideoSupport.c"
+#line 9679 "VideoSupport.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return NULL;
-#line 9515 "VideoSupport.c"
+#line 9683 "VideoSupport.c"
 }
 
 
 GParamSpec* video_param_spec_interpretable_results (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	VideoParamSpecInterpretableResults* spec;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return G_PARAM_SPEC (spec);
-#line 9529 "VideoSupport.c"
+#line 9697 "VideoSupport.c"
 }
 
 
 gpointer video_value_get_interpretable_results (const GValue* value) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS), NULL);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return value->data[0].v_pointer;
-#line 9538 "VideoSupport.c"
+#line 9706 "VideoSupport.c"
 }
 
 
 void video_value_set_interpretable_results (GValue* value, gpointer v_object) {
 	VideoInterpretableResults* old;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old = value->data[0].v_pointer;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (v_object) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_ref (value->data[0].v_pointer);
-#line 9558 "VideoSupport.c"
+#line 9726 "VideoSupport.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9562 "VideoSupport.c"
+#line 9730 "VideoSupport.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9568 "VideoSupport.c"
+#line 9736 "VideoSupport.c"
 	}
 }
 
 
 void video_value_take_interpretable_results (GValue* value, gpointer v_object) {
 	VideoInterpretableResults* old;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	old = value->data[0].v_pointer;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (v_object) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, VIDEO_TYPE_INTERPRETABLE_RESULTS));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = v_object;
-#line 9587 "VideoSupport.c"
+#line 9755 "VideoSupport.c"
 	} else {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		value->data[0].v_pointer = NULL;
-#line 9591 "VideoSupport.c"
+#line 9759 "VideoSupport.c"
 	}
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (old) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		video_interpretable_results_unref (old);
-#line 9597 "VideoSupport.c"
+#line 9765 "VideoSupport.c"
 	}
 }
 
 
 static void video_interpretable_results_class_init (VideoInterpretableResultsClass * klass) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_interpretable_results_parent_class = g_type_class_peek_parent (klass);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((VideoInterpretableResultsClass *) klass)->finalize = video_interpretable_results_finalize;
-#line 9607 "VideoSupport.c"
+#line 9775 "VideoSupport.c"
 }
 
 
 static void video_interpretable_results_instance_init (VideoInterpretableResults * self) {
-#line 315 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 331 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->update_interpretable = FALSE;
-#line 316 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->is_interpretable = FALSE;
-#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->new_thumbnail = NULL;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->ref_count = 1;
-#line 9620 "VideoSupport.c"
+#line 9788 "VideoSupport.c"
 }
 
 
 static void video_interpretable_results_finalize (VideoInterpretableResults* obj) {
 	VideoInterpretableResults * self;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, VIDEO_TYPE_INTERPRETABLE_RESULTS, VideoInterpretableResults);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_signal_handlers_destroy (self);
-#line 314 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->video);
-#line 317 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 333 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->new_thumbnail);
-#line 9634 "VideoSupport.c"
+#line 9802 "VideoSupport.c"
 }
 
 
@@ -9655,172 +9823,172 @@ GType video_interpretable_results_get_type (void) {
 gpointer video_interpretable_results_ref (gpointer instance) {
 	VideoInterpretableResults* self;
 	self = instance;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return instance;
-#line 9659 "VideoSupport.c"
+#line 9827 "VideoSupport.c"
 }
 
 
 void video_interpretable_results_unref (gpointer instance) {
 	VideoInterpretableResults* self;
 	self = instance;
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		VIDEO_INTERPRETABLE_RESULTS_GET_CLASS (self)->finalize (self);
-#line 313 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 9672 "VideoSupport.c"
+#line 9840 "VideoSupport.c"
 	}
 }
 
 
 static void video_class_init (VideoClass * klass) {
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_parent_class = g_type_class_peek_parent (klass);
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoPrivate));
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->commit_backlinks = video_real_commit_backlinks;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_event_id = video_real_set_event_id;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_backing_files_state = video_real_get_backing_files_state;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((ThumbnailSourceClass *) klass)->get_thumbnail = video_real_get_thumbnail;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_master_md5 = video_real_get_master_md5;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_preview_pixbuf = video_real_get_preview_pixbuf;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((ThumbnailSourceClass *) klass)->create_thumbnail = video_real_create_thumbnail;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->get_typename = video_real_get_typename;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->get_instance_id = video_real_get_instance_id;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_import_id = video_real_get_import_id;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((ThumbnailSourceClass *) klass)->get_preferred_thumbnail_format = video_real_get_preferred_thumbnail_format;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_title = video_real_get_title;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_title = video_real_set_title;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_comment = video_real_get_comment;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_comment = video_real_set_comment;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_rating = video_real_get_rating;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->set_rating = video_real_set_rating;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->increase_rating = video_real_increase_rating;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->decrease_rating = video_real_decrease_rating;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->is_trashed = video_real_is_trashed;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->is_offline = video_real_is_offline;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->mark_offline = video_real_mark_offline;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->mark_online = video_real_mark_online;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->trash = video_real_trash;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->untrash = video_real_untrash;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_event_id = video_real_get_event_id;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataObjectClass *) klass)->to_string = video_real_to_string;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_exposure_time = video_real_get_exposure_time;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_dimensions = video_real_get_dimensions;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_filesize = video_real_get_filesize;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_master_filesize = video_real_get_master_filesize;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_timestamp = video_real_get_timestamp;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_file = video_real_get_file;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceClass *) klass)->get_master_file = video_real_get_master_file;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->destroy = video_real_destroy;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataSourceClass *) klass)->internal_delete_backing = video_real_internal_delete_backing;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (klass)->finalize = video_finalize;
-#line 9756 "VideoSupport.c"
+#line 9924 "VideoSupport.c"
 }
 
 
 static void video_flaggable_interface_init (FlaggableIface * iface) {
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_flaggable_parent_iface = g_type_interface_peek_parent (iface);
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->is_flagged = (gboolean (*)(Flaggable*)) video_real_is_flagged;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_flagged = (void (*)(Flaggable*)) video_real_mark_flagged;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_unflagged = (void (*)(Flaggable*)) video_real_mark_unflagged;
-#line 9769 "VideoSupport.c"
+#line 9937 "VideoSupport.c"
 }
 
 
 static void video_monitorable_interface_init (MonitorableIface * iface) {
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_monitorable_parent_iface = g_type_interface_peek_parent (iface);
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->is_offline = (gboolean (*)(Monitorable*)) video_real_is_offline;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_offline = (void (*)(Monitorable*)) video_real_mark_offline;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->mark_online = (void (*)(Monitorable*)) video_real_mark_online;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_master_timestamp = (void (*)(Monitorable*, GFileInfo*)) video_real_set_master_timestamp;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_master_file = (void (*)(Monitorable*, GFile*)) video_real_set_master_file;
-#line 9786 "VideoSupport.c"
+#line 9954 "VideoSupport.c"
 }
 
 
 static void video_dateable_interface_init (DateableIface * iface) {
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_dateable_parent_iface = g_type_interface_peek_parent (iface);
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->get_exposure_time = (time_t (*)(Dateable*)) video_real_get_exposure_time;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	iface->set_exposure_time = (void (*)(Dateable*, time_t)) video_real_set_exposure_time;
-#line 9797 "VideoSupport.c"
+#line 9965 "VideoSupport.c"
 }
 
 
 static void video_instance_init (Video * self) {
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_GET_PRIVATE (self);
-#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_init (&self->priv->__lock_backing_row);
-#line 9806 "VideoSupport.c"
+#line 9974 "VideoSupport.c"
 }
 
 
 static void video_finalize (GObject* obj) {
 	Video * self;
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO, Video);
-#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_rec_mutex_clear (&self->priv->__lock_backing_row);
-#line 347 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 363 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_video_row_unref0 (self->priv->backing_row);
-#line 306 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 322 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	G_OBJECT_CLASS (video_parent_class)->finalize (obj);
-#line 9820 "VideoSupport.c"
+#line 9988 "VideoSupport.c"
 }
 
 
@@ -9857,44 +10025,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 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9859 "VideoSupport.c"
+#line 10027 "VideoSupport.c"
 }
 
 
 static guint64* _uint64_dup (guint64* self) {
 	guint64* dup;
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	dup = g_new0 (guint64, 1);
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	memcpy (dup, self, sizeof (guint64));
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return dup;
-#line 9871 "VideoSupport.c"
+#line 10039 "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 1063 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9880 "VideoSupport.c"
+#line 10048 "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 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_trashcan_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 9887 "VideoSupport.c"
+#line 10055 "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 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_on_offline_contents_altered ((VideoSourceCollection*) self, added, removed);
-#line 9894 "VideoSupport.c"
+#line 10062 "VideoSupport.c"
 }
 
 
@@ -9904,43 +10072,43 @@ VideoSourceCollection* video_source_collection_construct (GType object_type) {
 	MediaSourceHoldingTank* _tmp1_ = NULL;
 	MediaSourceHoldingTank* _tmp2_ = NULL;
 	MediaSourceHoldingTank* _tmp3_ = NULL;
-#line 1063 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1079 "/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 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/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 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/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 1065 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp1_);
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/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 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = _tmp2_;
-#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/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 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp3_);
-#line 1062 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return self;
-#line 9924 "VideoSupport.c"
+#line 10092 "VideoSupport.c"
 }
 
 
 VideoSourceCollection* video_source_collection_new (void) {
-#line 1062 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return video_source_collection_construct (TYPE_VIDEO_SOURCE_COLLECTION);
-#line 9931 "VideoSupport.c"
+#line 10099 "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 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9940 "VideoSupport.c"
+#line 10108 "VideoSupport.c"
 }
 
 
@@ -9948,24 +10116,24 @@ static MediaSourceHoldingTank* video_source_collection_real_create_trashcan (Med
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_ = NULL;
-#line 1069 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1085 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/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 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9956 "VideoSupport.c"
+#line 10124 "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 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9965 "VideoSupport.c"
+#line 10133 "VideoSupport.c"
 }
 
 
@@ -9973,15 +10141,15 @@ static MediaSourceHoldingTank* video_source_collection_real_create_offline_bin (
 	VideoSourceCollection * self;
 	MediaSourceHoldingTank* result = NULL;
 	MediaSourceHoldingTank* _tmp0_ = NULL;
-#line 1073 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/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 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 9981 "VideoSupport.c"
+#line 10149 "VideoSupport.c"
 }
 
 
@@ -9990,21 +10158,21 @@ static MediaMonitor* video_source_collection_real_create_media_monitor (MediaSou
 	MediaMonitor* result = NULL;
 	GCancellable* _tmp0_ = NULL;
 	VideoMonitor* _tmp1_ = NULL;
-#line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_WORKERS (workers), NULL);
-#line 1077 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = cancellable;
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_monitor_new (_tmp0_);
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_MONITOR, MediaMonitor);
-#line 1078 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1094 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10004 "VideoSupport.c"
+#line 10172 "VideoSupport.c"
 }
 
 
@@ -10012,17 +10180,17 @@ static gboolean video_source_collection_real_holds_type_of_source (SourceCollect
 	VideoSourceCollection * self;
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
-#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1097 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1081 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1097 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_VIDEO);
-#line 1082 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1098 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10022 "VideoSupport.c"
+#line 10190 "VideoSupport.c"
 }
 
 
@@ -10030,15 +10198,15 @@ static gchar* video_source_collection_real_get_typename (MediaSourceCollection*
 	VideoSourceCollection * self;
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-#line 1085 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = g_strdup (VIDEO_TYPENAME);
-#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp0_;
-#line 1086 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1102 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10038 "VideoSupport.c"
+#line 10206 "VideoSupport.c"
 }
 
 
@@ -10047,57 +10215,57 @@ static gboolean video_source_collection_real_is_file_recognized (MediaSourceColl
 	gboolean result = FALSE;
 	GFile* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1089 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), FALSE);
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = video_reader_is_supported_video_file (_tmp0_);
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1090 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10059 "VideoSupport.c"
+#line 10227 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_trashcan_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1093 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1095 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1111 "/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 10078 "VideoSupport.c"
+#line 10246 "VideoSupport.c"
 }
 
 
 static void video_source_collection_on_offline_contents_altered (VideoSourceCollection* self, GeeCollection* added, GeeCollection* removed) {
 	GeeCollection* _tmp0_ = NULL;
 	GeeCollection* _tmp1_ = NULL;
-#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_COLLECTION (added));
-#line 1099 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1115 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_COLLECTION (removed));
-#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = removed;
-#line 1101 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1117 "/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 10097 "VideoSupport.c"
+#line 10265 "VideoSupport.c"
 }
 
 
@@ -10107,19 +10275,19 @@ static MediaSource* video_source_collection_real_fetch_by_numeric_id (MediaSourc
 	gint64 _tmp0_ = 0LL;
 	VideoID _tmp1_ = {0};
 	Video* _tmp2_ = NULL;
-#line 1105 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1121 "/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 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = numeric_id;
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp1_, _tmp0_);
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video_source_collection_fetch (self, &_tmp1_);
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource);
-#line 1106 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1122 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10119 "VideoSupport.c"
+#line 10287 "VideoSupport.c"
 }
 
 
@@ -10132,29 +10300,29 @@ gint64 video_source_collection_get_video_key (DataSource* source) {
 	VideoID _tmp2_ = {0};
 	VideoID _tmp3_ = {0};
 	gint64 _tmp4_ = 0LL;
-#line 1109 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), 0LL);
-#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIDEO, Video));
-#line 1110 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1126 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = _tmp1_;
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_get_video_id (video, &_tmp2_);
-#line 1111 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1127 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id = _tmp2_;
-#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id;
-#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_.id;
-#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1113 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10154 "VideoSupport.c"
+#line 10322 "VideoSupport.c"
 }
 
 
@@ -10162,17 +10330,17 @@ gboolean video_source_collection_is_video_trashed (DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1116 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/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 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1117 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10172 "VideoSupport.c"
+#line 10340 "VideoSupport.c"
 }
 
 
@@ -10180,17 +10348,17 @@ gboolean video_source_collection_is_video_offline (DataSource* source) {
 	gboolean result = FALSE;
 	DataSource* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 1120 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1136 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
-#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = source;
-#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/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 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp1_;
-#line 1121 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10190 "VideoSupport.c"
+#line 10358 "VideoSupport.c"
 }
 
 
@@ -10199,21 +10367,21 @@ Video* video_source_collection_fetch (VideoSourceCollection* self, VideoID* vide
 	VideoID _tmp0_ = {0};
 	gint64 _tmp1_ = 0LL;
 	DataSource* _tmp2_ = NULL;
-#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1124 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (video_id != NULL, NULL);
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = *video_id;
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_.id;
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/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 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_VIDEO, Video);
-#line 1125 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10213 "VideoSupport.c"
+#line 10381 "VideoSupport.c"
 }
 
 
@@ -10225,27 +10393,27 @@ static GeeCollection* video_source_collection_real_get_event_source_ids (MediaSo
 	EventID _tmp2_ = {0};
 	GeeArrayList* _tmp3_ = NULL;
 	GeeCollection* _tmp4_ = NULL;
-#line 1128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1128 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (event_id != NULL, NULL);
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video_table_get_instance ();
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = *event_id;
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_table_get_event_source_ids (_tmp1_, &_tmp2_);
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_database_table_unref0 (_tmp1_);
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp4_;
-#line 1129 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1145 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10245 "VideoSupport.c"
+#line 10413 "VideoSupport.c"
 }
 
 
@@ -10266,113 +10434,113 @@ Video* video_source_collection_get_state_by_file (VideoSourceCollection* self, G
 	GFile* _tmp10_ = NULL;
 	MediaSource* _tmp11_ = NULL;
 	Video* _tmp12_ = NULL;
-#line 1132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), NULL);
-#line 1132 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = file;
-#line 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1149 "/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 1133 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_VIDEO, Video);
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = video;
-#line 1134 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1150 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp2_ != NULL) {
-#line 1135 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_ONLINE;
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10288 "VideoSupport.c"
+#line 10456 "VideoSupport.c"
 		}
-#line 1137 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1153 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10292 "VideoSupport.c"
+#line 10460 "VideoSupport.c"
 	}
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/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 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = _tmp3_;
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = file;
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = media_source_holding_tank_fetch_by_master_file (_tmp4_, _tmp5_);
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_VIDEO, Video);
-#line 1140 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp4_);
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp7_ = video;
-#line 1141 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1157 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp7_ != NULL) {
-#line 1142 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1158 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_TRASH;
-#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10320 "VideoSupport.c"
+#line 10488 "VideoSupport.c"
 		}
-#line 1144 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10324 "VideoSupport.c"
+#line 10492 "VideoSupport.c"
 	}
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/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 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp9_ = _tmp8_;
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp10_ = file;
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp11_ = media_source_holding_tank_fetch_by_master_file (_tmp9_, _tmp10_);
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_VIDEO, Video);
-#line 1147 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_source_holding_tank_unref0 (_tmp9_);
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp12_ = video;
-#line 1148 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp12_ != NULL) {
-#line 1149 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1165 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_vala_state = VIDEO_SOURCE_COLLECTION_STATE_OFFLINE;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		result = video;
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		if (state) {
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			*state = _vala_state;
-#line 10352 "VideoSupport.c"
+#line 10520 "VideoSupport.c"
 		}
-#line 1151 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return result;
-#line 10356 "VideoSupport.c"
+#line 10524 "VideoSupport.c"
 	}
-#line 1154 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1170 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_vala_state = VIDEO_SOURCE_COLLECTION_STATE_UNKNOWN;
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = NULL;
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (video);
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (state) {
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		*state = _vala_state;
-#line 10368 "VideoSupport.c"
+#line 10536 "VideoSupport.c"
 	}
-#line 1156 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10372 "VideoSupport.c"
+#line 10540 "VideoSupport.c"
 }
 
 
@@ -10386,83 +10554,83 @@ static void video_source_collection_compare_backing (VideoSourceCollection* self
 	GFileInfo* _tmp6_ = NULL;
 	GTimeVal _tmp7_ = {0};
 	glong _tmp8_ = 0L;
-#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO (video));
-#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1159 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = video;
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = media_source_get_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = info;
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = g_file_info_get_size (_tmp2_);
-#line 1160 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1176 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp1_ != ((guint64) _tmp3_)) {
-#line 1161 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		return;
-#line 10406 "VideoSupport.c"
+#line 10574 "VideoSupport.c"
 	}
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp4_ = video;
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp5_ = media_source_get_timestamp (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp6_ = info;
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_file_info_get_modification_time (_tmp6_, &_tmp7_);
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp8_ = _tmp7_.tv_sec;
-#line 1163 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp5_ == ((time_t) _tmp8_)) {
-#line 10420 "VideoSupport.c"
+#line 10588 "VideoSupport.c"
 		GeeCollection* _tmp9_ = NULL;
 		Video* _tmp10_ = NULL;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp9_ = matching_master;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp10_ = video;
-#line 1164 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1180 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		gee_collection_add (_tmp9_, _tmp10_);
-#line 10429 "VideoSupport.c"
+#line 10597 "VideoSupport.c"
 	}
 }
 
 
 void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* self, GFileInfo* info, GeeCollection* matching_master) {
-#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (G_IS_FILE_INFO (info));
-#line 1167 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1183 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (GEE_IS_COLLECTION (matching_master));
-#line 10441 "VideoSupport.c"
+#line 10609 "VideoSupport.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeCollection* _tmp0_ = NULL;
 		GeeCollection* _tmp1_ = NULL;
 		GeeIterator* _tmp2_ = NULL;
 		GeeIterator* _tmp3_ = NULL;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = data_collection_get_all (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_DATA_COLLECTION, DataCollection));
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = _tmp0_;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_object_it = _tmp3_;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10462 "VideoSupport.c"
+#line 10630 "VideoSupport.c"
 			GeeIterator* _tmp4_ = NULL;
 			gboolean _tmp5_ = FALSE;
 			DataObject* object = NULL;
@@ -10471,37 +10639,37 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			DataObject* _tmp8_ = NULL;
 			GFileInfo* _tmp9_ = NULL;
 			GeeCollection* _tmp10_ = NULL;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp4_ = _object_it;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp5_) {
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10479 "VideoSupport.c"
+#line 10647 "VideoSupport.c"
 			}
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _object_it;
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_get (_tmp6_);
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			object = (DataObject*) _tmp7_;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = object;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = info;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = matching_master;
-#line 1169 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_VIDEO, Video), _tmp9_, _tmp10_);
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (object);
-#line 10497 "VideoSupport.c"
+#line 10665 "VideoSupport.c"
 		}
-#line 1168 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1184 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_object_it);
-#line 10501 "VideoSupport.c"
+#line 10669 "VideoSupport.c"
 	}
 	{
 		GeeIterator* _media_it = NULL;
@@ -10509,21 +10677,21 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 		GeeCollection* _tmp12_ = NULL;
 		GeeIterator* _tmp13_ = NULL;
 		GeeIterator* _tmp14_ = NULL;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/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 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp12_ = _tmp11_;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp14_ = _tmp13_;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp12_);
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_media_it = _tmp14_;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10523 "VideoSupport.c"
+#line 10691 "VideoSupport.c"
 			GeeIterator* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
 			MediaSource* media = NULL;
@@ -10532,37 +10700,37 @@ void video_source_collection_fetch_by_matching_backing (VideoSourceCollection* s
 			MediaSource* _tmp19_ = NULL;
 			GFileInfo* _tmp20_ = NULL;
 			GeeCollection* _tmp21_ = NULL;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = _media_it;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = gee_iterator_next (_tmp15_);
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp16_) {
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10540 "VideoSupport.c"
+#line 10708 "VideoSupport.c"
 			}
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp17_ = _media_it;
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp18_ = gee_iterator_get (_tmp17_);
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			media = (MediaSource*) _tmp18_;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp19_ = media;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp20_ = info;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp21_ = matching_master;
-#line 1172 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1188 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video_source_collection_compare_backing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_VIDEO, Video), _tmp20_, _tmp21_);
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (media);
-#line 10558 "VideoSupport.c"
+#line 10726 "VideoSupport.c"
 		}
-#line 1171 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_media_it);
-#line 10562 "VideoSupport.c"
+#line 10730 "VideoSupport.c"
 	}
 }
 
@@ -10573,30 +10741,30 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 	GeeIterable* _tmp13_ = NULL;
 	GeeIterable* _tmp26_ = NULL;
 	GeeIterable* _tmp27_ = NULL;
-#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((added == NULL) || GEE_IS_ITERABLE (added));
-#line 1175 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1191 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail ((removed == NULL) || GEE_IS_ITERABLE (removed));
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = added;
-#line 1177 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ != NULL) {
-#line 10583 "VideoSupport.c"
+#line 10751 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp1_ = NULL;
 			GeeIterator* _tmp2_ = NULL;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp1_ = added;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp2_ = gee_iterable_iterator (_tmp1_);
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp2_;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10596 "VideoSupport.c"
+#line 10764 "VideoSupport.c"
 				GeeIterator* _tmp3_ = NULL;
 				gboolean _tmp4_ = FALSE;
 				DataObject* object = NULL;
@@ -10609,67 +10777,67 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				Video* _tmp10_ = NULL;
 				guint64 _tmp11_ = 0ULL;
 				Video* _tmp12_ = NULL;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp3_ = _object_it;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp4_ = gee_iterator_next (_tmp3_);
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp4_) {
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10617 "VideoSupport.c"
+#line 10785 "VideoSupport.c"
 				}
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp5_ = _object_it;
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp6_ = gee_iterator_get (_tmp5_);
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				object = (DataObject*) _tmp6_;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp7_ = object;
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_VIDEO, Video));
-#line 1179 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1195 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp8_;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp9_ = self->priv->filesize_to_video;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp10_ = video;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp11_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp12_ = video;
-#line 1181 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				gee_multi_map_set (_tmp9_, &_tmp11_, _tmp12_);
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10645 "VideoSupport.c"
+#line 10813 "VideoSupport.c"
 			}
-#line 1178 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1194 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10649 "VideoSupport.c"
+#line 10817 "VideoSupport.c"
 		}
 	}
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp13_ = removed;
-#line 1185 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1201 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp13_ != NULL) {
-#line 10656 "VideoSupport.c"
+#line 10824 "VideoSupport.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp14_ = NULL;
 			GeeIterator* _tmp15_ = NULL;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = removed;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = gee_iterable_iterator (_tmp14_);
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_object_it = _tmp15_;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			while (TRUE) {
-#line 10669 "VideoSupport.c"
+#line 10837 "VideoSupport.c"
 				GeeIterator* _tmp16_ = NULL;
 				gboolean _tmp17_ = FALSE;
 				DataObject* object = NULL;
@@ -10682,66 +10850,66 @@ static void video_source_collection_real_notify_contents_altered (DataCollection
 				Video* _tmp23_ = NULL;
 				guint64 _tmp24_ = 0ULL;
 				Video* _tmp25_ = NULL;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp16_ = _object_it;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = gee_iterator_next (_tmp16_);
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				if (!_tmp17_) {
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 					break;
-#line 10690 "VideoSupport.c"
+#line 10858 "VideoSupport.c"
 				}
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp18_ = _object_it;
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp19_ = gee_iterator_get (_tmp18_);
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				object = (DataObject*) _tmp19_;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp20_ = object;
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp21_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_VIDEO, Video));
-#line 1187 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1203 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video = _tmp21_;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp22_ = self->priv->filesize_to_video;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp23_ = video;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp24_ = media_source_get_master_filesize (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp25_ = video;
-#line 1189 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1205 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				gee_multi_map_remove (_tmp22_, &_tmp24_, _tmp25_);
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (object);
-#line 10718 "VideoSupport.c"
+#line 10886 "VideoSupport.c"
 			}
-#line 1186 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_object_it);
-#line 10722 "VideoSupport.c"
+#line 10890 "VideoSupport.c"
 		}
 	}
-#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp26_ = added;
-#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1209 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp27_ = removed;
-#line 1193 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1209 "/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 10731 "VideoSupport.c"
+#line 10899 "VideoSupport.c"
 }
 
 
 void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollection* self, const gchar* basename, guint64 filesize, VideoID* result) {
 	VideoID _tmp19_ = {0};
-#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (IS_VIDEO_SOURCE_COLLECTION (self));
-#line 1196 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1212 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_if_fail (basename != NULL);
-#line 10741 "VideoSupport.c"
+#line 10909 "VideoSupport.c"
 	{
 		GeeIterator* _video_it = NULL;
 		GeeMultiMap* _tmp0_ = NULL;
@@ -10750,25 +10918,25 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 		GeeCollection* _tmp3_ = NULL;
 		GeeIterator* _tmp4_ = NULL;
 		GeeIterator* _tmp5_ = NULL;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp0_ = self->priv->filesize_to_video;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp1_ = filesize;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp2_ = gee_multi_map_get (_tmp0_, &_tmp1_);
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp3_ = _tmp2_;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_tmp5_ = _tmp4_;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_tmp3_);
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_video_it = _tmp5_;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		while (TRUE) {
-#line 10768 "VideoSupport.c"
+#line 10936 "VideoSupport.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			Video* video = NULL;
@@ -10781,72 +10949,72 @@ void video_source_collection_get_basename_filesize_duplicate (VideoSourceCollect
 			const gchar* _tmp14_ = NULL;
 			gint _tmp15_ = 0;
 			gboolean _tmp16_ = FALSE;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp6_ = _video_it;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp7_ = gee_iterator_next (_tmp6_);
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (!_tmp7_) {
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				break;
-#line 10789 "VideoSupport.c"
+#line 10957 "VideoSupport.c"
 			}
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp8_ = _video_it;
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp9_ = gee_iterator_get (_tmp8_);
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			video = (Video*) _tmp9_;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp10_ = video;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp11_ = media_source_get_master_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp12_ = _tmp11_;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp13_ = g_file_get_basename (_tmp12_);
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp14_ = basename;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp15_ = utf8_ci_compare (_tmp13_, _tmp14_);
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_tmp16_ = _tmp15_ == 0;
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (_tmp12_);
-#line 1198 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1214 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			if (_tmp16_) {
-#line 10815 "VideoSupport.c"
+#line 10983 "VideoSupport.c"
 				Video* _tmp17_ = NULL;
 				VideoID _tmp18_ = {0};
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_tmp17_ = video;
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				video_get_video_id (_tmp17_, &_tmp18_);
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				*result = _tmp18_;
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (video);
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				_g_object_unref0 (_video_it);
-#line 1199 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1215 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 				return;
-#line 10830 "VideoSupport.c"
+#line 10998 "VideoSupport.c"
 			}
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 			_g_object_unref0 (video);
-#line 10834 "VideoSupport.c"
+#line 11002 "VideoSupport.c"
 		}
-#line 1197 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1213 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_g_object_unref0 (_video_it);
-#line 10838 "VideoSupport.c"
+#line 11006 "VideoSupport.c"
 	}
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_id_init (&_tmp19_, VIDEO_ID_INVALID);
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	*result = _tmp19_;
-#line 1202 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1218 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return;
-#line 10846 "VideoSupport.c"
+#line 11014 "VideoSupport.c"
 }
 
 
@@ -10856,23 +11024,23 @@ gboolean video_source_collection_has_basename_filesize_duplicate (VideoSourceCol
 	guint64 _tmp1_ = 0ULL;
 	VideoID _tmp2_ = {0};
 	gboolean _tmp3_ = FALSE;
-#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1222 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (IS_VIDEO_SOURCE_COLLECTION (self), FALSE);
-#line 1206 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1222 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_return_val_if_fail (basename != NULL, FALSE);
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = basename;
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp1_ = filesize;
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_get_basename_filesize_duplicate (self, _tmp0_, _tmp1_, &_tmp2_);
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp3_ = video_id_is_valid (&_tmp2_);
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp3_;
-#line 1207 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1223 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10872 "VideoSupport.c"
+#line 11040 "VideoSupport.c"
 }
 
 
@@ -10881,88 +11049,88 @@ static TransactionController* video_source_collection_real_get_transaction_contr
 	VideoSourceCollection* self;
 	TransactionController* _tmp0_ = NULL;
 	TransactionController* _tmp2_ = NULL;
-#line 1050 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1066 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = self->priv->_transaction_controller;
-#line 1051 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1067 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	if (_tmp0_ == NULL) {
-#line 10887 "VideoSupport.c"
+#line 11055 "VideoSupport.c"
 		MediaSourceTransactionController* _tmp1_ = NULL;
-#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1068 "/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 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 1052 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1068 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 		self->priv->_transaction_controller = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_TRANSACTION_CONTROLLER, TransactionController);
-#line 10895 "VideoSupport.c"
+#line 11063 "VideoSupport.c"
 	}
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp2_ = self->priv->_transaction_controller;
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	result = _tmp2_;
-#line 1054 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1070 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	return result;
-#line 10903 "VideoSupport.c"
+#line 11071 "VideoSupport.c"
 }
 
 
 static void video_source_collection_class_init (VideoSourceCollectionClass * klass) {
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	video_source_collection_parent_class = g_type_class_peek_parent (klass);
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataCollectionClass *) klass)->finalize = video_source_collection_finalize;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	g_type_class_add_private (klass, sizeof (VideoSourceCollectionPrivate));
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_trashcan = video_source_collection_real_create_trashcan;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_offline_bin = video_source_collection_real_create_offline_bin;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->create_media_monitor = video_source_collection_real_create_media_monitor;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((SourceCollectionClass *) klass)->holds_type_of_source = video_source_collection_real_holds_type_of_source;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->get_typename = video_source_collection_real_get_typename;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->is_file_recognized = video_source_collection_real_is_file_recognized;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->fetch_by_numeric_id = video_source_collection_real_fetch_by_numeric_id;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((MediaSourceCollectionClass *) klass)->get_event_source_ids = video_source_collection_real_get_event_source_ids;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	((DataCollectionClass *) klass)->notify_contents_altered = video_source_collection_real_notify_contents_altered;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	MEDIA_SOURCE_COLLECTION_CLASS (klass)->get_transaction_controller = video_source_collection_real_get_transaction_controller;
-#line 10934 "VideoSupport.c"
+#line 11102 "VideoSupport.c"
 }
 
 
 static void video_source_collection_instance_init (VideoSourceCollection * self) {
 	GeeTreeMultiMap* _tmp0_ = NULL;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv = VIDEO_SOURCE_COLLECTION_GET_PRIVATE (self);
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->_transaction_controller = NULL;
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_tmp0_ = gee_tree_multi_map_new (G_TYPE_UINT64, (GBoxedCopyFunc) _uint64_dup, g_free, TYPE_VIDEO, (GBoxedCopyFunc) g_object_ref, g_object_unref, _uint64_compare_gcompare_data_func, NULL, NULL, NULL, NULL, NULL);
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self->priv->filesize_to_video = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_MULTI_MAP, GeeMultiMap);
-#line 10948 "VideoSupport.c"
+#line 11116 "VideoSupport.c"
 }
 
 
 static void video_source_collection_finalize (DataCollection* obj) {
 	VideoSourceCollection * self;
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_VIDEO_SOURCE_COLLECTION, VideoSourceCollection);
-#line 1058 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1074 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_transaction_controller_unref0 (self->priv->_transaction_controller);
-#line 1059 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1075 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	_g_object_unref0 (self->priv->filesize_to_video);
-#line 1041 "/home/jens/Source/shotwell/src/VideoSupport.vala"
+#line 1057 "/home/jens/Source/shotwell/src/VideoSupport.vala"
 	DATA_COLLECTION_CLASS (video_source_collection_parent_class)->finalize (obj);
-#line 10962 "VideoSupport.c"
+#line 11130 "VideoSupport.c"
 }
 
 
diff --git a/src/VideoSupport.vala b/src/VideoSupport.vala
index 540aad4..5076a31 100644
--- a/src/VideoSupport.vala
+++ b/src/VideoSupport.vala
@@ -53,9 +53,24 @@ public class VideoReader {
      }
     
     public static bool is_supported_video_file(File file) {
+        var mime_type = ContentType.guess(file.get_basename(), new uchar[0], null);
+        // special case: deep-check content-type of files ending with .ogg
+        if (mime_type == "audio/ogg" && file.has_uri_scheme("file")) {
+            try {
+                var info = file.query_info(FileAttribute.STANDARD_CONTENT_TYPE,
+                                           FileQueryInfoFlags.NONE);
+                var content_type = info.get_content_type();
+                if (content_type != null && content_type.has_prefix ("video/")) {
+                    return true;
+                }
+            } catch (Error error) {
+                debug("Failed to query content type: %s", error.message);
+            }
+        }
+
         return is_supported_video_filename(file.get_basename());
     }
-    
+
     public static bool is_supported_video_filename(string filename) {
         string mime_type;
         mime_type = ContentType.guess(filename, new uchar[0], null);
@@ -63,7 +78,7 @@ public class VideoReader {
             string? extension = null;
             string? name = null;
             disassemble_filename(filename, out name, out extension);
-            
+
             if (extension == null)
                 return true;
 
@@ -71,9 +86,10 @@ public class VideoReader {
                 if (utf8_ci_compare(s, extension) == 0)
                     return false;
             }
-                
+
             return true;
         } else {
+            debug("Skipping %s, unsupported mime type %s", filename, mime_type);
             return false;
         }
     }
diff --git a/src/camera/CameraTable.c b/src/camera/CameraTable.c
index 926608c..33dc872 100644
--- a/src/camera/CameraTable.c
+++ b/src/camera/CameraTable.c
@@ -672,7 +672,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
 #line 675 "CameraTable.c"
-				goto __catch56_gphoto_error;
+				goto __catch57_gphoto_error;
 			}
 #line 63 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -683,8 +683,8 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 684 "CameraTable.c"
 		}
 	}
-	goto __finally56;
-	__catch56_gphoto_error:
+	goto __finally57;
+	__catch57_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -707,7 +707,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		return result;
 #line 709 "CameraTable.c"
 	}
-	__finally56:
+	__finally57:
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 62 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -726,7 +726,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
 #line 729 "CameraTable.c"
-				goto __catch57_gphoto_error;
+				goto __catch58_gphoto_error;
 			}
 #line 71 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -737,8 +737,8 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 #line 738 "CameraTable.c"
 		}
 	}
-	goto __finally57;
-	__catch57_gphoto_error:
+	goto __finally58;
+	__catch58_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -757,7 +757,7 @@ static gboolean camera_table_delayed_init (CameraTable* self) {
 		_g_error_free0 (err);
 #line 759 "CameraTable.c"
 	}
-	__finally57:
+	__finally58:
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 70 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
@@ -1747,7 +1747,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1748 "CameraTable.c"
-				goto __catch58_g_regex_error;
+				goto __catch59_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1772,7 +1772,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1773 "CameraTable.c"
-				goto __catch58_g_regex_error;
+				goto __catch59_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1798,8 +1798,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 1798 "CameraTable.c"
 	}
-	goto __finally58;
-	__catch58_g_regex_error:
+	goto __finally59;
+	__catch59_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1812,7 +1812,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 1812 "CameraTable.c"
 	}
-	__finally58:
+	__finally59:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4170,7 +4170,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			if (_inner_error_->domain == GPHOTO_ERROR) {
 #line 4171 "CameraTable.c"
-				goto __catch59_gphoto_error;
+				goto __catch60_gphoto_error;
 			}
 #line 399 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4181,8 +4181,8 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 #line 4180 "CameraTable.c"
 		}
 	}
-	goto __finally59;
-	__catch59_gphoto_error:
+	goto __finally60;
+	__catch60_gphoto_error:
 	{
 		GError* err = NULL;
 		GError* _tmp2_ = NULL;
@@ -4201,7 +4201,7 @@ static void camera_table_on_update_cameras (CameraTable* self) {
 		_g_error_free0 (err);
 #line 4201 "CameraTable.c"
 	}
-	__finally59:
+	__finally60:
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 398 "/home/jens/Source/shotwell/src/camera/CameraTable.vala"
diff --git a/src/camera/GPhoto.c b/src/camera/GPhoto.c
index b21ac78..41e795c 100644
--- a/src/camera/GPhoto.c
+++ b/src/camera/GPhoto.c
@@ -23,6 +23,10 @@
 #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>
+#include <unistd.h>
 #include <gobject/gvaluecollector.h>
 
 
@@ -236,28 +240,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 240 "GPhoto.c"
+#line 244 "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 247 "GPhoto.c"
+#line 251 "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 254 "GPhoto.c"
+#line 258 "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 261 "GPhoto.c"
+#line 265 "GPhoto.c"
 }
 
 
@@ -266,21 +270,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 270 "GPhoto.c"
+#line 274 "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 277 "GPhoto.c"
+#line 281 "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 284 "GPhoto.c"
+#line 288 "GPhoto.c"
 }
 
 
@@ -315,14 +319,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 319 "GPhoto.c"
+#line 323 "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 326 "GPhoto.c"
+#line 330 "GPhoto.c"
 }
 
 
@@ -335,14 +339,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 339 "GPhoto.c"
+#line 343 "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 346 "GPhoto.c"
+#line 350 "GPhoto.c"
 }
 
 
@@ -351,14 +355,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 355 "GPhoto.c"
+#line 359 "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 362 "GPhoto.c"
+#line 366 "GPhoto.c"
 }
 
 
@@ -367,14 +371,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 371 "GPhoto.c"
+#line 375 "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 378 "GPhoto.c"
+#line 382 "GPhoto.c"
 }
 
 
@@ -383,14 +387,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 387 "GPhoto.c"
+#line 391 "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 394 "GPhoto.c"
+#line 398 "GPhoto.c"
 }
 
 
@@ -399,7 +403,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 403 "GPhoto.c"
+#line 407 "GPhoto.c"
 }
 
 
@@ -412,7 +416,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 416 "GPhoto.c"
+#line 420 "GPhoto.c"
 }
 
 
@@ -425,7 +429,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 429 "GPhoto.c"
+#line 433 "GPhoto.c"
 }
 
 
@@ -436,7 +440,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 440 "GPhoto.c"
+#line 444 "GPhoto.c"
 }
 
 
@@ -452,7 +456,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 456 "GPhoto.c"
+#line 460 "GPhoto.c"
 }
 
 
@@ -468,7 +472,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 472 "GPhoto.c"
+#line 476 "GPhoto.c"
 }
 
 
@@ -484,7 +488,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 488 "GPhoto.c"
+#line 492 "GPhoto.c"
 }
 
 
@@ -508,7 +512,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 512 "GPhoto.c"
+#line 516 "GPhoto.c"
 }
 
 
@@ -522,7 +526,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 526 "GPhoto.c"
+#line 530 "GPhoto.c"
 }
 
 
@@ -533,14 +537,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 537 "GPhoto.c"
+#line 541 "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 544 "GPhoto.c"
+#line 548 "GPhoto.c"
 }
 
 
@@ -549,7 +553,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 553 "GPhoto.c"
+#line 557 "GPhoto.c"
 	}
 }
 
@@ -559,11 +563,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 563 "GPhoto.c"
+#line 567 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 567 "GPhoto.c"
+#line 571 "GPhoto.c"
 	}
 }
 
@@ -571,37 +575,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 575 "GPhoto.c"
+#line 579 "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 582 "GPhoto.c"
+#line 586 "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 589 "GPhoto.c"
+#line 593 "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 593 "GPhoto.c"
+#line 597 "GPhoto.c"
 		}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = gp_context_wrapper_ref (object);
-#line 597 "GPhoto.c"
+#line 601 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 601 "GPhoto.c"
+#line 605 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return NULL;
-#line 605 "GPhoto.c"
+#line 609 "GPhoto.c"
 }
 
 
@@ -612,25 +616,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 616 "GPhoto.c"
+#line 620 "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 622 "GPhoto.c"
+#line 626 "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 626 "GPhoto.c"
+#line 630 "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 630 "GPhoto.c"
+#line 634 "GPhoto.c"
 	}
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return NULL;
-#line 634 "GPhoto.c"
+#line 638 "GPhoto.c"
 }
 
 
@@ -644,7 +648,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 648 "GPhoto.c"
+#line 652 "GPhoto.c"
 }
 
 
@@ -653,7 +657,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 657 "GPhoto.c"
+#line 661 "GPhoto.c"
 }
 
 
@@ -673,17 +677,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 677 "GPhoto.c"
+#line 681 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 681 "GPhoto.c"
+#line 685 "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 687 "GPhoto.c"
+#line 691 "GPhoto.c"
 	}
 }
 
@@ -702,17 +706,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 706 "GPhoto.c"
+#line 710 "GPhoto.c"
 	} else {
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		value->data[0].v_pointer = NULL;
-#line 710 "GPhoto.c"
+#line 714 "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 716 "GPhoto.c"
+#line 720 "GPhoto.c"
 	}
 }
 
@@ -736,7 +740,7 @@ static void gp_context_wrapper_class_init (GPContextWrapperClass * klass) {
 	((GPContextWrapperClass *) klass)->progress_update = gp_context_wrapper_real_progress_update;
 #line 14 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	((GPContextWrapperClass *) klass)->progress_stop = gp_context_wrapper_real_progress_stop;
-#line 740 "GPhoto.c"
+#line 744 "GPhoto.c"
 }
 
 
@@ -748,7 +752,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 752 "GPhoto.c"
+#line 756 "GPhoto.c"
 }
 
 
@@ -760,7 +764,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 764 "GPhoto.c"
+#line 768 "GPhoto.c"
 }
 
 
@@ -785,7 +789,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 789 "GPhoto.c"
+#line 793 "GPhoto.c"
 }
 
 
@@ -798,7 +802,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 802 "GPhoto.c"
+#line 806 "GPhoto.c"
 	}
 }
 
@@ -809,14 +813,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 813 "GPhoto.c"
+#line 817 "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 820 "GPhoto.c"
+#line 824 "GPhoto.c"
 }
 
 
@@ -828,7 +832,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 832 "GPhoto.c"
+#line 836 "GPhoto.c"
 }
 
 
@@ -846,7 +850,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 850 "GPhoto.c"
+#line 854 "GPhoto.c"
 }
 
 
@@ -857,7 +861,7 @@ static void gp_spin_idle_wrapper_class_init (GPSpinIdleWrapperClass * klass) {
 	((GPContextWrapperClass *) klass)->idle = gp_spin_idle_wrapper_real_idle;
 #line 78 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	((GPContextWrapperClass *) klass)->progress_update = gp_spin_idle_wrapper_real_progress_update;
-#line 861 "GPhoto.c"
+#line 865 "GPhoto.c"
 }
 
 
@@ -911,7 +915,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 915 "GPhoto.c"
+#line 919 "GPhoto.c"
 	} else {
 		const gchar* _tmp4_ = NULL;
 		gint _tmp5_ = 0;
@@ -924,11 +928,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 928 "GPhoto.c"
+#line 932 "GPhoto.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp0_) {
-#line 932 "GPhoto.c"
+#line 936 "GPhoto.c"
 		CameraFileInfo _tmp7_ = {0};
 #line 105 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (_vala_info);
@@ -940,15 +944,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 944 "GPhoto.c"
+#line 948 "GPhoto.c"
 		} else {
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			 (_vala_info);
-#line 948 "GPhoto.c"
+#line 952 "GPhoto.c"
 		}
 #line 107 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 952 "GPhoto.c"
+#line 956 "GPhoto.c"
 	}
 #line 110 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = camera;
@@ -970,7 +974,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 974 "GPhoto.c"
+#line 978 "GPhoto.c"
 		int _tmp15_ = 0;
 		const gchar* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
@@ -995,7 +999,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 FALSE;
-#line 999 "GPhoto.c"
+#line 1003 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = TRUE;
@@ -1003,15 +1007,15 @@ 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 1007 "GPhoto.c"
+#line 1011 "GPhoto.c"
 	} else {
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		 (_vala_info);
-#line 1011 "GPhoto.c"
+#line 1015 "GPhoto.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1015 "GPhoto.c"
+#line 1019 "GPhoto.c"
 }
 
 
@@ -1044,7 +1048,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp2_ = start;
 #line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1048 "GPhoto.c"
+#line 1052 "GPhoto.c"
 		glong _tmp3_ = 0L;
 		glong _tmp4_ = 0L;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1053,13 +1057,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp4_ = start;
 #line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1057 "GPhoto.c"
+#line 1061 "GPhoto.c"
 	}
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
 #line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1063 "GPhoto.c"
+#line 1067 "GPhoto.c"
 		glong _tmp6_ = 0L;
 		glong _tmp7_ = 0L;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1068,13 +1072,13 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp7_ = end;
 #line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1072 "GPhoto.c"
+#line 1076 "GPhoto.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1078 "GPhoto.c"
+#line 1082 "GPhoto.c"
 		glong _tmp10_ = 0L;
 		glong _tmp11_ = 0L;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1083,11 +1087,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp11_ = string_length;
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1087 "GPhoto.c"
+#line 1091 "GPhoto.c"
 	} else {
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1091 "GPhoto.c"
+#line 1095 "GPhoto.c"
 	}
 #line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
@@ -1095,7 +1099,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	_tmp13_ = end;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1099 "GPhoto.c"
+#line 1103 "GPhoto.c"
 		glong _tmp14_ = 0L;
 		glong _tmp15_ = 0L;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1104,11 +1108,11 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 		_tmp15_ = string_length;
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1108 "GPhoto.c"
+#line 1112 "GPhoto.c"
 	} else {
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 1112 "GPhoto.c"
+#line 1116 "GPhoto.c"
 	}
 #line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
@@ -1130,7 +1134,7 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
 	result = _tmp21_;
 #line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 1134 "GPhoto.c"
+#line 1138 "GPhoto.c"
 }
 
 
@@ -1200,7 +1204,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 	_tmp9_ = g_str_has_prefix (_tmp8_, prefix);
 #line 133 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp9_) {
-#line 1204 "GPhoto.c"
+#line 1208 "GPhoto.c"
 		const gchar* _tmp10_ = NULL;
 		gint _tmp11_ = 0;
 		gint _tmp12_ = 0;
@@ -1226,7 +1230,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_g_free0 (path);
 #line 134 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		path = _tmp16_;
-#line 1230 "GPhoto.c"
+#line 1234 "GPhoto.c"
 	} else {
 #line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
@@ -1238,13 +1242,13 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		 (port_info);
 #line 136 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1242 "GPhoto.c"
+#line 1246 "GPhoto.c"
 	}
 #line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp17_ = photo_metadata_new ();
 #line 138 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	metadata = _tmp17_;
-#line 1248 "GPhoto.c"
+#line 1252 "GPhoto.c"
 	{
 		PhotoMetadata* _tmp18_ = NULL;
 		const gchar* _tmp19_ = NULL;
@@ -1294,12 +1298,12 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_g_free0 (_tmp22_);
 #line 140 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1298 "GPhoto.c"
-			goto __catch60_g_error;
+#line 1302 "GPhoto.c"
+			goto __catch61_g_error;
 		}
 	}
-	goto __finally60;
-	__catch60_g_error:
+	goto __finally61;
+	__catch61_g_error:
 	{
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
@@ -1309,9 +1313,9 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		_media_metadata_unref0 (metadata);
 #line 142 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		metadata = NULL;
-#line 1313 "GPhoto.c"
+#line 1317 "GPhoto.c"
 	}
-	__finally60:
+	__finally61:
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1328,7 +1332,7 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 		g_clear_error (&_inner_error_);
 #line 139 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1332 "GPhoto.c"
+#line 1336 "GPhoto.c"
 	}
 #line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
@@ -1340,14 +1344,14 @@ PhotoMetadata* gp_get_fallback_metadata (Camera* camera, GPContext* context, con
 	 (port_info);
 #line 145 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1344 "GPhoto.c"
+#line 1348 "GPhoto.c"
 }
 
 
 static guint8* _vala_array_dup23 (guint8* self, int length) {
 #line 186 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 1351 "GPhoto.c"
+#line 1355 "GPhoto.c"
 }
 
 
@@ -1388,7 +1392,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	_vala_raw_length1 = 0;
 #line 151 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_vala_raw_length = (gsize) 0;
-#line 1392 "GPhoto.c"
+#line 1396 "GPhoto.c"
 	{
 		guint8* _tmp0_ = NULL;
 		GPContext* _tmp1_ = NULL;
@@ -1419,8 +1423,8 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		__tmp0__size_ = _tmp0__length1;
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1423 "GPhoto.c"
-			goto __catch61_g_error;
+#line 1427 "GPhoto.c"
+			goto __catch62_g_error;
 		}
 #line 154 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
@@ -1438,10 +1442,10 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_vala_raw_length1 = _tmp7__length1;
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = (g_free (_tmp0_), NULL);
-#line 1442 "GPhoto.c"
+#line 1446 "GPhoto.c"
 	}
-	goto __finally61;
-	__catch61_g_error:
+	goto __finally62;
+	__catch62_g_error:
 	{
 		PhotoMetadata* metadata = NULL;
 		Camera* _tmp8_ = NULL;
@@ -1493,27 +1497,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			if (raw) {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw = _vala_raw;
-#line 1497 "GPhoto.c"
+#line 1501 "GPhoto.c"
 			} else {
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				_vala_raw = (g_free (_vala_raw), NULL);
-#line 1501 "GPhoto.c"
+#line 1505 "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 1507 "GPhoto.c"
+#line 1511 "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 1513 "GPhoto.c"
+#line 1517 "GPhoto.c"
 			}
 #line 158 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1517 "GPhoto.c"
+#line 1521 "GPhoto.c"
 		}
 #line 159 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp14_ = metadata;
@@ -1529,27 +1533,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			if (raw) {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				*raw = _vala_raw;
-#line 1533 "GPhoto.c"
+#line 1537 "GPhoto.c"
 			} else {
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				_vala_raw = (g_free (_vala_raw), NULL);
-#line 1537 "GPhoto.c"
+#line 1541 "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 1543 "GPhoto.c"
+#line 1547 "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 1549 "GPhoto.c"
+#line 1553 "GPhoto.c"
 			}
 #line 160 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			return result;
-#line 1553 "GPhoto.c"
+#line 1557 "GPhoto.c"
 		}
 #line 161 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = metadata;
@@ -1577,8 +1581,8 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			_photo_preview_unref0 (preview);
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_media_metadata_unref0 (metadata);
-#line 1581 "GPhoto.c"
-			goto __finally61;
+#line 1585 "GPhoto.c"
+			goto __finally62;
 		}
 #line 162 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp24_ = _tmp20_;
@@ -1600,16 +1604,16 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_photo_preview_unref0 (preview);
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 1604 "GPhoto.c"
+#line 1608 "GPhoto.c"
 	}
-	__finally61:
+	__finally62:
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
 #line 153 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1613 "GPhoto.c"
+#line 1617 "GPhoto.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = _vala_raw;
@@ -1625,27 +1629,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		if (raw) {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*raw = _vala_raw;
-#line 1629 "GPhoto.c"
+#line 1633 "GPhoto.c"
 		} else {
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			_vala_raw = (g_free (_vala_raw), NULL);
-#line 1633 "GPhoto.c"
+#line 1637 "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 1639 "GPhoto.c"
+#line 1643 "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 1645 "GPhoto.c"
+#line 1649 "GPhoto.c"
 		}
 #line 167 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1649 "GPhoto.c"
+#line 1653 "GPhoto.c"
 	}
 #line 170 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp26_ = _vala_raw;
@@ -1657,7 +1661,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	_tmp27_ = _vala_raw_length;
 #line 176 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp27_ > ((gsize) 32)) {
-#line 1661 "GPhoto.c"
+#line 1665 "GPhoto.c"
 		{
 			gsize i = 0UL;
 			gsize _tmp28_ = 0UL;
@@ -1665,14 +1669,14 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 			_tmp28_ = _vala_raw_length;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			i = _tmp28_ - 2;
-#line 1669 "GPhoto.c"
+#line 1673 "GPhoto.c"
 			{
 				gboolean _tmp29_ = FALSE;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				_tmp29_ = TRUE;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 				while (TRUE) {
-#line 1676 "GPhoto.c"
+#line 1680 "GPhoto.c"
 					gsize _tmp31_ = 0UL;
 					gsize _tmp32_ = 0UL;
 					gboolean _tmp33_ = FALSE;
@@ -1682,13 +1686,13 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 					guint8 _tmp36_ = 0U;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					if (!_tmp29_) {
-#line 1686 "GPhoto.c"
+#line 1690 "GPhoto.c"
 						gsize _tmp30_ = 0UL;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						_tmp30_ = i;
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						i = _tmp30_ - 1;
-#line 1692 "GPhoto.c"
+#line 1696 "GPhoto.c"
 					}
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					_tmp29_ = FALSE;
@@ -1700,7 +1704,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 					if (!(_tmp31_ > (_tmp32_ - 32))) {
 #line 177 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						break;
-#line 1704 "GPhoto.c"
+#line 1708 "GPhoto.c"
 					}
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					_tmp34_ = _vala_raw;
@@ -1712,7 +1716,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 					_tmp36_ = _tmp34_[_tmp35_];
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					if (_tmp36_ == JPEG_MARKER_PREFIX) {
-#line 1716 "GPhoto.c"
+#line 1720 "GPhoto.c"
 						guint8* _tmp37_ = NULL;
 						gint _tmp37__length1 = 0;
 						gsize _tmp38_ = 0UL;
@@ -1727,15 +1731,15 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 						_tmp39_ = _tmp37_[_tmp38_ + 1];
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						_tmp33_ = _tmp39_ == JPEG_MARKER_EOI;
-#line 1731 "GPhoto.c"
+#line 1735 "GPhoto.c"
 					} else {
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						_tmp33_ = FALSE;
-#line 1735 "GPhoto.c"
+#line 1739 "GPhoto.c"
 					}
 #line 178 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 					if (_tmp33_) {
-#line 1739 "GPhoto.c"
+#line 1743 "GPhoto.c"
 						const gchar* _tmp40_ = NULL;
 						gsize _tmp41_ = 0UL;
 #line 179 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
@@ -1748,7 +1752,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 						_vala_raw_length = _tmp41_ + 2;
 #line 181 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 						break;
-#line 1752 "GPhoto.c"
+#line 1756 "GPhoto.c"
 					}
 				}
 			}
@@ -1780,7 +1784,7 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 		_g_object_unref0 (mins);
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1784 "GPhoto.c"
+#line 1788 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp48_ = _tmp45_;
@@ -1796,27 +1800,27 @@ GdkPixbuf* gp_load_preview (GPContext* context, Camera* camera, const gchar* fol
 	if (raw) {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw = _vala_raw;
-#line 1800 "GPhoto.c"
+#line 1804 "GPhoto.c"
 	} else {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_vala_raw = (g_free (_vala_raw), NULL);
-#line 1804 "GPhoto.c"
+#line 1808 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw_length1) {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw_length1 = _vala_raw_length1;
-#line 1810 "GPhoto.c"
+#line 1814 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (raw_length) {
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*raw_length = _vala_raw_length;
-#line 1816 "GPhoto.c"
+#line 1820 "GPhoto.c"
 	}
 #line 187 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1820 "GPhoto.c"
+#line 1824 "GPhoto.c"
 }
 
 
@@ -1860,7 +1864,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 		g_propagate_error (error, _inner_error_);
 #line 192 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1864 "GPhoto.c"
+#line 1868 "GPhoto.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp5_ = ins;
@@ -1872,7 +1876,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 		_g_object_unref0 (ins);
 #line 194 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 1876 "GPhoto.c"
+#line 1880 "GPhoto.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = ins;
@@ -1888,7 +1892,7 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 		_g_object_unref0 (ins);
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 1892 "GPhoto.c"
+#line 1896 "GPhoto.c"
 	}
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = _tmp6_;
@@ -1902,29 +1906,32 @@ GdkPixbuf* gp_load_image (GPContext* context, Camera* camera, const gchar* folde
 	_g_object_unref0 (ins);
 #line 196 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 1906 "GPhoto.c"
+#line 1910 "GPhoto.c"
 }
 
 
 void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, const gchar* filename, GFile* dest_file, GError** error) {
+	gint fd = 0;
+	GFile* _tmp0_ = NULL;
+	gchar* _tmp1_ = NULL;
+	gchar* _tmp2_ = NULL;
+	gint _tmp3_ = 0;
+	gint _tmp4_ = 0;
+	gint _tmp5_ = 0;
 	CameraFile* camera_file = NULL;
 	int res = 0;
-	CameraFile* _tmp0_ = NULL;
-	int _tmp1_ = 0;
-	int _tmp2_ = 0;
-	Camera* _tmp7_ = NULL;
-	const gchar* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
-	CameraFile* _tmp10_ = NULL;
-	GPContext* _tmp11_ = NULL;
-	int _tmp12_ = 0;
-	int _tmp13_ = 0;
-	CameraFile* _tmp20_ = NULL;
-	GFile* _tmp21_ = NULL;
-	gchar* _tmp22_ = NULL;
-	gchar* _tmp23_ = NULL;
-	int _tmp24_ = 0;
-	int _tmp25_ = 0;
+	gint _tmp12_ = 0;
+	CameraFile* _tmp13_ = NULL;
+	int _tmp14_ = 0;
+	int _tmp15_ = 0;
+	Camera* _tmp21_ = NULL;
+	const gchar* _tmp22_ = NULL;
+	const gchar* _tmp23_ = NULL;
+	CameraFile* _tmp24_ = NULL;
+	GPContext* _tmp25_ = NULL;
+	int _tmp26_ = 0;
+	int _tmp27_ = 0;
+	gint _tmp35_ = 0;
 	GError * _inner_error_ = NULL;
 #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (context != NULL);
@@ -1936,152 +1943,154 @@ void gp_save_image (GPContext* context, Camera* camera, const gchar* folder, con
 	g_return_if_fail (filename != NULL);
 #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_if_fail (G_IS_FILE (dest_file));
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp0_ = dest_file;
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp1_ = g_file_get_path (_tmp0_);
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp2_ = _tmp1_;
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp3_ = creat (_tmp2_, (mode_t) 0640);
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp4_ = _tmp3_;
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_g_free0 (_tmp2_);
+#line 200 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	fd = _tmp4_;
+#line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp5_ = fd;
+#line 201 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	if (_tmp5_ < 0) {
+#line 1965 "GPhoto.c"
+		gint _tmp6_ = 0;
+		GFile* _tmp7_ = NULL;
+		gchar* _tmp8_ = NULL;
+		gchar* _tmp9_ = NULL;
+		GError* _tmp10_ = NULL;
+		GError* _tmp11_ = NULL;
 #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp1_ = gp_file_new (&_tmp0_);
+		_tmp6_ = errno;
 #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_gp_file_unref0 (camera_file);
+		_tmp7_ = dest_file;
 #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	camera_file = _tmp0_;
+		_tmp8_ = g_file_get_path (_tmp7_);
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp9_ = _tmp8_;
+#line 202 "/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 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp11_ = _tmp10_;
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_g_free0 (_tmp9_);
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_inner_error_ = _tmp11_;
 #line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	res = _tmp1_;
-#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp2_ = res;
-#line 203 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp2_ != GP_OK) {
-#line 1952 "GPhoto.c"
-		int _tmp3_ = 0;
-		int _tmp4_ = 0;
-		const gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp3_ = res;
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp4_ = res;
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 204 "/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 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_inner_error_ = _tmp6_;
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_gp_file_unref0 (camera_file);
-#line 204 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 202 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 1973 "GPhoto.c"
+#line 1992 "GPhoto.c"
 	}
 #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp7_ = camera;
+	_tmp12_ = fd;
 #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp8_ = folder;
+	_tmp14_ = gp_file_new_from_fd (&_tmp13_, _tmp12_);
 #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp9_ = filename;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp10_ = camera_file;
-#line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp11_ = context;
+	_gp_file_unref0 (camera_file);
 #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp12_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, GP_FILE_TYPE_NORMAL, _tmp10_, _tmp11_);
+	camera_file = _tmp13_;
 #line 206 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	res = _tmp12_;
+	res = _tmp14_;
 #line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp13_ = res;
+	_tmp15_ = res;
 #line 207 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp13_ != GP_OK) {
-#line 1993 "GPhoto.c"
-		int _tmp14_ = 0;
-		const gchar* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
+	if (_tmp15_ != GP_OK) {
+#line 2008 "GPhoto.c"
+		gint _tmp16_ = 0;
 		int _tmp17_ = 0;
-		const gchar* _tmp18_ = NULL;
-		GError* _tmp19_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp14_ = res;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp15_ = folder;
+		int _tmp18_ = 0;
+		const gchar* _tmp19_ = NULL;
+		GError* _tmp20_ = NULL;
 #line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp16_ = filename;
+		_tmp16_ = fd;
 #line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		close (_tmp16_);
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = res;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 208 "/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 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_inner_error_ = _tmp19_;
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp18_ = res;
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp19_ = gp_port_result_as_string (_tmp18_);
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp20_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error allocating camera file: %s", (gint) _tmp17_, _tmp19_);
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_inner_error_ = _tmp20_;
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 208 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 209 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 2020 "GPhoto.c"
+#line 2034 "GPhoto.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp20_ = camera_file;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp21_ = dest_file;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp22_ = g_file_get_path (_tmp21_);
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp23_ = _tmp22_;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp24_ = gp_file_save (_tmp20_, _tmp23_);
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	res = _tmp24_;
-#line 211 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_g_free0 (_tmp23_);
 #line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	_tmp25_ = res;
+	_tmp21_ = camera;
 #line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-	if (_tmp25_ != GP_OK) {
-#line 2040 "GPhoto.c"
-		int _tmp26_ = 0;
-		const gchar* _tmp27_ = NULL;
-		const gchar* _tmp28_ = NULL;
-		GFile* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
-		gchar* _tmp31_ = NULL;
+	_tmp22_ = folder;
+#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp23_ = filename;
+#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp24_ = camera_file;
+#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp25_ = context;
+#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp26_ = gp_camera_file_get (_tmp21_, _tmp22_, _tmp23_, GP_FILE_TYPE_NORMAL, _tmp24_, _tmp25_);
+#line 212 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	res = _tmp26_;
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp27_ = res;
+#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	if (_tmp27_ != GP_OK) {
+#line 2054 "GPhoto.c"
+		gint _tmp28_ = 0;
+		int _tmp29_ = 0;
+		const gchar* _tmp30_ = NULL;
+		const gchar* _tmp31_ = NULL;
 		int _tmp32_ = 0;
 		const gchar* _tmp33_ = NULL;
 		GError* _tmp34_ = NULL;
-		GError* _tmp35_ = NULL;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp26_ = res;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp27_ = folder;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp28_ = filename;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp29_ = dest_file;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp30_ = g_file_get_path (_tmp29_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp31_ = _tmp30_;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp28_ = fd;
+#line 214 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		close (_tmp28_);
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp29_ = res;
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp30_ = folder;
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp31_ = filename;
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp32_ = res;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp33_ = gp_port_result_as_string (_tmp32_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp34_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error copying file %s/%s to %s: %s", (gint) _tmp26_, _tmp27_, _tmp28_, _tmp31_, _tmp33_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_tmp35_ = _tmp34_;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_g_free0 (_tmp31_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
-		_inner_error_ = _tmp35_;
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_tmp34_ = g_error_new (GPHOTO_ERROR, GPHOTO_ERROR_LIBRARY, "[%d] Error retrieving file object for %s/%s: %s", (gint) _tmp29_, _tmp30_, _tmp31_, _tmp33_);
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+		_inner_error_ = _tmp34_;
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 213 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 215 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return;
-#line 2081 "GPhoto.c"
+#line 2086 "GPhoto.c"
 	}
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	_tmp35_ = fd;
+#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	close (_tmp35_);
 #line 199 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 2085 "GPhoto.c"
+#line 2094 "GPhoto.c"
 }
 
 
@@ -2099,21 +2108,21 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 	guint8* _tmp18_ = NULL;
 	gint _tmp18__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 217 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 222 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw = NULL;
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw_length1 = 0;
-#line 219 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 224 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_camera_raw_size_ = camera_raw_length1;
-#line 2117 "GPhoto.c"
+#line 2126 "GPhoto.c"
 	{
 		guint8* _tmp0_ = NULL;
 		GPContext* _tmp1_ = NULL;
@@ -2126,163 +2135,163 @@ PhotoMetadata* gp_load_metadata (GPContext* context, Camera* camera, const gchar
 		gint __tmp0__size_ = 0;
 		guint8* _tmp7_ = NULL;
 		gint _tmp7__length1 = 0;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp1_ = context;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp2_ = camera;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = folder;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = filename;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/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 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = _tmp6_;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0__length1 = _tmp5_;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		__tmp0__size_ = _tmp0__length1;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2148 "GPhoto.c"
-			goto __catch62_g_error;
+#line 2157 "GPhoto.c"
+			goto __catch63_g_error;
 		}
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7_ = _tmp0_;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp7__length1 = _tmp0__length1;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = NULL;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0__length1 = 0;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = _tmp7_;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw_length1 = _tmp7__length1;
-#line 221 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_camera_raw_size_ = camera_raw_length1;
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp0_ = (g_free (_tmp0_), NULL);
-#line 2169 "GPhoto.c"
+#line 2178 "GPhoto.c"
 	}
-	goto __finally62;
-	__catch62_g_error:
+	goto __finally63;
+	__catch63_g_error:
 	{
 		Camera* _tmp8_ = NULL;
 		GPContext* _tmp9_ = NULL;
 		const gchar* _tmp10_ = NULL;
 		const gchar* _tmp11_ = NULL;
 		PhotoMetadata* _tmp12_ = NULL;
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_clear_error (&_inner_error_);
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = NULL;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp8_ = camera;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp9_ = context;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp10_ = folder;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp11_ = filename;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp12_ = gp_get_fallback_metadata (_tmp8_, _tmp9_, _tmp10_, _tmp11_);
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = _tmp12_;
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 223 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 228 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2199 "GPhoto.c"
+#line 2208 "GPhoto.c"
 	}
-	__finally62:
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+	__finally63:
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 220 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 225 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2210 "GPhoto.c"
+#line 2219 "GPhoto.c"
 	}
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = camera_raw;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14__length1 = camera_raw_length1;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ == NULL) {
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp13_ = TRUE;
-#line 2220 "GPhoto.c"
+#line 2229 "GPhoto.c"
 	} else {
 		guint8* _tmp15_ = NULL;
 		gint _tmp15__length1 = 0;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = camera_raw;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15__length1 = camera_raw_length1;
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp13_ = _tmp15__length1 == 0;
-#line 2230 "GPhoto.c"
+#line 2239 "GPhoto.c"
 	}
-#line 226 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 231 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp13_) {
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = NULL;
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 227 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2240 "GPhoto.c"
+#line 2249 "GPhoto.c"
 	}
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp16_ = photo_metadata_new ();
-#line 229 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 234 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	metadata = _tmp16_;
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp17_ = metadata;
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp18_ = camera_raw;
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp18__length1 = camera_raw_length1;
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	photo_metadata_read_from_app1_segment (_tmp17_, _tmp18_, _tmp18__length1, 0, &_inner_error_);
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_media_metadata_unref0 (metadata);
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		camera_raw = (g_free (camera_raw), NULL);
-#line 230 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 235 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2264 "GPhoto.c"
+#line 2273 "GPhoto.c"
 	}
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = metadata;
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_raw = (g_free (camera_raw), NULL);
-#line 232 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2272 "GPhoto.c"
+#line 2281 "GPhoto.c"
 }
 
 
 static guint8* _vala_array_dup24 (guint8* self, int length) {
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return g_memdup (self, length * sizeof (guint8));
-#line 2279 "GPhoto.c"
+#line 2288 "GPhoto.c"
 }
 
 
 static void _gp_on_mins_destroyed_gdestroy_notify (void* data) {
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	gp_on_mins_destroyed (data);
-#line 2286 "GPhoto.c"
+#line 2295 "GPhoto.c"
 }
 
 
@@ -2321,109 +2330,109 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 	GFileInputStream* _tmp53_ = NULL;
 	GFileInputStream* _tmp54_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 237 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 240 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = gp_file_new (&_tmp0_);
-#line 240 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 240 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp0_;
-#line 240 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp1_;
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = res;
-#line 241 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2345 "GPhoto.c"
+#line 2354 "GPhoto.c"
 		int _tmp3_ = 0;
 		int _tmp4_ = 0;
 		const gchar* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = res;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = res;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/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 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp6_;
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 242 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 247 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2366 "GPhoto.c"
+#line 2375 "GPhoto.c"
 	}
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = folder;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = filename;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp10_ = filetype;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp11_ = context;
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, camera_file, _tmp11_);
-#line 244 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 249 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp12_;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp13_ = res;
-#line 245 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 250 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp13_ != GP_OK) {
-#line 2386 "GPhoto.c"
+#line 2395 "GPhoto.c"
 		int _tmp14_ = 0;
 		const gchar* _tmp15_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		int _tmp17_ = 0;
 		const gchar* _tmp18_ = NULL;
 		GError* _tmp19_ = NULL;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp14_ = res;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = folder;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = filename;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = res;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = gp_port_result_as_string (_tmp17_);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/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 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp19_;
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 246 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 251 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2413 "GPhoto.c"
+#line 2422 "GPhoto.c"
 	}
-#line 254 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp22_ = gp_file_get_data_and_size (camera_file, &_tmp20_, &_tmp21_);
-#line 254 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data = _tmp20_;
-#line 254 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data_len = _tmp21_;
-#line 254 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp22_;
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp23_ = res;
-#line 255 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 260 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp23_ == GP_OK) {
-#line 2427 "GPhoto.c"
+#line 2436 "GPhoto.c"
 		guint8* buffer = NULL;
 		gulong _tmp24_ = 0UL;
 		guint8* _tmp25_ = NULL;
@@ -2439,77 +2448,77 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 		guint8* _tmp30_ = NULL;
 		gint _tmp30__length1 = 0;
 		GMemoryInputStream* _tmp31_ = NULL;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp24_ = data_len;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp25_ = g_new0 (guint8, _tmp24_);
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer = _tmp25_;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer_length1 = _tmp24_;
-#line 256 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 261 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_buffer_size_ = buffer_length1;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26_ = buffer;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26__length1 = buffer_length1;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp27_ = data;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28_ = buffer;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp28__length1 = buffer_length1;
-#line 257 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 262 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		memcpy (_tmp26_, _tmp27_, (gsize) _tmp28__length1);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29_ = buffer;
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp29__length1 = buffer_length1;
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp30_ = (_tmp29_ != NULL) ? _vala_array_dup24 (_tmp29_, _tmp29__length1) : ((gpointer) _tmp29_);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp30__length1 = _tmp29__length1;
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp31_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp30_, _tmp30__length1, _gp_on_mins_destroyed_gdestroy_notify);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, g_input_stream_get_type (), GInputStream);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		buffer = (g_free (buffer), NULL);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 259 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2483 "GPhoto.c"
+#line 2492 "GPhoto.c"
 	}
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32_ = app_dirs_get_temp_dir ();
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp33_ = _tmp32_;
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp34_ = g_file_get_child (_tmp33_, "import.tmp");
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp35_ = _tmp34_;
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp33_);
-#line 263 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 268 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	temp = _tmp35_;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp36_ = temp;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp37_ = g_file_get_path (_tmp36_);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp38_ = _tmp37_;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp39_ = gp_file_save (camera_file, _tmp38_);
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp39_;
-#line 264 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_free0 (_tmp38_);
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp40_ = res;
-#line 265 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 270 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp40_ != GP_OK) {
-#line 2513 "GPhoto.c"
+#line 2522 "GPhoto.c"
 		int _tmp41_ = 0;
 		const gchar* _tmp42_ = NULL;
 		const gchar* _tmp43_ = NULL;
@@ -2520,83 +2529,83 @@ GInputStream* gp_load_file_into_stream (GPContext* context, Camera* camera, cons
 		const gchar* _tmp48_ = NULL;
 		GError* _tmp49_ = NULL;
 		GError* _tmp50_ = NULL;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp41_ = res;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp42_ = folder;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp43_ = filename;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp44_ = temp;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp45_ = g_file_get_path (_tmp44_);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp46_ = _tmp45_;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp47_ = res;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp48_ = gp_port_result_as_string (_tmp47_);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/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 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp50_ = _tmp49_;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_free0 (_tmp46_);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp50_;
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (temp);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 266 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 271 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2556 "GPhoto.c"
+#line 2565 "GPhoto.c"
 	}
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp52_ = temp;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp53_ = g_file_read (_tmp52_, NULL, &_inner_error_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp51_ = _tmp53_;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/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 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_g_object_unref0 (temp);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2574 "GPhoto.c"
+#line 2583 "GPhoto.c"
 	}
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp54_ = _tmp51_;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp51_ = NULL;
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (_tmp51_);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_g_object_unref0 (temp);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 269 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 274 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2590 "GPhoto.c"
+#line 2599 "GPhoto.c"
 }
 
 
 void gp_on_mins_destroyed (void* data) {
 	void* _tmp0_ = NULL;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp0_ = data;
-#line 273 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 278 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_free (_tmp0_);
-#line 2600 "GPhoto.c"
+#line 2609 "GPhoto.c"
 }
 
 
@@ -2635,172 +2644,172 @@ guint8* gp_load_file_into_buffer (GPContext* context, Camera* camera, const gcha
 	guint8* _tmp32_ = NULL;
 	gint _tmp32__length1 = 0;
 	GError * _inner_error_ = NULL;
-#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (context != NULL, NULL);
-#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (camera != NULL, NULL);
-#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (folder != NULL, NULL);
-#line 277 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp1_ = gp_file_new (&_tmp0_);
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	camera_file = _tmp0_;
-#line 280 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp1_;
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp2_ = res;
-#line 281 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp2_ != GP_OK) {
-#line 2659 "GPhoto.c"
+#line 2668 "GPhoto.c"
 		int _tmp3_ = 0;
 		int _tmp4_ = 0;
 		const gchar* _tmp5_ = NULL;
 		GError* _tmp6_ = NULL;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp3_ = res;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp4_ = res;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp5_ = gp_port_result_as_string (_tmp4_);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/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 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp6_;
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 282 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 287 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2680 "GPhoto.c"
+#line 2689 "GPhoto.c"
 	}
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp7_ = camera;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp8_ = folder;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp9_ = filename;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp10_ = filetype;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp11_ = camera_file;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp12_ = context;
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp13_ = gp_camera_file_get (_tmp7_, _tmp8_, _tmp9_, _tmp10_, _tmp11_, _tmp12_);
-#line 284 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 289 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp13_;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 290 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp14_ = res;
-#line 285 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 290 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp14_ != GP_OK) {
-#line 2702 "GPhoto.c"
+#line 2711 "GPhoto.c"
 		int _tmp15_ = 0;
 		const gchar* _tmp16_ = NULL;
 		const gchar* _tmp17_ = NULL;
 		int _tmp18_ = 0;
 		const gchar* _tmp19_ = NULL;
 		GError* _tmp20_ = NULL;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp15_ = res;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp16_ = folder;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp17_ = filename;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp18_ = res;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp19_ = gp_port_result_as_string (_tmp18_);
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/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 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_inner_error_ = _tmp20_;
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		g_propagate_error (error, _inner_error_);
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 286 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 291 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return NULL;
-#line 2729 "GPhoto.c"
+#line 2738 "GPhoto.c"
 	}
-#line 293 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp21_ = camera_file;
-#line 293 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp24_ = gp_file_get_data_and_size (_tmp21_, &_tmp22_, &_tmp23_);
-#line 293 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data = _tmp22_;
-#line 293 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	data_len = _tmp23_;
-#line 293 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	res = _tmp24_;
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp25_ = res;
-#line 294 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 299 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (_tmp25_ != GP_OK) {
-#line 2745 "GPhoto.c"
+#line 2754 "GPhoto.c"
 		guint8* _tmp26_ = NULL;
 		gint _tmp26__length1 = 0;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26_ = NULL;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_tmp26__length1 = 0;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		if (result_length1) {
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 			*result_length1 = _tmp26__length1;
-#line 2756 "GPhoto.c"
+#line 2765 "GPhoto.c"
 		}
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		result = _tmp26_;
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		_gp_file_unref0 (camera_file);
-#line 295 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		return result;
-#line 2764 "GPhoto.c"
+#line 2773 "GPhoto.c"
 	}
-#line 297 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp27_ = data_len;
-#line 297 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp28_ = g_new0 (guint8, _tmp27_);
-#line 297 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	buffer = _tmp28_;
-#line 297 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	buffer_length1 = _tmp27_;
-#line 297 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 302 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_buffer_size_ = buffer_length1;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp29_ = buffer;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp29__length1 = buffer_length1;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp30_ = data;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp31_ = buffer;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp31__length1 = buffer_length1;
-#line 298 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 303 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	memcpy (_tmp29_, _tmp30_, (gsize) _tmp31__length1);
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32_ = buffer;
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_tmp32__length1 = buffer_length1;
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	if (result_length1) {
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 		*result_length1 = _tmp32__length1;
-#line 2796 "GPhoto.c"
+#line 2805 "GPhoto.c"
 	}
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	result = _tmp32_;
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	_gp_file_unref0 (camera_file);
-#line 300 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
+#line 305 "/home/jens/Source/shotwell/src/camera/GPhoto.vala"
 	return result;
-#line 2804 "GPhoto.c"
+#line 2813 "GPhoto.c"
 }
 
 
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
index 3616cb2..5acc4a3 100644
--- a/src/camera/GPhoto.vala
+++ b/src/camera/GPhoto.vala
@@ -196,22 +196,27 @@ namespace GPhoto {
         return new Gdk.Pixbuf.from_stream(ins, null);
     }
 
-    public void save_image(Context context, Camera camera, string folder, string filename, 
-        File dest_file) throws Error {
+    public void save_image(Context context, Camera camera, string folder, string filename, File dest_file) throws Error {
+        var fd = Posix.creat(dest_file.get_path(), 0640);
+        if (fd < 0) {
+            throw new IOError.FAILED("[%d] Error creating file %s: %m", GLib.errno, dest_file.get_path());
+        }
+
         GPhoto.CameraFile camera_file;
-        GPhoto.Result res = GPhoto.CameraFile.create(out camera_file);
-        if (res != Result.OK)
+        GPhoto.Result res = GPhoto.CameraFile.create_from_fd(out camera_file, fd);
+        if (res != Result.OK) {
+            Posix.close(fd);
             throw new GPhotoError.LIBRARY("[%d] Error allocating camera file: %s", (int) res, res.as_string());
+        }
         
         res = camera.get_file(folder, filename, GPhoto.CameraFileType.NORMAL, camera_file, context);
-        if (res != Result.OK)
+        if (res != Result.OK) {
+            Posix.close(fd);
             throw new GPhotoError.LIBRARY("[%d] Error retrieving file object for %s/%s: %s", 
                 (int) res, folder, filename, res.as_string());
+        }
 
-        res = camera_file.save(dest_file.get_path());
-        if (res != Result.OK)
-            throw new GPhotoError.LIBRARY("[%d] Error copying file %s/%s to %s: %s", (int) res, 
-                folder, filename, dest_file.get_path(), res.as_string());
+        Posix.close(fd);
     }
     
     public PhotoMetadata? load_metadata(Context context, Camera camera, string folder, string filename)
diff --git a/src/camera/ImportPage.c b/src/camera/ImportPage.c
index 5e7cfb2..f967876 100644
--- a/src/camera/ImportPage.c
+++ b/src/camera/ImportPage.c
@@ -2530,13 +2530,13 @@ static gchar* gp_result_to_full_string (int self) {
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 480 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
+#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	_tmp0_ = gp_port_result_as_string (self);
-#line 480 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
+#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	_tmp1_ = g_strdup_printf ("%s (%d)", _tmp0_, (gint) self);
-#line 480 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
+#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	result = _tmp1_;
-#line 480 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
+#line 482 "/home/jens/Source/shotwell/vapi/libgphoto2.vapi"
 	return result;
 #line 2541 "ImportPage.c"
 }
@@ -3916,7 +3916,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3918 "ImportPage.c"
-			goto __catch63_g_error;
+			goto __catch64_g_error;
 		}
 #line 283 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp9_ = _tmp6_;
@@ -3930,8 +3930,8 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_object_unref0 (_tmp6_);
 #line 3931 "ImportPage.c"
 	}
-	goto __finally63;
-	__catch63_g_error:
+	goto __finally64;
+	__catch64_g_error:
 	{
 		GError* err = NULL;
 		gchar* _tmp10_ = NULL;
@@ -3958,7 +3958,7 @@ ImportPreview* import_preview_construct (GType object_type, ImportSource* source
 		_g_error_free0 (err);
 #line 3959 "ImportPage.c"
 	}
-	__finally63:
+	__finally64:
 #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"
@@ -6845,7 +6845,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6847 "ImportPage.c"
-					goto __catch64_g_error;
+					goto __catch65_g_error;
 				}
 #line 1014 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp12_ = _tmp9_;
@@ -6859,8 +6859,8 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_g_object_unref0 (_tmp9_);
 #line 6860 "ImportPage.c"
 			}
-			goto __finally64;
-			__catch64_g_error:
+			goto __finally65;
+			__catch65_g_error:
 			{
 				GError* err = NULL;
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -6871,7 +6871,7 @@ static void import_page_try_refreshing_camera (ImportPage* self, gboolean fail_o
 				_g_error_free0 (err);
 #line 6872 "ImportPage.c"
 			}
-			__finally64:
+			__finally65:
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1013 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -7208,11 +7208,11 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 #line 1088 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 7207 "ImportPage.c"
-			goto __catch65_g_error;
+			goto __catch66_g_error;
 		}
 	}
-	goto __finally65;
-	__catch65_g_error:
+	goto __finally66;
+	__catch66_g_error:
 	{
 		GError* err = NULL;
 		guint _tmp3_ = 0U;
@@ -7250,7 +7250,7 @@ static void import_page_on_unmount_finished (ImportPage* self, GObject* source,
 		_g_error_free0 (err);
 #line 7248 "ImportPage.c"
 	}
-	__finally65:
+	__finally66:
 #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1087 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -8913,7 +8913,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 						 (info);
 #line 8912 "ImportPage.c"
-						goto __catch66_g_error;
+						goto __catch67_g_error;
 					}
 #line 1395 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (!_tmp40_) {
@@ -9149,8 +9149,8 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					 (info);
 #line 9146 "ImportPage.c"
 				}
-				goto __finally66;
-				__catch66_g_error:
+				goto __finally67;
+				__catch67_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp103_ = NULL;
@@ -9195,7 +9195,7 @@ static gboolean import_page_enumerate_files (ImportPage* self, gint fsid, const
 					return result;
 #line 9192 "ImportPage.c"
 				}
-				__finally66:
+				__finally67:
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1393 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10169,7 +10169,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10166 "ImportPage.c"
-						goto __catch67_g_error;
+						goto __catch68_g_error;
 					}
 #line 1545 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp43_ = _tmp36_;
@@ -10183,8 +10183,8 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_media_metadata_unref0 (_tmp36_);
 #line 10179 "ImportPage.c"
 				}
-				goto __finally67;
-				__catch67_g_error:
+				goto __finally68;
+				__catch68_g_error:
 				{
 					GError* err = NULL;
 					const gchar* _tmp44_ = NULL;
@@ -10209,7 +10209,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_error_free0 (err);
 #line 10205 "ImportPage.c"
 				}
-				__finally67:
+				__finally68:
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1544 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10408,7 +10408,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_g_free0 (preview_fulldir);
 #line 10405 "ImportPage.c"
-					goto __catch68_g_error;
+					goto __catch69_g_error;
 				}
 #line 1577 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				_tmp77_ = _tmp67_;
@@ -10426,8 +10426,8 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_free0 (preview_fulldir);
 #line 10422 "ImportPage.c"
 			}
-			goto __finally68;
-			__catch68_g_error:
+			goto __finally69;
+			__catch69_g_error:
 			{
 				GError* err = NULL;
 				const gchar* _tmp78_ = NULL;
@@ -10463,7 +10463,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 				_g_error_free0 (err);
 #line 10459 "ImportPage.c"
 			}
-			__finally68:
+			__finally69:
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1570 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -10640,7 +10640,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 #line 1608 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 10637 "ImportPage.c"
-						goto __catch69_g_error;
+						goto __catch70_g_error;
 					}
 #line 1610 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 					_tmp113_ = associated;
@@ -10656,8 +10656,8 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_media_metadata_unref0 (associated_metadata);
 #line 10652 "ImportPage.c"
 				}
-				goto __finally69;
-				__catch69_g_error:
+				goto __finally70;
+				__catch70_g_error:
 				{
 					GError* err = NULL;
 					PhotoImportSource* _tmp117_ = NULL;
@@ -10698,7 +10698,7 @@ static void import_page_load_previews_and_metadata (ImportPage* self, GeeList* i
 					_g_error_free0 (err);
 #line 10694 "ImportPage.c"
 				}
-				__finally69:
+				__finally70:
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1607 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -11385,11 +11385,11 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 #line 1720 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 11381 "ImportPage.c"
-			goto __catch70_g_error;
+			goto __catch71_g_error;
 		}
 	}
-	goto __finally70;
-	__catch70_g_error:
+	goto __finally71;
+	__catch71_g_error:
 	{
 		GError* err = NULL;
 		BatchImportResult* _tmp7_ = NULL;
@@ -11422,7 +11422,7 @@ static void import_page_on_import_job_failed (ImportPage* self, BatchImportResul
 		_g_error_free0 (err);
 #line 11417 "ImportPage.c"
 	}
-	__finally70:
+	__finally71:
 #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1719 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12521,7 +12521,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12517 "ImportPage.c"
-			goto __catch71_g_error;
+			goto __catch72_g_error;
 		}
 #line 565 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		_tmp6_ = _tmp0_;
@@ -12535,8 +12535,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_object_unref0 (_tmp0_);
 #line 12530 "ImportPage.c"
 	}
-	goto __finally71;
-	__catch71_g_error:
+	goto __finally72;
+	__catch72_g_error:
 	{
 		GError* err = NULL;
 		ImportSource* _tmp7_ = NULL;
@@ -12566,7 +12566,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 		_g_error_free0 (err);
 #line 12561 "ImportPage.c"
 	}
-	__finally71:
+	__finally72:
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 563 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12648,10 +12648,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 582 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12644 "ImportPage.c"
-			goto __finally72;
+			goto __finally73;
 		}
 	}
-	__finally72:
+	__finally73:
 	{
 		GFile* _tmp23_ = NULL;
 #line 584 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12717,7 +12717,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 591 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12713 "ImportPage.c"
-				goto __catch73_g_error;
+				goto __catch74_g_error;
 			}
 #line 590 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			_tmp34_ = _tmp25_;
@@ -12731,8 +12731,8 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_backing_photo_row_unref0 (_tmp25_);
 #line 12726 "ImportPage.c"
 		}
-		goto __finally73;
-		__catch73_g_error:
+		goto __finally74;
+		__catch74_g_error:
 		{
 			GError* err = NULL;
 			ImportPageCameraImportJob* _tmp35_ = NULL;
@@ -12758,7 +12758,7 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 			_g_error_free0 (err);
 #line 12752 "ImportPage.c"
 		}
-		__finally73:
+		__finally74:
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 589 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
@@ -12849,10 +12849,10 @@ static gboolean import_page_camera_import_job_real_prepare (BatchImportJob* base
 #line 606 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 12844 "ImportPage.c"
-				goto __finally74;
+				goto __finally75;
 			}
 		}
-		__finally74:
+		__finally75:
 		{
 			GFile* _tmp54_ = NULL;
 #line 609 "/home/jens/Source/shotwell/src/camera/ImportPage.vala"
diff --git a/src/config/ConfigurationInterfaces.c b/src/config/ConfigurationInterfaces.c
index 09a6eb1..a44fd05 100644
--- a/src/config/ConfigurationInterfaces.c
+++ b/src/config/ConfigurationInterfaces.c
@@ -55,6 +55,8 @@ typedef struct _Dimensions Dimensions;
 #define _g_free0(var) (var = (g_free (var), NULL))
 #define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
 
+#define RESOURCES_TYPE_UNIT_SYSTEM (resources_unit_system_get_type ())
+
 typedef enum  {
 	CONFIGURATION_ERROR_PROPERTY_HAS_NO_VALUE,
 	CONFIGURATION_ERROR_ENGINE_ERROR
@@ -353,6 +355,12 @@ struct _ConfigurationFacadePrivate {
 	ConfigurationEngine* engine;
 };
 
+typedef enum  {
+	RESOURCES_UNIT_SYSTEM_IMPERIAL,
+	RESOURCES_UNIT_SYSTEM_METRIC,
+	RESOURCES_UNIT_SYSTEM_UNKNOWN
+} ResourcesUnitSystem;
+
 
 static gpointer configuration_facade_parent_class = NULL;
 
@@ -609,6 +617,8 @@ void configuration_facade_set_printing_print_titles (ConfigurationFacade* self,
 static void configuration_facade_real_set_printing_print_titles (ConfigurationFacade* self, gboolean print_titles);
 gint configuration_facade_get_printing_size_selection (ConfigurationFacade* self);
 static gint configuration_facade_real_get_printing_size_selection (ConfigurationFacade* self);
+GType resources_unit_system_get_type (void) G_GNUC_CONST;
+ResourcesUnitSystem resources_get_default_measurement_unit (void);
 void configuration_facade_set_printing_size_selection (ConfigurationFacade* self, gint size_code);
 static void configuration_facade_real_set_printing_size_selection (ConfigurationFacade* self, gint size_code);
 gchar* configuration_facade_get_printing_titles_font (ConfigurationFacade* self);
@@ -702,7 +712,7 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 	switch (self) {
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY:
-#line 706 "ConfigurationInterfaces.c"
+#line 716 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp0_ = NULL;
 #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -711,11 +721,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp0_;
 #line 99 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 715 "ConfigurationInterfaces.c"
+#line 725 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_BG_COLOR_NAME:
-#line 719 "ConfigurationInterfaces.c"
+#line 729 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp1_ = NULL;
 #line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -724,11 +734,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp1_;
 #line 102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 728 "ConfigurationInterfaces.c"
+#line 738 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
-#line 732 "ConfigurationInterfaces.c"
+#line 742 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp2_ = NULL;
 #line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -737,11 +747,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp2_;
 #line 105 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 741 "ConfigurationInterfaces.c"
+#line 751 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_FILE:
-#line 745 "ConfigurationInterfaces.c"
+#line 755 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp3_ = NULL;
 #line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -750,11 +760,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp3_;
 #line 108 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 754 "ConfigurationInterfaces.c"
+#line 764 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DESKTOP_BACKGROUND_MODE:
-#line 758 "ConfigurationInterfaces.c"
+#line 768 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp4_ = NULL;
 #line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -763,11 +773,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp4_;
 #line 111 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 767 "ConfigurationInterfaces.c"
+#line 777 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SCREENSAVER_FILE:
-#line 771 "ConfigurationInterfaces.c"
+#line 781 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp5_ = NULL;
 #line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -776,11 +786,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp5_;
 #line 114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 780 "ConfigurationInterfaces.c"
+#line 790 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SCREENSAVER_MODE:
-#line 784 "ConfigurationInterfaces.c"
+#line 794 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp6_ = NULL;
 #line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -789,11 +799,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp6_;
 #line 117 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 793 "ConfigurationInterfaces.c"
+#line 803 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN:
-#line 797 "ConfigurationInterfaces.c"
+#line 807 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp7_ = NULL;
 #line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -802,11 +812,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp7_;
 #line 120 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 806 "ConfigurationInterfaces.c"
+#line 816 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECTORY_PATTERN_CUSTOM:
-#line 810 "ConfigurationInterfaces.c"
+#line 820 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp8_ = NULL;
 #line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -815,11 +825,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp8_;
 #line 123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 819 "ConfigurationInterfaces.c"
+#line 829 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_HEIGHT:
-#line 823 "ConfigurationInterfaces.c"
+#line 833 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp9_ = NULL;
 #line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -828,11 +838,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp9_;
 #line 126 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 832 "ConfigurationInterfaces.c"
+#line 842 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_MAXIMIZE:
-#line 836 "ConfigurationInterfaces.c"
+#line 846 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp10_ = NULL;
 #line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -841,11 +851,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp10_;
 #line 129 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 845 "ConfigurationInterfaces.c"
+#line 855 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DIRECT_WINDOW_WIDTH:
-#line 849 "ConfigurationInterfaces.c"
+#line 859 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp11_ = NULL;
 #line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -854,11 +864,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp11_;
 #line 132 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 858 "ConfigurationInterfaces.c"
+#line 868 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_BASIC_PROPERTIES:
-#line 862 "ConfigurationInterfaces.c"
+#line 872 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp12_ = NULL;
 #line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -867,11 +877,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp12_;
 #line 135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 871 "ConfigurationInterfaces.c"
+#line 881 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_EXTENDED_PROPERTIES:
-#line 875 "ConfigurationInterfaces.c"
+#line 885 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp13_ = NULL;
 #line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -880,11 +890,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp13_;
 #line 138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 884 "ConfigurationInterfaces.c"
+#line 894 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_SIDEBAR:
-#line 888 "ConfigurationInterfaces.c"
+#line 898 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp14_ = NULL;
 #line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -893,11 +903,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp14_;
 #line 141 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 897 "ConfigurationInterfaces.c"
+#line 907 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_TOOLBAR:
-#line 901 "ConfigurationInterfaces.c"
+#line 911 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp15_ = NULL;
 #line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -906,11 +916,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp15_;
 #line 144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 910 "ConfigurationInterfaces.c"
+#line 920 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_SEARCH_BAR:
-#line 914 "ConfigurationInterfaces.c"
+#line 924 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp16_ = NULL;
 #line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -919,11 +929,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp16_;
 #line 147 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 923 "ConfigurationInterfaces.c"
+#line 933 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_RATINGS:
-#line 927 "ConfigurationInterfaces.c"
+#line 937 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp17_ = NULL;
 #line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -932,11 +942,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp17_;
 #line 150 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 936 "ConfigurationInterfaces.c"
+#line 946 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TAGS:
-#line 940 "ConfigurationInterfaces.c"
+#line 950 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp18_ = NULL;
 #line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -945,11 +955,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp18_;
 #line 153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 949 "ConfigurationInterfaces.c"
+#line 959 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_TITLES:
-#line 953 "ConfigurationInterfaces.c"
+#line 963 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp19_ = NULL;
 #line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -958,11 +968,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp19_;
 #line 156 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 962 "ConfigurationInterfaces.c"
+#line 972 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_PHOTO_COMMENTS:
-#line 966 "ConfigurationInterfaces.c"
+#line 976 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp20_ = NULL;
 #line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -971,11 +981,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp20_;
 #line 159 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 975 "ConfigurationInterfaces.c"
+#line 985 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_DISPLAY_EVENT_COMMENTS:
-#line 979 "ConfigurationInterfaces.c"
+#line 989 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp21_ = NULL;
 #line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -984,11 +994,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp21_;
 #line 162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 988 "ConfigurationInterfaces.c"
+#line 998 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_ASCENDING:
-#line 992 "ConfigurationInterfaces.c"
+#line 1002 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp22_ = NULL;
 #line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -997,11 +1007,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp22_;
 #line 165 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1001 "ConfigurationInterfaces.c"
+#line 1011 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENT_PHOTOS_SORT_BY:
-#line 1005 "ConfigurationInterfaces.c"
+#line 1015 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp23_ = NULL;
 #line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1010,11 +1020,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp23_;
 #line 168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1014 "ConfigurationInterfaces.c"
+#line 1024 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING:
-#line 1018 "ConfigurationInterfaces.c"
+#line 1028 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp24_ = NULL;
 #line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1023,11 +1033,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp24_;
 #line 171 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1027 "ConfigurationInterfaces.c"
+#line 1037 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_CONSTRAINT:
-#line 1031 "ConfigurationInterfaces.c"
+#line 1041 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp25_ = NULL;
 #line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1036,11 +1046,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp25_;
 #line 174 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1040 "ConfigurationInterfaces.c"
+#line 1050 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_FORMAT_MODE:
-#line 1044 "ConfigurationInterfaces.c"
+#line 1054 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp26_ = NULL;
 #line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1049,11 +1059,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp26_;
 #line 177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1053 "ConfigurationInterfaces.c"
+#line 1063 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_EXPORT_METADATA:
-#line 1057 "ConfigurationInterfaces.c"
+#line 1067 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp27_ = NULL;
 #line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1062,11 +1072,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp27_;
 #line 180 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1066 "ConfigurationInterfaces.c"
+#line 1076 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_PHOTO_FILE_FORMAT:
-#line 1070 "ConfigurationInterfaces.c"
+#line 1080 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp28_ = NULL;
 #line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1075,11 +1085,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp28_;
 #line 183 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1079 "ConfigurationInterfaces.c"
+#line 1089 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_QUALITY:
-#line 1083 "ConfigurationInterfaces.c"
+#line 1093 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp29_ = NULL;
 #line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1088,11 +1098,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp29_;
 #line 186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1092 "ConfigurationInterfaces.c"
+#line 1102 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXPORT_SCALE:
-#line 1096 "ConfigurationInterfaces.c"
+#line 1106 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp30_ = NULL;
 #line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1101,11 +1111,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp30_;
 #line 189 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1105 "ConfigurationInterfaces.c"
+#line 1115 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
-#line 1109 "ConfigurationInterfaces.c"
+#line 1119 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp31_ = NULL;
 #line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1114,11 +1124,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp31_;
 #line 192 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1118 "ConfigurationInterfaces.c"
+#line 1128 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
-#line 1122 "ConfigurationInterfaces.c"
+#line 1132 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp32_ = NULL;
 #line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1127,11 +1137,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp32_;
 #line 195 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1131 "ConfigurationInterfaces.c"
+#line 1141 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_HIDE_PHOTOS_ALREADY_IMPORTED:
-#line 1135 "ConfigurationInterfaces.c"
+#line 1145 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp33_ = NULL;
 #line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1140,11 +1150,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp33_;
 #line 198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1144 "ConfigurationInterfaces.c"
+#line 1154 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
-#line 1148 "ConfigurationInterfaces.c"
+#line 1158 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp34_ = NULL;
 #line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1153,11 +1163,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp34_;
 #line 201 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1157 "ConfigurationInterfaces.c"
+#line 1167 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_KEEP_RELATIVITY:
-#line 1161 "ConfigurationInterfaces.c"
+#line 1171 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp35_ = NULL;
 #line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1166,11 +1176,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp35_;
 #line 204 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1170 "ConfigurationInterfaces.c"
+#line 1180 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_CROP_HEIGHT:
-#line 1174 "ConfigurationInterfaces.c"
+#line 1184 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp36_ = NULL;
 #line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1179,11 +1189,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp36_;
 #line 207 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1183 "ConfigurationInterfaces.c"
+#line 1193 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_CROP_MENU_CHOICE:
-#line 1187 "ConfigurationInterfaces.c"
+#line 1197 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp37_ = NULL;
 #line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1192,11 +1202,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp37_;
 #line 210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1196 "ConfigurationInterfaces.c"
+#line 1206 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_CROP_WIDTH:
-#line 1200 "ConfigurationInterfaces.c"
+#line 1210 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp38_ = NULL;
 #line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1205,11 +1215,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp38_;
 #line 213 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1209 "ConfigurationInterfaces.c"
+#line 1219 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_USED_SERVICE:
-#line 1213 "ConfigurationInterfaces.c"
+#line 1223 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp39_ = NULL;
 #line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1218,11 +1228,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp39_;
 #line 216 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1222 "ConfigurationInterfaces.c"
+#line 1232 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LAST_USED_DATAIMPORTS_SERVICE:
-#line 1226 "ConfigurationInterfaces.c"
+#line 1236 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp40_ = NULL;
 #line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1231,11 +1241,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp40_;
 #line 219 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1235 "ConfigurationInterfaces.c"
+#line 1245 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_ASCENDING:
-#line 1239 "ConfigurationInterfaces.c"
+#line 1249 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp41_ = NULL;
 #line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1244,11 +1254,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp41_;
 #line 222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1248 "ConfigurationInterfaces.c"
+#line 1258 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_PHOTOS_SORT_BY:
-#line 1252 "ConfigurationInterfaces.c"
+#line 1262 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp42_ = NULL;
 #line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1257,11 +1267,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp42_;
 #line 225 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1261 "ConfigurationInterfaces.c"
+#line 1271 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_HEIGHT:
-#line 1265 "ConfigurationInterfaces.c"
+#line 1275 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp43_ = NULL;
 #line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1270,11 +1280,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp43_;
 #line 228 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1274 "ConfigurationInterfaces.c"
+#line 1284 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_MAXIMIZE:
-#line 1278 "ConfigurationInterfaces.c"
+#line 1288 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp44_ = NULL;
 #line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1283,11 +1293,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp44_;
 #line 231 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1287 "ConfigurationInterfaces.c"
+#line 1297 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_LIBRARY_WINDOW_WIDTH:
-#line 1291 "ConfigurationInterfaces.c"
+#line 1301 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp45_ = NULL;
 #line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1296,11 +1306,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp45_;
 #line 234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1300 "ConfigurationInterfaces.c"
+#line 1310 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_MODIFY_ORIGINALS:
-#line 1304 "ConfigurationInterfaces.c"
+#line 1314 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp46_ = NULL;
 #line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1309,11 +1319,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp46_;
 #line 237 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1313 "ConfigurationInterfaces.c"
+#line 1323 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PHOTO_THUMBNAIL_SCALE:
-#line 1317 "ConfigurationInterfaces.c"
+#line 1327 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp47_ = NULL;
 #line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1322,11 +1332,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp47_;
 #line 240 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1326 "ConfigurationInterfaces.c"
+#line 1336 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PIN_TOOLBAR_STATE:
-#line 1330 "ConfigurationInterfaces.c"
+#line 1340 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp48_ = NULL;
 #line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1335,11 +1345,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp48_;
 #line 243 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1339 "ConfigurationInterfaces.c"
+#line 1349 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_HEIGHT:
-#line 1343 "ConfigurationInterfaces.c"
+#line 1353 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp49_ = NULL;
 #line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1348,11 +1358,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp49_;
 #line 246 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1352 "ConfigurationInterfaces.c"
+#line 1362 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_LAYOUT:
-#line 1356 "ConfigurationInterfaces.c"
+#line 1366 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp50_ = NULL;
 #line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1361,11 +1371,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp50_;
 #line 249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1365 "ConfigurationInterfaces.c"
+#line 1375 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_PPI:
-#line 1369 "ConfigurationInterfaces.c"
+#line 1379 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp51_ = NULL;
 #line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1374,11 +1384,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp51_;
 #line 252 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1378 "ConfigurationInterfaces.c"
+#line 1388 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_UNITS:
-#line 1382 "ConfigurationInterfaces.c"
+#line 1392 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp52_ = NULL;
 #line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1387,11 +1397,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp52_;
 #line 255 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1391 "ConfigurationInterfaces.c"
+#line 1401 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_CONTENT_WIDTH:
-#line 1395 "ConfigurationInterfaces.c"
+#line 1405 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp53_ = NULL;
 #line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1400,11 +1410,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp53_;
 #line 258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1404 "ConfigurationInterfaces.c"
+#line 1414 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_IMAGES_PER_PAGE:
-#line 1408 "ConfigurationInterfaces.c"
+#line 1418 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp54_ = NULL;
 #line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1413,11 +1423,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp54_;
 #line 261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1417 "ConfigurationInterfaces.c"
+#line 1427 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_MATCH_ASPECT_RATIO:
-#line 1421 "ConfigurationInterfaces.c"
+#line 1431 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp55_ = NULL;
 #line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1426,11 +1436,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp55_;
 #line 264 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1430 "ConfigurationInterfaces.c"
+#line 1440 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_PRINT_TITLES:
-#line 1434 "ConfigurationInterfaces.c"
+#line 1444 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp56_ = NULL;
 #line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1439,11 +1449,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp56_;
 #line 267 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1443 "ConfigurationInterfaces.c"
+#line 1453 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION:
-#line 1447 "ConfigurationInterfaces.c"
+#line 1457 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp57_ = NULL;
 #line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1452,11 +1462,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp57_;
 #line 270 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1456 "ConfigurationInterfaces.c"
+#line 1466 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT:
-#line 1460 "ConfigurationInterfaces.c"
+#line 1470 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp58_ = NULL;
 #line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1465,11 +1475,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp58_;
 #line 273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1469 "ConfigurationInterfaces.c"
+#line 1479 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_RAW_DEVELOPER_DEFAULT:
-#line 1473 "ConfigurationInterfaces.c"
+#line 1483 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp59_ = NULL;
 #line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1478,11 +1488,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp59_;
 #line 276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1482 "ConfigurationInterfaces.c"
+#line 1492 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG:
-#line 1486 "ConfigurationInterfaces.c"
+#line 1496 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp60_ = NULL;
 #line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1491,11 +1501,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp60_;
 #line 279 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1495 "ConfigurationInterfaces.c"
+#line 1505 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SIDEBAR_POSITION:
-#line 1499 "ConfigurationInterfaces.c"
+#line 1509 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp61_ = NULL;
 #line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1504,11 +1514,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp61_;
 #line 282 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1508 "ConfigurationInterfaces.c"
+#line 1518 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY:
-#line 1512 "ConfigurationInterfaces.c"
+#line 1522 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp62_ = NULL;
 #line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1517,11 +1527,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp62_;
 #line 285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1521 "ConfigurationInterfaces.c"
+#line 1531 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY:
-#line 1525 "ConfigurationInterfaces.c"
+#line 1535 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp63_ = NULL;
 #line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1530,11 +1540,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp63_;
 #line 288 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1534 "ConfigurationInterfaces.c"
+#line 1544 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID:
-#line 1538 "ConfigurationInterfaces.c"
+#line 1548 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp64_ = NULL;
 #line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1543,11 +1553,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp64_;
 #line 291 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1547 "ConfigurationInterfaces.c"
+#line 1557 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE:
-#line 1551 "ConfigurationInterfaces.c"
+#line 1561 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp65_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1556,11 +1566,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp65_;
 #line 294 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1560 "ConfigurationInterfaces.c"
+#line 1570 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME:
-#line 1564 "ConfigurationInterfaces.c"
+#line 1574 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp66_ = NULL;
 #line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1569,11 +1579,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp66_;
 #line 297 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1573 "ConfigurationInterfaces.c"
+#line 1583 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES:
-#line 1577 "ConfigurationInterfaces.c"
+#line 1587 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp67_ = NULL;
 #line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1582,11 +1592,11 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp67_;
 #line 300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1586 "ConfigurationInterfaces.c"
+#line 1596 "ConfigurationInterfaces.c"
 		}
 #line 97 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE:
-#line 1590 "ConfigurationInterfaces.c"
+#line 1600 "ConfigurationInterfaces.c"
 		{
 			gchar* _tmp68_ = NULL;
 #line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -1595,14 +1605,14 @@ gchar* configurable_property_to_string (ConfigurableProperty self) {
 			result = _tmp68_;
 #line 303 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return result;
-#line 1599 "ConfigurationInterfaces.c"
+#line 1609 "ConfigurationInterfaces.c"
 		}
 		default:
 		{
 #line 306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_error ("ConfigurationInterfaces.vala:306: unknown ConfigurableProperty enumera" \
 "tion value");
-#line 1605 "ConfigurationInterfaces.c"
+#line 1615 "ConfigurationInterfaces.c"
 		}
 	}
 }
@@ -1625,7 +1635,7 @@ gchar* configuration_engine_get_name (ConfigurationEngine* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
 #line 314 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_name (self);
-#line 1628 "ConfigurationInterfaces.c"
+#line 1638 "ConfigurationInterfaces.c"
 }
 
 
@@ -1634,7 +1644,7 @@ gint configuration_engine_get_int_property (ConfigurationEngine* self, Configura
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 316 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_int_property (self, p, error);
-#line 1637 "ConfigurationInterfaces.c"
+#line 1647 "ConfigurationInterfaces.c"
 }
 
 
@@ -1643,7 +1653,7 @@ void configuration_engine_set_int_property (ConfigurationEngine* self, Configura
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 317 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_int_property (self, p, val, error);
-#line 1646 "ConfigurationInterfaces.c"
+#line 1656 "ConfigurationInterfaces.c"
 }
 
 
@@ -1652,7 +1662,7 @@ gint configuration_engine_get_enum_property (ConfigurationEngine* self, Configur
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 319 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_enum_property (self, p, error);
-#line 1655 "ConfigurationInterfaces.c"
+#line 1665 "ConfigurationInterfaces.c"
 }
 
 
@@ -1661,7 +1671,7 @@ void configuration_engine_set_enum_property (ConfigurationEngine* self, Configur
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 320 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_enum_property (self, p, val, error);
-#line 1664 "ConfigurationInterfaces.c"
+#line 1674 "ConfigurationInterfaces.c"
 }
 
 
@@ -1670,7 +1680,7 @@ gchar* configuration_engine_get_string_property (ConfigurationEngine* self, Conf
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
 #line 322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_string_property (self, p, error);
-#line 1673 "ConfigurationInterfaces.c"
+#line 1683 "ConfigurationInterfaces.c"
 }
 
 
@@ -1679,7 +1689,7 @@ void configuration_engine_set_string_property (ConfigurationEngine* self, Config
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_string_property (self, p, val, error);
-#line 1682 "ConfigurationInterfaces.c"
+#line 1692 "ConfigurationInterfaces.c"
 }
 
 
@@ -1688,7 +1698,7 @@ gboolean configuration_engine_get_bool_property (ConfigurationEngine* self, Conf
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE);
 #line 325 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_bool_property (self, p, error);
-#line 1691 "ConfigurationInterfaces.c"
+#line 1701 "ConfigurationInterfaces.c"
 }
 
 
@@ -1697,7 +1707,7 @@ void configuration_engine_set_bool_property (ConfigurationEngine* self, Configur
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_bool_property (self, p, val, error);
-#line 1700 "ConfigurationInterfaces.c"
+#line 1710 "ConfigurationInterfaces.c"
 }
 
 
@@ -1706,7 +1716,7 @@ gdouble configuration_engine_get_double_property (ConfigurationEngine* self, Con
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0);
 #line 328 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_double_property (self, p, error);
-#line 1709 "ConfigurationInterfaces.c"
+#line 1719 "ConfigurationInterfaces.c"
 }
 
 
@@ -1715,7 +1725,7 @@ void configuration_engine_set_double_property (ConfigurationEngine* self, Config
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 329 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_double_property (self, p, val, error);
-#line 1718 "ConfigurationInterfaces.c"
+#line 1728 "ConfigurationInterfaces.c"
 }
 
 
@@ -1724,7 +1734,7 @@ gboolean configuration_engine_get_plugin_bool (ConfigurationEngine* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), FALSE);
 #line 331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_bool (self, domain, id, key, def);
-#line 1727 "ConfigurationInterfaces.c"
+#line 1737 "ConfigurationInterfaces.c"
 }
 
 
@@ -1733,7 +1743,7 @@ void configuration_engine_set_plugin_bool (ConfigurationEngine* self, const gcha
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_bool (self, domain, id, key, val);
-#line 1736 "ConfigurationInterfaces.c"
+#line 1746 "ConfigurationInterfaces.c"
 }
 
 
@@ -1742,7 +1752,7 @@ gdouble configuration_engine_get_plugin_double (ConfigurationEngine* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0.0);
 #line 333 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_double (self, domain, id, key, def);
-#line 1745 "ConfigurationInterfaces.c"
+#line 1755 "ConfigurationInterfaces.c"
 }
 
 
@@ -1751,7 +1761,7 @@ void configuration_engine_set_plugin_double (ConfigurationEngine* self, const gc
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 334 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_double (self, domain, id, key, val);
-#line 1754 "ConfigurationInterfaces.c"
+#line 1764 "ConfigurationInterfaces.c"
 }
 
 
@@ -1760,7 +1770,7 @@ gint configuration_engine_get_plugin_int (ConfigurationEngine* self, const gchar
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 335 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_int (self, domain, id, key, def);
-#line 1763 "ConfigurationInterfaces.c"
+#line 1773 "ConfigurationInterfaces.c"
 }
 
 
@@ -1769,7 +1779,7 @@ void configuration_engine_set_plugin_int (ConfigurationEngine* self, const gchar
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 336 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_int (self, domain, id, key, val);
-#line 1772 "ConfigurationInterfaces.c"
+#line 1782 "ConfigurationInterfaces.c"
 }
 
 
@@ -1778,7 +1788,7 @@ gchar* configuration_engine_get_plugin_string (ConfigurationEngine* self, const
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), NULL);
 #line 337 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->get_plugin_string (self, domain, id, key, def);
-#line 1781 "ConfigurationInterfaces.c"
+#line 1791 "ConfigurationInterfaces.c"
 }
 
 
@@ -1787,7 +1797,7 @@ void configuration_engine_set_plugin_string (ConfigurationEngine* self, const gc
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 338 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_string (self, domain, id, key, val);
-#line 1790 "ConfigurationInterfaces.c"
+#line 1800 "ConfigurationInterfaces.c"
 }
 
 
@@ -1796,7 +1806,7 @@ void configuration_engine_unset_plugin_key (ConfigurationEngine* self, const gch
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 339 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->unset_plugin_key (self, domain, id, key);
-#line 1799 "ConfigurationInterfaces.c"
+#line 1809 "ConfigurationInterfaces.c"
 }
 
 
@@ -1805,7 +1815,7 @@ FuzzyPropertyState configuration_engine_is_plugin_enabled (ConfigurationEngine*
 	g_return_val_if_fail (IS_CONFIGURATION_ENGINE (self), 0);
 #line 341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_ENGINE_GET_INTERFACE (self)->is_plugin_enabled (self, id);
-#line 1808 "ConfigurationInterfaces.c"
+#line 1818 "ConfigurationInterfaces.c"
 }
 
 
@@ -1814,7 +1824,7 @@ void configuration_engine_set_plugin_enabled (ConfigurationEngine* self, const g
 	g_return_if_fail (IS_CONFIGURATION_ENGINE (self));
 #line 342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_ENGINE_GET_INTERFACE (self)->set_plugin_enabled (self, id, enabled);
-#line 1817 "ConfigurationInterfaces.c"
+#line 1827 "ConfigurationInterfaces.c"
 }
 
 
@@ -1827,7 +1837,7 @@ static void configuration_engine_base_init (ConfigurationEngineIface * iface) {
 		initialized = TRUE;
 #line 311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		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 1830 "ConfigurationInterfaces.c"
+#line 1840 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -1848,14 +1858,14 @@ GType configuration_engine_get_type (void) {
 static gpointer _g_object_ref0 (gpointer self) {
 #line 356 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1851 "ConfigurationInterfaces.c"
+#line 1861 "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"
 	configuration_facade_on_property_changed ((ConfigurationFacade*) self, p);
-#line 1858 "ConfigurationInterfaces.c"
+#line 1868 "ConfigurationInterfaces.c"
 }
 
 
@@ -1882,7 +1892,7 @@ ConfigurationFacade* configuration_facade_construct (GType object_type, Configur
 	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"
 	return self;
-#line 1885 "ConfigurationInterfaces.c"
+#line 1895 "ConfigurationInterfaces.c"
 }
 
 
@@ -1910,70 +1920,70 @@ static void configuration_facade_on_property_changed (ConfigurationFacade* self,
 	switch (_tmp3_) {
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_AUTO_IMPORT_FROM_LIBRARY:
-#line 1912 "ConfigurationInterfaces.c"
+#line 1922 "ConfigurationInterfaces.c"
 		{
 #line 366 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "auto-import-from-library-changed");
 #line 367 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1918 "ConfigurationInterfaces.c"
+#line 1928 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_BG_COLOR_NAME:
-#line 1922 "ConfigurationInterfaces.c"
+#line 1932 "ConfigurationInterfaces.c"
 		{
 #line 370 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "bg-color-name-changed");
 #line 371 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1928 "ConfigurationInterfaces.c"
+#line 1938 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_COMMIT_METADATA_TO_MASTERS:
-#line 1932 "ConfigurationInterfaces.c"
+#line 1942 "ConfigurationInterfaces.c"
 		{
 #line 374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "commit-metadata-to-masters-changed");
 #line 375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1938 "ConfigurationInterfaces.c"
+#line 1948 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EVENTS_SORT_ASCENDING:
-#line 1942 "ConfigurationInterfaces.c"
+#line 1952 "ConfigurationInterfaces.c"
 		{
 #line 378 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "events-sort-ascending-changed");
 #line 379 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1948 "ConfigurationInterfaces.c"
+#line 1958 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_PHOTO_APP:
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_EXTERNAL_RAW_APP:
-#line 1954 "ConfigurationInterfaces.c"
+#line 1964 "ConfigurationInterfaces.c"
 		{
 #line 383 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "external-app-changed");
 #line 384 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1960 "ConfigurationInterfaces.c"
+#line 1970 "ConfigurationInterfaces.c"
 		}
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		case CONFIGURABLE_PROPERTY_IMPORT_DIR:
-#line 1964 "ConfigurationInterfaces.c"
+#line 1974 "ConfigurationInterfaces.c"
 		{
 #line 387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_signal_emit_by_name (self, "import-directory-changed");
 #line 388 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			break;
-#line 1970 "ConfigurationInterfaces.c"
+#line 1980 "ConfigurationInterfaces.c"
 		}
 		default:
 #line 364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		break;
-#line 1975 "ConfigurationInterfaces.c"
+#line 1985 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -1992,7 +2002,7 @@ ConfigurationEngine* configuration_facade_get_engine (ConfigurationFacade* self)
 	result = _tmp1_;
 #line 393 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 1994 "ConfigurationInterfaces.c"
+#line 2004 "ConfigurationInterfaces.c"
 }
 
 
@@ -2004,7 +2014,7 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 	_tmp0_ = err;
 #line 397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (g_error_matches (_tmp0_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_PROPERTY_HAS_NO_VALUE)) {
-#line 2006 "ConfigurationInterfaces.c"
+#line 2016 "ConfigurationInterfaces.c"
 		ConfigurationEngine* _tmp1_ = NULL;
 		gchar* _tmp2_ = NULL;
 		gchar* _tmp3_ = NULL;
@@ -2025,14 +2035,14 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 "OPERTY_HAS_NO_VALUE error: %s", _tmp3_, _tmp5_);
 #line 398 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp3_);
-#line 2026 "ConfigurationInterfaces.c"
+#line 2036 "ConfigurationInterfaces.c"
 	} else {
 		GError* _tmp6_ = NULL;
 #line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
 #line 401 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (g_error_matches (_tmp6_, CONFIGURATION_ERROR, CONFIGURATION_ERROR_ENGINE_ERROR)) {
-#line 2033 "ConfigurationInterfaces.c"
+#line 2043 "ConfigurationInterfaces.c"
 			ConfigurationEngine* _tmp7_ = NULL;
 			gchar* _tmp8_ = NULL;
 			gchar* _tmp9_ = NULL;
@@ -2053,7 +2063,7 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 "GINE_ERROR: %s", _tmp9_, _tmp11_);
 #line 402 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_g_free0 (_tmp9_);
-#line 2053 "ConfigurationInterfaces.c"
+#line 2063 "ConfigurationInterfaces.c"
 		} else {
 			ConfigurationEngine* _tmp12_ = NULL;
 			gchar* _tmp13_ = NULL;
@@ -2075,7 +2085,7 @@ void configuration_facade_on_configuration_error (ConfigurationFacade* self, GEr
 "known error: %s", _tmp14_, _tmp16_);
 #line 405 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_g_free0 (_tmp14_);
-#line 2074 "ConfigurationInterfaces.c"
+#line 2084 "ConfigurationInterfaces.c"
 		}
 	}
 }
@@ -2106,8 +2116,8 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2105 "ConfigurationInterfaces.c"
-				goto __catch81_configuration_error;
+#line 2115 "ConfigurationInterfaces.c"
+				goto __catch82_configuration_error;
 			}
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2115,16 +2125,16 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 			g_clear_error (&_inner_error_);
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 2114 "ConfigurationInterfaces.c"
+#line 2124 "ConfigurationInterfaces.c"
 		}
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 415 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2120 "ConfigurationInterfaces.c"
+#line 2130 "ConfigurationInterfaces.c"
 	}
-	goto __finally81;
-	__catch81_configuration_error:
+	goto __finally82;
+	__catch82_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2142,16 +2152,16 @@ static gboolean configuration_facade_real_get_auto_import_from_library (Configur
 		_g_error_free0 (err);
 #line 419 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2141 "ConfigurationInterfaces.c"
+#line 2151 "ConfigurationInterfaces.c"
 	}
-	__finally81:
+	__finally82:
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 414 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 2150 "ConfigurationInterfaces.c"
+#line 2160 "ConfigurationInterfaces.c"
 }
 
 
@@ -2160,7 +2170,7 @@ gboolean configuration_facade_get_auto_import_from_library (ConfigurationFacade*
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 413 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_auto_import_from_library (self);
-#line 2159 "ConfigurationInterfaces.c"
+#line 2169 "ConfigurationInterfaces.c"
 }
 
 
@@ -2184,8 +2194,8 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2183 "ConfigurationInterfaces.c"
-				goto __catch82_configuration_error;
+#line 2193 "ConfigurationInterfaces.c"
+				goto __catch83_configuration_error;
 			}
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2193,11 +2203,11 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 			g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2192 "ConfigurationInterfaces.c"
+#line 2202 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally82;
-	__catch82_configuration_error:
+	goto __finally83;
+	__catch83_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -2213,9 +2223,9 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		_g_error_free0 (err);
 #line 429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2212 "ConfigurationInterfaces.c"
+#line 2222 "ConfigurationInterfaces.c"
 	}
-	__finally82:
+	__finally83:
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2224,7 +2234,7 @@ static void configuration_facade_real_set_auto_import_from_library (Configuratio
 		g_clear_error (&_inner_error_);
 #line 424 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2223 "ConfigurationInterfaces.c"
+#line 2233 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2234,7 +2244,7 @@ void configuration_facade_set_auto_import_from_library (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 423 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_auto_import_from_library (self, auto_import);
-#line 2233 "ConfigurationInterfaces.c"
+#line 2243 "ConfigurationInterfaces.c"
 }
 
 
@@ -2264,8 +2274,8 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2263 "ConfigurationInterfaces.c"
-				goto __catch83_configuration_error;
+#line 2273 "ConfigurationInterfaces.c"
+				goto __catch84_configuration_error;
 			}
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2273,7 +2283,7 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2272 "ConfigurationInterfaces.c"
+#line 2282 "ConfigurationInterfaces.c"
 		}
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2285,10 +2295,10 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		_g_free0 (_tmp0_);
 #line 438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2284 "ConfigurationInterfaces.c"
+#line 2294 "ConfigurationInterfaces.c"
 	}
-	goto __finally83;
-	__catch83_configuration_error:
+	goto __finally84;
+	__catch84_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -2309,16 +2319,16 @@ static gchar* configuration_facade_real_get_bg_color_name (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 442 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2308 "ConfigurationInterfaces.c"
+#line 2318 "ConfigurationInterfaces.c"
 	}
-	__finally83:
+	__finally84:
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 437 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2317 "ConfigurationInterfaces.c"
+#line 2327 "ConfigurationInterfaces.c"
 }
 
 
@@ -2327,7 +2337,7 @@ gchar* configuration_facade_get_bg_color_name (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 436 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_bg_color_name (self);
-#line 2326 "ConfigurationInterfaces.c"
+#line 2336 "ConfigurationInterfaces.c"
 }
 
 
@@ -2335,7 +2345,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 	GError * _inner_error_ = NULL;
 #line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (color_name != NULL);
-#line 2334 "ConfigurationInterfaces.c"
+#line 2344 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -2354,8 +2364,8 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2353 "ConfigurationInterfaces.c"
-				goto __catch84_configuration_error;
+#line 2363 "ConfigurationInterfaces.c"
+				goto __catch85_configuration_error;
 			}
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2363,11 +2373,11 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 			g_clear_error (&_inner_error_);
 #line 448 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2362 "ConfigurationInterfaces.c"
+#line 2372 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally84;
-	__catch84_configuration_error:
+	goto __finally85;
+	__catch85_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -2383,9 +2393,9 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 		_g_error_free0 (err);
 #line 451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2382 "ConfigurationInterfaces.c"
+#line 2392 "ConfigurationInterfaces.c"
 	}
-	__finally84:
+	__finally85:
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2394,7 +2404,7 @@ static void configuration_facade_real_set_bg_color_name (ConfigurationFacade* se
 		g_clear_error (&_inner_error_);
 #line 447 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2393 "ConfigurationInterfaces.c"
+#line 2403 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2404,7 +2414,7 @@ void configuration_facade_set_bg_color_name (ConfigurationFacade* self, const gc
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 446 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_bg_color_name (self, color_name);
-#line 2403 "ConfigurationInterfaces.c"
+#line 2413 "ConfigurationInterfaces.c"
 }
 
 
@@ -2433,8 +2443,8 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2432 "ConfigurationInterfaces.c"
-				goto __catch85_configuration_error;
+#line 2442 "ConfigurationInterfaces.c"
+				goto __catch86_configuration_error;
 			}
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2442,16 +2452,16 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 			g_clear_error (&_inner_error_);
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 2441 "ConfigurationInterfaces.c"
+#line 2451 "ConfigurationInterfaces.c"
 		}
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2447 "ConfigurationInterfaces.c"
+#line 2457 "ConfigurationInterfaces.c"
 	}
-	goto __finally85;
-	__catch85_configuration_error:
+	goto __finally86;
+	__catch86_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2469,16 +2479,16 @@ static gboolean configuration_facade_real_get_commit_metadata_to_masters (Config
 		_g_error_free0 (err);
 #line 464 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2468 "ConfigurationInterfaces.c"
+#line 2478 "ConfigurationInterfaces.c"
 	}
-	__finally85:
+	__finally86:
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 459 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 2477 "ConfigurationInterfaces.c"
+#line 2487 "ConfigurationInterfaces.c"
 }
 
 
@@ -2487,7 +2497,7 @@ gboolean configuration_facade_get_commit_metadata_to_masters (ConfigurationFacad
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 458 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_commit_metadata_to_masters (self);
-#line 2486 "ConfigurationInterfaces.c"
+#line 2496 "ConfigurationInterfaces.c"
 }
 
 
@@ -2511,8 +2521,8 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2510 "ConfigurationInterfaces.c"
-				goto __catch86_configuration_error;
+#line 2520 "ConfigurationInterfaces.c"
+				goto __catch87_configuration_error;
 			}
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2520,11 +2530,11 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 			g_clear_error (&_inner_error_);
 #line 470 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2519 "ConfigurationInterfaces.c"
+#line 2529 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally86;
-	__catch86_configuration_error:
+	goto __finally87;
+	__catch87_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -2540,9 +2550,9 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		_g_error_free0 (err);
 #line 474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2539 "ConfigurationInterfaces.c"
+#line 2549 "ConfigurationInterfaces.c"
 	}
-	__finally86:
+	__finally87:
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2551,7 +2561,7 @@ static void configuration_facade_real_set_commit_metadata_to_masters (Configurat
 		g_clear_error (&_inner_error_);
 #line 469 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2550 "ConfigurationInterfaces.c"
+#line 2560 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2561,7 +2571,7 @@ void configuration_facade_set_commit_metadata_to_masters (ConfigurationFacade* s
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 468 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_commit_metadata_to_masters (self, commit_metadata);
-#line 2560 "ConfigurationInterfaces.c"
+#line 2570 "ConfigurationInterfaces.c"
 }
 
 
@@ -2591,8 +2601,8 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2590 "ConfigurationInterfaces.c"
-				goto __catch87_configuration_error;
+#line 2600 "ConfigurationInterfaces.c"
+				goto __catch88_configuration_error;
 			}
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2600,7 +2610,7 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2599 "ConfigurationInterfaces.c"
+#line 2609 "ConfigurationInterfaces.c"
 		}
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2612,10 +2622,10 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		_g_free0 (_tmp0_);
 #line 483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2611 "ConfigurationInterfaces.c"
+#line 2621 "ConfigurationInterfaces.c"
 	}
-	goto __finally87;
-	__catch87_configuration_error:
+	goto __finally88;
+	__catch88_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -2636,16 +2646,16 @@ static gchar* configuration_facade_real_get_desktop_background (ConfigurationFac
 		_g_error_free0 (err);
 #line 487 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2635 "ConfigurationInterfaces.c"
+#line 2645 "ConfigurationInterfaces.c"
 	}
-	__finally87:
+	__finally88:
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2644 "ConfigurationInterfaces.c"
+#line 2654 "ConfigurationInterfaces.c"
 }
 
 
@@ -2654,7 +2664,7 @@ gchar* configuration_facade_get_desktop_background (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 481 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_desktop_background (self);
-#line 2653 "ConfigurationInterfaces.c"
+#line 2663 "ConfigurationInterfaces.c"
 }
 
 
@@ -2662,7 +2672,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 	GError * _inner_error_ = NULL;
 #line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (filename != NULL);
-#line 2661 "ConfigurationInterfaces.c"
+#line 2671 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -2683,8 +2693,8 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2682 "ConfigurationInterfaces.c"
-				goto __catch88_configuration_error;
+#line 2692 "ConfigurationInterfaces.c"
+				goto __catch89_configuration_error;
 			}
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2692,7 +2702,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 493 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2691 "ConfigurationInterfaces.c"
+#line 2701 "ConfigurationInterfaces.c"
 		}
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -2706,8 +2716,8 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2705 "ConfigurationInterfaces.c"
-				goto __catch88_configuration_error;
+#line 2715 "ConfigurationInterfaces.c"
+				goto __catch89_configuration_error;
 			}
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2715,11 +2725,11 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2714 "ConfigurationInterfaces.c"
+#line 2724 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally88;
-	__catch88_configuration_error:
+	goto __finally89;
+	__catch89_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2733,9 +2743,9 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		configuration_facade_on_configuration_error (self, _tmp5_);
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 2732 "ConfigurationInterfaces.c"
+#line 2742 "ConfigurationInterfaces.c"
 	}
-	__finally88:
+	__finally89:
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2744,7 +2754,7 @@ static void configuration_facade_real_set_desktop_background (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 492 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2743 "ConfigurationInterfaces.c"
+#line 2753 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2754,7 +2764,7 @@ void configuration_facade_set_desktop_background (ConfigurationFacade* self, con
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 491 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_desktop_background (self, filename);
-#line 2753 "ConfigurationInterfaces.c"
+#line 2763 "ConfigurationInterfaces.c"
 }
 
 
@@ -2784,8 +2794,8 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2783 "ConfigurationInterfaces.c"
-				goto __catch89_configuration_error;
+#line 2793 "ConfigurationInterfaces.c"
+				goto __catch90_configuration_error;
 			}
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2793,7 +2803,7 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 			g_clear_error (&_inner_error_);
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2792 "ConfigurationInterfaces.c"
+#line 2802 "ConfigurationInterfaces.c"
 		}
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -2805,10 +2815,10 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		_g_free0 (_tmp0_);
 #line 507 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2804 "ConfigurationInterfaces.c"
+#line 2814 "ConfigurationInterfaces.c"
 	}
-	goto __finally89;
-	__catch89_configuration_error:
+	goto __finally90;
+	__catch90_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -2829,16 +2839,16 @@ static gchar* configuration_facade_real_get_screensaver (ConfigurationFacade* se
 		_g_error_free0 (err);
 #line 511 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 2828 "ConfigurationInterfaces.c"
+#line 2838 "ConfigurationInterfaces.c"
 	}
-	__finally89:
+	__finally90:
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 2837 "ConfigurationInterfaces.c"
+#line 2847 "ConfigurationInterfaces.c"
 }
 
 
@@ -2847,7 +2857,7 @@ gchar* configuration_facade_get_screensaver (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_screensaver (self);
-#line 2846 "ConfigurationInterfaces.c"
+#line 2856 "ConfigurationInterfaces.c"
 }
 
 
@@ -2855,7 +2865,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 	GError * _inner_error_ = NULL;
 #line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (filename != NULL);
-#line 2854 "ConfigurationInterfaces.c"
+#line 2864 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -2876,8 +2886,8 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2875 "ConfigurationInterfaces.c"
-				goto __catch90_configuration_error;
+#line 2885 "ConfigurationInterfaces.c"
+				goto __catch91_configuration_error;
 			}
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2885,7 +2895,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 			g_clear_error (&_inner_error_);
 #line 517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2884 "ConfigurationInterfaces.c"
+#line 2894 "ConfigurationInterfaces.c"
 		}
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -2899,8 +2909,8 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2898 "ConfigurationInterfaces.c"
-				goto __catch90_configuration_error;
+#line 2908 "ConfigurationInterfaces.c"
+				goto __catch91_configuration_error;
 			}
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2908,11 +2918,11 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 			g_clear_error (&_inner_error_);
 #line 519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 2907 "ConfigurationInterfaces.c"
+#line 2917 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally90;
-	__catch90_configuration_error:
+	goto __finally91;
+	__catch91_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -2926,9 +2936,9 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		configuration_facade_on_configuration_error (self, _tmp5_);
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 2925 "ConfigurationInterfaces.c"
+#line 2935 "ConfigurationInterfaces.c"
 	}
-	__finally90:
+	__finally91:
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -2937,7 +2947,7 @@ static void configuration_facade_real_set_screensaver (ConfigurationFacade* self
 		g_clear_error (&_inner_error_);
 #line 516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 2936 "ConfigurationInterfaces.c"
+#line 2946 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -2947,7 +2957,7 @@ void configuration_facade_set_screensaver (ConfigurationFacade* self, const gcha
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 515 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_screensaver (self, filename);
-#line 2946 "ConfigurationInterfaces.c"
+#line 2956 "ConfigurationInterfaces.c"
 }
 
 
@@ -2978,8 +2988,8 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 2977 "ConfigurationInterfaces.c"
-				goto __catch91_configuration_error;
+#line 2987 "ConfigurationInterfaces.c"
+				goto __catch92_configuration_error;
 			}
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2987,17 +2997,17 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 2986 "ConfigurationInterfaces.c"
+#line 2996 "ConfigurationInterfaces.c"
 		}
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (g_strcmp0 (s, "") == 0) {
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = NULL;
-#line 2992 "ConfigurationInterfaces.c"
+#line 3002 "ConfigurationInterfaces.c"
 		} else {
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			_tmp4_ = s;
-#line 2996 "ConfigurationInterfaces.c"
+#line 3006 "ConfigurationInterfaces.c"
 		}
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = g_strdup (_tmp4_);
@@ -3007,10 +3017,10 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		_g_free0 (s);
 #line 532 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3006 "ConfigurationInterfaces.c"
+#line 3016 "ConfigurationInterfaces.c"
 	}
-	goto __finally91;
-	__catch91_configuration_error:
+	goto __finally92;
+	__catch92_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -3031,16 +3041,16 @@ static gchar* configuration_facade_real_get_directory_pattern (ConfigurationFaca
 		_g_error_free0 (err);
 #line 536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3030 "ConfigurationInterfaces.c"
+#line 3040 "ConfigurationInterfaces.c"
 	}
-	__finally91:
+	__finally92:
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 530 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 3039 "ConfigurationInterfaces.c"
+#line 3049 "ConfigurationInterfaces.c"
 }
 
 
@@ -3049,7 +3059,7 @@ gchar* configuration_facade_get_directory_pattern (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern (self);
-#line 3048 "ConfigurationInterfaces.c"
+#line 3058 "ConfigurationInterfaces.c"
 }
 
 
@@ -3066,7 +3076,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		if (_tmp0_ == NULL) {
 #line 543 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			s = "";
-#line 3065 "ConfigurationInterfaces.c"
+#line 3075 "ConfigurationInterfaces.c"
 		}
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
@@ -3082,8 +3092,8 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3081 "ConfigurationInterfaces.c"
-				goto __catch92_configuration_error;
+#line 3091 "ConfigurationInterfaces.c"
+				goto __catch93_configuration_error;
 			}
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3091,11 +3101,11 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 545 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3090 "ConfigurationInterfaces.c"
+#line 3100 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally92;
-	__catch92_configuration_error:
+	goto __finally93;
+	__catch93_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -3109,9 +3119,9 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp4_);
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3108 "ConfigurationInterfaces.c"
+#line 3118 "ConfigurationInterfaces.c"
 	}
-	__finally92:
+	__finally93:
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3120,7 +3130,7 @@ static void configuration_facade_real_set_directory_pattern (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 541 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3119 "ConfigurationInterfaces.c"
+#line 3129 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3130,7 +3140,7 @@ void configuration_facade_set_directory_pattern (ConfigurationFacade* self, cons
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern (self, s);
-#line 3129 "ConfigurationInterfaces.c"
+#line 3139 "ConfigurationInterfaces.c"
 }
 
 
@@ -3160,8 +3170,8 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3159 "ConfigurationInterfaces.c"
-				goto __catch93_configuration_error;
+#line 3169 "ConfigurationInterfaces.c"
+				goto __catch94_configuration_error;
 			}
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3169,7 +3179,7 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 			g_clear_error (&_inner_error_);
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 3168 "ConfigurationInterfaces.c"
+#line 3178 "ConfigurationInterfaces.c"
 		}
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -3181,10 +3191,10 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		_g_free0 (_tmp0_);
 #line 556 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3180 "ConfigurationInterfaces.c"
+#line 3190 "ConfigurationInterfaces.c"
 	}
-	goto __finally93;
-	__catch93_configuration_error:
+	goto __finally94;
+	__catch94_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -3205,16 +3215,16 @@ static gchar* configuration_facade_real_get_directory_pattern_custom (Configurat
 		_g_error_free0 (err);
 #line 560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3204 "ConfigurationInterfaces.c"
+#line 3214 "ConfigurationInterfaces.c"
 	}
-	__finally93:
+	__finally94:
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 3213 "ConfigurationInterfaces.c"
+#line 3223 "ConfigurationInterfaces.c"
 }
 
 
@@ -3223,7 +3233,7 @@ gchar* configuration_facade_get_directory_pattern_custom (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_directory_pattern_custom (self);
-#line 3222 "ConfigurationInterfaces.c"
+#line 3232 "ConfigurationInterfaces.c"
 }
 
 
@@ -3231,7 +3241,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 	GError * _inner_error_ = NULL;
 #line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (s != NULL);
-#line 3230 "ConfigurationInterfaces.c"
+#line 3240 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -3250,8 +3260,8 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3249 "ConfigurationInterfaces.c"
-				goto __catch94_configuration_error;
+#line 3259 "ConfigurationInterfaces.c"
+				goto __catch95_configuration_error;
 			}
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3259,11 +3269,11 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 			g_clear_error (&_inner_error_);
 #line 566 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3258 "ConfigurationInterfaces.c"
+#line 3268 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally94;
-	__catch94_configuration_error:
+	goto __finally95;
+	__catch95_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -3277,9 +3287,9 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3276 "ConfigurationInterfaces.c"
+#line 3286 "ConfigurationInterfaces.c"
 	}
-	__finally94:
+	__finally95:
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3288,7 +3298,7 @@ static void configuration_facade_real_set_directory_pattern_custom (Configuratio
 		g_clear_error (&_inner_error_);
 #line 565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3287 "ConfigurationInterfaces.c"
+#line 3297 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3298,7 +3308,7 @@ void configuration_facade_set_directory_pattern_custom (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 564 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_directory_pattern_custom (self, s);
-#line 3297 "ConfigurationInterfaces.c"
+#line 3307 "ConfigurationInterfaces.c"
 }
 
 
@@ -3310,7 +3320,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 	_vala_maximize = FALSE;
 #line 577 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	dimensions_init (&_vala_dimensions, 1024, 768);
-#line 3309 "ConfigurationInterfaces.c"
+#line 3319 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -3345,8 +3355,8 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3344 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+#line 3354 "ConfigurationInterfaces.c"
+				goto __catch96_configuration_error;
 			}
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3354,7 +3364,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3353 "ConfigurationInterfaces.c"
+#line 3363 "ConfigurationInterfaces.c"
 		}
 #line 579 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
@@ -3374,8 +3384,8 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3373 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+#line 3383 "ConfigurationInterfaces.c"
+				goto __catch96_configuration_error;
 			}
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3383,7 +3393,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3382 "ConfigurationInterfaces.c"
+#line 3392 "ConfigurationInterfaces.c"
 		}
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
@@ -3401,8 +3411,8 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3400 "ConfigurationInterfaces.c"
-				goto __catch95_configuration_error;
+#line 3410 "ConfigurationInterfaces.c"
+				goto __catch96_configuration_error;
 			}
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3410,7 +3420,7 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3409 "ConfigurationInterfaces.c"
+#line 3419 "ConfigurationInterfaces.c"
 		}
 #line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
@@ -3418,10 +3428,10 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		_tmp14_ = h;
 #line 582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
-#line 3417 "ConfigurationInterfaces.c"
+#line 3427 "ConfigurationInterfaces.c"
 	}
-	goto __finally95;
-	__catch95_configuration_error:
+	goto __finally96;
+	__catch96_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -3435,9 +3445,9 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp15_);
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3434 "ConfigurationInterfaces.c"
+#line 3444 "ConfigurationInterfaces.c"
 	}
-	__finally95:
+	__finally96:
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3446,19 +3456,19 @@ static void configuration_facade_real_get_direct_window_state (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 578 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3445 "ConfigurationInterfaces.c"
+#line 3455 "ConfigurationInterfaces.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (maximize) {
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*maximize = _vala_maximize;
-#line 3451 "ConfigurationInterfaces.c"
+#line 3461 "ConfigurationInterfaces.c"
 	}
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (dimensions) {
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*dimensions = _vala_dimensions;
-#line 3457 "ConfigurationInterfaces.c"
+#line 3467 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3468,7 +3478,7 @@ void configuration_facade_get_direct_window_state (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 575 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_direct_window_state (self, maximize, dimensions);
-#line 3467 "ConfigurationInterfaces.c"
+#line 3477 "ConfigurationInterfaces.c"
 }
 
 
@@ -3476,7 +3486,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 	GError * _inner_error_ = NULL;
 #line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (dimensions != NULL);
-#line 3475 "ConfigurationInterfaces.c"
+#line 3485 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -3503,8 +3513,8 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3502 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+#line 3512 "ConfigurationInterfaces.c"
+				goto __catch97_configuration_error;
 			}
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3512,7 +3522,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 590 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3511 "ConfigurationInterfaces.c"
+#line 3521 "ConfigurationInterfaces.c"
 		}
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -3530,8 +3540,8 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3529 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+#line 3539 "ConfigurationInterfaces.c"
+				goto __catch97_configuration_error;
 			}
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3539,7 +3549,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 591 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3538 "ConfigurationInterfaces.c"
+#line 3548 "ConfigurationInterfaces.c"
 		}
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
@@ -3557,8 +3567,8 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3556 "ConfigurationInterfaces.c"
-				goto __catch96_configuration_error;
+#line 3566 "ConfigurationInterfaces.c"
+				goto __catch97_configuration_error;
 			}
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3566,11 +3576,11 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3565 "ConfigurationInterfaces.c"
+#line 3575 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally96;
-	__catch96_configuration_error:
+	goto __finally97;
+	__catch97_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp11_ = NULL;
@@ -3584,9 +3594,9 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp11_);
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3583 "ConfigurationInterfaces.c"
+#line 3593 "ConfigurationInterfaces.c"
 	}
-	__finally96:
+	__finally97:
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3595,7 +3605,7 @@ static void configuration_facade_real_set_direct_window_state (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3594 "ConfigurationInterfaces.c"
+#line 3604 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3605,7 +3615,7 @@ void configuration_facade_set_direct_window_state (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 588 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_direct_window_state (self, maximize, dimensions);
-#line 3604 "ConfigurationInterfaces.c"
+#line 3614 "ConfigurationInterfaces.c"
 }
 
 
@@ -3634,8 +3644,8 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3633 "ConfigurationInterfaces.c"
-				goto __catch97_configuration_error;
+#line 3643 "ConfigurationInterfaces.c"
+				goto __catch98_configuration_error;
 			}
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3643,16 +3653,16 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 			g_clear_error (&_inner_error_);
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 3642 "ConfigurationInterfaces.c"
+#line 3652 "ConfigurationInterfaces.c"
 		}
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3648 "ConfigurationInterfaces.c"
+#line 3658 "ConfigurationInterfaces.c"
 	}
-	goto __finally97;
-	__catch97_configuration_error:
+	goto __finally98;
+	__catch98_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -3670,16 +3680,16 @@ static gboolean configuration_facade_real_get_display_basic_properties (Configur
 		_g_error_free0 (err);
 #line 609 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3669 "ConfigurationInterfaces.c"
+#line 3679 "ConfigurationInterfaces.c"
 	}
-	__finally97:
+	__finally98:
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 3678 "ConfigurationInterfaces.c"
+#line 3688 "ConfigurationInterfaces.c"
 }
 
 
@@ -3688,7 +3698,7 @@ gboolean configuration_facade_get_display_basic_properties (ConfigurationFacade*
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_basic_properties (self);
-#line 3687 "ConfigurationInterfaces.c"
+#line 3697 "ConfigurationInterfaces.c"
 }
 
 
@@ -3712,8 +3722,8 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3711 "ConfigurationInterfaces.c"
-				goto __catch98_configuration_error;
+#line 3721 "ConfigurationInterfaces.c"
+				goto __catch99_configuration_error;
 			}
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3721,11 +3731,11 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 			g_clear_error (&_inner_error_);
 #line 615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3720 "ConfigurationInterfaces.c"
+#line 3730 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally98;
-	__catch98_configuration_error:
+	goto __finally99;
+	__catch99_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -3739,9 +3749,9 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3738 "ConfigurationInterfaces.c"
+#line 3748 "ConfigurationInterfaces.c"
 	}
-	__finally98:
+	__finally99:
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3750,7 +3760,7 @@ static void configuration_facade_real_set_display_basic_properties (Configuratio
 		g_clear_error (&_inner_error_);
 #line 614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3749 "ConfigurationInterfaces.c"
+#line 3759 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3760,7 +3770,7 @@ void configuration_facade_set_display_basic_properties (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_basic_properties (self, display);
-#line 3759 "ConfigurationInterfaces.c"
+#line 3769 "ConfigurationInterfaces.c"
 }
 
 
@@ -3789,8 +3799,8 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3788 "ConfigurationInterfaces.c"
-				goto __catch99_configuration_error;
+#line 3798 "ConfigurationInterfaces.c"
+				goto __catch100_configuration_error;
 			}
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3798,16 +3808,16 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 			g_clear_error (&_inner_error_);
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 3797 "ConfigurationInterfaces.c"
+#line 3807 "ConfigurationInterfaces.c"
 		}
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3803 "ConfigurationInterfaces.c"
+#line 3813 "ConfigurationInterfaces.c"
 	}
-	goto __finally99;
-	__catch99_configuration_error:
+	goto __finally100;
+	__catch100_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -3825,16 +3835,16 @@ static gboolean configuration_facade_real_get_display_extended_properties (Confi
 		_g_error_free0 (err);
 #line 630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3824 "ConfigurationInterfaces.c"
+#line 3834 "ConfigurationInterfaces.c"
 	}
-	__finally99:
+	__finally100:
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 3833 "ConfigurationInterfaces.c"
+#line 3843 "ConfigurationInterfaces.c"
 }
 
 
@@ -3843,7 +3853,7 @@ gboolean configuration_facade_get_display_extended_properties (ConfigurationFaca
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_extended_properties (self);
-#line 3842 "ConfigurationInterfaces.c"
+#line 3852 "ConfigurationInterfaces.c"
 }
 
 
@@ -3867,8 +3877,8 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3866 "ConfigurationInterfaces.c"
-				goto __catch100_configuration_error;
+#line 3876 "ConfigurationInterfaces.c"
+				goto __catch101_configuration_error;
 			}
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3876,11 +3886,11 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 			g_clear_error (&_inner_error_);
 #line 636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 3875 "ConfigurationInterfaces.c"
+#line 3885 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally100;
-	__catch100_configuration_error:
+	goto __finally101;
+	__catch101_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -3894,9 +3904,9 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 3893 "ConfigurationInterfaces.c"
+#line 3903 "ConfigurationInterfaces.c"
 	}
-	__finally100:
+	__finally101:
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -3905,7 +3915,7 @@ static void configuration_facade_real_set_display_extended_properties (Configura
 		g_clear_error (&_inner_error_);
 #line 635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 3904 "ConfigurationInterfaces.c"
+#line 3914 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -3915,7 +3925,7 @@ void configuration_facade_set_display_extended_properties (ConfigurationFacade*
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_extended_properties (self, display);
-#line 3914 "ConfigurationInterfaces.c"
+#line 3924 "ConfigurationInterfaces.c"
 }
 
 
@@ -3944,8 +3954,8 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 3943 "ConfigurationInterfaces.c"
-				goto __catch101_configuration_error;
+#line 3953 "ConfigurationInterfaces.c"
+				goto __catch102_configuration_error;
 			}
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3953,16 +3963,16 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 3952 "ConfigurationInterfaces.c"
+#line 3962 "ConfigurationInterfaces.c"
 		}
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3958 "ConfigurationInterfaces.c"
+#line 3968 "ConfigurationInterfaces.c"
 	}
-	goto __finally101;
-	__catch101_configuration_error:
+	goto __finally102;
+	__catch102_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -3980,16 +3990,16 @@ static gboolean configuration_facade_real_get_display_sidebar (ConfigurationFaca
 		_g_error_free0 (err);
 #line 652 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 3979 "ConfigurationInterfaces.c"
+#line 3989 "ConfigurationInterfaces.c"
 	}
-	__finally101:
+	__finally102:
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 3988 "ConfigurationInterfaces.c"
+#line 3998 "ConfigurationInterfaces.c"
 }
 
 
@@ -3998,7 +4008,7 @@ gboolean configuration_facade_get_display_sidebar (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_sidebar (self);
-#line 3997 "ConfigurationInterfaces.c"
+#line 4007 "ConfigurationInterfaces.c"
 }
 
 
@@ -4022,8 +4032,8 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4021 "ConfigurationInterfaces.c"
-				goto __catch102_configuration_error;
+#line 4031 "ConfigurationInterfaces.c"
+				goto __catch103_configuration_error;
 			}
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4031,11 +4041,11 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4030 "ConfigurationInterfaces.c"
+#line 4040 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally102;
-	__catch102_configuration_error:
+	goto __finally103;
+	__catch103_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4049,9 +4059,9 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4048 "ConfigurationInterfaces.c"
+#line 4058 "ConfigurationInterfaces.c"
 	}
-	__finally102:
+	__finally103:
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4060,7 +4070,7 @@ static void configuration_facade_real_set_display_sidebar (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4059 "ConfigurationInterfaces.c"
+#line 4069 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4070,7 +4080,7 @@ void configuration_facade_set_display_sidebar (ConfigurationFacade* self, gboole
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 656 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_sidebar (self, display);
-#line 4069 "ConfigurationInterfaces.c"
+#line 4079 "ConfigurationInterfaces.c"
 }
 
 
@@ -4099,8 +4109,8 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4098 "ConfigurationInterfaces.c"
-				goto __catch103_configuration_error;
+#line 4108 "ConfigurationInterfaces.c"
+				goto __catch104_configuration_error;
 			}
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4108,16 +4118,16 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4107 "ConfigurationInterfaces.c"
+#line 4117 "ConfigurationInterfaces.c"
 		}
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4113 "ConfigurationInterfaces.c"
+#line 4123 "ConfigurationInterfaces.c"
 	}
-	goto __finally103;
-	__catch103_configuration_error:
+	goto __finally104;
+	__catch104_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4135,16 +4145,16 @@ static gboolean configuration_facade_real_get_display_toolbar (ConfigurationFaca
 		_g_error_free0 (err);
 #line 674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4134 "ConfigurationInterfaces.c"
+#line 4144 "ConfigurationInterfaces.c"
 	}
-	__finally103:
+	__finally104:
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 669 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4143 "ConfigurationInterfaces.c"
+#line 4153 "ConfigurationInterfaces.c"
 }
 
 
@@ -4153,7 +4163,7 @@ gboolean configuration_facade_get_display_toolbar (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 668 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_toolbar (self);
-#line 4152 "ConfigurationInterfaces.c"
+#line 4162 "ConfigurationInterfaces.c"
 }
 
 
@@ -4177,8 +4187,8 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4176 "ConfigurationInterfaces.c"
-				goto __catch104_configuration_error;
+#line 4186 "ConfigurationInterfaces.c"
+				goto __catch105_configuration_error;
 			}
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4186,11 +4196,11 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 680 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4185 "ConfigurationInterfaces.c"
+#line 4195 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally104;
-	__catch104_configuration_error:
+	goto __finally105;
+	__catch105_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4204,9 +4214,9 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4203 "ConfigurationInterfaces.c"
+#line 4213 "ConfigurationInterfaces.c"
 	}
-	__finally104:
+	__finally105:
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4215,7 +4225,7 @@ static void configuration_facade_real_set_display_toolbar (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4214 "ConfigurationInterfaces.c"
+#line 4224 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4225,7 +4235,7 @@ void configuration_facade_set_display_toolbar (ConfigurationFacade* self, gboole
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 678 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_toolbar (self, display);
-#line 4224 "ConfigurationInterfaces.c"
+#line 4234 "ConfigurationInterfaces.c"
 }
 
 
@@ -4254,8 +4264,8 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4253 "ConfigurationInterfaces.c"
-				goto __catch105_configuration_error;
+#line 4263 "ConfigurationInterfaces.c"
+				goto __catch106_configuration_error;
 			}
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4263,16 +4273,16 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4262 "ConfigurationInterfaces.c"
+#line 4272 "ConfigurationInterfaces.c"
 		}
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 691 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4268 "ConfigurationInterfaces.c"
+#line 4278 "ConfigurationInterfaces.c"
 	}
-	goto __finally105;
-	__catch105_configuration_error:
+	goto __finally106;
+	__catch106_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4290,16 +4300,16 @@ static gboolean configuration_facade_real_get_display_search_bar (ConfigurationF
 		_g_error_free0 (err);
 #line 695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4289 "ConfigurationInterfaces.c"
+#line 4299 "ConfigurationInterfaces.c"
 	}
-	__finally105:
+	__finally106:
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 690 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4298 "ConfigurationInterfaces.c"
+#line 4308 "ConfigurationInterfaces.c"
 }
 
 
@@ -4308,7 +4318,7 @@ gboolean configuration_facade_get_display_search_bar (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 689 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_search_bar (self);
-#line 4307 "ConfigurationInterfaces.c"
+#line 4317 "ConfigurationInterfaces.c"
 }
 
 
@@ -4332,8 +4342,8 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4331 "ConfigurationInterfaces.c"
-				goto __catch106_configuration_error;
+#line 4341 "ConfigurationInterfaces.c"
+				goto __catch107_configuration_error;
 			}
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4341,11 +4351,11 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 701 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4340 "ConfigurationInterfaces.c"
+#line 4350 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally106;
-	__catch106_configuration_error:
+	goto __finally107;
+	__catch107_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4359,9 +4369,9 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4358 "ConfigurationInterfaces.c"
+#line 4368 "ConfigurationInterfaces.c"
 	}
-	__finally106:
+	__finally107:
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4370,7 +4380,7 @@ static void configuration_facade_real_set_display_search_bar (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 700 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4369 "ConfigurationInterfaces.c"
+#line 4379 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4380,7 +4390,7 @@ void configuration_facade_set_display_search_bar (ConfigurationFacade* self, gbo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 699 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_search_bar (self, display);
-#line 4379 "ConfigurationInterfaces.c"
+#line 4389 "ConfigurationInterfaces.c"
 }
 
 
@@ -4409,8 +4419,8 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4408 "ConfigurationInterfaces.c"
-				goto __catch107_configuration_error;
+#line 4418 "ConfigurationInterfaces.c"
+				goto __catch108_configuration_error;
 			}
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4418,16 +4428,16 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 			g_clear_error (&_inner_error_);
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4417 "ConfigurationInterfaces.c"
+#line 4427 "ConfigurationInterfaces.c"
 		}
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 712 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4423 "ConfigurationInterfaces.c"
+#line 4433 "ConfigurationInterfaces.c"
 	}
-	goto __finally107;
-	__catch107_configuration_error:
+	goto __finally108;
+	__catch108_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4445,16 +4455,16 @@ static gboolean configuration_facade_real_get_display_photo_ratings (Configurati
 		_g_error_free0 (err);
 #line 716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4444 "ConfigurationInterfaces.c"
+#line 4454 "ConfigurationInterfaces.c"
 	}
-	__finally107:
+	__finally108:
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4453 "ConfigurationInterfaces.c"
+#line 4463 "ConfigurationInterfaces.c"
 }
 
 
@@ -4463,7 +4473,7 @@ gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_ratings (self);
-#line 4462 "ConfigurationInterfaces.c"
+#line 4472 "ConfigurationInterfaces.c"
 }
 
 
@@ -4487,8 +4497,8 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4486 "ConfigurationInterfaces.c"
-				goto __catch108_configuration_error;
+#line 4496 "ConfigurationInterfaces.c"
+				goto __catch109_configuration_error;
 			}
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4496,11 +4506,11 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 722 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4495 "ConfigurationInterfaces.c"
+#line 4505 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally108;
-	__catch108_configuration_error:
+	goto __finally109;
+	__catch109_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4514,9 +4524,9 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4513 "ConfigurationInterfaces.c"
+#line 4523 "ConfigurationInterfaces.c"
 	}
-	__finally108:
+	__finally109:
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4525,7 +4535,7 @@ static void configuration_facade_real_set_display_photo_ratings (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4524 "ConfigurationInterfaces.c"
+#line 4534 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4535,7 +4545,7 @@ void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 720 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_ratings (self, display);
-#line 4534 "ConfigurationInterfaces.c"
+#line 4544 "ConfigurationInterfaces.c"
 }
 
 
@@ -4564,8 +4574,8 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4563 "ConfigurationInterfaces.c"
-				goto __catch109_configuration_error;
+#line 4573 "ConfigurationInterfaces.c"
+				goto __catch110_configuration_error;
 			}
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4573,16 +4583,16 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4572 "ConfigurationInterfaces.c"
+#line 4582 "ConfigurationInterfaces.c"
 		}
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 733 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4578 "ConfigurationInterfaces.c"
+#line 4588 "ConfigurationInterfaces.c"
 	}
-	goto __finally109;
-	__catch109_configuration_error:
+	goto __finally110;
+	__catch110_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4600,16 +4610,16 @@ static gboolean configuration_facade_real_get_display_photo_tags (ConfigurationF
 		_g_error_free0 (err);
 #line 737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4599 "ConfigurationInterfaces.c"
+#line 4609 "ConfigurationInterfaces.c"
 	}
-	__finally109:
+	__finally110:
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4608 "ConfigurationInterfaces.c"
+#line 4618 "ConfigurationInterfaces.c"
 }
 
 
@@ -4618,7 +4628,7 @@ gboolean configuration_facade_get_display_photo_tags (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_tags (self);
-#line 4617 "ConfigurationInterfaces.c"
+#line 4627 "ConfigurationInterfaces.c"
 }
 
 
@@ -4642,8 +4652,8 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4641 "ConfigurationInterfaces.c"
-				goto __catch110_configuration_error;
+#line 4651 "ConfigurationInterfaces.c"
+				goto __catch111_configuration_error;
 			}
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4651,11 +4661,11 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4650 "ConfigurationInterfaces.c"
+#line 4660 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally110;
-	__catch110_configuration_error:
+	goto __finally111;
+	__catch111_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4669,9 +4679,9 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4668 "ConfigurationInterfaces.c"
+#line 4678 "ConfigurationInterfaces.c"
 	}
-	__finally110:
+	__finally111:
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4680,7 +4690,7 @@ static void configuration_facade_real_set_display_photo_tags (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 742 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4679 "ConfigurationInterfaces.c"
+#line 4689 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4690,7 +4700,7 @@ void configuration_facade_set_display_photo_tags (ConfigurationFacade* self, gbo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 741 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_tags (self, display);
-#line 4689 "ConfigurationInterfaces.c"
+#line 4699 "ConfigurationInterfaces.c"
 }
 
 
@@ -4719,8 +4729,8 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4718 "ConfigurationInterfaces.c"
-				goto __catch111_configuration_error;
+#line 4728 "ConfigurationInterfaces.c"
+				goto __catch112_configuration_error;
 			}
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4728,16 +4738,16 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 			g_clear_error (&_inner_error_);
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4727 "ConfigurationInterfaces.c"
+#line 4737 "ConfigurationInterfaces.c"
 		}
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4733 "ConfigurationInterfaces.c"
+#line 4743 "ConfigurationInterfaces.c"
 	}
-	goto __finally111;
-	__catch111_configuration_error:
+	goto __finally112;
+	__catch112_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4755,16 +4765,16 @@ static gboolean configuration_facade_real_get_display_photo_titles (Configuratio
 		_g_error_free0 (err);
 #line 758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4754 "ConfigurationInterfaces.c"
+#line 4764 "ConfigurationInterfaces.c"
 	}
-	__finally111:
+	__finally112:
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 753 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4763 "ConfigurationInterfaces.c"
+#line 4773 "ConfigurationInterfaces.c"
 }
 
 
@@ -4773,7 +4783,7 @@ gboolean configuration_facade_get_display_photo_titles (ConfigurationFacade* sel
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_titles (self);
-#line 4772 "ConfigurationInterfaces.c"
+#line 4782 "ConfigurationInterfaces.c"
 }
 
 
@@ -4797,8 +4807,8 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4796 "ConfigurationInterfaces.c"
-				goto __catch112_configuration_error;
+#line 4806 "ConfigurationInterfaces.c"
+				goto __catch113_configuration_error;
 			}
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4806,11 +4816,11 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 764 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4805 "ConfigurationInterfaces.c"
+#line 4815 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally112;
-	__catch112_configuration_error:
+	goto __finally113;
+	__catch113_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4824,9 +4834,9 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4823 "ConfigurationInterfaces.c"
+#line 4833 "ConfigurationInterfaces.c"
 	}
-	__finally112:
+	__finally113:
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4835,7 +4845,7 @@ static void configuration_facade_real_set_display_photo_titles (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4834 "ConfigurationInterfaces.c"
+#line 4844 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -4845,7 +4855,7 @@ void configuration_facade_set_display_photo_titles (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_titles (self, display);
-#line 4844 "ConfigurationInterfaces.c"
+#line 4854 "ConfigurationInterfaces.c"
 }
 
 
@@ -4874,8 +4884,8 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4873 "ConfigurationInterfaces.c"
-				goto __catch113_configuration_error;
+#line 4883 "ConfigurationInterfaces.c"
+				goto __catch114_configuration_error;
 			}
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4883,16 +4893,16 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 			g_clear_error (&_inner_error_);
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 4882 "ConfigurationInterfaces.c"
+#line 4892 "ConfigurationInterfaces.c"
 		}
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4888 "ConfigurationInterfaces.c"
+#line 4898 "ConfigurationInterfaces.c"
 	}
-	goto __finally113;
-	__catch113_configuration_error:
+	goto __finally114;
+	__catch114_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -4910,16 +4920,16 @@ static gboolean configuration_facade_real_get_display_photo_comments (Configurat
 		_g_error_free0 (err);
 #line 779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 4909 "ConfigurationInterfaces.c"
+#line 4919 "ConfigurationInterfaces.c"
 	}
-	__finally113:
+	__finally114:
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 4918 "ConfigurationInterfaces.c"
+#line 4928 "ConfigurationInterfaces.c"
 }
 
 
@@ -4928,7 +4938,7 @@ gboolean configuration_facade_get_display_photo_comments (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_photo_comments (self);
-#line 4927 "ConfigurationInterfaces.c"
+#line 4937 "ConfigurationInterfaces.c"
 }
 
 
@@ -4952,8 +4962,8 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 4951 "ConfigurationInterfaces.c"
-				goto __catch114_configuration_error;
+#line 4961 "ConfigurationInterfaces.c"
+				goto __catch115_configuration_error;
 			}
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -4961,11 +4971,11 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 4960 "ConfigurationInterfaces.c"
+#line 4970 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally114;
-	__catch114_configuration_error:
+	goto __finally115;
+	__catch115_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -4979,9 +4989,9 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 4978 "ConfigurationInterfaces.c"
+#line 4988 "ConfigurationInterfaces.c"
 	}
-	__finally114:
+	__finally115:
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -4990,7 +5000,7 @@ static void configuration_facade_real_set_display_photo_comments (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 784 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 4989 "ConfigurationInterfaces.c"
+#line 4999 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5000,7 +5010,7 @@ void configuration_facade_set_display_photo_comments (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_photo_comments (self, display);
-#line 4999 "ConfigurationInterfaces.c"
+#line 5009 "ConfigurationInterfaces.c"
 }
 
 
@@ -5029,8 +5039,8 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5028 "ConfigurationInterfaces.c"
-				goto __catch115_configuration_error;
+#line 5038 "ConfigurationInterfaces.c"
+				goto __catch116_configuration_error;
 			}
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5038,16 +5048,16 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 			g_clear_error (&_inner_error_);
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 5037 "ConfigurationInterfaces.c"
+#line 5047 "ConfigurationInterfaces.c"
 		}
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5043 "ConfigurationInterfaces.c"
+#line 5053 "ConfigurationInterfaces.c"
 	}
-	goto __finally115;
-	__catch115_configuration_error:
+	goto __finally116;
+	__catch116_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5065,16 +5075,16 @@ static gboolean configuration_facade_real_get_display_event_comments (Configurat
 		_g_error_free0 (err);
 #line 800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5064 "ConfigurationInterfaces.c"
+#line 5074 "ConfigurationInterfaces.c"
 	}
-	__finally115:
+	__finally116:
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 5073 "ConfigurationInterfaces.c"
+#line 5083 "ConfigurationInterfaces.c"
 }
 
 
@@ -5083,7 +5093,7 @@ gboolean configuration_facade_get_display_event_comments (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_display_event_comments (self);
-#line 5082 "ConfigurationInterfaces.c"
+#line 5092 "ConfigurationInterfaces.c"
 }
 
 
@@ -5107,8 +5117,8 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5106 "ConfigurationInterfaces.c"
-				goto __catch116_configuration_error;
+#line 5116 "ConfigurationInterfaces.c"
+				goto __catch117_configuration_error;
 			}
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5116,11 +5126,11 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5115 "ConfigurationInterfaces.c"
+#line 5125 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally116;
-	__catch116_configuration_error:
+	goto __finally117;
+	__catch117_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5134,9 +5144,9 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5133 "ConfigurationInterfaces.c"
+#line 5143 "ConfigurationInterfaces.c"
 	}
-	__finally116:
+	__finally117:
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5145,7 +5155,7 @@ static void configuration_facade_real_set_display_event_comments (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5144 "ConfigurationInterfaces.c"
+#line 5154 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5155,7 +5165,7 @@ void configuration_facade_set_display_event_comments (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_display_event_comments (self, display);
-#line 5154 "ConfigurationInterfaces.c"
+#line 5164 "ConfigurationInterfaces.c"
 }
 
 
@@ -5167,7 +5177,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 	_vala_sort_order = FALSE;
 #line 817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_by = 2;
-#line 5166 "ConfigurationInterfaces.c"
+#line 5176 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -5195,8 +5205,8 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5194 "ConfigurationInterfaces.c"
-				goto __catch117_configuration_error;
+#line 5204 "ConfigurationInterfaces.c"
+				goto __catch118_configuration_error;
 			}
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5204,7 +5214,7 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5203 "ConfigurationInterfaces.c"
+#line 5213 "ConfigurationInterfaces.c"
 		}
 #line 819 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
@@ -5224,8 +5234,8 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5223 "ConfigurationInterfaces.c"
-				goto __catch117_configuration_error;
+#line 5233 "ConfigurationInterfaces.c"
+				goto __catch118_configuration_error;
 			}
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5233,14 +5243,14 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5232 "ConfigurationInterfaces.c"
+#line 5242 "ConfigurationInterfaces.c"
 		}
 #line 821 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 5236 "ConfigurationInterfaces.c"
+#line 5246 "ConfigurationInterfaces.c"
 	}
-	goto __finally117;
-	__catch117_configuration_error:
+	goto __finally118;
+	__catch118_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -5254,9 +5264,9 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp10_);
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5253 "ConfigurationInterfaces.c"
+#line 5263 "ConfigurationInterfaces.c"
 	}
-	__finally117:
+	__finally118:
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5265,19 +5275,19 @@ static void configuration_facade_real_get_event_photos_sort (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5264 "ConfigurationInterfaces.c"
+#line 5274 "ConfigurationInterfaces.c"
 	}
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_order) {
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_order = _vala_sort_order;
-#line 5270 "ConfigurationInterfaces.c"
+#line 5280 "ConfigurationInterfaces.c"
 	}
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_by) {
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_by = _vala_sort_by;
-#line 5276 "ConfigurationInterfaces.c"
+#line 5286 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5287,7 +5297,7 @@ void configuration_facade_get_event_photos_sort (ConfigurationFacade* self, gboo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 815 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_event_photos_sort (self, sort_order, sort_by);
-#line 5286 "ConfigurationInterfaces.c"
+#line 5296 "ConfigurationInterfaces.c"
 }
 
 
@@ -5314,8 +5324,8 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5313 "ConfigurationInterfaces.c"
-				goto __catch118_configuration_error;
+#line 5323 "ConfigurationInterfaces.c"
+				goto __catch119_configuration_error;
 			}
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5323,7 +5333,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 829 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5322 "ConfigurationInterfaces.c"
+#line 5332 "ConfigurationInterfaces.c"
 		}
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -5339,8 +5349,8 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5338 "ConfigurationInterfaces.c"
-				goto __catch118_configuration_error;
+#line 5348 "ConfigurationInterfaces.c"
+				goto __catch119_configuration_error;
 			}
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5348,11 +5358,11 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 831 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5347 "ConfigurationInterfaces.c"
+#line 5357 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally118;
-	__catch118_configuration_error:
+	goto __finally119;
+	__catch119_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5366,9 +5376,9 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 5365 "ConfigurationInterfaces.c"
+#line 5375 "ConfigurationInterfaces.c"
 	}
-	__finally118:
+	__finally119:
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5377,7 +5387,7 @@ static void configuration_facade_real_set_event_photos_sort (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 828 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5376 "ConfigurationInterfaces.c"
+#line 5386 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5387,7 +5397,7 @@ void configuration_facade_set_event_photos_sort (ConfigurationFacade* self, gboo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 827 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_event_photos_sort (self, sort_order, sort_by);
-#line 5386 "ConfigurationInterfaces.c"
+#line 5396 "ConfigurationInterfaces.c"
 }
 
 
@@ -5416,8 +5426,8 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5415 "ConfigurationInterfaces.c"
-				goto __catch119_configuration_error;
+#line 5425 "ConfigurationInterfaces.c"
+				goto __catch120_configuration_error;
 			}
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5425,16 +5435,16 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 			g_clear_error (&_inner_error_);
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 5424 "ConfigurationInterfaces.c"
+#line 5434 "ConfigurationInterfaces.c"
 		}
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 843 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5430 "ConfigurationInterfaces.c"
+#line 5440 "ConfigurationInterfaces.c"
 	}
-	goto __finally119;
-	__catch119_configuration_error:
+	goto __finally120;
+	__catch120_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5452,16 +5462,16 @@ static gboolean configuration_facade_real_get_events_sort_ascending (Configurati
 		_g_error_free0 (err);
 #line 847 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5451 "ConfigurationInterfaces.c"
+#line 5461 "ConfigurationInterfaces.c"
 	}
-	__finally119:
+	__finally120:
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 842 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 5460 "ConfigurationInterfaces.c"
+#line 5470 "ConfigurationInterfaces.c"
 }
 
 
@@ -5470,7 +5480,7 @@ gboolean configuration_facade_get_events_sort_ascending (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 841 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_events_sort_ascending (self);
-#line 5469 "ConfigurationInterfaces.c"
+#line 5479 "ConfigurationInterfaces.c"
 }
 
 
@@ -5494,8 +5504,8 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5493 "ConfigurationInterfaces.c"
-				goto __catch120_configuration_error;
+#line 5503 "ConfigurationInterfaces.c"
+				goto __catch121_configuration_error;
 			}
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5503,11 +5513,11 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 853 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5502 "ConfigurationInterfaces.c"
+#line 5512 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally120;
-	__catch120_configuration_error:
+	goto __finally121;
+	__catch121_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5523,9 +5533,9 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		_g_error_free0 (err);
 #line 856 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5522 "ConfigurationInterfaces.c"
+#line 5532 "ConfigurationInterfaces.c"
 	}
-	__finally120:
+	__finally121:
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5534,7 +5544,7 @@ static void configuration_facade_real_set_events_sort_ascending (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 852 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5533 "ConfigurationInterfaces.c"
+#line 5543 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5544,7 +5554,7 @@ void configuration_facade_set_events_sort_ascending (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 851 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_events_sort_ascending (self, sort);
-#line 5543 "ConfigurationInterfaces.c"
+#line 5553 "ConfigurationInterfaces.c"
 }
 
 
@@ -5574,8 +5584,8 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5573 "ConfigurationInterfaces.c"
-				goto __catch121_configuration_error;
+#line 5583 "ConfigurationInterfaces.c"
+				goto __catch122_configuration_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5583,7 +5593,7 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 5582 "ConfigurationInterfaces.c"
+#line 5592 "ConfigurationInterfaces.c"
 		}
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -5595,10 +5605,10 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		_g_free0 (_tmp0_);
 #line 865 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5594 "ConfigurationInterfaces.c"
+#line 5604 "ConfigurationInterfaces.c"
 	}
-	goto __finally121;
-	__catch121_configuration_error:
+	goto __finally122;
+	__catch122_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5619,16 +5629,16 @@ static gchar* configuration_facade_real_get_external_photo_app (ConfigurationFac
 		_g_error_free0 (err);
 #line 869 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5618 "ConfigurationInterfaces.c"
+#line 5628 "ConfigurationInterfaces.c"
 	}
-	__finally121:
+	__finally122:
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 864 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5627 "ConfigurationInterfaces.c"
+#line 5637 "ConfigurationInterfaces.c"
 }
 
 
@@ -5637,7 +5647,7 @@ gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 863 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_photo_app (self);
-#line 5636 "ConfigurationInterfaces.c"
+#line 5646 "ConfigurationInterfaces.c"
 }
 
 
@@ -5645,7 +5655,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 	GError * _inner_error_ = NULL;
 #line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (external_photo_app != NULL);
-#line 5644 "ConfigurationInterfaces.c"
+#line 5654 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -5664,8 +5674,8 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5663 "ConfigurationInterfaces.c"
-				goto __catch122_configuration_error;
+#line 5673 "ConfigurationInterfaces.c"
+				goto __catch123_configuration_error;
 			}
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5673,11 +5683,11 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 875 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5672 "ConfigurationInterfaces.c"
+#line 5682 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally122;
-	__catch122_configuration_error:
+	goto __finally123;
+	__catch123_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5693,9 +5703,9 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 		_g_error_free0 (err);
 #line 879 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5692 "ConfigurationInterfaces.c"
+#line 5702 "ConfigurationInterfaces.c"
 	}
-	__finally122:
+	__finally123:
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5704,7 +5714,7 @@ static void configuration_facade_real_set_external_photo_app (ConfigurationFacad
 		g_clear_error (&_inner_error_);
 #line 874 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5703 "ConfigurationInterfaces.c"
+#line 5713 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5714,7 +5724,7 @@ void configuration_facade_set_external_photo_app (ConfigurationFacade* self, con
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 873 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_external_photo_app (self, external_photo_app);
-#line 5713 "ConfigurationInterfaces.c"
+#line 5723 "ConfigurationInterfaces.c"
 }
 
 
@@ -5744,8 +5754,8 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5743 "ConfigurationInterfaces.c"
-				goto __catch123_configuration_error;
+#line 5753 "ConfigurationInterfaces.c"
+				goto __catch124_configuration_error;
 			}
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5753,7 +5763,7 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 			g_clear_error (&_inner_error_);
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 5752 "ConfigurationInterfaces.c"
+#line 5762 "ConfigurationInterfaces.c"
 		}
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -5765,10 +5775,10 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		_g_free0 (_tmp0_);
 #line 888 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5764 "ConfigurationInterfaces.c"
+#line 5774 "ConfigurationInterfaces.c"
 	}
-	goto __finally123;
-	__catch123_configuration_error:
+	goto __finally124;
+	__catch124_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5789,16 +5799,16 @@ static gchar* configuration_facade_real_get_external_raw_app (ConfigurationFacad
 		_g_error_free0 (err);
 #line 892 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5788 "ConfigurationInterfaces.c"
+#line 5798 "ConfigurationInterfaces.c"
 	}
-	__finally123:
+	__finally124:
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 887 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 5797 "ConfigurationInterfaces.c"
+#line 5807 "ConfigurationInterfaces.c"
 }
 
 
@@ -5807,7 +5817,7 @@ gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 886 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_external_raw_app (self);
-#line 5806 "ConfigurationInterfaces.c"
+#line 5816 "ConfigurationInterfaces.c"
 }
 
 
@@ -5815,7 +5825,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 	GError * _inner_error_ = NULL;
 #line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (external_raw_app != NULL);
-#line 5814 "ConfigurationInterfaces.c"
+#line 5824 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -5834,8 +5844,8 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5833 "ConfigurationInterfaces.c"
-				goto __catch124_configuration_error;
+#line 5843 "ConfigurationInterfaces.c"
+				goto __catch125_configuration_error;
 			}
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5843,11 +5853,11 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 898 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5842 "ConfigurationInterfaces.c"
+#line 5852 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally124;
-	__catch124_configuration_error:
+	goto __finally125;
+	__catch125_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5863,9 +5873,9 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 902 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5862 "ConfigurationInterfaces.c"
+#line 5872 "ConfigurationInterfaces.c"
 	}
-	__finally124:
+	__finally125:
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -5874,7 +5884,7 @@ static void configuration_facade_real_set_external_raw_app (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 897 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 5873 "ConfigurationInterfaces.c"
+#line 5883 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -5884,7 +5894,7 @@ void configuration_facade_set_external_raw_app (ConfigurationFacade* self, const
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 896 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_external_raw_app (self, external_raw_app);
-#line 5883 "ConfigurationInterfaces.c"
+#line 5893 "ConfigurationInterfaces.c"
 }
 
 
@@ -5913,8 +5923,8 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5912 "ConfigurationInterfaces.c"
-				goto __catch125_configuration_error;
+#line 5922 "ConfigurationInterfaces.c"
+				goto __catch126_configuration_error;
 			}
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5922,16 +5932,16 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 			g_clear_error (&_inner_error_);
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 5921 "ConfigurationInterfaces.c"
+#line 5931 "ConfigurationInterfaces.c"
 		}
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (ScaleConstraint) _tmp0_;
 #line 911 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5927 "ConfigurationInterfaces.c"
+#line 5937 "ConfigurationInterfaces.c"
 	}
-	goto __finally125;
-	__catch125_configuration_error:
+	goto __finally126;
+	__catch126_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5949,16 +5959,16 @@ static ScaleConstraint configuration_facade_real_get_export_constraint (Configur
 		_g_error_free0 (err);
 #line 915 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 5948 "ConfigurationInterfaces.c"
+#line 5958 "ConfigurationInterfaces.c"
 	}
-	__finally125:
+	__finally126:
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 910 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 5957 "ConfigurationInterfaces.c"
+#line 5967 "ConfigurationInterfaces.c"
 }
 
 
@@ -5967,7 +5977,7 @@ ScaleConstraint configuration_facade_get_export_constraint (ConfigurationFacade*
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 909 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_constraint (self);
-#line 5966 "ConfigurationInterfaces.c"
+#line 5976 "ConfigurationInterfaces.c"
 }
 
 
@@ -5991,8 +6001,8 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 5990 "ConfigurationInterfaces.c"
-				goto __catch126_configuration_error;
+#line 6000 "ConfigurationInterfaces.c"
+				goto __catch127_configuration_error;
 			}
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6000,11 +6010,11 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 921 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 5999 "ConfigurationInterfaces.c"
+#line 6009 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally126;
-	__catch126_configuration_error:
+	goto __finally127;
+	__catch127_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6020,9 +6030,9 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 		_g_error_free0 (err);
 #line 924 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6019 "ConfigurationInterfaces.c"
+#line 6029 "ConfigurationInterfaces.c"
 	}
-	__finally126:
+	__finally127:
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6031,7 +6041,7 @@ static void configuration_facade_real_set_export_constraint (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 920 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6030 "ConfigurationInterfaces.c"
+#line 6040 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6041,7 +6051,7 @@ void configuration_facade_set_export_constraint (ConfigurationFacade* self, Scal
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 919 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_constraint (self, constraint);
-#line 6040 "ConfigurationInterfaces.c"
+#line 6050 "ConfigurationInterfaces.c"
 }
 
 
@@ -6070,8 +6080,8 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6069 "ConfigurationInterfaces.c"
-				goto __catch127_configuration_error;
+#line 6079 "ConfigurationInterfaces.c"
+				goto __catch128_configuration_error;
 			}
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6079,16 +6089,16 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 			g_clear_error (&_inner_error_);
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6078 "ConfigurationInterfaces.c"
+#line 6088 "ConfigurationInterfaces.c"
 		}
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (ExportFormatMode) _tmp0_;
 #line 930 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6084 "ConfigurationInterfaces.c"
+#line 6094 "ConfigurationInterfaces.c"
 	}
-	goto __finally127;
-	__catch127_configuration_error:
+	goto __finally128;
+	__catch128_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6106,16 +6116,16 @@ static ExportFormatMode configuration_facade_real_get_export_export_format_mode
 		_g_error_free0 (err);
 #line 934 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6105 "ConfigurationInterfaces.c"
+#line 6115 "ConfigurationInterfaces.c"
 	}
-	__finally127:
+	__finally128:
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 929 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6114 "ConfigurationInterfaces.c"
+#line 6124 "ConfigurationInterfaces.c"
 }
 
 
@@ -6124,7 +6134,7 @@ ExportFormatMode configuration_facade_get_export_export_format_mode (Configurati
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 928 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_format_mode (self);
-#line 6123 "ConfigurationInterfaces.c"
+#line 6133 "ConfigurationInterfaces.c"
 }
 
 
@@ -6148,8 +6158,8 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6147 "ConfigurationInterfaces.c"
-				goto __catch128_configuration_error;
+#line 6157 "ConfigurationInterfaces.c"
+				goto __catch129_configuration_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6157,11 +6167,11 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 			g_clear_error (&_inner_error_);
 #line 940 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6156 "ConfigurationInterfaces.c"
+#line 6166 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally128;
-	__catch128_configuration_error:
+	goto __finally129;
+	__catch129_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6177,9 +6187,9 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 		_g_error_free0 (err);
 #line 943 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6176 "ConfigurationInterfaces.c"
+#line 6186 "ConfigurationInterfaces.c"
 	}
-	__finally128:
+	__finally129:
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6188,7 +6198,7 @@ static void configuration_facade_real_set_export_export_format_mode (Configurati
 		g_clear_error (&_inner_error_);
 #line 939 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6187 "ConfigurationInterfaces.c"
+#line 6197 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6198,7 +6208,7 @@ void configuration_facade_set_export_export_format_mode (ConfigurationFacade* se
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 938 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_format_mode (self, export_format_mode);
-#line 6197 "ConfigurationInterfaces.c"
+#line 6207 "ConfigurationInterfaces.c"
 }
 
 
@@ -6227,8 +6237,8 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6226 "ConfigurationInterfaces.c"
-				goto __catch129_configuration_error;
+#line 6236 "ConfigurationInterfaces.c"
+				goto __catch130_configuration_error;
 			}
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6236,16 +6246,16 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 			g_clear_error (&_inner_error_);
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 6235 "ConfigurationInterfaces.c"
+#line 6245 "ConfigurationInterfaces.c"
 		}
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 949 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6241 "ConfigurationInterfaces.c"
+#line 6251 "ConfigurationInterfaces.c"
 	}
-	goto __finally129;
-	__catch129_configuration_error:
+	goto __finally130;
+	__catch130_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6263,16 +6273,16 @@ static gboolean configuration_facade_real_get_export_export_metadata (Configurat
 		_g_error_free0 (err);
 #line 953 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6262 "ConfigurationInterfaces.c"
+#line 6272 "ConfigurationInterfaces.c"
 	}
-	__finally129:
+	__finally130:
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 948 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 6271 "ConfigurationInterfaces.c"
+#line 6281 "ConfigurationInterfaces.c"
 }
 
 
@@ -6281,7 +6291,7 @@ gboolean configuration_facade_get_export_export_metadata (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 947 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_export_metadata (self);
-#line 6280 "ConfigurationInterfaces.c"
+#line 6290 "ConfigurationInterfaces.c"
 }
 
 
@@ -6305,8 +6315,8 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6304 "ConfigurationInterfaces.c"
-				goto __catch130_configuration_error;
+#line 6314 "ConfigurationInterfaces.c"
+				goto __catch131_configuration_error;
 			}
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6314,11 +6324,11 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 959 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6313 "ConfigurationInterfaces.c"
+#line 6323 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally130;
-	__catch130_configuration_error:
+	goto __finally131;
+	__catch131_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6334,9 +6344,9 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 		_g_error_free0 (err);
 #line 962 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6333 "ConfigurationInterfaces.c"
+#line 6343 "ConfigurationInterfaces.c"
 	}
-	__finally130:
+	__finally131:
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6345,7 +6355,7 @@ static void configuration_facade_real_set_export_export_metadata (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 958 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6344 "ConfigurationInterfaces.c"
+#line 6354 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6355,7 +6365,7 @@ void configuration_facade_set_export_export_metadata (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 957 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_export_metadata (self, export_metadata);
-#line 6354 "ConfigurationInterfaces.c"
+#line 6364 "ConfigurationInterfaces.c"
 }
 
 
@@ -6385,8 +6395,8 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6384 "ConfigurationInterfaces.c"
-				goto __catch131_configuration_error;
+#line 6394 "ConfigurationInterfaces.c"
+				goto __catch132_configuration_error;
 			}
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6394,7 +6404,7 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 			g_clear_error (&_inner_error_);
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6393 "ConfigurationInterfaces.c"
+#line 6403 "ConfigurationInterfaces.c"
 		}
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = photo_file_format_unserialize (_tmp0_);
@@ -6402,10 +6412,10 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		result = _tmp5_;
 #line 968 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6401 "ConfigurationInterfaces.c"
+#line 6411 "ConfigurationInterfaces.c"
 	}
-	goto __finally131;
-	__catch131_configuration_error:
+	goto __finally132;
+	__catch132_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -6423,16 +6433,16 @@ static PhotoFileFormat configuration_facade_real_get_export_photo_file_format (C
 		_g_error_free0 (err);
 #line 972 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6422 "ConfigurationInterfaces.c"
+#line 6432 "ConfigurationInterfaces.c"
 	}
-	__finally131:
+	__finally132:
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 967 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6431 "ConfigurationInterfaces.c"
+#line 6441 "ConfigurationInterfaces.c"
 }
 
 
@@ -6441,7 +6451,7 @@ PhotoFileFormat configuration_facade_get_export_photo_file_format (Configuration
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 966 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_photo_file_format (self);
-#line 6440 "ConfigurationInterfaces.c"
+#line 6450 "ConfigurationInterfaces.c"
 }
 
 
@@ -6468,8 +6478,8 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6467 "ConfigurationInterfaces.c"
-				goto __catch132_configuration_error;
+#line 6477 "ConfigurationInterfaces.c"
+				goto __catch133_configuration_error;
 			}
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6477,11 +6487,11 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 			g_clear_error (&_inner_error_);
 #line 978 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6476 "ConfigurationInterfaces.c"
+#line 6486 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally132;
-	__catch132_configuration_error:
+	goto __finally133;
+	__catch133_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -6497,9 +6507,9 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 		_g_error_free0 (err);
 #line 981 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6496 "ConfigurationInterfaces.c"
+#line 6506 "ConfigurationInterfaces.c"
 	}
-	__finally132:
+	__finally133:
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6508,7 +6518,7 @@ static void configuration_facade_real_set_export_photo_file_format (Configuratio
 		g_clear_error (&_inner_error_);
 #line 977 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6507 "ConfigurationInterfaces.c"
+#line 6517 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6518,7 +6528,7 @@ void configuration_facade_set_export_photo_file_format (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 976 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_photo_file_format (self, photo_file_format);
-#line 6517 "ConfigurationInterfaces.c"
+#line 6527 "ConfigurationInterfaces.c"
 }
 
 
@@ -6547,8 +6557,8 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6546 "ConfigurationInterfaces.c"
-				goto __catch133_configuration_error;
+#line 6556 "ConfigurationInterfaces.c"
+				goto __catch134_configuration_error;
 			}
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6556,16 +6566,16 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6555 "ConfigurationInterfaces.c"
+#line 6565 "ConfigurationInterfaces.c"
 		}
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = (JpegQuality) _tmp0_;
 #line 987 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6561 "ConfigurationInterfaces.c"
+#line 6571 "ConfigurationInterfaces.c"
 	}
-	goto __finally133;
-	__catch133_configuration_error:
+	goto __finally134;
+	__catch134_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6583,16 +6593,16 @@ static JpegQuality configuration_facade_real_get_export_quality (ConfigurationFa
 		_g_error_free0 (err);
 #line 991 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6582 "ConfigurationInterfaces.c"
+#line 6592 "ConfigurationInterfaces.c"
 	}
-	__finally133:
+	__finally134:
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 986 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6591 "ConfigurationInterfaces.c"
+#line 6601 "ConfigurationInterfaces.c"
 }
 
 
@@ -6601,7 +6611,7 @@ JpegQuality configuration_facade_get_export_quality (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 985 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_quality (self);
-#line 6600 "ConfigurationInterfaces.c"
+#line 6610 "ConfigurationInterfaces.c"
 }
 
 
@@ -6625,8 +6635,8 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6624 "ConfigurationInterfaces.c"
-				goto __catch134_configuration_error;
+#line 6634 "ConfigurationInterfaces.c"
+				goto __catch135_configuration_error;
 			}
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6634,11 +6644,11 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 			g_clear_error (&_inner_error_);
 #line 997 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6633 "ConfigurationInterfaces.c"
+#line 6643 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally134;
-	__catch134_configuration_error:
+	goto __finally135;
+	__catch135_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6654,9 +6664,9 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 		_g_error_free0 (err);
 #line 1000 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6653 "ConfigurationInterfaces.c"
+#line 6663 "ConfigurationInterfaces.c"
 	}
-	__finally134:
+	__finally135:
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6665,7 +6675,7 @@ static void configuration_facade_real_set_export_quality (ConfigurationFacade* s
 		g_clear_error (&_inner_error_);
 #line 996 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6664 "ConfigurationInterfaces.c"
+#line 6674 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6675,7 +6685,7 @@ void configuration_facade_set_export_quality (ConfigurationFacade* self, JpegQua
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 995 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_quality (self, quality);
-#line 6674 "ConfigurationInterfaces.c"
+#line 6684 "ConfigurationInterfaces.c"
 }
 
 
@@ -6704,8 +6714,8 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6703 "ConfigurationInterfaces.c"
-				goto __catch135_configuration_error;
+#line 6713 "ConfigurationInterfaces.c"
+				goto __catch136_configuration_error;
 			}
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6713,16 +6723,16 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 			g_clear_error (&_inner_error_);
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6712 "ConfigurationInterfaces.c"
+#line 6722 "ConfigurationInterfaces.c"
 		}
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1006 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6718 "ConfigurationInterfaces.c"
+#line 6728 "ConfigurationInterfaces.c"
 	}
-	goto __finally135;
-	__catch135_configuration_error:
+	goto __finally136;
+	__catch136_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6740,16 +6750,16 @@ static gint configuration_facade_real_get_export_scale (ConfigurationFacade* sel
 		_g_error_free0 (err);
 #line 1010 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6739 "ConfigurationInterfaces.c"
+#line 6749 "ConfigurationInterfaces.c"
 	}
-	__finally135:
+	__finally136:
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1005 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6748 "ConfigurationInterfaces.c"
+#line 6758 "ConfigurationInterfaces.c"
 }
 
 
@@ -6758,7 +6768,7 @@ gint configuration_facade_get_export_scale (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1004 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_export_scale (self);
-#line 6757 "ConfigurationInterfaces.c"
+#line 6767 "ConfigurationInterfaces.c"
 }
 
 
@@ -6782,8 +6792,8 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6781 "ConfigurationInterfaces.c"
-				goto __catch136_configuration_error;
+#line 6791 "ConfigurationInterfaces.c"
+				goto __catch137_configuration_error;
 			}
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6791,11 +6801,11 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 			g_clear_error (&_inner_error_);
 #line 1016 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6790 "ConfigurationInterfaces.c"
+#line 6800 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally136;
-	__catch136_configuration_error:
+	goto __finally137;
+	__catch137_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -6811,9 +6821,9 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 		_g_error_free0 (err);
 #line 1019 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6810 "ConfigurationInterfaces.c"
+#line 6820 "ConfigurationInterfaces.c"
 	}
-	__finally136:
+	__finally137:
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6822,7 +6832,7 @@ static void configuration_facade_real_set_export_scale (ConfigurationFacade* sel
 		g_clear_error (&_inner_error_);
 #line 1015 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6821 "ConfigurationInterfaces.c"
+#line 6831 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -6832,7 +6842,7 @@ void configuration_facade_set_export_scale (ConfigurationFacade* self, gint scal
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1014 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_export_scale (self, scale);
-#line 6831 "ConfigurationInterfaces.c"
+#line 6841 "ConfigurationInterfaces.c"
 }
 
 
@@ -6862,8 +6872,8 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6861 "ConfigurationInterfaces.c"
-				goto __catch137_configuration_error;
+#line 6871 "ConfigurationInterfaces.c"
+				goto __catch138_configuration_error;
 			}
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6871,7 +6881,7 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 			g_clear_error (&_inner_error_);
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 6870 "ConfigurationInterfaces.c"
+#line 6880 "ConfigurationInterfaces.c"
 		}
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = raw_developer_from_string (_tmp0_);
@@ -6881,10 +6891,10 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		_g_free0 (_tmp0_);
 #line 1028 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6880 "ConfigurationInterfaces.c"
+#line 6890 "ConfigurationInterfaces.c"
 	}
-	goto __finally137;
-	__catch137_configuration_error:
+	goto __finally138;
+	__catch138_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -6902,16 +6912,16 @@ static RawDeveloper configuration_facade_real_get_default_raw_developer (Configu
 		_g_error_free0 (err);
 #line 1033 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 6901 "ConfigurationInterfaces.c"
+#line 6911 "ConfigurationInterfaces.c"
 	}
-	__finally137:
+	__finally138:
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1027 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 6910 "ConfigurationInterfaces.c"
+#line 6920 "ConfigurationInterfaces.c"
 }
 
 
@@ -6920,7 +6930,7 @@ RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1026 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_default_raw_developer (self);
-#line 6919 "ConfigurationInterfaces.c"
+#line 6929 "ConfigurationInterfaces.c"
 }
 
 
@@ -6952,8 +6962,8 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 6951 "ConfigurationInterfaces.c"
-				goto __catch138_configuration_error;
+#line 6961 "ConfigurationInterfaces.c"
+				goto __catch139_configuration_error;
 			}
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6961,11 +6971,11 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1039 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 6960 "ConfigurationInterfaces.c"
+#line 6970 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally138;
-	__catch138_configuration_error:
+	goto __finally139;
+	__catch139_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -6981,9 +6991,9 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		_g_error_free0 (err);
 #line 1043 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6980 "ConfigurationInterfaces.c"
+#line 6990 "ConfigurationInterfaces.c"
 	}
-	__finally138:
+	__finally139:
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -6992,7 +7002,7 @@ static void configuration_facade_real_set_default_raw_developer (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1038 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 6991 "ConfigurationInterfaces.c"
+#line 7001 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7002,7 +7012,7 @@ void configuration_facade_set_default_raw_developer (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1037 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_default_raw_developer (self, d);
-#line 7001 "ConfigurationInterfaces.c"
+#line 7011 "ConfigurationInterfaces.c"
 }
 
 
@@ -7031,8 +7041,8 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7030 "ConfigurationInterfaces.c"
-				goto __catch139_configuration_error;
+#line 7040 "ConfigurationInterfaces.c"
+				goto __catch140_configuration_error;
 			}
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7040,16 +7050,16 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 			g_clear_error (&_inner_error_);
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 7039 "ConfigurationInterfaces.c"
+#line 7049 "ConfigurationInterfaces.c"
 		}
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1052 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7045 "ConfigurationInterfaces.c"
+#line 7055 "ConfigurationInterfaces.c"
 	}
-	goto __finally139;
-	__catch139_configuration_error:
+	goto __finally140;
+	__catch140_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7067,16 +7077,16 @@ static gboolean configuration_facade_real_get_hide_photos_already_imported (Conf
 		_g_error_free0 (err);
 #line 1056 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7066 "ConfigurationInterfaces.c"
+#line 7076 "ConfigurationInterfaces.c"
 	}
-	__finally139:
+	__finally140:
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1051 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 7075 "ConfigurationInterfaces.c"
+#line 7085 "ConfigurationInterfaces.c"
 }
 
 
@@ -7085,7 +7095,7 @@ gboolean configuration_facade_get_hide_photos_already_imported (ConfigurationFac
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1050 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_hide_photos_already_imported (self);
-#line 7084 "ConfigurationInterfaces.c"
+#line 7094 "ConfigurationInterfaces.c"
 }
 
 
@@ -7109,8 +7119,8 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7108 "ConfigurationInterfaces.c"
-				goto __catch140_configuration_error;
+#line 7118 "ConfigurationInterfaces.c"
+				goto __catch141_configuration_error;
 			}
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7118,11 +7128,11 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 			g_clear_error (&_inner_error_);
 #line 1062 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7117 "ConfigurationInterfaces.c"
+#line 7127 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally140;
-	__catch140_configuration_error:
+	goto __finally141;
+	__catch141_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7136,9 +7146,9 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7135 "ConfigurationInterfaces.c"
+#line 7145 "ConfigurationInterfaces.c"
 	}
-	__finally140:
+	__finally141:
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7147,7 +7157,7 @@ static void configuration_facade_real_set_hide_photos_already_imported (Configur
 		g_clear_error (&_inner_error_);
 #line 1061 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7146 "ConfigurationInterfaces.c"
+#line 7156 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7157,7 +7167,7 @@ void configuration_facade_set_hide_photos_already_imported (ConfigurationFacade*
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1060 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_hide_photos_already_imported (self, hide_imported);
-#line 7156 "ConfigurationInterfaces.c"
+#line 7166 "ConfigurationInterfaces.c"
 }
 
 
@@ -7187,8 +7197,8 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7186 "ConfigurationInterfaces.c"
-				goto __catch141_configuration_error;
+#line 7196 "ConfigurationInterfaces.c"
+				goto __catch142_configuration_error;
 			}
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7196,7 +7206,7 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 			g_clear_error (&_inner_error_);
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 7195 "ConfigurationInterfaces.c"
+#line 7205 "ConfigurationInterfaces.c"
 		}
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -7208,10 +7218,10 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		_g_free0 (_tmp0_);
 #line 1073 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7207 "ConfigurationInterfaces.c"
+#line 7217 "ConfigurationInterfaces.c"
 	}
-	goto __finally141;
-	__catch141_configuration_error:
+	goto __finally142;
+	__catch142_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -7232,16 +7242,16 @@ static gchar* configuration_facade_real_get_import_dir (ConfigurationFacade* sel
 		_g_error_free0 (err);
 #line 1077 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7231 "ConfigurationInterfaces.c"
+#line 7241 "ConfigurationInterfaces.c"
 	}
-	__finally141:
+	__finally142:
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1072 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 7240 "ConfigurationInterfaces.c"
+#line 7250 "ConfigurationInterfaces.c"
 }
 
 
@@ -7250,7 +7260,7 @@ gchar* configuration_facade_get_import_dir (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1071 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_import_dir (self);
-#line 7249 "ConfigurationInterfaces.c"
+#line 7259 "ConfigurationInterfaces.c"
 }
 
 
@@ -7258,7 +7268,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 	GError * _inner_error_ = NULL;
 #line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (import_dir != NULL);
-#line 7257 "ConfigurationInterfaces.c"
+#line 7267 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -7277,8 +7287,8 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7276 "ConfigurationInterfaces.c"
-				goto __catch142_configuration_error;
+#line 7286 "ConfigurationInterfaces.c"
+				goto __catch143_configuration_error;
 			}
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7286,11 +7296,11 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 			g_clear_error (&_inner_error_);
 #line 1083 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7285 "ConfigurationInterfaces.c"
+#line 7295 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally142;
-	__catch142_configuration_error:
+	goto __finally143;
+	__catch143_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7304,9 +7314,9 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7303 "ConfigurationInterfaces.c"
+#line 7313 "ConfigurationInterfaces.c"
 	}
-	__finally142:
+	__finally143:
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7315,7 +7325,7 @@ static void configuration_facade_real_set_import_dir (ConfigurationFacade* self,
 		g_clear_error (&_inner_error_);
 #line 1082 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7314 "ConfigurationInterfaces.c"
+#line 7324 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7325,7 +7335,7 @@ void configuration_facade_set_import_dir (ConfigurationFacade* self, const gchar
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1081 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_import_dir (self, import_dir);
-#line 7324 "ConfigurationInterfaces.c"
+#line 7334 "ConfigurationInterfaces.c"
 }
 
 
@@ -7354,8 +7364,8 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7353 "ConfigurationInterfaces.c"
-				goto __catch143_configuration_error;
+#line 7363 "ConfigurationInterfaces.c"
+				goto __catch144_configuration_error;
 			}
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7363,16 +7373,16 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 7362 "ConfigurationInterfaces.c"
+#line 7372 "ConfigurationInterfaces.c"
 		}
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1094 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7368 "ConfigurationInterfaces.c"
+#line 7378 "ConfigurationInterfaces.c"
 	}
-	goto __finally143;
-	__catch143_configuration_error:
+	goto __finally144;
+	__catch144_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7390,16 +7400,16 @@ static gboolean configuration_facade_real_get_keep_relativity (ConfigurationFaca
 		_g_error_free0 (err);
 #line 1098 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7389 "ConfigurationInterfaces.c"
+#line 7399 "ConfigurationInterfaces.c"
 	}
-	__finally143:
+	__finally144:
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1093 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 7398 "ConfigurationInterfaces.c"
+#line 7408 "ConfigurationInterfaces.c"
 }
 
 
@@ -7408,7 +7418,7 @@ gboolean configuration_facade_get_keep_relativity (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1092 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_keep_relativity (self);
-#line 7407 "ConfigurationInterfaces.c"
+#line 7417 "ConfigurationInterfaces.c"
 }
 
 
@@ -7432,8 +7442,8 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7431 "ConfigurationInterfaces.c"
-				goto __catch144_configuration_error;
+#line 7441 "ConfigurationInterfaces.c"
+				goto __catch145_configuration_error;
 			}
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7441,11 +7451,11 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1104 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7440 "ConfigurationInterfaces.c"
+#line 7450 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally144;
-	__catch144_configuration_error:
+	goto __finally145;
+	__catch145_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7459,9 +7469,9 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7458 "ConfigurationInterfaces.c"
+#line 7468 "ConfigurationInterfaces.c"
 	}
-	__finally144:
+	__finally145:
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7470,7 +7480,7 @@ static void configuration_facade_real_set_keep_relativity (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1103 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7469 "ConfigurationInterfaces.c"
+#line 7479 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7480,7 +7490,7 @@ void configuration_facade_set_keep_relativity (ConfigurationFacade* self, gboole
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1102 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_keep_relativity (self, keep_relativity);
-#line 7479 "ConfigurationInterfaces.c"
+#line 7489 "ConfigurationInterfaces.c"
 }
 
 
@@ -7509,8 +7519,8 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7508 "ConfigurationInterfaces.c"
-				goto __catch145_configuration_error;
+#line 7518 "ConfigurationInterfaces.c"
+				goto __catch146_configuration_error;
 			}
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7518,16 +7528,16 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 7517 "ConfigurationInterfaces.c"
+#line 7527 "ConfigurationInterfaces.c"
 		}
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1115 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7523 "ConfigurationInterfaces.c"
+#line 7533 "ConfigurationInterfaces.c"
 	}
-	goto __finally145;
-	__catch145_configuration_error:
+	goto __finally146;
+	__catch146_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7545,16 +7555,16 @@ static gboolean configuration_facade_real_get_pin_toolbar_state (ConfigurationFa
 		_g_error_free0 (err);
 #line 1118 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7544 "ConfigurationInterfaces.c"
+#line 7554 "ConfigurationInterfaces.c"
 	}
-	__finally145:
+	__finally146:
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1114 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 7553 "ConfigurationInterfaces.c"
+#line 7563 "ConfigurationInterfaces.c"
 }
 
 
@@ -7563,7 +7573,7 @@ gboolean configuration_facade_get_pin_toolbar_state (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1113 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_pin_toolbar_state (self);
-#line 7562 "ConfigurationInterfaces.c"
+#line 7572 "ConfigurationInterfaces.c"
 }
 
 
@@ -7587,8 +7597,8 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7586 "ConfigurationInterfaces.c"
-				goto __catch146_configuration_error;
+#line 7596 "ConfigurationInterfaces.c"
+				goto __catch147_configuration_error;
 			}
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7596,11 +7606,11 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 1124 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7595 "ConfigurationInterfaces.c"
+#line 7605 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally146;
-	__catch146_configuration_error:
+	goto __finally147;
+	__catch147_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7614,9 +7624,9 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7613 "ConfigurationInterfaces.c"
+#line 7623 "ConfigurationInterfaces.c"
 	}
-	__finally146:
+	__finally147:
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7625,7 +7635,7 @@ static void configuration_facade_real_set_pin_toolbar_state (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 1123 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7624 "ConfigurationInterfaces.c"
+#line 7634 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7635,7 +7645,7 @@ void configuration_facade_set_pin_toolbar_state (ConfigurationFacade* self, gboo
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1122 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_pin_toolbar_state (self, state);
-#line 7634 "ConfigurationInterfaces.c"
+#line 7644 "ConfigurationInterfaces.c"
 }
 
 
@@ -7664,8 +7674,8 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7663 "ConfigurationInterfaces.c"
-				goto __catch147_configuration_error;
+#line 7673 "ConfigurationInterfaces.c"
+				goto __catch148_configuration_error;
 			}
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7673,16 +7683,16 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 7672 "ConfigurationInterfaces.c"
+#line 7682 "ConfigurationInterfaces.c"
 		}
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1135 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7678 "ConfigurationInterfaces.c"
+#line 7688 "ConfigurationInterfaces.c"
 	}
-	goto __finally147;
-	__catch147_configuration_error:
+	goto __finally148;
+	__catch148_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7700,16 +7710,16 @@ static gint configuration_facade_real_get_last_crop_height (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 1138 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7699 "ConfigurationInterfaces.c"
+#line 7709 "ConfigurationInterfaces.c"
 	}
-	__finally147:
+	__finally148:
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1134 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 7708 "ConfigurationInterfaces.c"
+#line 7718 "ConfigurationInterfaces.c"
 }
 
 
@@ -7718,7 +7728,7 @@ gint configuration_facade_get_last_crop_height (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1133 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_height (self);
-#line 7717 "ConfigurationInterfaces.c"
+#line 7727 "ConfigurationInterfaces.c"
 }
 
 
@@ -7742,8 +7752,8 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7741 "ConfigurationInterfaces.c"
-				goto __catch148_configuration_error;
+#line 7751 "ConfigurationInterfaces.c"
+				goto __catch149_configuration_error;
 			}
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7751,11 +7761,11 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1144 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7750 "ConfigurationInterfaces.c"
+#line 7760 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally148;
-	__catch148_configuration_error:
+	goto __finally149;
+	__catch149_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7769,9 +7779,9 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7768 "ConfigurationInterfaces.c"
+#line 7778 "ConfigurationInterfaces.c"
 	}
-	__finally148:
+	__finally149:
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7780,7 +7790,7 @@ static void configuration_facade_real_set_last_crop_height (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1143 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7779 "ConfigurationInterfaces.c"
+#line 7789 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7790,7 +7800,7 @@ void configuration_facade_set_last_crop_height (ConfigurationFacade* self, gint
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1142 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_height (self, choice);
-#line 7789 "ConfigurationInterfaces.c"
+#line 7799 "ConfigurationInterfaces.c"
 }
 
 
@@ -7819,8 +7829,8 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7818 "ConfigurationInterfaces.c"
-				goto __catch149_configuration_error;
+#line 7828 "ConfigurationInterfaces.c"
+				goto __catch150_configuration_error;
 			}
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7828,16 +7838,16 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 7827 "ConfigurationInterfaces.c"
+#line 7837 "ConfigurationInterfaces.c"
 		}
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1155 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7833 "ConfigurationInterfaces.c"
+#line 7843 "ConfigurationInterfaces.c"
 	}
-	goto __finally149;
-	__catch149_configuration_error:
+	goto __finally150;
+	__catch150_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -7855,16 +7865,16 @@ static gint configuration_facade_real_get_last_crop_menu_choice (ConfigurationFa
 		_g_error_free0 (err);
 #line 1162 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7854 "ConfigurationInterfaces.c"
+#line 7864 "ConfigurationInterfaces.c"
 	}
-	__finally149:
+	__finally150:
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1154 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 7863 "ConfigurationInterfaces.c"
+#line 7873 "ConfigurationInterfaces.c"
 }
 
 
@@ -7873,7 +7883,7 @@ gint configuration_facade_get_last_crop_menu_choice (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1153 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_menu_choice (self);
-#line 7872 "ConfigurationInterfaces.c"
+#line 7882 "ConfigurationInterfaces.c"
 }
 
 
@@ -7897,8 +7907,8 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7896 "ConfigurationInterfaces.c"
-				goto __catch150_configuration_error;
+#line 7906 "ConfigurationInterfaces.c"
+				goto __catch151_configuration_error;
 			}
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7906,11 +7916,11 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1168 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 7905 "ConfigurationInterfaces.c"
+#line 7915 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally150;
-	__catch150_configuration_error:
+	goto __finally151;
+	__catch151_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -7924,9 +7934,9 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 7923 "ConfigurationInterfaces.c"
+#line 7933 "ConfigurationInterfaces.c"
 	}
-	__finally150:
+	__finally151:
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -7935,7 +7945,7 @@ static void configuration_facade_real_set_last_crop_menu_choice (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1167 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 7934 "ConfigurationInterfaces.c"
+#line 7944 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -7945,7 +7955,7 @@ void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1166 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_menu_choice (self, choice);
-#line 7944 "ConfigurationInterfaces.c"
+#line 7954 "ConfigurationInterfaces.c"
 }
 
 
@@ -7974,8 +7984,8 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 7973 "ConfigurationInterfaces.c"
-				goto __catch151_configuration_error;
+#line 7983 "ConfigurationInterfaces.c"
+				goto __catch152_configuration_error;
 			}
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -7983,16 +7993,16 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 7982 "ConfigurationInterfaces.c"
+#line 7992 "ConfigurationInterfaces.c"
 		}
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1179 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 7988 "ConfigurationInterfaces.c"
+#line 7998 "ConfigurationInterfaces.c"
 	}
-	goto __finally151;
-	__catch151_configuration_error:
+	goto __finally152;
+	__catch152_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -8010,16 +8020,16 @@ static gint configuration_facade_real_get_last_crop_width (ConfigurationFacade*
 		_g_error_free0 (err);
 #line 1182 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8009 "ConfigurationInterfaces.c"
+#line 8019 "ConfigurationInterfaces.c"
 	}
-	__finally151:
+	__finally152:
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1178 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 8018 "ConfigurationInterfaces.c"
+#line 8028 "ConfigurationInterfaces.c"
 }
 
 
@@ -8028,7 +8038,7 @@ gint configuration_facade_get_last_crop_width (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1177 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_crop_width (self);
-#line 8027 "ConfigurationInterfaces.c"
+#line 8037 "ConfigurationInterfaces.c"
 }
 
 
@@ -8052,8 +8062,8 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8051 "ConfigurationInterfaces.c"
-				goto __catch152_configuration_error;
+#line 8061 "ConfigurationInterfaces.c"
+				goto __catch153_configuration_error;
 			}
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8061,11 +8071,11 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1188 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8060 "ConfigurationInterfaces.c"
+#line 8070 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally152;
-	__catch152_configuration_error:
+	goto __finally153;
+	__catch153_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -8079,9 +8089,9 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8078 "ConfigurationInterfaces.c"
+#line 8088 "ConfigurationInterfaces.c"
 	}
-	__finally152:
+	__finally153:
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8090,7 +8100,7 @@ static void configuration_facade_real_set_last_crop_width (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1187 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8089 "ConfigurationInterfaces.c"
+#line 8099 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8100,7 +8110,7 @@ void configuration_facade_set_last_crop_width (ConfigurationFacade* self, gint c
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1186 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_crop_width (self, choice);
-#line 8099 "ConfigurationInterfaces.c"
+#line 8109 "ConfigurationInterfaces.c"
 }
 
 
@@ -8130,8 +8140,8 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8129 "ConfigurationInterfaces.c"
-				goto __catch153_configuration_error;
+#line 8139 "ConfigurationInterfaces.c"
+				goto __catch154_configuration_error;
 			}
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8139,7 +8149,7 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 8138 "ConfigurationInterfaces.c"
+#line 8148 "ConfigurationInterfaces.c"
 		}
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -8151,10 +8161,10 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		_g_free0 (_tmp0_);
 #line 1199 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8150 "ConfigurationInterfaces.c"
+#line 8160 "ConfigurationInterfaces.c"
 	}
-	goto __finally153;
-	__catch153_configuration_error:
+	goto __finally154;
+	__catch154_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -8175,16 +8185,16 @@ static gchar* configuration_facade_real_get_last_used_service (ConfigurationFaca
 		_g_error_free0 (err);
 #line 1206 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8174 "ConfigurationInterfaces.c"
+#line 8184 "ConfigurationInterfaces.c"
 	}
-	__finally153:
+	__finally154:
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1198 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 8183 "ConfigurationInterfaces.c"
+#line 8193 "ConfigurationInterfaces.c"
 }
 
 
@@ -8193,7 +8203,7 @@ gchar* configuration_facade_get_last_used_service (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1197 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_service (self);
-#line 8192 "ConfigurationInterfaces.c"
+#line 8202 "ConfigurationInterfaces.c"
 }
 
 
@@ -8201,7 +8211,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 	GError * _inner_error_ = NULL;
 #line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (service_name != NULL);
-#line 8200 "ConfigurationInterfaces.c"
+#line 8210 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8220,8 +8230,8 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8219 "ConfigurationInterfaces.c"
-				goto __catch154_configuration_error;
+#line 8229 "ConfigurationInterfaces.c"
+				goto __catch155_configuration_error;
 			}
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8229,11 +8239,11 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 			g_clear_error (&_inner_error_);
 #line 1212 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8228 "ConfigurationInterfaces.c"
+#line 8238 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally154;
-	__catch154_configuration_error:
+	goto __finally155;
+	__catch155_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -8247,9 +8257,9 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8246 "ConfigurationInterfaces.c"
+#line 8256 "ConfigurationInterfaces.c"
 	}
-	__finally154:
+	__finally155:
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8258,7 +8268,7 @@ static void configuration_facade_real_set_last_used_service (ConfigurationFacade
 		g_clear_error (&_inner_error_);
 #line 1211 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8257 "ConfigurationInterfaces.c"
+#line 8267 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8268,7 +8278,7 @@ void configuration_facade_set_last_used_service (ConfigurationFacade* self, cons
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1210 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_service (self, service_name);
-#line 8267 "ConfigurationInterfaces.c"
+#line 8277 "ConfigurationInterfaces.c"
 }
 
 
@@ -8298,8 +8308,8 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8297 "ConfigurationInterfaces.c"
-				goto __catch155_configuration_error;
+#line 8307 "ConfigurationInterfaces.c"
+				goto __catch156_configuration_error;
 			}
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8307,7 +8317,7 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 			g_clear_error (&_inner_error_);
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 8306 "ConfigurationInterfaces.c"
+#line 8316 "ConfigurationInterfaces.c"
 		}
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
@@ -8319,10 +8329,10 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		_g_free0 (_tmp0_);
 #line 1223 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8318 "ConfigurationInterfaces.c"
+#line 8328 "ConfigurationInterfaces.c"
 	}
-	goto __finally155;
-	__catch155_configuration_error:
+	goto __finally156;
+	__catch156_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -8343,16 +8353,16 @@ static gchar* configuration_facade_real_get_last_used_dataimports_service (Confi
 		_g_error_free0 (err);
 #line 1230 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 8342 "ConfigurationInterfaces.c"
+#line 8352 "ConfigurationInterfaces.c"
 	}
-	__finally155:
+	__finally156:
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1222 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 8351 "ConfigurationInterfaces.c"
+#line 8361 "ConfigurationInterfaces.c"
 }
 
 
@@ -8361,7 +8371,7 @@ gchar* configuration_facade_get_last_used_dataimports_service (ConfigurationFaca
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
 #line 1221 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_last_used_dataimports_service (self);
-#line 8360 "ConfigurationInterfaces.c"
+#line 8370 "ConfigurationInterfaces.c"
 }
 
 
@@ -8369,7 +8379,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 	GError * _inner_error_ = NULL;
 #line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (service_name != NULL);
-#line 8368 "ConfigurationInterfaces.c"
+#line 8378 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8388,8 +8398,8 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8387 "ConfigurationInterfaces.c"
-				goto __catch156_configuration_error;
+#line 8397 "ConfigurationInterfaces.c"
+				goto __catch157_configuration_error;
 			}
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8397,11 +8407,11 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 			g_clear_error (&_inner_error_);
 #line 1236 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8396 "ConfigurationInterfaces.c"
+#line 8406 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally156;
-	__catch156_configuration_error:
+	goto __finally157;
+	__catch157_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -8415,9 +8425,9 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8414 "ConfigurationInterfaces.c"
+#line 8424 "ConfigurationInterfaces.c"
 	}
-	__finally156:
+	__finally157:
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8426,7 +8436,7 @@ static void configuration_facade_real_set_last_used_dataimports_service (Configu
 		g_clear_error (&_inner_error_);
 #line 1235 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8425 "ConfigurationInterfaces.c"
+#line 8435 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8436,7 +8446,7 @@ void configuration_facade_set_last_used_dataimports_service (ConfigurationFacade
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1234 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_last_used_dataimports_service (self, service_name);
-#line 8435 "ConfigurationInterfaces.c"
+#line 8445 "ConfigurationInterfaces.c"
 }
 
 
@@ -8448,7 +8458,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 	_vala_sort_order = FALSE;
 #line 1247 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_vala_sort_by = 2;
-#line 8447 "ConfigurationInterfaces.c"
+#line 8457 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8476,8 +8486,8 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8475 "ConfigurationInterfaces.c"
-				goto __catch157_configuration_error;
+#line 8485 "ConfigurationInterfaces.c"
+				goto __catch158_configuration_error;
 			}
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8485,7 +8495,7 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8484 "ConfigurationInterfaces.c"
+#line 8494 "ConfigurationInterfaces.c"
 		}
 #line 1249 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_order = _tmp0_;
@@ -8505,8 +8515,8 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8504 "ConfigurationInterfaces.c"
-				goto __catch157_configuration_error;
+#line 8514 "ConfigurationInterfaces.c"
+				goto __catch158_configuration_error;
 			}
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8514,14 +8524,14 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8513 "ConfigurationInterfaces.c"
+#line 8523 "ConfigurationInterfaces.c"
 		}
 #line 1251 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_sort_by = _tmp5_;
-#line 8517 "ConfigurationInterfaces.c"
+#line 8527 "ConfigurationInterfaces.c"
 	}
-	goto __finally157;
-	__catch157_configuration_error:
+	goto __finally158;
+	__catch158_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -8535,9 +8545,9 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp10_);
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8534 "ConfigurationInterfaces.c"
+#line 8544 "ConfigurationInterfaces.c"
 	}
-	__finally157:
+	__finally158:
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8546,19 +8556,19 @@ static void configuration_facade_real_get_library_photos_sort (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 1248 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8545 "ConfigurationInterfaces.c"
+#line 8555 "ConfigurationInterfaces.c"
 	}
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_order) {
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_order = _vala_sort_order;
-#line 8551 "ConfigurationInterfaces.c"
+#line 8561 "ConfigurationInterfaces.c"
 	}
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (sort_by) {
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*sort_by = _vala_sort_by;
-#line 8557 "ConfigurationInterfaces.c"
+#line 8567 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8568,7 +8578,7 @@ void configuration_facade_get_library_photos_sort (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1245 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_library_photos_sort (self, sort_order, sort_by);
-#line 8567 "ConfigurationInterfaces.c"
+#line 8577 "ConfigurationInterfaces.c"
 }
 
 
@@ -8595,8 +8605,8 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8594 "ConfigurationInterfaces.c"
-				goto __catch158_configuration_error;
+#line 8604 "ConfigurationInterfaces.c"
+				goto __catch159_configuration_error;
 			}
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8604,7 +8614,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1259 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8603 "ConfigurationInterfaces.c"
+#line 8613 "ConfigurationInterfaces.c"
 		}
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -8620,8 +8630,8 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8619 "ConfigurationInterfaces.c"
-				goto __catch158_configuration_error;
+#line 8629 "ConfigurationInterfaces.c"
+				goto __catch159_configuration_error;
 			}
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8629,11 +8639,11 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 			g_clear_error (&_inner_error_);
 #line 1261 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8628 "ConfigurationInterfaces.c"
+#line 8638 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally158;
-	__catch158_configuration_error:
+	goto __finally159;
+	__catch159_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -8647,9 +8657,9 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		configuration_facade_on_configuration_error (self, _tmp6_);
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8646 "ConfigurationInterfaces.c"
+#line 8656 "ConfigurationInterfaces.c"
 	}
-	__finally158:
+	__finally159:
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8658,7 +8668,7 @@ static void configuration_facade_real_set_library_photos_sort (ConfigurationFaca
 		g_clear_error (&_inner_error_);
 #line 1258 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8657 "ConfigurationInterfaces.c"
+#line 8667 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8668,7 +8678,7 @@ void configuration_facade_set_library_photos_sort (ConfigurationFacade* self, gb
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1257 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_library_photos_sort (self, sort_order, sort_by);
-#line 8667 "ConfigurationInterfaces.c"
+#line 8677 "ConfigurationInterfaces.c"
 }
 
 
@@ -8680,7 +8690,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 	_vala_maximize = FALSE;
 #line 1273 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	dimensions_init (&_vala_dimensions, 1024, 768);
-#line 8679 "ConfigurationInterfaces.c"
+#line 8689 "ConfigurationInterfaces.c"
 	{
 		gboolean _tmp0_ = FALSE;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8715,8 +8725,8 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8714 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+#line 8724 "ConfigurationInterfaces.c"
+				goto __catch160_configuration_error;
 			}
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8724,7 +8734,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8723 "ConfigurationInterfaces.c"
+#line 8733 "ConfigurationInterfaces.c"
 		}
 #line 1275 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_vala_maximize = _tmp0_;
@@ -8744,8 +8754,8 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8743 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+#line 8753 "ConfigurationInterfaces.c"
+				goto __catch160_configuration_error;
 			}
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8753,7 +8763,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1276 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8752 "ConfigurationInterfaces.c"
+#line 8762 "ConfigurationInterfaces.c"
 		}
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = configuration_facade_get_engine (self);
@@ -8771,8 +8781,8 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8770 "ConfigurationInterfaces.c"
-				goto __catch159_configuration_error;
+#line 8780 "ConfigurationInterfaces.c"
+				goto __catch160_configuration_error;
 			}
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8780,7 +8790,7 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1277 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8779 "ConfigurationInterfaces.c"
+#line 8789 "ConfigurationInterfaces.c"
 		}
 #line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp13_ = w;
@@ -8788,10 +8798,10 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		_tmp14_ = h;
 #line 1278 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		dimensions_init (&_vala_dimensions, _tmp13_, _tmp14_);
-#line 8787 "ConfigurationInterfaces.c"
+#line 8797 "ConfigurationInterfaces.c"
 	}
-	goto __finally159;
-	__catch159_configuration_error:
+	goto __finally160;
+	__catch160_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp15_ = NULL;
@@ -8805,9 +8815,9 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp15_);
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8804 "ConfigurationInterfaces.c"
+#line 8814 "ConfigurationInterfaces.c"
 	}
-	__finally159:
+	__finally160:
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8816,19 +8826,19 @@ static void configuration_facade_real_get_library_window_state (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 1274 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8815 "ConfigurationInterfaces.c"
+#line 8825 "ConfigurationInterfaces.c"
 	}
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (maximize) {
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*maximize = _vala_maximize;
-#line 8821 "ConfigurationInterfaces.c"
+#line 8831 "ConfigurationInterfaces.c"
 	}
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (dimensions) {
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		*dimensions = _vala_dimensions;
-#line 8827 "ConfigurationInterfaces.c"
+#line 8837 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8838,7 +8848,7 @@ void configuration_facade_get_library_window_state (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1271 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->get_library_window_state (self, maximize, dimensions);
-#line 8837 "ConfigurationInterfaces.c"
+#line 8847 "ConfigurationInterfaces.c"
 }
 
 
@@ -8846,7 +8856,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 	GError * _inner_error_ = NULL;
 #line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (dimensions != NULL);
-#line 8845 "ConfigurationInterfaces.c"
+#line 8855 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
@@ -8873,8 +8883,8 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8872 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 8882 "ConfigurationInterfaces.c"
+				goto __catch161_configuration_error;
 			}
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8882,7 +8892,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1286 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8881 "ConfigurationInterfaces.c"
+#line 8891 "ConfigurationInterfaces.c"
 		}
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_facade_get_engine (self);
@@ -8900,8 +8910,8 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8899 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 8909 "ConfigurationInterfaces.c"
+				goto __catch161_configuration_error;
 			}
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8909,7 +8919,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1287 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8908 "ConfigurationInterfaces.c"
+#line 8918 "ConfigurationInterfaces.c"
 		}
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = configuration_facade_get_engine (self);
@@ -8927,8 +8937,8 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 8926 "ConfigurationInterfaces.c"
-				goto __catch160_configuration_error;
+#line 8936 "ConfigurationInterfaces.c"
+				goto __catch161_configuration_error;
 			}
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8936,11 +8946,11 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1289 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 8935 "ConfigurationInterfaces.c"
+#line 8945 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally160;
-	__catch160_configuration_error:
+	goto __finally161;
+	__catch161_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp11_ = NULL;
@@ -8954,9 +8964,9 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp11_);
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 8953 "ConfigurationInterfaces.c"
+#line 8963 "ConfigurationInterfaces.c"
 	}
-	__finally160:
+	__finally161:
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -8965,7 +8975,7 @@ static void configuration_facade_real_set_library_window_state (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 1285 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 8964 "ConfigurationInterfaces.c"
+#line 8974 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -8975,7 +8985,7 @@ void configuration_facade_set_library_window_state (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1284 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_library_window_state (self, maximize, dimensions);
-#line 8974 "ConfigurationInterfaces.c"
+#line 8984 "ConfigurationInterfaces.c"
 }
 
 
@@ -9004,8 +9014,8 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9003 "ConfigurationInterfaces.c"
-				goto __catch161_configuration_error;
+#line 9013 "ConfigurationInterfaces.c"
+				goto __catch162_configuration_error;
 			}
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9013,16 +9023,16 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 9012 "ConfigurationInterfaces.c"
+#line 9022 "ConfigurationInterfaces.c"
 		}
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1301 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9018 "ConfigurationInterfaces.c"
+#line 9028 "ConfigurationInterfaces.c"
 	}
-	goto __finally161;
-	__catch161_configuration_error:
+	goto __finally162;
+	__catch162_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9040,16 +9050,16 @@ static gboolean configuration_facade_real_get_modify_originals (ConfigurationFac
 		_g_error_free0 (err);
 #line 1306 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9039 "ConfigurationInterfaces.c"
+#line 9049 "ConfigurationInterfaces.c"
 	}
-	__finally161:
+	__finally162:
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1300 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 9048 "ConfigurationInterfaces.c"
+#line 9058 "ConfigurationInterfaces.c"
 }
 
 
@@ -9058,7 +9068,7 @@ gboolean configuration_facade_get_modify_originals (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1299 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_modify_originals (self);
-#line 9057 "ConfigurationInterfaces.c"
+#line 9067 "ConfigurationInterfaces.c"
 }
 
 
@@ -9082,8 +9092,8 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9081 "ConfigurationInterfaces.c"
-				goto __catch162_configuration_error;
+#line 9091 "ConfigurationInterfaces.c"
+				goto __catch163_configuration_error;
 			}
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9091,11 +9101,11 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 			g_clear_error (&_inner_error_);
 #line 1312 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9090 "ConfigurationInterfaces.c"
+#line 9100 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally162;
-	__catch162_configuration_error:
+	goto __finally163;
+	__catch163_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9109,9 +9119,9 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9108 "ConfigurationInterfaces.c"
+#line 9118 "ConfigurationInterfaces.c"
 	}
-	__finally162:
+	__finally163:
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9120,7 +9130,7 @@ static void configuration_facade_real_set_modify_originals (ConfigurationFacade*
 		g_clear_error (&_inner_error_);
 #line 1311 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9119 "ConfigurationInterfaces.c"
+#line 9129 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9130,7 +9140,7 @@ void configuration_facade_set_modify_originals (ConfigurationFacade* self, gbool
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1310 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_modify_originals (self, modify_originals);
-#line 9129 "ConfigurationInterfaces.c"
+#line 9139 "ConfigurationInterfaces.c"
 }
 
 
@@ -9159,8 +9169,8 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9158 "ConfigurationInterfaces.c"
-				goto __catch163_configuration_error;
+#line 9168 "ConfigurationInterfaces.c"
+				goto __catch164_configuration_error;
 			}
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9168,16 +9178,16 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 9167 "ConfigurationInterfaces.c"
+#line 9177 "ConfigurationInterfaces.c"
 		}
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1323 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9173 "ConfigurationInterfaces.c"
+#line 9183 "ConfigurationInterfaces.c"
 	}
-	goto __finally163;
-	__catch163_configuration_error:
+	goto __finally164;
+	__catch164_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9201,16 +9211,16 @@ static gint configuration_facade_real_get_photo_thumbnail_scale (ConfigurationFa
 		_g_error_free0 (err);
 #line 1326 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9200 "ConfigurationInterfaces.c"
+#line 9210 "ConfigurationInterfaces.c"
 	}
-	__finally163:
+	__finally164:
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1322 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 9209 "ConfigurationInterfaces.c"
+#line 9219 "ConfigurationInterfaces.c"
 }
 
 
@@ -9219,7 +9229,7 @@ gint configuration_facade_get_photo_thumbnail_scale (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1321 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_photo_thumbnail_scale (self);
-#line 9218 "ConfigurationInterfaces.c"
+#line 9228 "ConfigurationInterfaces.c"
 }
 
 
@@ -9243,8 +9253,8 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9242 "ConfigurationInterfaces.c"
-				goto __catch164_configuration_error;
+#line 9252 "ConfigurationInterfaces.c"
+				goto __catch165_configuration_error;
 			}
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9252,11 +9262,11 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1332 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9251 "ConfigurationInterfaces.c"
+#line 9261 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally164;
-	__catch164_configuration_error:
+	goto __finally165;
+	__catch165_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9270,9 +9280,9 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9269 "ConfigurationInterfaces.c"
+#line 9279 "ConfigurationInterfaces.c"
 	}
-	__finally164:
+	__finally165:
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9281,7 +9291,7 @@ static void configuration_facade_real_set_photo_thumbnail_scale (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1331 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9280 "ConfigurationInterfaces.c"
+#line 9290 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9291,7 +9301,7 @@ void configuration_facade_set_photo_thumbnail_scale (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1330 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_photo_thumbnail_scale (self, scale);
-#line 9290 "ConfigurationInterfaces.c"
+#line 9300 "ConfigurationInterfaces.c"
 }
 
 
@@ -9320,8 +9330,8 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9319 "ConfigurationInterfaces.c"
-				goto __catch165_configuration_error;
+#line 9329 "ConfigurationInterfaces.c"
+				goto __catch166_configuration_error;
 			}
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9329,16 +9339,16 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 			g_clear_error (&_inner_error_);
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 9328 "ConfigurationInterfaces.c"
+#line 9338 "ConfigurationInterfaces.c"
 		}
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1343 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9334 "ConfigurationInterfaces.c"
+#line 9344 "ConfigurationInterfaces.c"
 	}
-	goto __finally165;
-	__catch165_configuration_error:
+	goto __finally166;
+	__catch166_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9356,16 +9366,16 @@ static gdouble configuration_facade_real_get_printing_content_height (Configurat
 		_g_error_free0 (err);
 #line 1347 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9355 "ConfigurationInterfaces.c"
+#line 9365 "ConfigurationInterfaces.c"
 	}
-	__finally165:
+	__finally166:
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1342 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 9364 "ConfigurationInterfaces.c"
+#line 9374 "ConfigurationInterfaces.c"
 }
 
 
@@ -9374,7 +9384,7 @@ gdouble configuration_facade_get_printing_content_height (ConfigurationFacade* s
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
 #line 1341 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_height (self);
-#line 9373 "ConfigurationInterfaces.c"
+#line 9383 "ConfigurationInterfaces.c"
 }
 
 
@@ -9398,8 +9408,8 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9397 "ConfigurationInterfaces.c"
-				goto __catch166_configuration_error;
+#line 9407 "ConfigurationInterfaces.c"
+				goto __catch167_configuration_error;
 			}
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9407,11 +9417,11 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 			g_clear_error (&_inner_error_);
 #line 1353 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9406 "ConfigurationInterfaces.c"
+#line 9416 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally166;
-	__catch166_configuration_error:
+	goto __finally167;
+	__catch167_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9425,9 +9435,9 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9424 "ConfigurationInterfaces.c"
+#line 9434 "ConfigurationInterfaces.c"
 	}
-	__finally166:
+	__finally167:
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9436,7 +9446,7 @@ static void configuration_facade_real_set_printing_content_height (Configuration
 		g_clear_error (&_inner_error_);
 #line 1352 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9435 "ConfigurationInterfaces.c"
+#line 9445 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9446,7 +9456,7 @@ void configuration_facade_set_printing_content_height (ConfigurationFacade* self
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1351 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_height (self, content_height);
-#line 9445 "ConfigurationInterfaces.c"
+#line 9455 "ConfigurationInterfaces.c"
 }
 
 
@@ -9475,8 +9485,8 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9474 "ConfigurationInterfaces.c"
-				goto __catch167_configuration_error;
+#line 9484 "ConfigurationInterfaces.c"
+				goto __catch168_configuration_error;
 			}
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9484,16 +9494,16 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 			g_clear_error (&_inner_error_);
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 9483 "ConfigurationInterfaces.c"
+#line 9493 "ConfigurationInterfaces.c"
 		}
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
 #line 1365 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9489 "ConfigurationInterfaces.c"
+#line 9499 "ConfigurationInterfaces.c"
 	}
-	goto __finally167;
-	__catch167_configuration_error:
+	goto __finally168;
+	__catch168_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9511,16 +9521,16 @@ static gint configuration_facade_real_get_printing_content_layout (Configuration
 		_g_error_free0 (err);
 #line 1369 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9510 "ConfigurationInterfaces.c"
+#line 9520 "ConfigurationInterfaces.c"
 	}
-	__finally167:
+	__finally168:
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1364 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 9519 "ConfigurationInterfaces.c"
+#line 9529 "ConfigurationInterfaces.c"
 }
 
 
@@ -9529,7 +9539,7 @@ gint configuration_facade_get_printing_content_layout (ConfigurationFacade* self
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1363 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_layout (self);
-#line 9528 "ConfigurationInterfaces.c"
+#line 9538 "ConfigurationInterfaces.c"
 }
 
 
@@ -9553,8 +9563,8 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9552 "ConfigurationInterfaces.c"
-				goto __catch168_configuration_error;
+#line 9562 "ConfigurationInterfaces.c"
+				goto __catch169_configuration_error;
 			}
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9562,11 +9572,11 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 			g_clear_error (&_inner_error_);
 #line 1375 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9561 "ConfigurationInterfaces.c"
+#line 9571 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally168;
-	__catch168_configuration_error:
+	goto __finally169;
+	__catch169_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9580,9 +9590,9 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9579 "ConfigurationInterfaces.c"
+#line 9589 "ConfigurationInterfaces.c"
 	}
-	__finally168:
+	__finally169:
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9591,7 +9601,7 @@ static void configuration_facade_real_set_printing_content_layout (Configuration
 		g_clear_error (&_inner_error_);
 #line 1374 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9590 "ConfigurationInterfaces.c"
+#line 9600 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9601,7 +9611,7 @@ void configuration_facade_set_printing_content_layout (ConfigurationFacade* self
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1373 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_layout (self, layout_code);
-#line 9600 "ConfigurationInterfaces.c"
+#line 9610 "ConfigurationInterfaces.c"
 }
 
 
@@ -9630,8 +9640,8 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9629 "ConfigurationInterfaces.c"
-				goto __catch169_configuration_error;
+#line 9639 "ConfigurationInterfaces.c"
+				goto __catch170_configuration_error;
 			}
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9639,16 +9649,16 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 9638 "ConfigurationInterfaces.c"
+#line 9648 "ConfigurationInterfaces.c"
 		}
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1387 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9644 "ConfigurationInterfaces.c"
+#line 9654 "ConfigurationInterfaces.c"
 	}
-	goto __finally169;
-	__catch169_configuration_error:
+	goto __finally170;
+	__catch170_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9666,16 +9676,16 @@ static gint configuration_facade_real_get_printing_content_ppi (ConfigurationFac
 		_g_error_free0 (err);
 #line 1391 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9665 "ConfigurationInterfaces.c"
+#line 9675 "ConfigurationInterfaces.c"
 	}
-	__finally169:
+	__finally170:
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1386 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 9674 "ConfigurationInterfaces.c"
+#line 9684 "ConfigurationInterfaces.c"
 }
 
 
@@ -9684,7 +9694,7 @@ gint configuration_facade_get_printing_content_ppi (ConfigurationFacade* self) {
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1385 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_ppi (self);
-#line 9683 "ConfigurationInterfaces.c"
+#line 9693 "ConfigurationInterfaces.c"
 }
 
 
@@ -9708,8 +9718,8 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9707 "ConfigurationInterfaces.c"
-				goto __catch170_configuration_error;
+#line 9717 "ConfigurationInterfaces.c"
+				goto __catch171_configuration_error;
 			}
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9717,11 +9727,11 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 			g_clear_error (&_inner_error_);
 #line 1397 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9716 "ConfigurationInterfaces.c"
+#line 9726 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally170;
-	__catch170_configuration_error:
+	goto __finally171;
+	__catch171_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9735,9 +9745,9 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9734 "ConfigurationInterfaces.c"
+#line 9744 "ConfigurationInterfaces.c"
 	}
-	__finally170:
+	__finally171:
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9746,7 +9756,7 @@ static void configuration_facade_real_set_printing_content_ppi (ConfigurationFac
 		g_clear_error (&_inner_error_);
 #line 1396 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9745 "ConfigurationInterfaces.c"
+#line 9755 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9756,7 +9766,7 @@ void configuration_facade_set_printing_content_ppi (ConfigurationFacade* self, g
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1395 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_ppi (self, content_ppi);
-#line 9755 "ConfigurationInterfaces.c"
+#line 9765 "ConfigurationInterfaces.c"
 }
 
 
@@ -9785,8 +9795,8 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9784 "ConfigurationInterfaces.c"
-				goto __catch171_configuration_error;
+#line 9794 "ConfigurationInterfaces.c"
+				goto __catch172_configuration_error;
 			}
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9794,16 +9804,16 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 9793 "ConfigurationInterfaces.c"
+#line 9803 "ConfigurationInterfaces.c"
 		}
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
 #line 1408 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9799 "ConfigurationInterfaces.c"
+#line 9809 "ConfigurationInterfaces.c"
 	}
-	goto __finally171;
-	__catch171_configuration_error:
+	goto __finally172;
+	__catch172_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9821,16 +9831,16 @@ static gint configuration_facade_real_get_printing_content_units (ConfigurationF
 		_g_error_free0 (err);
 #line 1412 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9820 "ConfigurationInterfaces.c"
+#line 9830 "ConfigurationInterfaces.c"
 	}
-	__finally171:
+	__finally172:
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1407 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 9829 "ConfigurationInterfaces.c"
+#line 9839 "ConfigurationInterfaces.c"
 }
 
 
@@ -9839,7 +9849,7 @@ gint configuration_facade_get_printing_content_units (ConfigurationFacade* self)
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1406 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_units (self);
-#line 9838 "ConfigurationInterfaces.c"
+#line 9848 "ConfigurationInterfaces.c"
 }
 
 
@@ -9863,8 +9873,8 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9862 "ConfigurationInterfaces.c"
-				goto __catch172_configuration_error;
+#line 9872 "ConfigurationInterfaces.c"
+				goto __catch173_configuration_error;
 			}
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9872,11 +9882,11 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 1418 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 9871 "ConfigurationInterfaces.c"
+#line 9881 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally172;
-	__catch172_configuration_error:
+	goto __finally173;
+	__catch173_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -9890,9 +9900,9 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 9889 "ConfigurationInterfaces.c"
+#line 9899 "ConfigurationInterfaces.c"
 	}
-	__finally172:
+	__finally173:
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -9901,7 +9911,7 @@ static void configuration_facade_real_set_printing_content_units (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 1417 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 9900 "ConfigurationInterfaces.c"
+#line 9910 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -9911,7 +9921,7 @@ void configuration_facade_set_printing_content_units (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1416 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_units (self, units_code);
-#line 9910 "ConfigurationInterfaces.c"
+#line 9920 "ConfigurationInterfaces.c"
 }
 
 
@@ -9940,8 +9950,8 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 9939 "ConfigurationInterfaces.c"
-				goto __catch173_configuration_error;
+#line 9949 "ConfigurationInterfaces.c"
+				goto __catch174_configuration_error;
 			}
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -9949,16 +9959,16 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 			g_clear_error (&_inner_error_);
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 9948 "ConfigurationInterfaces.c"
+#line 9958 "ConfigurationInterfaces.c"
 		}
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1430 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9954 "ConfigurationInterfaces.c"
+#line 9964 "ConfigurationInterfaces.c"
 	}
-	goto __finally173;
-	__catch173_configuration_error:
+	goto __finally174;
+	__catch174_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -9976,16 +9986,16 @@ static gdouble configuration_facade_real_get_printing_content_width (Configurati
 		_g_error_free0 (err);
 #line 1434 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 9975 "ConfigurationInterfaces.c"
+#line 9985 "ConfigurationInterfaces.c"
 	}
-	__finally173:
+	__finally174:
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1429 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 9984 "ConfigurationInterfaces.c"
+#line 9994 "ConfigurationInterfaces.c"
 }
 
 
@@ -9994,7 +10004,7 @@ gdouble configuration_facade_get_printing_content_width (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
 #line 1428 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_content_width (self);
-#line 9993 "ConfigurationInterfaces.c"
+#line 10003 "ConfigurationInterfaces.c"
 }
 
 
@@ -10018,8 +10028,8 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10017 "ConfigurationInterfaces.c"
-				goto __catch174_configuration_error;
+#line 10027 "ConfigurationInterfaces.c"
+				goto __catch175_configuration_error;
 			}
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10027,11 +10037,11 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 			g_clear_error (&_inner_error_);
 #line 1440 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10026 "ConfigurationInterfaces.c"
+#line 10036 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally174;
-	__catch174_configuration_error:
+	goto __finally175;
+	__catch175_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10045,9 +10055,9 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10044 "ConfigurationInterfaces.c"
+#line 10054 "ConfigurationInterfaces.c"
 	}
-	__finally174:
+	__finally175:
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10056,7 +10066,7 @@ static void configuration_facade_real_set_printing_content_width (ConfigurationF
 		g_clear_error (&_inner_error_);
 #line 1439 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10055 "ConfigurationInterfaces.c"
+#line 10065 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10066,7 +10076,7 @@ void configuration_facade_set_printing_content_width (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1438 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_content_width (self, content_width);
-#line 10065 "ConfigurationInterfaces.c"
+#line 10075 "ConfigurationInterfaces.c"
 }
 
 
@@ -10095,8 +10105,8 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10094 "ConfigurationInterfaces.c"
-				goto __catch175_configuration_error;
+#line 10104 "ConfigurationInterfaces.c"
+				goto __catch176_configuration_error;
 			}
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10104,16 +10114,16 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 			g_clear_error (&_inner_error_);
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 10103 "ConfigurationInterfaces.c"
+#line 10113 "ConfigurationInterfaces.c"
 		}
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_ - 1;
 #line 1452 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10109 "ConfigurationInterfaces.c"
+#line 10119 "ConfigurationInterfaces.c"
 	}
-	goto __finally175;
-	__catch175_configuration_error:
+	goto __finally176;
+	__catch176_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10131,16 +10141,16 @@ static gint configuration_facade_real_get_printing_images_per_page (Configuratio
 		_g_error_free0 (err);
 #line 1456 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10130 "ConfigurationInterfaces.c"
+#line 10140 "ConfigurationInterfaces.c"
 	}
-	__finally175:
+	__finally176:
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1451 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 10139 "ConfigurationInterfaces.c"
+#line 10149 "ConfigurationInterfaces.c"
 }
 
 
@@ -10149,7 +10159,7 @@ gint configuration_facade_get_printing_images_per_page (ConfigurationFacade* sel
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1450 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_images_per_page (self);
-#line 10148 "ConfigurationInterfaces.c"
+#line 10158 "ConfigurationInterfaces.c"
 }
 
 
@@ -10173,8 +10183,8 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10172 "ConfigurationInterfaces.c"
-				goto __catch176_configuration_error;
+#line 10182 "ConfigurationInterfaces.c"
+				goto __catch177_configuration_error;
 			}
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10182,11 +10192,11 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 			g_clear_error (&_inner_error_);
 #line 1462 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10181 "ConfigurationInterfaces.c"
+#line 10191 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally176;
-	__catch176_configuration_error:
+	goto __finally177;
+	__catch177_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10200,9 +10210,9 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10199 "ConfigurationInterfaces.c"
+#line 10209 "ConfigurationInterfaces.c"
 	}
-	__finally176:
+	__finally177:
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10211,7 +10221,7 @@ static void configuration_facade_real_set_printing_images_per_page (Configuratio
 		g_clear_error (&_inner_error_);
 #line 1461 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10210 "ConfigurationInterfaces.c"
+#line 10220 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10221,7 +10231,7 @@ void configuration_facade_set_printing_images_per_page (ConfigurationFacade* sel
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1460 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_images_per_page (self, images_per_page_code);
-#line 10220 "ConfigurationInterfaces.c"
+#line 10230 "ConfigurationInterfaces.c"
 }
 
 
@@ -10250,8 +10260,8 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10249 "ConfigurationInterfaces.c"
-				goto __catch177_configuration_error;
+#line 10259 "ConfigurationInterfaces.c"
+				goto __catch178_configuration_error;
 			}
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10259,16 +10269,16 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 			g_clear_error (&_inner_error_);
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 10258 "ConfigurationInterfaces.c"
+#line 10268 "ConfigurationInterfaces.c"
 		}
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1474 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10264 "ConfigurationInterfaces.c"
+#line 10274 "ConfigurationInterfaces.c"
 	}
-	goto __finally177;
-	__catch177_configuration_error:
+	goto __finally178;
+	__catch178_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10286,16 +10296,16 @@ static gboolean configuration_facade_real_get_printing_match_aspect_ratio (Confi
 		_g_error_free0 (err);
 #line 1478 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10285 "ConfigurationInterfaces.c"
+#line 10295 "ConfigurationInterfaces.c"
 	}
-	__finally177:
+	__finally178:
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1473 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 10294 "ConfigurationInterfaces.c"
+#line 10304 "ConfigurationInterfaces.c"
 }
 
 
@@ -10304,7 +10314,7 @@ gboolean configuration_facade_get_printing_match_aspect_ratio (ConfigurationFaca
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1472 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_match_aspect_ratio (self);
-#line 10303 "ConfigurationInterfaces.c"
+#line 10313 "ConfigurationInterfaces.c"
 }
 
 
@@ -10328,8 +10338,8 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10327 "ConfigurationInterfaces.c"
-				goto __catch178_configuration_error;
+#line 10337 "ConfigurationInterfaces.c"
+				goto __catch179_configuration_error;
 			}
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10337,11 +10347,11 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 			g_clear_error (&_inner_error_);
 #line 1484 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10336 "ConfigurationInterfaces.c"
+#line 10346 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally178;
-	__catch178_configuration_error:
+	goto __finally179;
+	__catch179_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10355,9 +10365,9 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10354 "ConfigurationInterfaces.c"
+#line 10364 "ConfigurationInterfaces.c"
 	}
-	__finally178:
+	__finally179:
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10366,7 +10376,7 @@ static void configuration_facade_real_set_printing_match_aspect_ratio (Configura
 		g_clear_error (&_inner_error_);
 #line 1483 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10365 "ConfigurationInterfaces.c"
+#line 10375 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10376,7 +10386,7 @@ void configuration_facade_set_printing_match_aspect_ratio (ConfigurationFacade*
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1482 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_match_aspect_ratio (self, match_aspect_ratio);
-#line 10375 "ConfigurationInterfaces.c"
+#line 10385 "ConfigurationInterfaces.c"
 }
 
 
@@ -10405,8 +10415,8 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10404 "ConfigurationInterfaces.c"
-				goto __catch179_configuration_error;
+#line 10414 "ConfigurationInterfaces.c"
+				goto __catch180_configuration_error;
 			}
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10414,16 +10424,16 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 			g_clear_error (&_inner_error_);
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 10413 "ConfigurationInterfaces.c"
+#line 10423 "ConfigurationInterfaces.c"
 		}
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
 #line 1496 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10419 "ConfigurationInterfaces.c"
+#line 10429 "ConfigurationInterfaces.c"
 	}
-	goto __finally179;
-	__catch179_configuration_error:
+	goto __finally180;
+	__catch180_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -10441,16 +10451,16 @@ static gboolean configuration_facade_real_get_printing_print_titles (Configurati
 		_g_error_free0 (err);
 #line 1500 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10440 "ConfigurationInterfaces.c"
+#line 10450 "ConfigurationInterfaces.c"
 	}
-	__finally179:
+	__finally180:
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1495 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 10449 "ConfigurationInterfaces.c"
+#line 10459 "ConfigurationInterfaces.c"
 }
 
 
@@ -10459,7 +10469,7 @@ gboolean configuration_facade_get_printing_print_titles (ConfigurationFacade* se
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
 #line 1494 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_print_titles (self);
-#line 10458 "ConfigurationInterfaces.c"
+#line 10468 "ConfigurationInterfaces.c"
 }
 
 
@@ -10483,8 +10493,8 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10482 "ConfigurationInterfaces.c"
-				goto __catch180_configuration_error;
+#line 10492 "ConfigurationInterfaces.c"
+				goto __catch181_configuration_error;
 			}
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10492,11 +10502,11 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 			g_clear_error (&_inner_error_);
 #line 1506 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10491 "ConfigurationInterfaces.c"
+#line 10501 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally180;
-	__catch180_configuration_error:
+	goto __finally181;
+	__catch181_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -10510,9 +10520,9 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		configuration_facade_on_configuration_error (self, _tmp3_);
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10509 "ConfigurationInterfaces.c"
+#line 10519 "ConfigurationInterfaces.c"
 	}
-	__finally180:
+	__finally181:
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10521,7 +10531,7 @@ static void configuration_facade_real_set_printing_print_titles (ConfigurationFa
 		g_clear_error (&_inner_error_);
 #line 1505 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10520 "ConfigurationInterfaces.c"
+#line 10530 "ConfigurationInterfaces.c"
 	}
 }
 
@@ -10531,7 +10541,7 @@ void configuration_facade_set_printing_print_titles (ConfigurationFacade* self,
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
 #line 1504 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_print_titles (self, print_titles);
-#line 10530 "ConfigurationInterfaces.c"
+#line 10540 "ConfigurationInterfaces.c"
 }
 
 
@@ -10544,6 +10554,8 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
+		gint val = 0;
+		gint _tmp5_ = 0;
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
@@ -10560,8 +10572,8 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10559 "ConfigurationInterfaces.c"
-				goto __catch181_configuration_error;
+#line 10571 "ConfigurationInterfaces.c"
+				goto __catch182_configuration_error;
 			}
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -10569,43 +10581,64 @@ static gint configuration_facade_real_get_printing_size_selection (Configuration
 			g_clear_error (&_inner_error_);
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 10568 "ConfigurationInterfaces.c"
+#line 10580 "ConfigurationInterfaces.c"
 		}
 #line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		result = _tmp0_ - 1;
-#line 1518 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		val = _tmp0_ - 1;
+#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp5_ = val;
+#line 1519 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		if (_tmp5_ == -2) {
+#line 10588 "ConfigurationInterfaces.c"
+			ResourcesUnitSystem _tmp6_ = 0;
+#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			_tmp6_ = resources_get_default_measurement_unit ();
+#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+			if (_tmp6_ == RESOURCES_UNIT_SYSTEM_IMPERIAL) {
+#line 1521 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+				val = 2;
+#line 10596 "ConfigurationInterfaces.c"
+			} else {
+#line 1523 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+				val = 10;
+#line 10600 "ConfigurationInterfaces.c"
+			}
+		}
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		result = val;
+#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10574 "ConfigurationInterfaces.c"
+#line 10607 "ConfigurationInterfaces.c"
 	}
-	goto __finally181;
-	__catch181_configuration_error:
+	goto __finally182;
+	__catch182_configuration_error:
 	{
 		GError* err = NULL;
-		GError* _tmp5_ = NULL;
+		GError* _tmp7_ = NULL;
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		_tmp5_ = err;
-#line 1520 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
-		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		_tmp7_ = err;
+#line 1529 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+		configuration_facade_on_configuration_error (self, _tmp7_);
+#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0;
-#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1522 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10595 "ConfigurationInterfaces.c"
+#line 10628 "ConfigurationInterfaces.c"
 	}
-	__finally181:
+	__finally182:
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
 #line 1517 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 10604 "ConfigurationInterfaces.c"
+#line 10637 "ConfigurationInterfaces.c"
 }
 
 
@@ -10614,7 +10647,7 @@ gint configuration_facade_get_printing_size_selection (ConfigurationFacade* self
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
 #line 1516 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_size_selection (self);
-#line 10613 "ConfigurationInterfaces.c"
+#line 10646 "ConfigurationInterfaces.c"
 }
 
 
@@ -10624,69 +10657,69 @@ static void configuration_facade_real_set_printing_size_selection (Configuration
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = size_code;
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_SIZE_SELECTION, _tmp2_ + 1, &_inner_error_);
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10637 "ConfigurationInterfaces.c"
-				goto __catch182_configuration_error;
+#line 10670 "ConfigurationInterfaces.c"
+				goto __catch183_configuration_error;
 			}
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1528 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1537 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10646 "ConfigurationInterfaces.c"
+#line 10679 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally182;
-	__catch182_configuration_error:
+	goto __finally183;
+	__catch183_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1531 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10664 "ConfigurationInterfaces.c"
+#line 10697 "ConfigurationInterfaces.c"
 	}
-	__finally182:
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally183:
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/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 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1527 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1536 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10675 "ConfigurationInterfaces.c"
+#line 10708 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_size_selection (ConfigurationFacade* self, gint size_code) {
-#line 1526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1526 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1535 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_size_selection (self, size_code);
-#line 10685 "ConfigurationInterfaces.c"
+#line 10718 "ConfigurationInterfaces.c"
 }
 
 
@@ -10700,161 +10733,161 @@ static gchar* configuration_facade_real_get_printing_titles_font (ConfigurationF
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, &_inner_error_);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10715 "ConfigurationInterfaces.c"
-				goto __catch183_configuration_error;
+#line 10748 "ConfigurationInterfaces.c"
+				goto __catch184_configuration_error;
 			}
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 10724 "ConfigurationInterfaces.c"
+#line 10757 "ConfigurationInterfaces.c"
 		}
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1540 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1549 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10736 "ConfigurationInterfaces.c"
+#line 10769 "ConfigurationInterfaces.c"
 	}
-	goto __finally183;
-	__catch183_configuration_error:
+	goto __finally184;
+	__catch184_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1542 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup ("Sans Bold 12");
-#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1546 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1555 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10760 "ConfigurationInterfaces.c"
+#line 10793 "ConfigurationInterfaces.c"
 	}
-	__finally183:
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally184:
+#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1539 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1548 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 10769 "ConfigurationInterfaces.c"
+#line 10802 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_printing_titles_font (ConfigurationFacade* self) {
-#line 1538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1538 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1547 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_printing_titles_font (self);
-#line 10778 "ConfigurationInterfaces.c"
+#line 10811 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name) {
 	GError * _inner_error_ = NULL;
-#line 1550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (font_name != NULL);
-#line 10786 "ConfigurationInterfaces.c"
+#line 10819 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = font_name;
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_PRINTING_TITLES_FONT, _tmp2_, &_inner_error_);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10805 "ConfigurationInterfaces.c"
-				goto __catch184_configuration_error;
+#line 10838 "ConfigurationInterfaces.c"
+				goto __catch185_configuration_error;
 			}
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1552 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10814 "ConfigurationInterfaces.c"
+#line 10847 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally184;
-	__catch184_configuration_error:
+	goto __finally185;
+	__catch185_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1554 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10832 "ConfigurationInterfaces.c"
+#line 10865 "ConfigurationInterfaces.c"
 	}
-	__finally184:
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally185:
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/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 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1551 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1560 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10843 "ConfigurationInterfaces.c"
+#line 10876 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_printing_titles_font (ConfigurationFacade* self, const gchar* font_name) {
-#line 1550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1550 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1559 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_printing_titles_font (self, font_name);
-#line 10853 "ConfigurationInterfaces.c"
+#line 10886 "ConfigurationInterfaces.c"
 }
 
 
@@ -10867,77 +10900,77 @@ static gboolean configuration_facade_real_get_show_welcome_dialog (Configuration
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, &_inner_error_);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10882 "ConfigurationInterfaces.c"
-				goto __catch185_configuration_error;
+#line 10915 "ConfigurationInterfaces.c"
+				goto __catch186_configuration_error;
 			}
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 10891 "ConfigurationInterfaces.c"
+#line 10924 "ConfigurationInterfaces.c"
 		}
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1563 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10897 "ConfigurationInterfaces.c"
+#line 10930 "ConfigurationInterfaces.c"
 	}
-	goto __finally185;
-	__catch185_configuration_error:
+	goto __finally186;
+	__catch186_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1565 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1574 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = TRUE;
-#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1567 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 10918 "ConfigurationInterfaces.c"
+#line 10951 "ConfigurationInterfaces.c"
 	}
-	__finally185:
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally186:
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1562 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 10927 "ConfigurationInterfaces.c"
+#line 10960 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_show_welcome_dialog (ConfigurationFacade* self) {
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1570 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1561 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1570 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_show_welcome_dialog (self);
-#line 10936 "ConfigurationInterfaces.c"
+#line 10969 "ConfigurationInterfaces.c"
 }
 
 
@@ -10947,69 +10980,69 @@ static void configuration_facade_real_set_show_welcome_dialog (ConfigurationFaca
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = show;
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SHOW_WELCOME_DIALOG, _tmp2_, &_inner_error_);
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 10960 "ConfigurationInterfaces.c"
-				goto __catch186_configuration_error;
+#line 10993 "ConfigurationInterfaces.c"
+				goto __catch187_configuration_error;
 			}
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1573 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1582 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 10969 "ConfigurationInterfaces.c"
+#line 11002 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally186;
-	__catch186_configuration_error:
+	goto __finally187;
+	__catch187_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1576 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 10987 "ConfigurationInterfaces.c"
+#line 11020 "ConfigurationInterfaces.c"
 	}
-	__finally186:
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally187:
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/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 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1572 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1581 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 10998 "ConfigurationInterfaces.c"
+#line 11031 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_show_welcome_dialog (ConfigurationFacade* self, gboolean show) {
-#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1571 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1580 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_show_welcome_dialog (self, show);
-#line 11008 "ConfigurationInterfaces.c"
+#line 11041 "ConfigurationInterfaces.c"
 }
 
 
@@ -11022,77 +11055,77 @@ static gint configuration_facade_real_get_sidebar_position (ConfigurationFacade*
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, &_inner_error_);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11037 "ConfigurationInterfaces.c"
-				goto __catch187_configuration_error;
+#line 11070 "ConfigurationInterfaces.c"
+				goto __catch188_configuration_error;
 			}
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 11046 "ConfigurationInterfaces.c"
+#line 11079 "ConfigurationInterfaces.c"
 		}
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1585 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11052 "ConfigurationInterfaces.c"
+#line 11085 "ConfigurationInterfaces.c"
 	}
-	goto __finally187;
-	__catch187_configuration_error:
+	goto __finally188;
+	__catch188_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1587 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1596 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 180;
-#line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1589 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1598 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11073 "ConfigurationInterfaces.c"
+#line 11106 "ConfigurationInterfaces.c"
 	}
-	__finally187:
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally188:
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1584 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 11082 "ConfigurationInterfaces.c"
+#line 11115 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_sidebar_position (ConfigurationFacade* self) {
-#line 1583 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1583 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1592 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_sidebar_position (self);
-#line 11091 "ConfigurationInterfaces.c"
+#line 11124 "ConfigurationInterfaces.c"
 }
 
 
@@ -11102,69 +11135,69 @@ static void configuration_facade_real_set_sidebar_position (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = position;
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_SIDEBAR_POSITION, _tmp2_, &_inner_error_);
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11115 "ConfigurationInterfaces.c"
-				goto __catch188_configuration_error;
+#line 11148 "ConfigurationInterfaces.c"
+				goto __catch189_configuration_error;
 			}
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1595 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11124 "ConfigurationInterfaces.c"
+#line 11157 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally188;
-	__catch188_configuration_error:
+	goto __finally189;
+	__catch189_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1597 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11142 "ConfigurationInterfaces.c"
+#line 11175 "ConfigurationInterfaces.c"
 	}
-	__finally188:
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally189:
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/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 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1594 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1603 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11153 "ConfigurationInterfaces.c"
+#line 11186 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_sidebar_position (ConfigurationFacade* self, gint position) {
-#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1593 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1602 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_sidebar_position (self, position);
-#line 11163 "ConfigurationInterfaces.c"
+#line 11196 "ConfigurationInterfaces.c"
 }
 
 
@@ -11177,77 +11210,77 @@ static gdouble configuration_facade_real_get_slideshow_delay (ConfigurationFacad
 		ConfigurationEngine* _tmp2_ = NULL;
 		gdouble _tmp3_ = 0.0;
 		gdouble _tmp4_ = 0.0;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, &_inner_error_);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11192 "ConfigurationInterfaces.c"
-				goto __catch189_configuration_error;
+#line 11225 "ConfigurationInterfaces.c"
+				goto __catch190_configuration_error;
 			}
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 11201 "ConfigurationInterfaces.c"
+#line 11234 "ConfigurationInterfaces.c"
 		}
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1606 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11207 "ConfigurationInterfaces.c"
+#line 11240 "ConfigurationInterfaces.c"
 	}
-	goto __finally189;
-	__catch189_configuration_error:
+	goto __finally190;
+	__catch190_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1608 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1617 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 3.0;
-#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1610 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1619 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11228 "ConfigurationInterfaces.c"
+#line 11261 "ConfigurationInterfaces.c"
 	}
-	__finally189:
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally190:
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1605 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 11237 "ConfigurationInterfaces.c"
+#line 11270 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_slideshow_delay (ConfigurationFacade* self) {
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1604 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1613 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_delay (self);
-#line 11246 "ConfigurationInterfaces.c"
+#line 11279 "ConfigurationInterfaces.c"
 }
 
 
@@ -11257,69 +11290,69 @@ static void configuration_facade_real_set_slideshow_delay (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gdouble _tmp2_ = 0.0;
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = delay;
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_DELAY, _tmp2_, &_inner_error_);
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11270 "ConfigurationInterfaces.c"
-				goto __catch190_configuration_error;
+#line 11303 "ConfigurationInterfaces.c"
+				goto __catch191_configuration_error;
 			}
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1616 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11279 "ConfigurationInterfaces.c"
+#line 11312 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally190;
-	__catch190_configuration_error:
+	goto __finally191;
+	__catch191_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1618 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11297 "ConfigurationInterfaces.c"
+#line 11330 "ConfigurationInterfaces.c"
 	}
-	__finally190:
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally191:
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/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 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1615 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1624 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11308 "ConfigurationInterfaces.c"
+#line 11341 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_delay (ConfigurationFacade* self, gdouble delay) {
-#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1614 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1623 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_delay (self, delay);
-#line 11318 "ConfigurationInterfaces.c"
+#line 11351 "ConfigurationInterfaces.c"
 }
 
 
@@ -11332,77 +11365,77 @@ static gdouble configuration_facade_real_get_slideshow_transition_delay (Configu
 		ConfigurationEngine* _tmp2_ = NULL;
 		gdouble _tmp3_ = 0.0;
 		gdouble _tmp4_ = 0.0;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_double_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, &_inner_error_);
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11347 "ConfigurationInterfaces.c"
-				goto __catch191_configuration_error;
+#line 11380 "ConfigurationInterfaces.c"
+				goto __catch192_configuration_error;
 			}
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0.0;
-#line 11356 "ConfigurationInterfaces.c"
+#line 11389 "ConfigurationInterfaces.c"
 		}
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1627 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11362 "ConfigurationInterfaces.c"
+#line 11395 "ConfigurationInterfaces.c"
 	}
-	goto __finally191;
-	__catch191_configuration_error:
+	goto __finally192;
+	__catch192_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1630 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1639 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = 0.3;
-#line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1632 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11383 "ConfigurationInterfaces.c"
+#line 11416 "ConfigurationInterfaces.c"
 	}
-	__finally191:
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally192:
+#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1626 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1635 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0.0;
-#line 11392 "ConfigurationInterfaces.c"
+#line 11425 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_slideshow_transition_delay (ConfigurationFacade* self) {
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1625 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1634 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_delay (self);
-#line 11401 "ConfigurationInterfaces.c"
+#line 11434 "ConfigurationInterfaces.c"
 }
 
 
@@ -11412,69 +11445,69 @@ static void configuration_facade_real_set_slideshow_transition_delay (Configurat
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gdouble _tmp2_ = 0.0;
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = delay;
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_double_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_DELAY, _tmp2_, &_inner_error_);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11425 "ConfigurationInterfaces.c"
-				goto __catch192_configuration_error;
+#line 11458 "ConfigurationInterfaces.c"
+				goto __catch193_configuration_error;
 			}
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1638 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1647 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11434 "ConfigurationInterfaces.c"
+#line 11467 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally192;
-	__catch192_configuration_error:
+	goto __finally193;
+	__catch193_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1641 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11452 "ConfigurationInterfaces.c"
+#line 11485 "ConfigurationInterfaces.c"
 	}
-	__finally192:
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally193:
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/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 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1637 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1646 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11463 "ConfigurationInterfaces.c"
+#line 11496 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_transition_delay (ConfigurationFacade* self, gdouble delay) {
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1645 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1636 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1645 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_delay (self, delay);
-#line 11473 "ConfigurationInterfaces.c"
+#line 11506 "ConfigurationInterfaces.c"
 }
 
 
@@ -11488,161 +11521,161 @@ static gchar* configuration_facade_real_get_slideshow_transition_effect_id (Conf
 		gchar* _tmp3_ = NULL;
 		gchar* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_string_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, &_inner_error_);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11503 "ConfigurationInterfaces.c"
-				goto __catch193_configuration_error;
+#line 11536 "ConfigurationInterfaces.c"
+				goto __catch194_configuration_error;
 			}
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return NULL;
-#line 11512 "ConfigurationInterfaces.c"
+#line 11545 "ConfigurationInterfaces.c"
 		}
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = _tmp0_;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = NULL;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp5_;
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp0_);
-#line 1650 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1659 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11524 "ConfigurationInterfaces.c"
+#line 11557 "ConfigurationInterfaces.c"
 	}
-	goto __finally193;
-	__catch193_configuration_error:
+	goto __finally194;
+	__catch194_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
-#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp6_ = err;
-#line 1653 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp6_);
-#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_strdup (TRANSITION_EFFECTS_MANAGER_NULL_EFFECT_ID);
-#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp7_;
-#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11548 "ConfigurationInterfaces.c"
+#line 11581 "ConfigurationInterfaces.c"
 	}
-	__finally193:
-#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally194:
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1649 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1658 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return NULL;
-#line 11557 "ConfigurationInterfaces.c"
+#line 11590 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_slideshow_transition_effect_id (ConfigurationFacade* self) {
-#line 1648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1648 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1657 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_transition_effect_id (self);
-#line 11566 "ConfigurationInterfaces.c"
+#line 11599 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_real_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id) {
 	GError * _inner_error_ = NULL;
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 11574 "ConfigurationInterfaces.c"
+#line 11607 "ConfigurationInterfaces.c"
 	{
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		const gchar* _tmp2_ = NULL;
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = id;
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_string_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_TRANSITION_EFFECT_ID, _tmp2_, &_inner_error_);
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11593 "ConfigurationInterfaces.c"
-				goto __catch194_configuration_error;
+#line 11626 "ConfigurationInterfaces.c"
+				goto __catch195_configuration_error;
 			}
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1663 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1672 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11602 "ConfigurationInterfaces.c"
+#line 11635 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally194;
-	__catch194_configuration_error:
+	goto __finally195;
+	__catch195_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1666 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11620 "ConfigurationInterfaces.c"
+#line 11653 "ConfigurationInterfaces.c"
 	}
-	__finally194:
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally195:
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/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 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1662 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1671 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11631 "ConfigurationInterfaces.c"
+#line 11664 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_transition_effect_id (ConfigurationFacade* self, const gchar* id) {
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1661 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1670 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_transition_effect_id (self, id);
-#line 11641 "ConfigurationInterfaces.c"
+#line 11674 "ConfigurationInterfaces.c"
 }
 
 
@@ -11655,77 +11688,77 @@ static gboolean configuration_facade_real_get_slideshow_show_title (Configuratio
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, &_inner_error_);
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11670 "ConfigurationInterfaces.c"
-				goto __catch195_configuration_error;
+#line 11703 "ConfigurationInterfaces.c"
+				goto __catch196_configuration_error;
 			}
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 11679 "ConfigurationInterfaces.c"
+#line 11712 "ConfigurationInterfaces.c"
 		}
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1675 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11685 "ConfigurationInterfaces.c"
+#line 11718 "ConfigurationInterfaces.c"
 	}
-	goto __finally195;
-	__catch195_configuration_error:
+	goto __finally196;
+	__catch196_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1677 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1686 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1679 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1688 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11706 "ConfigurationInterfaces.c"
+#line 11739 "ConfigurationInterfaces.c"
 	}
-	__finally195:
-#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally196:
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1674 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 11715 "ConfigurationInterfaces.c"
+#line 11748 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_slideshow_show_title (ConfigurationFacade* self) {
-#line 1673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1673 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1682 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_slideshow_show_title (self);
-#line 11724 "ConfigurationInterfaces.c"
+#line 11757 "ConfigurationInterfaces.c"
 }
 
 
@@ -11735,69 +11768,69 @@ static void configuration_facade_real_set_slideshow_show_title (ConfigurationFac
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = show_title;
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_SLIDESHOW_SHOW_TITLE, _tmp2_, &_inner_error_);
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11748 "ConfigurationInterfaces.c"
-				goto __catch196_configuration_error;
+#line 11781 "ConfigurationInterfaces.c"
+				goto __catch197_configuration_error;
 			}
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %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/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1685 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11757 "ConfigurationInterfaces.c"
+#line 11790 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally196;
-	__catch196_configuration_error:
+	goto __finally197;
+	__catch197_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1687 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 11775 "ConfigurationInterfaces.c"
+#line 11808 "ConfigurationInterfaces.c"
 	}
-	__finally196:
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally197:
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/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 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1684 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1693 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 11786 "ConfigurationInterfaces.c"
+#line 11819 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_slideshow_show_title (ConfigurationFacade* self, gboolean show_title) {
-#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1683 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1692 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_slideshow_show_title (self, show_title);
-#line 11796 "ConfigurationInterfaces.c"
+#line 11829 "ConfigurationInterfaces.c"
 }
 
 
@@ -11812,7 +11845,7 @@ static void g_time_local (time_t time, struct tm* result) {
 	*result = _result_;
 #line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return;
-#line 11811 "ConfigurationInterfaces.c"
+#line 11844 "ConfigurationInterfaces.c"
 }
 
 
@@ -11858,7 +11891,7 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
 	buffer = (g_free (buffer), NULL);
 #line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 11857 "ConfigurationInterfaces.c"
+#line 11890 "ConfigurationInterfaces.c"
 }
 
 
@@ -11871,41 +11904,41 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, &_inner_error_);
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11886 "ConfigurationInterfaces.c"
-				goto __catch197_configuration_error;
+#line 11919 "ConfigurationInterfaces.c"
+				goto __catch198_configuration_error;
 			}
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 11895 "ConfigurationInterfaces.c"
+#line 11928 "ConfigurationInterfaces.c"
 		}
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1696 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1705 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11901 "ConfigurationInterfaces.c"
+#line 11934 "ConfigurationInterfaces.c"
 	}
-	goto __finally197;
-	__catch197_configuration_error:
+	goto __finally198;
+	__catch198_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -11914,51 +11947,51 @@ static gboolean configuration_facade_real_get_use_24_hour_time (ConfigurationFac
 		gchar* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1698 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_time_local ((time_t) 0, &_tmp6_);
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp7_ = g_time_format (&_tmp6_, "%p");
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp7_;
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp9_ = is_string_empty (_tmp8_);
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _tmp9_;
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_free0 (_tmp8_);
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp10_;
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1702 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1711 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 11939 "ConfigurationInterfaces.c"
+#line 11972 "ConfigurationInterfaces.c"
 	}
-	__finally197:
-#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally198:
+#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1695 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1704 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 11948 "ConfigurationInterfaces.c"
+#line 11981 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_use_24_hour_time (ConfigurationFacade* self) {
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1694 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1703 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_24_hour_time (self);
-#line 11957 "ConfigurationInterfaces.c"
+#line 11990 "ConfigurationInterfaces.c"
 }
 
 
@@ -11968,69 +12001,69 @@ static void configuration_facade_real_set_use_24_hour_time (ConfigurationFacade*
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = use_24_hour_time;
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_24_HOUR_TIME, _tmp2_, &_inner_error_);
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 11981 "ConfigurationInterfaces.c"
-				goto __catch198_configuration_error;
+#line 12014 "ConfigurationInterfaces.c"
+				goto __catch199_configuration_error;
 			}
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1708 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 11990 "ConfigurationInterfaces.c"
+#line 12023 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally198;
-	__catch198_configuration_error:
+	goto __finally199;
+	__catch199_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1710 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12008 "ConfigurationInterfaces.c"
+#line 12041 "ConfigurationInterfaces.c"
 	}
-	__finally198:
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally199:
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/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 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1707 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1716 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12019 "ConfigurationInterfaces.c"
+#line 12052 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_use_24_hour_time (ConfigurationFacade* self, gboolean use_24_hour_time) {
-#line 1706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1706 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1715 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_use_24_hour_time (self, use_24_hour_time);
-#line 12029 "ConfigurationInterfaces.c"
+#line 12062 "ConfigurationInterfaces.c"
 }
 
 
@@ -12043,77 +12076,77 @@ static gboolean configuration_facade_real_get_use_lowercase_filenames (Configura
 		ConfigurationEngine* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
 		gboolean _tmp4_ = FALSE;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_bool_property (_tmp2_, CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, &_inner_error_);
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12058 "ConfigurationInterfaces.c"
-				goto __catch199_configuration_error;
+#line 12091 "ConfigurationInterfaces.c"
+				goto __catch200_configuration_error;
 			}
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected 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/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return FALSE;
-#line 12067 "ConfigurationInterfaces.c"
+#line 12100 "ConfigurationInterfaces.c"
 		}
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1719 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12073 "ConfigurationInterfaces.c"
+#line 12106 "ConfigurationInterfaces.c"
 	}
-	goto __finally199;
-	__catch199_configuration_error:
+	goto __finally200;
+	__catch200_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1721 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1730 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1723 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = FALSE;
-#line 1723 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1723 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1732 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12094 "ConfigurationInterfaces.c"
+#line 12127 "ConfigurationInterfaces.c"
 	}
-	__finally199:
-#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally200:
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1718 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return FALSE;
-#line 12103 "ConfigurationInterfaces.c"
+#line 12136 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_use_lowercase_filenames (ConfigurationFacade* self) {
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1717 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1726 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_use_lowercase_filenames (self);
-#line 12112 "ConfigurationInterfaces.c"
+#line 12145 "ConfigurationInterfaces.c"
 }
 
 
@@ -12123,69 +12156,69 @@ static void configuration_facade_real_set_use_lowercase_filenames (Configuration
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gboolean _tmp2_ = FALSE;
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = b;
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_bool_property (_tmp1_, CONFIGURABLE_PROPERTY_USE_LOWERCASE_FILENAMES, _tmp2_, &_inner_error_);
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12136 "ConfigurationInterfaces.c"
-				goto __catch200_configuration_error;
+#line 12169 "ConfigurationInterfaces.c"
+				goto __catch201_configuration_error;
 			}
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1729 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 12145 "ConfigurationInterfaces.c"
+#line 12178 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally200;
-	__catch200_configuration_error:
+	goto __finally201;
+	__catch201_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1731 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12163 "ConfigurationInterfaces.c"
+#line 12196 "ConfigurationInterfaces.c"
 	}
-	__finally200:
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally201:
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/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 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1728 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1737 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12174 "ConfigurationInterfaces.c"
+#line 12207 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_use_lowercase_filenames (ConfigurationFacade* self, gboolean b) {
-#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1727 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1736 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_use_lowercase_filenames (self, b);
-#line 12184 "ConfigurationInterfaces.c"
+#line 12217 "ConfigurationInterfaces.c"
 }
 
 
@@ -12198,77 +12231,77 @@ static gint configuration_facade_real_get_video_interpreter_state_cookie (Config
 		ConfigurationEngine* _tmp2_ = NULL;
 		gint _tmp3_ = 0;
 		gint _tmp4_ = 0;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = configuration_facade_get_engine (self);
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = _tmp1_;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = configuration_engine_get_int_property (_tmp2_, CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, &_inner_error_);
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp4_ = _tmp3_;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp2_);
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = _tmp4_;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12213 "ConfigurationInterfaces.c"
-				goto __catch201_configuration_error;
+#line 12246 "ConfigurationInterfaces.c"
+				goto __catch202_configuration_error;
 			}
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return 0;
-#line 12222 "ConfigurationInterfaces.c"
+#line 12255 "ConfigurationInterfaces.c"
 		}
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = _tmp0_;
-#line 1740 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12228 "ConfigurationInterfaces.c"
+#line 12261 "ConfigurationInterfaces.c"
 	}
-	goto __finally201;
-	__catch201_configuration_error:
+	goto __finally202;
+	__catch202_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
-#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp5_ = err;
-#line 1743 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1752 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp5_);
-#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		result = -1;
-#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 1745 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return result;
-#line 12249 "ConfigurationInterfaces.c"
+#line 12282 "ConfigurationInterfaces.c"
 	}
-	__finally201:
-#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally202:
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_clear_error (&_inner_error_);
-#line 1739 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1748 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return 0;
-#line 12258 "ConfigurationInterfaces.c"
+#line 12291 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_video_interpreter_state_cookie (ConfigurationFacade* self) {
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1738 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1747 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_video_interpreter_state_cookie (self);
-#line 12267 "ConfigurationInterfaces.c"
+#line 12300 "ConfigurationInterfaces.c"
 }
 
 
@@ -12278,69 +12311,69 @@ static void configuration_facade_real_set_video_interpreter_state_cookie (Config
 		ConfigurationEngine* _tmp0_ = NULL;
 		ConfigurationEngine* _tmp1_ = NULL;
 		gint _tmp2_ = 0;
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp0_ = configuration_facade_get_engine (self);
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp1_ = _tmp0_;
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp2_ = state_cookie;
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_engine_set_int_property (_tmp1_, CONFIGURABLE_PROPERTY_VIDEO_INTERPRETER_STATE_COOKIE, _tmp2_, &_inner_error_);
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_object_unref0 (_tmp1_);
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
-#line 12291 "ConfigurationInterfaces.c"
-				goto __catch202_configuration_error;
+#line 12324 "ConfigurationInterfaces.c"
+				goto __catch203_configuration_error;
 			}
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			g_clear_error (&_inner_error_);
-#line 1751 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1760 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 			return;
-#line 12300 "ConfigurationInterfaces.c"
+#line 12333 "ConfigurationInterfaces.c"
 		}
 	}
-	goto __finally202;
-	__catch202_configuration_error:
+	goto __finally203;
+	__catch203_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		err = _inner_error_;
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_inner_error_ = NULL;
-#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp3_ = err;
-#line 1754 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1763 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		configuration_facade_on_configuration_error (self, _tmp3_);
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_g_error_free0 (err);
-#line 12318 "ConfigurationInterfaces.c"
+#line 12351 "ConfigurationInterfaces.c"
 	}
-	__finally202:
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+	__finally203:
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/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 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		g_clear_error (&_inner_error_);
-#line 1750 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1759 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		return;
-#line 12329 "ConfigurationInterfaces.c"
+#line 12362 "ConfigurationInterfaces.c"
 	}
 }
 
 
 void configuration_facade_set_video_interpreter_state_cookie (ConfigurationFacade* self, gint state_cookie) {
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1749 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1758 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_video_interpreter_state_cookie (self, state_cookie);
-#line 12339 "ConfigurationInterfaces.c"
+#line 12372 "ConfigurationInterfaces.c"
 }
 
 
@@ -12354,44 +12387,44 @@ static gboolean configuration_facade_real_get_plugin_bool (ConfigurationFacade*
 	gboolean _tmp5_ = FALSE;
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, FALSE);
-#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, FALSE);
-#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, FALSE);
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1762 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1771 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12381 "ConfigurationInterfaces.c"
+#line 12414 "ConfigurationInterfaces.c"
 }
 
 
 gboolean configuration_facade_get_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean def) {
-#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), FALSE);
-#line 1761 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_bool (self, domain, id, key, def);
-#line 12390 "ConfigurationInterfaces.c"
+#line 12423 "ConfigurationInterfaces.c"
 }
 
 
@@ -12402,38 +12435,38 @@ static void configuration_facade_real_set_plugin_bool (ConfigurationFacade* self
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_bool (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1766 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1775 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12423 "ConfigurationInterfaces.c"
+#line 12456 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_bool (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gboolean val) {
-#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1765 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_bool (self, domain, id, key, val);
-#line 12432 "ConfigurationInterfaces.c"
+#line 12465 "ConfigurationInterfaces.c"
 }
 
 
@@ -12447,44 +12480,44 @@ static gdouble configuration_facade_real_get_plugin_double (ConfigurationFacade*
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
 	gdouble _tmp7_ = 0.0;
-#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, 0.0);
-#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0.0);
-#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, 0.0);
-#line 1770 "/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 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1770 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1779 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12474 "ConfigurationInterfaces.c"
+#line 12507 "ConfigurationInterfaces.c"
 }
 
 
 gdouble configuration_facade_get_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble def) {
-#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0.0);
-#line 1769 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_double (self, domain, id, key, def);
-#line 12483 "ConfigurationInterfaces.c"
+#line 12516 "ConfigurationInterfaces.c"
 }
 
 
@@ -12495,38 +12528,38 @@ static void configuration_facade_real_set_plugin_double (ConfigurationFacade* se
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gdouble _tmp5_ = 0.0;
-#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_double (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1774 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1783 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12516 "ConfigurationInterfaces.c"
+#line 12549 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_double (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gdouble val) {
-#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1773 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_double (self, domain, id, key, val);
-#line 12525 "ConfigurationInterfaces.c"
+#line 12558 "ConfigurationInterfaces.c"
 }
 
 
@@ -12540,44 +12573,44 @@ static gint configuration_facade_real_get_plugin_int (ConfigurationFacade* self,
 	gint _tmp5_ = 0;
 	gint _tmp6_ = 0;
 	gint _tmp7_ = 0;
-#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, 0);
-#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, 0);
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp7_;
-#line 1778 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12567 "ConfigurationInterfaces.c"
+#line 12600 "ConfigurationInterfaces.c"
 }
 
 
 gint configuration_facade_get_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint def) {
-#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1777 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_int (self, domain, id, key, def);
-#line 12576 "ConfigurationInterfaces.c"
+#line 12609 "ConfigurationInterfaces.c"
 }
 
 
@@ -12588,38 +12621,38 @@ static void configuration_facade_real_set_plugin_int (ConfigurationFacade* self,
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
 	gint _tmp5_ = 0;
-#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = val;
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_int (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1782 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12609 "ConfigurationInterfaces.c"
+#line 12642 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_int (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, gint val) {
-#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1781 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_int (self, domain, id, key, val);
-#line 12618 "ConfigurationInterfaces.c"
+#line 12651 "ConfigurationInterfaces.c"
 }
 
 
@@ -12637,65 +12670,65 @@ static gchar* configuration_facade_real_get_plugin_string (ConfigurationFacade*
 	const gchar* _tmp8_ = NULL;
 	const gchar* _tmp9_ = NULL;
 	gchar* _tmp11_ = NULL;
-#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (domain != NULL, NULL);
-#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, NULL);
-#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (key != NULL, NULL);
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = def;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = configuration_engine_get_plugin_string (_tmp1_, _tmp2_, _tmp3_, _tmp4_, _tmp5_);
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp7_ = _tmp6_;
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1786 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1795 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_result_ = _tmp7_;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp9_ = _result_;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (g_strcmp0 (_tmp9_, "") == 0) {
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = NULL;
-#line 12668 "ConfigurationInterfaces.c"
+#line 12701 "ConfigurationInterfaces.c"
 	} else {
 		const gchar* _tmp10_ = NULL;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp10_ = _result_;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		_tmp8_ = _tmp10_;
-#line 12675 "ConfigurationInterfaces.c"
+#line 12708 "ConfigurationInterfaces.c"
 	}
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp11_ = g_strdup (_tmp8_);
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp11_;
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_free0 (_result_);
-#line 1787 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1796 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12685 "ConfigurationInterfaces.c"
+#line 12718 "ConfigurationInterfaces.c"
 }
 
 
 gchar* configuration_facade_get_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* def) {
-#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), NULL);
-#line 1785 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->get_plugin_string (self, domain, id, key, def);
-#line 12694 "ConfigurationInterfaces.c"
+#line 12727 "ConfigurationInterfaces.c"
 }
 
 
@@ -12707,46 +12740,46 @@ static void configuration_facade_real_set_plugin_string (ConfigurationFacade* se
 	const gchar* _tmp4_ = NULL;
 	const gchar* _tmp5_ = NULL;
 	const gchar* _tmp6_ = NULL;
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/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 1799 "/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 1799 "/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 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = val;
-#line 1791 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1800 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	if (_tmp0_ == NULL) {
-#line 1792 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1801 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 		val = "";
-#line 12718 "ConfigurationInterfaces.c"
+#line 12751 "ConfigurationInterfaces.c"
 	}
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = configuration_facade_get_engine (self);
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = _tmp1_;
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = domain;
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = id;
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp5_ = key;
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp6_ = val;
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_string (_tmp2_, _tmp3_, _tmp4_, _tmp5_, _tmp6_);
-#line 1794 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1803 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp2_);
-#line 12736 "ConfigurationInterfaces.c"
+#line 12769 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_string (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key, const gchar* val) {
-#line 1790 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1799 "/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 1799 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_string (self, domain, id, key, val);
-#line 12745 "ConfigurationInterfaces.c"
+#line 12778 "ConfigurationInterfaces.c"
 }
 
 
@@ -12756,36 +12789,36 @@ static void configuration_facade_real_unset_plugin_key (ConfigurationFacade* sel
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	const gchar* _tmp4_ = NULL;
-#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (domain != NULL);
-#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (key != NULL);
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = domain;
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = id;
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = key;
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_unset_plugin_key (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1798 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1807 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12775 "ConfigurationInterfaces.c"
+#line 12808 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_unset_plugin_key (ConfigurationFacade* self, const gchar* domain, const gchar* id, const gchar* key) {
-#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1797 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1806 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->unset_plugin_key (self, domain, id, key);
-#line 12784 "ConfigurationInterfaces.c"
+#line 12817 "ConfigurationInterfaces.c"
 }
 
 
@@ -12796,34 +12829,34 @@ static FuzzyPropertyState configuration_facade_real_is_plugin_enabled (Configura
 	const gchar* _tmp2_ = NULL;
 	FuzzyPropertyState _tmp3_ = 0;
 	FuzzyPropertyState _tmp4_ = 0;
-#line 1804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (id != NULL, 0);
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = id;
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = configuration_engine_is_plugin_enabled (_tmp1_, _tmp2_);
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp4_ = _tmp3_;
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	result = _tmp4_;
-#line 1805 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1814 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return result;
-#line 12813 "ConfigurationInterfaces.c"
+#line 12846 "ConfigurationInterfaces.c"
 }
 
 
 FuzzyPropertyState configuration_facade_is_plugin_enabled (ConfigurationFacade* self, const gchar* id) {
-#line 1804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_val_if_fail (IS_CONFIGURATION_FACADE (self), 0);
-#line 1804 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1813 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	return CONFIGURATION_FACADE_GET_CLASS (self)->is_plugin_enabled (self, id);
-#line 12822 "ConfigurationInterfaces.c"
+#line 12855 "ConfigurationInterfaces.c"
 }
 
 
@@ -12832,30 +12865,30 @@ static void configuration_facade_real_set_plugin_enabled (ConfigurationFacade* s
 	ConfigurationEngine* _tmp1_ = NULL;
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
-#line 1808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (id != NULL);
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp0_ = configuration_facade_get_engine (self);
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp1_ = _tmp0_;
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp2_ = id;
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_tmp3_ = enabled;
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	configuration_engine_set_plugin_enabled (_tmp1_, _tmp2_, _tmp3_);
-#line 1809 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1818 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	_g_object_unref0 (_tmp1_);
-#line 12845 "ConfigurationInterfaces.c"
+#line 12878 "ConfigurationInterfaces.c"
 }
 
 
 void configuration_facade_set_plugin_enabled (ConfigurationFacade* self, const gchar* id, gboolean enabled) {
-#line 1808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	g_return_if_fail (IS_CONFIGURATION_FACADE (self));
-#line 1808 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
+#line 1817 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	CONFIGURATION_FACADE_GET_CLASS (self)->set_plugin_enabled (self, id, enabled);
-#line 12854 "ConfigurationInterfaces.c"
+#line 12887 "ConfigurationInterfaces.c"
 }
 
 
@@ -13144,14 +13177,14 @@ static void configuration_facade_class_init (ConfigurationFacadeClass * klass) {
 	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"
 	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 13143 "ConfigurationInterfaces.c"
+#line 13176 "ConfigurationInterfaces.c"
 }
 
 
 static void configuration_facade_instance_init (ConfigurationFacade * self) {
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	self->priv = CONFIGURATION_FACADE_GET_PRIVATE (self);
-#line 13150 "ConfigurationInterfaces.c"
+#line 13183 "ConfigurationInterfaces.c"
 }
 
 
@@ -13163,7 +13196,7 @@ static void configuration_facade_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->engine);
 #line 345 "/home/jens/Source/shotwell/src/config/ConfigurationInterfaces.vala"
 	G_OBJECT_CLASS (configuration_facade_parent_class)->finalize (obj);
-#line 13162 "ConfigurationInterfaces.c"
+#line 13195 "ConfigurationInterfaces.c"
 }
 
 
diff --git a/src/config/ConfigurationInterfaces.vala b/src/config/ConfigurationInterfaces.vala
index 29a3604..a9636ef 100644
--- a/src/config/ConfigurationInterfaces.vala
+++ b/src/config/ConfigurationInterfaces.vala
@@ -1515,7 +1515,16 @@ public abstract class ConfigurationFacade : Object {
     //
     public virtual int get_printing_size_selection() {
         try {
-            return get_engine().get_int_property(ConfigurableProperty.PRINTING_SIZE_SELECTION) - 1;
+            var val = get_engine().get_int_property(ConfigurableProperty.PRINTING_SIZE_SELECTION) - 1;
+            if (val == -2) {
+                if (Resources.get_default_measurement_unit() == Resources.UnitSystem.IMPERIAL) {
+                    val = 2;
+                } else {
+                    val = 10;
+                }
+            }
+
+            return val;
         } catch (ConfigurationError err) {
             on_configuration_error(err);
 
diff --git a/src/config/GSettingsEngine.c b/src/config/GSettingsEngine.c
index 6d9dfe0..873e431 100644
--- a/src/config/GSettingsEngine.c
+++ b/src/config/GSettingsEngine.c
@@ -3376,7 +3376,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3379 "GSettingsEngine.c"
-				goto __catch203_g_regex_error;
+				goto __catch204_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -3401,7 +3401,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 3404 "GSettingsEngine.c"
-				goto __catch203_g_regex_error;
+				goto __catch204_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -3427,8 +3427,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 3429 "GSettingsEngine.c"
 	}
-	goto __finally203;
-	__catch203_g_regex_error:
+	goto __finally204;
+	__catch204_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -3441,7 +3441,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 3443 "GSettingsEngine.c"
 	}
-	__finally203:
+	__finally204:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -4600,7 +4600,7 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4603 "GSettingsEngine.c"
-				goto __catch204_configuration_error;
+				goto __catch205_configuration_error;
 			}
 #line 373 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4620,8 +4620,8 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 		return result;
 #line 4622 "GSettingsEngine.c"
 	}
-	goto __finally204;
-	__catch204_configuration_error:
+	goto __finally205;
+	__catch205_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -4649,7 +4649,7 @@ static gboolean gsettings_configuration_engine_real_get_plugin_bool (Configurati
 		return result;
 #line 4651 "GSettingsEngine.c"
 	}
-	__finally204:
+	__finally205:
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 372 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4708,7 +4708,7 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4711 "GSettingsEngine.c"
-				goto __catch205_configuration_error;
+				goto __catch206_configuration_error;
 			}
 #line 384 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4721,8 +4721,8 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 #line 4722 "GSettingsEngine.c"
 		}
 	}
-	goto __finally205;
-	__catch205_configuration_error:
+	goto __finally206;
+	__catch206_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -4741,7 +4741,7 @@ static void gsettings_configuration_engine_real_set_plugin_bool (ConfigurationEn
 		_g_error_free0 (err);
 #line 4743 "GSettingsEngine.c"
 	}
-	__finally205:
+	__finally206:
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 383 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4811,7 +4811,7 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4814 "GSettingsEngine.c"
-				goto __catch206_configuration_error;
+				goto __catch207_configuration_error;
 			}
 #line 394 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4831,8 +4831,8 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 		return result;
 #line 4833 "GSettingsEngine.c"
 	}
-	goto __finally206;
-	__catch206_configuration_error:
+	goto __finally207;
+	__catch207_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -4860,7 +4860,7 @@ static gdouble gsettings_configuration_engine_real_get_plugin_double (Configurat
 		return result;
 #line 4862 "GSettingsEngine.c"
 	}
-	__finally206:
+	__finally207:
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 393 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -4919,7 +4919,7 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 4922 "GSettingsEngine.c"
-				goto __catch207_configuration_error;
+				goto __catch208_configuration_error;
 			}
 #line 405 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -4932,8 +4932,8 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 #line 4933 "GSettingsEngine.c"
 		}
 	}
-	goto __finally207;
-	__catch207_configuration_error:
+	goto __finally208;
+	__catch208_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -4952,7 +4952,7 @@ static void gsettings_configuration_engine_real_set_plugin_double (Configuration
 		_g_error_free0 (err);
 #line 4954 "GSettingsEngine.c"
 	}
-	__finally207:
+	__finally208:
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 404 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5022,7 +5022,7 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5025 "GSettingsEngine.c"
-				goto __catch208_configuration_error;
+				goto __catch209_configuration_error;
 			}
 #line 415 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5042,8 +5042,8 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 		return result;
 #line 5044 "GSettingsEngine.c"
 	}
-	goto __finally208;
-	__catch208_configuration_error:
+	goto __finally209;
+	__catch209_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -5071,7 +5071,7 @@ static gint gsettings_configuration_engine_real_get_plugin_int (ConfigurationEng
 		return result;
 #line 5073 "GSettingsEngine.c"
 	}
-	__finally208:
+	__finally209:
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 414 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5130,7 +5130,7 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5133 "GSettingsEngine.c"
-				goto __catch209_configuration_error;
+				goto __catch210_configuration_error;
 			}
 #line 426 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5143,8 +5143,8 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 #line 5144 "GSettingsEngine.c"
 		}
 	}
-	goto __finally209;
-	__catch209_configuration_error:
+	goto __finally210;
+	__catch210_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -5163,7 +5163,7 @@ static void gsettings_configuration_engine_real_set_plugin_int (ConfigurationEng
 		_g_error_free0 (err);
 #line 5165 "GSettingsEngine.c"
 	}
-	__finally209:
+	__finally210:
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 425 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5234,7 +5234,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5237 "GSettingsEngine.c"
-				goto __catch210_configuration_error;
+				goto __catch211_configuration_error;
 			}
 #line 436 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5260,8 +5260,8 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 		return result;
 #line 5262 "GSettingsEngine.c"
 	}
-	goto __finally210;
-	__catch210_configuration_error:
+	goto __finally211;
+	__catch211_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -5292,7 +5292,7 @@ static gchar* gsettings_configuration_engine_real_get_plugin_string (Configurati
 		return result;
 #line 5294 "GSettingsEngine.c"
 	}
-	__finally210:
+	__finally211:
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (schema_name);
 #line 435 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5351,7 +5351,7 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5354 "GSettingsEngine.c"
-				goto __catch211_configuration_error;
+				goto __catch212_configuration_error;
 			}
 #line 447 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5364,8 +5364,8 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 #line 5365 "GSettingsEngine.c"
 		}
 	}
-	goto __finally211;
-	__catch211_configuration_error:
+	goto __finally212;
+	__catch212_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -5384,7 +5384,7 @@ static void gsettings_configuration_engine_real_set_plugin_string (Configuration
 		_g_error_free0 (err);
 #line 5386 "GSettingsEngine.c"
 	}
-	__finally211:
+	__finally212:
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 446 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5446,7 +5446,7 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5449 "GSettingsEngine.c"
-				goto __catch212_configuration_error;
+				goto __catch213_configuration_error;
 			}
 #line 457 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (schema_name);
@@ -5459,8 +5459,8 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 #line 5460 "GSettingsEngine.c"
 		}
 	}
-	goto __finally212;
-	__catch212_configuration_error:
+	goto __finally213;
+	__catch213_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5479,7 +5479,7 @@ static void gsettings_configuration_engine_real_unset_plugin_key (ConfigurationE
 		_g_error_free0 (err);
 #line 5481 "GSettingsEngine.c"
 	}
-	__finally212:
+	__finally213:
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 456 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5529,7 +5529,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5532 "GSettingsEngine.c"
-				goto __catch213_configuration_error;
+				goto __catch214_configuration_error;
 			}
 #line 467 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
@@ -5559,8 +5559,8 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 		return result;
 #line 5561 "GSettingsEngine.c"
 	}
-	goto __finally213;
-	__catch213_configuration_error:
+	goto __finally214;
+	__catch214_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp5_ = NULL;
@@ -5585,7 +5585,7 @@ static FuzzyPropertyState gsettings_configuration_engine_real_is_plugin_enabled
 		return result;
 #line 5587 "GSettingsEngine.c"
 	}
-	__finally213:
+	__finally214:
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	_g_free0 (enable_disable_name);
 #line 466 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5626,7 +5626,7 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			if (_inner_error_->domain == CONFIGURATION_ERROR) {
 #line 5629 "GSettingsEngine.c"
-				goto __catch214_configuration_error;
+				goto __catch215_configuration_error;
 			}
 #line 479 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 			_g_free0 (enable_disable_name);
@@ -5639,8 +5639,8 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 #line 5640 "GSettingsEngine.c"
 		}
 	}
-	goto __finally214;
-	__catch214_configuration_error:
+	goto __finally215;
+	__catch215_configuration_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -5659,7 +5659,7 @@ static void gsettings_configuration_engine_real_set_plugin_enabled (Configuratio
 		_g_error_free0 (err);
 #line 5661 "GSettingsEngine.c"
 	}
-	__finally214:
+	__finally215:
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 478 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
@@ -5712,11 +5712,11 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {
 #line 493 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 5715 "GSettingsEngine.c"
-			goto __catch215_g_error;
+			goto __catch216_g_error;
 		}
 	}
-	goto __finally215;
-	__catch215_g_error:
+	goto __finally216;
+	__catch216_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp6_ = NULL;
@@ -5735,7 +5735,7 @@ void gsettings_configuration_engine_run_gsettings_migrator (void) {
 		_g_error_free0 (err);
 #line 5737 "GSettingsEngine.c"
 	}
-	__finally215:
+	__finally216:
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 492 "/home/jens/Source/shotwell/src/config/GSettingsEngine.vala"
diff --git a/src/core/DataSource.c b/src/core/DataSource.c
index 3009d24..4d1d881 100644
--- a/src/core/DataSource.c
+++ b/src/core/DataSource.c
@@ -2387,7 +2387,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2389 "DataSource.c"
-				goto __catch49_g_error;
+				goto __catch50_g_error;
 			}
 #line 370 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 			ret = _tmp1_;
@@ -2409,8 +2409,8 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 #line 2409 "DataSource.c"
 			}
 		}
-		goto __finally49;
-		__catch49_g_error:
+		goto __finally50;
+		__catch50_g_error:
 		{
 			GError* err = NULL;
 			gchar* _tmp6_ = NULL;
@@ -2439,7 +2439,7 @@ gboolean data_source_destroy_orphan (DataSource* self, gboolean delete_backing)
 			_g_error_free0 (err);
 #line 2440 "DataSource.c"
 		}
-		__finally49:
+		__finally50:
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 369 "/home/jens/Source/shotwell/src/core/DataSource.vala"
diff --git a/src/core/SourceCollection.c b/src/core/SourceCollection.c
index 3cca952..edda651 100644
--- a/src/core/SourceCollection.c
+++ b/src/core/SourceCollection.c
@@ -757,14 +757,14 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 760 "SourceCollection.c"
-			goto __catch48_g_error;
+			goto __catch49_g_error;
 		}
 #line 115 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 		success = _tmp0_;
 #line 765 "SourceCollection.c"
 	}
-	goto __finally48;
-	__catch48_g_error:
+	goto __finally49;
+	__catch49_g_error:
 	{
 		GError* err = NULL;
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
@@ -777,7 +777,7 @@ static gboolean source_collection_destroy_and_delete_source (SourceCollection* s
 		_g_error_free0 (err);
 #line 779 "SourceCollection.c"
 	}
-	__finally48:
+	__finally49:
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 114 "/home/jens/Source/shotwell/src/core/SourceCollection.vala"
diff --git a/src/data_imports/DataImportSource.c b/src/data_imports/DataImportSource.c
index 93664d4..8558571 100644
--- a/src/data_imports/DataImportSource.c
+++ b/src/data_imports/DataImportSource.c
@@ -364,11 +364,11 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 46 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 367 "DataImportSource.c"
-				goto __catch216_g_error;
+				goto __catch217_g_error;
 			}
 		}
-		goto __finally216;
-		__catch216_g_error:
+		goto __finally217;
+		__catch217_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp26_ = NULL;
@@ -399,7 +399,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 401 "DataImportSource.c"
 		}
-		__finally216:
+		__finally217:
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 45 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -583,7 +583,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 64 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 586 "DataImportSource.c"
-					goto __catch217_g_error;
+					goto __catch218_g_error;
 				}
 #line 65 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 				_tmp57_ = preview_raw;
@@ -603,8 +603,8 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				preview_raw = (g_free (preview_raw), NULL);
 #line 605 "DataImportSource.c"
 			}
-			goto __finally217;
-			__catch217_g_error:
+			goto __finally218;
+			__catch218_g_error:
 			{
 				GError* e = NULL;
 				gchar* _tmp60_ = NULL;
@@ -631,7 +631,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 				_g_error_free0 (e);
 #line 633 "DataImportSource.c"
 			}
-			__finally217:
+			__finally218:
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 63 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -670,14 +670,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 673 "DataImportSource.c"
-				goto __catch218_g_error;
+				goto __catch219_g_error;
 			}
 #line 75 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->file_size = _tmp64_;
 #line 678 "DataImportSource.c"
 		}
-		goto __finally218;
-		__catch218_g_error:
+		goto __finally219;
+		__catch219_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp67_ = NULL;
@@ -704,7 +704,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 706 "DataImportSource.c"
 		}
-		__finally218:
+		__finally219:
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
@@ -742,14 +742,14 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 745 "DataImportSource.c"
-				goto __catch219_g_error;
+				goto __catch220_g_error;
 			}
 #line 80 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 			self->priv->modification_time = _tmp71_;
 #line 750 "DataImportSource.c"
 		}
-		goto __finally219;
-		__catch219_g_error:
+		goto __finally220;
+		__catch220_g_error:
 		{
 			GError* e = NULL;
 			gchar* _tmp74_ = NULL;
@@ -776,7 +776,7 @@ SpitDataImportsDataImportSource* spit_data_imports_data_import_source_construct
 			_g_error_free0 (e);
 #line 778 "DataImportSource.c"
 		}
-		__finally219:
+		__finally220:
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/data_imports/DataImportSource.vala"
diff --git a/src/direct/DirectPhoto.c b/src/direct/DirectPhoto.c
index 6e17fe2..369ddae 100644
--- a/src/direct/DirectPhoto.c
+++ b/src/direct/DirectPhoto.c
@@ -1258,7 +1258,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1261 "DirectPhoto.c"
-			goto __catch44_g_error;
+			goto __catch45_g_error;
 		}
 #line 59 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO, Photo)->backing_photo_row;
@@ -1270,8 +1270,8 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_g_object_unref0 (_tmp0_);
 #line 1272 "DirectPhoto.c"
 	}
-	goto __finally44;
-	__catch44_g_error:
+	goto __finally45;
+	__catch45_g_error:
 	{
 		GError* e = NULL;
 		gchar* _tmp5_ = NULL;
@@ -1292,7 +1292,7 @@ static void direct_photo_save_dims (DirectPhoto* self) {
 		_g_error_free0 (e);
 #line 1294 "DirectPhoto.c"
 	}
-	__finally44:
+	__finally45:
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 58 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -1337,7 +1337,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1340 "DirectPhoto.c"
-			goto __catch45_g_error;
+			goto __catch46_g_error;
 		}
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		_tmp2_ = reimport_state;
@@ -1346,11 +1346,11 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1349 "DirectPhoto.c"
-			goto __catch45_g_error;
+			goto __catch46_g_error;
 		}
 	}
-	goto __finally45;
-	__catch45_g_error:
+	goto __finally46;
+	__catch46_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
@@ -1375,7 +1375,7 @@ ImportResult direct_photo_demand_load (DirectPhoto* self) {
 		return result;
 #line 1377 "DirectPhoto.c"
 	}
-	__finally45:
+	__finally46:
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
@@ -2563,7 +2563,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_photo_reimport_master_state_unref0 (reimport_state);
 #line 2566 "DirectPhoto.c"
-					goto __catch46_g_error;
+					goto __catch47_g_error;
 				}
 #line 289 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 				if (_tmp12_) {
@@ -2582,7 +2582,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 #line 290 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 						_photo_reimport_master_state_unref0 (reimport_state);
 #line 2585 "DirectPhoto.c"
-						goto __catch46_g_error;
+						goto __catch47_g_error;
 					}
 #line 291 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 					_tmp18_ = should_restore_ori;
@@ -2613,8 +2613,8 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				_photo_reimport_master_state_unref0 (reimport_state);
 #line 2615 "DirectPhoto.c"
 			}
-			goto __finally46;
-			__catch46_g_error:
+			goto __finally47;
+			__catch47_g_error:
 			{
 				GError* err = NULL;
 				GError* _tmp22_ = NULL;
@@ -2638,7 +2638,7 @@ gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self,
 				_g_error_free0 (err);
 #line 2640 "DirectPhoto.c"
 			}
-			__finally46:
+			__finally47:
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 278 "/home/jens/Source/shotwell/src/direct/DirectPhoto.vala"
diff --git a/src/direct/DirectPhotoPage.c b/src/direct/DirectPhotoPage.c
index aeefa98..cc6e84e 100644
--- a/src/direct/DirectPhotoPage.c
+++ b/src/direct/DirectPhotoPage.c
@@ -502,6 +502,7 @@ struct _DirectPhotoPagePrivate {
 	DirectViewCollection* view_controller;
 	GFile* current_save_dir;
 	gboolean drop_if_dirty;
+	GtkMenu* context_menu;
 };
 
 typedef enum  {
@@ -740,6 +741,8 @@ ImportResult direct_photo_demand_load (DirectPhoto* self);
 GFile* direct_photo_page_get_current_file (DirectPhotoPage* self);
 GFile* media_source_get_file (MediaSource* self);
 static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event);
+gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventButton* event);
+static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self);
 static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage* self);
 GType zoom_state_get_type (void) G_GNUC_CONST;
 ZoomState* zoom_state_dup (const ZoomState* self);
@@ -795,6 +798,7 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b
 void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result);
 void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error);
 gchar* direct_photo_source_collection_fetch (DirectPhotoSourceCollection* self, GFile* file, DirectPhoto** photo, gboolean reimport);
+gboolean data_source_equals (DataSource* self, DataSource* source);
 GType direct_view_get_type (void) G_GNUC_CONST;
 DirectView* direct_view_new (DirectPhoto* source);
 DirectView* direct_view_construct (GType object_type, DirectPhoto* source);
@@ -862,182 +866,182 @@ static const GActionEntry DIRECT_PHOTO_PAGE_entries[23] = {{"Save", _direct_phot
 static void _direct_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 32 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_photos_altered ((DirectPhotoPage*) self, items);
-#line 866 "DirectPhotoPage.c"
+#line 870 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_save_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_save ((DirectPhotoPage*) self);
-#line 873 "DirectPhotoPage.c"
+#line 877 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_save_as_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_save_as ((DirectPhotoPage*) self);
-#line 880 "DirectPhotoPage.c"
+#line 884 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_send_to ((DirectPhotoPage*) self);
-#line 887 "DirectPhotoPage.c"
+#line 891 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_print ((DirectPhotoPage*) self);
-#line 894 "DirectPhotoPage.c"
+#line 898 "DirectPhotoPage.c"
 }
 
 
 static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 901 "DirectPhotoPage.c"
+#line 905 "DirectPhotoPage.c"
 }
 
 
 static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 908 "DirectPhotoPage.c"
+#line 912 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 915 "DirectPhotoPage.c"
+#line 919 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 922 "DirectPhotoPage.c"
+#line 926 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 929 "DirectPhotoPage.c"
+#line 933 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 936 "DirectPhotoPage.c"
+#line 940 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 943 "DirectPhotoPage.c"
+#line 947 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 950 "DirectPhotoPage.c"
+#line 954 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 957 "DirectPhotoPage.c"
+#line 961 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 964 "DirectPhotoPage.c"
+#line 968 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 971 "DirectPhotoPage.c"
+#line 975 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_revert ((EditingHostPage*) self);
-#line 978 "DirectPhotoPage.c"
+#line 982 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 985 "DirectPhotoPage.c"
+#line 989 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 992 "DirectPhotoPage.c"
+#line 996 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 999 "DirectPhotoPage.c"
+#line 1003 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 1006 "DirectPhotoPage.c"
+#line 1010 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 1013 "DirectPhotoPage.c"
+#line 1017 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 1020 "DirectPhotoPage.c"
+#line 1024 "DirectPhotoPage.c"
 }
 
 
 static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 42 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 1027 "DirectPhotoPage.c"
+#line 1031 "DirectPhotoPage.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1034 "DirectPhotoPage.c"
+#line 1038 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_selection_group_altered_view_collection_selection_group_altered (ViewCollection* _sender, gpointer self) {
 #line 28 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_selection_group_altered ((DirectPhotoPage*) self);
-#line 1041 "DirectPhotoPage.c"
+#line 1045 "DirectPhotoPage.c"
 }
 
 
@@ -1077,7 +1081,7 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
 	_tmp5_ = direct_photo_page_check_editable_file (_tmp4_);
 #line 16 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp5_) {
-#line 1081 "DirectPhotoPage.c"
+#line 1085 "DirectPhotoPage.c"
 		Application* _tmp6_ = NULL;
 		Application* _tmp7_ = NULL;
 #line 17 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1090,7 +1094,7 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
 		_application_unref0 (_tmp7_);
 #line 19 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return self;
-#line 1094 "DirectPhotoPage.c"
+#line 1098 "DirectPhotoPage.c"
 	}
 #line 22 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = file;
@@ -1128,14 +1132,14 @@ DirectPhotoPage* direct_photo_page_construct (GType object_type, GFile* file) {
 	_data_collection_unref0 (_tmp15_);
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self;
-#line 1132 "DirectPhotoPage.c"
+#line 1136 "DirectPhotoPage.c"
 }
 
 
 DirectPhotoPage* direct_photo_page_new (GFile* file) {
 #line 13 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return direct_photo_page_construct (TYPE_DIRECT_PHOTO_PAGE, file);
-#line 1139 "DirectPhotoPage.c"
+#line 1143 "DirectPhotoPage.c"
 }
 
 
@@ -1160,7 +1164,7 @@ static void direct_photo_page_real_init_collect_ui_filenames (Page* base, GeeLis
 	_tmp2_ = ui_filenames;
 #line 39 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "direct.ui");
-#line 1164 "DirectPhotoPage.c"
+#line 1168 "DirectPhotoPage.c"
 }
 
 
@@ -1180,7 +1184,7 @@ static void direct_photo_page_real_add_actions (Page* base, GActionMap* map) {
 	_tmp1_ = map;
 #line 71 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_action_map_add_action_entries (_tmp1_, DIRECT_PHOTO_PAGE_entries, G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries), self);
-#line 1184 "DirectPhotoPage.c"
+#line 1188 "DirectPhotoPage.c"
 }
 
 
@@ -1195,7 +1199,7 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map)
 	_tmp0_ = map;
 #line 75 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	PAGE_CLASS (direct_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 1199 "DirectPhotoPage.c"
+#line 1203 "DirectPhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -1207,11 +1211,11 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map)
 		entry_collection_length1 = G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries);
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (DIRECT_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
-#line 1211 "DirectPhotoPage.c"
+#line 1215 "DirectPhotoPage.c"
 			GActionEntry entry = {0};
 #line 76 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 1215 "DirectPhotoPage.c"
+#line 1219 "DirectPhotoPage.c"
 			{
 				GActionMap* _tmp1_ = NULL;
 				GActionEntry _tmp2_ = {0};
@@ -1224,7 +1228,7 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map)
 				_tmp3_ = _tmp2_.name;
 #line 77 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 1228 "DirectPhotoPage.c"
+#line 1232 "DirectPhotoPage.c"
 			}
 		}
 	}
@@ -1234,7 +1238,7 @@ static void direct_photo_page_real_remove_actions (Page* base, GActionMap* map)
 static gpointer _injection_group_ref0 (gpointer self) {
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 1238 "DirectPhotoPage.c"
+#line 1242 "DirectPhotoPage.c"
 }
 
 
@@ -1245,13 +1249,13 @@ static void _vala_array_add61 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 1249 "DirectPhotoPage.c"
+#line 1253 "DirectPhotoPage.c"
 	}
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 87 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 1255 "DirectPhotoPage.c"
+#line 1259 "DirectPhotoPage.c"
 }
 
 
@@ -1262,13 +1266,13 @@ static void _vala_array_add62 (InjectionGroup*** array, int* length, int* size,
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 1266 "DirectPhotoPage.c"
+#line 1270 "DirectPhotoPage.c"
 	}
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 92 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 1272 "DirectPhotoPage.c"
+#line 1276 "DirectPhotoPage.c"
 }
 
 
@@ -1344,7 +1348,7 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 	if (result_length1) {
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		*result_length1 = _tmp10__length1;
-#line 1348 "DirectPhotoPage.c"
+#line 1352 "DirectPhotoPage.c"
 	}
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp10_;
@@ -1354,7 +1358,7 @@ static InjectionGroup** direct_photo_page_real_init_collect_injection_groups (Pa
 	_injection_group_unref0 (print_group);
 #line 94 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1358 "DirectPhotoPage.c"
+#line 1362 "DirectPhotoPage.c"
 }
 
 
@@ -1381,7 +1385,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 	_g_free0 (_tmp2_);
 #line 98 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp4_) {
-#line 1385 "DirectPhotoPage.c"
+#line 1389 "DirectPhotoPage.c"
 		const gchar* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
@@ -1406,7 +1410,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 		_g_free0 (_tmp10_);
 #line 99 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp8_);
-#line 1410 "DirectPhotoPage.c"
+#line 1414 "DirectPhotoPage.c"
 	} else {
 		GFile* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
@@ -1427,7 +1431,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 		_g_free0 (_tmp13_);
 #line 100 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp15_) {
-#line 1431 "DirectPhotoPage.c"
+#line 1435 "DirectPhotoPage.c"
 			const gchar* _tmp16_ = NULL;
 			GFile* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
@@ -1452,7 +1456,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 			_g_free0 (_tmp21_);
 #line 101 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_free0 (_tmp19_);
-#line 1456 "DirectPhotoPage.c"
+#line 1460 "DirectPhotoPage.c"
 		} else {
 			GFile* _tmp22_ = NULL;
 			gboolean _tmp23_ = FALSE;
@@ -1462,7 +1466,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 			_tmp23_ = photo_file_format_is_file_supported (_tmp22_);
 #line 102 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (!_tmp23_) {
-#line 1466 "DirectPhotoPage.c"
+#line 1470 "DirectPhotoPage.c"
 				const gchar* _tmp24_ = NULL;
 				GFile* _tmp25_ = NULL;
 				gchar* _tmp26_ = NULL;
@@ -1487,13 +1491,13 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 				_g_free0 (_tmp29_);
 #line 103 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp27_);
-#line 1491 "DirectPhotoPage.c"
+#line 1495 "DirectPhotoPage.c"
 			} else {
 #line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				result = TRUE;
 #line 106 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				return result;
-#line 1497 "DirectPhotoPage.c"
+#line 1501 "DirectPhotoPage.c"
 			}
 		}
 	}
@@ -1501,7 +1505,7 @@ static gboolean direct_photo_page_check_editable_file (GFile* file) {
 	result = FALSE;
 #line 108 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1505 "DirectPhotoPage.c"
+#line 1509 "DirectPhotoPage.c"
 }
 
 
@@ -1518,7 +1522,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 	if (GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize != NULL) {
 #line 113 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		GTK_WIDGET_CLASS (direct_photo_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget));
-#line 1522 "DirectPhotoPage.c"
+#line 1526 "DirectPhotoPage.c"
 	}
 #line 115 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = direct_photo_global;
@@ -1532,7 +1536,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 	_tmp3_ = photo;
 #line 117 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_ != NULL) {
-#line 1536 "DirectPhotoPage.c"
+#line 1540 "DirectPhotoPage.c"
 		DirectViewCollection* _tmp4_ = NULL;
 		DirectPhoto* _tmp5_ = NULL;
 #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1541,7 +1545,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 		_tmp5_ = photo;
 #line 118 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo));
-#line 1545 "DirectPhotoPage.c"
+#line 1549 "DirectPhotoPage.c"
 	} else {
 		const gchar* _tmp6_ = NULL;
 		GFile* _tmp7_ = NULL;
@@ -1567,7 +1571,7 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 		_g_free0 (_tmp11_);
 #line 120 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp9_);
-#line 1571 "DirectPhotoPage.c"
+#line 1575 "DirectPhotoPage.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (self->priv->initial_file);
@@ -1575,14 +1579,14 @@ static void direct_photo_page_real_realize (GtkWidget* base) {
 	self->priv->initial_file = NULL;
 #line 111 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 1579 "DirectPhotoPage.c"
+#line 1583 "DirectPhotoPage.c"
 }
 
 
 static void _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed (DirectPhoto* _sender, gboolean b, gpointer self) {
 #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_on_dphoto_can_rotate_changed ((DirectPhotoPage*) self, b);
-#line 1586 "DirectPhotoPage.c"
+#line 1590 "DirectPhotoPage.c"
 }
 
 
@@ -1610,7 +1614,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 	_g_object_unref0 (_tmp1_);
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp2_) {
-#line 1614 "DirectPhotoPage.c"
+#line 1618 "DirectPhotoPage.c"
 		DirectPhoto* tmp = NULL;
 		Photo* _tmp3_ = NULL;
 		DirectPhoto* _tmp4_ = NULL;
@@ -1623,7 +1627,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 		if (_tmp4_ == NULL) {
 #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 1627 "DirectPhotoPage.c"
+#line 1631 "DirectPhotoPage.c"
 		}
 #line 128 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		tmp = _tmp4_;
@@ -1631,7 +1635,7 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 		_tmp5_ = tmp;
 #line 130 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 1635 "DirectPhotoPage.c"
+#line 1639 "DirectPhotoPage.c"
 			DirectPhoto* _tmp6_ = NULL;
 			guint _tmp7_ = 0U;
 #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
@@ -1640,11 +1644,11 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 			g_signal_parse_name ("can-rotate-changed", TYPE_DIRECT_PHOTO, &_tmp7_, NULL, FALSE);
 #line 131 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self);
-#line 1644 "DirectPhotoPage.c"
+#line 1648 "DirectPhotoPage.c"
 		}
 #line 127 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (tmp);
-#line 1648 "DirectPhotoPage.c"
+#line 1652 "DirectPhotoPage.c"
 	}
 #line 135 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = new_photo;
@@ -1660,17 +1664,17 @@ static void direct_photo_page_real_photo_changing (EditingHostPage* base, Photo*
 	_tmp11_ = tmp;
 #line 139 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp11_ != NULL) {
-#line 1664 "DirectPhotoPage.c"
+#line 1668 "DirectPhotoPage.c"
 		DirectPhoto* _tmp12_ = NULL;
 #line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = tmp;
 #line 140 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_signal_connect_object (_tmp12_, "can-rotate-changed", (GCallback) _direct_photo_page_on_dphoto_can_rotate_changed_direct_photo_can_rotate_changed, self, 0);
-#line 1670 "DirectPhotoPage.c"
+#line 1674 "DirectPhotoPage.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (tmp);
-#line 1674 "DirectPhotoPage.c"
+#line 1678 "DirectPhotoPage.c"
 }
 
 
@@ -1696,22 +1700,92 @@ GFile* direct_photo_page_get_current_file (DirectPhotoPage* self) {
 	result = _tmp3_;
 #line 145 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1700 "DirectPhotoPage.c"
+#line 1704 "DirectPhotoPage.c"
 }
 
 
 static gboolean direct_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) {
 	DirectPhotoPage * self;
 	gboolean result = FALSE;
+	GtkMenu* _tmp0_ = NULL;
+	GtkMenu* _tmp1_ = NULL;
+	GdkEventButton* _tmp2_ = NULL;
 #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
 #line 148 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 152 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp0_ = direct_photo_page_get_context_menu (self);
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp1_ = _tmp0_;
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp2_ = event;
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_);
+#line 149 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_g_object_unref0 (_tmp1_);
+#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = TRUE;
-#line 152 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 151 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 1715 "DirectPhotoPage.c"
+#line 1732 "DirectPhotoPage.c"
+}
+
+
+static GtkMenu* direct_photo_page_get_context_menu (DirectPhotoPage* self) {
+	GtkMenu* result = NULL;
+	GtkMenu* _tmp0_ = NULL;
+	GtkMenu* _tmp7_ = NULL;
+	GtkMenu* _tmp8_ = NULL;
+#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), NULL);
+#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp0_ = self->priv->context_menu;
+#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	if (_tmp0_ == NULL) {
+#line 1747 "DirectPhotoPage.c"
+		GMenuModel* model = NULL;
+		GtkBuilder* _tmp1_ = NULL;
+		GObject* _tmp2_ = NULL;
+		GMenuModel* _tmp3_ = NULL;
+		GMenuModel* _tmp4_ = NULL;
+		GtkMenu* _tmp5_ = NULL;
+		GtkMenu* _tmp6_ = NULL;
+#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page)->builder;
+#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp2_ = gtk_builder_get_object (_tmp1_, "DirectContextMenu");
+#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp2_) : NULL);
+#line 158 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		model = _tmp3_;
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp4_ = model;
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_);
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		g_object_ref_sink (_tmp5_);
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_g_object_unref0 (self->priv->context_menu);
+#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		self->priv->context_menu = _tmp5_;
+#line 161 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp6_ = self->priv->context_menu;
+#line 161 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_g_object_unref0 (model);
+#line 1779 "DirectPhotoPage.c"
+	}
+#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp7_ = self->priv->context_menu;
+#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp8_ = _g_object_ref0 (_tmp7_);
+#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	result = _tmp8_;
+#line 164 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	return result;
+#line 1789 "DirectPhotoPage.c"
 }
 
 
@@ -1722,73 +1796,73 @@ static void direct_photo_page_update_zoom_menu_item_sensitivity (DirectPhotoPage
 	gboolean _tmp4_ = FALSE;
 	ZoomState _tmp5_ = {0};
 	gboolean _tmp6_ = FALSE;
-#line 155 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp2_) {
-#line 1734 "DirectPhotoPage.c"
+#line 1808 "DirectPhotoPage.c"
 		gboolean _tmp3_ = FALSE;
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = !_tmp3_;
-#line 1740 "DirectPhotoPage.c"
+#line 1814 "DirectPhotoPage.c"
 	} else {
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 1744 "DirectPhotoPage.c"
+#line 1818 "DirectPhotoPage.c"
 	}
-#line 156 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 168 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = zoom_state_is_default (&_tmp5_);
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp6_) {
-#line 1754 "DirectPhotoPage.c"
+#line 1828 "DirectPhotoPage.c"
 		gboolean _tmp7_ = FALSE;
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = !_tmp7_;
-#line 1760 "DirectPhotoPage.c"
+#line 1834 "DirectPhotoPage.c"
 	} else {
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 1764 "DirectPhotoPage.c"
+#line 1838 "DirectPhotoPage.c"
 	}
-#line 157 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 1768 "DirectPhotoPage.c"
+#line 1842 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_on_increase_size (EditingHostPage* base) {
 	DirectPhotoPage * self;
-#line 160 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 161 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 163 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 1780 "DirectPhotoPage.c"
+#line 1854 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	DirectPhotoPage * self;
-#line 166 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 167 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 179 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 169 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 181 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 1792 "DirectPhotoPage.c"
+#line 1866 "DirectPhotoPage.c"
 }
 
 
@@ -1802,24 +1876,24 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 	gboolean _tmp19_ = FALSE;
 	gboolean _tmp20_ = FALSE;
 	gboolean _tmp25_ = FALSE;
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 172 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 184 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
-#line 173 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	contains = FALSE;
-#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 1816 "DirectPhotoPage.c"
+#line 1890 "DirectPhotoPage.c"
 		Photo* photo = NULL;
 		Photo* _tmp1_ = NULL;
-#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 175 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo = _tmp1_;
-#line 1823 "DirectPhotoPage.c"
+#line 1897 "DirectPhotoPage.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeMap* _tmp2_ = NULL;
@@ -1828,25 +1902,25 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 			GeeSet* _tmp5_ = NULL;
 			GeeIterator* _tmp6_ = NULL;
 			GeeIterator* _tmp7_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp2_ = map;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp3_ = gee_map_get_keys (_tmp2_);
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp4_ = _tmp3_;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp5_ = _tmp4_;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ITERABLE, GeeIterable));
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp7_ = _tmp6_;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_tmp5_);
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_object_it = _tmp7_;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			while (TRUE) {
-#line 1850 "DirectPhotoPage.c"
+#line 1924 "DirectPhotoPage.c"
 				GeeIterator* _tmp8_ = NULL;
 				gboolean _tmp9_ = FALSE;
 				DataObject* object = NULL;
@@ -1854,129 +1928,129 @@ static void direct_photo_page_on_photos_altered (DirectPhotoPage* self, GeeMap*
 				gpointer _tmp11_ = NULL;
 				DataObject* _tmp12_ = NULL;
 				Photo* _tmp13_ = NULL;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp8_ = _object_it;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp9_ = gee_iterator_next (_tmp8_);
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				if (!_tmp9_) {
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					break;
-#line 1866 "DirectPhotoPage.c"
+#line 1940 "DirectPhotoPage.c"
 				}
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp10_ = _object_it;
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp11_ = gee_iterator_get (_tmp10_);
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				object = (DataObject*) _tmp11_;
-#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp12_ = object;
-#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp13_ = photo;
-#line 177 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				if (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO, Photo) == _tmp13_) {
-#line 178 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					contains = TRUE;
-#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					_g_object_unref0 (object);
-#line 180 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 192 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 					break;
-#line 1886 "DirectPhotoPage.c"
+#line 1960 "DirectPhotoPage.c"
 				}
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (object);
-#line 1890 "DirectPhotoPage.c"
+#line 1964 "DirectPhotoPage.c"
 			}
-#line 176 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 188 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_g_object_unref0 (_object_it);
-#line 1894 "DirectPhotoPage.c"
+#line 1968 "DirectPhotoPage.c"
 		}
-#line 174 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (photo);
-#line 1898 "DirectPhotoPage.c"
+#line 1972 "DirectPhotoPage.c"
 	}
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp15_) {
-#line 1904 "DirectPhotoPage.c"
+#line 1978 "DirectPhotoPage.c"
 		gboolean _tmp16_ = FALSE;
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp16_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = !_tmp16_;
-#line 1910 "DirectPhotoPage.c"
+#line 1984 "DirectPhotoPage.c"
 	} else {
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = FALSE;
-#line 1914 "DirectPhotoPage.c"
+#line 1988 "DirectPhotoPage.c"
 	}
-#line 185 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 197 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	sensitive = _tmp14_;
-#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = sensitive;
-#line 186 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 198 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp17_) {
-#line 1922 "DirectPhotoPage.c"
+#line 1996 "DirectPhotoPage.c"
 		gboolean _tmp18_ = FALSE;
-#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp18_ = contains;
-#line 187 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 199 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		sensitive = _tmp18_;
-#line 1928 "DirectPhotoPage.c"
+#line 2002 "DirectPhotoPage.c"
 	}
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = sensitive;
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp20_) {
-#line 1934 "DirectPhotoPage.c"
+#line 2008 "DirectPhotoPage.c"
 		Photo* _tmp21_ = NULL;
 		Photo* _tmp22_ = NULL;
 		PhotoFileFormat _tmp23_ = 0;
 		gboolean _tmp24_ = FALSE;
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp22_ = _tmp21_;
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp23_ = photo_get_file_format (_tmp22_);
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp24_ = photo_file_format_can_write (_tmp23_);
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = _tmp24_;
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp22_);
-#line 1951 "DirectPhotoPage.c"
+#line 2025 "DirectPhotoPage.c"
 	} else {
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = FALSE;
-#line 1955 "DirectPhotoPage.c"
+#line 2029 "DirectPhotoPage.c"
 	}
-#line 189 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 201 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp19_);
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = sensitive;
-#line 190 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 202 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp25_);
-#line 1963 "DirectPhotoPage.c"
+#line 2037 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_selection_group_altered (DirectPhotoPage* self) {
 	CommandManager* _tmp0_ = NULL;
 	CommandManager* _tmp1_ = NULL;
-#line 193 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	command_manager_reset (_tmp1_);
-#line 200 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 212 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 1980 "DirectPhotoPage.c"
+#line 2054 "DirectPhotoPage.c"
 }
 
 
@@ -1989,51 +2063,51 @@ static gboolean direct_photo_page_real_on_double_click (EditingHostPage* base, G
 	FullscreenWindow* _tmp2_ = NULL;
 	GdkEventButton* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
-#line 203 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 203 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_FULLSCREEN_WINDOW) ? ((FullscreenWindow*) _tmp0_) : NULL;
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_ == NULL) {
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 2005 "DirectPhotoPage.c"
+#line 2079 "DirectPhotoPage.c"
 	}
-#line 204 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 216 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	fs = _tmp1_;
-#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = fs;
-#line 205 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 2013 "DirectPhotoPage.c"
+#line 2087 "DirectPhotoPage.c"
 		FullscreenWindow* _tmp3_ = NULL;
-#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = fs;
-#line 206 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (fs);
-#line 208 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2025 "DirectPhotoPage.c"
+#line 2099 "DirectPhotoPage.c"
 	}
-#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = event;
-#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->on_double_click (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp4_);
-#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp5_;
-#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (fs);
-#line 211 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 223 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2037 "DirectPhotoPage.c"
+#line 2111 "DirectPhotoPage.c"
 }
 
 
@@ -2069,135 +2143,135 @@ static void direct_photo_page_real_update_ui (EditingHostPage* base, gboolean mi
 	gboolean _tmp26_ = FALSE;
 	gboolean _tmp27_ = FALSE;
 	gboolean _tmp29_ = FALSE;
-#line 214 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 226 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = missing;
-#line 215 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	sensitivity = !_tmp0_;
-#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = sensitivity;
-#line 217 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Save", _tmp1_);
-#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = sensitivity;
-#line 218 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SaveAs", _tmp2_);
-#line 219 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = sensitivity;
-#line 219 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", _tmp3_);
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = sensitivity;
-#line 220 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 232 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Publish", _tmp4_);
-#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = sensitivity;
-#line 221 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Print", _tmp5_);
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = sensitivity;
-#line 222 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonJumpToFile", _tmp6_);
-#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = sensitivity;
-#line 224 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonUndo", _tmp7_);
-#line 225 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = sensitivity;
-#line 225 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CommonRedo", _tmp8_);
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = sensitivity;
-#line 227 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp9_);
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp10_ = sensitivity;
-#line 228 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp10_);
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = sensitivity;
-#line 229 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ZoomFit", _tmp11_);
-#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp12_ = sensitivity;
-#line 230 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom100", _tmp12_);
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = sensitivity;
-#line 231 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Zoom200", _tmp13_);
-#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = sensitivity;
-#line 233 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 245 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp14_);
-#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = sensitivity;
-#line 234 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp15_);
-#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = sensitivity;
-#line 235 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 247 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp16_);
-#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = sensitivity;
-#line 236 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp17_);
-#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = sensitivity;
-#line 237 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 249 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp18_);
-#line 238 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = sensitivity;
-#line 238 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 250 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp19_);
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = sensitivity;
-#line 239 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Straighten", _tmp20_);
-#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = sensitivity;
-#line 240 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp21_);
-#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = sensitivity;
-#line 241 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Adjust", _tmp22_);
-#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = sensitivity;
-#line 242 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp23_);
-#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = sensitivity;
-#line 243 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp24_);
-#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = sensitivity;
-#line 244 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Fullscreen", _tmp25_);
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp27_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp27_) {
-#line 2183 "DirectPhotoPage.c"
+#line 2257 "DirectPhotoPage.c"
 		gboolean _tmp28_ = FALSE;
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp28_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = !_tmp28_;
-#line 2189 "DirectPhotoPage.c"
+#line 2263 "DirectPhotoPage.c"
 	} else {
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = FALSE;
-#line 2193 "DirectPhotoPage.c"
+#line 2267 "DirectPhotoPage.c"
 	}
-#line 246 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp26_);
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp29_ = missing;
-#line 248 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	EDITING_HOST_PAGE_CLASS (direct_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp29_);
-#line 2201 "DirectPhotoPage.c"
+#line 2275 "DirectPhotoPage.c"
 }
 
 
@@ -2232,157 +2306,157 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 	gboolean _tmp42_ = FALSE;
 	gint _tmp46_ = 0;
 	gint _tmp47_ = 0;
-#line 251 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_ > 1;
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 252 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	multiple = _tmp3_;
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_) {
-#line 2254 "DirectPhotoPage.c"
+#line 2328 "DirectPhotoPage.c"
 		gboolean _tmp6_ = FALSE;
 		Photo* _tmp7_ = NULL;
 		Photo* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = _tmp7_;
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = photo_has_transformations (_tmp8_);
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp9_;
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp10_) {
-#line 2272 "DirectPhotoPage.c"
+#line 2346 "DirectPhotoPage.c"
 			gboolean _tmp11_ = FALSE;
-#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp11_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = !_tmp11_;
-#line 2278 "DirectPhotoPage.c"
+#line 2352 "DirectPhotoPage.c"
 		} else {
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp6_ = FALSE;
-#line 2282 "DirectPhotoPage.c"
+#line 2356 "DirectPhotoPage.c"
 		}
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = _tmp6_;
-#line 2286 "DirectPhotoPage.c"
+#line 2360 "DirectPhotoPage.c"
 	} else {
-#line 254 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 266 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = FALSE;
-#line 2290 "DirectPhotoPage.c"
+#line 2364 "DirectPhotoPage.c"
 	}
-#line 253 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	revert_possible = _tmp4_;
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp13_) {
-#line 2298 "DirectPhotoPage.c"
+#line 2372 "DirectPhotoPage.c"
 		Photo* _tmp14_ = NULL;
 		Photo* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp15_ = _tmp14_;
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp16_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp15_);
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = _tmp16_;
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp15_);
-#line 2312 "DirectPhotoPage.c"
+#line 2386 "DirectPhotoPage.c"
 	} else {
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 2316 "DirectPhotoPage.c"
+#line 2390 "DirectPhotoPage.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	rotate_possible = _tmp12_;
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp18_) {
-#line 2324 "DirectPhotoPage.c"
+#line 2398 "DirectPhotoPage.c"
 		Photo* _tmp19_ = NULL;
 		Photo* _tmp20_ = NULL;
 		gboolean _tmp21_ = FALSE;
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp20_ = _tmp19_;
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp21_ = editing_host_page_is_enhance_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp20_);
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = _tmp21_;
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp20_);
-#line 2338 "DirectPhotoPage.c"
+#line 2412 "DirectPhotoPage.c"
 	} else {
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = FALSE;
-#line 2342 "DirectPhotoPage.c"
+#line 2416 "DirectPhotoPage.c"
 	}
-#line 256 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 268 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	enhance_possible = _tmp17_;
-#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = multiple;
-#line 258 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp22_);
-#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = multiple;
-#line 259 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp23_);
-#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 272 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = rotate_possible;
-#line 260 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 272 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp24_);
-#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = rotate_possible;
-#line 261 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 273 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp25_);
-#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 274 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp26_ = rotate_possible;
-#line 262 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 274 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp26_);
-#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp27_ = rotate_possible;
-#line 263 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 275 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp27_);
-#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp28_ = revert_possible;
-#line 264 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 276 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp28_);
-#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp29_ = enhance_possible;
-#line 265 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Enhance", _tmp29_);
-#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp30_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 267 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 279 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp30_);
-#line 269 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 281 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 269 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 281 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp31_) {
-#line 2386 "DirectPhotoPage.c"
+#line 2460 "DirectPhotoPage.c"
 		Photo* _tmp32_ = NULL;
 		Photo* _tmp33_ = NULL;
 		Scaling _tmp34_ = {0};
@@ -2391,69 +2465,69 @@ static void direct_photo_page_real_update_actions (Page* base, gint selected_cou
 		Photo* _tmp37_ = NULL;
 		Scaling _tmp38_ = {0};
 		gboolean _tmp39_ = FALSE;
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp33_ = _tmp32_;
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		scaling_for_original (&_tmp34_);
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp35_ = editing_tools_crop_tool_is_available (_tmp33_, &_tmp34_);
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp35_);
-#line 270 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 282 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp33_);
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp37_ = _tmp36_;
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		scaling_for_original (&_tmp38_);
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp39_ = editing_tools_redeye_tool_is_available (_tmp37_, &_tmp38_);
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp39_);
-#line 271 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp37_);
-#line 2419 "DirectPhotoPage.c"
+#line 2493 "DirectPhotoPage.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp40_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp41_ = _tmp40_;
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp42_ = _tmp41_ != NULL;
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp41_);
-#line 277 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp42_) {
-#line 2431 "DirectPhotoPage.c"
+#line 2505 "DirectPhotoPage.c"
 		Photo* _tmp43_ = NULL;
 		Photo* _tmp44_ = NULL;
 		PhotoFileFormat _tmp45_ = 0;
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp43_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp44_ = _tmp43_;
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp45_ = photo_get_file_format (_tmp44_);
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", _tmp45_ != PHOTO_FILE_FORMAT_RAW);
-#line 278 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp44_);
-#line 2445 "DirectPhotoPage.c"
+#line 2519 "DirectPhotoPage.c"
 	} else {
-#line 280 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "AdjustDateTime", FALSE);
-#line 2449 "DirectPhotoPage.c"
+#line 2523 "DirectPhotoPage.c"
 	}
-#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp46_ = selected_count;
-#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp47_ = count;
-#line 283 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	PAGE_CLASS (direct_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp46_, _tmp47_);
-#line 2457 "DirectPhotoPage.c"
+#line 2531 "DirectPhotoPage.c"
 }
 
 
@@ -2485,216 +2559,216 @@ static gboolean direct_photo_page_check_ok_to_close_photo (DirectPhotoPage* self
 	GtkResponseType _tmp23_ = 0;
 	GtkResponseType _tmp24_ = 0;
 	GtkResponseType _tmp25_ = 0;
-#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
-#line 286 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail ((photo == NULL) || IS_PHOTO (photo), FALSE);
-#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = photo;
-#line 289 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 301 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 290 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 302 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2501 "DirectPhotoPage.c"
+#line 2575 "DirectPhotoPage.c"
 	}
-#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = photo;
-#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = photo_has_alterations (_tmp1_);
-#line 292 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp2_) {
-#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 293 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 305 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2513 "DirectPhotoPage.c"
+#line 2587 "DirectPhotoPage.c"
 	}
-#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = self->priv->drop_if_dirty;
-#line 295 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 307 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_) {
-#line 2519 "DirectPhotoPage.c"
+#line 2593 "DirectPhotoPage.c"
 		Photo* _tmp4_ = NULL;
-#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = photo;
-#line 298 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_remove_all_transformations (_tmp4_);
-#line 300 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		result = TRUE;
-#line 300 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return result;
-#line 2529 "DirectPhotoPage.c"
+#line 2603 "DirectPhotoPage.c"
 	}
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = _tmp5_;
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = photo_get_file_format (_tmp6_);
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = photo_file_format_can_write (_tmp7_);
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = _tmp8_;
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp6_);
-#line 303 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 315 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	is_writeable = _tmp9_;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = is_writeable;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp11_) {
-#line 2549 "DirectPhotoPage.c"
+#line 2623 "DirectPhotoPage.c"
 		const gchar* _tmp12_ = NULL;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = _ ("_Save");
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp12_;
-#line 2555 "DirectPhotoPage.c"
+#line 2629 "DirectPhotoPage.c"
 	} else {
 		const gchar* _tmp13_ = NULL;
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp13_ = _ ("_Save a Copy");
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = _tmp13_;
-#line 2562 "DirectPhotoPage.c"
+#line 2636 "DirectPhotoPage.c"
 	}
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = g_strdup (_tmp10_);
-#line 304 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 316 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_option = _tmp14_;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = _ ("Lose changes to %s?");
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = photo;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = media_source_get_basename (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = _tmp17_;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = g_strdup_printf (_tmp15_, _tmp18_);
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = _tmp19_;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = save_option;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = _ ("Close _without Saving");
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = app_window_negate_affirm_cancel_question (_tmp20_, _tmp21_, _tmp22_, NULL, NULL);
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = _tmp23_;
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp20_);
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp18_);
-#line 306 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	response = _tmp24_;
-#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp25_ = response;
-#line 310 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 322 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp25_ == GTK_RESPONSE_YES) {
-#line 2598 "DirectPhotoPage.c"
+#line 2672 "DirectPhotoPage.c"
 		Photo* _tmp26_ = NULL;
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp26_ = photo;
-#line 311 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_remove_all_transformations (_tmp26_);
-#line 2604 "DirectPhotoPage.c"
+#line 2678 "DirectPhotoPage.c"
 	} else {
 		GtkResponseType _tmp27_ = 0;
-#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp27_ = response;
-#line 312 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 324 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (_tmp27_ == GTK_RESPONSE_NO) {
-#line 2611 "DirectPhotoPage.c"
+#line 2685 "DirectPhotoPage.c"
 			gboolean _tmp28_ = FALSE;
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp28_ = is_writeable;
-#line 313 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 325 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp28_) {
-#line 2617 "DirectPhotoPage.c"
+#line 2691 "DirectPhotoPage.c"
 				Photo* _tmp29_ = NULL;
 				GFile* _tmp30_ = NULL;
 				GFile* _tmp31_ = NULL;
 				Photo* _tmp32_ = NULL;
 				Photo* _tmp33_ = NULL;
 				PhotoFileFormat _tmp34_ = 0;
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp29_ = photo;
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp30_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp31_ = _tmp30_;
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp32_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp33_ = _tmp32_;
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp34_ = photo_get_file_format (_tmp33_);
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				direct_photo_page_save (self, _tmp31_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp34_, FALSE, TRUE);
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (_tmp33_);
-#line 314 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_object_unref0 (_tmp31_);
-#line 2642 "DirectPhotoPage.c"
+#line 2716 "DirectPhotoPage.c"
 			} else {
-#line 317 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 329 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				direct_photo_page_on_save_as (self);
-#line 2646 "DirectPhotoPage.c"
+#line 2720 "DirectPhotoPage.c"
 			}
 		} else {
 			gboolean _tmp35_ = FALSE;
 			gboolean _tmp36_ = FALSE;
 			GtkResponseType _tmp37_ = 0;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp37_ = response;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp37_ == GTK_RESPONSE_CANCEL) {
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp36_ = TRUE;
-#line 2658 "DirectPhotoPage.c"
+#line 2732 "DirectPhotoPage.c"
 			} else {
 				GtkResponseType _tmp38_ = 0;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp38_ = response;
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp36_ = _tmp38_ == GTK_RESPONSE_DELETE_EVENT;
-#line 2665 "DirectPhotoPage.c"
+#line 2739 "DirectPhotoPage.c"
 			}
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp36_) {
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = TRUE;
-#line 2671 "DirectPhotoPage.c"
+#line 2745 "DirectPhotoPage.c"
 			} else {
 				GtkResponseType _tmp39_ = 0;
-#line 319 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp39_ = response;
-#line 319 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = _tmp39_ == GTK_RESPONSE_CLOSE;
-#line 2678 "DirectPhotoPage.c"
+#line 2752 "DirectPhotoPage.c"
 			}
-#line 318 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			if (_tmp35_) {
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				result = FALSE;
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (save_option);
-#line 320 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 332 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				return result;
-#line 2688 "DirectPhotoPage.c"
+#line 2762 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = TRUE;
-#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (save_option);
-#line 323 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 335 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2698 "DirectPhotoPage.c"
+#line 2772 "DirectPhotoPage.c"
 }
 
 
@@ -2704,23 +2778,23 @@ gboolean direct_photo_page_check_quit (DirectPhotoPage* self) {
 	Photo* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-#line 326 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DIRECT_PHOTO_PAGE (self), FALSE);
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = direct_photo_page_check_ok_to_close_photo (self, _tmp1_);
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp3_;
-#line 327 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2724 "DirectPhotoPage.c"
+#line 2798 "DirectPhotoPage.c"
 }
 
 
@@ -2729,36 +2803,36 @@ static gboolean direct_photo_page_real_confirm_replace_photo (EditingHostPage* b
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	Photo* _tmp1_ = NULL;
-#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail ((old_photo == NULL) || IS_PHOTO (old_photo), FALSE);
-#line 330 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 342 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (new_photo), FALSE);
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = old_photo;
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 2743 "DirectPhotoPage.c"
+#line 2817 "DirectPhotoPage.c"
 		Photo* _tmp2_ = NULL;
 		gboolean _tmp3_ = FALSE;
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp2_ = old_photo;
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = direct_photo_page_check_ok_to_close_photo (self, _tmp2_);
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = _tmp3_;
-#line 2752 "DirectPhotoPage.c"
+#line 2826 "DirectPhotoPage.c"
 	} else {
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 2756 "DirectPhotoPage.c"
+#line 2830 "DirectPhotoPage.c"
 	}
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp0_;
-#line 331 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 343 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 2762 "DirectPhotoPage.c"
+#line 2836 "DirectPhotoPage.c"
 }
 
 
@@ -2773,29 +2847,29 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 	DirectPhoto* _tmp21_ = NULL;
 	gchar* _tmp22_ = NULL;
 	gchar* _tmp23_ = NULL;
-	DirectView* tmp_view = NULL;
-	DirectPhoto* _tmp24_ = NULL;
-	DirectView* _tmp25_ = NULL;
-	DirectViewCollection* _tmp26_ = NULL;
-	DirectView* _tmp27_ = NULL;
-	DirectPhotoSourceCollection* _tmp28_ = NULL;
-	DirectPhoto* _tmp29_ = NULL;
-	DirectViewCollection* _tmp30_ = NULL;
-	DirectPhoto* _tmp31_ = NULL;
+	Photo* _tmp24_ = NULL;
+	Photo* _tmp25_ = NULL;
+	DirectPhoto* _tmp26_ = NULL;
+	gboolean _tmp27_ = FALSE;
+	gboolean _tmp28_ = FALSE;
+	DirectPhotoSourceCollection* _tmp33_ = NULL;
+	DirectPhoto* _tmp34_ = NULL;
+	DirectViewCollection* _tmp35_ = NULL;
+	DirectPhoto* _tmp36_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (G_IS_FILE (dest));
-#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = constraint;
-#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = scale;
-#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scaling_for_constraint (_tmp0_, _tmp1_, FALSE, &_tmp2_);
-#line 336 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 348 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scaling = _tmp2_;
-#line 2799 "DirectPhotoPage.c"
+#line 2873 "DirectPhotoPage.c"
 	{
 		Photo* _tmp3_ = NULL;
 		Photo* _tmp4_ = NULL;
@@ -2805,34 +2879,34 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		PhotoFileFormat _tmp8_ = 0;
 		gboolean _tmp9_ = FALSE;
 		gboolean _tmp10_ = FALSE;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = _tmp3_;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = dest;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = scaling;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = quality;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = format;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = copy_unmodified;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = save_metadata;
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		photo_export (_tmp4_, _tmp5_, &_tmp6_, _tmp7_, _tmp8_, _tmp9_, _tmp10_, &_inner_error_);
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 339 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2831 "DirectPhotoPage.c"
-			goto __catch47_g_error;
+#line 2905 "DirectPhotoPage.c"
+			goto __catch48_g_error;
 		}
 	}
-	goto __finally47;
-	__catch47_g_error:
+	goto __finally48;
+	__catch48_g_error:
 	{
 		GError* err = NULL;
 		const gchar* _tmp11_ = NULL;
@@ -2843,92 +2917,114 @@ static void direct_photo_page_save (DirectPhotoPage* self, GFile* dest, gint sca
 		const gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
 		gchar* _tmp18_ = NULL;
-#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		err = _inner_error_;
-#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_inner_error_ = NULL;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp11_ = _ ("Error while saving to %s: %s");
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp12_ = dest;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp13_ = g_file_get_path (_tmp12_);
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp14_ = _tmp13_;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp15_ = err;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp16_ = _tmp15_->message;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp17_ = g_strdup_printf (_tmp11_, _tmp14_, _tmp16_);
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp18_ = _tmp17_;
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		app_window_error_message (_tmp18_, NULL);
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp18_);
-#line 341 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 353 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp14_);
-#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_error_free0 (err);
-#line 344 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 356 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 2877 "DirectPhotoPage.c"
+#line 2951 "DirectPhotoPage.c"
 	}
-	__finally47:
-#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	__finally48:
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_clear_error (&_inner_error_);
-#line 338 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 350 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 2888 "DirectPhotoPage.c"
+#line 2962 "DirectPhotoPage.c"
 	}
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = direct_photo_global;
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp20_ = dest;
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = direct_photo_source_collection_fetch (_tmp19_, _tmp20_, &_tmp21_, TRUE);
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	photo = _tmp21_;
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = _tmp22_;
-#line 349 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp23_);
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp24_ = photo;
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp25_ = direct_view_new (_tmp24_);
-#line 351 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	tmp_view = _tmp25_;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp26_ = self->priv->view_controller;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp27_ = tmp_view;
-#line 352 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_OBJECT, DataObject));
-#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp28_ = direct_photo_global;
-#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp29_ = photo;
-#line 354 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	direct_photo_source_collection_reimport_photo (_tmp28_, _tmp29_);
-#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp30_ = self->priv->view_controller;
-#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_tmp31_ = photo;
-#line 355 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_PHOTO, Photo));
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
-	_g_object_unref0 (tmp_view);
-#line 334 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp24_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp25_ = _tmp24_;
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp26_ = photo;
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp27_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_SOURCE, DataSource));
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp28_ = !_tmp27_;
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_g_object_unref0 (_tmp25_);
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	if (_tmp28_) {
+#line 2992 "DirectPhotoPage.c"
+		DirectView* tmp_view = NULL;
+		DirectPhoto* _tmp29_ = NULL;
+		DirectView* _tmp30_ = NULL;
+		DirectViewCollection* _tmp31_ = NULL;
+		DirectView* _tmp32_ = NULL;
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp29_ = photo;
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp30_ = direct_view_new (_tmp29_);
+#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		tmp_view = _tmp30_;
+#line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp31_ = self->priv->view_controller;
+#line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_tmp32_ = tmp_view;
+#line 365 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		data_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
+#line 363 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+		_g_object_unref0 (tmp_view);
+#line 3012 "DirectPhotoPage.c"
+	}
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp33_ = direct_photo_global;
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp34_ = photo;
+#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	direct_photo_source_collection_reimport_photo (_tmp33_, _tmp34_);
+#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp35_ = self->priv->view_controller;
+#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_tmp36_ = photo;
+#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	editing_host_page_display_mirror_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_VIEW_COLLECTION, ViewCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_PHOTO, Photo));
+#line 346 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 2932 "DirectPhotoPage.c"
+#line 3028 "DirectPhotoPage.c"
 }
 
 
@@ -2946,84 +3042,84 @@ static void direct_photo_page_on_save (DirectPhotoPage* self) {
 	Photo* _tmp15_ = NULL;
 	Photo* _tmp16_ = NULL;
 	PhotoFileFormat _tmp17_ = 0;
-#line 358 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 372 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp4_ = photo_has_alterations (_tmp3_);
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = !_tmp4_;
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_) {
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 2966 "DirectPhotoPage.c"
+#line 3062 "DirectPhotoPage.c"
 	} else {
 		Photo* _tmp6_ = NULL;
 		Photo* _tmp7_ = NULL;
 		PhotoFileFormat _tmp8_ = 0;
 		gboolean _tmp9_ = FALSE;
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = photo_get_file_format (_tmp7_);
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = photo_file_format_can_write (_tmp8_);
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = !_tmp9_;
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 2984 "DirectPhotoPage.c"
+#line 3080 "DirectPhotoPage.c"
 	}
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp1_) {
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 2990 "DirectPhotoPage.c"
+#line 3086 "DirectPhotoPage.c"
 	} else {
 		gboolean _tmp10_ = FALSE;
-#line 360 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp10_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 360 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp0_ = _tmp10_;
-#line 2997 "DirectPhotoPage.c"
+#line 3093 "DirectPhotoPage.c"
 	}
-#line 359 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 361 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 3003 "DirectPhotoPage.c"
+#line 3099 "DirectPhotoPage.c"
 	}
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp12_ = _tmp11_;
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = _tmp13_;
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = photo_get_file_format (_tmp16_);
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_photo_page_save (self, _tmp14_, 0, SCALE_CONSTRAINT_ORIGINAL, JPEG_QUALITY_HIGH, _tmp17_, FALSE, TRUE);
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp16_);
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp14_);
-#line 364 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 3027 "DirectPhotoPage.c"
+#line 3123 "DirectPhotoPage.c"
 }
 
 
@@ -3088,114 +3184,114 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 	gint _tmp54_ = 0;
 	gint _tmp55_ = 0;
 	GtkFileChooserDialog* _tmp74_ = NULL;
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = _ ("Save As");
-#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = export_dialog_new (_tmp0_);
-#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp1_);
-#line 369 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_dialog = _tmp1_;
-#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_format_parameters_last (&_tmp2_);
-#line 373 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	export_params = _tmp2_;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = export_dialog;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp6_ = export_dialog_execute (_tmp3_, &_tmp4_, &_tmp5_, &export_params);
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	scale = _tmp4_;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	constraint = _tmp5_;
-#line 374 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 388 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (!_tmp6_) {
-#line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (export_dialog);
-#line 375 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 389 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		return;
-#line 3120 "DirectPhotoPage.c"
+#line 3216 "DirectPhotoPage.c"
 	}
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp8_ = _tmp7_;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp9_ = export_params;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp10_ = photo_get_export_basename_for_parameters (_tmp8_, &_tmp9_);
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp11_ = _tmp10_;
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp8_);
-#line 377 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 391 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	filename = _tmp11_;
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp13_ = _tmp12_;
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp14_ = export_params;
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp15_ = photo_get_export_format_for_parameters (_tmp13_, &_tmp14_);
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp16_ = _tmp15_;
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp13_);
-#line 378 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 392 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	effective_export_format = _tmp16_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp17_ = effective_export_format;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp18_ = photo_file_format_get_properties (_tmp17_);
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp19_ = _tmp18_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp21_ = photo_file_format_properties_get_known_extensions (_tmp19_, &_tmp20_);
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22_ = _tmp21_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp22__length1 = _tmp20_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_photo_file_format_properties_unref0 (_tmp19_);
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_extensions = _tmp22_;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_extensions_length1 = _tmp22__length1;
-#line 381 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_output_format_extensions_size_ = output_format_extensions_length1;
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp23_ = gtk_file_filter_new ();
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp23_);
-#line 383 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_filter = _tmp23_;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24_ = output_format_extensions;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp24__length1 = output_format_extensions_length1;
-#line 3180 "DirectPhotoPage.c"
+#line 3276 "DirectPhotoPage.c"
 	{
 		gchar** extension_collection = NULL;
 		gint extension_collection_length1 = 0;
 		gint _extension_collection_size_ = 0;
 		gint extension_it = 0;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		extension_collection = _tmp24_;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		extension_collection_length1 = _tmp24__length1;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		for (extension_it = 0; extension_it < _tmp24__length1; extension_it = extension_it + 1) {
-#line 3192 "DirectPhotoPage.c"
+#line 3288 "DirectPhotoPage.c"
 			gchar* _tmp25_ = NULL;
 			gchar* extension = NULL;
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			_tmp25_ = g_strdup (extension_collection[extension_it]);
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 			extension = _tmp25_;
-#line 3199 "DirectPhotoPage.c"
+#line 3295 "DirectPhotoPage.c"
 			{
 				gchar* uppercase_extension = NULL;
 				const gchar* _tmp26_ = NULL;
@@ -3208,109 +3304,109 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 				const gchar* _tmp33_ = NULL;
 				gchar* _tmp34_ = NULL;
 				gchar* _tmp35_ = NULL;
-#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp26_ = extension;
-#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp27_ = g_utf8_strup (_tmp26_, (gssize) -1);
-#line 385 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 399 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				uppercase_extension = _tmp27_;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp28_ = output_format_filter;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp29_ = extension;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp30_ = g_strconcat ("*.", _tmp29_, NULL);
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp31_ = _tmp30_;
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				gtk_file_filter_add_pattern (_tmp28_, _tmp31_);
-#line 386 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp31_);
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp32_ = output_format_filter;
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp33_ = uppercase_extension;
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp34_ = g_strconcat ("*.", _tmp33_, NULL);
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_tmp35_ = _tmp34_;
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				gtk_file_filter_add_pattern (_tmp32_, _tmp35_);
-#line 387 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (_tmp35_);
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (uppercase_extension);
-#line 384 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				_g_free0 (extension);
-#line 3246 "DirectPhotoPage.c"
+#line 3342 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp36_ = _ ("Save As");
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp37_ = app_window_get_instance ();
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp38_ = _tmp37_;
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp39_ = (GtkFileChooserDialog*) gtk_file_chooser_dialog_new (_tmp36_, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_window_get_type (), GtkWindow), GTK_FILE_CHOOSER_ACTION_SAVE, RESOURCES_CANCEL_LABEL, GTK_RESPONSE_CANCEL, RESOURCES_OK_LABEL, GTK_RESPONSE_OK, NULL);
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_object_ref_sink (_tmp39_);
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp40_ = _tmp39_;
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (_tmp38_);
-#line 390 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	save_as_dialog = _tmp40_;
-#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp41_ = save_as_dialog;
-#line 393 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 407 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_select_multiple (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp42_ = save_as_dialog;
-#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp43_ = filename;
-#line 394 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_current_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp43_);
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp44_ = save_as_dialog;
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp45_ = self->priv->current_save_dir;
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp46_ = g_file_get_path (_tmp45_);
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp47_ = _tmp46_;
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp47_);
-#line 395 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 409 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (_tmp47_);
-#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp48_ = save_as_dialog;
-#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp49_ = output_format_filter;
-#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp50_ = _g_object_ref0 (_tmp49_);
-#line 396 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_add_filter (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), _tmp50_);
-#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp51_ = save_as_dialog;
-#line 397 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 411 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_do_overwrite_confirmation (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), TRUE);
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp52_ = save_as_dialog;
-#line 398 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 412 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_file_chooser_set_local_only (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser), FALSE);
-#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp53_ = save_as_dialog;
-#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp54_ = gtk_dialog_run (G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, gtk_dialog_get_type (), GtkDialog));
-#line 400 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 414 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	response = _tmp54_;
-#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp55_ = response;
-#line 401 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 415 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp55_ == ((gint) GTK_RESPONSE_OK)) {
-#line 3314 "DirectPhotoPage.c"
+#line 3410 "DirectPhotoPage.c"
 		GtkFileChooserDialog* _tmp56_ = NULL;
 		gchar* _tmp57_ = NULL;
 		gchar* _tmp58_ = NULL;
@@ -3329,106 +3425,106 @@ static void direct_photo_page_on_save_as (DirectPhotoPage* self) {
 		gchar* _tmp71_ = NULL;
 		gchar* _tmp72_ = NULL;
 		GFile* _tmp73_ = NULL;
-#line 404 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->drop_if_dirty = TRUE;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp56_ = save_as_dialog;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp57_ = gtk_file_chooser_get_uri (G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp58_ = _tmp57_;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp59_ = g_file_new_for_uri (_tmp58_);
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp60_ = _tmp59_;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp61_ = scale;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp62_ = constraint;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp63_ = export_params;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp64_ = _tmp63_.quality;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp65_ = effective_export_format;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp66_ = export_params;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp67_ = _tmp66_.mode;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp68_ = export_params;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp69_ = _tmp68_.export_metadata;
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		direct_photo_page_save (self, _tmp60_, _tmp61_, _tmp62_, _tmp64_, _tmp65_, _tmp67_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp69_);
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp60_);
-#line 405 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 419 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp58_);
-#line 408 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 422 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->drop_if_dirty = FALSE;
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp70_ = save_as_dialog;
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp71_ = gtk_file_chooser_get_current_folder (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, GTK_TYPE_FILE_CHOOSER, GtkFileChooser));
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp72_ = _tmp71_;
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp73_ = g_file_new_for_path (_tmp72_);
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (self->priv->current_save_dir);
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self->priv->current_save_dir = _tmp73_;
-#line 410 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_free0 (_tmp72_);
-#line 3385 "DirectPhotoPage.c"
+#line 3481 "DirectPhotoPage.c"
 	}
-#line 413 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp74_ = save_as_dialog;
-#line 413 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_widget_get_type (), GtkWidget));
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (save_as_dialog);
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (output_format_filter);
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	output_format_extensions = (_vala_array_free (output_format_extensions, output_format_extensions_length1, (GDestroyNotify) g_free), NULL);
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_free0 (filename);
-#line 368 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 382 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 3401 "DirectPhotoPage.c"
+#line 3497 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_send_to (DirectPhotoPage* self) {
 	gboolean _tmp0_ = FALSE;
-#line 416 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 430 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 417 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp0_) {
-#line 3413 "DirectPhotoPage.c"
+#line 3509 "DirectPhotoPage.c"
 		ViewCollection* _tmp1_ = NULL;
 		ViewCollection* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
 		GeeCollection* _tmp4_ = NULL;
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp2_ = _tmp1_;
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp3_ = view_collection_get_selected_sources (_tmp2_);
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		desktop_integration_send_to (_tmp4_);
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 418 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 432 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_data_collection_unref0 (_tmp2_);
-#line 3432 "DirectPhotoPage.c"
+#line 3528 "DirectPhotoPage.c"
 	}
 }
 
@@ -3442,93 +3538,93 @@ static gboolean direct_photo_page_real_on_app_key_pressed (Page* base, GdkEventK
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 3450 "DirectPhotoPage.c"
+#line 3546 "DirectPhotoPage.c"
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-#line 421 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 421 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 422 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 436 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	handled = TRUE;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = event;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_;
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("bracketright")))) {
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3473 "DirectPhotoPage.c"
+#line 3569 "DirectPhotoPage.c"
 			default:
 			{
-#line 426 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 440 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 427 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3480 "DirectPhotoPage.c"
+#line 3576 "DirectPhotoPage.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("bracketleft")))) {
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3486 "DirectPhotoPage.c"
+#line 3582 "DirectPhotoPage.c"
 			default:
 			{
-#line 430 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 444 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
-#line 431 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 445 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3493 "DirectPhotoPage.c"
+#line 3589 "DirectPhotoPage.c"
 			}
 		}
 	} else {
-#line 424 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		switch (0) {
-#line 3499 "DirectPhotoPage.c"
+#line 3595 "DirectPhotoPage.c"
 			default:
 			{
-#line 434 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				handled = FALSE;
-#line 435 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 449 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 				break;
-#line 3506 "DirectPhotoPage.c"
+#line 3602 "DirectPhotoPage.c"
 			}
 		}
 	}
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp7_ = handled;
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp7_) {
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = TRUE;
-#line 3516 "DirectPhotoPage.c"
+#line 3612 "DirectPhotoPage.c"
 	} else {
 		GdkEventKey* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = event;
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = PAGE_CLASS (direct_photo_page_parent_class)->on_app_key_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp8_);
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = _tmp9_;
-#line 3526 "DirectPhotoPage.c"
+#line 3622 "DirectPhotoPage.c"
 	}
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = _tmp6_;
-#line 438 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3532 "DirectPhotoPage.c"
+#line 3628 "DirectPhotoPage.c"
 }
 
 
@@ -3537,75 +3633,75 @@ static void direct_photo_page_on_print (DirectPhotoPage* self) {
 	ViewCollection* _tmp1_ = NULL;
 	gint _tmp2_ = 0;
 	gboolean _tmp3_ = FALSE;
-#line 441 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = _tmp0_;
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp3_ = _tmp2_ > 0;
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
-#line 442 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 456 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (_tmp3_) {
-#line 3555 "DirectPhotoPage.c"
+#line 3651 "DirectPhotoPage.c"
 		PrintManager* _tmp4_ = NULL;
 		PrintManager* _tmp5_ = NULL;
 		ViewCollection* _tmp6_ = NULL;
 		ViewCollection* _tmp7_ = NULL;
 		GeeList* _tmp8_ = NULL;
 		GeeCollection* _tmp9_ = NULL;
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp4_ = print_manager_get_instance ();
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp5_ = _tmp4_;
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp7_ = _tmp6_;
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		print_manager_spool_photo (_tmp5_, _tmp9_);
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (_tmp9_);
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_data_collection_unref0 (_tmp7_);
-#line 443 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 457 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_print_manager_unref0 (_tmp5_);
-#line 3582 "DirectPhotoPage.c"
+#line 3678 "DirectPhotoPage.c"
 	}
 }
 
 
 static Block6Data* block6_data_ref (Block6Data* _data6_) {
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_atomic_int_inc (&_data6_->_ref_count_);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return _data6_;
-#line 3592 "DirectPhotoPage.c"
+#line 3688 "DirectPhotoPage.c"
 }
 
 
 static void block6_data_unref (void * _userdata_) {
 	Block6Data* _data6_;
 	_data6_ = (Block6Data*) _userdata_;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) {
-#line 3601 "DirectPhotoPage.c"
+#line 3697 "DirectPhotoPage.c"
 		DirectPhotoPage* self;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		self = _data6_->self;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		_g_object_unref0 (self);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 		g_slice_free (Block6Data, _data6_);
-#line 3609 "DirectPhotoPage.c"
+#line 3705 "DirectPhotoPage.c"
 	}
 }
 
@@ -3614,51 +3710,51 @@ static gboolean __lambda15_ (Block6Data* _data6_) {
 	DirectPhotoPage* self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = _data6_->self;
-#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = _data6_->should_allow_rotation;
-#line 453 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 467 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	editing_host_page_enable_rotate (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_);
-#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = FALSE;
-#line 455 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3628 "DirectPhotoPage.c"
+#line 3724 "DirectPhotoPage.c"
 }
 
 
 static gboolean ___lambda15__gsource_func (gpointer self) {
 	gboolean result;
 	result = __lambda15_ (self);
-#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3637 "DirectPhotoPage.c"
+#line 3733 "DirectPhotoPage.c"
 }
 
 
 static void direct_photo_page_on_dphoto_can_rotate_changed (DirectPhotoPage* self, gboolean should_allow_rotation) {
 	Block6Data* _data6_;
 	gboolean _tmp0_ = FALSE;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (IS_DIRECT_PHOTO_PAGE (self));
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_ = g_slice_new0 (Block6Data);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->_ref_count_ = 1;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->self = g_object_ref (self);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = should_allow_rotation;
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_->should_allow_rotation = _tmp0_;
-#line 452 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, ___lambda15__gsource_func, block6_data_ref (_data6_), block6_data_unref);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	block6_data_unref (_data6_);
-#line 448 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 462 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_data6_ = NULL;
-#line 3662 "DirectPhotoPage.c"
+#line 3758 "DirectPhotoPage.c"
 }
 
 
@@ -3667,19 +3763,19 @@ static DataView* direct_photo_page_real_create_photo_view (EditingHostPage* base
 	DataView* result = NULL;
 	DataSource* _tmp0_ = NULL;
 	DirectView* _tmp1_ = NULL;
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_PHOTO_PAGE, DirectPhotoPage);
-#line 459 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 473 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
-#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = source;
-#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp1_ = direct_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DIRECT_PHOTO, DirectPhoto));
-#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
-#line 460 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 474 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return result;
-#line 3683 "DirectPhotoPage.c"
+#line 3779 "DirectPhotoPage.c"
 }
 
 
@@ -3720,7 +3816,7 @@ static void direct_photo_page_class_init (DirectPhotoPageClass * klass) {
 	((EditingHostPageClass *) klass)->create_photo_view = direct_photo_page_real_create_photo_view;
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = direct_photo_page_finalize;
-#line 3724 "DirectPhotoPage.c"
+#line 3820 "DirectPhotoPage.c"
 }
 
 
@@ -3731,7 +3827,7 @@ static void direct_photo_page_instance_init (DirectPhotoPage * self) {
 	self->priv->view_controller = NULL;
 #line 11 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self->priv->drop_if_dirty = FALSE;
-#line 3735 "DirectPhotoPage.c"
+#line 3831 "DirectPhotoPage.c"
 }
 
 
@@ -3753,9 +3849,11 @@ static void direct_photo_page_finalize (GObject* obj) {
 	_data_collection_unref0 (self->priv->view_controller);
 #line 10 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_g_object_unref0 (self->priv->current_save_dir);
+#line 154 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+	_g_object_unref0 (self->priv->context_menu);
 #line 7 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	G_OBJECT_CLASS (direct_photo_page_parent_class)->finalize (obj);
-#line 3759 "DirectPhotoPage.c"
+#line 3857 "DirectPhotoPage.c"
 }
 
 
@@ -3774,46 +3872,46 @@ GType direct_photo_page_get_type (void) {
 DirectFullscreenPhotoPage* direct_fullscreen_photo_page_construct (GType object_type, GFile* file) {
 	DirectFullscreenPhotoPage * self = NULL;
 	GFile* _tmp0_ = NULL;
-#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_val_if_fail (G_IS_FILE (file), NULL);
-#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = file;
-#line 466 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 480 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = (DirectFullscreenPhotoPage*) direct_photo_page_construct (object_type, _tmp0_);
-#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return self;
-#line 3786 "DirectPhotoPage.c"
+#line 3884 "DirectPhotoPage.c"
 }
 
 
 DirectFullscreenPhotoPage* direct_fullscreen_photo_page_new (GFile* file) {
-#line 465 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 479 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	return direct_fullscreen_photo_page_construct (TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, file);
-#line 3793 "DirectPhotoPage.c"
+#line 3891 "DirectPhotoPage.c"
 }
 
 
 static void direct_fullscreen_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
 	DirectFullscreenPhotoPage * self;
 	GeeList* _tmp0_ = NULL;
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_DIRECT_FULLSCREEN_PHOTO_PAGE, DirectFullscreenPhotoPage);
-#line 469 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 483 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
-#line 472 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	_tmp0_ = ui_filenames;
-#line 472 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 486 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_COLLECTION, GeeCollection), "direct_context.ui");
-#line 3808 "DirectPhotoPage.c"
+#line 3906 "DirectPhotoPage.c"
 }
 
 
 static void direct_fullscreen_photo_page_class_init (DirectFullscreenPhotoPageClass * klass) {
-#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	direct_fullscreen_photo_page_parent_class = g_type_class_peek_parent (klass);
-#line 464 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
+#line 478 "/home/jens/Source/shotwell/src/direct/DirectPhotoPage.vala"
 	((PageClass *) klass)->init_collect_ui_filenames = direct_fullscreen_photo_page_real_init_collect_ui_filenames;
-#line 3817 "DirectPhotoPage.c"
+#line 3915 "DirectPhotoPage.c"
 }
 
 
diff --git a/src/direct/DirectPhotoPage.vala b/src/direct/DirectPhotoPage.vala
index a48f9e0..14b54bc 100644
--- a/src/direct/DirectPhotoPage.vala
+++ b/src/direct/DirectPhotoPage.vala
@@ -146,12 +146,24 @@ public class DirectPhotoPage : EditingHostPage {
     }
 
     protected override bool on_context_buttonpress(Gdk.EventButton event) {
-//        Gtk.Menu context_menu = (Gtk.Menu) ui.get_widget("/DirectContextMenu");
-//        popup_context_menu(context_menu, event);
+        popup_context_menu(get_context_menu(), event);
 
         return true;
     }
 
+    private Gtk.Menu context_menu;
+
+    private Gtk.Menu get_context_menu() {
+        if (context_menu == null) {
+            var model = this.builder.get_object ("DirectContextMenu")
+                as GLib.MenuModel;
+            context_menu = new Gtk.Menu.from_model (model);
+            context_menu.attach_to_widget (this, null);
+        }
+
+        return this.context_menu;
+    }
+
     private void update_zoom_menu_item_sensitivity() {
         set_action_sensitive("IncreaseSize", !get_zoom_state().is_max() && !get_photo_missing());
         set_action_sensitive("DecreaseSize", !get_zoom_state().is_default() && !get_photo_missing());
@@ -348,8 +360,10 @@ public class DirectPhotoPage : EditingHostPage {
         DirectPhoto photo;
         DirectPhoto.global.fetch(dest, out photo, true);
 
-        DirectView tmp_view = new DirectView(photo);
-        view_controller.add(tmp_view);
+        if (!get_photo().equals(photo)) {
+            DirectView tmp_view = new DirectView(photo);
+            view_controller.add(tmp_view);
+        }
 
         DirectPhoto.global.reimport_photo(photo);
         display_mirror_of(view_controller, photo);
diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index d1fe68f..b9d37d7 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -12676,7 +12676,7 @@ static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_win
 #line 677 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_combo_box_set_active (_tmp12_, 0);
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = (GtkImage*) gtk_image_new_from_resource ("/org/gnome/Shotwell/crop-pivot-reticle.png");
+	_tmp13_ = (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"
 	g_object_ref_sink (_tmp13_);
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
diff --git a/src/editing_tools/EditingTools.vala b/src/editing_tools/EditingTools.vala
index c3c79f6..d160f23 100644
--- a/src/editing_tools/EditingTools.vala
+++ b/src/editing_tools/EditingTools.vala
@@ -676,7 +676,7 @@ public class CropTool : EditingTool {
             constraint_combo.set_row_separator_func(constraint_combo_separator_func);
             constraint_combo.set_active(0);
 
-            var image = new Gtk.Image.from_resource ("/org/gnome/Shotwell/crop-pivot-reticle.png");
+            var image = new Gtk.Image.from_icon_name("crop-pivot-reticle", Gtk.IconSize.LARGE_TOOLBAR);
             pivot_reticle_button.set_image (image);
             pivot_reticle_button.set_tooltip_text(_("Pivot the crop rectangle between portrait and landscape orientations"));
 
diff --git a/src/events/EventDirectoryItem.c b/src/events/EventDirectoryItem.c
index b50047a..4f1606c 100644
--- a/src/events/EventDirectoryItem.c
+++ b/src/events/EventDirectoryItem.c
@@ -1155,7 +1155,7 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 #line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1158 "EventDirectoryItem.c"
-			goto __catch51_g_error;
+			goto __catch52_g_error;
 		}
 #line 107 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp1_);
@@ -1163,8 +1163,8 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 		_g_object_unref0 (_tmp1_);
 #line 1165 "EventDirectoryItem.c"
 	}
-	goto __finally51;
-	__catch51_g_error:
+	goto __finally52;
+	__catch52_g_error:
 	{
 		GError* err = NULL;
 		Event* _tmp8_ = NULL;
@@ -1194,7 +1194,7 @@ static void event_directory_item_real_exposed (CheckerboardItem* base) {
 		_g_error_free0 (err);
 #line 1196 "EventDirectoryItem.c"
 	}
-	__finally51:
+	__finally52:
 #line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 106 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
@@ -1321,7 +1321,7 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1324 "EventDirectoryItem.c"
-				goto __catch52_g_error;
+				goto __catch53_g_error;
 			}
 #line 140 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 			checkerboard_item_set_image (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_CHECKERBOARD_ITEM, CheckerboardItem), _tmp5_);
@@ -1329,8 +1329,8 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 			_g_object_unref0 (_tmp5_);
 #line 1331 "EventDirectoryItem.c"
 		}
-		goto __finally52;
-		__catch52_g_error:
+		goto __finally53;
+		__catch53_g_error:
 		{
 			GError* err = NULL;
 			Event* _tmp9_ = NULL;
@@ -1360,7 +1360,7 @@ static void event_directory_item_real_thumbnail_altered (ThumbnailView* base) {
 			_g_error_free0 (err);
 #line 1362 "EventDirectoryItem.c"
 		}
-		__finally52:
+		__finally53:
 #line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 139 "/home/jens/Source/shotwell/src/events/EventDirectoryItem.vala"
diff --git a/src/library/LibraryWindow.c b/src/library/LibraryWindow.c
index 07c30d7..e304171 100644
--- a/src/library/LibraryWindow.c
+++ b/src/library/LibraryWindow.c
@@ -6597,7 +6597,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 6599 "LibraryWindow.c"
-			goto __catch41_g_error;
+			goto __catch42_g_error;
 		}
 #line 957 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp12_ = _tmp9_;
@@ -6611,8 +6611,8 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_g_object_unref0 (_tmp9_);
 #line 6612 "LibraryWindow.c"
 	}
-	goto __finally41;
-	__catch41_g_error:
+	goto __finally42;
+	__catch42_g_error:
 	{
 		GError* err = NULL;
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -6623,7 +6623,7 @@ static void library_window_on_camera_added (LibraryWindow* self, DiscoveredCamer
 		_g_error_free0 (err);
 #line 6624 "LibraryWindow.c"
 	}
-	__finally41:
+	__finally42:
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 956 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
@@ -8747,7 +8747,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 8749 "LibraryWindow.c"
-				goto __catch43_g_regex_error;
+				goto __catch44_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -8772,7 +8772,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 8774 "LibraryWindow.c"
-				goto __catch43_g_regex_error;
+				goto __catch44_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -8798,8 +8798,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 8799 "LibraryWindow.c"
 	}
-	goto __finally43;
-	__catch43_g_regex_error:
+	goto __finally44;
+	__catch44_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8812,7 +8812,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 8813 "LibraryWindow.c"
 	}
-	__finally43:
+	__finally44:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -8886,7 +8886,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 8888 "LibraryWindow.c"
-			goto __catch42_g_error;
+			goto __catch43_g_error;
 		}
 #line 1414 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 		_tmp9_ = _tmp6_;
@@ -8900,8 +8900,8 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		_g_object_unref0 (_tmp6_);
 #line 8901 "LibraryWindow.c"
 	}
-	goto __finally42;
-	__catch42_g_error:
+	goto __finally43;
+	__catch43_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp10_ = NULL;
@@ -8926,7 +8926,7 @@ void library_window_mounted_camera_shell_notification (LibraryWindow* self, cons
 		return;
 #line 8927 "LibraryWindow.c"
 	}
-	__finally42:
+	__finally43:
 #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1413 "/home/jens/Source/shotwell/src/library/LibraryWindow.vala"
diff --git a/src/main.c b/src/main.c
index d549d88..0b93c0c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -506,7 +506,6 @@ ProgressDialog* progress_dialog_new (GtkWindow* owner, const gchar* text, GCance
 ProgressDialog* progress_dialog_construct (GType object_type, GtkWindow* owner, const gchar* text, GCancellable* cancellable);
 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);
-GFile* app_dirs_get_resources_dir (void);
 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);
 AggregateProgressMonitor* aggregate_progress_monitor_new (guint64 grand_total, ProgressMonitor wrapped_monitor, void* wrapped_monitor_target);
@@ -697,25 +696,25 @@ GType shotwell_command_get_type (void) {
 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 114 "/home/jens/Source/shotwell/src/main.vala"
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
 	return result;
-#line 703 "main.c"
+#line 702 "main.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 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 	return result;
-#line 712 "main.c"
+#line 711 "main.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 719 "main.c"
+#line 718 "main.c"
 }
 
 
@@ -741,55 +740,55 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	void* monitor_target = NULL;
 	GDestroyNotify monitor_target_destroy_notify = NULL;
 	gboolean _tmp39_ = FALSE;
-	AggregateProgressMonitor* _tmp79_ = NULL;
-	ProgressMonitor _tmp81_ = NULL;
-	void* _tmp81__target = NULL;
-	AggregateProgressMonitor* _tmp82_ = NULL;
-	ProgressMonitor _tmp84_ = NULL;
-	void* _tmp84__target = NULL;
-	AggregateProgressMonitor* _tmp85_ = NULL;
-	Upgrades* _tmp87_ = NULL;
-	Upgrades* _tmp88_ = NULL;
+	AggregateProgressMonitor* _tmp70_ = NULL;
+	ProgressMonitor _tmp72_ = NULL;
+	void* _tmp72__target = NULL;
+	AggregateProgressMonitor* _tmp73_ = NULL;
+	ProgressMonitor _tmp75_ = NULL;
+	void* _tmp75__target = NULL;
+	AggregateProgressMonitor* _tmp76_ = NULL;
+	Upgrades* _tmp78_ = NULL;
+	Upgrades* _tmp79_ = NULL;
 	MediaCollectionRegistry* registry = NULL;
-	MediaCollectionRegistry* _tmp89_ = NULL;
-	MediaCollectionRegistry* _tmp90_ = NULL;
-	LibraryPhotoSourceCollection* _tmp91_ = NULL;
-	MediaCollectionRegistry* _tmp92_ = NULL;
-	VideoSourceCollection* _tmp93_ = NULL;
-	AggregateProgressMonitor* _tmp94_ = NULL;
-	ProgressMonitor _tmp96_ = NULL;
-	void* _tmp96__target = NULL;
-	AggregateProgressMonitor* _tmp97_ = NULL;
-	ProgressMonitor _tmp99_ = NULL;
-	void* _tmp99__target = NULL;
-	Application* _tmp100_ = NULL;
-	Application* _tmp101_ = NULL;
-	AggregateProgressMonitor* _tmp102_ = NULL;
+	MediaCollectionRegistry* _tmp80_ = NULL;
+	MediaCollectionRegistry* _tmp81_ = NULL;
+	LibraryPhotoSourceCollection* _tmp82_ = NULL;
+	MediaCollectionRegistry* _tmp83_ = NULL;
+	VideoSourceCollection* _tmp84_ = NULL;
+	AggregateProgressMonitor* _tmp85_ = NULL;
+	ProgressMonitor _tmp87_ = NULL;
+	void* _tmp87__target = NULL;
+	AggregateProgressMonitor* _tmp88_ = NULL;
+	ProgressMonitor _tmp90_ = NULL;
+	void* _tmp90__target = NULL;
+	Application* _tmp91_ = NULL;
+	Application* _tmp92_ = NULL;
+	AggregateProgressMonitor* _tmp93_ = NULL;
 	LibraryWindow* library_window = NULL;
-	ProgressMonitor _tmp104_ = NULL;
-	void* _tmp104__target = NULL;
+	ProgressMonitor _tmp95_ = NULL;
+	void* _tmp95__target = NULL;
+	LibraryWindow* _tmp96_ = NULL;
+	AggregateProgressMonitor* _tmp97_ = NULL;
+	ProgressDialog* _tmp99_ = NULL;
+	gchar** _tmp101_ = NULL;
+	gint _tmp101__length1 = 0;
 	LibraryWindow* _tmp105_ = NULL;
-	AggregateProgressMonitor* _tmp106_ = NULL;
-	ProgressDialog* _tmp108_ = NULL;
-	gchar** _tmp110_ = NULL;
-	gint _tmp110__length1 = 0;
-	LibraryWindow* _tmp114_ = NULL;
 	WelcomeServiceEntry** selected_import_entries = NULL;
-	WelcomeServiceEntry** _tmp115_ = NULL;
+	WelcomeServiceEntry** _tmp106_ = NULL;
 	gint selected_import_entries_length1 = 0;
 	gint _selected_import_entries_size_ = 0;
-	gboolean _tmp116_ = FALSE;
-	ConfigFacade* _tmp117_ = NULL;
-	ConfigFacade* _tmp118_ = NULL;
-	gboolean _tmp119_ = FALSE;
-	gboolean _tmp120_ = FALSE;
-	WelcomeServiceEntry** _tmp134_ = NULL;
-	gint _tmp134__length1 = 0;
-	gboolean _tmp138_ = FALSE;
-	GTimer* _tmp139_ = NULL;
-	gdouble _tmp140_ = 0.0;
-	Application* _tmp141_ = NULL;
-	Application* _tmp142_ = NULL;
+	gboolean _tmp107_ = FALSE;
+	ConfigFacade* _tmp108_ = NULL;
+	ConfigFacade* _tmp109_ = NULL;
+	gboolean _tmp110_ = FALSE;
+	gboolean _tmp111_ = FALSE;
+	WelcomeServiceEntry** _tmp125_ = NULL;
+	gint _tmp125__length1 = 0;
+	gboolean _tmp129_ = FALSE;
+	GTimer* _tmp130_ = NULL;
+	gdouble _tmp131_ = 0.0;
+	Application* _tmp132_ = NULL;
+	Application* _tmp133_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 16 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = application_get_is_remote ();
@@ -799,7 +798,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 803 "main.c"
+#line 802 "main.c"
 		gchar** _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
 #line 25 "/home/jens/Source/shotwell/src/main.vala"
@@ -812,7 +811,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 816 "main.c"
+#line 815 "main.c"
 	}
 #line 31 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp3_ = app_dirs_get_data_subdir ("data", NULL);
@@ -828,18 +827,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 832 "main.c"
+#line 831 "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 838 "main.c"
-			goto __catch220_g_error;
+#line 837 "main.c"
+			goto __catch221_g_error;
 		}
 	}
-	goto __finally220;
-	__catch220_g_error:
+	goto __finally221;
+	__catch221_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -858,9 +857,9 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		_g_error_free0 (err);
 #line 39 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 862 "main.c"
+#line 861 "main.c"
 	}
-	__finally220:
+	__finally221:
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 34 "/home/jens/Source/shotwell/src/main.vala"
@@ -869,7 +868,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 873 "main.c"
+#line 872 "main.c"
 	}
 #line 43 "/home/jens/Source/shotwell/src/main.vala"
 	g_message ("main.vala:43: Verifying database…");
@@ -891,15 +890,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 895 "main.c"
+#line 894 "main.c"
 		{
 #line 51 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 899 "main.c"
+#line 898 "main.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_FUTURE_VERSION:
-#line 903 "main.c"
+#line 902 "main.c"
 		{
 			const gchar* _tmp13_ = NULL;
 			const gchar* _tmp14_ = NULL;
@@ -921,11 +920,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			errormsg = _tmp16_;
 #line 56 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 923 "main.c"
+#line 922 "main.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_UPGRADE_ERROR:
-#line 927 "main.c"
+#line 926 "main.c"
 		{
 			const gchar* _tmp17_ = NULL;
 			const gchar* _tmp18_ = NULL;
@@ -947,11 +946,11 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			errormsg = _tmp20_;
 #line 62 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 947 "main.c"
+#line 946 "main.c"
 		}
 #line 48 "/home/jens/Source/shotwell/src/main.vala"
 		case DB_VERIFY_RESULT_NO_UPGRADE_AVAILABLE:
-#line 951 "main.c"
+#line 950 "main.c"
 		{
 			const gchar* _tmp21_ = NULL;
 			const gchar* _tmp22_ = NULL;
@@ -990,7 +989,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			_g_object_unref0 (_tmp25_);
 #line 68 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 987 "main.c"
+#line 986 "main.c"
 		}
 		default:
 		{
@@ -1012,14 +1011,14 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			errormsg = _tmp32_;
 #line 73 "/home/jens/Source/shotwell/src/main.vala"
 			break;
-#line 1009 "main.c"
+#line 1008 "main.c"
 		}
 	}
 #line 76 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp33_ = errormsg;
 #line 76 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp33_ != NULL) {
-#line 1016 "main.c"
+#line 1015 "main.c"
 		GtkMessageDialog* dialog = NULL;
 		const gchar* _tmp34_ = NULL;
 		GtkMessageDialog* _tmp35_ = NULL;
@@ -1056,7 +1055,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		_g_free0 (errormsg);
 #line 85 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1053 "main.c"
+#line 1052 "main.c"
 	}
 #line 88 "/home/jens/Source/shotwell/src/main.vala"
 	upgrades_init ();
@@ -1074,7 +1073,7 @@ void library_exec (gchar** mounts, int mounts_length1) {
 	_tmp39_ = commandline_options_no_startup_progress;
 #line 94 "/home/jens/Source/shotwell/src/main.vala"
 	if (!_tmp39_) {
-#line 1071 "main.c"
+#line 1070 "main.c"
 		guint64 grand_total = 0ULL;
 		PhotoTable* _tmp40_ = NULL;
 		PhotoTable* _tmp41_ = NULL;
@@ -1141,15 +1140,15 @@ void library_exec (gchar** mounts, int mounts_length1) {
 		_tmp56_ = grand_total;
 #line 103 "/home/jens/Source/shotwell/src/main.vala"
 		if (_tmp56_ > ((guint64) 5000)) {
-#line 1138 "main.c"
+#line 1137 "main.c"
 			const gchar* _tmp57_ = NULL;
 			ProgressDialog* _tmp58_ = NULL;
 			ProgressDialog* _tmp59_ = NULL;
 			ProgressDialog* _tmp60_ = NULL;
-			guint64 _tmp75_ = 0ULL;
-			ProgressDialog* _tmp76_ = NULL;
-			AggregateProgressMonitor* _tmp77_ = NULL;
-			AggregateProgressMonitor* _tmp78_ = NULL;
+			guint64 _tmp66_ = 0ULL;
+			ProgressDialog* _tmp67_ = NULL;
+			AggregateProgressMonitor* _tmp68_ = NULL;
+			AggregateProgressMonitor* _tmp69_ = NULL;
 #line 104 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp57_ = _ ("Loading Shotwell");
 #line 104 "/home/jens/Source/shotwell/src/main.vala"
@@ -1168,90 +1167,50 @@ void library_exec (gchar** mounts, int mounts_length1) {
 			_tmp60_ = progress_dialog;
 #line 106 "/home/jens/Source/shotwell/src/main.vala"
 			progress_dialog_set_minimum_on_screen_time_msec (_tmp60_, 250);
-#line 1165 "main.c"
+#line 1164 "main.c"
 			{
-				gchar* icon_path = NULL;
-				GFile* _tmp61_ = NULL;
-				GFile* _tmp62_ = NULL;
-				GFile* _tmp63_ = NULL;
-				GFile* _tmp64_ = NULL;
-				GFile* _tmp65_ = NULL;
-				GFile* _tmp66_ = NULL;
-				gchar* _tmp67_ = NULL;
-				gchar* _tmp68_ = NULL;
-				GdkPixbuf* _tmp69_ = NULL;
-				const gchar* _tmp70_ = NULL;
-				GdkPixbuf* _tmp71_ = NULL;
-				ProgressDialog* _tmp72_ = NULL;
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp61_ = app_dirs_get_resources_dir ();
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp62_ = _tmp61_;
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp63_ = g_file_get_child (_tmp62_, "icons");
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp64_ = _tmp63_;
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp65_ = g_file_get_child (_tmp64_, "shotwell.svg");
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp66_ = _tmp65_;
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp67_ = g_file_get_path (_tmp66_);
+				GdkPixbuf* _tmp61_ = NULL;
+				GdkPixbuf* _tmp62_ = NULL;
+				ProgressDialog* _tmp63_ = NULL;
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp68_ = _tmp67_;
+				_tmp62_ = gdk_pixbuf_new_from_resource ("/org/gnome/Shotwell/icons/shotwell.svg", &_inner_error_);
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_g_object_unref0 (_tmp66_);
+				_tmp61_ = _tmp62_;
 #line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_g_object_unref0 (_tmp64_);
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				_g_object_unref0 (_tmp62_);
-#line 108 "/home/jens/Source/shotwell/src/main.vala"
-				icon_path = _tmp68_;
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp70_ = icon_path;
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp71_ = gdk_pixbuf_new_from_file (_tmp70_, &_inner_error_);
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp69_ = _tmp71_;
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-					_g_free0 (icon_path);
-#line 1214 "main.c"
-					goto __catch221_g_error;
+#line 1175 "main.c"
+					goto __catch222_g_error;
 				}
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp72_ = progress_dialog;
-#line 109 "/home/jens/Source/shotwell/src/main.vala"
-				gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, gtk_window_get_type (), GtkWindow), _tmp69_);
-#line 107 "/home/jens/Source/shotwell/src/main.vala"
-				_g_object_unref0 (_tmp69_);
+#line 108 "/home/jens/Source/shotwell/src/main.vala"
+				_tmp63_ = progress_dialog;
+#line 108 "/home/jens/Source/shotwell/src/main.vala"
+				gtk_window_set_icon (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_window_get_type (), GtkWindow), _tmp61_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
-				_g_free0 (icon_path);
-#line 1225 "main.c"
+				_g_object_unref0 (_tmp61_);
+#line 1184 "main.c"
 			}
-			goto __finally221;
-			__catch221_g_error:
+			goto __finally222;
+			__catch222_g_error:
 			{
 				GError* err = NULL;
-				GError* _tmp73_ = NULL;
-				const gchar* _tmp74_ = NULL;
+				GError* _tmp64_ = NULL;
+				const gchar* _tmp65_ = NULL;
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				err = _inner_error_;
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				_inner_error_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp73_ = err;
-#line 111 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp74_ = _tmp73_->message;
-#line 111 "/home/jens/Source/shotwell/src/main.vala"
-				g_debug ("main.vala:111: Warning - could not load application icon for loading w" \
-"indow: %s", _tmp74_);
+#line 110 "/home/jens/Source/shotwell/src/main.vala"
+				_tmp64_ = err;
+#line 110 "/home/jens/Source/shotwell/src/main.vala"
+				_tmp65_ = _tmp64_->message;
+#line 110 "/home/jens/Source/shotwell/src/main.vala"
+				g_debug ("main.vala:110: Warning - could not load application icon for loading w" \
+"indow: %s", _tmp65_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				_g_error_free0 (err);
-#line 1245 "main.c"
+#line 1204 "main.c"
 			}
-			__finally221:
+			__finally222:
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
@@ -1276,461 +1235,461 @@ void library_exec (gchar** mounts, int mounts_length1) {
 				g_clear_error (&_inner_error_);
 #line 107 "/home/jens/Source/shotwell/src/main.vala"
 				return;
-#line 1272 "main.c"
+#line 1231 "main.c"
 			}
-#line 114 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp75_ = grand_total;
-#line 114 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp76_ = progress_dialog;
-#line 114 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp77_ = aggregate_progress_monitor_new (_tmp75_, _progress_dialog_monitor_progress_monitor, _tmp76_);
-#line 114 "/home/jens/Source/shotwell/src/main.vala"
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp66_ = grand_total;
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp67_ = progress_dialog;
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp68_ = aggregate_progress_monitor_new (_tmp66_, _progress_dialog_monitor_progress_monitor, _tmp67_);
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
 			_aggregate_progress_monitor_unref0 (aggregate_monitor);
+#line 113 "/home/jens/Source/shotwell/src/main.vala"
+			aggregate_monitor = _tmp68_;
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp69_ = aggregate_monitor;
 #line 114 "/home/jens/Source/shotwell/src/main.vala"
-			aggregate_monitor = _tmp77_;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp78_ = aggregate_monitor;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
 			(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor = NULL;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor_target = NULL;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor_target_destroy_notify = NULL;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor = _aggregate_progress_monitor_monitor_progress_monitor;
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
-			monitor_target = aggregate_progress_monitor_ref (_tmp78_);
-#line 115 "/home/jens/Source/shotwell/src/main.vala"
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
+			monitor_target = aggregate_progress_monitor_ref (_tmp69_);
+#line 114 "/home/jens/Source/shotwell/src/main.vala"
 			monitor_target_destroy_notify = aggregate_progress_monitor_unref;
-#line 1300 "main.c"
+#line 1259 "main.c"
 		}
 	}
-#line 119 "/home/jens/Source/shotwell/src/main.vala"
+#line 118 "/home/jens/Source/shotwell/src/main.vala"
 	thumbnail_cache_init ();
-#line 120 "/home/jens/Source/shotwell/src/main.vala"
+#line 119 "/home/jens/Source/shotwell/src/main.vala"
 	tombstone_init ();
+#line 121 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp70_ = aggregate_monitor;
+#line 121 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp70_ != NULL) {
+#line 1270 "main.c"
+		AggregateProgressMonitor* _tmp71_ = NULL;
 #line 122 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp79_ = aggregate_monitor;
+		_tmp71_ = aggregate_monitor;
 #line 122 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp79_ != NULL) {
-#line 1311 "main.c"
-		AggregateProgressMonitor* _tmp80_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp71_, "LibraryPhoto.init");
+#line 1276 "main.c"
+	}
 #line 123 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp80_ = aggregate_monitor;
+	_tmp72_ = monitor;
 #line 123 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp80_, "LibraryPhoto.init");
-#line 1317 "main.c"
-	}
-#line 124 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp81_ = monitor;
+	_tmp72__target = monitor_target;
+#line 123 "/home/jens/Source/shotwell/src/main.vala"
+	library_photo_init (_tmp72_, _tmp72__target);
 #line 124 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp81__target = monitor_target;
+	_tmp73_ = aggregate_monitor;
 #line 124 "/home/jens/Source/shotwell/src/main.vala"
-	library_photo_init (_tmp81_, _tmp81__target);
+	if (_tmp73_ != NULL) {
+#line 1288 "main.c"
+		AggregateProgressMonitor* _tmp74_ = NULL;
 #line 125 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp82_ = aggregate_monitor;
+		_tmp74_ = aggregate_monitor;
 #line 125 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp82_ != NULL) {
-#line 1329 "main.c"
-		AggregateProgressMonitor* _tmp83_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp74_, "Video.init");
+#line 1294 "main.c"
+	}
 #line 126 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp83_ = aggregate_monitor;
+	_tmp75_ = monitor;
 #line 126 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp83_, "Video.init");
-#line 1335 "main.c"
-	}
-#line 127 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp84_ = monitor;
+	_tmp75__target = monitor_target;
+#line 126 "/home/jens/Source/shotwell/src/main.vala"
+	video_init (_tmp75_, _tmp75__target);
 #line 127 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp84__target = monitor_target;
+	_tmp76_ = aggregate_monitor;
 #line 127 "/home/jens/Source/shotwell/src/main.vala"
-	video_init (_tmp84_, _tmp84__target);
+	if (_tmp76_ != NULL) {
+#line 1306 "main.c"
+		AggregateProgressMonitor* _tmp77_ = NULL;
 #line 128 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp85_ = aggregate_monitor;
+		_tmp77_ = aggregate_monitor;
 #line 128 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp85_ != NULL) {
-#line 1347 "main.c"
-		AggregateProgressMonitor* _tmp86_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp77_, "Upgrades.execute");
+#line 1312 "main.c"
+	}
 #line 129 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp86_ = aggregate_monitor;
+	_tmp78_ = upgrades_get_instance ();
 #line 129 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp86_, "Upgrades.execute");
-#line 1353 "main.c"
-	}
-#line 130 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp87_ = upgrades_get_instance ();
-#line 130 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp88_ = _tmp87_;
-#line 130 "/home/jens/Source/shotwell/src/main.vala"
-	upgrades_execute (_tmp88_, NULL, NULL);
-#line 130 "/home/jens/Source/shotwell/src/main.vala"
-	_upgrades_unref0 (_tmp88_);
-#line 132 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp79_ = _tmp78_;
+#line 129 "/home/jens/Source/shotwell/src/main.vala"
+	upgrades_execute (_tmp79_, NULL, NULL);
+#line 129 "/home/jens/Source/shotwell/src/main.vala"
+	_upgrades_unref0 (_tmp79_);
+#line 131 "/home/jens/Source/shotwell/src/main.vala"
 	library_monitor_pool_init ();
-#line 133 "/home/jens/Source/shotwell/src/main.vala"
+#line 132 "/home/jens/Source/shotwell/src/main.vala"
 	media_collection_registry_init ();
+#line 133 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp80_ = media_collection_registry_get_instance ();
+#line 133 "/home/jens/Source/shotwell/src/main.vala"
+	registry = _tmp80_;
+#line 134 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp81_ = registry;
 #line 134 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp89_ = media_collection_registry_get_instance ();
+	_tmp82_ = library_photo_global;
 #line 134 "/home/jens/Source/shotwell/src/main.vala"
-	registry = _tmp89_;
+	media_collection_registry_register_collection (_tmp81_, G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
 #line 135 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp90_ = registry;
+	_tmp83_ = registry;
 #line 135 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp91_ = library_photo_global;
+	_tmp84_ = video_global;
 #line 135 "/home/jens/Source/shotwell/src/main.vala"
-	media_collection_registry_register_collection (_tmp90_, G_TYPE_CHECK_INSTANCE_CAST (_tmp91_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
-#line 136 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp92_ = registry;
-#line 136 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp93_ = video_global;
-#line 136 "/home/jens/Source/shotwell/src/main.vala"
-	media_collection_registry_register_collection (_tmp92_, G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+	media_collection_registry_register_collection (_tmp83_, G_TYPE_CHECK_INSTANCE_CAST (_tmp84_, TYPE_MEDIA_SOURCE_COLLECTION, MediaSourceCollection));
+#line 137 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp85_ = aggregate_monitor;
+#line 137 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp85_ != NULL) {
+#line 1346 "main.c"
+		AggregateProgressMonitor* _tmp86_ = NULL;
 #line 138 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp94_ = aggregate_monitor;
+		_tmp86_ = aggregate_monitor;
 #line 138 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp94_ != NULL) {
-#line 1387 "main.c"
-		AggregateProgressMonitor* _tmp95_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp86_, "Event.init");
+#line 1352 "main.c"
+	}
 #line 139 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp95_ = aggregate_monitor;
+	_tmp87_ = monitor;
 #line 139 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp95_, "Event.init");
-#line 1393 "main.c"
-	}
-#line 140 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp96_ = monitor;
+	_tmp87__target = monitor_target;
+#line 139 "/home/jens/Source/shotwell/src/main.vala"
+	event_init (_tmp87_, _tmp87__target);
 #line 140 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp96__target = monitor_target;
+	_tmp88_ = aggregate_monitor;
 #line 140 "/home/jens/Source/shotwell/src/main.vala"
-	event_init (_tmp96_, _tmp96__target);
+	if (_tmp88_ != NULL) {
+#line 1364 "main.c"
+		AggregateProgressMonitor* _tmp89_ = NULL;
 #line 141 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp97_ = aggregate_monitor;
+		_tmp89_ = aggregate_monitor;
 #line 141 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp97_ != NULL) {
-#line 1405 "main.c"
-		AggregateProgressMonitor* _tmp98_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp89_, "Tag.init");
+#line 1370 "main.c"
+	}
 #line 142 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp98_ = aggregate_monitor;
+	_tmp90_ = monitor;
 #line 142 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp98_, "Tag.init");
-#line 1411 "main.c"
-	}
-#line 143 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp99_ = monitor;
-#line 143 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp99__target = monitor_target;
-#line 143 "/home/jens/Source/shotwell/src/main.vala"
-	tag_init (_tmp99_, _tmp99__target);
-#line 145 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp90__target = monitor_target;
+#line 142 "/home/jens/Source/shotwell/src/main.vala"
+	tag_init (_tmp90_, _tmp90__target);
+#line 144 "/home/jens/Source/shotwell/src/main.vala"
 	metadata_writer_init ();
-#line 146 "/home/jens/Source/shotwell/src/main.vala"
+#line 145 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_init ();
-#line 148 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp100_ = application_get_instance ();
-#line 148 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp101_ = _tmp100_;
-#line 148 "/home/jens/Source/shotwell/src/main.vala"
-	g_signal_emit_by_name (_tmp101_, "init-done");
-#line 148 "/home/jens/Source/shotwell/src/main.vala"
-	_application_unref0 (_tmp101_);
+#line 147 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp91_ = application_get_instance ();
+#line 147 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp92_ = _tmp91_;
+#line 147 "/home/jens/Source/shotwell/src/main.vala"
+	g_signal_emit_by_name (_tmp92_, "init-done");
+#line 147 "/home/jens/Source/shotwell/src/main.vala"
+	_application_unref0 (_tmp92_);
+#line 150 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp93_ = aggregate_monitor;
+#line 150 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp93_ != NULL) {
+#line 1394 "main.c"
+		AggregateProgressMonitor* _tmp94_ = NULL;
 #line 151 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp102_ = aggregate_monitor;
+		_tmp94_ = aggregate_monitor;
 #line 151 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp102_ != NULL) {
-#line 1435 "main.c"
-		AggregateProgressMonitor* _tmp103_ = NULL;
+		aggregate_progress_monitor_next_step (_tmp94_, "LibraryWindow");
+#line 1400 "main.c"
+	}
 #line 152 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp103_ = aggregate_monitor;
+	_tmp95_ = monitor;
 #line 152 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp103_, "LibraryWindow");
-#line 1441 "main.c"
-	}
-#line 153 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp104_ = monitor;
-#line 153 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp104__target = monitor_target;
-#line 153 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp105_ = library_window_new (_tmp104_, _tmp104__target);
-#line 153 "/home/jens/Source/shotwell/src/main.vala"
-	g_object_ref_sink (_tmp105_);
-#line 153 "/home/jens/Source/shotwell/src/main.vala"
-	library_window = _tmp105_;
+	_tmp95__target = monitor_target;
+#line 152 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp96_ = library_window_new (_tmp95_, _tmp95__target);
+#line 152 "/home/jens/Source/shotwell/src/main.vala"
+	g_object_ref_sink (_tmp96_);
+#line 152 "/home/jens/Source/shotwell/src/main.vala"
+	library_window = _tmp96_;
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp97_ = aggregate_monitor;
+#line 154 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp97_ != NULL) {
+#line 1416 "main.c"
+		AggregateProgressMonitor* _tmp98_ = NULL;
 #line 155 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp106_ = aggregate_monitor;
+		_tmp98_ = aggregate_monitor;
 #line 155 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp106_ != NULL) {
-#line 1457 "main.c"
-		AggregateProgressMonitor* _tmp107_ = NULL;
-#line 156 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp107_ = aggregate_monitor;
-#line 156 "/home/jens/Source/shotwell/src/main.vala"
-		aggregate_progress_monitor_next_step (_tmp107_, "done");
-#line 1463 "main.c"
+		aggregate_progress_monitor_next_step (_tmp98_, "done");
+#line 1422 "main.c"
 	}
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	(monitor_target_destroy_notify == NULL) ? NULL : (monitor_target_destroy_notify (monitor_target), NULL);
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target_destroy_notify = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target = NULL;
-#line 161 "/home/jens/Source/shotwell/src/main.vala"
+#line 160 "/home/jens/Source/shotwell/src/main.vala"
 	monitor_target_destroy_notify = NULL;
-#line 162 "/home/jens/Source/shotwell/src/main.vala"
+#line 161 "/home/jens/Source/shotwell/src/main.vala"
 	_aggregate_progress_monitor_unref0 (aggregate_monitor);
-#line 162 "/home/jens/Source/shotwell/src/main.vala"
+#line 161 "/home/jens/Source/shotwell/src/main.vala"
 	aggregate_monitor = NULL;
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp99_ = progress_dialog;
+#line 162 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp99_ != NULL) {
+#line 1446 "main.c"
+		ProgressDialog* _tmp100_ = NULL;
 #line 163 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp108_ = progress_dialog;
+		_tmp100_ = progress_dialog;
 #line 163 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp108_ != NULL) {
-#line 1487 "main.c"
-		ProgressDialog* _tmp109_ = NULL;
-#line 164 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp109_ = progress_dialog;
-#line 164 "/home/jens/Source/shotwell/src/main.vala"
-		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, gtk_widget_get_type (), GtkWidget));
-#line 1493 "main.c"
+		gtk_widget_destroy (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
+#line 1452 "main.c"
 	}
-#line 165 "/home/jens/Source/shotwell/src/main.vala"
+#line 164 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (progress_dialog);
-#line 165 "/home/jens/Source/shotwell/src/main.vala"
+#line 164 "/home/jens/Source/shotwell/src/main.vala"
 	progress_dialog = NULL;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp110_ = mounts;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp110__length1 = mounts_length1;
-#line 1503 "main.c"
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp101_ = mounts;
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp101__length1 = mounts_length1;
+#line 1462 "main.c"
 	{
 		gchar** mount_collection = NULL;
 		gint mount_collection_length1 = 0;
 		gint _mount_collection_size_ = 0;
 		gint mount_it = 0;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
-		mount_collection = _tmp110_;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
-		mount_collection_length1 = _tmp110__length1;
-#line 168 "/home/jens/Source/shotwell/src/main.vala"
-		for (mount_it = 0; mount_it < _tmp110__length1; mount_it = mount_it + 1) {
-#line 1515 "main.c"
-			gchar* _tmp111_ = NULL;
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+		mount_collection = _tmp101_;
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+		mount_collection_length1 = _tmp101__length1;
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+		for (mount_it = 0; mount_it < _tmp101__length1; mount_it = mount_it + 1) {
+#line 1474 "main.c"
+			gchar* _tmp102_ = NULL;
 			gchar* mount = NULL;
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+			_tmp102_ = g_strdup (mount_collection[mount_it]);
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
+			mount = _tmp102_;
+#line 1481 "main.c"
+			{
+				LibraryWindow* _tmp103_ = NULL;
+				const gchar* _tmp104_ = NULL;
 #line 168 "/home/jens/Source/shotwell/src/main.vala"
-			_tmp111_ = g_strdup (mount_collection[mount_it]);
+				_tmp103_ = library_window;
 #line 168 "/home/jens/Source/shotwell/src/main.vala"
-			mount = _tmp111_;
-#line 1522 "main.c"
-			{
-				LibraryWindow* _tmp112_ = NULL;
-				const gchar* _tmp113_ = NULL;
-#line 169 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp112_ = library_window;
-#line 169 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp113_ = mount;
-#line 169 "/home/jens/Source/shotwell/src/main.vala"
-				library_window_mounted_camera_shell_notification (_tmp112_, _tmp113_, TRUE);
+				_tmp104_ = mount;
 #line 168 "/home/jens/Source/shotwell/src/main.vala"
+				library_window_mounted_camera_shell_notification (_tmp103_, _tmp104_, TRUE);
+#line 167 "/home/jens/Source/shotwell/src/main.vala"
 				_g_free0 (mount);
-#line 1534 "main.c"
+#line 1493 "main.c"
 			}
 		}
 	}
-#line 171 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp114_ = library_window;
-#line 171 "/home/jens/Source/shotwell/src/main.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_widget_get_type (), GtkWidget));
+#line 170 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp105_ = library_window;
+#line 170 "/home/jens/Source/shotwell/src/main.vala"
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, gtk_widget_get_type (), GtkWidget));
+#line 172 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp106_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
+#line 172 "/home/jens/Source/shotwell/src/main.vala"
+	selected_import_entries = _tmp106_;
+#line 172 "/home/jens/Source/shotwell/src/main.vala"
+	selected_import_entries_length1 = 0;
+#line 172 "/home/jens/Source/shotwell/src/main.vala"
+	_selected_import_entries_size_ = selected_import_entries_length1;
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp115_ = g_new0 (WelcomeServiceEntry*, 0 + 1);
+	_tmp108_ = config_facade_get_instance ();
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	selected_import_entries = _tmp115_;
+	_tmp109_ = _tmp108_;
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	selected_import_entries_length1 = 0;
+	_tmp110_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp109_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 173 "/home/jens/Source/shotwell/src/main.vala"
-	_selected_import_entries_size_ = selected_import_entries_length1;
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp117_ = config_facade_get_instance ();
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp118_ = _tmp117_;
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp119_ = configuration_facade_get_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp118_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp111_ = _tmp110_;
+#line 173 "/home/jens/Source/shotwell/src/main.vala"
+	_g_object_unref0 (_tmp109_);
+#line 173 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp111_) {
+#line 1521 "main.c"
+		LibraryPhotoSourceCollection* _tmp112_ = NULL;
+		gint _tmp113_ = 0;
 #line 174 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp120_ = _tmp119_;
+		_tmp112_ = library_photo_global;
 #line 174 "/home/jens/Source/shotwell/src/main.vala"
-	_g_object_unref0 (_tmp118_);
+		_tmp113_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp112_, TYPE_DATA_COLLECTION, DataCollection));
 #line 174 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp120_) {
-#line 1562 "main.c"
-		LibraryPhotoSourceCollection* _tmp121_ = NULL;
-		gint _tmp122_ = 0;
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp121_ = library_photo_global;
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp122_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, TYPE_DATA_COLLECTION, DataCollection));
-#line 175 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp116_ = _tmp122_ == 0;
-#line 1571 "main.c"
+		_tmp107_ = _tmp113_ == 0;
+#line 1530 "main.c"
 	} else {
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp116_ = FALSE;
-#line 1575 "main.c"
+#line 173 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp107_ = FALSE;
+#line 1534 "main.c"
 	}
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp116_) {
-#line 1579 "main.c"
+#line 173 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp107_) {
+#line 1538 "main.c"
 		WelcomeDialog* welcome = NULL;
-		LibraryWindow* _tmp123_ = NULL;
-		WelcomeDialog* _tmp124_ = NULL;
-		ConfigFacade* _tmp125_ = NULL;
-		ConfigFacade* _tmp126_ = NULL;
-		WelcomeDialog* _tmp127_ = NULL;
-		WelcomeServiceEntry** _tmp128_ = NULL;
-		gint _tmp129_ = 0;
-		gboolean _tmp130_ = FALSE;
-		gboolean _tmp131_ = FALSE;
+		LibraryWindow* _tmp114_ = NULL;
+		WelcomeDialog* _tmp115_ = NULL;
+		ConfigFacade* _tmp116_ = NULL;
+		ConfigFacade* _tmp117_ = NULL;
+		WelcomeDialog* _tmp118_ = NULL;
+		WelcomeServiceEntry** _tmp119_ = NULL;
+		gint _tmp120_ = 0;
+		gboolean _tmp121_ = FALSE;
+		gboolean _tmp122_ = FALSE;
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp114_ = library_window;
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp115_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp114_, gtk_window_get_type (), GtkWindow));
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
+		g_object_ref_sink (_tmp115_);
+#line 175 "/home/jens/Source/shotwell/src/main.vala"
+		welcome = _tmp115_;
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp123_ = library_window;
+		_tmp116_ = config_facade_get_instance ();
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp124_ = welcome_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp123_, gtk_window_get_type (), GtkWindow));
+		_tmp117_ = _tmp116_;
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		g_object_ref_sink (_tmp124_);
+		_tmp118_ = welcome;
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp122_ = welcome_dialog_execute (_tmp118_, &_tmp119_, &_tmp120_, &_tmp121_);
 #line 176 "/home/jens/Source/shotwell/src/main.vala"
-		welcome = _tmp124_;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp125_ = config_facade_get_instance ();
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp126_ = _tmp125_;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp127_ = welcome;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp131_ = welcome_dialog_execute (_tmp127_, &_tmp128_, &_tmp129_, &_tmp130_);
-#line 177 "/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 177 "/home/jens/Source/shotwell/src/main.vala"
-		selected_import_entries = _tmp128_;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		selected_import_entries_length1 = _tmp129_;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		selected_import_entries = _tmp119_;
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		selected_import_entries_length1 = _tmp120_;
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
 		_selected_import_entries_size_ = selected_import_entries_length1;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		do_system_pictures_import = _tmp130_;
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp131_);
-#line 177 "/home/jens/Source/shotwell/src/main.vala"
-		_g_object_unref0 (_tmp126_);
-#line 174 "/home/jens/Source/shotwell/src/main.vala"
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		do_system_pictures_import = _tmp121_;
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp117_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp122_);
+#line 176 "/home/jens/Source/shotwell/src/main.vala"
+		_g_object_unref0 (_tmp117_);
+#line 173 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (welcome);
-#line 1622 "main.c"
+#line 1581 "main.c"
 	} else {
-		ConfigFacade* _tmp132_ = NULL;
-		ConfigFacade* _tmp133_ = NULL;
-#line 180 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp132_ = config_facade_get_instance ();
-#line 180 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp133_ = _tmp132_;
-#line 180 "/home/jens/Source/shotwell/src/main.vala"
-		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE);
-#line 180 "/home/jens/Source/shotwell/src/main.vala"
-		_g_object_unref0 (_tmp133_);
-#line 1634 "main.c"
+		ConfigFacade* _tmp123_ = NULL;
+		ConfigFacade* _tmp124_ = NULL;
+#line 179 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp123_ = config_facade_get_instance ();
+#line 179 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp124_ = _tmp123_;
+#line 179 "/home/jens/Source/shotwell/src/main.vala"
+		configuration_facade_set_show_welcome_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp124_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), FALSE);
+#line 179 "/home/jens/Source/shotwell/src/main.vala"
+		_g_object_unref0 (_tmp124_);
+#line 1593 "main.c"
 	}
+#line 182 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp125_ = selected_import_entries;
+#line 182 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp125__length1 = selected_import_entries_length1;
+#line 182 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp125__length1 > 0) {
+#line 1601 "main.c"
+		WelcomeServiceEntry** _tmp126_ = NULL;
+		gint _tmp126__length1 = 0;
 #line 183 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp134_ = selected_import_entries;
-#line 183 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp134__length1 = selected_import_entries_length1;
-#line 183 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp134__length1 > 0) {
-#line 1642 "main.c"
-		WelcomeServiceEntry** _tmp135_ = NULL;
-		gint _tmp135__length1 = 0;
-#line 184 "/home/jens/Source/shotwell/src/main.vala"
 		do_external_import = TRUE;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp135_ = selected_import_entries;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-		_tmp135__length1 = selected_import_entries_length1;
-#line 1651 "main.c"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp126_ = selected_import_entries;
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+		_tmp126__length1 = selected_import_entries_length1;
+#line 1610 "main.c"
 		{
 			WelcomeServiceEntry** entry_collection = NULL;
 			gint entry_collection_length1 = 0;
 			gint _entry_collection_size_ = 0;
 			gint entry_it = 0;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-			entry_collection = _tmp135_;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-			entry_collection_length1 = _tmp135__length1;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-			for (entry_it = 0; entry_it < _tmp135__length1; entry_it = entry_it + 1) {
-#line 1663 "main.c"
-				WelcomeServiceEntry* _tmp136_ = NULL;
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+			entry_collection = _tmp126_;
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+			entry_collection_length1 = _tmp126__length1;
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+			for (entry_it = 0; entry_it < _tmp126__length1; entry_it = entry_it + 1) {
+#line 1622 "main.c"
+				WelcomeServiceEntry* _tmp127_ = NULL;
 				WelcomeServiceEntry* entry = NULL;
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-				_tmp136_ = _g_object_ref0 (entry_collection[entry_it]);
-#line 185 "/home/jens/Source/shotwell/src/main.vala"
-				entry = _tmp136_;
-#line 1670 "main.c"
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+				_tmp127_ = _g_object_ref0 (entry_collection[entry_it]);
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
+				entry = _tmp127_;
+#line 1629 "main.c"
 				{
-					WelcomeServiceEntry* _tmp137_ = NULL;
-#line 186 "/home/jens/Source/shotwell/src/main.vala"
-					_tmp137_ = entry;
-#line 186 "/home/jens/Source/shotwell/src/main.vala"
-					welcome_service_entry_execute (_tmp137_);
+					WelcomeServiceEntry* _tmp128_ = NULL;
 #line 185 "/home/jens/Source/shotwell/src/main.vala"
+					_tmp128_ = entry;
+#line 185 "/home/jens/Source/shotwell/src/main.vala"
+					welcome_service_entry_execute (_tmp128_);
+#line 184 "/home/jens/Source/shotwell/src/main.vala"
 					_g_object_unref0 (entry);
-#line 1679 "main.c"
+#line 1638 "main.c"
 				}
 			}
 		}
 	}
-#line 188 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp138_ = do_system_pictures_import;
-#line 188 "/home/jens/Source/shotwell/src/main.vala"
-	if (_tmp138_) {
-#line 192 "/home/jens/Source/shotwell/src/main.vala"
+#line 187 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp129_ = do_system_pictures_import;
+#line 187 "/home/jens/Source/shotwell/src/main.vala"
+	if (_tmp129_) {
+#line 191 "/home/jens/Source/shotwell/src/main.vala"
 		run_system_pictures_import (NULL);
-#line 1690 "main.c"
+#line 1649 "main.c"
 	}
-#line 195 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp139_ = startup_timer;
-#line 195 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp140_ = g_timer_elapsed (_tmp139_, NULL);
-#line 195 "/home/jens/Source/shotwell/src/main.vala"
-	g_debug ("main.vala:195: %lf seconds to Gtk.main()", _tmp140_);
-#line 197 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp141_ = application_get_instance ();
-#line 197 "/home/jens/Source/shotwell/src/main.vala"
-	_tmp142_ = _tmp141_;
-#line 197 "/home/jens/Source/shotwell/src/main.vala"
-	application_start (_tmp142_, NULL, 0);
-#line 197 "/home/jens/Source/shotwell/src/main.vala"
-	_application_unref0 (_tmp142_);
-#line 199 "/home/jens/Source/shotwell/src/main.vala"
+#line 194 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp130_ = startup_timer;
+#line 194 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp131_ = g_timer_elapsed (_tmp130_, NULL);
+#line 194 "/home/jens/Source/shotwell/src/main.vala"
+	g_debug ("main.vala:194: %lf seconds to Gtk.main()", _tmp131_);
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp132_ = application_get_instance ();
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
+	_tmp133_ = _tmp132_;
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
+	application_start (_tmp133_, NULL, 0);
+#line 196 "/home/jens/Source/shotwell/src/main.vala"
+	_application_unref0 (_tmp133_);
+#line 198 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_terminate ();
-#line 200 "/home/jens/Source/shotwell/src/main.vala"
+#line 199 "/home/jens/Source/shotwell/src/main.vala"
 	metadata_writer_terminate ();
-#line 201 "/home/jens/Source/shotwell/src/main.vala"
+#line 200 "/home/jens/Source/shotwell/src/main.vala"
 	tag_terminate ();
-#line 202 "/home/jens/Source/shotwell/src/main.vala"
+#line 201 "/home/jens/Source/shotwell/src/main.vala"
 	event_terminate ();
-#line 203 "/home/jens/Source/shotwell/src/main.vala"
+#line 202 "/home/jens/Source/shotwell/src/main.vala"
 	library_photo_terminate ();
-#line 204 "/home/jens/Source/shotwell/src/main.vala"
+#line 203 "/home/jens/Source/shotwell/src/main.vala"
 	media_collection_registry_terminate ();
-#line 205 "/home/jens/Source/shotwell/src/main.vala"
+#line 204 "/home/jens/Source/shotwell/src/main.vala"
 	library_monitor_pool_terminate ();
-#line 206 "/home/jens/Source/shotwell/src/main.vala"
+#line 205 "/home/jens/Source/shotwell/src/main.vala"
 	tombstone_terminate ();
-#line 207 "/home/jens/Source/shotwell/src/main.vala"
+#line 206 "/home/jens/Source/shotwell/src/main.vala"
 	thumbnail_cache_terminate ();
-#line 208 "/home/jens/Source/shotwell/src/main.vala"
+#line 207 "/home/jens/Source/shotwell/src/main.vala"
 	video_terminate ();
-#line 209 "/home/jens/Source/shotwell/src/main.vala"
+#line 208 "/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);
@@ -1754,14 +1713,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 1750 "main.c"
+#line 1709 "main.c"
 }
 
 
 static void _report_system_pictures_import_batch_import_import_reporter (ImportManifest* manifest, BatchImportRoll* import_roll, gpointer self) {
-#line 224 "/home/jens/Source/shotwell/src/main.vala"
+#line 223 "/home/jens/Source/shotwell/src/main.vala"
 	report_system_pictures_import (manifest, import_roll);
-#line 1757 "main.c"
+#line 1716 "main.c"
 }
 
 
@@ -1783,65 +1742,65 @@ void run_system_pictures_import (ImportManifest* external_exclusion_manifest) {
 	LibraryWindow* _tmp11_ = NULL;
 	BatchImport* _tmp12_ = NULL;
 	LibraryWindow* _tmp13_ = NULL;
-#line 215 "/home/jens/Source/shotwell/src/main.vala"
+#line 214 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail ((external_exclusion_manifest == NULL) || IS_IMPORT_MANIFEST (external_exclusion_manifest));
-#line 216 "/home/jens/Source/shotwell/src/main.vala"
+#line 215 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = do_system_pictures_import;
-#line 216 "/home/jens/Source/shotwell/src/main.vala"
+#line 215 "/home/jens/Source/shotwell/src/main.vala"
 	if (!_tmp0_) {
-#line 217 "/home/jens/Source/shotwell/src/main.vala"
+#line 216 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1787 "main.c"
+#line 1746 "main.c"
 	}
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 218 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = gee_array_list_new (TYPE_FILE_IMPORT_JOB, (GBoxedCopyFunc) batch_import_job_ref, batch_import_job_unref, NULL, NULL, NULL);
-#line 219 "/home/jens/Source/shotwell/src/main.vala"
+#line 218 "/home/jens/Source/shotwell/src/main.vala"
 	jobs = _tmp1_;
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp2_ = jobs;
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp3_ = app_dirs_get_import_dir ();
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_ = _tmp3_;
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp5_ = file_import_job_new (_tmp4_, FALSE);
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = _tmp5_;
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp6_);
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_batch_import_job_unref0 (_tmp6_);
-#line 220 "/home/jens/Source/shotwell/src/main.vala"
+#line 219 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (_tmp4_);
-#line 222 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_ = app_window_get_instance ();
-#line 222 "/home/jens/Source/shotwell/src/main.vala"
+#line 221 "/home/jens/Source/shotwell/src/main.vala"
 	library_window = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_WINDOW, LibraryWindow);
-#line 224 "/home/jens/Source/shotwell/src/main.vala"
+#line 223 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp8_ = jobs;
-#line 224 "/home/jens/Source/shotwell/src/main.vala"
+#line 223 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp9_ = external_exclusion_manifest;
-#line 224 "/home/jens/Source/shotwell/src/main.vala"
+#line 223 "/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 224 "/home/jens/Source/shotwell/src/main.vala"
+#line 223 "/home/jens/Source/shotwell/src/main.vala"
 	batch_import = _tmp10_;
-#line 226 "/home/jens/Source/shotwell/src/main.vala"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp11_ = library_window;
-#line 226 "/home/jens/Source/shotwell/src/main.vala"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp12_ = batch_import;
-#line 226 "/home/jens/Source/shotwell/src/main.vala"
+#line 225 "/home/jens/Source/shotwell/src/main.vala"
 	library_window_enqueue_batch_import (_tmp11_, _tmp12_, TRUE);
-#line 228 "/home/jens/Source/shotwell/src/main.vala"
+#line 227 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_ = library_window;
-#line 228 "/home/jens/Source/shotwell/src/main.vala"
+#line 227 "/home/jens/Source/shotwell/src/main.vala"
 	library_window_switch_to_import_queue_page (_tmp13_);
-#line 215 "/home/jens/Source/shotwell/src/main.vala"
+#line 214 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (batch_import);
-#line 215 "/home/jens/Source/shotwell/src/main.vala"
+#line 214 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (library_window);
-#line 215 "/home/jens/Source/shotwell/src/main.vala"
+#line 214 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (jobs);
-#line 1837 "main.c"
+#line 1796 "main.c"
 }
 
 
@@ -1849,46 +1808,46 @@ void report_system_pictures_import (ImportManifest* manifest, BatchImportRoll* i
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	ImportManifest* _tmp6_ = NULL;
-#line 231 "/home/jens/Source/shotwell/src/main.vala"
+#line 230 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail (IS_IMPORT_MANIFEST (manifest));
-#line 231 "/home/jens/Source/shotwell/src/main.vala"
+#line 230 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail (IS_BATCH_IMPORT_ROLL (import_roll));
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = do_external_import;
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp1_) {
-#line 1853 "main.c"
+#line 1812 "main.c"
 		ImportManifest* _tmp2_ = NULL;
 		GeeList* _tmp3_ = NULL;
 		gint _tmp4_ = 0;
 		gint _tmp5_ = 0;
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp2_ = manifest;
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3_ = _tmp2_->all;
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp4_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp5_ = _tmp4_;
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp0_ = _tmp5_ == 0;
-#line 1868 "main.c"
+#line 1827 "main.c"
 	} else {
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp0_ = FALSE;
-#line 1872 "main.c"
+#line 1831 "main.c"
 	}
-#line 238 "/home/jens/Source/shotwell/src/main.vala"
+#line 237 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp0_) {
-#line 239 "/home/jens/Source/shotwell/src/main.vala"
+#line 238 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1878 "main.c"
+#line 1837 "main.c"
 	}
-#line 241 "/home/jens/Source/shotwell/src/main.vala"
+#line 240 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = manifest;
-#line 241 "/home/jens/Source/shotwell/src/main.vala"
+#line 240 "/home/jens/Source/shotwell/src/main.vala"
 	import_ui_report_manifest (_tmp6_, TRUE, NULL);
-#line 1884 "main.c"
+#line 1843 "main.c"
 }
 
 
@@ -1906,193 +1865,193 @@ void editing_exec (const gchar* filename) {
 	Application* _tmp10_ = NULL;
 	Application* _tmp11_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 243 "/home/jens/Source/shotwell/src/main.vala"
 	g_return_if_fail (filename != NULL);
-#line 245 "/home/jens/Source/shotwell/src/main.vala"
+#line 244 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = filename;
-#line 245 "/home/jens/Source/shotwell/src/main.vala"
+#line 244 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = g_file_new_for_commandline_arg (_tmp0_);
-#line 245 "/home/jens/Source/shotwell/src/main.vala"
+#line 244 "/home/jens/Source/shotwell/src/main.vala"
 	initial_file = _tmp1_;
-#line 248 "/home/jens/Source/shotwell/src/main.vala"
+#line 247 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp2_ = initial_file;
-#line 248 "/home/jens/Source/shotwell/src/main.vala"
+#line 247 "/home/jens/Source/shotwell/src/main.vala"
 	direct_preconfigure (_tmp2_);
-#line 249 "/home/jens/Source/shotwell/src/main.vala"
+#line 248 "/home/jens/Source/shotwell/src/main.vala"
 	db_preconfigure (NULL);
-#line 1916 "main.c"
+#line 1875 "main.c"
 	{
-#line 253 "/home/jens/Source/shotwell/src/main.vala"
+#line 252 "/home/jens/Source/shotwell/src/main.vala"
 		direct_app_init (&_inner_error_);
-#line 253 "/home/jens/Source/shotwell/src/main.vala"
+#line 252 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1922 "main.c"
-			goto __catch222_g_error;
+#line 1881 "main.c"
+			goto __catch223_g_error;
 		}
 	}
-	goto __finally222;
-	__catch222_g_error:
+	goto __finally223;
+	__catch223_g_error:
 	{
 		GError* err = NULL;
 		GError* _tmp3_ = NULL;
 		const gchar* _tmp4_ = NULL;
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 		err = _inner_error_;
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 		_inner_error_ = NULL;
-#line 255 "/home/jens/Source/shotwell/src/main.vala"
+#line 254 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3_ = err;
-#line 255 "/home/jens/Source/shotwell/src/main.vala"
+#line 254 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp4_ = _tmp3_->message;
-#line 255 "/home/jens/Source/shotwell/src/main.vala"
+#line 254 "/home/jens/Source/shotwell/src/main.vala"
 		app_window_panic (_tmp4_);
-#line 257 "/home/jens/Source/shotwell/src/main.vala"
+#line 256 "/home/jens/Source/shotwell/src/main.vala"
 		_g_error_free0 (err);
-#line 257 "/home/jens/Source/shotwell/src/main.vala"
+#line 256 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (initial_file);
-#line 257 "/home/jens/Source/shotwell/src/main.vala"
+#line 256 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1948 "main.c"
+#line 1907 "main.c"
 	}
-	__finally222:
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+	__finally223:
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (initial_file);
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/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 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 		g_clear_error (&_inner_error_);
-#line 252 "/home/jens/Source/shotwell/src/main.vala"
+#line 251 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 1961 "main.c"
+#line 1920 "main.c"
 	}
-#line 261 "/home/jens/Source/shotwell/src/main.vala"
+#line 260 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_init ();
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
+#line 266 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp5_ = initial_file;
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
+#line 266 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_ = direct_window_new (_tmp5_);
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
+#line 266 "/home/jens/Source/shotwell/src/main.vala"
 	g_object_ref_sink (_tmp6_);
-#line 267 "/home/jens/Source/shotwell/src/main.vala"
+#line 266 "/home/jens/Source/shotwell/src/main.vala"
 	direct_window = _tmp6_;
-#line 268 "/home/jens/Source/shotwell/src/main.vala"
+#line 267 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_ = direct_window;
-#line 268 "/home/jens/Source/shotwell/src/main.vala"
+#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 270 "/home/jens/Source/shotwell/src/main.vala"
+#line 269 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp8_ = startup_timer;
-#line 270 "/home/jens/Source/shotwell/src/main.vala"
+#line 269 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp9_ = g_timer_elapsed (_tmp8_, NULL);
-#line 270 "/home/jens/Source/shotwell/src/main.vala"
-	g_debug ("main.vala:270: %lf seconds to Gtk.main()", _tmp9_);
-#line 272 "/home/jens/Source/shotwell/src/main.vala"
+#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 ();
-#line 272 "/home/jens/Source/shotwell/src/main.vala"
+#line 271 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp11_ = _tmp10_;
-#line 272 "/home/jens/Source/shotwell/src/main.vala"
+#line 271 "/home/jens/Source/shotwell/src/main.vala"
 	application_start (_tmp11_, NULL, 0);
-#line 272 "/home/jens/Source/shotwell/src/main.vala"
+#line 271 "/home/jens/Source/shotwell/src/main.vala"
 	_application_unref0 (_tmp11_);
-#line 274 "/home/jens/Source/shotwell/src/main.vala"
+#line 273 "/home/jens/Source/shotwell/src/main.vala"
 	desktop_integration_terminate ();
-#line 277 "/home/jens/Source/shotwell/src/main.vala"
+#line 276 "/home/jens/Source/shotwell/src/main.vala"
 	direct_app_terminate ();
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 243 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (direct_window);
-#line 244 "/home/jens/Source/shotwell/src/main.vala"
+#line 243 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (initial_file);
-#line 1999 "main.c"
+#line 1958 "main.c"
 }
 
 
 static GOptionEntry* _vala_array_dup26 (GOptionEntry* self, int length) {
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 	return g_memdup (self, length * sizeof (GOptionEntry));
-#line 2006 "main.c"
+#line 1965 "main.c"
 }
 
 
 static void _vala_array_add70 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2017 "main.c"
+#line 1976 "main.c"
 	}
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2021 "main.c"
+#line 1980 "main.c"
 }
 
 
 static void _vala_array_add71 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2032 "main.c"
+#line 1991 "main.c"
 	}
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2036 "main.c"
+#line 1995 "main.c"
 }
 
 
 static void _vala_array_add72 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2047 "main.c"
+#line 2006 "main.c"
 	}
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2051 "main.c"
+#line 2010 "main.c"
 }
 
 
 static void _vala_array_add73 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2062 "main.c"
+#line 2021 "main.c"
 	}
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2066 "main.c"
+#line 2025 "main.c"
 }
 
 
 static void _vala_array_add74 (GOptionEntry** array, int* length, int* size, const GOptionEntry* value) {
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (GOptionEntry, *array, *size);
-#line 2077 "main.c"
+#line 2036 "main.c"
 	}
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = *value;
-#line 2081 "main.c"
+#line 2040 "main.c"
 }
 
 
 static GOptionEntry* _vala_array_dup27 (GOptionEntry* self, int length) {
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	return g_memdup (self, length * sizeof (GOptionEntry));
-#line 2088 "main.c"
+#line 2047 "main.c"
 }
 
 
@@ -2136,213 +2095,213 @@ GOptionEntry* commandline_options_get_options (int* result_length1) {
 	gint _tmp25__length1 = 0;
 	GOptionEntry* _tmp26_ = NULL;
 	gint _tmp26__length1 = 0;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 289 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = commandline_options_entries;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 289 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0__length1 = commandline_options_entries_length1;
-#line 290 "/home/jens/Source/shotwell/src/main.vala"
+#line 289 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp0_ != NULL) {
-#line 2138 "main.c"
+#line 2097 "main.c"
 		GOptionEntry* _tmp1_ = NULL;
 		gint _tmp1__length1 = 0;
 		GOptionEntry* _tmp2_ = NULL;
 		gint _tmp2__length1 = 0;
 		GOptionEntry* _tmp3_ = NULL;
 		gint _tmp3__length1 = 0;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp1_ = commandline_options_entries;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp1__length1 = commandline_options_entries_length1;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp2_ = (_tmp1_ != NULL) ? _vala_array_dup26 (_tmp1_, _tmp1__length1) : ((gpointer) _tmp1_);
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp2__length1 = _tmp1__length1;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3_ = _tmp2_;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp3__length1 = _tmp2__length1;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		if (result_length1) {
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 			*result_length1 = _tmp3__length1;
-#line 2161 "main.c"
+#line 2120 "main.c"
 		}
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		result = _tmp3_;
-#line 291 "/home/jens/Source/shotwell/src/main.vala"
+#line 290 "/home/jens/Source/shotwell/src/main.vala"
 		return result;
-#line 2167 "main.c"
+#line 2126 "main.c"
 	}
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_ = _ ("Path to Shotwell’s private data");
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp5_ = _ ("DIRECTORY");
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.long_name = "datadir";
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.short_name = 'd';
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.flags = 0;
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.arg = G_OPTION_ARG_FILENAME;
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.arg_data = &commandline_options_data_dir;
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.description = _tmp4_;
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp6_.arg_description = _tmp5_;
-#line 293 "/home/jens/Source/shotwell/src/main.vala"
+#line 292 "/home/jens/Source/shotwell/src/main.vala"
 	datadir = _tmp6_;
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7_ = commandline_options_entries;
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp7__length1 = commandline_options_entries_length1;
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp8_ = datadir;
-#line 295 "/home/jens/Source/shotwell/src/main.vala"
+#line 294 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add70 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp8_);
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp9_ = _ ("Do not monitor library directory at runtime for changes");
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.long_name = "no-runtime-monitoring";
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.short_name = (gchar) 0;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.flags = 0;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.arg = G_OPTION_ARG_NONE;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.arg_data = &commandline_options_no_runtime_monitoring;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.description = _tmp9_;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp10_.arg_description = NULL;
-#line 297 "/home/jens/Source/shotwell/src/main.vala"
+#line 296 "/home/jens/Source/shotwell/src/main.vala"
 	no_monitoring = _tmp10_;
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp11_ = commandline_options_entries;
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp11__length1 = commandline_options_entries_length1;
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp12_ = no_monitoring;
-#line 299 "/home/jens/Source/shotwell/src/main.vala"
+#line 298 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add71 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp12_);
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp13_ = _ ("Don’t display startup progress meter");
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.long_name = "no-startup-progress";
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.short_name = (gchar) 0;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.flags = 0;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.arg = G_OPTION_ARG_NONE;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.arg_data = &commandline_options_no_startup_progress;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.description = _tmp13_;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp14_.arg_description = NULL;
-#line 301 "/home/jens/Source/shotwell/src/main.vala"
+#line 300 "/home/jens/Source/shotwell/src/main.vala"
 	no_startup = _tmp14_;
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp15_ = commandline_options_entries;
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp15__length1 = commandline_options_entries_length1;
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp16_ = no_startup;
-#line 303 "/home/jens/Source/shotwell/src/main.vala"
+#line 302 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add72 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp16_);
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp17_ = _ ("Show the application’s version");
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.long_name = "version";
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.short_name = 'V';
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.flags = 0;
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.arg = G_OPTION_ARG_NONE;
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.arg_data = &commandline_options_show_version;
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.description = _tmp17_;
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp18_.arg_description = NULL;
-#line 305 "/home/jens/Source/shotwell/src/main.vala"
+#line 304 "/home/jens/Source/shotwell/src/main.vala"
 	version = _tmp18_;
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp19_ = commandline_options_entries;
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp19__length1 = commandline_options_entries_length1;
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp20_ = version;
-#line 307 "/home/jens/Source/shotwell/src/main.vala"
+#line 306 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add73 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp20_);
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.long_name = NULL;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.short_name = (gchar) 0;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.flags = 0;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.arg = 0;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.arg_data = NULL;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.description = NULL;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp21_.arg_description = NULL;
-#line 309 "/home/jens/Source/shotwell/src/main.vala"
+#line 308 "/home/jens/Source/shotwell/src/main.vala"
 	terminator = _tmp21_;
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp22_ = commandline_options_entries;
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp22__length1 = commandline_options_entries_length1;
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp23_ = terminator;
-#line 310 "/home/jens/Source/shotwell/src/main.vala"
+#line 309 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_array_add74 (&commandline_options_entries, &commandline_options_entries_length1, &_commandline_options_entries_size_, &_tmp23_);
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp24_ = commandline_options_entries;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp24__length1 = commandline_options_entries_length1;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp25_ = (_tmp24_ != NULL) ? _vala_array_dup27 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_);
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp25__length1 = _tmp24__length1;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp26_ = _tmp25_;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp26__length1 = _tmp25__length1;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	if (result_length1) {
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 		*result_length1 = _tmp26__length1;
-#line 2315 "main.c"
+#line 2274 "main.c"
 	}
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	result = _tmp26_;
-#line 312 "/home/jens/Source/shotwell/src/main.vala"
+#line 311 "/home/jens/Source/shotwell/src/main.vala"
 	return result;
-#line 2321 "main.c"
+#line 2280 "main.c"
 }
 
 
 static void _vala_array_add75 (gchar*** array, int* length, int* size, gchar* value) {
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 	if ((*length) == (*size)) {
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 		*array = g_renew (gchar*, *array, (*size) + 1);
-#line 2332 "main.c"
+#line 2291 "main.c"
 	}
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[(*length)++] = value;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 	(*array)[*length] = NULL;
-#line 2338 "main.c"
+#line 2297 "main.c"
 }
 
 
@@ -2362,7 +2321,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
 	result = _tmp1_ != NULL;
 #line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2358 "main.c"
+#line 2317 "main.c"
 }
 
 
@@ -2398,54 +2357,58 @@ void _vala_main (gchar** args, int args_length1) {
 	const gchar* _tmp68_ = NULL;
 	gboolean _tmp69_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 320 "/home/jens/Source/shotwell/src/main.vala"
+#line 319 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0_ = args;
-#line 320 "/home/jens/Source/shotwell/src/main.vala"
+#line 319 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp0__length1 = args_length1;
-#line 320 "/home/jens/Source/shotwell/src/main.vala"
+#line 319 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp1_ = _tmp0_[0];
-#line 320 "/home/jens/Source/shotwell/src/main.vala"
+#line 319 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_init (_tmp1_);
-#line 325 "/home/jens/Source/shotwell/src/main.vala"
+#line 324 "/home/jens/Source/shotwell/src/main.vala"
 	gexiv2_initialize ();
-#line 331 "/home/jens/Source/shotwell/src/main.vala"
+#line 325 "/home/jens/Source/shotwell/src/main.vala"
+	gexiv2_log_use_glib_logging ();
+#line 329 "/home/jens/Source/shotwell/src/main.vala"
+	gexiv2_log_set_level (GEXIV2_LOG_LEVEL_DEBUG);
+#line 335 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp2_ = app_dirs_get_install_dir ();
-#line 331 "/home/jens/Source/shotwell/src/main.vala"
+#line 335 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp3_ = _tmp2_;
-#line 331 "/home/jens/Source/shotwell/src/main.vala"
+#line 335 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp4_ = _tmp3_ == NULL;
-#line 331 "/home/jens/Source/shotwell/src/main.vala"
+#line 335 "/home/jens/Source/shotwell/src/main.vala"
 	_g_object_unref0 (_tmp3_);
-#line 331 "/home/jens/Source/shotwell/src/main.vala"
+#line 335 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp4_) {
-#line 2414 "main.c"
+#line 2377 "main.c"
 		GFile* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
 		gchar* _tmp7_ = NULL;
 		gchar* _tmp8_ = NULL;
 		gchar* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp5_ = app_dirs_get_exec_dir ();
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp6_ = _tmp5_;
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp7_ = g_file_get_path (_tmp6_);
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp8_ = _tmp7_;
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp9_ = g_strconcat (_tmp8_, "/misc", NULL);
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp10_ = _tmp9_;
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		g_setenv ("GSETTINGS_SCHEMA_DIR", _tmp10_, TRUE);
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (_tmp10_);
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (_tmp8_);
-#line 332 "/home/jens/Source/shotwell/src/main.vala"
+#line 336 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (_tmp6_);
-#line 2441 "main.c"
+#line 2404 "main.c"
 	}
 	{
 		const gchar* _tmp11_ = NULL;
@@ -2453,26 +2416,26 @@ void _vala_main (gchar** args, int args_length1) {
 		GOptionEntry* _tmp13_ = NULL;
 		GOptionEntry* _tmp14_ = NULL;
 		gint _tmp14__length1 = 0;
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp11_ = _ ("[FILE]");
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp13_ = commandline_options_get_options (&_tmp12_);
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp14_ = _tmp13_;
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp14__length1 = _tmp12_;
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		gtk_init_with_args (&args_length1, &args, _tmp11_, _tmp14_, RESOURCES_APP_GETTEXT_PACKAGE, &_inner_error_);
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp14_ = (g_free (_tmp14_), NULL);
-#line 338 "/home/jens/Source/shotwell/src/main.vala"
+#line 342 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 2463 "main.c"
-			goto __catch223_g_error;
+#line 2426 "main.c"
+			goto __catch224_g_error;
 		}
 	}
-	goto __finally223;
-	__catch223_g_error:
+	goto __finally224;
+	__catch224_g_error:
 	{
 		GError* e = NULL;
 		GError* _tmp15_ = NULL;
@@ -2483,94 +2446,94 @@ void _vala_main (gchar** args, int args_length1) {
 		gchar** _tmp20_ = NULL;
 		gint _tmp20__length1 = 0;
 		const gchar* _tmp21_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/main.vala"
+#line 341 "/home/jens/Source/shotwell/src/main.vala"
 		e = _inner_error_;
-#line 337 "/home/jens/Source/shotwell/src/main.vala"
-		_inner_error_ = NULL;
 #line 341 "/home/jens/Source/shotwell/src/main.vala"
+		_inner_error_ = NULL;
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp15_ = e;
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp16_ = _tmp15_->message;
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp17_ = g_strconcat (_tmp16_, "\n", NULL);
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp18_ = _tmp17_;
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		g_print ("%s", _tmp18_);
-#line 341 "/home/jens/Source/shotwell/src/main.vala"
+#line 345 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (_tmp18_);
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 346 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp19_ = _ ("Run “%s --help” to see a full list of available command line options.\n");
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 346 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp20_ = args;
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 346 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp20__length1 = args_length1;
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 346 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp21_ = _tmp20_[0];
-#line 342 "/home/jens/Source/shotwell/src/main.vala"
+#line 346 "/home/jens/Source/shotwell/src/main.vala"
 		g_print (_tmp19_, _tmp21_);
-#line 343 "/home/jens/Source/shotwell/src/main.vala"
+#line 347 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_terminate ();
-#line 344 "/home/jens/Source/shotwell/src/main.vala"
+#line 348 "/home/jens/Source/shotwell/src/main.vala"
 		_g_error_free0 (e);
-#line 344 "/home/jens/Source/shotwell/src/main.vala"
+#line 348 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2511 "main.c"
+#line 2474 "main.c"
 	}
-	__finally223:
-#line 337 "/home/jens/Source/shotwell/src/main.vala"
+	__finally224:
+#line 341 "/home/jens/Source/shotwell/src/main.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 337 "/home/jens/Source/shotwell/src/main.vala"
+#line 341 "/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 337 "/home/jens/Source/shotwell/src/main.vala"
+#line 341 "/home/jens/Source/shotwell/src/main.vala"
 		g_clear_error (&_inner_error_);
-#line 337 "/home/jens/Source/shotwell/src/main.vala"
+#line 341 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2522 "main.c"
+#line 2485 "main.c"
 	}
-#line 347 "/home/jens/Source/shotwell/src/main.vala"
+#line 351 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp22_ = commandline_options_show_version;
-#line 347 "/home/jens/Source/shotwell/src/main.vala"
+#line 351 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp22_) {
-#line 348 "/home/jens/Source/shotwell/src/main.vala"
+#line 352 "/home/jens/Source/shotwell/src/main.vala"
 		if (RESOURCES_GIT_VERSION != NULL) {
-#line 349 "/home/jens/Source/shotwell/src/main.vala"
+#line 353 "/home/jens/Source/shotwell/src/main.vala"
 			g_print ("%s %s (%s)\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2532 "main.c"
+#line 2495 "main.c"
 		} else {
-#line 351 "/home/jens/Source/shotwell/src/main.vala"
+#line 355 "/home/jens/Source/shotwell/src/main.vala"
 			g_print ("%s %s\n", RESOURCES_APP_TITLE, RESOURCES_APP_VERSION);
-#line 2536 "main.c"
+#line 2499 "main.c"
 		}
-#line 353 "/home/jens/Source/shotwell/src/main.vala"
+#line 357 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_terminate ();
-#line 355 "/home/jens/Source/shotwell/src/main.vala"
+#line 359 "/home/jens/Source/shotwell/src/main.vala"
 		return;
-#line 2542 "main.c"
+#line 2505 "main.c"
 	}
-#line 365 "/home/jens/Source/shotwell/src/main.vala"
+#line 369 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp23_ = g_new0 (gchar*, 0 + 1);
-#line 365 "/home/jens/Source/shotwell/src/main.vala"
+#line 369 "/home/jens/Source/shotwell/src/main.vala"
 	mounts = _tmp23_;
-#line 365 "/home/jens/Source/shotwell/src/main.vala"
+#line 369 "/home/jens/Source/shotwell/src/main.vala"
 	mounts_length1 = 0;
-#line 365 "/home/jens/Source/shotwell/src/main.vala"
+#line 369 "/home/jens/Source/shotwell/src/main.vala"
 	_mounts_size_ = mounts_length1;
-#line 366 "/home/jens/Source/shotwell/src/main.vala"
+#line 370 "/home/jens/Source/shotwell/src/main.vala"
 	filename = NULL;
-#line 2554 "main.c"
+#line 2517 "main.c"
 	{
 		gint ctr = 0;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 		ctr = 1;
-#line 2559 "main.c"
+#line 2522 "main.c"
 		{
 			gboolean _tmp24_ = FALSE;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp24_ = TRUE;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 			while (TRUE) {
-#line 2566 "main.c"
+#line 2529 "main.c"
 				gint _tmp26_ = 0;
 				gchar** _tmp27_ = NULL;
 				gint _tmp27__length1 = 0;
@@ -2582,281 +2545,281 @@ void _vala_main (gchar** args, int args_length1) {
 				gchar* _tmp31_ = NULL;
 				const gchar* _tmp32_ = NULL;
 				gboolean _tmp33_ = FALSE;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				if (!_tmp24_) {
-#line 2580 "main.c"
+#line 2543 "main.c"
 					gint _tmp25_ = 0;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp25_ = ctr;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 					ctr = _tmp25_ + 1;
-#line 2586 "main.c"
+#line 2549 "main.c"
 				}
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp24_ = FALSE;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp26_ = ctr;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp27_ = args;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp27__length1 = args_length1;
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				if (!(_tmp26_ < _tmp27__length1)) {
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 					break;
-#line 2600 "main.c"
+#line 2563 "main.c"
 				}
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp28_ = args;
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp28__length1 = args_length1;
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp29_ = ctr;
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp30_ = _tmp28_[_tmp29_];
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp31_ = g_strdup (_tmp30_);
-#line 369 "/home/jens/Source/shotwell/src/main.vala"
+#line 373 "/home/jens/Source/shotwell/src/main.vala"
 				arg = _tmp31_;
-#line 371 "/home/jens/Source/shotwell/src/main.vala"
+#line 375 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp32_ = arg;
-#line 371 "/home/jens/Source/shotwell/src/main.vala"
+#line 375 "/home/jens/Source/shotwell/src/main.vala"
 				_tmp33_ = library_window_is_mount_uri_supported (_tmp32_);
-#line 371 "/home/jens/Source/shotwell/src/main.vala"
+#line 375 "/home/jens/Source/shotwell/src/main.vala"
 				if (_tmp33_) {
-#line 2620 "main.c"
+#line 2583 "main.c"
 					gchar** _tmp34_ = NULL;
 					gint _tmp34__length1 = 0;
 					const gchar* _tmp35_ = NULL;
 					gchar* _tmp36_ = NULL;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp34_ = mounts;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp34__length1 = mounts_length1;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp35_ = arg;
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp36_ = g_strdup (_tmp35_);
-#line 372 "/home/jens/Source/shotwell/src/main.vala"
+#line 376 "/home/jens/Source/shotwell/src/main.vala"
 					_vala_array_add75 (&mounts, &mounts_length1, &_mounts_size_, _tmp36_);
-#line 2635 "main.c"
+#line 2598 "main.c"
 				} else {
 					gboolean _tmp37_ = FALSE;
 					const gchar* _tmp38_ = NULL;
 					gboolean _tmp39_ = FALSE;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp38_ = filename;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 					_tmp39_ = is_string_empty (_tmp38_);
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 					if (_tmp39_) {
-#line 2646 "main.c"
+#line 2609 "main.c"
 						const gchar* _tmp40_ = NULL;
 						gboolean _tmp41_ = FALSE;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp40_ = arg;
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp41_ = string_contains (_tmp40_, "://");
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp37_ = !_tmp41_;
-#line 2655 "main.c"
+#line 2618 "main.c"
 					} else {
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp37_ = FALSE;
-#line 2659 "main.c"
+#line 2622 "main.c"
 					}
-#line 373 "/home/jens/Source/shotwell/src/main.vala"
+#line 377 "/home/jens/Source/shotwell/src/main.vala"
 					if (_tmp37_) {
-#line 2663 "main.c"
+#line 2626 "main.c"
 						const gchar* _tmp42_ = NULL;
 						gchar* _tmp43_ = NULL;
-#line 374 "/home/jens/Source/shotwell/src/main.vala"
+#line 378 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp42_ = arg;
-#line 374 "/home/jens/Source/shotwell/src/main.vala"
+#line 378 "/home/jens/Source/shotwell/src/main.vala"
 						_tmp43_ = g_strdup (_tmp42_);
-#line 374 "/home/jens/Source/shotwell/src/main.vala"
+#line 378 "/home/jens/Source/shotwell/src/main.vala"
 						_g_free0 (filename);
-#line 374 "/home/jens/Source/shotwell/src/main.vala"
+#line 378 "/home/jens/Source/shotwell/src/main.vala"
 						filename = _tmp43_;
-#line 2674 "main.c"
+#line 2637 "main.c"
 					}
 				}
-#line 368 "/home/jens/Source/shotwell/src/main.vala"
+#line 372 "/home/jens/Source/shotwell/src/main.vala"
 				_g_free0 (arg);
-#line 2679 "main.c"
+#line 2642 "main.c"
 			}
 		}
 	}
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp45_ = filename;
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp46_ = is_string_empty (_tmp45_);
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp46_) {
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp44_ = DEBUG_LIBRARY_PREFIX;
-#line 2691 "main.c"
+#line 2654 "main.c"
 	} else {
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp44_ = DEBUG_VIEWER_PREFIX;
-#line 2695 "main.c"
+#line 2658 "main.c"
 	}
-#line 378 "/home/jens/Source/shotwell/src/main.vala"
+#line 382 "/home/jens/Source/shotwell/src/main.vala"
 	debug_init (_tmp44_);
-#line 380 "/home/jens/Source/shotwell/src/main.vala"
+#line 384 "/home/jens/Source/shotwell/src/main.vala"
 	if (RESOURCES_GIT_VERSION != NULL) {
-#line 2701 "main.c"
+#line 2664 "main.c"
 		const gchar* _tmp47_ = NULL;
 		const gchar* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp48_ = filename;
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp49_ = is_string_empty (_tmp48_);
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 		if (_tmp49_) {
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp47_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2713 "main.c"
+#line 2676 "main.c"
 		} else {
-#line 382 "/home/jens/Source/shotwell/src/main.vala"
+#line 386 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp47_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2717 "main.c"
+#line 2680 "main.c"
 		}
-#line 381 "/home/jens/Source/shotwell/src/main.vala"
-		g_message ("main.vala:381: Shotwell %s %s (%s)", _tmp47_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
-#line 2721 "main.c"
+#line 385 "/home/jens/Source/shotwell/src/main.vala"
+		g_message ("main.vala:385: Shotwell %s %s (%s)", _tmp47_, RESOURCES_APP_VERSION, RESOURCES_GIT_VERSION);
+#line 2684 "main.c"
 	} else {
 		const gchar* _tmp50_ = NULL;
 		const gchar* _tmp51_ = NULL;
 		gboolean _tmp52_ = FALSE;
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp51_ = filename;
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp52_ = is_string_empty (_tmp51_);
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 		if (_tmp52_) {
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp50_ = RESOURCES_APP_LIBRARY_ROLE;
-#line 2734 "main.c"
+#line 2697 "main.c"
 		} else {
-#line 386 "/home/jens/Source/shotwell/src/main.vala"
+#line 390 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp50_ = RESOURCES_APP_DIRECT_ROLE;
-#line 2738 "main.c"
+#line 2701 "main.c"
 		}
-#line 385 "/home/jens/Source/shotwell/src/main.vala"
-		g_message ("main.vala:385: Shotwell %s %s", _tmp50_, RESOURCES_APP_VERSION);
-#line 2742 "main.c"
-	}
 #line 389 "/home/jens/Source/shotwell/src/main.vala"
+		g_message ("main.vala:389: Shotwell %s %s", _tmp50_, RESOURCES_APP_VERSION);
+#line 2705 "main.c"
+	}
+#line 393 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp53_ = g_date_time_new_now_local ();
-#line 389 "/home/jens/Source/shotwell/src/main.vala"
+#line 393 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp54_ = _tmp53_;
-#line 389 "/home/jens/Source/shotwell/src/main.vala"
+#line 393 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp55_ = g_date_time_get_timezone_abbreviation (_tmp54_);
-#line 389 "/home/jens/Source/shotwell/src/main.vala"
-	g_debug ("main.vala:389: Shotwell is running in timezone %s", _tmp55_);
-#line 389 "/home/jens/Source/shotwell/src/main.vala"
+#line 393 "/home/jens/Source/shotwell/src/main.vala"
+	g_debug ("main.vala:393: Shotwell is running in timezone %s", _tmp55_);
+#line 393 "/home/jens/Source/shotwell/src/main.vala"
 	_g_date_time_unref0 (_tmp54_);
-#line 394 "/home/jens/Source/shotwell/src/main.vala"
+#line 398 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp56_ = filename;
-#line 394 "/home/jens/Source/shotwell/src/main.vala"
+#line 398 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp57_ = is_string_empty (_tmp56_);
-#line 394 "/home/jens/Source/shotwell/src/main.vala"
+#line 398 "/home/jens/Source/shotwell/src/main.vala"
 	application_init (!_tmp57_);
-#line 397 "/home/jens/Source/shotwell/src/main.vala"
+#line 401 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp58_ = commandline_options_data_dir;
-#line 397 "/home/jens/Source/shotwell/src/main.vala"
+#line 401 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp58_ != NULL) {
-#line 2764 "main.c"
+#line 2727 "main.c"
 		const gchar* _tmp59_ = NULL;
-#line 398 "/home/jens/Source/shotwell/src/main.vala"
+#line 402 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp59_ = commandline_options_data_dir;
-#line 398 "/home/jens/Source/shotwell/src/main.vala"
+#line 402 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_set_data_dir (_tmp59_);
-#line 2770 "main.c"
+#line 2733 "main.c"
 	} else {
-#line 400 "/home/jens/Source/shotwell/src/main.vala"
+#line 404 "/home/jens/Source/shotwell/src/main.vala"
 		app_dirs_try_migrate_data ();
-#line 2774 "main.c"
+#line 2737 "main.c"
 	}
-#line 403 "/home/jens/Source/shotwell/src/main.vala"
+#line 407 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_verify_data_dir ();
-#line 404 "/home/jens/Source/shotwell/src/main.vala"
+#line 408 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_verify_cache_dir ();
-#line 407 "/home/jens/Source/shotwell/src/main.vala"
+#line 411 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp60_ = args;
-#line 407 "/home/jens/Source/shotwell/src/main.vala"
+#line 411 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp60__length1 = args_length1;
-#line 407 "/home/jens/Source/shotwell/src/main.vala"
+#line 411 "/home/jens/Source/shotwell/src/main.vala"
 	international_support_init (RESOURCES_APP_GETTEXT_PACKAGE, _tmp60_, _tmp60__length1, INTERNATIONAL_SUPPORT_SYSTEM_LOCALE);
-#line 409 "/home/jens/Source/shotwell/src/main.vala"
+#line 413 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp61_ = g_timer_new ();
-#line 409 "/home/jens/Source/shotwell/src/main.vala"
+#line 413 "/home/jens/Source/shotwell/src/main.vala"
 	_g_timer_destroy0 (startup_timer);
-#line 409 "/home/jens/Source/shotwell/src/main.vala"
+#line 413 "/home/jens/Source/shotwell/src/main.vala"
 	startup_timer = _tmp61_;
-#line 410 "/home/jens/Source/shotwell/src/main.vala"
+#line 414 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp62_ = startup_timer;
-#line 410 "/home/jens/Source/shotwell/src/main.vala"
+#line 414 "/home/jens/Source/shotwell/src/main.vala"
 	g_timer_start (_tmp62_);
-#line 413 "/home/jens/Source/shotwell/src/main.vala"
-	g_set_application_name (RESOURCES_APP_TITLE);
 #line 417 "/home/jens/Source/shotwell/src/main.vala"
+	g_set_application_name (RESOURCES_APP_TITLE);
+#line 421 "/home/jens/Source/shotwell/src/main.vala"
 	resources_init ();
-#line 422 "/home/jens/Source/shotwell/src/main.vala"
+#line 426 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp63_ = filename;
-#line 422 "/home/jens/Source/shotwell/src/main.vala"
+#line 426 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp64_ = is_string_empty (_tmp63_);
-#line 422 "/home/jens/Source/shotwell/src/main.vala"
+#line 426 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp64_) {
-#line 2806 "main.c"
+#line 2769 "main.c"
 		gchar** _tmp65_ = NULL;
 		gint _tmp65__length1 = 0;
-#line 423 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp65_ = mounts;
-#line 423 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp65__length1 = mounts_length1;
-#line 423 "/home/jens/Source/shotwell/src/main.vala"
+#line 427 "/home/jens/Source/shotwell/src/main.vala"
 		library_exec (_tmp65_, _tmp65__length1);
-#line 2815 "main.c"
+#line 2778 "main.c"
 	} else {
 		const gchar* _tmp66_ = NULL;
-#line 425 "/home/jens/Source/shotwell/src/main.vala"
+#line 429 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp66_ = filename;
-#line 425 "/home/jens/Source/shotwell/src/main.vala"
+#line 429 "/home/jens/Source/shotwell/src/main.vala"
 		editing_exec (_tmp66_);
-#line 2822 "main.c"
+#line 2785 "main.c"
 	}
-#line 428 "/home/jens/Source/shotwell/src/main.vala"
+#line 432 "/home/jens/Source/shotwell/src/main.vala"
 	resources_terminate ();
-#line 429 "/home/jens/Source/shotwell/src/main.vala"
+#line 433 "/home/jens/Source/shotwell/src/main.vala"
 	application_terminate ();
-#line 430 "/home/jens/Source/shotwell/src/main.vala"
+#line 434 "/home/jens/Source/shotwell/src/main.vala"
 	debug_terminate ();
-#line 431 "/home/jens/Source/shotwell/src/main.vala"
+#line 435 "/home/jens/Source/shotwell/src/main.vala"
 	app_dirs_terminate ();
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp68_ = filename;
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 	_tmp69_ = is_string_empty (_tmp68_);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp69_) {
-#line 2838 "main.c"
+#line 2801 "main.c"
 		gboolean _tmp70_ = FALSE;
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp70_ = was_already_running;
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp67_ = !_tmp70_;
-#line 2844 "main.c"
+#line 2807 "main.c"
 	} else {
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp67_ = FALSE;
-#line 2848 "main.c"
+#line 2811 "main.c"
 	}
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 	if (_tmp67_) {
-#line 2852 "main.c"
+#line 2815 "main.c"
 		gchar* orig_path = NULL;
 		GFile* _tmp71_ = NULL;
 		GFile* _tmp72_ = NULL;
@@ -2867,31 +2830,31 @@ void _vala_main (gchar** args, int args_length1) {
 		gchar* backup_path = NULL;
 		const gchar* _tmp77_ = NULL;
 		gchar* _tmp78_ = NULL;
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp71_ = app_dirs_get_data_subdir ("data", NULL);
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp72_ = _tmp71_;
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp73_ = g_file_get_child (_tmp72_, "photo.db");
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp74_ = _tmp73_;
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp75_ = g_file_get_path (_tmp74_);
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp76_ = _tmp75_;
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (_tmp74_);
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		_g_object_unref0 (_tmp72_);
-#line 437 "/home/jens/Source/shotwell/src/main.vala"
+#line 441 "/home/jens/Source/shotwell/src/main.vala"
 		orig_path = _tmp76_;
-#line 438 "/home/jens/Source/shotwell/src/main.vala"
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp77_ = orig_path;
-#line 438 "/home/jens/Source/shotwell/src/main.vala"
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
 		_tmp78_ = g_strconcat (_tmp77_, ".bak", NULL);
-#line 438 "/home/jens/Source/shotwell/src/main.vala"
+#line 442 "/home/jens/Source/shotwell/src/main.vala"
 		backup_path = _tmp78_;
-#line 2887 "main.c"
+#line 2850 "main.c"
 		{
 			GFile* src = NULL;
 			const gchar* _tmp79_ = NULL;
@@ -2901,91 +2864,91 @@ void _vala_main (gchar** args, int args_length1) {
 			GFile* _tmp82_ = NULL;
 			GFile* _tmp83_ = NULL;
 			GFile* _tmp84_ = NULL;
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
+#line 444 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp79_ = orig_path;
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
+#line 444 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp80_ = g_file_new_for_commandline_arg (_tmp79_);
-#line 440 "/home/jens/Source/shotwell/src/main.vala"
+#line 444 "/home/jens/Source/shotwell/src/main.vala"
 			src = _tmp80_;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
+#line 445 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp81_ = backup_path;
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
+#line 445 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp82_ = g_file_new_for_commandline_arg (_tmp81_);
-#line 441 "/home/jens/Source/shotwell/src/main.vala"
+#line 445 "/home/jens/Source/shotwell/src/main.vala"
 			dest = _tmp82_;
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp83_ = src;
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp84_ = dest;
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 			g_file_copy (_tmp83_, _tmp84_, G_FILE_COPY_OVERWRITE | G_FILE_COPY_ALL_METADATA, NULL, NULL, NULL, &_inner_error_);
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 				_g_object_unref0 (dest);
-#line 442 "/home/jens/Source/shotwell/src/main.vala"
+#line 446 "/home/jens/Source/shotwell/src/main.vala"
 				_g_object_unref0 (src);
-#line 2921 "main.c"
-				goto __catch224_g_error;
+#line 2884 "main.c"
+				goto __catch225_g_error;
 			}
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_object_unref0 (dest);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_object_unref0 (src);
-#line 2928 "main.c"
+#line 2891 "main.c"
 		}
-		goto __finally224;
-		__catch224_g_error:
+		goto __finally225;
+		__catch225_g_error:
 		{
 			GError* _error_ = NULL;
 			GError* _tmp85_ = NULL;
 			const gchar* _tmp86_ = NULL;
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_error_ = _inner_error_;
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_inner_error_ = NULL;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
+#line 450 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp85_ = _error_;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
+#line 450 "/home/jens/Source/shotwell/src/main.vala"
 			_tmp86_ = _tmp85_->message;
-#line 446 "/home/jens/Source/shotwell/src/main.vala"
-			g_warning ("main.vala:446: Failed to create backup file of database: %s", _tmp86_);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 450 "/home/jens/Source/shotwell/src/main.vala"
+			g_warning ("main.vala:450: Failed to create backup file of database: %s", _tmp86_);
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_error_free0 (_error_);
-#line 2948 "main.c"
+#line 2911 "main.c"
 		}
-		__finally224:
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+		__finally225:
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (backup_path);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (orig_path);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			_g_free0 (filename);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/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 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			g_clear_error (&_inner_error_);
-#line 439 "/home/jens/Source/shotwell/src/main.vala"
+#line 443 "/home/jens/Source/shotwell/src/main.vala"
 			return;
-#line 2967 "main.c"
+#line 2930 "main.c"
 		}
-#line 449 "/home/jens/Source/shotwell/src/main.vala"
+#line 453 "/home/jens/Source/shotwell/src/main.vala"
 		sync ();
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (backup_path);
-#line 436 "/home/jens/Source/shotwell/src/main.vala"
+#line 440 "/home/jens/Source/shotwell/src/main.vala"
 		_g_free0 (orig_path);
-#line 2975 "main.c"
+#line 2938 "main.c"
 	}
-#line 317 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	_g_free0 (filename);
-#line 317 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	mounts = (_vala_array_free (mounts, mounts_length1, (GDestroyNotify) g_free), NULL);
-#line 2981 "main.c"
+#line 2944 "main.c"
 }
 
 
@@ -2996,11 +2959,11 @@ int main (int argc, char ** argv) {
 #if !GLIB_CHECK_VERSION (2,35,0)
 	g_type_init ();
 #endif
-#line 317 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	_vala_main (argv, argc);
-#line 317 "/home/jens/Source/shotwell/src/main.vala"
+#line 316 "/home/jens/Source/shotwell/src/main.vala"
 	return 0;
-#line 2996 "main.c"
+#line 2959 "main.c"
 }
 
 
diff --git a/src/main.vala b/src/main.vala
index 6941734..0755f62 100644
--- a/src/main.vala
+++ b/src/main.vala
@@ -105,8 +105,7 @@ void library_exec(string[] mounts) {
             progress_dialog.update_display_every(100);
             progress_dialog.set_minimum_on_screen_time_msec(250);
             try {
-                string icon_path = AppDirs.get_resources_dir().get_child("icons").get_child("shotwell.svg").get_path();
-                progress_dialog.icon = new Gdk.Pixbuf.from_file(icon_path);
+                progress_dialog.icon = new Gdk.Pixbuf.from_resource("/org/gnome/Shotwell/icons/shotwell.svg");
             } catch (Error err) {
                 debug("Warning - could not load application icon for loading window: %s", err.message);
             }
@@ -323,6 +322,11 @@ void main(string[] args) {
     // parser is initialized in a thread-safe fashion; please see 
     // http://redmine.yorba.org/issues/4120 for details.
     GExiv2.initialize();
+    GExiv2.log_use_glib_logging();
+
+    // Set GExiv2 log level to DEBUG, filtering will be done through Shotwell
+    // logging mechanisms
+    GExiv2.log_set_level(GExiv2.LogLevel.DEBUG);
 
     // following the GIO programming guidelines at http://developer.gnome.org/gio/2.26/ch03.html,
     // set the GSETTINGS_SCHEMA_DIR environment variable to allow us to load GSettings schemas from 
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 2b56cbf..12ffba3 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -29,6 +29,8 @@
 
 #define GRAW_TYPE_INTERPOLATION_QUALITY (graw_interpolation_quality_get_type ())
 
+#define GRAW_TYPE_USE_CAMERA_MATRIX (graw_use_camera_matrix_get_type ())
+
 #define GRAW_TYPE_PROCESSED_IMAGE (graw_processed_image_get_type ())
 #define GRAW_PROCESSED_IMAGE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImage))
 #define GRAW_PROCESSED_IMAGE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImageClass))
@@ -115,6 +117,12 @@ typedef enum  {
 	GRAW_INTERPOLATION_QUALITY_AHD = 3
 } GRawInterpolationQuality;
 
+typedef enum  {
+	GRAW_USE_CAMERA_MATRIX_IGNORE = 0,
+	GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE = 1,
+	GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA = 3
+} GRawUseCameraMatrix;
+
 struct _GRawProcessedImage {
 	GTypeInstance parent_instance;
 	volatile int ref_count;
@@ -168,6 +176,7 @@ GType graw_flip_get_type (void) G_GNUC_CONST;
 GType graw_fuji_rotate_get_type (void) G_GNUC_CONST;
 GType graw_highlight_mode_get_type (void) G_GNUC_CONST;
 GType graw_interpolation_quality_get_type (void) G_GNUC_CONST;
+GType graw_use_camera_matrix_get_type (void) G_GNUC_CONST;
 gpointer graw_processed_image_ref (gpointer instance);
 void graw_processed_image_unref (gpointer instance);
 GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -290,6 +299,18 @@ GType graw_interpolation_quality_get_type (void) {
 }
 
 
+GType graw_use_camera_matrix_get_type (void) {
+	static volatile gsize graw_use_camera_matrix_type_id__volatile = 0;
+	if (g_once_init_enter (&graw_use_camera_matrix_type_id__volatile)) {
+		static const GEnumValue values[] = {{GRAW_USE_CAMERA_MATRIX_IGNORE, "GRAW_USE_CAMERA_MATRIX_IGNORE", "ignore"}, {GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE, "GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE", "embedded-color-profile"}, {GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA, "GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA", "embedded-color-data"}, {0, NULL, NULL}};
+		GType graw_use_camera_matrix_type_id;
+		graw_use_camera_matrix_type_id = g_enum_register_static ("GRawUseCameraMatrix", values);
+		g_once_init_leave (&graw_use_camera_matrix_type_id__volatile, graw_use_camera_matrix_type_id);
+	}
+	return graw_use_camera_matrix_type_id__volatile;
+}
+
+
 GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_data_t* proc, GError** error) {
 	GRawProcessedImage* self = NULL;
 	enum LibRaw_errors _result_ = 0;
@@ -312,91 +333,91 @@ GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_da
 	gushort _tmp15_ = 0U;
 	GdkPixbuf* _tmp16_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (proc != NULL, NULL);
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = (GRawProcessedImage*) g_type_create_instance (object_type);
-#line 107 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 113 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_result_ = LIBRAW_SUCCESS;
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = proc;
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_dcraw_make_mem_image (_tmp0_, &_result_);
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_free0 (self->priv->image);
-#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv->image = _tmp1_;
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = _result_;
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("ProcessedImage", _tmp2_, &_inner_error_);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_graw_processed_image_unref0 (self);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 344 "GRaw.c"
+#line 365 "GRaw.c"
 		} else {
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 109 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 352 "GRaw.c"
+#line 373 "GRaw.c"
 		}
 	}
-#line 110 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp3_ = self->priv->image;
-#line 110 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_vala_assert (_tmp3_ != NULL, "image != null");
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp4_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp5_ = _tmp4_->data;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp5__length1 = _tmp4_->data_size;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp6_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp7_ = _tmp6_->bits;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp8_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp9_ = _tmp8_->width;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp10_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp11_ = _tmp10_->height;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp12_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp13_ = _tmp12_->width;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp14_ = self->priv->image;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp15_ = _tmp14_->colors;
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp16_ = gdk_pixbuf_new_from_data (_tmp5_, GDK_COLORSPACE_RGB, FALSE, (gint) _tmp7_, (gint) _tmp9_, (gint) _tmp11_, (gint) (_tmp13_ * _tmp15_), (GdkPixbufDestroyNotify) NULL, NULL);
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_g_object_unref0 (self->priv->pixbuf);
-#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv->pixbuf = _tmp16_;
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return self;
-#line 393 "GRaw.c"
+#line 414 "GRaw.c"
 }
 
 
 GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, GError** error) {
-#line 106 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return graw_processed_image_construct (GRAW_TYPE_PROCESSED_IMAGE, proc, error);
-#line 400 "GRaw.c"
+#line 421 "GRaw.c"
 }
 
 
@@ -424,50 +445,50 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 	gint _tmp31_ = 0;
 	gint _tmp32_ = 0;
 	GError * _inner_error_ = NULL;
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (proc != NULL, NULL);
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = (GRawProcessedImage*) g_type_create_instance (object_type);
-#line 119 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_result_ = LIBRAW_SUCCESS;
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = proc;
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_dcraw_make_mem_thumb (_tmp0_, &_result_);
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_free0 (self->priv->image);
-#line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv->image = _tmp1_;
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = _result_;
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("ProcessedImage.from_thumb", _tmp2_, &_inner_error_);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_graw_processed_image_unref0 (self);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 456 "GRaw.c"
+#line 477 "GRaw.c"
 		} else {
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 121 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 464 "GRaw.c"
+#line 485 "GRaw.c"
 		}
 	}
-#line 122 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp3_ = self->priv->image;
-#line 122 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_vala_assert (_tmp3_ != NULL, "image != null");
-#line 471 "GRaw.c"
+#line 492 "GRaw.c"
 	{
 		GBytes* bytes = NULL;
 		libraw_processed_image_t* _tmp4_ = NULL;
@@ -481,50 +502,50 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 		GdkPixbuf* _tmp11_ = NULL;
 		GdkPixbuf* _tmp12_ = NULL;
 		GdkPixbuf* _tmp13_ = NULL;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp4_ = self->priv->image;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp5_ = _tmp4_->data;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp5__length1 = _tmp4_->data_size;
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp6_ = g_bytes_new_static (_tmp5_, _tmp5__length1);
-#line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		bytes = _tmp6_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp8_ = bytes;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp9_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp8_);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp10_ = _tmp9_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp12_ = _tmp11_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_object_unref0 (_tmp10_);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp7_ = _tmp12_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_g_bytes_unref0 (bytes);
-#line 513 "GRaw.c"
+#line 534 "GRaw.c"
 			goto __catch29_g_error;
 		}
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp13_ = _tmp7_;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp7_ = NULL;
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_object_unref0 (self->priv->pixbuf);
-#line 129 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		self->priv->pixbuf = _tmp13_;
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_object_unref0 (_tmp7_);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_bytes_unref0 (bytes);
-#line 528 "GRaw.c"
+#line 549 "GRaw.c"
 	}
 	goto __finally29;
 	__catch29_g_error:
@@ -533,95 +554,95 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type
 		GError* _tmp14_ = NULL;
 		const gchar* _tmp15_ = NULL;
 		GError* _tmp16_ = NULL;
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		err = _inner_error_;
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_inner_error_ = NULL;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp14_ = err;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp15_ = _tmp14_->message;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp16_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp15_);
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_inner_error_ = _tmp16_;
-#line 132 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_g_error_free0 (err);
-#line 551 "GRaw.c"
+#line 572 "GRaw.c"
 		goto __finally29;
 	}
 	__finally29:
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_graw_processed_image_unref0 (self);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 565 "GRaw.c"
+#line 586 "GRaw.c"
 		} else {
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %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/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 573 "GRaw.c"
+#line 594 "GRaw.c"
 		}
 	}
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp17_ = self->priv->image;
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp18_ = self->priv->pixbuf;
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp19_ = gdk_pixbuf_get_width (_tmp18_);
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp20_ = _tmp19_;
-#line 136 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp17_->width = (gushort) _tmp20_;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp21_ = self->priv->image;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp22_ = self->priv->pixbuf;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp23_ = gdk_pixbuf_get_height (_tmp22_);
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp24_ = _tmp23_;
-#line 137 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp21_->height = (gushort) _tmp24_;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp25_ = self->priv->image;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp26_ = self->priv->pixbuf;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp27_ = gdk_pixbuf_get_n_channels (_tmp26_);
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp28_ = _tmp27_;
-#line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp25_->colors = (gushort) _tmp28_;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp29_ = self->priv->image;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp30_ = self->priv->pixbuf;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp31_ = gdk_pixbuf_get_bits_per_sample (_tmp30_);
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp32_ = _tmp31_;
-#line 139 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp29_->bits = (gushort) _tmp32_;
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return self;
-#line 618 "GRaw.c"
+#line 639 "GRaw.c"
 }
 
 
 GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, GError** error) {
-#line 118 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return graw_processed_image_construct_from_thumb (GRAW_TYPE_PROCESSED_IMAGE, proc, error);
-#line 625 "GRaw.c"
+#line 646 "GRaw.c"
 }
 
 
@@ -629,17 +650,17 @@ GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) {
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 149 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL);
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->pixbuf;
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = gdk_pixbuf_copy (_tmp0_);
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 643 "GRaw.c"
+#line 664 "GRaw.c"
 }
 
 
@@ -647,17 +668,17 @@ gushort graw_processed_image_get_width (GRawProcessedImage* self) {
 	gushort result;
 	libraw_processed_image_t* _tmp0_ = NULL;
 	gushort _tmp1_ = 0U;
-#line 71 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 77 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->width;
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 661 "GRaw.c"
+#line 682 "GRaw.c"
 }
 
 
@@ -665,17 +686,17 @@ gushort graw_processed_image_get_height (GRawProcessedImage* self) {
 	gushort result;
 	libraw_processed_image_t* _tmp0_ = NULL;
 	gushort _tmp1_ = 0U;
-#line 77 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->height;
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 679 "GRaw.c"
+#line 700 "GRaw.c"
 }
 
 
@@ -683,17 +704,17 @@ gushort graw_processed_image_get_colors (GRawProcessedImage* self) {
 	gushort result;
 	libraw_processed_image_t* _tmp0_ = NULL;
 	gushort _tmp1_ = 0U;
-#line 83 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 89 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->colors;
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 697 "GRaw.c"
+#line 718 "GRaw.c"
 }
 
 
@@ -701,17 +722,17 @@ gushort graw_processed_image_get_bits (GRawProcessedImage* self) {
 	gushort result;
 	libraw_processed_image_t* _tmp0_ = NULL;
 	gushort _tmp1_ = 0U;
-#line 89 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 95 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->bits;
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 715 "GRaw.c"
+#line 736 "GRaw.c"
 }
 
 
@@ -720,19 +741,19 @@ guint8* graw_processed_image_get_data (GRawProcessedImage* self) {
 	libraw_processed_image_t* _tmp0_ = NULL;
 	guint8* _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 95 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 101 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL);
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->data;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1__length1 = _tmp0_->data_size;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 736 "GRaw.c"
+#line 757 "GRaw.c"
 }
 
 
@@ -740,233 +761,233 @@ guint graw_processed_image_get_data_size (GRawProcessedImage* self) {
 	guint result;
 	libraw_processed_image_t* _tmp0_ = NULL;
 	guint _tmp1_ = 0U;
-#line 101 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 107 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U);
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->image;
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_->data_size;
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 754 "GRaw.c"
+#line 775 "GRaw.c"
 }
 
 
 static void graw_value_processed_image_init (GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	value->data[0].v_pointer = NULL;
-#line 761 "GRaw.c"
+#line 782 "GRaw.c"
 }
 
 
 static void graw_value_processed_image_free_value (GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (value->data[0].v_pointer) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processed_image_unref (value->data[0].v_pointer);
-#line 770 "GRaw.c"
+#line 791 "GRaw.c"
 	}
 }
 
 
 static void graw_value_processed_image_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (src_value->data[0].v_pointer) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = graw_processed_image_ref (src_value->data[0].v_pointer);
-#line 780 "GRaw.c"
+#line 801 "GRaw.c"
 	} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 784 "GRaw.c"
+#line 805 "GRaw.c"
 	}
 }
 
 
 static gpointer graw_value_processed_image_peek_pointer (const GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 792 "GRaw.c"
+#line 813 "GRaw.c"
 }
 
 
 static gchar* graw_value_processed_image_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (collect_values[0].v_pointer) {
-#line 799 "GRaw.c"
+#line 820 "GRaw.c"
 		GRawProcessedImage* object;
 		object = collect_values[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 806 "GRaw.c"
+#line 827 "GRaw.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.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 810 "GRaw.c"
+#line 831 "GRaw.c"
 		}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = graw_processed_image_ref (object);
-#line 814 "GRaw.c"
+#line 835 "GRaw.c"
 	} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 818 "GRaw.c"
+#line 839 "GRaw.c"
 	}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 822 "GRaw.c"
+#line 843 "GRaw.c"
 }
 
 
 static gchar* graw_value_processed_image_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	GRawProcessedImage** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!object_p) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 833 "GRaw.c"
+#line 854 "GRaw.c"
 	}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!value->data[0].v_pointer) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = NULL;
-#line 839 "GRaw.c"
+#line 860 "GRaw.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = value->data[0].v_pointer;
-#line 843 "GRaw.c"
+#line 864 "GRaw.c"
 	} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = graw_processed_image_ref (value->data[0].v_pointer);
-#line 847 "GRaw.c"
+#line 868 "GRaw.c"
 	}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 851 "GRaw.c"
+#line 872 "GRaw.c"
 }
 
 
 GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	GRawParamSpecProcessedImage* spec;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, GRAW_TYPE_PROCESSED_IMAGE), NULL);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return G_PARAM_SPEC (spec);
-#line 865 "GRaw.c"
+#line 886 "GRaw.c"
 }
 
 
 gpointer graw_value_get_processed_image (const GValue* value) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE), NULL);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 874 "GRaw.c"
+#line 895 "GRaw.c"
 }
 
 
 void graw_value_set_processed_image (GValue* value, gpointer v_object) {
 	GRawProcessedImage* old;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	old = value->data[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (v_object) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = v_object;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processed_image_ref (value->data[0].v_pointer);
-#line 894 "GRaw.c"
+#line 915 "GRaw.c"
 	} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 898 "GRaw.c"
+#line 919 "GRaw.c"
 	}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processed_image_unref (old);
-#line 904 "GRaw.c"
+#line 925 "GRaw.c"
 	}
 }
 
 
 void graw_value_take_processed_image (GValue* value, gpointer v_object) {
 	GRawProcessedImage* old;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	old = value->data[0].v_pointer;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (v_object) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSED_IMAGE));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = v_object;
-#line 923 "GRaw.c"
+#line 944 "GRaw.c"
 	} else {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 927 "GRaw.c"
+#line 948 "GRaw.c"
 	}
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processed_image_unref (old);
-#line 933 "GRaw.c"
+#line 954 "GRaw.c"
 	}
 }
 
 
 static void graw_processed_image_class_init (GRawProcessedImageClass * klass) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_processed_image_parent_class = g_type_class_peek_parent (klass);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	((GRawProcessedImageClass *) klass)->finalize = graw_processed_image_finalize;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_type_class_add_private (klass, sizeof (GRawProcessedImagePrivate));
-#line 945 "GRaw.c"
+#line 966 "GRaw.c"
 }
 
 
 static void graw_processed_image_instance_init (GRawProcessedImage * self) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv = GRAW_PROCESSED_IMAGE_GET_PRIVATE (self);
-#line 68 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 74 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv->pixbuf = NULL;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->ref_count = 1;
-#line 956 "GRaw.c"
+#line 977 "GRaw.c"
 }
 
 
 static void graw_processed_image_finalize (GRawProcessedImage* obj) {
 	GRawProcessedImage * self;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImage);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_signal_handlers_destroy (self);
-#line 67 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 73 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_free0 (self->priv->image);
-#line 68 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 74 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_g_object_unref0 (self->priv->pixbuf);
-#line 970 "GRaw.c"
+#line 991 "GRaw.c"
 }
 
 
@@ -987,24 +1008,24 @@ GType graw_processed_image_get_type (void) {
 gpointer graw_processed_image_ref (gpointer instance) {
 	GRawProcessedImage* self;
 	self = instance;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return instance;
-#line 995 "GRaw.c"
+#line 1016 "GRaw.c"
 }
 
 
 void graw_processed_image_unref (gpointer instance) {
 	GRawProcessedImage* self;
 	self = instance;
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		GRAW_PROCESSED_IMAGE_GET_CLASS (self)->finalize (self);
-#line 66 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 1008 "GRaw.c"
+#line 1029 "GRaw.c"
 	}
 }
 
@@ -1013,26 +1034,26 @@ GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_construc
 	GRawProcessor* self = NULL;
 	enum LibRaw_constructor_flags _tmp0_ = 0;
 	libraw_data_t* _tmp1_ = NULL;
-#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = (GRawProcessor*) g_type_create_instance (object_type);
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = options;
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_init (_tmp0_);
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_libraw_close0 (self->priv->proc);
-#line 158 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv->proc = _tmp1_;
-#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return self;
-#line 1029 "GRaw.c"
+#line 1050 "GRaw.c"
 }
 
 
 GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options) {
-#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return graw_processor_construct (GRAW_TYPE_PROCESSOR, options);
-#line 1036 "GRaw.c"
+#line 1057 "GRaw.c"
 }
 
 
@@ -1040,31 +1061,31 @@ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error)
 	libraw_data_t* _tmp0_ = NULL;
 	enum LibRaw_errors _tmp1_ = 0;
 	GError * _inner_error_ = NULL;
-#line 161 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 167 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_adjust_sizes_info_only (_tmp0_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("adjust_sizes_info_only", _tmp1_, &_inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1060 "GRaw.c"
+#line 1081 "GRaw.c"
 		} else {
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 162 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1068 "GRaw.c"
+#line 1089 "GRaw.c"
 		}
 	}
 }
@@ -1081,7 +1102,7 @@ static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) {
 	result = _tmp0_;
 #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1085 "GRaw.c"
+#line 1106 "GRaw.c"
 }
 
 
@@ -1089,17 +1110,17 @@ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) {
 	libraw_imgother_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_imgother_t _tmp1_ = {0};
-#line 165 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 171 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_get_image_other (_tmp0_);
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 166 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1103 "GRaw.c"
+#line 1124 "GRaw.c"
 }
 
 
@@ -1114,7 +1135,7 @@ static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) {
 	result = _tmp0_;
 #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1118 "GRaw.c"
+#line 1139 "GRaw.c"
 }
 
 
@@ -1122,17 +1143,17 @@ libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) {
 	libraw_iparams_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_iparams_t _tmp1_ = {0};
-#line 169 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 175 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_get_image_params (_tmp0_);
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 170 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1136 "GRaw.c"
+#line 1157 "GRaw.c"
 }
 
 
@@ -1147,7 +1168,7 @@ static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) {
 	result = _tmp0_;
 #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1151 "GRaw.c"
+#line 1172 "GRaw.c"
 }
 
 
@@ -1155,17 +1176,17 @@ libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) {
 	libraw_image_sizes_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_image_sizes_t _tmp1_ = {0};
-#line 173 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 179 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_get_sizes (_tmp0_);
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 174 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1169 "GRaw.c"
+#line 1190 "GRaw.c"
 }
 
 
@@ -1180,7 +1201,7 @@ static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) {
 	result = _tmp0_;
 #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
 	return result;
-#line 1184 "GRaw.c"
+#line 1205 "GRaw.c"
 }
 
 
@@ -1188,17 +1209,17 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) {
 	libraw_thumbnail_t result = {0};
 	libraw_data_t* _tmp0_ = NULL;
 	libraw_thumbnail_t _tmp1_ = {0};
-#line 177 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 183 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_get_thumbnail (_tmp0_);
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp1_;
-#line 178 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1202 "GRaw.c"
+#line 1223 "GRaw.c"
 }
 
 
@@ -1209,44 +1230,44 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
 	GRawProcessedImage* _tmp2_ = NULL;
 	GRawProcessedImage* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 181 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 187 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = self->priv->proc;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = graw_processed_image_new (_tmp1_, &_inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = _tmp2_;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1229 "GRaw.c"
+#line 1250 "GRaw.c"
 		} else {
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1237 "GRaw.c"
+#line 1258 "GRaw.c"
 		}
 	}
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp3_ = _tmp0_;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp3_;
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_graw_processed_image_unref0 (_tmp0_);
-#line 182 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1250 "GRaw.c"
+#line 1271 "GRaw.c"
 }
 
 
@@ -1257,44 +1278,44 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
 	GRawProcessedImage* _tmp2_ = NULL;
 	GRawProcessedImage* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 185 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 191 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = self->priv->proc;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = graw_processed_image_new_from_thumb (_tmp1_, &_inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = _tmp2_;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1277 "GRaw.c"
+#line 1298 "GRaw.c"
 		} else {
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %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/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return NULL;
-#line 1285 "GRaw.c"
+#line 1306 "GRaw.c"
 		}
 	}
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp3_ = _tmp0_;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = NULL;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = _tmp3_;
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_graw_processed_image_unref0 (_tmp0_);
-#line 186 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1298 "GRaw.c"
+#line 1319 "GRaw.c"
 }
 
 
@@ -1304,35 +1325,35 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer
 	gint _tmp1__length1 = 0;
 	enum LibRaw_errors _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 189 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 195 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = buffer;
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1__length1 = buffer_length1;
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = libraw_open_buffer (_tmp0_, _tmp1_, _tmp1__length1);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("open_buffer", _tmp2_, &_inner_error_);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1328 "GRaw.c"
+#line 1349 "GRaw.c"
 		} else {
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 190 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1336 "GRaw.c"
+#line 1357 "GRaw.c"
 		}
 	}
 }
@@ -1343,35 +1364,35 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro
 	const gchar* _tmp1_ = NULL;
 	enum LibRaw_errors _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 193 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 199 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 193 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 199 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (filename != NULL);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = filename;
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = libraw_open_file (_tmp0_, _tmp1_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("open_file", _tmp2_, &_inner_error_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1367 "GRaw.c"
+#line 1388 "GRaw.c"
 		} else {
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 194 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1375 "GRaw.c"
+#line 1396 "GRaw.c"
 		}
 	}
 }
@@ -1381,31 +1402,31 @@ void graw_processor_process (GRawProcessor* self, GError** error) {
 	libraw_data_t* _tmp0_ = NULL;
 	enum LibRaw_errors _tmp1_ = 0;
 	GError * _inner_error_ = NULL;
-#line 197 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 203 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_dcraw_process (_tmp0_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("process", _tmp1_, &_inner_error_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1401 "GRaw.c"
+#line 1422 "GRaw.c"
 		} else {
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 198 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1409 "GRaw.c"
+#line 1430 "GRaw.c"
 		}
 	}
 }
@@ -1416,35 +1437,35 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename,
 	const gchar* _tmp1_ = NULL;
 	enum LibRaw_errors _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 201 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 207 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 201 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 207 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (filename != NULL);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = filename;
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = libraw_dcraw_ppm_tiff_writer (_tmp0_, _tmp1_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("ppm_tiff_writer", _tmp2_, &_inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1440 "GRaw.c"
+#line 1461 "GRaw.c"
 		} else {
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught 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/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 202 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1448 "GRaw.c"
+#line 1469 "GRaw.c"
 		}
 	}
 }
@@ -1455,35 +1476,35 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
 	const gchar* _tmp1_ = NULL;
 	enum LibRaw_errors _tmp2_ = 0;
 	GError * _inner_error_ = NULL;
-#line 205 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 205 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 211 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (filename != NULL);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = filename;
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = libraw_dcraw_thumb_writer (_tmp0_, _tmp1_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("thumb_writer", _tmp2_, &_inner_error_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1479 "GRaw.c"
+#line 1500 "GRaw.c"
 		} else {
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 206 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1487 "GRaw.c"
+#line 1508 "GRaw.c"
 		}
 	}
 }
@@ -1491,13 +1512,13 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
 
 void graw_processor_recycle (GRawProcessor* self) {
 	libraw_data_t* _tmp0_ = NULL;
-#line 209 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 215 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 210 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 210 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	libraw_recycle (_tmp0_);
-#line 1501 "GRaw.c"
+#line 1522 "GRaw.c"
 }
 
 
@@ -1505,31 +1526,31 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) {
 	libraw_data_t* _tmp0_ = NULL;
 	enum LibRaw_errors _tmp1_ = 0;
 	GError * _inner_error_ = NULL;
-#line 213 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 219 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_unpack (_tmp0_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("unpack", _tmp1_, &_inner_error_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1525 "GRaw.c"
+#line 1546 "GRaw.c"
 		} else {
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %s: line %d: uncaught 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/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 214 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1533 "GRaw.c"
+#line 1554 "GRaw.c"
 		}
 	}
 }
@@ -1539,75 +1560,87 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) {
 	libraw_data_t* _tmp0_ = NULL;
 	enum LibRaw_errors _tmp1_ = 0;
 	GError * _inner_error_ = NULL;
-#line 217 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 223 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = libraw_unpack_thumb (_tmp0_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_throw_exception ("unpack_thumb", _tmp1_, &_inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_propagate_error (error, _inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1559 "GRaw.c"
+#line 1580 "GRaw.c"
 		} else {
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_critical ("file %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/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			g_clear_error (&_inner_error_);
-#line 218 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 1567 "GRaw.c"
+#line 1588 "GRaw.c"
 		}
 	}
 }
 
 
-static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t self, gdouble red_multiplier, gdouble green_multiplier) {
-	gdouble _tmp0_ = 0.0;
+static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t* params, gdouble red_multiplier, gdouble green_multiplier) {
+	libraw_output_params_t* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
+	libraw_output_params_t* _tmp3_ = NULL;
+	gdouble _tmp4_ = 0.0;
+	gdouble _tmp5_ = 0.0;
+#line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+	_tmp0_ = params;
 #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp0_ = red_multiplier;
+	_tmp1_ = red_multiplier;
 #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	self.aber[0] = _tmp0_;
+	(*_tmp0_).aber[0] = _tmp1_;
 #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp1_ = self.aber[0];
+	_tmp2_ = (*_tmp0_).aber[0];
+#line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+	_tmp3_ = params;
 #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp2_ = green_multiplier;
+	_tmp4_ = green_multiplier;
 #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	self.aber[2] = _tmp2_;
+	(*_tmp3_).aber[2] = _tmp4_;
 #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp3_ = self.aber[2];
-#line 1590 "GRaw.c"
+	_tmp5_ = (*_tmp3_).aber[2];
+#line 1617 "GRaw.c"
 }
 
 
-static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t self, gdouble power, gdouble slope) {
-	gdouble _tmp0_ = 0.0;
+static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* params, gdouble power, gdouble slope) {
+	libraw_output_params_t* _tmp0_ = NULL;
 	gdouble _tmp1_ = 0.0;
 	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
+	libraw_output_params_t* _tmp3_ = NULL;
+	gdouble _tmp4_ = 0.0;
+	gdouble _tmp5_ = 0.0;
 #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp0_ = power;
+	_tmp0_ = params;
 #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	self.gamm[0] = _tmp0_;
+	_tmp1_ = power;
 #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp1_ = self.gamm[0];
+	(*_tmp0_).gamm[0] = 1.0 / _tmp1_;
+#line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+	_tmp2_ = (*_tmp0_).gamm[0];
+#line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
+	_tmp3_ = params;
 #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp2_ = slope;
+	_tmp4_ = slope;
 #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	self.gamm[1] = _tmp2_;
+	(*_tmp3_).gamm[1] = _tmp4_;
 #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
-	_tmp3_ = self.gamm[1];
-#line 1611 "GRaw.c"
+	_tmp5_ = (*_tmp3_).gamm[1];
+#line 1644 "GRaw.c"
 }
 
 
@@ -1643,328 +1676,328 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal
 	libraw_output_params_t* _tmp28_ = NULL;
 	libraw_output_params_t* _tmp29_ = NULL;
 	libraw_output_params_t* _tmp30_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (GRAW_IS_PROCESSOR (self));
-#line 229 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = graw_processor_get_output_params (self);
-#line 229 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp1_ = _tmp0_;
-#line 229 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	lib_raw_output_params_set_chromatic_aberrations (*_tmp1_, 1.0, 1.0);
-#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+	lib_raw_output_params_set_chromatic_aberrations (_tmp1_, 1.0, 1.0);
+#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp2_ = graw_processor_get_output_params (self);
-#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp3_ = _tmp2_;
-#line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	lib_raw_output_params_set_gamma_curve (*_tmp3_, GRAW_SRGB_POWER, GRAW_SRGB_SLOPE);
-#line 234 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+	lib_raw_output_params_set_gamma_curve (_tmp3_, GRAW_SRGB_POWER, GRAW_SRGB_SLOPE);
+#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp4_ = graw_processor_get_output_params (self);
-#line 234 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp5_ = _tmp4_;
-#line 234 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp5_).bright = 1.0f;
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp6_ = graw_processor_get_output_params (self);
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp7_ = _tmp6_;
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp8_ = half_size;
-#line 236 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp7_).half_size = _tmp8_;
-#line 238 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp9_ = graw_processor_get_output_params (self);
-#line 238 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp10_ = _tmp9_;
-#line 238 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp10_).highlight = (gint) GRAW_HIGHLIGHT_MODE_CLIP;
-#line 239 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp11_ = graw_processor_get_output_params (self);
-#line 239 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp12_ = _tmp11_;
-#line 239 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp12_).use_auto_wb = TRUE;
-#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp13_ = graw_processor_get_output_params (self);
-#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp14_ = _tmp13_;
-#line 240 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp14_).use_camera_wb = TRUE;
-#line 241 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp15_ = graw_processor_get_output_params (self);
-#line 241 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp16_ = _tmp15_;
-#line 241 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-	(*_tmp16_).use_camera_matrix = TRUE;
-#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+	(*_tmp16_).use_camera_matrix = (gint) GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE;
+#line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp17_ = graw_processor_get_output_params (self);
-#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp18_ = _tmp17_;
-#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp18_).output_color = (gint) GRAW_COLORSPACE_SRGB;
-#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp19_ = graw_processor_get_output_params (self);
-#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp20_ = _tmp19_;
-#line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp20_).output_bps = 8;
-#line 249 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp21_ = graw_processor_get_output_params (self);
-#line 249 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp22_ = _tmp21_;
-#line 249 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp22_).user_flip = (gint) GRAW_FLIP_FROM_SOURCE;
-#line 250 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp23_ = graw_processor_get_output_params (self);
-#line 250 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp24_ = _tmp23_;
-#line 250 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp24_).user_qual = (gint) GRAW_INTERPOLATION_QUALITY_PPG;
-#line 254 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp25_ = graw_processor_get_output_params (self);
-#line 254 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp26_ = _tmp25_;
-#line 254 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp26_).no_auto_bright = TRUE;
-#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp27_ = graw_processor_get_output_params (self);
-#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp28_ = _tmp27_;
-#line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp28_).auto_bright_thr = 0.01f;
-#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp29_ = graw_processor_get_output_params (self);
-#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp30_ = _tmp29_;
-#line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	(*_tmp30_).use_fuji_rotate = (gint) GRAW_FUJI_ROTATE_USE;
-#line 1741 "GRaw.c"
+#line 1774 "GRaw.c"
 }
 
 
 libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) {
 	libraw_output_params_t* result;
 	libraw_data_t* _tmp0_ = NULL;
-#line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 156 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL);
-#line 151 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = self->priv->proc;
-#line 151 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	result = &_tmp0_->params;
-#line 151 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return result;
-#line 1756 "GRaw.c"
+#line 1789 "GRaw.c"
 }
 
 
 static void graw_value_processor_init (GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	value->data[0].v_pointer = NULL;
-#line 1763 "GRaw.c"
+#line 1796 "GRaw.c"
 }
 
 
 static void graw_value_processor_free_value (GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (value->data[0].v_pointer) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (value->data[0].v_pointer);
-#line 1772 "GRaw.c"
+#line 1805 "GRaw.c"
 	}
 }
 
 
 static void graw_value_processor_copy_value (const GValue* src_value, GValue* dest_value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (src_value->data[0].v_pointer) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = graw_processor_ref (src_value->data[0].v_pointer);
-#line 1782 "GRaw.c"
+#line 1815 "GRaw.c"
 	} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 1786 "GRaw.c"
+#line 1819 "GRaw.c"
 	}
 }
 
 
 static gpointer graw_value_processor_peek_pointer (const GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 1794 "GRaw.c"
+#line 1827 "GRaw.c"
 }
 
 
 static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (collect_values[0].v_pointer) {
-#line 1801 "GRaw.c"
+#line 1834 "GRaw.c"
 		GRawProcessor* object;
 		object = collect_values[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (object->parent_instance.g_class == NULL) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1808 "GRaw.c"
+#line 1841 "GRaw.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.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 1812 "GRaw.c"
+#line 1845 "GRaw.c"
 		}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = graw_processor_ref (object);
-#line 1816 "GRaw.c"
+#line 1849 "GRaw.c"
 	} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1820 "GRaw.c"
+#line 1853 "GRaw.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 1824 "GRaw.c"
+#line 1857 "GRaw.c"
 }
 
 
 static gchar* graw_value_processor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 	GRawProcessor** object_p;
 	object_p = collect_values[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!object_p) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1835 "GRaw.c"
+#line 1868 "GRaw.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (!value->data[0].v_pointer) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = NULL;
-#line 1841 "GRaw.c"
+#line 1874 "GRaw.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = value->data[0].v_pointer;
-#line 1845 "GRaw.c"
+#line 1878 "GRaw.c"
 	} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		*object_p = graw_processor_ref (value->data[0].v_pointer);
-#line 1849 "GRaw.c"
+#line 1882 "GRaw.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return NULL;
-#line 1853 "GRaw.c"
+#line 1886 "GRaw.c"
 }
 
 
 GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
 	GRawParamSpecProcessor* spec;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, GRAW_TYPE_PROCESSOR), NULL);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	spec = g_param_spec_internal (G_TYPE_PARAM_OBJECT, name, nick, blurb, flags);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	G_PARAM_SPEC (spec)->value_type = object_type;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return G_PARAM_SPEC (spec);
-#line 1867 "GRaw.c"
+#line 1900 "GRaw.c"
 }
 
 
 gpointer graw_value_get_processor (const GValue* value) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR), NULL);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return value->data[0].v_pointer;
-#line 1876 "GRaw.c"
+#line 1909 "GRaw.c"
 }
 
 
 void graw_value_set_processor (GValue* value, gpointer v_object) {
 	GRawProcessor* old;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	old = value->data[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (v_object) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = v_object;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_ref (value->data[0].v_pointer);
-#line 1896 "GRaw.c"
+#line 1929 "GRaw.c"
 	} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1900 "GRaw.c"
+#line 1933 "GRaw.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (old);
-#line 1906 "GRaw.c"
+#line 1939 "GRaw.c"
 	}
 }
 
 
 void graw_value_take_processor (GValue* value, gpointer v_object) {
 	GRawProcessor* old;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	old = value->data[0].v_pointer;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (v_object) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (G_TYPE_CHECK_INSTANCE_TYPE (v_object, GRAW_TYPE_PROCESSOR));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = v_object;
-#line 1925 "GRaw.c"
+#line 1958 "GRaw.c"
 	} else {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		value->data[0].v_pointer = NULL;
-#line 1929 "GRaw.c"
+#line 1962 "GRaw.c"
 	}
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (old) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		graw_processor_unref (old);
-#line 1935 "GRaw.c"
+#line 1968 "GRaw.c"
 	}
 }
 
 
 static void graw_processor_class_init (GRawProcessorClass * klass) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	graw_processor_parent_class = g_type_class_peek_parent (klass);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	((GRawProcessorClass *) klass)->finalize = graw_processor_finalize;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_type_class_add_private (klass, sizeof (GRawProcessorPrivate));
-#line 1947 "GRaw.c"
+#line 1980 "GRaw.c"
 }
 
 
 static void graw_processor_instance_init (GRawProcessor * self) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->priv = GRAW_PROCESSOR_GET_PRIVATE (self);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self->ref_count = 1;
-#line 1956 "GRaw.c"
+#line 1989 "GRaw.c"
 }
 
 
 static void graw_processor_finalize (GRawProcessor* obj) {
 	GRawProcessor * self;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSOR, GRawProcessor);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_signal_handlers_destroy (self);
-#line 155 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 161 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_libraw_close0 (self->priv->proc);
-#line 1968 "GRaw.c"
+#line 2001 "GRaw.c"
 }
 
 
@@ -1985,24 +2018,24 @@ GType graw_processor_get_type (void) {
 gpointer graw_processor_ref (gpointer instance) {
 	GRawProcessor* self;
 	self = instance;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_atomic_int_inc (&self->ref_count);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	return instance;
-#line 1993 "GRaw.c"
+#line 2026 "GRaw.c"
 }
 
 
 void graw_processor_unref (gpointer instance) {
 	GRawProcessor* self;
 	self = instance;
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		GRAW_PROCESSOR_GET_CLASS (self)->finalize (self);
-#line 148 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2006 "GRaw.c"
+#line 2039 "GRaw.c"
 	}
 }
 
@@ -2016,149 +2049,83 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 	gchar* _tmp10_ = NULL;
 	enum LibRaw_errors _tmp11_ = 0;
 	GError * _inner_error_ = NULL;
-#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	g_return_if_fail (caller != NULL);
-#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp0_ = _result_;
-#line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 267 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	if (_tmp0_ == LIBRAW_SUCCESS) {
-#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		return;
-#line 2028 "GRaw.c"
+#line 2061 "GRaw.c"
 	} else {
 		enum LibRaw_errors _tmp1_ = 0;
-#line 263 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		_tmp1_ = _result_;
-#line 263 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		if (_tmp1_ > 0) {
-#line 2035 "GRaw.c"
+#line 2068 "GRaw.c"
 			const gchar* _tmp2_ = NULL;
 			enum LibRaw_errors _tmp3_ = 0;
 			enum LibRaw_errors _tmp4_ = 0;
 			const gchar* _tmp5_ = NULL;
 			GError* _tmp6_ = NULL;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp2_ = caller;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp3_ = _result_;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp4_ = _result_;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp5_ = g_strerror ((gint) _tmp4_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_tmp6_ = g_error_new (GRAW_EXCEPTION, GRAW_EXCEPTION_SYSTEM_ERROR, "%s: System error %d: %s", _tmp2_, (gint) _tmp3_, _tmp5_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_inner_error_ = _tmp6_;
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				g_propagate_error (error, _inner_error_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2059 "GRaw.c"
+#line 2092 "GRaw.c"
 			} else {
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				g_critical ("file %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/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				g_clear_error (&_inner_error_);
-#line 264 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2067 "GRaw.c"
+#line 2100 "GRaw.c"
 			}
 		}
 	}
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp7_ = caller;
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp8_ = _result_;
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp9_ = libraw_strerror (_tmp8_);
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp10_ = g_strdup_printf ("%s: %s", _tmp7_, _tmp9_);
-#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	msg = _tmp10_;
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_tmp11_ = _result_;
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	switch (_tmp11_) {
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 		case LIBRAW_UNSPECIFIED_ERROR:
-#line 2087 "GRaw.c"
+#line 2120 "GRaw.c"
 		{
 			const gchar* _tmp12_ = NULL;
 			GError* _tmp13_ = NULL;
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp12_ = msg;
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp13_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSPECIFIED, _tmp12_);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp13_;
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				g_propagate_error (error, _inner_error_);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				_g_free0 (msg);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				return;
-#line 2105 "GRaw.c"
-			} else {
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				_g_free0 (msg);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				g_critical ("file %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/src/photos/GRaw.vala"
-				g_clear_error (&_inner_error_);
-#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				return;
-#line 2115 "GRaw.c"
-			}
-		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_FILE_UNSUPPORTED:
-#line 2120 "GRaw.c"
-		{
-			const gchar* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp14_ = msg;
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_FILE, _tmp14_);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp15_;
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			if (_inner_error_->domain == GRAW_EXCEPTION) {
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				g_propagate_error (error, _inner_error_);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				_g_free0 (msg);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				return;
-#line 2138 "GRaw.c"
-			} else {
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				_g_free0 (msg);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				g_critical ("file %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/src/photos/GRaw.vala"
-				g_clear_error (&_inner_error_);
-#line 273 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-				return;
-#line 2148 "GRaw.c"
-			}
-		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE:
-#line 2153 "GRaw.c"
-		{
-			const gchar* _tmp16_ = NULL;
-			GError* _tmp17_ = NULL;
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp16_ = msg;
+			_tmp12_ = msg;
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp17_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NONEXISTANT_IMAGE, _tmp16_);
+			_tmp13_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSPECIFIED, _tmp12_);
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp17_;
+			_inner_error_ = _tmp13_;
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2167,7 +2134,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2171 "GRaw.c"
+#line 2138 "GRaw.c"
 			} else {
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2177,21 +2144,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2181 "GRaw.c"
+#line 2148 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_OUT_OF_ORDER_CALL:
-#line 2186 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_FILE_UNSUPPORTED:
+#line 2153 "GRaw.c"
 		{
-			const gchar* _tmp18_ = NULL;
-			GError* _tmp19_ = NULL;
+			const gchar* _tmp14_ = NULL;
+			GError* _tmp15_ = NULL;
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp18_ = msg;
+			_tmp14_ = msg;
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp19_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_ORDER_CALL, _tmp18_);
+			_tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_FILE, _tmp14_);
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp19_;
+			_inner_error_ = _tmp15_;
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2200,7 +2167,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2204 "GRaw.c"
+#line 2171 "GRaw.c"
 			} else {
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2210,21 +2177,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2214 "GRaw.c"
+#line 2181 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_NO_THUMBNAIL:
-#line 2219 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE:
+#line 2186 "GRaw.c"
 		{
-			const gchar* _tmp20_ = NULL;
-			GError* _tmp21_ = NULL;
+			const gchar* _tmp16_ = NULL;
+			GError* _tmp17_ = NULL;
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp20_ = msg;
+			_tmp16_ = msg;
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp21_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NO_THUMBNAIL, _tmp20_);
+			_tmp17_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NONEXISTANT_IMAGE, _tmp16_);
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp21_;
+			_inner_error_ = _tmp17_;
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2233,7 +2200,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2237 "GRaw.c"
+#line 2204 "GRaw.c"
 			} else {
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2243,21 +2210,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2247 "GRaw.c"
+#line 2214 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_UNSUPPORTED_THUMBNAIL:
-#line 2252 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_OUT_OF_ORDER_CALL:
+#line 2219 "GRaw.c"
 		{
-			const gchar* _tmp22_ = NULL;
-			GError* _tmp23_ = NULL;
+			const gchar* _tmp18_ = NULL;
+			GError* _tmp19_ = NULL;
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp22_ = msg;
+			_tmp18_ = msg;
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp23_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp22_);
+			_tmp19_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_ORDER_CALL, _tmp18_);
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp23_;
+			_inner_error_ = _tmp19_;
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2266,7 +2233,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2270 "GRaw.c"
+#line 2237 "GRaw.c"
 			} else {
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2276,21 +2243,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2280 "GRaw.c"
+#line 2247 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_UNSUFFICIENT_MEMORY:
-#line 2285 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_NO_THUMBNAIL:
+#line 2252 "GRaw.c"
 		{
-			const gchar* _tmp24_ = NULL;
-			GError* _tmp25_ = NULL;
+			const gchar* _tmp20_ = NULL;
+			GError* _tmp21_ = NULL;
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp24_ = msg;
+			_tmp20_ = msg;
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp25_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_MEMORY, _tmp24_);
+			_tmp21_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NO_THUMBNAIL, _tmp20_);
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp25_;
+			_inner_error_ = _tmp21_;
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2299,7 +2266,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2303 "GRaw.c"
+#line 2270 "GRaw.c"
 			} else {
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2309,21 +2276,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2313 "GRaw.c"
+#line 2280 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_DATA_ERROR:
-#line 2318 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_UNSUPPORTED_THUMBNAIL:
+#line 2285 "GRaw.c"
 		{
-			const gchar* _tmp26_ = NULL;
-			GError* _tmp27_ = NULL;
+			const gchar* _tmp22_ = NULL;
+			GError* _tmp23_ = NULL;
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp26_ = msg;
+			_tmp22_ = msg;
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp27_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_DATA_ERROR, _tmp26_);
+			_tmp23_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp22_);
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp27_;
+			_inner_error_ = _tmp23_;
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2332,7 +2299,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2336 "GRaw.c"
+#line 2303 "GRaw.c"
 			} else {
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2342,21 +2309,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2346 "GRaw.c"
+#line 2313 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_IO_ERROR:
-#line 2351 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_UNSUFFICIENT_MEMORY:
+#line 2318 "GRaw.c"
 		{
-			const gchar* _tmp28_ = NULL;
-			GError* _tmp29_ = NULL;
+			const gchar* _tmp24_ = NULL;
+			GError* _tmp25_ = NULL;
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp28_ = msg;
+			_tmp24_ = msg;
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp29_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_IO_ERROR, _tmp28_);
+			_tmp25_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_MEMORY, _tmp24_);
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp29_;
+			_inner_error_ = _tmp25_;
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2365,7 +2332,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2369 "GRaw.c"
+#line 2336 "GRaw.c"
 			} else {
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2375,21 +2342,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2379 "GRaw.c"
+#line 2346 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_CANCELLED_BY_CALLBACK:
-#line 2384 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_DATA_ERROR:
+#line 2351 "GRaw.c"
 		{
-			const gchar* _tmp30_ = NULL;
-			GError* _tmp31_ = NULL;
+			const gchar* _tmp26_ = NULL;
+			GError* _tmp27_ = NULL;
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp30_ = msg;
+			_tmp26_ = msg;
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp31_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_CANCELLED_BY_CALLBACK, _tmp30_);
+			_tmp27_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_DATA_ERROR, _tmp26_);
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp31_;
+			_inner_error_ = _tmp27_;
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2398,7 +2365,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2402 "GRaw.c"
+#line 2369 "GRaw.c"
 			} else {
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2408,21 +2375,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2412 "GRaw.c"
+#line 2379 "GRaw.c"
 			}
 		}
-#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-		case LIBRAW_BAD_CROP:
-#line 2417 "GRaw.c"
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_IO_ERROR:
+#line 2384 "GRaw.c"
 		{
-			const gchar* _tmp32_ = NULL;
-			GError* _tmp33_ = NULL;
+			const gchar* _tmp28_ = NULL;
+			GError* _tmp29_ = NULL;
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp32_ = msg;
+			_tmp28_ = msg;
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_tmp33_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_BAD_CROP, _tmp32_);
+			_tmp29_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_IO_ERROR, _tmp28_);
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
-			_inner_error_ = _tmp33_;
+			_inner_error_ = _tmp29_;
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			if (_inner_error_->domain == GRAW_EXCEPTION) {
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -2431,7 +2398,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				_g_free0 (msg);
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
-#line 2435 "GRaw.c"
+#line 2402 "GRaw.c"
 			} else {
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				_g_free0 (msg);
@@ -2441,21 +2408,87 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
 				g_clear_error (&_inner_error_);
 #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 				return;
+#line 2412 "GRaw.c"
+			}
+		}
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_CANCELLED_BY_CALLBACK:
+#line 2417 "GRaw.c"
+		{
+			const gchar* _tmp30_ = NULL;
+			GError* _tmp31_ = NULL;
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_tmp30_ = msg;
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_tmp31_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_CANCELLED_BY_CALLBACK, _tmp30_);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_inner_error_ = _tmp31_;
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			if (_inner_error_->domain == GRAW_EXCEPTION) {
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_propagate_error (error, _inner_error_);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				_g_free0 (msg);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				return;
+#line 2435 "GRaw.c"
+			} else {
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				_g_free0 (msg);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_clear_error (&_inner_error_);
+#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				return;
 #line 2445 "GRaw.c"
 			}
 		}
+#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+		case LIBRAW_BAD_CROP:
+#line 2450 "GRaw.c"
+		{
+			const gchar* _tmp32_ = NULL;
+			GError* _tmp33_ = NULL;
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_tmp32_ = msg;
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_tmp33_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_BAD_CROP, _tmp32_);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			_inner_error_ = _tmp33_;
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+			if (_inner_error_->domain == GRAW_EXCEPTION) {
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_propagate_error (error, _inner_error_);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				_g_free0 (msg);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				return;
+#line 2468 "GRaw.c"
+			} else {
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				_g_free0 (msg);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				g_clear_error (&_inner_error_);
+#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+				return;
+#line 2478 "GRaw.c"
+			}
+		}
 		default:
 		{
-#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			_g_free0 (msg);
-#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 309 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 			return;
-#line 2454 "GRaw.c"
+#line 2487 "GRaw.c"
 		}
 	}
-#line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
+#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
 	_g_free0 (msg);
-#line 2459 "GRaw.c"
+#line 2492 "GRaw.c"
 }
 
 
diff --git a/src/photos/GRaw.vala b/src/photos/GRaw.vala
index ec1df8d..19b5cdc 100644
--- a/src/photos/GRaw.vala
+++ b/src/photos/GRaw.vala
@@ -63,6 +63,12 @@ public enum InterpolationQuality {
     AHD = 3
 }
 
+public enum UseCameraMatrix {
+    IGNORE = 0,
+    EMBEDDED_COLOR_PROFILE = 1,
+    EMBEDDED_COLOR_DATA = 3
+}
+
 public class ProcessedImage {
     private LibRaw.ProcessedImage image;
     private Gdk.Pixbuf pixbuf = null;
@@ -226,8 +232,8 @@ public class Processor {
         // These fields are set to reasonable defaults by libraw.
         
         // greybox
-        output_params->set_chromatic_aberrations(1.0, 1.0);
-        output_params->set_gamma_curve(GRaw.SRGB_POWER, GRaw.SRGB_SLOPE);
+        LibRaw.OutputParams.set_chromatic_aberrations(output_params, 1.0, 1.0);
+        LibRaw.OutputParams.set_gamma_curve(output_params, GRaw.SRGB_POWER, GRaw.SRGB_SLOPE);
         // user_mul
         // shot_select
         // multi_out
@@ -238,7 +244,7 @@ public class Processor {
         output_params->highlight = GRaw.HighlightMode.CLIP;
         output_params->use_auto_wb = true;
         output_params->use_camera_wb = true;
-        output_params->use_camera_matrix = true;
+        output_params->use_camera_matrix = GRaw.UseCameraMatrix.EMBEDDED_COLOR_PROFILE;
         output_params->output_color = GRaw.Colorspace.SRGB;
         // output_profile
         // camera_profile
diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index 59a0632..89b0e25 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -79,6 +79,8 @@ typedef struct _PhotoMetadataClass PhotoMetadataClass;
 #define TYPE_DIMENSIONS (dimensions_get_type ())
 typedef struct _Dimensions Dimensions;
 
+#define PHOTO_FILE_READER_TYPE_ROLE (photo_file_reader_role_get_type ())
+
 #define TYPE_PHOTO_FILE_WRITER (photo_file_writer_get_type ())
 #define PHOTO_FILE_WRITER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PHOTO_FILE_WRITER, PhotoFileWriter))
 #define PHOTO_FILE_WRITER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PHOTO_FILE_WRITER, PhotoFileWriterClass))
@@ -153,6 +155,15 @@ struct _PhotoFileReaderClass {
 };
 
 typedef enum  {
+	PHOTO_FILE_READER_ROLE_DEFAULT,
+	PHOTO_FILE_READER_ROLE_THUMBNAIL
+} PhotoFileReaderRole;
+
+struct _PhotoFileReaderPrivate {
+	PhotoFileReaderRole role;
+};
+
+typedef enum  {
 	PHOTO_FORMAT_ERROR_READ_ONLY
 } PhotoFormatError;
 #define PHOTO_FORMAT_ERROR photo_format_error_quark ()
@@ -219,6 +230,8 @@ GType photo_metadata_get_type (void) G_GNUC_CONST;
 GType dimensions_get_type (void) G_GNUC_CONST;
 Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
+GType photo_file_reader_role_get_type (void) G_GNUC_CONST;
+#define PHOTO_FILE_READER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_FILE_READER, PhotoFileReaderPrivate))
 enum  {
 	PHOTO_FILE_READER_DUMMY_PROPERTY
 };
@@ -237,6 +250,9 @@ static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, G
 GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error);
 static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error);
 GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp);
+void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role);
+PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self);
+static void photo_file_reader_finalize (PhotoFileAdapter* obj);
 GType jpeg_quality_get_type (void) G_GNUC_CONST;
 enum  {
 	PHOTO_FILE_WRITER_DUMMY_PROPERTY
@@ -278,7 +294,7 @@ PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar*
 	self->priv->file_format = _tmp2_;
 #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 282 "PhotoFileAdapter.c"
+#line 298 "PhotoFileAdapter.c"
 }
 
 
@@ -296,7 +312,7 @@ gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) {
 	result = _tmp1_;
 #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 300 "PhotoFileAdapter.c"
+#line 316 "PhotoFileAdapter.c"
 }
 
 
@@ -314,14 +330,14 @@ gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) {
 	result = _tmp1_;
 #line 35 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 318 "PhotoFileAdapter.c"
+#line 334 "PhotoFileAdapter.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 325 "PhotoFileAdapter.c"
+#line 341 "PhotoFileAdapter.c"
 }
 
 
@@ -331,14 +347,14 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 	GError * _inner_error_ = NULL;
 #line 38 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL);
-#line 335 "PhotoFileAdapter.c"
+#line 351 "PhotoFileAdapter.c"
 	{
 		GFile* _tmp0_ = NULL;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		_tmp0_ = self->priv->file;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		g_rec_mutex_lock (&self->priv->__lock_file);
-#line 342 "PhotoFileAdapter.c"
+#line 358 "PhotoFileAdapter.c"
 		{
 			GFile* _tmp1_ = NULL;
 			GFile* _tmp4_ = NULL;
@@ -347,7 +363,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			_tmp1_ = self->priv->file;
 #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			if (_tmp1_ == NULL) {
-#line 351 "PhotoFileAdapter.c"
+#line 367 "PhotoFileAdapter.c"
 				const gchar* _tmp2_ = NULL;
 				GFile* _tmp3_ = NULL;
 #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
@@ -358,7 +374,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 				_g_object_unref0 (self->priv->file);
 #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 				self->priv->file = _tmp3_;
-#line 362 "PhotoFileAdapter.c"
+#line 378 "PhotoFileAdapter.c"
 			}
 #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			_tmp4_ = self->priv->file;
@@ -368,7 +384,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			_g_object_unref0 (_result_);
 #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			_result_ = _tmp5_;
-#line 372 "PhotoFileAdapter.c"
+#line 388 "PhotoFileAdapter.c"
 		}
 		__finally24:
 		{
@@ -377,7 +393,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			_tmp6_ = self->priv->file;
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_rec_mutex_unlock (&self->priv->__lock_file);
-#line 381 "PhotoFileAdapter.c"
+#line 397 "PhotoFileAdapter.c"
 		}
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
@@ -389,14 +405,14 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) {
 			g_clear_error (&_inner_error_);
 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 393 "PhotoFileAdapter.c"
+#line 409 "PhotoFileAdapter.c"
 		}
 	}
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _result_;
 #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 400 "PhotoFileAdapter.c"
+#line 416 "PhotoFileAdapter.c"
 }
 
 
@@ -411,14 +427,14 @@ PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) {
 	result = _tmp0_;
 #line 51 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 415 "PhotoFileAdapter.c"
+#line 431 "PhotoFileAdapter.c"
 }
 
 
 static void value_photo_file_adapter_init (GValue* value) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	value->data[0].v_pointer = NULL;
-#line 422 "PhotoFileAdapter.c"
+#line 438 "PhotoFileAdapter.c"
 }
 
 
@@ -427,7 +443,7 @@ static void value_photo_file_adapter_free_value (GValue* value) {
 	if (value->data[0].v_pointer) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_unref (value->data[0].v_pointer);
-#line 431 "PhotoFileAdapter.c"
+#line 447 "PhotoFileAdapter.c"
 	}
 }
 
@@ -437,11 +453,11 @@ static void value_photo_file_adapter_copy_value (const GValue* src_value, GValue
 	if (src_value->data[0].v_pointer) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		dest_value->data[0].v_pointer = photo_file_adapter_ref (src_value->data[0].v_pointer);
-#line 441 "PhotoFileAdapter.c"
+#line 457 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 445 "PhotoFileAdapter.c"
+#line 461 "PhotoFileAdapter.c"
 	}
 }
 
@@ -449,37 +465,37 @@ static void value_photo_file_adapter_copy_value (const GValue* src_value, GValue
 static gpointer value_photo_file_adapter_peek_pointer (const GValue* value) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return value->data[0].v_pointer;
-#line 453 "PhotoFileAdapter.c"
+#line 469 "PhotoFileAdapter.c"
 }
 
 
 static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (collect_values[0].v_pointer) {
-#line 460 "PhotoFileAdapter.c"
+#line 476 "PhotoFileAdapter.c"
 		PhotoFileAdapter* object;
 		object = collect_values[0].v_pointer;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 467 "PhotoFileAdapter.c"
+#line 483 "PhotoFileAdapter.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.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 471 "PhotoFileAdapter.c"
+#line 487 "PhotoFileAdapter.c"
 		}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = photo_file_adapter_ref (object);
-#line 475 "PhotoFileAdapter.c"
+#line 491 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = NULL;
-#line 479 "PhotoFileAdapter.c"
+#line 495 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 483 "PhotoFileAdapter.c"
+#line 499 "PhotoFileAdapter.c"
 }
 
 
@@ -490,25 +506,25 @@ static gchar* value_photo_file_adapter_lcopy_value (const GValue* value, guint n
 	if (!object_p) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 494 "PhotoFileAdapter.c"
+#line 510 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (!value->data[0].v_pointer) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		*object_p = NULL;
-#line 500 "PhotoFileAdapter.c"
+#line 516 "PhotoFileAdapter.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		*object_p = value->data[0].v_pointer;
-#line 504 "PhotoFileAdapter.c"
+#line 520 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		*object_p = photo_file_adapter_ref (value->data[0].v_pointer);
-#line 508 "PhotoFileAdapter.c"
+#line 524 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 512 "PhotoFileAdapter.c"
+#line 528 "PhotoFileAdapter.c"
 }
 
 
@@ -522,7 +538,7 @@ GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick,
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return G_PARAM_SPEC (spec);
-#line 526 "PhotoFileAdapter.c"
+#line 542 "PhotoFileAdapter.c"
 }
 
 
@@ -531,7 +547,7 @@ gpointer value_get_photo_file_adapter (const GValue* value) {
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER), NULL);
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return value->data[0].v_pointer;
-#line 535 "PhotoFileAdapter.c"
+#line 551 "PhotoFileAdapter.c"
 }
 
 
@@ -551,17 +567,17 @@ void value_set_photo_file_adapter (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_ref (value->data[0].v_pointer);
-#line 555 "PhotoFileAdapter.c"
+#line 571 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = NULL;
-#line 559 "PhotoFileAdapter.c"
+#line 575 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (old) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_unref (old);
-#line 565 "PhotoFileAdapter.c"
+#line 581 "PhotoFileAdapter.c"
 	}
 }
 
@@ -580,17 +596,17 @@ void value_take_photo_file_adapter (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = v_object;
-#line 584 "PhotoFileAdapter.c"
+#line 600 "PhotoFileAdapter.c"
 	} else {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		value->data[0].v_pointer = NULL;
-#line 588 "PhotoFileAdapter.c"
+#line 604 "PhotoFileAdapter.c"
 	}
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (old) {
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		photo_file_adapter_unref (old);
-#line 594 "PhotoFileAdapter.c"
+#line 610 "PhotoFileAdapter.c"
 	}
 }
 
@@ -602,7 +618,7 @@ static void photo_file_adapter_class_init (PhotoFileAdapterClass * klass) {
 	((PhotoFileAdapterClass *) klass)->finalize = photo_file_adapter_finalize;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_type_class_add_private (klass, sizeof (PhotoFileAdapterPrivate));
-#line 606 "PhotoFileAdapter.c"
+#line 622 "PhotoFileAdapter.c"
 }
 
 
@@ -615,7 +631,7 @@ static void photo_file_adapter_instance_init (PhotoFileAdapter * self) {
 	self->priv->file = NULL;
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self->ref_count = 1;
-#line 619 "PhotoFileAdapter.c"
+#line 635 "PhotoFileAdapter.c"
 }
 
 
@@ -631,7 +647,7 @@ static void photo_file_adapter_finalize (PhotoFileAdapter* obj) {
 	g_rec_mutex_clear (&self->priv->__lock_file);
 #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_object_unref0 (self->priv->file);
-#line 635 "PhotoFileAdapter.c"
+#line 651 "PhotoFileAdapter.c"
 }
 
 
@@ -656,7 +672,7 @@ gpointer photo_file_adapter_ref (gpointer instance) {
 	g_atomic_int_inc (&self->ref_count);
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return instance;
-#line 660 "PhotoFileAdapter.c"
+#line 676 "PhotoFileAdapter.c"
 }
 
 
@@ -669,8 +685,20 @@ void photo_file_adapter_unref (gpointer instance) {
 		PHOTO_FILE_ADAPTER_GET_CLASS (self)->finalize (self);
 #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 673 "PhotoFileAdapter.c"
+#line 689 "PhotoFileAdapter.c"
+	}
+}
+
+
+GType photo_file_reader_role_get_type (void) {
+	static volatile gsize photo_file_reader_role_type_id__volatile = 0;
+	if (g_once_init_enter (&photo_file_reader_role_type_id__volatile)) {
+		static const GEnumValue values[] = {{PHOTO_FILE_READER_ROLE_DEFAULT, "PHOTO_FILE_READER_ROLE_DEFAULT", "default"}, {PHOTO_FILE_READER_ROLE_THUMBNAIL, "PHOTO_FILE_READER_ROLE_THUMBNAIL", "thumbnail"}, {0, NULL, NULL}};
+		GType photo_file_reader_role_type_id;
+		photo_file_reader_role_type_id = g_enum_register_static ("PhotoFileReaderRole", values);
+		g_once_init_leave (&photo_file_reader_role_type_id__volatile, photo_file_reader_role_type_id);
 	}
+	return photo_file_reader_role_type_id__volatile;
 }
 
 
@@ -678,17 +706,17 @@ PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* fi
 	PhotoFileReader* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	PhotoFileFormat _tmp1_ = 0;
-#line 60 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
-#line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = filepath;
-#line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = file_format;
-#line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self = (PhotoFileReader*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
-#line 60 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 692 "PhotoFileAdapter.c"
+#line 720 "PhotoFileAdapter.c"
 }
 
 
@@ -702,52 +730,52 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError*
 	PhotoFileWriter* _tmp5_ = NULL;
 	PhotoFileWriter* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 64 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 71 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp3_ = _tmp2_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp4_ = photo_file_format_create_writer (_tmp1_, _tmp3_, &_inner_error_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp5_ = _tmp4_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_free0 (_tmp3_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = _tmp5_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		if (_inner_error_->domain == PHOTO_FORMAT_ERROR) {
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_propagate_error (error, _inner_error_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 730 "PhotoFileAdapter.c"
+#line 758 "PhotoFileAdapter.c"
 		} else {
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_clear_error (&_inner_error_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 738 "PhotoFileAdapter.c"
+#line 766 "PhotoFileAdapter.c"
 		}
 	}
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp6_ = _tmp0_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = NULL;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _tmp6_;
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_photo_file_adapter_unref0 (_tmp0_);
-#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 751 "PhotoFileAdapter.c"
+#line 779 "PhotoFileAdapter.c"
 }
 
 
@@ -761,88 +789,88 @@ PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileRead
 	PhotoFileMetadataWriter* _tmp5_ = NULL;
 	PhotoFileMetadataWriter* _tmp6_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 75 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp3_ = _tmp2_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp4_ = photo_file_format_create_metadata_writer (_tmp1_, _tmp3_, &_inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp5_ = _tmp4_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_free0 (_tmp3_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = _tmp5_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		if (_inner_error_->domain == PHOTO_FORMAT_ERROR) {
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_propagate_error (error, _inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 789 "PhotoFileAdapter.c"
+#line 817 "PhotoFileAdapter.c"
 		} else {
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			g_clear_error (&_inner_error_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 			return NULL;
-#line 797 "PhotoFileAdapter.c"
+#line 825 "PhotoFileAdapter.c"
 		}
 	}
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp6_ = _tmp0_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = NULL;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _tmp6_;
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_photo_file_adapter_unref0 (_tmp0_);
-#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 810 "PhotoFileAdapter.c"
+#line 838 "PhotoFileAdapter.c"
 }
 
 
 static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self, GError** error) {
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_reader_read_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 819 "PhotoFileAdapter.c"
+#line 847 "PhotoFileAdapter.c"
 }
 
 
 PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error) {
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return PHOTO_FILE_READER_GET_CLASS (self)->read_metadata (self, error);
-#line 828 "PhotoFileAdapter.c"
+#line 856 "PhotoFileAdapter.c"
 }
 
 
 static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, GError** error) {
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_reader_unscaled_read'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return NULL;
-#line 837 "PhotoFileAdapter.c"
+#line 865 "PhotoFileAdapter.c"
 }
 
 
 GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error) {
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 74 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return PHOTO_FILE_READER_GET_CLASS (self)->unscaled_read (self, error);
-#line 846 "PhotoFileAdapter.c"
+#line 874 "PhotoFileAdapter.c"
 }
 
 
@@ -853,42 +881,69 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim
 	Dimensions _tmp2_ = {0};
 	GdkPixbuf* _tmp3_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (full != NULL, NULL);
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (scaled != NULL, NULL);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = photo_file_reader_unscaled_read (self, &_inner_error_);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = _tmp1_;
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		g_propagate_error (error, _inner_error_);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 		return NULL;
-#line 871 "PhotoFileAdapter.c"
+#line 899 "PhotoFileAdapter.c"
 	}
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp2_ = *scaled;
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp3_ = resize_pixbuf (_tmp0_, &_tmp2_, GDK_INTERP_BILINEAR);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _tmp3_;
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_object_unref0 (_tmp0_);
-#line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 883 "PhotoFileAdapter.c"
+#line 911 "PhotoFileAdapter.c"
 }
 
 
 GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) {
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL);
-#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return PHOTO_FILE_READER_GET_CLASS (self)->scaled_read (self, full, scaled, error);
-#line 892 "PhotoFileAdapter.c"
+#line 920 "PhotoFileAdapter.c"
+}
+
+
+void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role) {
+	PhotoFileReaderRole _tmp0_ = 0;
+#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	g_return_if_fail (IS_PHOTO_FILE_READER (self));
+#line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	_tmp0_ = role;
+#line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	self->priv->role = _tmp0_;
+#line 932 "PhotoFileAdapter.c"
+}
+
+
+PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) {
+	PhotoFileReaderRole result = 0;
+	PhotoFileReaderRole _tmp0_ = 0;
+#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	g_return_val_if_fail (IS_PHOTO_FILE_READER (self), 0);
+#line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	_tmp0_ = self->priv->role;
+#line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	result = _tmp0_;
+#line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	return result;
+#line 947 "PhotoFileAdapter.c"
 }
 
 
@@ -896,16 +951,35 @@ static void photo_file_reader_class_init (PhotoFileReaderClass * klass) {
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_reader_parent_class = g_type_class_peek_parent (klass);
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	((PhotoFileAdapterClass *) klass)->finalize = photo_file_reader_finalize;
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	g_type_class_add_private (klass, sizeof (PhotoFileReaderPrivate));
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileReaderClass *) klass)->read_metadata = photo_file_reader_real_read_metadata;
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileReaderClass *) klass)->unscaled_read = photo_file_reader_real_unscaled_read;
 #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileReaderClass *) klass)->scaled_read = photo_file_reader_real_scaled_read;
-#line 905 "PhotoFileAdapter.c"
+#line 964 "PhotoFileAdapter.c"
 }
 
 
 static void photo_file_reader_instance_init (PhotoFileReader * self) {
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	self->priv = PHOTO_FILE_READER_GET_PRIVATE (self);
+#line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	self->priv->role = PHOTO_FILE_READER_ROLE_DEFAULT;
+#line 973 "PhotoFileAdapter.c"
+}
+
+
+static void photo_file_reader_finalize (PhotoFileAdapter* obj) {
+	PhotoFileReader * self;
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_READER, PhotoFileReader);
+#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+	PHOTO_FILE_ADAPTER_CLASS (photo_file_reader_parent_class)->finalize (obj);
+#line 983 "PhotoFileAdapter.c"
 }
 
 
@@ -925,17 +999,17 @@ PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* fi
 	PhotoFileWriter* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	PhotoFileFormat _tmp1_ = 0;
-#line 86 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
-#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = filepath;
-#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = file_format;
-#line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self = (PhotoFileWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
-#line 86 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 939 "PhotoFileAdapter.c"
+#line 1013 "PhotoFileAdapter.c"
 }
 
 
@@ -946,52 +1020,52 @@ PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self) {
 	gchar* _tmp2_ = NULL;
 	PhotoFileReader* _tmp3_ = NULL;
 	PhotoFileReader* _tmp4_ = NULL;
-#line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 105 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_WRITER (self), NULL);
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp2_ = _tmp1_;
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_);
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp4_ = _tmp3_;
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_free0 (_tmp2_);
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _tmp4_;
-#line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 968 "PhotoFileAdapter.c"
+#line 1042 "PhotoFileAdapter.c"
 }
 
 
 static void photo_file_writer_real_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_writer_write'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return;
-#line 977 "PhotoFileAdapter.c"
+#line 1051 "PhotoFileAdapter.c"
 }
 
 
 void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) {
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (IS_PHOTO_FILE_WRITER (self));
-#line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	PHOTO_FILE_WRITER_GET_CLASS (self)->write (self, pixbuf, quality, error);
-#line 986 "PhotoFileAdapter.c"
+#line 1060 "PhotoFileAdapter.c"
 }
 
 
 static void photo_file_writer_class_init (PhotoFileWriterClass * klass) {
-#line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_writer_parent_class = g_type_class_peek_parent (klass);
-#line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileWriterClass *) klass)->write = photo_file_writer_real_write;
-#line 995 "PhotoFileAdapter.c"
+#line 1069 "PhotoFileAdapter.c"
 }
 
 
@@ -1015,17 +1089,17 @@ PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type
 	PhotoFileMetadataWriter* self = NULL;
 	const gchar* _tmp0_ = NULL;
 	PhotoFileFormat _tmp1_ = 0;
-#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (filepath != NULL, NULL);
-#line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = filepath;
-#line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = file_format;
-#line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	self = (PhotoFileMetadataWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_);
-#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return self;
-#line 1029 "PhotoFileAdapter.c"
+#line 1103 "PhotoFileAdapter.c"
 }
 
 
@@ -1036,52 +1110,52 @@ PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWrit
 	gchar* _tmp2_ = NULL;
 	PhotoFileReader* _tmp3_ = NULL;
 	PhotoFileReader* _tmp4_ = NULL;
-#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 121 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_val_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self), NULL);
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter));
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp2_ = _tmp1_;
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_);
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_tmp4_ = _tmp3_;
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	_g_free0 (_tmp2_);
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	result = _tmp4_;
-#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return result;
-#line 1058 "PhotoFileAdapter.c"
+#line 1132 "PhotoFileAdapter.c"
 }
 
 
 static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) {
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_critical ("Type `%s' does not implement abstract method `photo_file_metadata_writer_write_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	return;
-#line 1067 "PhotoFileAdapter.c"
+#line 1141 "PhotoFileAdapter.c"
 }
 
 
 void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) {
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	g_return_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self));
-#line 110 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	PHOTO_FILE_METADATA_WRITER_GET_CLASS (self)->write_metadata (self, metadata, error);
-#line 1076 "PhotoFileAdapter.c"
+#line 1150 "PhotoFileAdapter.c"
 }
 
 
 static void photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass * klass) {
-#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	photo_file_metadata_writer_parent_class = g_type_class_peek_parent (klass);
-#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
+#line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
 	((PhotoFileMetadataWriterClass *) klass)->write_metadata = photo_file_metadata_writer_real_write_metadata;
-#line 1085 "PhotoFileAdapter.c"
+#line 1159 "PhotoFileAdapter.c"
 }
 
 
diff --git a/src/photos/PhotoFileAdapter.vala b/src/photos/PhotoFileAdapter.vala
index 644917c..df49edb 100644
--- a/src/photos/PhotoFileAdapter.vala
+++ b/src/photos/PhotoFileAdapter.vala
@@ -57,6 +57,13 @@ public abstract class PhotoFileAdapter {
 //
 
 public abstract class PhotoFileReader : PhotoFileAdapter {
+    public enum Role {
+        DEFAULT,
+        THUMBNAIL
+    }
+
+    PhotoFileReader.Role role = Role.DEFAULT;
+
     protected PhotoFileReader(string filepath, PhotoFileFormat file_format) {
         base (filepath, file_format);
     }
@@ -76,6 +83,14 @@ public abstract class PhotoFileReader : PhotoFileAdapter {
     public virtual Gdk.Pixbuf scaled_read(Dimensions full, Dimensions scaled) throws Error {
         return resize_pixbuf(unscaled_read(), scaled, Gdk.InterpType.BILINEAR);
     }
+
+    public void set_role (PhotoFileReader.Role role) {
+        this.role = role;
+    }
+
+    public PhotoFileReader.Role get_role () {
+        return this.role;
+    }
 }
 
 //
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index 6569e3b..1b0d4b8 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -211,6 +211,8 @@ typedef struct _GRawProcessedImage GRawProcessedImage;
 typedef struct _GRawProcessedImageClass GRawProcessedImageClass;
 #define _graw_processed_image_unref0(var) ((var == NULL) ? NULL : (var = (graw_processed_image_unref (var), NULL)))
 
+#define PHOTO_FILE_READER_TYPE_ROLE (photo_file_reader_role_get_type ())
+
 #define TYPE_RAW_DEVELOPER (raw_developer_get_type ())
 
 #define TYPE_BACKING_PHOTO_ROW (backing_photo_row_get_type ())
@@ -410,6 +412,11 @@ struct _RawReaderClass {
 };
 
 typedef enum  {
+	PHOTO_FILE_READER_ROLE_DEFAULT,
+	PHOTO_FILE_READER_ROLE_THUMBNAIL
+} PhotoFileReaderRole;
+
+typedef enum  {
 	RAW_DEVELOPER_SHOTWELL = 0,
 	RAW_DEVELOPER_CAMERA,
 	RAW_DEVELOPER_EMBEDDED
@@ -618,6 +625,10 @@ GType graw_processed_image_get_type (void) G_GNUC_CONST;
 GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error);
 GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self);
 static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error);
+GType photo_file_reader_role_get_type (void) G_GNUC_CONST;
+PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self);
+void graw_processor_unpack_thumb (GRawProcessor* self, GError** error);
+GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error);
 GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp);
 GType raw_developer_get_type (void) G_GNUC_CONST;
 RawDeveloper* raw_developer_as_array (int* result_length1);
@@ -654,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 658 "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 665 "RawSupport.c"
+#line 676 "RawSupport.c"
 }
 
 
@@ -677,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 681 "RawSupport.c"
+#line 692 "RawSupport.c"
 }
 
 
@@ -693,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 697 "RawSupport.c"
+#line 708 "RawSupport.c"
 }
 
 
@@ -714,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 718 "RawSupport.c"
+#line 729 "RawSupport.c"
 }
 
 
@@ -730,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 734 "RawSupport.c"
+#line 745 "RawSupport.c"
 }
 
 
@@ -743,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 747 "RawSupport.c"
+#line 758 "RawSupport.c"
 }
 
 
@@ -756,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 760 "RawSupport.c"
+#line 771 "RawSupport.c"
 }
 
 
@@ -771,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 775 "RawSupport.c"
+#line 786 "RawSupport.c"
 }
 
 
@@ -786,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 790 "RawSupport.c"
+#line 801 "RawSupport.c"
 }
 
 
@@ -810,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 814 "RawSupport.c"
+#line 825 "RawSupport.c"
 }
 
 
@@ -820,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 824 "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 831 "RawSupport.c"
+#line 842 "RawSupport.c"
 }
 
 
@@ -852,7 +863,7 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass)
 	((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = raw_file_format_driver_real_create_metadata_writer;
 #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileFormatDriverClass *) klass)->create_sniffer = raw_file_format_driver_real_create_sniffer;
-#line 856 "RawSupport.c"
+#line 867 "RawSupport.c"
 }
 
 
@@ -866,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 870 "RawSupport.c"
+#line 881 "RawSupport.c"
 }
 
 
@@ -890,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 894 "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 901 "RawSupport.c"
+#line 912 "RawSupport.c"
 }
 
 
@@ -913,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 917 "RawSupport.c"
+#line 928 "RawSupport.c"
 }
 
 
@@ -926,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 930 "RawSupport.c"
+#line 941 "RawSupport.c"
 }
 
 
@@ -945,7 +956,7 @@ static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFo
 	result = _tmp1_;
 #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 949 "RawSupport.c"
+#line 960 "RawSupport.c"
 }
 
 
@@ -958,7 +969,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 962 "RawSupport.c"
+#line 973 "RawSupport.c"
 }
 
 
@@ -974,7 +985,7 @@ 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 978 "RawSupport.c"
+#line 989 "RawSupport.c"
 }
 
 
@@ -985,17 +996,17 @@ static gchar** _vala_array_dup12 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 989 "RawSupport.c"
+#line 1000 "RawSupport.c"
 		gchar* _tmp0_ = NULL;
 #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 995 "RawSupport.c"
+#line 1006 "RawSupport.c"
 	}
 #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 999 "RawSupport.c"
+#line 1010 "RawSupport.c"
 }
 
 
@@ -1026,13 +1037,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 1030 "RawSupport.c"
+#line 1041 "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 1036 "RawSupport.c"
+#line 1047 "RawSupport.c"
 }
 
 
@@ -1057,7 +1068,7 @@ 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 1061 "RawSupport.c"
+#line 1072 "RawSupport.c"
 }
 
 
@@ -1068,17 +1079,17 @@ static gchar** _vala_array_dup13 (gchar** self, int length) {
 	result = g_new0 (gchar*, length + 1);
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	for (i = 0; i < length; i++) {
-#line 1072 "RawSupport.c"
+#line 1083 "RawSupport.c"
 		gchar* _tmp0_ = NULL;
 #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 1078 "RawSupport.c"
+#line 1089 "RawSupport.c"
 	}
 #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 1082 "RawSupport.c"
+#line 1093 "RawSupport.c"
 }
 
 
@@ -1109,13 +1120,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 1113 "RawSupport.c"
+#line 1124 "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 1119 "RawSupport.c"
+#line 1130 "RawSupport.c"
 }
 
 
@@ -1125,14 +1136,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 1129 "RawSupport.c"
+#line 1140 "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 1136 "RawSupport.c"
+#line 1147 "RawSupport.c"
 }
 
 
@@ -1604,7 +1615,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 1608 "RawSupport.c"
+#line 1619 "RawSupport.c"
 }
 
 
@@ -1618,7 +1629,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 1622 "RawSupport.c"
+#line 1633 "RawSupport.c"
 }
 
 
@@ -1648,21 +1659,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 1652 "RawSupport.c"
+#line 1663 "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 1659 "RawSupport.c"
+#line 1670 "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 1666 "RawSupport.c"
+#line 1677 "RawSupport.c"
 }
 
 
@@ -1720,7 +1731,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 1724 "RawSupport.c"
+#line 1735 "RawSupport.c"
 	{
 		GRawProcessor* _tmp5_ = NULL;
 		GFile* _tmp6_ = NULL;
@@ -1744,7 +1755,7 @@ 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 1748 "RawSupport.c"
+#line 1759 "RawSupport.c"
 				goto __catch32_graw_exception;
 			}
 #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1757,7 +1768,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 1761 "RawSupport.c"
+#line 1772 "RawSupport.c"
 		}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp9_ = processor;
@@ -1767,7 +1778,7 @@ 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 1771 "RawSupport.c"
+#line 1782 "RawSupport.c"
 				goto __catch32_graw_exception;
 			}
 #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1780,7 +1791,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 1784 "RawSupport.c"
+#line 1795 "RawSupport.c"
 		}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp10_ = processor;
@@ -1790,7 +1801,7 @@ 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 1794 "RawSupport.c"
+#line 1805 "RawSupport.c"
 				goto __catch32_graw_exception;
 			}
 #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1803,7 +1814,7 @@ 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 1807 "RawSupport.c"
+#line 1818 "RawSupport.c"
 		}
 	}
 	goto __finally32;
@@ -1833,11 +1844,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 1837 "RawSupport.c"
+#line 1848 "RawSupport.c"
 			}
 #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 1841 "RawSupport.c"
+#line 1852 "RawSupport.c"
 		}
 #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp12_ = exception;
@@ -1847,7 +1858,7 @@ 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 1851 "RawSupport.c"
+#line 1862 "RawSupport.c"
 		goto __finally32;
 	}
 	__finally32:
@@ -1861,7 +1872,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 1865 "RawSupport.c"
+#line 1876 "RawSupport.c"
 	}
 #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp14_ = detected;
@@ -1905,7 +1916,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 1909 "RawSupport.c"
+#line 1920 "RawSupport.c"
 	{
 		PhotoMetadata* _tmp29_ = NULL;
 		RawReader* _tmp30_ = NULL;
@@ -1920,7 +1931,7 @@ 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 1924 "RawSupport.c"
+#line 1935 "RawSupport.c"
 			goto __catch33_g_error;
 		}
 #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1935,7 +1946,7 @@ 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 1939 "RawSupport.c"
+#line 1950 "RawSupport.c"
 	}
 	goto __finally33;
 	__catch33_g_error:
@@ -1947,7 +1958,7 @@ 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 1951 "RawSupport.c"
+#line 1962 "RawSupport.c"
 	}
 	__finally33:
 #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -1962,7 +1973,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 1966 "RawSupport.c"
+#line 1977 "RawSupport.c"
 	}
 #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp34_ = detected;
@@ -1970,7 +1981,7 @@ 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 1974 "RawSupport.c"
+#line 1985 "RawSupport.c"
 		guint8* flattened_sans_thumbnail = NULL;
 		DetectedPhotoInformation* _tmp36_ = NULL;
 		PhotoMetadata* _tmp37_ = NULL;
@@ -2009,7 +2020,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp41__length1 = flattened_sans_thumbnail_length1;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp41_ != NULL) {
-#line 2013 "RawSupport.c"
+#line 2024 "RawSupport.c"
 			guint8* _tmp42_ = NULL;
 			gint _tmp42__length1 = 0;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2018,15 +2029,15 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_tmp42__length1 = flattened_sans_thumbnail_length1;
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp40_ = _tmp42__length1 > 0;
-#line 2022 "RawSupport.c"
+#line 2033 "RawSupport.c"
 		} else {
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp40_ = FALSE;
-#line 2026 "RawSupport.c"
+#line 2037 "RawSupport.c"
 		}
 #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp40_) {
-#line 2030 "RawSupport.c"
+#line 2041 "RawSupport.c"
 			DetectedPhotoInformation* _tmp43_ = NULL;
 			guint8* _tmp44_ = NULL;
 			gint _tmp44__length1 = 0;
@@ -2049,7 +2060,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_g_free0 (_tmp43_->exif_md5);
 #line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp43_->exif_md5 = _tmp46_;
-#line 2053 "RawSupport.c"
+#line 2064 "RawSupport.c"
 		}
 #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp47_ = detected;
@@ -2069,7 +2080,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp52__length1 = flattened_thumbnail_length1;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp52_ != NULL) {
-#line 2073 "RawSupport.c"
+#line 2084 "RawSupport.c"
 			guint8* _tmp53_ = NULL;
 			gint _tmp53__length1 = 0;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2078,15 +2089,15 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_tmp53__length1 = flattened_thumbnail_length1;
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp51_ = _tmp53__length1 > 0;
-#line 2082 "RawSupport.c"
+#line 2093 "RawSupport.c"
 		} else {
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp51_ = FALSE;
-#line 2086 "RawSupport.c"
+#line 2097 "RawSupport.c"
 		}
 #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (_tmp51_) {
-#line 2090 "RawSupport.c"
+#line 2101 "RawSupport.c"
 			DetectedPhotoInformation* _tmp54_ = NULL;
 			guint8* _tmp55_ = NULL;
 			gint _tmp55__length1 = 0;
@@ -2109,19 +2120,19 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_g_free0 (_tmp54_->thumbnail_md5);
 #line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp54_->thumbnail_md5 = _tmp57_;
-#line 2113 "RawSupport.c"
+#line 2124 "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 2119 "RawSupport.c"
+#line 2130 "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 2125 "RawSupport.c"
+#line 2136 "RawSupport.c"
 		gchar* _tmp59_ = NULL;
 		GFile* _tmp60_ = NULL;
 		gchar* _tmp61_ = NULL;
@@ -2145,7 +2156,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 			_detected_photo_information_unref0 (detected);
 #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return NULL;
-#line 2149 "RawSupport.c"
+#line 2160 "RawSupport.c"
 		}
 #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp62_ = detected;
@@ -2159,7 +2170,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 		_tmp62_->md5 = _tmp63_;
 #line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp59_);
-#line 2163 "RawSupport.c"
+#line 2174 "RawSupport.c"
 	}
 #line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp64_ = detected;
@@ -2183,11 +2194,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base,
 	if (is_corrupted) {
 #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*is_corrupted = _vala_is_corrupted;
-#line 2187 "RawSupport.c"
+#line 2198 "RawSupport.c"
 	}
 #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2191 "RawSupport.c"
+#line 2202 "RawSupport.c"
 }
 
 
@@ -2196,7 +2207,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 = raw_sniffer_real_sniff;
-#line 2200 "RawSupport.c"
+#line 2211 "RawSupport.c"
 }
 
 
@@ -2227,14 +2238,14 @@ RawReader* raw_reader_construct (GType object_type, const gchar* filepath) {
 	self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW);
 #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return self;
-#line 2231 "RawSupport.c"
+#line 2242 "RawSupport.c"
 }
 
 
 RawReader* raw_reader_new (const gchar* filepath) {
 #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return raw_reader_construct (TYPE_RAW_READER, filepath);
-#line 2238 "RawSupport.c"
+#line 2249 "RawSupport.c"
 }
 
 
@@ -2268,13 +2279,13 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr
 		_media_metadata_unref0 (metadata);
 #line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2272 "RawSupport.c"
+#line 2283 "RawSupport.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = metadata;
 #line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2278 "RawSupport.c"
+#line 2289 "RawSupport.c"
 }
 
 
@@ -2336,7 +2347,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2340 "RawSupport.c"
+#line 2351 "RawSupport.c"
 	}
 #line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp8_ = processor;
@@ -2350,7 +2361,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2354 "RawSupport.c"
+#line 2365 "RawSupport.c"
 	}
 #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp9_ = processor;
@@ -2364,7 +2375,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2368 "RawSupport.c"
+#line 2379 "RawSupport.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp11_ = processor;
@@ -2380,7 +2391,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 		_graw_processor_unref0 (processor);
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2384 "RawSupport.c"
+#line 2395 "RawSupport.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp13_ = _tmp10_;
@@ -2402,7 +2413,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError**
 	_graw_processor_unref0 (processor);
 #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2406 "RawSupport.c"
+#line 2417 "RawSupport.c"
 }
 
 
@@ -2432,17 +2443,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	GRawProcessor* _tmp17_ = NULL;
 	gchar* _tmp18_ = NULL;
 	gchar* _tmp19_ = NULL;
-	GRawProcessor* _tmp20_ = NULL;
-	GRawProcessor* _tmp21_ = NULL;
+	GRawProcessor* _tmp30_ = NULL;
+	GRawProcessor* _tmp31_ = NULL;
 	GRawProcessedImage* image = NULL;
-	GRawProcessor* _tmp22_ = NULL;
-	GRawProcessedImage* _tmp23_ = NULL;
-	GRawProcessedImage* _tmp24_ = NULL;
-	GdkPixbuf* _tmp25_ = NULL;
-	GdkPixbuf* _tmp26_ = NULL;
-	Dimensions _tmp27_ = {0};
-	GdkPixbuf* _tmp28_ = NULL;
-	GdkPixbuf* _tmp29_ = NULL;
+	GRawProcessor* _tmp32_ = NULL;
+	GRawProcessedImage* _tmp33_ = NULL;
+	GRawProcessedImage* _tmp34_ = NULL;
+	GdkPixbuf* _tmp35_ = NULL;
+	GdkPixbuf* _tmp36_ = NULL;
+	Dimensions _tmp37_ = {0};
+	GdkPixbuf* _tmp38_ = NULL;
+	GdkPixbuf* _tmp39_ = NULL;
 	GError * _inner_error_ = NULL;
 #line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader);
@@ -2450,86 +2461,72 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 	g_return_val_if_fail (full != NULL, NULL);
 #line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (scaled != NULL, NULL);
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = *scaled;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = _tmp0_.width;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp2_ = *full;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = _tmp2_.width;
-#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	width_proportion = ((gdouble) _tmp1_) / ((gdouble) _tmp3_);
 #line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	width_proportion = ((gdouble) _tmp1_) / ((gdouble) _tmp3_);
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp4_ = *scaled;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp5_ = _tmp4_.height;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp6_ = *full;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp7_ = _tmp6_.height;
-#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	height_proportion = ((gdouble) _tmp5_) / ((gdouble) _tmp7_);
 #line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	height_proportion = ((gdouble) _tmp5_) / ((gdouble) _tmp7_);
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp9_ = width_proportion;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp9_ < 0.5) {
-#line 2478 "RawSupport.c"
+#line 2489 "RawSupport.c"
 		gdouble _tmp10_ = 0.0;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp10_ = height_proportion;
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp8_ = _tmp10_ < 0.5;
-#line 2484 "RawSupport.c"
+#line 2495 "RawSupport.c"
 	} else {
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp8_ = FALSE;
-#line 2488 "RawSupport.c"
+#line 2499 "RawSupport.c"
 	}
-#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	half_size = _tmp8_;
-#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp11_ = graw_processor_new (LIBRAW_OPTIONS_NONE);
-#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	processor = _tmp11_;
 #line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	processor = _tmp11_;
+#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp12_ = processor;
-#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp13_ = half_size;
-#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	graw_processor_configure_for_rgb_display (_tmp12_, _tmp13_);
 #line 249 "/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"
 	_tmp14_ = processor;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp15_ = graw_processor_get_output_params (_tmp14_);
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp16_ = _tmp15_;
-#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	(*_tmp16_).user_flip = (gint) GRAW_FLIP_NONE;
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp17_ = processor;
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/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 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp19_ = _tmp18_;
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	graw_processor_open_file (_tmp17_, _tmp19_, &_inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_free0 (_tmp19_);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		g_propagate_error (error, _inner_error_);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		_graw_processor_unref0 (processor);
-#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-		return NULL;
-#line 2528 "RawSupport.c"
-	}
 #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp20_ = processor;
+	graw_processor_open_file (_tmp17_, _tmp19_, &_inner_error_);
 #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	graw_processor_unpack (_tmp20_, &_inner_error_);
+	_g_free0 (_tmp19_);
 #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2538,12 +2535,83 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_graw_processor_unref0 (processor);
 #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2542 "RawSupport.c"
+#line 2539 "RawSupport.c"
 	}
+	{
+		PhotoFileReaderRole _tmp20_ = 0;
+#line 254 "/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"
+		if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) {
+#line 2547 "RawSupport.c"
+			GRawProcessor* _tmp21_ = NULL;
+			GRawProcessedImage* image = NULL;
+			GRawProcessor* _tmp22_ = NULL;
+			GRawProcessedImage* _tmp23_ = NULL;
+			GRawProcessedImage* _tmp24_ = NULL;
+			GdkPixbuf* _tmp25_ = NULL;
+			GdkPixbuf* _tmp26_ = NULL;
+			Dimensions _tmp27_ = {0};
+			GdkPixbuf* _tmp28_ = NULL;
+			GdkPixbuf* _tmp29_ = NULL;
+#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp21_ = processor;
+#line 255 "/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"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2564 "RawSupport.c"
+				goto __catch34_g_error;
+			}
+#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp22_ = processor;
+#line 256 "/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"
+			image = _tmp23_;
+#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 2575 "RawSupport.c"
+				goto __catch34_g_error;
+			}
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp24_ = image;
+#line 257 "/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"
+			_tmp26_ = _tmp25_;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_tmp27_ = *scaled;
+#line 257 "/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"
+			_tmp29_ = _tmp28_;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_g_object_unref0 (_tmp26_);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			result = _tmp29_;
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_graw_processed_image_unref0 (image);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			_graw_processor_unref0 (processor);
+#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+			return result;
+#line 2600 "RawSupport.c"
+		}
+	}
+	goto __finally34;
+	__catch34_g_error:
+	{
+		GError* _error_ = NULL;
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp21_ = processor;
+		_error_ = _inner_error_;
+#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_inner_error_ = NULL;
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	graw_processor_process (_tmp21_, &_inner_error_);
+		_g_error_free0 (_error_);
+#line 2613 "RawSupport.c"
+	}
+	__finally34:
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2552,47 +2620,75 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions
 		_graw_processor_unref0 (processor);
 #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2556 "RawSupport.c"
+#line 2624 "RawSupport.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp22_ = processor;
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp23_ = graw_processor_make_mem_image (_tmp22_, &_inner_error_);
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	image = _tmp23_;
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp30_ = processor;
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	graw_processor_unpack (_tmp30_, &_inner_error_);
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_graw_processor_unref0 (processor);
-#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 2572 "RawSupport.c"
+#line 2638 "RawSupport.c"
 	}
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp24_ = image;
-#line 257 "/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"
-	_tmp26_ = _tmp25_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_tmp27_ = *scaled;
-#line 257 "/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"
-	_tmp29_ = _tmp28_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	_g_object_unref0 (_tmp26_);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
-	result = _tmp29_;
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp31_ = processor;
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	graw_processor_process (_tmp31_, &_inner_error_);
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		g_propagate_error (error, _inner_error_);
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_graw_processor_unref0 (processor);
+#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		return NULL;
+#line 2652 "RawSupport.c"
+	}
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp32_ = processor;
+#line 268 "/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"
+	image = _tmp33_;
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		g_propagate_error (error, _inner_error_);
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		_graw_processor_unref0 (processor);
+#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+		return NULL;
+#line 2668 "RawSupport.c"
+	}
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp34_ = image;
+#line 270 "/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"
+	_tmp36_ = _tmp35_;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_tmp37_ = *scaled;
+#line 270 "/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"
+	_tmp39_ = _tmp38_;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	_g_object_unref0 (_tmp36_);
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+	result = _tmp39_;
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processed_image_unref0 (image);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_graw_processor_unref0 (processor);
-#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2596 "RawSupport.c"
+#line 2692 "RawSupport.c"
 }
 
 
@@ -2605,7 +2701,7 @@ static void raw_reader_class_init (RawReaderClass * klass) {
 	((PhotoFileReaderClass *) klass)->unscaled_read = raw_reader_real_unscaled_read;
 #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	((PhotoFileReaderClass *) klass)->scaled_read = raw_reader_real_scaled_read;
-#line 2609 "RawSupport.c"
+#line 2705 "RawSupport.c"
 }
 
 
@@ -2630,80 +2726,80 @@ RawDeveloper* raw_developer_as_array (int* result_length1) {
 	RawDeveloper* _tmp0_ = NULL;
 	RawDeveloper* _tmp1_ = NULL;
 	gint _tmp1__length1 = 0;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = g_new0 (RawDeveloper, 3);
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[0] = RAW_DEVELOPER_SHOTWELL;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[1] = RAW_DEVELOPER_CAMERA;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_[2] = RAW_DEVELOPER_EMBEDDED;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1__length1 = 3;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (result_length1) {
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		*result_length1 = _tmp1__length1;
-#line 2650 "RawSupport.c"
+#line 2746 "RawSupport.c"
 	}
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = _tmp1_;
-#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2656 "RawSupport.c"
+#line 2752 "RawSupport.c"
 }
 
 
 gchar* raw_developer_to_string (RawDeveloper self) {
 	gchar* result = NULL;
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	switch (self) {
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 2666 "RawSupport.c"
+#line 2762 "RawSupport.c"
 		{
 			gchar* _tmp0_ = NULL;
-#line 274 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp0_ = g_strdup ("SHOTWELL");
-#line 274 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp0_;
-#line 274 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2675 "RawSupport.c"
+#line 2771 "RawSupport.c"
 		}
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 2679 "RawSupport.c"
+#line 2775 "RawSupport.c"
 		{
 			gchar* _tmp1_ = NULL;
-#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp1_ = g_strdup ("CAMERA");
-#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp1_;
-#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2688 "RawSupport.c"
+#line 2784 "RawSupport.c"
 		}
-#line 272 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 2692 "RawSupport.c"
+#line 2788 "RawSupport.c"
 		{
 			gchar* _tmp2_ = NULL;
-#line 278 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp2_ = g_strdup ("EMBEDDED");
-#line 278 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp2_;
-#line 278 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2701 "RawSupport.c"
+#line 2797 "RawSupport.c"
 		}
 		default:
 		{
-#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_assert_not_reached ();
-#line 2707 "RawSupport.c"
+#line 2803 "RawSupport.c"
 		}
 	}
 }
@@ -2714,69 +2810,69 @@ RawDeveloper raw_developer_from_string (const gchar* value) {
 	const gchar* _tmp0_ = NULL;
 	const gchar* _tmp1_ = NULL;
 	GQuark _tmp3_ = 0U;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	static GQuark _tmp2_label0 = 0;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	static GQuark _tmp2_label1 = 0;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	static GQuark _tmp2_label2 = 0;
-#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (value != NULL, 0);
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = value;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = _tmp0_;
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("SHOTWELL")))) {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2736 "RawSupport.c"
+#line 2832 "RawSupport.c"
 			default:
 			{
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_SHOTWELL;
-#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2743 "RawSupport.c"
+#line 2839 "RawSupport.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("CAMERA")))) {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2749 "RawSupport.c"
+#line 2845 "RawSupport.c"
 			default:
 			{
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_CAMERA;
-#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2756 "RawSupport.c"
+#line 2852 "RawSupport.c"
 			}
 		}
 	} else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("EMBEDDED")))) {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2762 "RawSupport.c"
+#line 2858 "RawSupport.c"
 			default:
 			{
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				result = RAW_DEVELOPER_EMBEDDED;
-#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				return result;
-#line 2769 "RawSupport.c"
+#line 2865 "RawSupport.c"
 			}
 		}
 	} else {
-#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		switch (0) {
-#line 2775 "RawSupport.c"
+#line 2871 "RawSupport.c"
 			default:
 			{
-#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 				g_assert_not_reached ();
-#line 2780 "RawSupport.c"
+#line 2876 "RawSupport.c"
 			}
 		}
 	}
@@ -2785,47 +2881,47 @@ RawDeveloper raw_developer_from_string (const gchar* value) {
 
 gchar* raw_developer_get_label (RawDeveloper self) {
 	gchar* result = NULL;
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	switch (self) {
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_SHOTWELL:
-#line 2793 "RawSupport.c"
+#line 2889 "RawSupport.c"
 		{
 			const gchar* _tmp0_ = NULL;
 			gchar* _tmp1_ = NULL;
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp0_ = _ ("Shotwell");
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp1_ = g_strdup (_tmp0_);
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp1_;
-#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2805 "RawSupport.c"
+#line 2901 "RawSupport.c"
 		}
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_CAMERA:
-#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		case RAW_DEVELOPER_EMBEDDED:
-#line 2811 "RawSupport.c"
+#line 2907 "RawSupport.c"
 		{
 			const gchar* _tmp2_ = NULL;
 			gchar* _tmp3_ = NULL;
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp2_ = _ ("Camera");
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp3_ = g_strdup (_tmp2_);
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			result = _tmp3_;
-#line 303 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			return result;
-#line 2823 "RawSupport.c"
+#line 2919 "RawSupport.c"
 		}
 		default:
 		{
-#line 305 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 318 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			g_assert_not_reached ();
-#line 2829 "RawSupport.c"
+#line 2925 "RawSupport.c"
 		}
 	}
 }
@@ -2836,68 +2932,68 @@ gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) {
 	RawDeveloper _tmp0_ = 0;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-#line 312 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = d;
-#line 312 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (self == _tmp0_) {
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result = TRUE;
-#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return result;
-#line 2848 "RawSupport.c"
+#line 2944 "RawSupport.c"
 	}
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (self == RAW_DEVELOPER_CAMERA) {
-#line 2852 "RawSupport.c"
+#line 2948 "RawSupport.c"
 		RawDeveloper _tmp3_ = 0;
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp3_ = d;
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED;
-#line 2858 "RawSupport.c"
+#line 2954 "RawSupport.c"
 	} else {
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp2_ = FALSE;
-#line 2862 "RawSupport.c"
+#line 2958 "RawSupport.c"
 	}
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp2_) {
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp1_ = TRUE;
-#line 2868 "RawSupport.c"
+#line 2964 "RawSupport.c"
 	} else {
 		gboolean _tmp4_ = FALSE;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (self == RAW_DEVELOPER_EMBEDDED) {
-#line 2873 "RawSupport.c"
+#line 2969 "RawSupport.c"
 			RawDeveloper _tmp5_ = 0;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp5_ = d;
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA;
-#line 2879 "RawSupport.c"
+#line 2975 "RawSupport.c"
 		} else {
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp4_ = FALSE;
-#line 2883 "RawSupport.c"
+#line 2979 "RawSupport.c"
 		}
-#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp1_ = _tmp4_;
-#line 2887 "RawSupport.c"
+#line 2983 "RawSupport.c"
 	}
-#line 315 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp1_) {
-#line 317 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		result = TRUE;
-#line 317 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return result;
-#line 2895 "RawSupport.c"
+#line 2991 "RawSupport.c"
 	}
-#line 319 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = FALSE;
-#line 319 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 2901 "RawSupport.c"
+#line 2997 "RawSupport.c"
 }
 
 
@@ -2932,41 +3028,41 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
 	GFile* _tmp37_ = NULL;
 	gchar* _tmp38_ = NULL;
 	GError * _inner_error_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	g_return_val_if_fail (raw_filepath != NULL, NULL);
-#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp0_ = backing_photo_row_new ();
-#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	ns = _tmp0_;
-#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp1_ = raw_filepath;
-#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp2_ = g_file_new_for_path (_tmp1_);
-#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	master = _tmp2_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp3_ = master;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp4_ = g_file_get_basename (_tmp3_);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp5_ = _tmp4_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	disassemble_filename (_tmp5_, &_tmp6_, &_tmp7_);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (name);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	name = _tmp6_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (ext);
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	ext = _tmp7_;
-#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (_tmp5_);
-#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp8_ = camera_development_filename;
-#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (_tmp8_ == NULL) {
-#line 2970 "RawSupport.c"
+#line 3066 "RawSupport.c"
 		gchar* _tmp9_ = NULL;
 		const gchar* _tmp16_ = NULL;
 		gchar* _tmp17_ = NULL;
@@ -2977,176 +3073,176 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper
 		gchar* _tmp22_ = NULL;
 		gchar* _tmp23_ = NULL;
 		gchar* _tmp24_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		if (self != RAW_DEVELOPER_CAMERA) {
-#line 2983 "RawSupport.c"
+#line 3079 "RawSupport.c"
 			gchar* _tmp10_ = NULL;
 			gchar* _tmp11_ = NULL;
 			gchar* _tmp12_ = NULL;
 			gchar* _tmp13_ = NULL;
 			gchar* _tmp14_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp10_ = raw_developer_to_string (self);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp11_ = _tmp10_;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp12_ = g_utf8_strdown (_tmp11_, (gssize) -1);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp13_ = _tmp12_;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp14_ = g_strconcat ("_", _tmp13_, NULL);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp9_);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp9_ = _tmp14_;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp13_);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp11_);
-#line 3007 "RawSupport.c"
+#line 3103 "RawSupport.c"
 		} else {
 			gchar* _tmp15_ = NULL;
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp15_ = g_strdup ("");
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_g_free0 (_tmp9_);
-#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 			_tmp9_ = _tmp15_;
-#line 3016 "RawSupport.c"
+#line 3112 "RawSupport.c"
 		}
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp16_ = name;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp17_ = g_strconcat (_tmp16_, "_", NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp18_ = _tmp17_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp19_ = ext;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp21_ = _tmp20_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp22_ = g_strconcat (_tmp21_, _tmp9_, NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp23_ = _tmp22_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp24_ = g_strconcat (_tmp23_, ".jpg", NULL);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		basename = _tmp24_;
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp23_);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp21_);
-#line 336 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp18_);
-#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (_tmp9_);
-#line 3048 "RawSupport.c"
+#line 3144 "RawSupport.c"
 	} else {
 		const gchar* _tmp25_ = NULL;
 		gchar* _tmp26_ = NULL;
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp25_ = camera_development_filename;
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_tmp26_ = g_strdup (_tmp25_);
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		basename = _tmp26_;
-#line 3060 "RawSupport.c"
+#line 3156 "RawSupport.c"
 	}
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp27_ = master;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp28_ = g_file_get_parent (_tmp27_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp29_ = _tmp28_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp30_ = basename;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp32_ = generate_unique_file (_tmp29_, _tmp30_, &_tmp31_, &_inner_error_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	c = _tmp31_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp33_ = _tmp32_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (_tmp29_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	new_back = _tmp33_;
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (ext);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (name);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (master);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_backing_photo_row_unref0 (ns);
-#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 3096 "RawSupport.c"
+#line 3192 "RawSupport.c"
 	}
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp34_ = new_back;
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	claim_file (_tmp34_, &_inner_error_);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		g_propagate_error (error, _inner_error_);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (new_back);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (basename);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (ext);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_free0 (name);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_g_object_unref0 (master);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		_backing_photo_row_unref0 (ns);
-#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 		return NULL;
-#line 3120 "RawSupport.c"
+#line 3216 "RawSupport.c"
 	}
-#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp35_ = ns;
-#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp35_->file_format = PHOTO_FILE_FORMAT_JFIF;
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp36_ = ns;
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp37_ = new_back;
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp38_ = g_file_get_path (_tmp37_);
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (_tmp36_->filepath);
-#line 346 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_tmp36_->filepath = _tmp38_;
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	result = ns;
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (new_back);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (basename);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (ext);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_free0 (name);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	_g_object_unref0 (master);
-#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
+#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
 	return result;
-#line 3150 "RawSupport.c"
+#line 3246 "RawSupport.c"
 }
 
 
diff --git a/src/photos/RawSupport.vala b/src/photos/RawSupport.vala
index 441b899..05f652c 100644
--- a/src/photos/RawSupport.vala
+++ b/src/photos/RawSupport.vala
@@ -240,6 +240,7 @@ public class RawReader : PhotoFileReader {
     }
     
     public override Gdk.Pixbuf scaled_read(Dimensions full, Dimensions scaled) throws Error {
+        // Try to get the embedded thumbnail first
         double width_proportion = (double) scaled.width / (double) full.width;
         double height_proportion = (double) scaled.height / (double) full.height;
         bool half_size = width_proportion < 0.5 && height_proportion < 0.5;
@@ -249,6 +250,18 @@ public class RawReader : PhotoFileReader {
         processor.output_params->user_flip = GRaw.Flip.NONE;
         
         processor.open_file(get_filepath());
+        try {
+            if (this.get_role () == Role.THUMBNAIL) {
+                processor.unpack_thumb();
+                var image = processor.make_thumb_image ();
+                return resize_pixbuf (image.get_pixbuf_copy (),
+                                      scaled,
+                                      Gdk.InterpType.BILINEAR);
+            }
+        } catch (Error error) {
+            // Nothing to do, continue with raw developer
+        }
+
         processor.unpack();
         processor.process();
         
diff --git a/src/plugins/ManifestWidget.c b/src/plugins/ManifestWidget.c
index 2571817..af0f48d 100644
--- a/src/plugins/ManifestWidget.c
+++ b/src/plugins/ManifestWidget.c
@@ -1428,7 +1428,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1431 "ManifestWidget.c"
-							goto __catch36_g_error;
+							goto __catch37_g_error;
 						}
 #line 179 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 						_tmp53_ = _tmp50_;
@@ -1442,8 +1442,8 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						_g_object_unref0 (_tmp50_);
 #line 1444 "ManifestWidget.c"
 					}
-					goto __finally36;
-					__catch36_g_error:
+					goto __finally37;
+					__catch37_g_error:
 					{
 						GError* err = NULL;
 						PluginsExtensionPoint* _tmp54_ = NULL;
@@ -1471,7 +1471,7 @@ PluginsManifestListView* plugins_manifest_list_view_construct (GType object_type
 						_g_error_free0 (err);
 #line 1473 "ManifestWidget.c"
 					}
-					__finally36:
+					__finally37:
 #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 178 "/home/jens/Source/shotwell/src/plugins/ManifestWidget.vala"
diff --git a/src/plugins/Plugins.c b/src/plugins/Plugins.c
index 983b44c..c6ccfad 100644
--- a/src/plugins/Plugins.c
+++ b/src/plugins/Plugins.c
@@ -1894,11 +1894,11 @@ void plugins_init (GError** error) {
 #line 133 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1896 "Plugins.c"
-						goto __catch34_g_error;
+						goto __catch35_g_error;
 					}
 				}
-				goto __finally34;
-				__catch34_g_error:
+				goto __finally35;
+				__catch35_g_error:
 				{
 					GError* err = NULL;
 					GFile* _tmp13_ = NULL;
@@ -1928,7 +1928,7 @@ void plugins_init (GError** error) {
 					_g_error_free0 (err);
 #line 1929 "Plugins.c"
 				}
-				__finally34:
+				__finally35:
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 132 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
@@ -3801,11 +3801,11 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 #line 335 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 3803 "Plugins.c"
-							goto __catch35_g_error;
+							goto __catch36_g_error;
 						}
 					}
-					goto __finally35;
-					__catch35_g_error:
+					goto __finally36;
+					__catch36_g_error:
 					{
 						GError* err = NULL;
 						GFile* _tmp18_ = NULL;
@@ -3835,7 +3835,7 @@ void plugins_search_for_plugins (GFile* dir, GError** error) {
 						_g_error_free0 (err);
 #line 3836 "Plugins.c"
 					}
-					__finally35:
+					__finally36:
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
 					if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 334 "/home/jens/Source/shotwell/src/plugins/Plugins.vala"
diff --git a/src/plugins/PublishingInterfaces.c b/src/plugins/PublishingInterfaces.c
index 22cfa5a..4dfb6a4 100644
--- a/src/plugins/PublishingInterfaces.c
+++ b/src/plugins/PublishingInterfaces.c
@@ -16,6 +16,7 @@
 #include <float.h>
 #include <math.h>
 #include <gtk/gtk.h>
+#include <gee.h>
 
 
 #define SPIT_PUBLISHING_TYPE_PUBLISHER (spit_publishing_publisher_get_type ())
@@ -83,6 +84,22 @@ typedef struct _SpitPublishingPublishableIface SpitPublishingPublishableIface;
 
 #define SPIT_PUBLISHING_PUBLISHER_TYPE_MEDIA_TYPE (spit_publishing_publisher_media_type_get_type ())
 
+#define SPIT_PUBLISHING_TYPE_AUTHENTICATOR (spit_publishing_authenticator_get_type ())
+#define SPIT_PUBLISHING_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticator))
+#define SPIT_PUBLISHING_IS_AUTHENTICATOR(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR))
+#define SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR, SpitPublishingAuthenticatorIface))
+
+typedef struct _SpitPublishingAuthenticator SpitPublishingAuthenticator;
+typedef struct _SpitPublishingAuthenticatorIface SpitPublishingAuthenticatorIface;
+
+#define SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY (spit_publishing_authenticator_factory_get_type ())
+#define SPIT_PUBLISHING_AUTHENTICATOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactory))
+#define SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY))
+#define SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), SPIT_PUBLISHING_TYPE_AUTHENTICATOR_FACTORY, SpitPublishingAuthenticatorFactoryIface))
+
+typedef struct _SpitPublishingAuthenticatorFactory SpitPublishingAuthenticatorFactory;
+typedef struct _SpitPublishingAuthenticatorFactoryIface SpitPublishingAuthenticatorFactoryIface;
+
 /**
  * Defines different kinds of errors that can occur during publishing.
  */
@@ -261,6 +278,21 @@ struct _SpitPublishingPublisherIface {
 	void (*reserved7) (SpitPublishingPublisher* self);
 };
 
+struct _SpitPublishingAuthenticatorIface {
+	GTypeInterface parent_iface;
+	void (*authenticate) (SpitPublishingAuthenticator* self);
+	gboolean (*can_logout) (SpitPublishingAuthenticator* self);
+	void (*logout) (SpitPublishingAuthenticator* self);
+	void (*refresh) (SpitPublishingAuthenticator* self);
+	GHashTable* (*get_authentication_parameter) (SpitPublishingAuthenticator* self);
+};
+
+struct _SpitPublishingAuthenticatorFactoryIface {
+	GTypeInterface parent_iface;
+	GeeList* (*get_available_authenticators) (SpitPublishingAuthenticatorFactory* self);
+	SpitPublishingAuthenticator* (*create) (SpitPublishingAuthenticatorFactory* self, const gchar* provider, SpitPublishingPluginHost* host);
+};
+
 
 
 #define SPIT_PUBLISHING_CURRENT_INTERFACE 0
@@ -395,6 +427,15 @@ void spit_publishing_service_reserved6 (SpitPublishingService* self);
 static void spit_publishing_service_real_reserved6 (SpitPublishingService* self);
 void spit_publishing_service_reserved7 (SpitPublishingService* self);
 static void spit_publishing_service_real_reserved7 (SpitPublishingService* self);
+GType spit_publishing_authenticator_get_type (void) G_GNUC_CONST;
+void spit_publishing_authenticator_authenticate (SpitPublishingAuthenticator* self);
+gboolean spit_publishing_authenticator_can_logout (SpitPublishingAuthenticator* self);
+void spit_publishing_authenticator_logout (SpitPublishingAuthenticator* self);
+void spit_publishing_authenticator_refresh (SpitPublishingAuthenticator* self);
+GHashTable* spit_publishing_authenticator_get_authentication_parameter (SpitPublishingAuthenticator* self);
+GType spit_publishing_authenticator_factory_get_type (void) G_GNUC_CONST;
+GeeList* spit_publishing_authenticator_factory_get_available_authenticators (SpitPublishingAuthenticatorFactory* self);
+SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitPublishingAuthenticatorFactory* self, const gchar* provider, SpitPublishingPluginHost* host);
 
 
 GQuark spit_publishing_publishing_error_quark (void) {
@@ -428,7 +469,7 @@ SpitPublishingService* spit_publishing_publisher_get_service (SpitPublishingPubl
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self), NULL);
 #line 121 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->get_service (self);
-#line 432 "PublishingInterfaces.c"
+#line 473 "PublishingInterfaces.c"
 }
 
 
@@ -443,7 +484,7 @@ void spit_publishing_publisher_start (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 129 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->start (self);
-#line 447 "PublishingInterfaces.c"
+#line 488 "PublishingInterfaces.c"
 }
 
 
@@ -455,7 +496,7 @@ gboolean spit_publishing_publisher_is_running (SpitPublishingPublisher* self) {
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self), FALSE);
 #line 134 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->is_running (self);
-#line 459 "PublishingInterfaces.c"
+#line 500 "PublishingInterfaces.c"
 }
 
 
@@ -468,7 +509,7 @@ void spit_publishing_publisher_stop (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 140 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->stop (self);
-#line 472 "PublishingInterfaces.c"
+#line 513 "PublishingInterfaces.c"
 }
 
 
@@ -481,7 +522,7 @@ void spit_publishing_publisher_reserved0 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 145 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved0 (self);
-#line 485 "PublishingInterfaces.c"
+#line 526 "PublishingInterfaces.c"
 }
 
 
@@ -494,7 +535,7 @@ void spit_publishing_publisher_reserved1 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 146 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved1 (self);
-#line 498 "PublishingInterfaces.c"
+#line 539 "PublishingInterfaces.c"
 }
 
 
@@ -507,7 +548,7 @@ void spit_publishing_publisher_reserved2 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 147 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved2 (self);
-#line 511 "PublishingInterfaces.c"
+#line 552 "PublishingInterfaces.c"
 }
 
 
@@ -520,7 +561,7 @@ void spit_publishing_publisher_reserved3 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 148 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved3 (self);
-#line 524 "PublishingInterfaces.c"
+#line 565 "PublishingInterfaces.c"
 }
 
 
@@ -533,7 +574,7 @@ void spit_publishing_publisher_reserved4 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 149 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved4 (self);
-#line 537 "PublishingInterfaces.c"
+#line 578 "PublishingInterfaces.c"
 }
 
 
@@ -546,7 +587,7 @@ void spit_publishing_publisher_reserved5 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 150 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved5 (self);
-#line 550 "PublishingInterfaces.c"
+#line 591 "PublishingInterfaces.c"
 }
 
 
@@ -559,7 +600,7 @@ void spit_publishing_publisher_reserved6 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 151 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved6 (self);
-#line 563 "PublishingInterfaces.c"
+#line 604 "PublishingInterfaces.c"
 }
 
 
@@ -572,7 +613,7 @@ void spit_publishing_publisher_reserved7 (SpitPublishingPublisher* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHER (self));
 #line 152 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHER_GET_INTERFACE (self)->reserved7 (self);
-#line 576 "PublishingInterfaces.c"
+#line 617 "PublishingInterfaces.c"
 }
 
 
@@ -599,7 +640,7 @@ static void spit_publishing_publisher_base_init (SpitPublishingPublisherIface *
 		iface->reserved6 = spit_publishing_publisher_real_reserved6;
 #line 105 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_publisher_real_reserved7;
-#line 603 "PublishingInterfaces.c"
+#line 644 "PublishingInterfaces.c"
 	}
 }
 
@@ -651,7 +692,7 @@ GtkWidget* spit_publishing_dialog_pane_get_widget (SpitPublishingDialogPane* sel
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self), NULL);
 #line 197 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->get_widget (self);
-#line 655 "PublishingInterfaces.c"
+#line 696 "PublishingInterfaces.c"
 }
 
 
@@ -664,7 +705,7 @@ SpitPublishingDialogPaneGeometryOptions spit_publishing_dialog_pane_get_preferre
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self), 0);
 #line 203 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->get_preferred_geometry (self);
-#line 668 "PublishingInterfaces.c"
+#line 709 "PublishingInterfaces.c"
 }
 
 
@@ -677,7 +718,7 @@ void spit_publishing_dialog_pane_on_pane_installed (SpitPublishingDialogPane* se
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 209 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->on_pane_installed (self);
-#line 681 "PublishingInterfaces.c"
+#line 722 "PublishingInterfaces.c"
 }
 
 
@@ -690,7 +731,7 @@ void spit_publishing_dialog_pane_on_pane_uninstalled (SpitPublishingDialogPane*
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 215 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->on_pane_uninstalled (self);
-#line 694 "PublishingInterfaces.c"
+#line 735 "PublishingInterfaces.c"
 }
 
 
@@ -703,7 +744,7 @@ void spit_publishing_dialog_pane_reserved0 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 220 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved0 (self);
-#line 707 "PublishingInterfaces.c"
+#line 748 "PublishingInterfaces.c"
 }
 
 
@@ -716,7 +757,7 @@ void spit_publishing_dialog_pane_reserved1 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 221 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved1 (self);
-#line 720 "PublishingInterfaces.c"
+#line 761 "PublishingInterfaces.c"
 }
 
 
@@ -729,7 +770,7 @@ void spit_publishing_dialog_pane_reserved2 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 222 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved2 (self);
-#line 733 "PublishingInterfaces.c"
+#line 774 "PublishingInterfaces.c"
 }
 
 
@@ -742,7 +783,7 @@ void spit_publishing_dialog_pane_reserved3 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 223 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved3 (self);
-#line 746 "PublishingInterfaces.c"
+#line 787 "PublishingInterfaces.c"
 }
 
 
@@ -755,7 +796,7 @@ void spit_publishing_dialog_pane_reserved4 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 224 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved4 (self);
-#line 759 "PublishingInterfaces.c"
+#line 800 "PublishingInterfaces.c"
 }
 
 
@@ -768,7 +809,7 @@ void spit_publishing_dialog_pane_reserved5 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 225 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved5 (self);
-#line 772 "PublishingInterfaces.c"
+#line 813 "PublishingInterfaces.c"
 }
 
 
@@ -781,7 +822,7 @@ void spit_publishing_dialog_pane_reserved6 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 226 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved6 (self);
-#line 785 "PublishingInterfaces.c"
+#line 826 "PublishingInterfaces.c"
 }
 
 
@@ -794,7 +835,7 @@ void spit_publishing_dialog_pane_reserved7 (SpitPublishingDialogPane* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_DIALOG_PANE (self));
 #line 227 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_DIALOG_PANE_GET_INTERFACE (self)->reserved7 (self);
-#line 798 "PublishingInterfaces.c"
+#line 839 "PublishingInterfaces.c"
 }
 
 
@@ -821,7 +862,7 @@ static void spit_publishing_dialog_pane_base_init (SpitPublishingDialogPaneIface
 		iface->reserved6 = spit_publishing_dialog_pane_real_reserved6;
 #line 160 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_dialog_pane_real_reserved7;
-#line 825 "PublishingInterfaces.c"
+#line 866 "PublishingInterfaces.c"
 	}
 }
 
@@ -871,7 +912,7 @@ void spit_publishing_plugin_host_post_error (SpitPublishingPluginHost* self, GEr
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 277 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->post_error (self, err);
-#line 875 "PublishingInterfaces.c"
+#line 916 "PublishingInterfaces.c"
 }
 
 
@@ -886,7 +927,7 @@ void spit_publishing_plugin_host_stop_publishing (SpitPublishingPluginHost* self
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 285 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->stop_publishing (self);
-#line 890 "PublishingInterfaces.c"
+#line 931 "PublishingInterfaces.c"
 }
 
 
@@ -898,7 +939,7 @@ SpitPublishingPublisher* spit_publishing_plugin_host_get_publisher (SpitPublishi
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL);
 #line 290 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publisher (self);
-#line 902 "PublishingInterfaces.c"
+#line 943 "PublishingInterfaces.c"
 }
 
 
@@ -925,7 +966,7 @@ void spit_publishing_plugin_host_install_dialog_pane (SpitPublishingPluginHost*
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 310 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_dialog_pane (self, pane, mode);
-#line 929 "PublishingInterfaces.c"
+#line 970 "PublishingInterfaces.c"
 }
 
 
@@ -960,7 +1001,7 @@ void spit_publishing_plugin_host_install_static_message_pane (SpitPublishingPlug
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 339 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_static_message_pane (self, message, mode);
-#line 964 "PublishingInterfaces.c"
+#line 1005 "PublishingInterfaces.c"
 }
 
 
@@ -987,7 +1028,7 @@ void spit_publishing_plugin_host_install_pango_message_pane (SpitPublishingPlugi
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 360 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_pango_message_pane (self, markup, mode);
-#line 991 "PublishingInterfaces.c"
+#line 1032 "PublishingInterfaces.c"
 }
 
 
@@ -1008,7 +1049,7 @@ void spit_publishing_plugin_host_install_success_pane (SpitPublishingPluginHost*
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 375 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_success_pane (self);
-#line 1012 "PublishingInterfaces.c"
+#line 1053 "PublishingInterfaces.c"
 }
 
 
@@ -1031,7 +1072,7 @@ void spit_publishing_plugin_host_install_account_fetch_wait_pane (SpitPublishing
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 391 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_account_fetch_wait_pane (self);
-#line 1035 "PublishingInterfaces.c"
+#line 1076 "PublishingInterfaces.c"
 }
 
 
@@ -1051,7 +1092,7 @@ void spit_publishing_plugin_host_install_login_wait_pane (SpitPublishingPluginHo
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 405 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_login_wait_pane (self);
-#line 1055 "PublishingInterfaces.c"
+#line 1096 "PublishingInterfaces.c"
 }
 
 
@@ -1080,7 +1121,7 @@ void spit_publishing_plugin_host_install_welcome_pane (SpitPublishingPluginHost*
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 427 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->install_welcome_pane (self, welcome_message, on_login_clicked, on_login_clicked_target);
-#line 1084 "PublishingInterfaces.c"
+#line 1125 "PublishingInterfaces.c"
 }
 
 
@@ -1103,7 +1144,7 @@ void spit_publishing_plugin_host_set_service_locked (SpitPublishingPluginHost* s
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 444 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->set_service_locked (self, is_locked);
-#line 1107 "PublishingInterfaces.c"
+#line 1148 "PublishingInterfaces.c"
 }
 
 
@@ -1122,7 +1163,7 @@ void spit_publishing_plugin_host_set_dialog_default_widget (SpitPublishingPlugin
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 456 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->set_dialog_default_widget (self, widget);
-#line 1126 "PublishingInterfaces.c"
+#line 1167 "PublishingInterfaces.c"
 }
 
 
@@ -1135,7 +1176,7 @@ SpitPublishingPublishable** spit_publishing_plugin_host_get_publishables (SpitPu
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL);
 #line 462 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publishables (self, result_length1);
-#line 1139 "PublishingInterfaces.c"
+#line 1180 "PublishingInterfaces.c"
 }
 
 
@@ -1174,7 +1215,7 @@ SpitPublishingProgressCallback spit_publishing_plugin_host_serialize_publishable
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), NULL);
 #line 494 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->serialize_publishables (self, content_major_axis, strip_metadata, result_target, result_target_destroy_notify);
-#line 1178 "PublishingInterfaces.c"
+#line 1219 "PublishingInterfaces.c"
 }
 
 
@@ -1188,7 +1229,7 @@ SpitPublishingPublisherMediaType spit_publishing_plugin_host_get_publishable_med
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self), 0);
 #line 502 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->get_publishable_media_type (self);
-#line 1192 "PublishingInterfaces.c"
+#line 1233 "PublishingInterfaces.c"
 }
 
 
@@ -1201,7 +1242,7 @@ void spit_publishing_plugin_host_reserved0 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 507 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved0 (self);
-#line 1205 "PublishingInterfaces.c"
+#line 1246 "PublishingInterfaces.c"
 }
 
 
@@ -1214,7 +1255,7 @@ void spit_publishing_plugin_host_reserved1 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 508 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved1 (self);
-#line 1218 "PublishingInterfaces.c"
+#line 1259 "PublishingInterfaces.c"
 }
 
 
@@ -1227,7 +1268,7 @@ void spit_publishing_plugin_host_reserved2 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 509 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved2 (self);
-#line 1231 "PublishingInterfaces.c"
+#line 1272 "PublishingInterfaces.c"
 }
 
 
@@ -1240,7 +1281,7 @@ void spit_publishing_plugin_host_reserved3 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 510 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved3 (self);
-#line 1244 "PublishingInterfaces.c"
+#line 1285 "PublishingInterfaces.c"
 }
 
 
@@ -1253,7 +1294,7 @@ void spit_publishing_plugin_host_reserved4 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 511 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved4 (self);
-#line 1257 "PublishingInterfaces.c"
+#line 1298 "PublishingInterfaces.c"
 }
 
 
@@ -1266,7 +1307,7 @@ void spit_publishing_plugin_host_reserved5 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 512 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved5 (self);
-#line 1270 "PublishingInterfaces.c"
+#line 1311 "PublishingInterfaces.c"
 }
 
 
@@ -1279,7 +1320,7 @@ void spit_publishing_plugin_host_reserved6 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 513 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved6 (self);
-#line 1283 "PublishingInterfaces.c"
+#line 1324 "PublishingInterfaces.c"
 }
 
 
@@ -1292,7 +1333,7 @@ void spit_publishing_plugin_host_reserved7 (SpitPublishingPluginHost* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PLUGIN_HOST (self));
 #line 514 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PLUGIN_HOST_GET_INTERFACE (self)->reserved7 (self);
-#line 1296 "PublishingInterfaces.c"
+#line 1337 "PublishingInterfaces.c"
 }
 
 
@@ -1319,7 +1360,7 @@ static void spit_publishing_plugin_host_base_init (SpitPublishingPluginHostIface
 		iface->reserved6 = spit_publishing_plugin_host_real_reserved6;
 #line 260 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_plugin_host_real_reserved7;
-#line 1323 "PublishingInterfaces.c"
+#line 1364 "PublishingInterfaces.c"
 	}
 }
 
@@ -1362,7 +1403,7 @@ GFile* spit_publishing_publishable_get_serialized_file (SpitPublishingPublishabl
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 535 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_serialized_file (self);
-#line 1366 "PublishingInterfaces.c"
+#line 1407 "PublishingInterfaces.c"
 }
 
 
@@ -1378,7 +1419,7 @@ gchar* spit_publishing_publishable_get_publishing_name (SpitPublishingPublishabl
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 544 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_publishing_name (self);
-#line 1382 "PublishingInterfaces.c"
+#line 1423 "PublishingInterfaces.c"
 }
 
 
@@ -1391,7 +1432,7 @@ gchar* spit_publishing_publishable_get_param_string (SpitPublishingPublishable*
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 550 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_param_string (self, name);
-#line 1395 "PublishingInterfaces.c"
+#line 1436 "PublishingInterfaces.c"
 }
 
 
@@ -1404,7 +1445,7 @@ gchar** spit_publishing_publishable_get_publishing_keywords (SpitPublishingPubli
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 556 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_publishing_keywords (self, result_length1);
-#line 1408 "PublishingInterfaces.c"
+#line 1449 "PublishingInterfaces.c"
 }
 
 
@@ -1416,7 +1457,7 @@ SpitPublishingPublisherMediaType spit_publishing_publishable_get_media_type (Spi
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), 0);
 #line 561 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_media_type (self);
-#line 1420 "PublishingInterfaces.c"
+#line 1461 "PublishingInterfaces.c"
 }
 
 
@@ -1428,7 +1469,7 @@ GDateTime* spit_publishing_publishable_get_exposure_date_time (SpitPublishingPub
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self), NULL);
 #line 566 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->get_exposure_date_time (self);
-#line 1432 "PublishingInterfaces.c"
+#line 1473 "PublishingInterfaces.c"
 }
 
 
@@ -1441,7 +1482,7 @@ void spit_publishing_publishable_reserved0 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 571 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved0 (self);
-#line 1445 "PublishingInterfaces.c"
+#line 1486 "PublishingInterfaces.c"
 }
 
 
@@ -1454,7 +1495,7 @@ void spit_publishing_publishable_reserved1 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 572 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved1 (self);
-#line 1458 "PublishingInterfaces.c"
+#line 1499 "PublishingInterfaces.c"
 }
 
 
@@ -1467,7 +1508,7 @@ void spit_publishing_publishable_reserved2 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 573 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved2 (self);
-#line 1471 "PublishingInterfaces.c"
+#line 1512 "PublishingInterfaces.c"
 }
 
 
@@ -1480,7 +1521,7 @@ void spit_publishing_publishable_reserved3 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 574 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved3 (self);
-#line 1484 "PublishingInterfaces.c"
+#line 1525 "PublishingInterfaces.c"
 }
 
 
@@ -1493,7 +1534,7 @@ void spit_publishing_publishable_reserved4 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 575 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved4 (self);
-#line 1497 "PublishingInterfaces.c"
+#line 1538 "PublishingInterfaces.c"
 }
 
 
@@ -1506,7 +1547,7 @@ void spit_publishing_publishable_reserved5 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 576 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved5 (self);
-#line 1510 "PublishingInterfaces.c"
+#line 1551 "PublishingInterfaces.c"
 }
 
 
@@ -1519,7 +1560,7 @@ void spit_publishing_publishable_reserved6 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 577 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved6 (self);
-#line 1523 "PublishingInterfaces.c"
+#line 1564 "PublishingInterfaces.c"
 }
 
 
@@ -1532,7 +1573,7 @@ void spit_publishing_publishable_reserved7 (SpitPublishingPublishable* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_PUBLISHABLE (self));
 #line 578 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_PUBLISHABLE_GET_INTERFACE (self)->reserved7 (self);
-#line 1536 "PublishingInterfaces.c"
+#line 1577 "PublishingInterfaces.c"
 }
 
 
@@ -1559,7 +1600,7 @@ static void spit_publishing_publishable_base_init (SpitPublishingPublishableIfac
 		iface->reserved6 = spit_publishing_publishable_real_reserved6;
 #line 521 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_publishable_real_reserved7;
-#line 1563 "PublishingInterfaces.c"
+#line 1604 "PublishingInterfaces.c"
 	}
 }
 
@@ -1590,7 +1631,7 @@ SpitPublishingPublisher* spit_publishing_service_create_publisher (SpitPublishin
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (self), NULL);
 #line 591 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->create_publisher (self, host);
-#line 1594 "PublishingInterfaces.c"
+#line 1635 "PublishingInterfaces.c"
 }
 
 
@@ -1602,7 +1643,7 @@ SpitPublishingPublisherMediaType spit_publishing_service_get_supported_media (Sp
 	g_return_val_if_fail (SPIT_PUBLISHING_IS_SERVICE (self), 0);
 #line 596 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	return SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->get_supported_media (self);
-#line 1606 "PublishingInterfaces.c"
+#line 1647 "PublishingInterfaces.c"
 }
 
 
@@ -1615,7 +1656,7 @@ void spit_publishing_service_reserved0 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 601 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved0 (self);
-#line 1619 "PublishingInterfaces.c"
+#line 1660 "PublishingInterfaces.c"
 }
 
 
@@ -1628,7 +1669,7 @@ void spit_publishing_service_reserved1 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 602 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved1 (self);
-#line 1632 "PublishingInterfaces.c"
+#line 1673 "PublishingInterfaces.c"
 }
 
 
@@ -1641,7 +1682,7 @@ void spit_publishing_service_reserved2 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 603 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved2 (self);
-#line 1645 "PublishingInterfaces.c"
+#line 1686 "PublishingInterfaces.c"
 }
 
 
@@ -1654,7 +1695,7 @@ void spit_publishing_service_reserved3 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 604 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved3 (self);
-#line 1658 "PublishingInterfaces.c"
+#line 1699 "PublishingInterfaces.c"
 }
 
 
@@ -1667,7 +1708,7 @@ void spit_publishing_service_reserved4 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 605 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved4 (self);
-#line 1671 "PublishingInterfaces.c"
+#line 1712 "PublishingInterfaces.c"
 }
 
 
@@ -1680,7 +1721,7 @@ void spit_publishing_service_reserved5 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 606 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved5 (self);
-#line 1684 "PublishingInterfaces.c"
+#line 1725 "PublishingInterfaces.c"
 }
 
 
@@ -1693,7 +1734,7 @@ void spit_publishing_service_reserved6 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 607 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved6 (self);
-#line 1697 "PublishingInterfaces.c"
+#line 1738 "PublishingInterfaces.c"
 }
 
 
@@ -1706,7 +1747,7 @@ void spit_publishing_service_reserved7 (SpitPublishingService* self) {
 	g_return_if_fail (SPIT_PUBLISHING_IS_SERVICE (self));
 #line 608 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 	SPIT_PUBLISHING_SERVICE_GET_INTERFACE (self)->reserved7 (self);
-#line 1710 "PublishingInterfaces.c"
+#line 1751 "PublishingInterfaces.c"
 }
 
 
@@ -1733,7 +1774,7 @@ static void spit_publishing_service_base_init (SpitPublishingServiceIface * ifac
 		iface->reserved6 = spit_publishing_service_real_reserved6;
 #line 586 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
 		iface->reserved7 = spit_publishing_service_real_reserved7;
-#line 1737 "PublishingInterfaces.c"
+#line 1778 "PublishingInterfaces.c"
 	}
 }
 
@@ -1757,4 +1798,121 @@ GType spit_publishing_service_get_type (void) {
 }
 
 
+void spit_publishing_authenticator_authenticate (SpitPublishingAuthenticator* self) {
+#line 615 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self));
+#line 615 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->authenticate (self);
+#line 1807 "PublishingInterfaces.c"
+}
+
+
+gboolean spit_publishing_authenticator_can_logout (SpitPublishingAuthenticator* self) {
+#line 616 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self), FALSE);
+#line 616 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	return SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->can_logout (self);
+#line 1816 "PublishingInterfaces.c"
+}
+
+
+void spit_publishing_authenticator_logout (SpitPublishingAuthenticator* self) {
+#line 617 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self));
+#line 617 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->logout (self);
+#line 1825 "PublishingInterfaces.c"
+}
+
+
+void spit_publishing_authenticator_refresh (SpitPublishingAuthenticator* self) {
+#line 618 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self));
+#line 618 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->refresh (self);
+#line 1834 "PublishingInterfaces.c"
+}
+
+
+GHashTable* spit_publishing_authenticator_get_authentication_parameter (SpitPublishingAuthenticator* self) {
+#line 620 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR (self), NULL);
+#line 620 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	return SPIT_PUBLISHING_AUTHENTICATOR_GET_INTERFACE (self)->get_authentication_parameter (self);
+#line 1843 "PublishingInterfaces.c"
+}
+
+
+static void spit_publishing_authenticator_base_init (SpitPublishingAuthenticatorIface * iface) {
+#line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	static gboolean initialized = FALSE;
+#line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	if (!initialized) {
+#line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+		initialized = TRUE;
+#line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+		g_signal_new ("authenticated", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 611 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+		g_signal_new ("authentication_failed", SPIT_PUBLISHING_TYPE_AUTHENTICATOR, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+#line 1858 "PublishingInterfaces.c"
+	}
+}
+
+
+GType spit_publishing_authenticator_get_type (void) {
+	static volatile gsize spit_publishing_authenticator_type_id__volatile = 0;
+	if (g_once_init_enter (&spit_publishing_authenticator_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingAuthenticatorIface), (GBaseInitFunc) spit_publishing_authenticator_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
+		GType spit_publishing_authenticator_type_id;
+		spit_publishing_authenticator_type_id = g_type_register_static (G_TYPE_INTERFACE, "SpitPublishingAuthenticator", &g_define_type_info, 0);
+		g_type_interface_add_prerequisite (spit_publishing_authenticator_type_id, G_TYPE_OBJECT);
+		g_once_init_leave (&spit_publishing_authenticator_type_id__volatile, spit_publishing_authenticator_type_id);
+	}
+	return spit_publishing_authenticator_type_id__volatile;
+}
+
+
+GeeList* spit_publishing_authenticator_factory_get_available_authenticators (SpitPublishingAuthenticatorFactory* self) {
+#line 628 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY (self), NULL);
+#line 628 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	return SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE (self)->get_available_authenticators (self);
+#line 1881 "PublishingInterfaces.c"
+}
+
+
+SpitPublishingAuthenticator* spit_publishing_authenticator_factory_create (SpitPublishingAuthenticatorFactory* self, const gchar* provider, SpitPublishingPluginHost* host) {
+#line 629 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	g_return_val_if_fail (SPIT_PUBLISHING_IS_AUTHENTICATOR_FACTORY (self), NULL);
+#line 629 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	return SPIT_PUBLISHING_AUTHENTICATOR_FACTORY_GET_INTERFACE (self)->create (self, provider, host);
+#line 1890 "PublishingInterfaces.c"
+}
+
+
+static void spit_publishing_authenticator_factory_base_init (SpitPublishingAuthenticatorFactoryIface * iface) {
+#line 623 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	static gboolean initialized = FALSE;
+#line 623 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+	if (!initialized) {
+#line 623 "/home/jens/Source/shotwell/src/plugins/PublishingInterfaces.vala"
+		initialized = TRUE;
+#line 1901 "PublishingInterfaces.c"
+	}
+}
+
+
+GType spit_publishing_authenticator_factory_get_type (void) {
+	static volatile gsize spit_publishing_authenticator_factory_type_id__volatile = 0;
+	if (g_once_init_enter (&spit_publishing_authenticator_factory_type_id__volatile)) {
+		static const GTypeInfo g_define_type_info = { sizeof (SpitPublishingAuthenticatorFactoryIface), (GBaseInitFunc) spit_publishing_authenticator_factory_base_init, (GBaseFinalizeFunc) NULL, (GClassInitFunc) NULL, (GClassFinalizeFunc) NULL, NULL, 0, 0, (GInstanceInitFunc) NULL, NULL };
+		GType spit_publishing_authenticator_factory_type_id;
+		spit_publishing_authenticator_factory_type_id = g_type_register_static (G_TYPE_INTERFACE, "SpitPublishingAuthenticatorFactory", &g_define_type_info, 0);
+		g_type_interface_add_prerequisite (spit_publishing_authenticator_factory_type_id, G_TYPE_OBJECT);
+		g_once_init_leave (&spit_publishing_authenticator_factory_type_id__volatile, spit_publishing_authenticator_factory_type_id);
+	}
+	return spit_publishing_authenticator_factory_type_id__volatile;
+}
+
+
 
diff --git a/src/plugins/PublishingInterfaces.vala b/src/plugins/PublishingInterfaces.vala
index 7a8ac40..6518142 100644
--- a/src/plugins/PublishingInterfaces.vala
+++ b/src/plugins/PublishingInterfaces.vala
@@ -608,5 +608,27 @@ public interface Service : Object, Spit.Pluggable {
     protected virtual void reserved7() {}
 }
 
+public interface Authenticator : Object {
+    public signal void authenticated();
+    public signal void authentication_failed();
+
+    public abstract void authenticate();
+    public abstract bool can_logout();
+    public abstract void logout();
+    public abstract void refresh();
+
+    public abstract GLib.HashTable<string, Variant> get_authentication_parameter();
+}
+
+public interface AuthenticatorFactory : Object {
+    // By contract, every AuthenticatorFactory implementation needs to have a
+    // static get_instance() method. Unfortunately this is not expressable in
+    // Vala.
+
+    public abstract Gee.List<string> get_available_authenticators();
+    public abstract Authenticator? create(string provider,
+            Spit.Publishing.PluginHost host);
+}
+
 }
 
diff --git a/src/publishing/APIGlue.c b/src/publishing/APIGlue.c
index 690d2b3..f58aaba 100644
--- a/src/publishing/APIGlue.c
+++ b/src/publishing/APIGlue.c
@@ -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 __catch38_g_error;
+			goto __catch39_g_error;
 		}
 	}
-	goto __finally38;
-	__catch38_g_error:
+	goto __finally39;
+	__catch39_g_error:
 	{
 		GError* err = NULL;
 		GFile* _tmp5_ = NULL;
@@ -444,7 +444,7 @@ void publishing_glue_media_source_publishable_wrapper_clean_up (PublishingGlueMe
 		_g_error_free0 (err);
 #line 446 "APIGlue.c"
 	}
-	__finally38:
+	__finally39:
 #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 __catch39_g_error;
+				goto __catch40_g_error;
 			}
 		}
-		goto __finally39;
-		__catch39_g_error:
+		goto __finally40;
+		__catch40_g_error:
 		{
 			GError* err = NULL;
 			LibraryPhoto* _tmp25_ = NULL;
@@ -725,9 +725,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 62 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			_g_error_free0 (err);
 #line 727 "APIGlue.c"
-			goto __finally39;
+			goto __finally40;
 		}
-		__finally39:
+		__finally40:
 #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 __catch40_g_error;
+					goto __catch41_g_error;
 				}
 			}
-			goto __finally40;
-			__catch40_g_error:
+			goto __finally41;
+			__catch41_g_error:
 			{
 				GError* err = NULL;
 				Video* _tmp56_ = NULL;
@@ -915,9 +915,9 @@ GFile* publishing_glue_media_source_publishable_wrapper_serialize_for_publishing
 #line 82 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 				_g_error_free0 (err);
 #line 916 "APIGlue.c"
-				goto __finally40;
+				goto __finally41;
 			}
-			__finally40:
+			__finally41:
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 79 "/home/jens/Source/shotwell/src/publishing/APIGlue.vala"
diff --git a/src/publishing/PublishingPluginHost.c b/src/publishing/PublishingPluginHost.c
index 49208ca..3fbf248 100644
--- a/src/publishing/PublishingPluginHost.c
+++ b/src/publishing/PublishingPluginHost.c
@@ -1273,7 +1273,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						if (_inner_error_->domain == SPIT_PUBLISHING_PUBLISHING_ERROR) {
 #line 1272 "PublishingPluginHost.c"
-							goto __catch37_spit_publishing_publishing_error;
+							goto __catch38_spit_publishing_publishing_error;
 						}
 #line 215 "/home/jens/Source/shotwell/src/publishing/PublishingPluginHost.vala"
 						_g_object_unref0 (wrapper);
@@ -1293,8 +1293,8 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					_g_object_unref0 (wrapper);
 #line 1291 "PublishingPluginHost.c"
 				}
-				goto __finally37;
-				__catch37_spit_publishing_publishing_error:
+				goto __finally38;
+				__catch38_spit_publishing_publishing_error:
 				{
 					GError* err = NULL;
 					GError* _tmp16_ = NULL;
@@ -1331,7 +1331,7 @@ static SpitPublishingProgressCallback spit_publishing_concrete_publishing_host_r
 					return result;
 #line 1329 "PublishingPluginHost.c"
 				}
-				__finally37:
+				__finally38:
 #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/searches/Branch.c b/src/searches/Branch.c
index c202931..3abe9a9 100644
--- a/src/searches/Branch.c
+++ b/src/searches/Branch.c
@@ -544,6 +544,7 @@ enum  {
 SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
 SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
 static void searches_header_setup_context_menu (SearchesHeader* self);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -607,14 +608,14 @@ static void searches_sidebar_entry_finalize (GObject* obj);
 static void _searches_branch_on_saved_search_added_saved_search_table_search_added (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
 #line 28 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_branch_on_saved_search_added ((SearchesBranch*) self, search);
-#line 611 "Branch.c"
+#line 612 "Branch.c"
 }
 
 
 static void _searches_branch_on_saved_search_removed_saved_search_table_search_removed (SavedSearchTable* _sender, SavedSearch* search, gpointer self) {
 #line 29 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_branch_on_saved_search_removed ((SearchesBranch*) self, search);
-#line 618 "Branch.c"
+#line 619 "Branch.c"
 }
 
 
@@ -623,7 +624,7 @@ static gint _searches_branch_comparator_gcompare_func (gconstpointer a, gconstpo
 	result = searches_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 627 "Branch.c"
+#line 628 "Branch.c"
 }
 
 
@@ -643,7 +644,7 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 	self = (SearchesBranch*) sidebar_branch_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SIDEBAR_TYPE_ENTRY, SidebarEntry), (SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY | SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) | SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, _searches_branch_comparator_gcompare_func, NULL);
 #line 12 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (_tmp1_);
-#line 647 "Branch.c"
+#line 648 "Branch.c"
 	{
 		GeeIterator* _search_it = NULL;
 		SavedSearchTable* _tmp2_ = NULL;
@@ -672,7 +673,7 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 		_search_it = _tmp7_;
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		while (TRUE) {
-#line 676 "Branch.c"
+#line 677 "Branch.c"
 			GeeIterator* _tmp8_ = NULL;
 			gboolean _tmp9_ = FALSE;
 			SavedSearch* search = NULL;
@@ -687,7 +688,7 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 			if (!_tmp9_) {
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 				break;
-#line 691 "Branch.c"
+#line 692 "Branch.c"
 			}
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp10_ = _search_it;
@@ -701,11 +702,11 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 			searches_branch_on_saved_search_added (self, _tmp12_);
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_g_object_unref0 (search);
-#line 705 "Branch.c"
+#line 706 "Branch.c"
 		}
 #line 19 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (_search_it);
-#line 709 "Branch.c"
+#line 710 "Branch.c"
 	}
 #line 23 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp13_ = saved_search_table_get_instance ();
@@ -725,14 +726,14 @@ SearchesBranch* searches_branch_construct (GType object_type) {
 	_saved_search_table_unref0 (_tmp16_);
 #line 11 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 729 "Branch.c"
+#line 730 "Branch.c"
 }
 
 
 SearchesBranch* searches_branch_new (void) {
 #line 11 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_branch_construct (SEARCHES_TYPE_BRANCH);
-#line 736 "Branch.c"
+#line 737 "Branch.c"
 }
 
 
@@ -755,7 +756,7 @@ SearchesSidebarEntry* searches_branch_get_entry_for_saved_search (SearchesBranch
 	result = (SearchesSidebarEntry*) _tmp2_;
 #line 33 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 759 "Branch.c"
+#line 760 "Branch.c"
 }
 
 
@@ -782,7 +783,7 @@ static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 		result = 0;
 #line 38 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		return result;
-#line 786 "Branch.c"
+#line 787 "Branch.c"
 	}
 #line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp2_ = a;
@@ -798,7 +799,7 @@ static gint searches_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	result = _tmp6_;
 #line 40 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 802 "Branch.c"
+#line 803 "Branch.c"
 }
 
 
@@ -838,7 +839,7 @@ static void searches_branch_on_saved_search_added (SearchesBranch* self, SavedSe
 	_g_object_unref0 (_tmp5_);
 #line 44 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (entry);
-#line 842 "Branch.c"
+#line 843 "Branch.c"
 }
 
 
@@ -881,7 +882,7 @@ static void searches_branch_on_saved_search_removed (SearchesBranch* self, Saved
 	sidebar_branch_prune (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (entry, SIDEBAR_TYPE_ENTRY, SidebarEntry));
 #line 51 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (entry);
-#line 885 "Branch.c"
+#line 886 "Branch.c"
 }
 
 
@@ -892,7 +893,7 @@ static void searches_branch_class_init (SearchesBranchClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchesBranchPrivate));
 #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_branch_finalize;
-#line 896 "Branch.c"
+#line 897 "Branch.c"
 }
 
 
@@ -904,7 +905,7 @@ static void searches_branch_instance_init (SearchesBranch * self) {
 	_tmp0_ = gee_hash_map_new (TYPE_SAVED_SEARCH, (GBoxedCopyFunc) g_object_ref, g_object_unref, SEARCHES_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->entry_map = _tmp0_;
-#line 908 "Branch.c"
+#line 909 "Branch.c"
 }
 
 
@@ -942,7 +943,7 @@ static void searches_branch_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->entry_map);
 #line 7 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_branch_parent_class)->finalize (obj);
-#line 946 "Branch.c"
+#line 947 "Branch.c"
 }
 
 
@@ -969,21 +970,21 @@ SearchesHeader* searches_header_construct (GType object_type) {
 	searches_header_setup_context_menu (self);
 #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 973 "Branch.c"
+#line 974 "Branch.c"
 }
 
 
 SearchesHeader* searches_header_new (void) {
 #line 67 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_header_construct (SEARCHES_TYPE_HEADER);
-#line 980 "Branch.c"
+#line 981 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
-#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 987 "Branch.c"
+#line 988 "Branch.c"
 }
 
 
@@ -998,85 +999,93 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 	_g_object_unref0 (self->priv->builder);
 #line 73 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->builder = _tmp0_;
-#line 1002 "Branch.c"
+#line 1003 "Branch.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
+		gchar* _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp2_ = NULL;
-		GObject* _tmp3_ = NULL;
-		GMenuModel* _tmp4_ = NULL;
-		GMenuModel* _tmp5_ = NULL;
-		GtkMenu* _tmp6_ = NULL;
+		GtkBuilder* _tmp4_ = NULL;
+		GObject* _tmp5_ = NULL;
+		GMenuModel* _tmp6_ = NULL;
+		GMenuModel* _tmp7_ = NULL;
+		GtkMenu* _tmp8_ = NULL;
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp1_ = self->priv->builder;
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		gtk_builder_add_from_resource (_tmp1_, "/org/gnome/Shotwell/search_sidebar_context.ui", &_inner_error_);
+		_tmp2_ = resources_get_ui ("search_sidebar_context.ui");
+#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp3_ = _tmp2_;
+#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		gtk_builder_add_from_resource (_tmp1_, _tmp3_, &_inner_error_);
+#line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_g_free0 (_tmp3_);
 #line 75 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1017 "Branch.c"
-			goto __catch75_g_error;
+#line 1026 "Branch.c"
+			goto __catch76_g_error;
 		}
+#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp4_ = self->priv->builder;
+#line 76 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp5_ = gtk_builder_get_object (_tmp4_, "popup-menu");
+#line 76 "/home/jens/Source/shotwell/src/searches/Branch.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"
+		model = _tmp6_;
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp2_ = self->priv->builder;
+		_tmp7_ = model;
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp3_ = gtk_builder_get_object (_tmp2_, "popup-menu");
+		_tmp8_ = (GtkMenu*) gtk_menu_new_from_model (_tmp7_);
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
+		g_object_ref_sink (_tmp8_);
 #line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		model = _tmp4_;
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp5_ = model;
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		g_object_ref_sink (_tmp6_);
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (self->priv->context_menu);
-#line 78 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		self->priv->context_menu = _tmp6_;
+#line 77 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		self->priv->context_menu = _tmp8_;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (model);
-#line 1040 "Branch.c"
+#line 1049 "Branch.c"
 	}
-	goto __finally75;
-	__catch75_g_error:
+	goto __finally76;
+	__catch76_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		Application* _tmp11_ = NULL;
-		Application* _tmp12_ = NULL;
+		GError* _tmp9_ = NULL;
+		const gchar* _tmp10_ = NULL;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_ = NULL;
+		Application* _tmp13_ = NULL;
+		Application* _tmp14_ = NULL;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_error_ = _inner_error_;
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_inner_error_ = NULL;
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp7_ = _error_;
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp8_ = _tmp7_->message;
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp9_ = g_strdup_printf ("Error loading UI resource: %s", _tmp8_);
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp10_ = _tmp9_;
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		app_window_error_message (_tmp10_, NULL);
-#line 80 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_g_free0 (_tmp10_);
-#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_tmp11_ = application_get_instance ();
-#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp9_ = _error_;
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp10_ = _tmp9_->message;
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp11_ = g_strdup_printf ("Error loading UI resource: %s", _tmp10_);
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp12_ = _tmp11_;
-#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		application_panic (_tmp12_);
-#line 82 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-		_application_unref0 (_tmp12_);
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		app_window_error_message (_tmp12_, NULL);
+#line 79 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_g_free0 (_tmp12_);
+#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp13_ = application_get_instance ();
+#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_tmp14_ = _tmp13_;
+#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		application_panic (_tmp14_);
+#line 81 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+		_application_unref0 (_tmp14_);
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_error_free0 (_error_);
-#line 1078 "Branch.c"
+#line 1087 "Branch.c"
 	}
-	__finally75:
+	__finally76:
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
@@ -1085,7 +1094,7 @@ static void searches_header_setup_context_menu (SearchesHeader* self) {
 		g_clear_error (&_inner_error_);
 #line 74 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		return;
-#line 1089 "Branch.c"
+#line 1098 "Branch.c"
 	}
 }
 
@@ -1095,17 +1104,17 @@ static GtkMenu* searches_header_real_get_sidebar_context_menu (SidebarContextabl
 	GtkMenu* result = NULL;
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
-#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 85 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_HEADER, SearchesHeader);
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 87 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 86 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1109 "Branch.c"
+#line 1118 "Branch.c"
 }
 
 
@@ -1116,7 +1125,7 @@ static void searches_header_class_init (SearchesHeaderClass * klass) {
 	g_type_class_add_private (klass, sizeof (SearchesHeaderPrivate));
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_header_finalize;
-#line 1120 "Branch.c"
+#line 1129 "Branch.c"
 }
 
 
@@ -1125,7 +1134,7 @@ static void searches_header_sidebar_contextable_interface_init (SidebarContextab
 	searches_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) searches_header_real_get_sidebar_context_menu;
-#line 1129 "Branch.c"
+#line 1138 "Branch.c"
 }
 
 
@@ -1134,7 +1143,7 @@ static void searches_header_instance_init (SearchesHeader * self) {
 	self->priv = SEARCHES_HEADER_GET_PRIVATE (self);
 #line 65 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv->context_menu = NULL;
-#line 1138 "Branch.c"
+#line 1147 "Branch.c"
 }
 
 
@@ -1148,7 +1157,7 @@ static void searches_header_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 63 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_header_parent_class)->finalize (obj);
-#line 1152 "Branch.c"
+#line 1161 "Branch.c"
 }
 
 
@@ -1170,28 +1179,28 @@ SearchesSidebarEntry* searches_sidebar_entry_construct (GType object_type, Saved
 	SearchesSidebarEntry * self = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearch* _tmp1_ = NULL;
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (IS_SAVED_SEARCH (search), NULL);
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = (SearchesSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = search;
-#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (self->priv->search);
-#line 98 "/home/jens/Source/shotwell/src/searches/Branch.vala"
-	self->priv->search = _tmp1_;
 #line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+	self->priv->search = _tmp1_;
+#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return self;
-#line 1188 "Branch.c"
+#line 1197 "Branch.c"
 }
 
 
 SearchesSidebarEntry* searches_sidebar_entry_new (SavedSearch* search) {
-#line 97 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 96 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return searches_sidebar_entry_construct (SEARCHES_TYPE_SIDEBAR_ENTRY, search);
-#line 1195 "Branch.c"
+#line 1204 "Branch.c"
 }
 
 
@@ -1207,17 +1216,17 @@ SavedSearch* searches_sidebar_entry_for_saved_search (SearchesSidebarEntry* self
 	SavedSearch* result = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearch* _tmp1_ = NULL;
-#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 106 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_val_if_fail (SEARCHES_IS_SIDEBAR_ENTRY (self), NULL);
-#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 108 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 107 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1221 "Branch.c"
+#line 1230 "Branch.c"
 }
 
 
@@ -1226,17 +1235,17 @@ static gchar* searches_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEnt
 	gchar* result = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 110 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_OBJECT, DataObject));
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 112 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 111 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1240 "Branch.c"
+#line 1249 "Branch.c"
 }
 
 
@@ -1245,17 +1254,17 @@ static gchar* searches_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEnt
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 114 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = searches_sidebar_entry_single_search_icon;
-#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = _tmp1_;
-#line 116 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 115 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1259 "Branch.c"
+#line 1268 "Branch.c"
 }
 
 
@@ -1264,32 +1273,32 @@ static Page* searches_sidebar_entry_real_create_page (SidebarSimplePageEntry* ba
 	Page* result = NULL;
 	SavedSearch* _tmp0_ = NULL;
 	SavedSearchPage* _tmp1_ = NULL;
-#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 118 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = saved_search_page_new (_tmp0_);
-#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 120 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 119 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1280 "Branch.c"
+#line 1289 "Branch.c"
 }
 
 
 static gboolean searches_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
 	SearchesSidebarEntry * self;
 	gboolean result = FALSE;
-#line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 122 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 124 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	result = TRUE;
-#line 124 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 123 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	return result;
-#line 1293 "Branch.c"
+#line 1302 "Branch.c"
 }
 
 
@@ -1300,85 +1309,85 @@ static void searches_sidebar_entry_real_rename (SidebarRenameableEntry* base, co
 	const gchar* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 126 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_return_if_fail (new_name != NULL);
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = saved_search_table_get_instance ();
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = _tmp0_;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp2_ = new_name;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp3_ = saved_search_table_exists (_tmp1_, _tmp2_);
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp4_ = !_tmp3_;
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_saved_search_table_unref0 (_tmp1_);
-#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 127 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (_tmp4_) {
-#line 1322 "Branch.c"
+#line 1331 "Branch.c"
 		CommandManager* _tmp5_ = NULL;
 		CommandManager* _tmp6_ = NULL;
 		SavedSearch* _tmp7_ = NULL;
 		const gchar* _tmp8_ = NULL;
 		RenameSavedSearchCommand* _tmp9_ = NULL;
 		RenameSavedSearchCommand* _tmp10_ = NULL;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp5_ = app_window_get_command_manager ();
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp6_ = _tmp5_;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp7_ = self->priv->search;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp8_ = new_name;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp9_ = rename_saved_search_command_new (_tmp7_, _tmp8_);
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp10_ = _tmp9_;
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (_tmp10_);
-#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 128 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 1347 "Branch.c"
+#line 1356 "Branch.c"
 	} else {
 		const gchar* _tmp11_ = NULL;
 		SavedSearch* _tmp12_ = NULL;
 		gchar* _tmp13_ = NULL;
 		gchar* _tmp14_ = NULL;
 		gboolean _tmp15_ = FALSE;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp11_ = new_name;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp12_ = self->priv->search;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp13_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp14_ = _tmp13_;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp15_ = g_strcmp0 (_tmp11_, _tmp14_) != 0;
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_free0 (_tmp14_);
-#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 129 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		if (_tmp15_) {
-#line 1368 "Branch.c"
+#line 1377 "Branch.c"
 			const gchar* _tmp16_ = NULL;
 			gchar* _tmp17_ = NULL;
 			gchar* _tmp18_ = NULL;
-#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp16_ = new_name;
-#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp17_ = resources_rename_search_exists_message (_tmp16_);
-#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_tmp18_ = _tmp17_;
-#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			app_window_error_message (_tmp18_, NULL);
-#line 131 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 130 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 			_g_free0 (_tmp18_);
-#line 1382 "Branch.c"
+#line 1391 "Branch.c"
 		}
 	}
 }
@@ -1388,99 +1397,99 @@ static void searches_sidebar_entry_real_destroy_source (SidebarDestroyableEntry*
 	SearchesSidebarEntry * self;
 	SavedSearch* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 133 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = self->priv->search;
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp1_ = dialogs_confirm_delete_saved_search (_tmp0_);
-#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 134 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	if (_tmp1_) {
-#line 1400 "Branch.c"
+#line 1409 "Branch.c"
 		CommandManager* _tmp2_ = NULL;
 		CommandManager* _tmp3_ = NULL;
 		SavedSearch* _tmp4_ = NULL;
 		DeleteSavedSearchCommand* _tmp5_ = NULL;
 		DeleteSavedSearchCommand* _tmp6_ = NULL;
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp3_ = _tmp2_;
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp4_ = self->priv->search;
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp5_ = delete_saved_search_command_new (_tmp4_);
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_tmp6_ = _tmp5_;
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_g_object_unref0 (_tmp6_);
-#line 136 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 135 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 1422 "Branch.c"
+#line 1431 "Branch.c"
 	}
 }
 
 
 static void searches_sidebar_entry_class_init (SearchesSidebarEntryClass * klass) {
 	gchar* _tmp0_ = NULL;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	g_type_class_add_private (klass, sizeof (SearchesSidebarEntryPrivate));
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = searches_sidebar_entry_real_get_sidebar_name;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = searches_sidebar_entry_real_get_sidebar_icon;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = searches_sidebar_entry_real_create_page;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = searches_sidebar_entry_finalize;
-#line 93 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_tmp0_ = g_strdup ("find");
-#line 93 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 92 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_single_search_icon = _tmp0_;
-#line 1445 "Branch.c"
+#line 1454 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) searches_sidebar_entry_real_is_user_renameable;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) searches_sidebar_entry_real_rename;
-#line 1456 "Branch.c"
+#line 1465 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) {
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	searches_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) searches_sidebar_entry_real_destroy_source;
-#line 1465 "Branch.c"
+#line 1474 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_instance_init (SearchesSidebarEntry * self) {
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self->priv = SEARCHES_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 1472 "Branch.c"
+#line 1481 "Branch.c"
 }
 
 
 static void searches_sidebar_entry_finalize (GObject* obj) {
 	SearchesSidebarEntry * self;
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SEARCHES_TYPE_SIDEBAR_ENTRY, SearchesSidebarEntry);
-#line 95 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 94 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	_g_object_unref0 (self->priv->search);
-#line 91 "/home/jens/Source/shotwell/src/searches/Branch.vala"
+#line 90 "/home/jens/Source/shotwell/src/searches/Branch.vala"
 	G_OBJECT_CLASS (searches_sidebar_entry_parent_class)->finalize (obj);
-#line 1484 "Branch.c"
+#line 1493 "Branch.c"
 }
 
 
diff --git a/src/searches/Branch.vala b/src/searches/Branch.vala
index f557baa..1c4ee90 100644
--- a/src/searches/Branch.vala
+++ b/src/searches/Branch.vala
@@ -72,8 +72,7 @@ public class Searches.Header : Sidebar.Header, Sidebar.Contextable {
     private void setup_context_menu() {
         this.builder = new Gtk.Builder ();
         try {
-            this.builder.add_from_resource
-                            ("/org/gnome/Shotwell/search_sidebar_context.ui");
+            this.builder.add_from_resource(Resources.get_ui("search_sidebar_context.ui"));
             var model = builder.get_object ("popup-menu") as GLib.MenuModel;
             this.context_menu = new Gtk.Menu.from_model (model);
         } catch (Error error) {
diff --git a/src/searches/SearchBoolean.c b/src/searches/SearchBoolean.c
index eea8d74..15a6e82 100644
--- a/src/searches/SearchBoolean.c
+++ b/src/searches/SearchBoolean.c
@@ -5691,7 +5691,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5684 "SearchBoolean.c"
-				goto __catch76_database_error;
+				goto __catch77_database_error;
 			}
 #line 847 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5707,8 +5707,8 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_tmp6_->search_id = _tmp0_;
 #line 5699 "SearchBoolean.c"
 	}
-	goto __finally76;
-	__catch76_database_error:
+	goto __finally77;
+	__catch77_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp7_ = NULL;
@@ -5724,7 +5724,7 @@ void saved_search_reconstitute (SavedSearch* self) {
 		_g_error_free0 (err);
 #line 5716 "SearchBoolean.c"
 	}
-	__finally76:
+	__finally77:
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 846 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -5835,7 +5835,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 5828 "SearchBoolean.c"
-				goto __catch77_database_error;
+				goto __catch78_database_error;
 			}
 #line 865 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -5846,8 +5846,8 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 #line 5837 "SearchBoolean.c"
 		}
 	}
-	goto __finally77;
-	__catch77_database_error:
+	goto __finally78;
+	__catch78_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp12_ = NULL;
@@ -5867,7 +5867,7 @@ gboolean saved_search_rename (SavedSearch* self, const gchar* new_name) {
 		return result;
 #line 5859 "SearchBoolean.c"
 	}
-	__finally77:
+	__finally78:
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 864 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6041,7 +6041,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6034 "SearchBoolean.c"
-				goto __catch78_database_error;
+				goto __catch79_database_error;
 			}
 #line 900 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6132,8 +6132,8 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_object_unref0 (_tmp0_);
 #line 6124 "SearchBoolean.c"
 	}
-	goto __finally78;
-	__catch78_database_error:
+	goto __finally79;
+	__catch79_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp18_ = NULL;
@@ -6149,7 +6149,7 @@ static SavedSearchTable* saved_search_table_construct (GType object_type) {
 		_g_error_free0 (err);
 #line 6141 "SearchBoolean.c"
 	}
-	__finally78:
+	__finally79:
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 899 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6282,7 +6282,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6275 "SearchBoolean.c"
-				goto __catch79_database_error;
+				goto __catch80_database_error;
 			}
 #line 926 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			_g_object_unref0 (search);
@@ -6304,8 +6304,8 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_saved_search_row_unref0 (_tmp0_);
 #line 6296 "SearchBoolean.c"
 	}
-	goto __finally79;
-	__catch79_database_error:
+	goto __finally80;
+	__catch80_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp9_ = NULL;
@@ -6321,7 +6321,7 @@ SavedSearch* saved_search_table_create (SavedSearchTable* self, const gchar* nam
 		_g_error_free0 (err);
 #line 6313 "SearchBoolean.c"
 	}
-	__finally79:
+	__finally80:
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 925 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
@@ -6386,7 +6386,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
 #line 6379 "SearchBoolean.c"
-				goto __catch80_database_error;
+				goto __catch81_database_error;
 			}
 #line 940 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -6397,8 +6397,8 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 #line 6388 "SearchBoolean.c"
 		}
 	}
-	goto __finally80;
-	__catch80_database_error:
+	goto __finally81;
+	__catch81_database_error:
 	{
 		GError* err = NULL;
 		GError* _tmp4_ = NULL;
@@ -6414,7 +6414,7 @@ void saved_search_table_remove (SavedSearchTable* self, SavedSearch* search) {
 		_g_error_free0 (err);
 #line 6406 "SearchBoolean.c"
 	}
-	__finally80:
+	__finally81:
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 939 "/home/jens/Source/shotwell/src/searches/SearchBoolean.vala"
diff --git a/src/sidebar/Tree.c b/src/sidebar/Tree.c
index 6a28a5f..f63fbe0 100644
--- a/src/sidebar/Tree.c
+++ b/src/sidebar/Tree.c
@@ -500,6 +500,7 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 GType sidebar_grouping_get_type (void) G_GNUC_CONST;
 GType sidebar_header_get_type (void) G_GNUC_CONST;
 static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* self, GtkTreePath* path);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -679,14 +680,14 @@ static const GActionEntry SIDEBAR_TREE_entries[2] = {{"tag.new", _sidebar_tree_o
 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"
 	sidebar_tree_on_editing_canceled ((SidebarTree*) self);
-#line 683 "Tree.c"
+#line 684 "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"
 	sidebar_tree_on_editing_started ((SidebarTree*) self, editable, path);
-#line 690 "Tree.c"
+#line 691 "Tree.c"
 }
 
 
@@ -705,28 +706,28 @@ static GType sidebar_tree_columns_get_type (void) {
 static void _sidebar_tree_on_new_tag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_new_tag ((SidebarTree*) self);
-#line 709 "Tree.c"
+#line 710 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_new_search_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
 #line 193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_new_search ((SidebarTree*) self);
-#line 716 "Tree.c"
+#line 717 "Tree.c"
 }
 
 
 static void _sidebar_tree_icon_renderer_function_gtk_cell_layout_data_func (GtkCellLayout* cell_layout, GtkCellRenderer* cell, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer self) {
 #line 104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_icon_renderer_function ((SidebarTree*) self, cell_layout, cell, tree_model, iter);
-#line 723 "Tree.c"
+#line 724 "Tree.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 127 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 730 "Tree.c"
+#line 731 "Tree.c"
 }
 
 
@@ -735,7 +736,7 @@ static gboolean _sidebar_tree_on_selection_gtk_tree_selection_func (GtkTreeSelec
 	result = sidebar_tree_on_selection ((SidebarTree*) self, selection, model, path, path_currently_selected);
 #line 129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 739 "Tree.c"
+#line 740 "Tree.c"
 }
 
 
@@ -744,7 +745,7 @@ static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_expand_row (GtkTr
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
 #line 131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 748 "Tree.c"
+#line 749 "Tree.c"
 }
 
 
@@ -753,7 +754,7 @@ static gboolean _sidebar_tree_on_toggle_row_gtk_tree_view_test_collapse_row (Gtk
 	result = sidebar_tree_on_toggle_row ((SidebarTree*) self, iter, path);
 #line 132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 757 "Tree.c"
+#line 758 "Tree.c"
 }
 
 
@@ -764,11 +765,11 @@ static void _vala_array_add64 (GtkTargetEntry** array, int* length, int* size, c
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		*array = g_renew (GtkTargetEntry, *array, *size);
-#line 768 "Tree.c"
+#line 769 "Tree.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	(*array)[(*length)++] = *value;
-#line 772 "Tree.c"
+#line 773 "Tree.c"
 }
 
 
@@ -777,21 +778,21 @@ static gboolean _sidebar_tree_on_context_menu_keypress_gtk_widget_popup_menu (Gt
 	result = sidebar_tree_on_context_menu_keypress ((SidebarTree*) self);
 #line 146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 781 "Tree.c"
+#line 782 "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"
 	sidebar_tree_on_drag_begin ((SidebarTree*) self, context);
-#line 788 "Tree.c"
+#line 789 "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"
 	sidebar_tree_on_drag_end ((SidebarTree*) self, context);
-#line 795 "Tree.c"
+#line 796 "Tree.c"
 }
 
 
@@ -800,7 +801,7 @@ static gboolean _sidebar_tree_on_drag_motion_gtk_widget_drag_motion (GtkWidget*
 	result = sidebar_tree_on_drag_motion ((SidebarTree*) self, context, x, y, time_);
 #line 152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 804 "Tree.c"
+#line 805 "Tree.c"
 }
 
 
@@ -1015,14 +1016,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 1019 "Tree.c"
+#line 1020 "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 1026 "Tree.c"
+#line 1027 "Tree.c"
 }
 
 
@@ -1058,7 +1059,7 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo
 		_g_object_unref0 (wrapper);
 #line 163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1062 "Tree.c"
+#line 1063 "Tree.c"
 	}
 #line 165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = renderer;
@@ -1070,7 +1071,7 @@ void sidebar_tree_icon_renderer_function (SidebarTree* self, GtkCellLayout* layo
 	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"
 	_g_object_unref0 (wrapper);
-#line 1074 "Tree.c"
+#line 1075 "Tree.c"
 }
 
 
@@ -1081,7 +1082,7 @@ static void sidebar_tree_on_drag_begin (SidebarTree* self, GdkDragContext* ctx)
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (ctx));
 #line 169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->is_internal_drag_in_progress = TRUE;
-#line 1085 "Tree.c"
+#line 1086 "Tree.c"
 }
 
 
@@ -1096,7 +1097,7 @@ static void sidebar_tree_on_drag_end (SidebarTree* self, GdkDragContext* ctx) {
 	_g_object_unref0 (self->priv->internal_drag_source_entry);
 #line 174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->internal_drag_source_entry = NULL;
-#line 1100 "Tree.c"
+#line 1101 "Tree.c"
 }
 
 
@@ -1112,21 +1113,21 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 	_tmp1_ = self->priv->is_internal_drag_in_progress;
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 1116 "Tree.c"
+#line 1117 "Tree.c"
 		SidebarEntry* _tmp2_ = NULL;
 #line 178 "/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"
 		_tmp0_ = _tmp2_ == NULL;
-#line 1122 "Tree.c"
+#line 1123 "Tree.c"
 	} else {
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = FALSE;
-#line 1126 "Tree.c"
+#line 1127 "Tree.c"
 	}
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_) {
-#line 1130 "Tree.c"
+#line 1131 "Tree.c"
 		GtkTreePath* path = NULL;
 		GtkTreeViewDropPosition position = 0;
 		gint _tmp3_ = 0;
@@ -1150,7 +1151,7 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 		_tmp7_ = path;
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp7_ != NULL) {
-#line 1154 "Tree.c"
+#line 1155 "Tree.c"
 			SidebarTreeEntryWrapper* wrapper = NULL;
 			GtkTreePath* _tmp8_ = NULL;
 			SidebarTreeEntryWrapper* _tmp9_ = NULL;
@@ -1165,7 +1166,7 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 			_tmp10_ = wrapper;
 #line 185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp10_ != NULL) {
-#line 1169 "Tree.c"
+#line 1170 "Tree.c"
 				SidebarTreeEntryWrapper* _tmp11_ = NULL;
 				SidebarEntry* _tmp12_ = NULL;
 				SidebarEntry* _tmp13_ = NULL;
@@ -1179,21 +1180,21 @@ static gboolean sidebar_tree_on_drag_motion (SidebarTree* self, GdkDragContext*
 				_g_object_unref0 (self->priv->internal_drag_source_entry);
 #line 186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->internal_drag_source_entry = _tmp13_;
-#line 1183 "Tree.c"
+#line 1184 "Tree.c"
 			}
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1187 "Tree.c"
+#line 1188 "Tree.c"
 		}
 #line 178 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1191 "Tree.c"
+#line 1192 "Tree.c"
 	}
 #line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
 #line 190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1197 "Tree.c"
+#line 1198 "Tree.c"
 }
 
 
@@ -1201,108 +1202,116 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 	GError * _inner_error_ = NULL;
 #line 198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1205 "Tree.c"
+#line 1206 "Tree.c"
 	{
 		GtkBuilder* _tmp0_ = NULL;
+		gchar* _tmp1_ = NULL;
+		gchar* _tmp2_ = NULL;
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp1_ = NULL;
-		GObject* _tmp2_ = NULL;
-		GMenuModel* _tmp3_ = NULL;
-		GMenuModel* _tmp4_ = NULL;
-		GtkMenu* _tmp5_ = NULL;
+		GtkBuilder* _tmp3_ = NULL;
+		GObject* _tmp4_ = NULL;
+		GMenuModel* _tmp5_ = NULL;
+		GMenuModel* _tmp6_ = NULL;
+		GtkMenu* _tmp7_ = NULL;
 		GSimpleActionGroup* group = NULL;
-		GSimpleActionGroup* _tmp6_ = NULL;
-		GSimpleActionGroup* _tmp7_ = NULL;
 		GSimpleActionGroup* _tmp8_ = NULL;
-		GtkMenu* _tmp9_ = NULL;
+		GSimpleActionGroup* _tmp9_ = NULL;
+		GSimpleActionGroup* _tmp10_ = NULL;
+		GtkMenu* _tmp11_ = NULL;
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp0_ = self->priv->builder;
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_builder_add_from_resource (_tmp0_, "/org/gnome/Shotwell/sidebar_default_context.ui", &_inner_error_);
+		_tmp1_ = resources_get_ui ("sidebar_default_context.ui");
+#line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp2_ = _tmp1_;
+#line 200 "/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"
+		_g_free0 (_tmp2_);
 #line 200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1225 "Tree.c"
-			goto __catch50_g_error;
+#line 1234 "Tree.c"
+			goto __catch51_g_error;
 		}
+#line 201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp3_ = self->priv->builder;
+#line 201 "/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"
+		_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"
+		model = _tmp5_;
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp1_ = self->priv->builder;
+		_tmp6_ = model;
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp2_ = gtk_builder_get_object (_tmp1_, "popup-menu");
+		_tmp7_ = (GtkMenu*) gtk_menu_new_from_model (_tmp6_);
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp3_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp2_) : NULL);
+		g_object_ref_sink (_tmp7_);
 #line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		model = _tmp3_;
-#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp4_ = model;
-#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp5_ = (GtkMenu*) gtk_menu_new_from_model (_tmp4_);
-#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_object_ref_sink (_tmp5_);
-#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (self->priv->default_context_menu);
+#line 202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		self->priv->default_context_menu = _tmp7_;
 #line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		self->priv->default_context_menu = _tmp5_;
+		_tmp8_ = g_simple_action_group_new ();
+#line 203 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		group = _tmp8_;
 #line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp6_ = g_simple_action_group_new ();
+		_tmp9_ = group;
 #line 204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		group = _tmp6_;
+		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"
-		_tmp7_ = group;
+		_tmp10_ = group;
 #line 205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_action_map_add_action_entries (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, g_action_map_get_type (), GActionMap), SIDEBAR_TREE_entries, G_N_ELEMENTS (SIDEBAR_TREE_entries), self);
+		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"
-		_tmp8_ = group;
+		_tmp11_ = self->priv->default_context_menu;
 #line 206 "/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 (_tmp8_, g_action_group_get_type (), GActionGroup));
-#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp9_ = self->priv->default_context_menu;
-#line 207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		gtk_menu_attach_to_widget (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
+		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"
 		_g_object_unref0 (group);
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (model);
-#line 1266 "Tree.c"
+#line 1275 "Tree.c"
 	}
-	goto __finally50;
-	__catch50_g_error:
+	goto __finally51;
+	__catch51_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp10_ = NULL;
-		const gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gchar* _tmp13_ = NULL;
-		Application* _tmp14_ = NULL;
-		Application* _tmp15_ = NULL;
+		GError* _tmp12_ = NULL;
+		const gchar* _tmp13_ = NULL;
+		gchar* _tmp14_ = NULL;
+		gchar* _tmp15_ = NULL;
+		Application* _tmp16_ = NULL;
+		Application* _tmp17_ = NULL;
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_error_ = _inner_error_;
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_inner_error_ = NULL;
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp10_ = _error_;
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp11_ = _tmp10_->message;
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp12_ = g_strdup_printf ("Error loading UI resource: %s", _tmp11_);
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp13_ = _tmp12_;
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		app_window_error_message (_tmp13_, NULL);
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_g_free0 (_tmp13_);
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_tmp14_ = application_get_instance ();
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp12_ = _error_;
+#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp13_ = _tmp12_->message;
+#line 208 "/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"
 		_tmp15_ = _tmp14_;
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		application_panic (_tmp15_);
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		_application_unref0 (_tmp15_);
+#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		app_window_error_message (_tmp15_, NULL);
+#line 208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_g_free0 (_tmp15_);
+#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp16_ = application_get_instance ();
+#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_tmp17_ = _tmp16_;
+#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		application_panic (_tmp17_);
+#line 210 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+		_application_unref0 (_tmp17_);
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_error_free0 (_error_);
-#line 1304 "Tree.c"
+#line 1313 "Tree.c"
 	}
-	__finally50:
+	__finally51:
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
@@ -1311,7 +1320,7 @@ static void sidebar_tree_setup_default_context_menu (SidebarTree* self) {
 		g_clear_error (&_inner_error_);
 #line 199 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1315 "Tree.c"
+#line 1324 "Tree.c"
 	}
 }
 
@@ -1321,21 +1330,21 @@ static gboolean sidebar_tree_has_wrapper (SidebarTree* self, SidebarEntry* entry
 	GeeHashMap* _tmp0_ = NULL;
 	SidebarEntry* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 214 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/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 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp2_;
-#line 216 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 215 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1339 "Tree.c"
+#line 1348 "Tree.c"
 }
 
 
@@ -1346,43 +1355,43 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper (SidebarTree* self, Sid
 	SidebarEntry* _tmp1_ = NULL;
 	gpointer _tmp2_ = NULL;
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 218 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
-#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->entry_map;
-#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/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 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 219 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = (SidebarTreeEntryWrapper*) _tmp2_;
-#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 220 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 1366 "Tree.c"
+#line 1375 "Tree.c"
 		SidebarEntry* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = entry;
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = sidebar_entry_to_string (_tmp4_);
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 221 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp5_;
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_warning ("Tree.vala:222: Entry %s not found in sidebar", _tmp6_);
-#line 222 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#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"
 		_g_free0 (_tmp6_);
-#line 1380 "Tree.c"
+#line 1389 "Tree.c"
 	}
-#line 224 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
-#line 224 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 223 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1386 "Tree.c"
+#line 1395 "Tree.c"
 }
 
 
@@ -1396,64 +1405,64 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_iter (SidebarTree* s
 	GValue _tmp3_ = {0};
 	SidebarTreeEntryWrapper* _tmp4_ = NULL;
 	SidebarTreeEntryWrapper* _tmp5_ = NULL;
-#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 227 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 226 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (iter != NULL, NULL);
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->store;
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = *iter;
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 228 "/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 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 229 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 228 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	val = _tmp2_;
-#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = val;
-#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _g_object_ref0 (g_value_get_object (&_tmp3_));
-#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 230 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp4_;
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 231 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ == NULL) {
-#line 1424 "Tree.c"
+#line 1433 "Tree.c"
 		GtkTreeStore* _tmp6_ = NULL;
 		GtkTreeIter _tmp7_ = {0};
 		GtkTreePath* _tmp8_ = NULL;
 		GtkTreePath* _tmp9_ = NULL;
 		gchar* _tmp10_ = NULL;
 		gchar* _tmp11_ = NULL;
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->store;
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = *iter;
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/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 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = _tmp8_;
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = gtk_tree_path_to_string (_tmp9_);
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = _tmp10_;
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_message ("Tree.vala:233: No entry found in sidebar at %s", _tmp11_);
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#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"
 		_g_free0 (_tmp11_);
-#line 233 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 232 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (_tmp9_);
-#line 1449 "Tree.c"
+#line 1458 "Tree.c"
 	}
-#line 235 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = wrapper;
-#line 235 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
-#line 235 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 234 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1457 "Tree.c"
+#line 1466 "Tree.c"
 }
 
 
@@ -1466,49 +1475,49 @@ static SidebarTreeEntryWrapper* sidebar_tree_get_wrapper_at_path (SidebarTree* s
 	gboolean _tmp3_ = FALSE;
 	GtkTreeIter _tmp7_ = {0};
 	SidebarTreeEntryWrapper* _tmp8_ = NULL;
-#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 237 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 238 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 237 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, NULL);
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->store;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/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 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp2_;
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 239 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp3_) {
-#line 1484 "Tree.c"
+#line 1493 "Tree.c"
 		GtkTreePath* _tmp4_ = NULL;
 		gchar* _tmp5_ = NULL;
 		gchar* _tmp6_ = NULL;
-#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = path;
-#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = gtk_tree_path_to_string (_tmp4_);
-#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 240 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp5_;
-#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-		g_message ("Tree.vala:241: No entry found in sidebar at %s", _tmp6_);
-#line 241 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#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"
 		_g_free0 (_tmp6_);
-#line 243 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = NULL;
-#line 243 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 242 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1502 "Tree.c"
+#line 1511 "Tree.c"
 	}
-#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = iter;
-#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_);
-#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp8_;
-#line 246 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 245 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1512 "Tree.c"
+#line 1521 "Tree.c"
 }
 
 
@@ -1530,79 +1539,79 @@ gboolean sidebar_tree_place_cursor (SidebarTree* self, SidebarEntry* entry, gboo
 	GtkTreePath* _tmp12_ = NULL;
 	SidebarEntry* _tmp13_ = NULL;
 	gboolean _tmp14_ = FALSE;
-#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 250 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_);
-#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 251 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp1_) {
-#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 253 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 252 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1548 "Tree.c"
+#line 1557 "Tree.c"
 	}
-#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_);
-#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 254 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp3_;
-#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
-#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 255 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 257 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 256 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1566 "Tree.c"
+#line 1575 "Tree.c"
 	}
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/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 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_);
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_select_path (_tmp5_, _tmp8_);
-#line 259 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 258 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp8_);
-#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = mask_signal;
-#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 260 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->mask_entry_selected_signal = _tmp9_;
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = wrapper;
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = sidebar_tree_entry_wrapper_get_path (_tmp10_);
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = _tmp11_;
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/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 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 261 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp12_);
-#line 263 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 262 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->mask_entry_selected_signal = FALSE;
-#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = entry;
-#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = sidebar_tree_scroll_to_entry (self, _tmp13_);
-#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp14_;
-#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 265 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 264 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1606 "Tree.c"
+#line 1615 "Tree.c"
 }
 
 
@@ -1617,75 +1626,75 @@ gboolean sidebar_tree_is_selected (SidebarTree* self, SidebarEntry* entry) {
 	GtkTreeSelection* _tmp4_ = NULL;
 	gboolean _tmp5_ = FALSE;
 	SidebarTreeEntryWrapper* _tmp6_ = NULL;
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 267 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 269 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 268 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 272 "/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 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _g_object_ref0 (_tmp2_);
-#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 272 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selection = _tmp3_;
-#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = selection;
-#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 273 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selection);
-#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 275 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 274 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1649 "Tree.c"
+#line 1658 "Tree.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ != NULL) {
-#line 1655 "Tree.c"
+#line 1664 "Tree.c"
 		GtkTreeSelection* _tmp7_ = NULL;
 		SidebarTreeEntryWrapper* _tmp8_ = NULL;
 		GtkTreePath* _tmp9_ = NULL;
 		GtkTreePath* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = selection;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = wrapper;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = sidebar_tree_entry_wrapper_get_path (_tmp8_);
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = _tmp9_;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = gtk_tree_selection_path_is_selected (_tmp7_, _tmp10_);
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp11_;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (_tmp10_);
-#line 1675 "Tree.c"
+#line 1684 "Tree.c"
 	} else {
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 1679 "Tree.c"
+#line 1688 "Tree.c"
 	}
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp5_;
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selection);
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 276 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1689 "Tree.c"
+#line 1698 "Tree.c"
 }
 
 
@@ -1693,40 +1702,40 @@ gboolean sidebar_tree_is_any_selected (SidebarTree* self) {
 	gboolean result = FALSE;
 	GtkTreeSelection* _tmp0_ = NULL;
 	gint _tmp1_ = 0;
-#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 279 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 280 "/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 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_selection_count_selected_rows (_tmp0_);
-#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp1_ != 0;
-#line 281 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 280 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1707 "Tree.c"
+#line 1716 "Tree.c"
 }
 
 
 static gpointer _gtk_tree_path_copy0 (gpointer self) {
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? gtk_tree_path_copy (self) : NULL;
-#line 1714 "Tree.c"
+#line 1723 "Tree.c"
 }
 
 
 static void _gtk_tree_path_free0_ (gpointer var) {
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	(var == NULL) ? NULL : (var = (gtk_tree_path_free (var), NULL));
-#line 1721 "Tree.c"
+#line 1730 "Tree.c"
 }
 
 
 static void _g_list_free__gtk_tree_path_free0_ (GList* self) {
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_list_foreach (self, (GFunc) _gtk_tree_path_free0_, NULL);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_list_free (self);
-#line 1730 "Tree.c"
+#line 1739 "Tree.c"
 }
 
 
@@ -1749,96 +1758,96 @@ static GtkTreePath* sidebar_tree_get_selected_path (SidebarTree* self) {
 	GList* _tmp13_ = NULL;
 	guint _tmp14_ = 0U;
 	GtkTreePath* _tmp17_ = NULL;
-#line 284 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 283 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 285 "/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 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 285 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selection = _tmp1_;
-#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = selection;
-#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 286 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = NULL;
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selection);
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (model);
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 287 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 1773 "Tree.c"
+#line 1782 "Tree.c"
 	}
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = selection;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = gtk_tree_selection_get_selected_rows (_tmp3_, &_tmp4_);
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _g_object_ref0 (_tmp4_);
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	model = _tmp6_;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 289 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp5_;
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = rows;
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = g_list_length (_tmp8_);
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp9_ == ((guint) 0)) {
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = TRUE;
-#line 1795 "Tree.c"
+#line 1804 "Tree.c"
 	} else {
 		GList* _tmp10_ = NULL;
 		guint _tmp11_ = 0U;
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = rows;
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = g_list_length (_tmp10_);
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp11_ == ((guint) 1);
-#line 1805 "Tree.c"
+#line 1814 "Tree.c"
 	}
-#line 291 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 290 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp7_, "rows.length() == 0 || rows.length() == 1");
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = rows;
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = g_list_length (_tmp13_);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp14_ != ((guint) 0)) {
-#line 1815 "Tree.c"
+#line 1824 "Tree.c"
 		GList* _tmp15_ = NULL;
 		gconstpointer _tmp16_ = NULL;
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = rows;
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = g_list_nth_data (_tmp15_, (guint) 0);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = (GtkTreePath*) _tmp16_;
-#line 1824 "Tree.c"
+#line 1833 "Tree.c"
 	} else {
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = NULL;
-#line 1828 "Tree.c"
+#line 1837 "Tree.c"
 	}
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = _gtk_tree_path_copy0 (_tmp12_);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp17_;
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selection);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 292 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1842 "Tree.c"
+#line 1851 "Tree.c"
 }
 
 
@@ -1855,90 +1864,90 @@ static gchar* sidebar_tree_get_name_for_entry (SidebarTree* self, SidebarEntry*
 	SidebarEmphasizableEntry* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	SidebarEmphasizableEntry* _tmp8_ = NULL;
-#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 295 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_entry_get_sidebar_name (_tmp0_);
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = guarded_markup_escape_text (_tmp2_);
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp2_);
-#line 297 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 296 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	name = _tmp4_;
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = entry;
-#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/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 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 298 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable_entry = _tmp6_;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = emphasizable_entry;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_ != NULL) {
-#line 1887 "Tree.c"
+#line 1896 "Tree.c"
 		SidebarEmphasizableEntry* _tmp9_ = NULL;
 		gboolean _tmp10_ = FALSE;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = emphasizable_entry;
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = sidebar_emphasizable_entry_is_emphasized (_tmp9_);
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp10_;
-#line 1896 "Tree.c"
+#line 1905 "Tree.c"
 	} else {
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = FALSE;
-#line 1900 "Tree.c"
+#line 1909 "Tree.c"
 	}
-#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 299 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 1904 "Tree.c"
+#line 1913 "Tree.c"
 		const gchar* _tmp11_ = NULL;
 		gchar* _tmp12_ = NULL;
-#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = name;
-#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = g_strdup_printf ("<b>%s</b>", _tmp11_);
-#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (name);
-#line 301 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 300 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		name = _tmp12_;
-#line 1915 "Tree.c"
+#line 1924 "Tree.c"
 	}
-#line 303 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = name;
-#line 303 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable_entry);
-#line 303 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 302 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1923 "Tree.c"
+#line 1932 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_real_accept_cursor_changed (SidebarTree* self) {
 	gboolean result = FALSE;
-#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 307 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 1933 "Tree.c"
+#line 1942 "Tree.c"
 }
 
 
 gboolean sidebar_tree_accept_cursor_changed (SidebarTree* self) {
-#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 306 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 305 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return SIDEBAR_TREE_GET_CLASS (self)->accept_cursor_changed (self);
-#line 1942 "Tree.c"
+#line 1951 "Tree.c"
 }
 
 
@@ -1952,41 +1961,41 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	SidebarTreeEntryWrapper* _tmp4_ = NULL;
 	SidebarTreeEntryWrapper* _tmp5_ = NULL;
-#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = sidebar_tree_get_selected_path (self);
-#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp0_;
-#line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 311 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_ == NULL) {
-#line 313 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 312 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
-#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 313 "/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 1970 "Tree.c"
+#line 1979 "Tree.c"
 		}
-#line 315 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 315 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 314 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 1976 "Tree.c"
+#line 1985 "Tree.c"
 	}
-#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = path;
-#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper_at_path (self, _tmp2_);
-#line 318 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 317 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp3_;
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = self->priv->selected_wrapper;
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ != _tmp5_) {
-#line 1990 "Tree.c"
+#line 1999 "Tree.c"
 		SidebarTreeEntryWrapper* old_wrapper = NULL;
 		SidebarTreeEntryWrapper* _tmp6_ = NULL;
 		SidebarTreeEntryWrapper* _tmp7_ = NULL;
@@ -1996,168 +2005,168 @@ static void sidebar_tree_real_cursor_changed (GtkTreeView* base) {
 		gint _tmp11_ = 0;
 		gboolean _tmp19_ = FALSE;
 		SidebarTreeEntryWrapper* _tmp20_ = NULL;
-#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->selected_wrapper;
-#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _g_object_ref0 (_tmp6_);
-#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		old_wrapper = _tmp7_;
-#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = wrapper;
-#line 322 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 321 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->selected_wrapper = _tmp8_;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = self->priv->editing_disabled;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ == 0) {
-#line 2014 "Tree.c"
+#line 2023 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp12_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = wrapper;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _tmp12_ != NULL;
-#line 2020 "Tree.c"
+#line 2029 "Tree.c"
 		} else {
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = FALSE;
-#line 2024 "Tree.c"
+#line 2033 "Tree.c"
 		}
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_) {
-#line 2028 "Tree.c"
+#line 2037 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp13_ = NULL;
 			SidebarEntry* _tmp14_ = NULL;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = wrapper;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = _tmp13_->entry;
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2037 "Tree.c"
+#line 2046 "Tree.c"
 		} else {
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2041 "Tree.c"
+#line 2050 "Tree.c"
 		}
-#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 323 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2045 "Tree.c"
+#line 2054 "Tree.c"
 			GtkCellRendererText* _tmp15_ = NULL;
 			SidebarTreeEntryWrapper* _tmp16_ = NULL;
 			SidebarEntry* _tmp17_ = NULL;
 			gboolean _tmp18_ = FALSE;
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = self->priv->text_renderer;
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = wrapper;
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = _tmp16_->entry;
-#line 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/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 325 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 324 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			g_object_set (_tmp15_, "editable", _tmp18_, NULL);
-#line 2060 "Tree.c"
+#line 2069 "Tree.c"
 		}
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = wrapper;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp20_ != NULL) {
-#line 2066 "Tree.c"
+#line 2075 "Tree.c"
 			gboolean _tmp21_ = FALSE;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = self->priv->mask_entry_selected_signal;
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = !_tmp21_;
-#line 2072 "Tree.c"
+#line 2081 "Tree.c"
 		} else {
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = FALSE;
-#line 2076 "Tree.c"
+#line 2085 "Tree.c"
 		}
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp19_) {
-#line 2080 "Tree.c"
+#line 2089 "Tree.c"
 			SidebarSelectableEntry* selectable = NULL;
 			SidebarTreeEntryWrapper* _tmp22_ = NULL;
 			SidebarEntry* _tmp23_ = NULL;
 			SidebarSelectableEntry* _tmp24_ = NULL;
 			SidebarSelectableEntry* _tmp25_ = NULL;
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = wrapper;
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = _tmp22_->entry;
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/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 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			selectable = _tmp24_;
-#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = selectable;
-#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 328 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp25_ != NULL) {
-#line 2098 "Tree.c"
+#line 2107 "Tree.c"
 				gboolean _tmp26_ = FALSE;
-#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp26_ = sidebar_tree_accept_cursor_changed (self);
-#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 329 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp26_) {
-#line 2104 "Tree.c"
+#line 2113 "Tree.c"
 					SidebarSelectableEntry* _tmp27_ = NULL;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp27_ = selectable;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 330 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					g_signal_emit_by_name (self, "entry-selected", _tmp27_);
-#line 2110 "Tree.c"
+#line 2119 "Tree.c"
 				} else {
 					SidebarTreeEntryWrapper* _tmp28_ = NULL;
 					SidebarEntry* _tmp29_ = NULL;
-#line 333 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp28_ = old_wrapper;
-#line 333 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp29_ = _tmp28_->entry;
-#line 333 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 332 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					sidebar_tree_place_cursor (self, _tmp29_, TRUE);
-#line 2120 "Tree.c"
+#line 2129 "Tree.c"
 				}
 			}
-#line 327 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 326 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (selectable);
-#line 2125 "Tree.c"
+#line 2134 "Tree.c"
 		}
-#line 320 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 319 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (old_wrapper);
-#line 2129 "Tree.c"
+#line 2138 "Tree.c"
 	}
-#line 339 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 338 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (GTK_TREE_VIEW_CLASS (sidebar_tree_parent_class)->cursor_changed != NULL) {
-#line 340 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 339 "/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 2135 "Tree.c"
+#line 2144 "Tree.c"
 	}
-#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 310 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 309 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 2141 "Tree.c"
+#line 2150 "Tree.c"
 }
 
 
 void sidebar_tree_disable_editing (SidebarTree* self) {
 	gint _tmp0_ = 0;
-#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 342 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->editing_disabled;
-#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->editing_disabled = _tmp0_ + 1;
-#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 343 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ == 0) {
-#line 2155 "Tree.c"
+#line 2164 "Tree.c"
 		GtkCellRendererText* _tmp1_ = NULL;
-#line 345 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->text_renderer;
-#line 345 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 344 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp1_, "editable", FALSE, NULL);
-#line 2161 "Tree.c"
+#line 2170 "Tree.c"
 	}
 }
 
@@ -2168,141 +2177,141 @@ void sidebar_tree_enable_editing (SidebarTree* self) {
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	GtkTreePath* _tmp3_ = NULL;
-#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = sidebar_tree_get_selected_path (self);
-#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp0_;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = path;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ != NULL) {
-#line 2182 "Tree.c"
+#line 2191 "Tree.c"
 		gint _tmp4_ = 0;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = self->priv->editing_disabled;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp4_ > 0;
-#line 2188 "Tree.c"
+#line 2197 "Tree.c"
 	} else {
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 2192 "Tree.c"
+#line 2201 "Tree.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
-#line 2196 "Tree.c"
+#line 2205 "Tree.c"
 		gint _tmp5_ = 0;
 		gint _tmp6_ = 0;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->editing_disabled;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->editing_disabled = _tmp5_ - 1;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = self->priv->editing_disabled;
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = _tmp6_ == 0;
-#line 2207 "Tree.c"
+#line 2216 "Tree.c"
 	} else {
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = FALSE;
-#line 2211 "Tree.c"
+#line 2220 "Tree.c"
 	}
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 2215 "Tree.c"
+#line 2224 "Tree.c"
 		SidebarTreeEntryWrapper* wrapper = NULL;
 		GtkTreePath* _tmp7_ = NULL;
 		SidebarTreeEntryWrapper* _tmp8_ = NULL;
 		gboolean _tmp9_ = FALSE;
 		SidebarTreeEntryWrapper* _tmp10_ = NULL;
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = path;
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = sidebar_tree_get_wrapper_at_path (self, _tmp7_);
-#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		wrapper = _tmp8_;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = wrapper;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp10_ != NULL) {
-#line 2231 "Tree.c"
+#line 2240 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp11_ = NULL;
 			SidebarEntry* _tmp12_ = NULL;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = wrapper;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _tmp11_->entry;
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_RENAMEABLE_ENTRY);
-#line 2240 "Tree.c"
+#line 2249 "Tree.c"
 		} else {
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = FALSE;
-#line 2244 "Tree.c"
+#line 2253 "Tree.c"
 		}
-#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 351 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_) {
-#line 2248 "Tree.c"
+#line 2257 "Tree.c"
 			GtkCellRendererText* _tmp13_ = NULL;
 			SidebarTreeEntryWrapper* _tmp14_ = NULL;
 			SidebarEntry* _tmp15_ = NULL;
 			gboolean _tmp16_ = FALSE;
-#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = self->priv->text_renderer;
-#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = wrapper;
-#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = _tmp14_->entry;
-#line 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/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 353 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 352 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			g_object_set (_tmp13_, "editable", _tmp16_, NULL);
-#line 2263 "Tree.c"
+#line 2272 "Tree.c"
 		}
-#line 350 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 349 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 2267 "Tree.c"
+#line 2276 "Tree.c"
 	}
-#line 348 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 347 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 2271 "Tree.c"
+#line 2280 "Tree.c"
 }
 
 
 void sidebar_tree_toggle_branch_expansion (SidebarTree* self, GtkTreePath* path, gboolean expand_all) {
 	GtkTreePath* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 357 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (path != NULL);
-#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 358 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 359 "/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 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 359 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp1_) {
-#line 2290 "Tree.c"
+#line 2299 "Tree.c"
 		GtkTreePath* _tmp2_ = NULL;
-#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 360 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = path;
-#line 361 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 360 "/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 2296 "Tree.c"
+#line 2305 "Tree.c"
 	} else {
 		GtkTreePath* _tmp3_ = NULL;
 		gboolean _tmp4_ = FALSE;
-#line 363 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = path;
-#line 363 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 362 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = expand_all;
-#line 363 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 362 "/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 2306 "Tree.c"
+#line 2315 "Tree.c"
 	}
 }
 
@@ -2316,47 +2325,47 @@ gboolean sidebar_tree_expand_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreePath* _tmp5_ = NULL;
-#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 365 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 366 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 367 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 368 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 370 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 369 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 2342 "Tree.c"
+#line 2351 "Tree.c"
 	}
-#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 371 "/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 372 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 371 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 374 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 374 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 374 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 373 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 2360 "Tree.c"
+#line 2369 "Tree.c"
 }
 
 
@@ -2370,37 +2379,37 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreeIter iter = {0};
 	GtkTreePath* _tmp13_ = NULL;
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = TRUE;
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 378 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 379 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 381 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 380 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2394 "Tree.c"
+#line 2403 "Tree.c"
 	}
-#line 383 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 383 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 383 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 382 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp4_;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2404 "Tree.c"
+#line 2413 "Tree.c"
 		GtkTreeStore* _tmp5_ = NULL;
 		GtkTreePath* _tmp6_ = NULL;
 		GtkTreeIter _tmp7_ = {0};
@@ -2409,89 +2418,89 @@ void sidebar_tree_expand_to_first_child (SidebarTree* self, SidebarEntry* entry)
 		GtkTreeIter _tmp10_ = {0};
 		gboolean _tmp11_ = FALSE;
 		GtkTreePath* _tmp12_ = NULL;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->store;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = path;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/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 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		iter = _tmp7_;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp8_) {
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 385 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2425 "Tree.c"
+#line 2434 "Tree.c"
 		}
-#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = self->priv->store;
-#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = iter;
-#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/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 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 386 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp11_) {
-#line 388 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 387 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2437 "Tree.c"
+#line 2446 "Tree.c"
 		}
-#line 390 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = path;
-#line 390 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 389 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_path_down (_tmp12_);
-#line 2443 "Tree.c"
+#line 2452 "Tree.c"
 	}
-#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 392 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = path;
-#line 393 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 392 "/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 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 376 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 2453 "Tree.c"
+#line 2462 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added (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_added ((SidebarTree*) self, _sender, entry);
-#line 2460 "Tree.c"
+#line 2469 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed (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_removed ((SidebarTree*) self, _sender, entry);
-#line 2467 "Tree.c"
+#line 2476 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved (SidebarBranch* _sender, SidebarEntry* entry, 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_moved ((SidebarTree*) self, _sender, entry);
-#line 2474 "Tree.c"
+#line 2483 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented (SidebarBranch* _sender, SidebarEntry* entry, SidebarEntry* old_parent, 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_entry_reparented ((SidebarTree*) self, _sender, entry, old_parent);
-#line 2481 "Tree.c"
+#line 2490 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered (SidebarBranch* _sender, SidebarEntry* entry, 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_branch_children_reordered ((SidebarTree*) self, _sender, entry);
-#line 2488 "Tree.c"
+#line 2497 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_show_branch_sidebar_branch_show_branch (SidebarBranch* _sender, gboolean show, gpointer self) {
-#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_show_branch ((SidebarTree*) self, _sender, show);
-#line 2495 "Tree.c"
+#line 2504 "Tree.c"
 }
 
 
@@ -2512,139 +2521,139 @@ void sidebar_tree_graft (SidebarTree* self, SidebarBranch* branch, gint position
 	SidebarBranch* _tmp24_ = NULL;
 	SidebarBranch* _tmp25_ = NULL;
 	SidebarBranch* _tmp26_ = NULL;
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = position;
-#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 395 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_return_if_fail (_tmp0_ >= 0, "position >= 0");
-#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->branches;
-#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = branch;
-#line 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/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 397 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 396 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!_tmp3_, "!branches.has_key(branch)");
-#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = self->priv->branches;
-#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = branch;
-#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 398 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = position;
-#line 399 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 398 "/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 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = branch;
-#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = sidebar_branch_get_show_branch (_tmp7_);
-#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 400 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_) {
-#line 2546 "Tree.c"
+#line 2555 "Tree.c"
 		SidebarBranch* _tmp9_ = NULL;
 		SidebarBranch* _tmp10_ = NULL;
 		gboolean _tmp11_ = FALSE;
 		SidebarBranch* _tmp15_ = NULL;
 		gboolean _tmp16_ = FALSE;
-#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = branch;
-#line 402 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 401 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_associate_branch (self, _tmp9_);
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = branch;
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = sidebar_branch_is_startup_expand_to_first_child (_tmp10_);
-#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 403 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_) {
-#line 2562 "Tree.c"
+#line 2571 "Tree.c"
 			SidebarBranch* _tmp12_ = NULL;
 			SidebarEntry* _tmp13_ = NULL;
 			SidebarEntry* _tmp14_ = NULL;
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = branch;
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = sidebar_branch_get_root (_tmp12_);
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = _tmp13_;
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_expand_to_first_child (self, _tmp14_);
-#line 405 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 404 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp14_);
-#line 2576 "Tree.c"
+#line 2585 "Tree.c"
 		}
-#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = branch;
-#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = sidebar_branch_is_startup_open_grouping (_tmp15_);
-#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 406 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp16_) {
-#line 2584 "Tree.c"
+#line 2593 "Tree.c"
 			SidebarBranch* _tmp17_ = NULL;
 			SidebarEntry* _tmp18_ = NULL;
 			SidebarEntry* _tmp19_ = NULL;
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = branch;
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = sidebar_branch_get_root (_tmp17_);
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _tmp18_;
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_expand_to_entry (self, _tmp19_);
-#line 408 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 407 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp19_);
-#line 2598 "Tree.c"
+#line 2607 "Tree.c"
 		}
 	}
-#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 410 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = 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 (_tmp20_, "entry-added", (GCallback) _sidebar_tree_on_branch_entry_added_sidebar_branch_entry_added, self, 0);
-#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 411 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = 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 (_tmp21_, "entry-removed", (GCallback) _sidebar_tree_on_branch_entry_removed_sidebar_branch_entry_removed, self, 0);
-#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 412 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = 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 (_tmp22_, "entry-moved", (GCallback) _sidebar_tree_on_branch_entry_moved_sidebar_branch_entry_moved, self, 0);
-#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 413 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = 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 (_tmp23_, "entry-reparented", (GCallback) _sidebar_tree_on_branch_entry_reparented_sidebar_branch_entry_reparented, self, 0);
-#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 414 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = 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 (_tmp24_, "children-reordered", (GCallback) _sidebar_tree_on_branch_children_reordered_sidebar_branch_children_reordered, self, 0);
-#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 415 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = branch;
-#line 416 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 415 "/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 418 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = branch;
-#line 418 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 417 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "branch-added", _tmp26_);
-#line 2629 "Tree.c"
+#line 2638 "Tree.c"
 }
 
 
 static GtkTreeIter* _gtk_tree_iter_dup (GtkTreeIter* self) {
 	GtkTreeIter* dup;
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	dup = g_new0 (GtkTreeIter, 1);
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	memcpy (dup, self, sizeof (GtkTreeIter));
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return dup;
-#line 2641 "Tree.c"
+#line 2650 "Tree.c"
 }
 
 
 static gpointer __gtk_tree_iter_dup0 (gpointer self) {
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return self ? _gtk_tree_iter_dup (self) : NULL;
-#line 2648 "Tree.c"
+#line 2657 "Tree.c"
 }
 
 
@@ -2683,39 +2692,39 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 	SidebarEntry* _tmp46_ = NULL;
 	GtkTreeIter* _tmp47_ = NULL;
 	GtkTreeIter _tmp48_ = {0};
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->branches;
-#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = branch;
-#line 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 422 "/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 423 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_, "branches.has_key(branch)");
-#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->branches;
-#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = branch;
-#line 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 424 "/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 425 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 424 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	position = (gint) ((gintptr) _tmp5_);
-#line 427 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 426 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	insertion_iter = NULL;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->store;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/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 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp7_;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 430 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	found = _tmp8_;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 2719 "Tree.c"
+#line 2728 "Tree.c"
 		gboolean _tmp9_ = FALSE;
 		SidebarTreeRootWrapper* root_wrapper = NULL;
 		GtkTreeIter _tmp10_ = {0};
@@ -2727,154 +2736,154 @@ static void sidebar_tree_associate_branch (SidebarTree* self, SidebarBranch* bra
 		gint _tmp16_ = 0;
 		GtkTreeStore* _tmp22_ = NULL;
 		gboolean _tmp23_ = FALSE;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = found;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp9_) {
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2737 "Tree.c"
+#line 2746 "Tree.c"
 		}
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = iter;
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp10_);
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp11_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp11_) : NULL;
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp12_ == NULL) {
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (_tmp11_);
-#line 2749 "Tree.c"
+#line 2758 "Tree.c"
 		}
-#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		root_wrapper = _tmp12_;
-#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = root_wrapper;
-#line 434 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 433 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp13_ != NULL, "root_wrapper != null");
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = position;
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = root_wrapper;
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = _tmp15_->root_position;
-#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 435 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp14_ < _tmp16_) {
-#line 2765 "Tree.c"
+#line 2774 "Tree.c"
 			GtkTreeStore* _tmp17_ = NULL;
 			GtkTreeIter _tmp18_ = {0};
 			GtkTreeIter _tmp19_ = {0};
 			GtkTreeIter _tmp20_ = {0};
 			GtkTreeIter* _tmp21_ = NULL;
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = self->priv->store;
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = iter;
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_insert_before (_tmp17_, &_tmp19_, NULL, &_tmp18_);
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_free0 (insertion_iter);
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = _tmp19_;
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = __gtk_tree_iter_dup0 (&_tmp20_);
-#line 437 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 436 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			insertion_iter = _tmp21_;
-#line 439 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (root_wrapper);
-#line 439 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 438 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 2789 "Tree.c"
+#line 2798 "Tree.c"
 		}
-#line 442 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = self->priv->store;
-#line 442 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 441 "/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 442 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 441 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		found = _tmp23_;
-#line 432 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 431 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (root_wrapper);
-#line 2799 "Tree.c"
+#line 2808 "Tree.c"
 	}
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = insertion_iter;
-#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 445 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp24_ == NULL) {
-#line 2805 "Tree.c"
+#line 2814 "Tree.c"
 		GtkTreeStore* _tmp25_ = NULL;
 		GtkTreeIter _tmp26_ = {0};
 		GtkTreeIter _tmp27_ = {0};
 		GtkTreeIter* _tmp28_ = NULL;
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = self->priv->store;
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_append (_tmp25_, &_tmp26_, NULL);
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (insertion_iter);
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp27_ = _tmp26_;
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = __gtk_tree_iter_dup0 (&_tmp27_);
-#line 447 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 446 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp28_;
-#line 2822 "Tree.c"
+#line 2831 "Tree.c"
 	}
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = insertion_iter;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = self->priv->store;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = branch;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = sidebar_branch_get_root (_tmp31_);
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = _tmp32_;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = self->priv->store;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp35_ = insertion_iter;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = *_tmp35_;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/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 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = _tmp37_;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = position;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/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 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp41_ = _tmp40_;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp42_ = *_tmp29_;
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/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 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp41_);
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp38_);
-#line 449 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 448 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp33_);
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp43_ = branch;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp44_ = branch;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp45_ = sidebar_branch_get_root (_tmp44_);
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp46_ = _tmp45_;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp47_ = insertion_iter;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp48_ = *_tmp47_;
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_children (self, _tmp43_, _tmp46_, &_tmp48_);
-#line 454 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 453 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp46_);
-#line 422 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 421 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (insertion_iter);
-#line 2878 "Tree.c"
+#line 2887 "Tree.c"
 }
 
 
@@ -2884,31 +2893,31 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 	SidebarEntry* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeList* _tmp3_ = NULL;
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (parent));
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (parent_iter != NULL);
-#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = parent;
-#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_);
-#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 458 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp2_;
-#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = children;
-#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 459 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 461 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 460 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 2912 "Tree.c"
+#line 2921 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
@@ -2919,25 +2928,25 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
 		gint _child_index = 0;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = children;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_list = _tmp5_;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _child_list;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp7_;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_size = _tmp8_;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_index = -1;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 2941 "Tree.c"
+#line 2950 "Tree.c"
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
@@ -2954,61 +2963,61 @@ static void sidebar_tree_associate_children (SidebarTree* self, SidebarBranch* b
 			SidebarBranch* _tmp20_ = NULL;
 			SidebarEntry* _tmp21_ = NULL;
 			GtkTreeIter _tmp22_ = {0};
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = _child_index;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_index = _tmp9_ + 1;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _child_index;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = _child_size;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp10_ < _tmp11_)) {
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 2970 "Tree.c"
+#line 2979 "Tree.c"
 			}
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _child_list;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = _child_index;
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child = (SidebarEntry*) _tmp14_;
-#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = self->priv->store;
-#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = *parent_iter;
-#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_append (_tmp15_, &_tmp17_, &_tmp16_);
-#line 465 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 464 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			append_iter = _tmp17_;
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = append_iter;
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = child;
-#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 466 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_associate_entry (self, &_tmp18_, _tmp19_);
-#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = branch;
-#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = child;
-#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = append_iter;
-#line 468 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 467 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_associate_children (self, _tmp20_, _tmp21_, &_tmp22_);
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 3004 "Tree.c"
+#line 3013 "Tree.c"
 		}
-#line 463 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 462 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 3008 "Tree.c"
+#line 3017 "Tree.c"
 	}
-#line 457 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 456 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 3012 "Tree.c"
+#line 3021 "Tree.c"
 }
 
 
@@ -3022,79 +3031,79 @@ static void sidebar_tree_associate_entry (SidebarTree* self, GtkTreeIter* assoc_
 	GtkTreePath* _tmp6_ = NULL;
 	SidebarTreeEntryWrapper* _tmp7_ = NULL;
 	SidebarTreeEntryWrapper* _tmp8_ = NULL;
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (assoc_iter != NULL);
-#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 471 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *assoc_iter;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->store;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = *assoc_iter;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/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 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/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 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_wrapper (self, &_tmp0_, _tmp8_);
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp8_);
-#line 473 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 472 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp6_);
-#line 3056 "Tree.c"
+#line 3065 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed (SidebarEntry* _sender, const gchar* tooltip, 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_tooltip_changed ((SidebarTree*) self, _sender, tooltip);
-#line 3063 "Tree.c"
+#line 3072 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_icon_changed_sidebar_entry_sidebar_icon_changed (SidebarEntry* _sender, const gchar* icon, gpointer self) {
-#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_icon_changed ((SidebarTree*) self, _sender, icon);
-#line 3070 "Tree.c"
+#line 3079 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created (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_page_created ((SidebarTree*) self, _sender, page);
-#line 3077 "Tree.c"
+#line 3086 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_destroying_page_sidebar_page_representative_destroying_page (SidebarPageRepresentative* _sender, Page* page, gpointer self) {
-#line 493 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_destroying_page ((SidebarTree*) self, _sender, page);
-#line 3084 "Tree.c"
+#line 3093 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_is_emphasized_changed_sidebar_emphasizable_entry_is_emphasized_changed (SidebarEmphasizableEntry* _sender, gboolean emphasized, gpointer self) {
-#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_is_emphasized_changed ((SidebarTree*) self, _sender, emphasized);
-#line 3091 "Tree.c"
+#line 3100 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_sidebar_name_changed_sidebar_renameable_entry_sidebar_name_changed (SidebarRenameableEntry* _sender, const gchar* name, gpointer self) {
-#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_sidebar_name_changed ((SidebarTree*) self, _sender, name);
-#line 3098 "Tree.c"
+#line 3107 "Tree.c"
 }
 
 
@@ -3140,162 +3149,162 @@ static void sidebar_tree_associate_wrapper (SidebarTree* self, GtkTreeIter* asso
 	SidebarRenameableEntry* _tmp37_ = NULL;
 	SidebarRenameableEntry* _tmp38_ = NULL;
 	SidebarEntry* _tmp40_ = NULL;
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (assoc_iter != NULL);
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = wrapper;
-#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 477 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp2_;
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->entry_map;
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = entry;
-#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/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 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 478 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (!_tmp5_, "!entry_map.has_key(entry)");
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->entry_map;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = entry;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = wrapper;
-#line 480 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 479 "/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 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = self->priv->store;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = *assoc_iter;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = entry;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = sidebar_tree_get_name_for_entry (self, _tmp11_);
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = _tmp12_;
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp9_, &_tmp10_, SIDEBAR_TREE_COLUMNS_NAME, _tmp13_, -1);
-#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 481 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp13_);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = self->priv->store;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = *assoc_iter;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = entry;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = sidebar_entry_get_sidebar_tooltip (_tmp16_);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = _tmp17_;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = guarded_markup_escape_text (_tmp18_);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = _tmp19_;
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp14_, &_tmp15_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp20_, -1);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp20_);
-#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 482 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp18_);
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = self->priv->store;
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = *assoc_iter;
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = wrapper;
-#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 483 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp21_, &_tmp22_, SIDEBAR_TREE_COLUMNS_WRAPPER, _tmp23_, -1);
-#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = *assoc_iter;
-#line 485 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 484 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp24_);
-#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 486 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = 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 (_tmp25_, "sidebar-tooltip-changed", (GCallback) _sidebar_tree_on_sidebar_tooltip_changed_sidebar_entry_sidebar_tooltip_changed, self, 0);
-#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 487 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = entry;
-#line 488 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 487 "/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 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = entry;
-#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 489 "/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 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 489 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pageable = _tmp28_;
-#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = pageable;
-#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 490 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp29_ != NULL) {
-#line 3238 "Tree.c"
+#line 3247 "Tree.c"
 		SidebarPageRepresentative* _tmp30_ = NULL;
 		SidebarPageRepresentative* _tmp31_ = NULL;
-#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 491 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = 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 (_tmp30_, "page-created", (GCallback) _sidebar_tree_on_sidebar_page_created_sidebar_page_representative_page_created, self, 0);
-#line 493 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 492 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp31_ = pageable;
-#line 493 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 492 "/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 3249 "Tree.c"
+#line 3258 "Tree.c"
 	}
-#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = entry;
-#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 495 "/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 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 495 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable = _tmp33_;
-#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = emphasizable;
-#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 496 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp34_ != NULL) {
-#line 3261 "Tree.c"
+#line 3270 "Tree.c"
 		SidebarEmphasizableEntry* _tmp35_ = NULL;
-#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 497 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp35_ = emphasizable;
-#line 498 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 497 "/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 3267 "Tree.c"
+#line 3276 "Tree.c"
 	}
-#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = entry;
-#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 499 "/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 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 499 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp37_;
-#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = renameable;
-#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 500 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp38_ != NULL) {
-#line 3279 "Tree.c"
+#line 3288 "Tree.c"
 		SidebarRenameableEntry* _tmp39_ = NULL;
-#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 501 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp39_ = renameable;
-#line 502 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 501 "/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 3285 "Tree.c"
+#line 3294 "Tree.c"
 	}
-#line 504 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = entry;
-#line 504 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 503 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_entry_grafted (_tmp40_, self);
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable);
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (pageable);
-#line 476 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 475 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 3299 "Tree.c"
+#line 3308 "Tree.c"
 }
 
 
@@ -3330,97 +3339,97 @@ static SidebarTreeEntryWrapper* sidebar_tree_reparent_wrapper (SidebarTree* self
 	GtkTreeStore* _tmp23_ = NULL;
 	GtkTreeIter _tmp24_ = {0};
 	GtkTreeIter _tmp25_ = {0};
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (new_iter != NULL, NULL);
-#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 506 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (current_wrapper), NULL);
-#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = current_wrapper;
-#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 508 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 507 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp2_;
-#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->entry_map;
-#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 509 "/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 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 509 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp4_;
-#line 511 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 510 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (removed, "removed");
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = self->priv->store;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->store;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = *new_iter;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/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 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _tmp8_;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/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 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = _tmp10_;
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp9_);
-#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 512 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_wrapper = _tmp11_;
-#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = self->priv->entry_map;
-#line 514 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 513 "/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 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->store;
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = *new_iter;
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = sidebar_tree_get_name_for_entry (self, entry);
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = _tmp15_;
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp13_, &_tmp14_, SIDEBAR_TREE_COLUMNS_NAME, _tmp16_, -1);
-#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 515 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp16_);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = self->priv->store;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = *new_iter;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = sidebar_entry_get_sidebar_tooltip (entry);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = _tmp19_;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = guarded_markup_escape_text (_tmp20_);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = _tmp21_;
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp17_, &_tmp18_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp22_, -1);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp22_);
-#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 516 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp20_);
-#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = self->priv->store;
-#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = *new_iter;
-#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 517 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp23_, &_tmp24_, SIDEBAR_TREE_COLUMNS_WRAPPER, new_wrapper, -1);
-#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = *new_iter;
-#line 519 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 518 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp25_);
-#line 521 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = new_wrapper;
-#line 521 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 521 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 520 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 3424 "Tree.c"
+#line 3433 "Tree.c"
 }
 
 
@@ -3450,91 +3459,91 @@ void sidebar_tree_prune (SidebarTree* self, SidebarBranch* branch) {
 	SidebarBranch* _tmp22_ = NULL;
 	gboolean _tmp23_ = FALSE;
 	SidebarBranch* _tmp24_ = NULL;
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 523 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->branches;
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = branch;
-#line 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 524 "/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 525 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 524 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_, "branches.has_key(branch)");
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = branch;
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_branch_get_root (_tmp3_);
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = sidebar_tree_has_wrapper (self, _tmp5_);
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = _tmp6_;
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp5_);
-#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 526 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 3480 "Tree.c"
+#line 3489 "Tree.c"
 		SidebarBranch* _tmp8_ = NULL;
-#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = branch;
-#line 528 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 527 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_disassociate_branch (self, _tmp8_);
-#line 3486 "Tree.c"
+#line 3495 "Tree.c"
 	}
-#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 529 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = 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-added", SIDEBAR_TYPE_BRANCH, &_tmp10_, 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 (_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 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 530 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = 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-removed", SIDEBAR_TYPE_BRANCH, &_tmp12_, 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 (_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 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 531 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = 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-moved", SIDEBAR_TYPE_BRANCH, &_tmp14_, 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 (_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 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 532 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = 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 ("entry-reparented", SIDEBAR_TYPE_BRANCH, &_tmp16_, 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 (_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 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 533 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = 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 ("children-reordered", SIDEBAR_TYPE_BRANCH, &_tmp18_, 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 (_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 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = branch;
-#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 534 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("show-branch", SIDEBAR_TYPE_BRANCH, &_tmp20_, NULL, FALSE);
-#line 535 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 534 "/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 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = self->priv->branches;
-#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = branch;
-#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 536 "/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 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 536 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp23_;
-#line 538 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 537 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (removed, "removed");
-#line 540 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = branch;
-#line 540 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 539 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "branch-removed", _tmp24_);
-#line 3538 "Tree.c"
+#line 3547 "Tree.c"
 }
 
 
@@ -3546,39 +3555,39 @@ static void sidebar_tree_disassociate_branch (SidebarTree* self, SidebarBranch*
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	SidebarTreeRootWrapper* _tmp4_ = NULL;
 	SidebarTreeRootWrapper* _tmp5_ = NULL;
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_branch_get_root (_tmp0_);
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper (self, _tmp2_);
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, SIDEBAR_TREE_TYPE_ROOT_WRAPPER) ? ((SidebarTreeRootWrapper*) _tmp3_) : NULL;
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_ == NULL) {
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_tmp3_);
-#line 3568 "Tree.c"
+#line 3577 "Tree.c"
 	}
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp2_);
-#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	root_wrapper = _tmp5_;
-#line 545 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 544 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (root_wrapper != NULL, "root_wrapper != null");
-#line 547 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 546 "/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 543 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 542 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (root_wrapper);
-#line 3582 "Tree.c"
+#line 3591 "Tree.c"
 }
 
 
@@ -3590,54 +3599,54 @@ static void sidebar_tree_disassociate_wrapper_and_signal (SidebarTree* self, Sid
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
 	gboolean _tmp5_ = FALSE;
-#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 551 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = wrapper;
-#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->entry;
-#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_tree_is_selected (self, _tmp1_);
-#line 553 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 552 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selected = _tmp2_;
-#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = only_children;
-#line 555 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 554 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper (self, _tmp3_, _tmp4_);
-#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = selected;
-#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 3616 "Tree.c"
+#line 3625 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
 		SidebarTreeEntryWrapper* _tmp6_ = NULL;
 		SidebarEntry* _tmp7_ = NULL;
 		SidebarSelectableEntry* _tmp8_ = NULL;
 		SidebarSelectableEntry* _tmp9_ = NULL;
 		SidebarSelectableEntry* _tmp10_ = NULL;
-#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = wrapper;
-#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp6_->entry;
-#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/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 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selectable = _tmp8_;
-#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = selectable;
-#line 559 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 558 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp9_ != NULL, "selectable != null");
-#line 561 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = selectable;
-#line 561 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 560 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_emit_by_name (self, "selected-entry-removed", _tmp10_);
-#line 557 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 556 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 3641 "Tree.c"
+#line 3650 "Tree.c"
 	}
 }
 
@@ -3685,29 +3694,29 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 	SidebarEntry* _tmp58_ = NULL;
 	gboolean _tmp59_ = FALSE;
 	gboolean _tmp60_ = FALSE;
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_TREE_IS_ENTRY_WRAPPER (wrapper));
-#line 566 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gee_array_list_new (SIDEBAR_TREE_TYPE_ENTRY_WRAPPER, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL);
-#line 566 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp0_;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp2_, &_tmp3_);
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/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 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	child_iter = _tmp4_;
-#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 568 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	found = _tmp5_;
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	while (TRUE) {
-#line 3711 "Tree.c"
+#line 3720 "Tree.c"
 		gboolean _tmp6_ = FALSE;
 		SidebarTreeEntryWrapper* child_wrapper = NULL;
 		GtkTreeIter _tmp7_ = {0};
@@ -3717,39 +3726,39 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		SidebarTreeEntryWrapper* _tmp11_ = NULL;
 		GtkTreeStore* _tmp12_ = NULL;
 		gboolean _tmp13_ = FALSE;
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = found;
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (!_tmp6_) {
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			break;
-#line 3727 "Tree.c"
+#line 3736 "Tree.c"
 		}
-#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = child_iter;
-#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp7_);
-#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		child_wrapper = _tmp8_;
-#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = child_wrapper;
-#line 572 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 571 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp9_ != NULL, "child_wrapper != null");
-#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = children;
-#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 573 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = child_wrapper;
-#line 574 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 573 "/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 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 575 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = self->priv->store;
-#line 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 575 "/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 576 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 575 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		found = _tmp13_;
-#line 570 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 569 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (child_wrapper);
-#line 3753 "Tree.c"
+#line 3762 "Tree.c"
 	}
 	{
 		GeeArrayList* _child_wrapper_list = NULL;
@@ -3760,25 +3769,25 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 		gint _tmp17_ = 0;
 		gint _tmp18_ = 0;
 		gint _child_wrapper_index = 0;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = children;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = _g_object_ref0 (_tmp14_);
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_list = _tmp15_;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = _child_wrapper_list;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp17_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp18_ = _tmp17_;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_size = _tmp18_;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_wrapper_index = -1;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 3782 "Tree.c"
+#line 3791 "Tree.c"
 			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
 			gint _tmp21_ = 0;
@@ -3787,188 +3796,188 @@ static void sidebar_tree_disassociate_wrapper (SidebarTree* self, SidebarTreeEnt
 			gint _tmp23_ = 0;
 			gpointer _tmp24_ = NULL;
 			SidebarTreeEntryWrapper* _tmp25_ = NULL;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _child_wrapper_index;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_wrapper_index = _tmp19_ + 1;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = _child_wrapper_index;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = _child_wrapper_size;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp20_ < _tmp21_)) {
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 3803 "Tree.c"
+#line 3812 "Tree.c"
 			}
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp22_ = _child_wrapper_list;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = _child_wrapper_index;
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/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 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_wrapper = (SidebarTreeEntryWrapper*) _tmp24_;
-#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = child_wrapper;
-#line 580 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-			sidebar_tree_disassociate_wrapper (self, _tmp25_, FALSE);
 #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"
 			_g_object_unref0 (child_wrapper);
-#line 3819 "Tree.c"
+#line 3828 "Tree.c"
 		}
-#line 579 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 578 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_wrapper_list);
-#line 3823 "Tree.c"
+#line 3832 "Tree.c"
 	}
-#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = only_children;
-#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 581 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp26_) {
-#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 583 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 582 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 3833 "Tree.c"
+#line 3842 "Tree.c"
 	}
-#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = wrapper;
-#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp27_, &_tmp28_);
-#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 584 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp28_;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = self->priv->store;
-#line 586 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 585 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_remove (_tmp29_, &iter);
-#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = self->priv->selected_wrapper;
-#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = wrapper;
-#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 587 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp30_ == _tmp31_) {
-#line 589 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 588 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->selected_wrapper = NULL;
-#line 3853 "Tree.c"
+#line 3862 "Tree.c"
 	}
-#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = wrapper;
-#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = _tmp32_->entry;
-#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = _g_object_ref0 (_tmp33_);
-#line 591 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 590 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry = _tmp34_;
-#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 592 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp35_ = entry;
-#line 593 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 592 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_entry_pruned (_tmp35_, self);
-#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 594 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = 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-tooltip-changed", SIDEBAR_TYPE_ENTRY, &_tmp37_, 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 (_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 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = entry;
-#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 595 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("sidebar-icon-changed", SIDEBAR_TYPE_ENTRY, &_tmp39_, NULL, FALSE);
-#line 596 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 595 "/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 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = entry;
-#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 597 "/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 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 597 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pageable = _tmp41_;
-#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp42_ = pageable;
-#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 598 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp42_ != NULL) {
-#line 3889 "Tree.c"
+#line 3898 "Tree.c"
 		SidebarPageRepresentative* _tmp43_ = NULL;
 		guint _tmp44_ = 0U;
 		SidebarPageRepresentative* _tmp45_ = NULL;
 		guint _tmp46_ = 0U;
-#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 599 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = 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 ("page-created", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp44_, 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 (_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 601 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp45_ = pageable;
-#line 601 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 600 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("destroying-page", SIDEBAR_TYPE_PAGE_REPRESENTATIVE, &_tmp46_, NULL, FALSE);
-#line 601 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 600 "/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 3906 "Tree.c"
+#line 3915 "Tree.c"
 	}
-#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp47_ = entry;
-#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 603 "/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 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 603 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp48_;
-#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp49_ = renameable;
-#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 604 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp49_ != NULL) {
-#line 3918 "Tree.c"
+#line 3927 "Tree.c"
 		SidebarRenameableEntry* _tmp50_ = NULL;
 		guint _tmp51_ = 0U;
-#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp50_ = renameable;
-#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 605 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("sidebar-name-changed", SIDEBAR_TYPE_RENAMEABLE_ENTRY, &_tmp51_, NULL, FALSE);
-#line 606 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 605 "/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 3927 "Tree.c"
+#line 3936 "Tree.c"
 	}
-#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp52_ = entry;
-#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 607 "/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 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 607 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	emphasizable = _tmp53_;
-#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp54_ = emphasizable;
-#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 608 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp54_ != NULL) {
-#line 3939 "Tree.c"
+#line 3948 "Tree.c"
 		SidebarEmphasizableEntry* _tmp55_ = NULL;
 		guint _tmp56_ = 0U;
-#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp55_ = emphasizable;
-#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 609 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_parse_name ("is-emphasized-changed", SIDEBAR_TYPE_EMPHASIZABLE_ENTRY, &_tmp56_, NULL, FALSE);
-#line 610 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 609 "/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 3948 "Tree.c"
+#line 3957 "Tree.c"
 	}
-#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp57_ = self->priv->entry_map;
-#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = entry;
-#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 611 "/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 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 611 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	removed = _tmp59_;
-#line 613 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp60_ = removed;
-#line 613 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 612 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp60_, "removed");
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (emphasizable);
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (pageable);
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (entry);
-#line 565 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 564 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 3972 "Tree.c"
+#line 3981 "Tree.c"
 }
 
 
@@ -3995,47 +4004,47 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 	GtkTreeIter _tmp27_ = {0};
 	SidebarBranch* _tmp28_ = NULL;
 	gboolean _tmp29_ = FALSE;
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_parent (_tmp0_, _tmp1_);
-#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent = _tmp2_;
-#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = parent;
-#line 618 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 617 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp3_ != NULL, "parent != null");
-#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = parent;
-#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = sidebar_tree_get_wrapper (self, _tmp4_);
-#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 619 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent_wrapper = _tmp5_;
-#line 621 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = parent_wrapper;
-#line 621 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 620 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp6_ != NULL, "parent_wrapper != null");
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = branch;
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = entry;
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = sidebar_branch_get_next_sibling (_tmp7_, _tmp8_);
-#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 623 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	next = _tmp9_;
-#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = next;
-#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp10_ != NULL) {
-#line 4039 "Tree.c"
+#line 4048 "Tree.c"
 		SidebarTreeEntryWrapper* next_wrapper = NULL;
 		SidebarEntry* _tmp11_ = NULL;
 		SidebarTreeEntryWrapper* _tmp12_ = NULL;
@@ -4045,81 +4054,81 @@ static void sidebar_tree_on_branch_entry_added (SidebarTree* self, SidebarBranch
 		SidebarTreeEntryWrapper* _tmp16_ = NULL;
 		GtkTreeIter _tmp17_ = {0};
 		GtkTreeIter _tmp18_ = {0};
-#line 626 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = next;
-#line 626 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = sidebar_tree_get_wrapper (self, _tmp11_);
-#line 626 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		next_wrapper = _tmp12_;
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = self->priv->store;
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = parent_wrapper;
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_);
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = next_wrapper;
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp16_, &_tmp17_);
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_insert_before (_tmp13_, &_tmp18_, &_tmp15_, &_tmp17_);
-#line 629 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 628 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp18_;
-#line 625 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 624 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (next_wrapper);
-#line 4071 "Tree.c"
+#line 4080 "Tree.c"
 	} else {
 		GtkTreeStore* _tmp19_ = NULL;
 		SidebarTreeEntryWrapper* _tmp20_ = NULL;
 		GtkTreeIter _tmp21_ = {0};
 		GtkTreeIter _tmp22_ = {0};
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp19_ = self->priv->store;
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = parent_wrapper;
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp20_, &_tmp21_);
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_store_append (_tmp19_, &_tmp22_, &_tmp21_);
-#line 632 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 631 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		insertion_iter = _tmp22_;
-#line 4087 "Tree.c"
+#line 4096 "Tree.c"
 	}
-#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = insertion_iter;
-#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = entry;
-#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 634 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_entry (self, &_tmp23_, _tmp24_);
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp25_ = branch;
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp26_ = entry;
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = insertion_iter;
-#line 636 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 635 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_associate_children (self, _tmp25_, _tmp26_, &_tmp27_);
-#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp28_ = branch;
-#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp29_ = sidebar_branch_is_auto_open_on_new_child (_tmp28_);
-#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 637 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp29_) {
-#line 4109 "Tree.c"
+#line 4118 "Tree.c"
 		SidebarEntry* _tmp30_ = NULL;
-#line 639 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = entry;
-#line 639 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 638 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_expand_to_entry (self, _tmp30_);
-#line 4115 "Tree.c"
+#line 4124 "Tree.c"
 	}
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (next);
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent_wrapper);
-#line 616 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 615 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent);
-#line 4123 "Tree.c"
+#line 4132 "Tree.c"
 }
 
 
@@ -4127,27 +4136,27 @@ static void sidebar_tree_on_branch_entry_removed (SidebarTree* self, SidebarBran
 	SidebarTreeEntryWrapper* wrapper = NULL;
 	SidebarEntry* _tmp0_ = NULL;
 	SidebarTreeEntryWrapper* _tmp1_ = NULL;
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 644 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 643 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 645 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 644 "/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 647 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 646 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_disassociate_wrapper_and_signal (self, wrapper, FALSE);
-#line 642 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 641 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4151 "Tree.c"
+#line 4160 "Tree.c"
 }
 
 
@@ -4168,41 +4177,41 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 	GtkTreeIter _tmp15_ = {0};
 	GtkTreeStore* _tmp16_ = NULL;
 	GtkTreeIter* _tmp17_ = NULL;
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 651 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_ != NULL, "wrapper != null");
-#line 653 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 652 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 653 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 652 "/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 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 655 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev_iter = NULL;
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = branch;
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = entry;
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = sidebar_branch_get_previous_sibling (_tmp4_, _tmp5_);
-#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 656 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev = _tmp6_;
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = prev;
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_ != NULL) {
-#line 4206 "Tree.c"
+#line 4215 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
 		SidebarEntry* _tmp8_ = NULL;
 		SidebarTreeEntryWrapper* _tmp9_ = NULL;
@@ -4210,49 +4219,49 @@ static void sidebar_tree_on_branch_entry_moved (SidebarTree* self, SidebarBranch
 		SidebarTreeEntryWrapper* _tmp11_ = NULL;
 		GtkTreeIter _tmp12_ = {0};
 		GtkTreeIter* _tmp13_ = NULL;
-#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = prev;
-#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = sidebar_tree_get_wrapper (self, _tmp8_);
-#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_wrapper = _tmp9_;
-#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = prev_wrapper;
-#line 660 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 659 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp10_ != NULL, "prev_wrapper != null");
-#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = prev_wrapper;
-#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_);
-#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = __gtk_tree_iter_dup0 (&_tmp12_);
-#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (prev_iter);
-#line 662 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 661 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_iter = _tmp13_;
-#line 658 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 657 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4236 "Tree.c"
+#line 4245 "Tree.c"
 	}
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = wrapper;
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp14_, &_tmp15_);
-#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 664 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	entry_iter = _tmp15_;
-#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = self->priv->store;
-#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = prev_iter;
-#line 666 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 665 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_move_after (_tmp16_, &entry_iter, _tmp17_);
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (prev);
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (prev_iter);
-#line 650 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 649 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4256 "Tree.c"
+#line 4265 "Tree.c"
 }
 
 
@@ -4300,95 +4309,95 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 	SidebarTreeEntryWrapper* _tmp37_ = NULL;
 	SidebarTreeEntryWrapper* _tmp38_ = NULL;
 	gboolean _tmp39_ = FALSE;
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (old_parent));
-#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 670 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 671 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp2_ != NULL, "wrapper != null");
-#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 672 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 673 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 672 "/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 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_get_current_path (self);
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = wrapper;
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = sidebar_tree_entry_wrapper_get_path (_tmp6_);
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_;
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = gtk_tree_path_compare (_tmp5_, _tmp8_);
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = _tmp9_ == 0;
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp8_);
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 675 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 674 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selected = _tmp10_;
-#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = wrapper;
-#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp11_, &_tmp12_);
-#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 677 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	iter = _tmp12_;
-#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->store;
-#line 679 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 678 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_remove (_tmp13_, &iter);
-#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = branch;
-#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = entry;
-#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = sidebar_branch_get_parent (_tmp14_, _tmp15_);
-#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 680 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent = _tmp16_;
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = parent;
-#line 682 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 681 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp17_ != NULL, "parent != null");
-#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = parent;
-#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = sidebar_tree_get_wrapper (self, _tmp18_);
-#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 683 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	parent_wrapper = _tmp19_;
-#line 685 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp20_ = parent_wrapper;
-#line 685 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 684 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp20_ != NULL, "parent_wrapper != null");
-#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 687 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev_iter = NULL;
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp21_ = branch;
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp22_ = entry;
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp23_ = sidebar_branch_get_previous_sibling (_tmp21_, _tmp22_);
-#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 688 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	prev = _tmp23_;
-#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp24_ = prev;
-#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp24_ != NULL) {
-#line 4392 "Tree.c"
+#line 4401 "Tree.c"
 		SidebarTreeEntryWrapper* prev_wrapper = NULL;
 		SidebarEntry* _tmp25_ = NULL;
 		SidebarTreeEntryWrapper* _tmp26_ = NULL;
@@ -4396,86 +4405,86 @@ static void sidebar_tree_on_branch_entry_reparented (SidebarTree* self, SidebarB
 		SidebarTreeEntryWrapper* _tmp28_ = NULL;
 		GtkTreeIter _tmp29_ = {0};
 		GtkTreeIter* _tmp30_ = NULL;
-#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = prev;
-#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = sidebar_tree_get_wrapper (self, _tmp25_);
-#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_wrapper = _tmp26_;
-#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp27_ = prev_wrapper;
-#line 692 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 691 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_vala_assert (_tmp27_ != NULL, "prev_wrapper != null");
-#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = prev_wrapper;
-#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_entry_wrapper_get_iter (_tmp28_, &_tmp29_);
-#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp30_ = __gtk_tree_iter_dup0 (&_tmp29_);
-#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_free0 (prev_iter);
-#line 694 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 693 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		prev_iter = _tmp30_;
-#line 690 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 689 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (prev_wrapper);
-#line 4422 "Tree.c"
+#line 4431 "Tree.c"
 	}
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = self->priv->store;
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp32_ = parent_wrapper;
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (_tmp32_, &_tmp33_);
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp34_ = prev_iter;
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_insert_after (_tmp31_, &_tmp35_, &_tmp33_, _tmp34_);
-#line 698 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 697 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_iter = _tmp35_;
-#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = new_iter;
-#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = wrapper;
-#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = sidebar_tree_reparent_wrapper (self, &_tmp36_, _tmp37_);
-#line 700 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 699 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	new_wrapper = _tmp38_;
-#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = selected;
-#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 701 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp39_) {
-#line 4448 "Tree.c"
+#line 4457 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp40_ = NULL;
 		SidebarEntry* _tmp41_ = NULL;
 		SidebarTreeEntryWrapper* _tmp42_ = NULL;
 		SidebarEntry* _tmp43_ = NULL;
-#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp40_ = new_wrapper;
-#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp41_ = _tmp40_->entry;
-#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 702 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_expand_to_entry (self, _tmp41_);
-#line 704 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp42_ = new_wrapper;
-#line 704 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = _tmp42_->entry;
-#line 704 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 703 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_place_cursor (self, _tmp43_, FALSE);
-#line 4465 "Tree.c"
+#line 4474 "Tree.c"
 	}
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (new_wrapper);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (prev);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (prev_iter);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent_wrapper);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (parent);
-#line 669 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 668 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4479 "Tree.c"
+#line 4488 "Tree.c"
 }
 
 
@@ -4485,29 +4494,29 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 	SidebarEntry* _tmp1_ = NULL;
 	GeeList* _tmp2_ = NULL;
 	GeeList* _tmp3_ = NULL;
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = branch;
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = entry;
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_branch_get_children (_tmp0_, _tmp1_);
-#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	children = _tmp2_;
-#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = children;
-#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 709 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 711 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (children);
-#line 711 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 710 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4511 "Tree.c"
+#line 4520 "Tree.c"
 	}
 	{
 		GeeList* _child_list = NULL;
@@ -4518,25 +4527,25 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 		gint _tmp7_ = 0;
 		gint _tmp8_ = 0;
 		gint _child_index = 0;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = children;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _g_object_ref0 (_tmp4_);
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_list = _tmp5_;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _child_list;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp7_;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_size = _tmp8_;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_child_index = -1;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		while (TRUE) {
-#line 4540 "Tree.c"
+#line 4549 "Tree.c"
 			gint _tmp9_ = 0;
 			gint _tmp10_ = 0;
 			gint _tmp11_ = 0;
@@ -4552,61 +4561,61 @@ static void sidebar_tree_on_branch_children_reordered (SidebarTree* self, Sideba
 			SidebarTreeEntryWrapper* _tmp18_ = NULL;
 			GtkTreeIter _tmp19_ = {0};
 			GtkTreeStore* _tmp20_ = NULL;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = _child_index;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_child_index = _tmp9_ + 1;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = _child_index;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = _child_size;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (!(_tmp10_ < _tmp11_)) {
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				break;
-#line 4568 "Tree.c"
+#line 4577 "Tree.c"
 			}
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = _child_list;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = _child_index;
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = gee_list_get (_tmp12_, _tmp13_);
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child = (SidebarEntry*) _tmp14_;
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = child;
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp16_ = sidebar_tree_get_wrapper (self, _tmp15_);
-#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_wrapper = _tmp16_;
-#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp17_ = child_wrapper;
-#line 717 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 716 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_vala_assert (_tmp17_ != NULL, "child_wrapper != null");
-#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = child_wrapper;
-#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_entry_wrapper_get_iter (_tmp18_, &_tmp19_);
-#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 718 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			child_iter = _tmp19_;
-#line 720 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = self->priv->store;
-#line 720 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 719 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_tree_store_move_before (_tmp20_, &child_iter, NULL);
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child_wrapper);
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (child);
-#line 4602 "Tree.c"
+#line 4611 "Tree.c"
 		}
-#line 715 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 714 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (_child_list);
-#line 4606 "Tree.c"
+#line 4615 "Tree.c"
 	}
-#line 708 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 707 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (children);
-#line 4610 "Tree.c"
+#line 4619 "Tree.c"
 }
 
 
@@ -4614,36 +4623,36 @@ static void sidebar_tree_on_show_branch (SidebarTree* self, SidebarBranch* branc
 	gboolean _tmp0_ = FALSE;
 	SidebarBranch* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 723 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (branch));
-#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = shown;
-#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 724 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_) {
-#line 4626 "Tree.c"
+#line 4635 "Tree.c"
 		SidebarBranch* _tmp1_ = NULL;
-#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = branch;
-#line 726 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 725 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_associate_branch (self, _tmp1_);
-#line 4632 "Tree.c"
+#line 4641 "Tree.c"
 	} else {
 		SidebarBranch* _tmp2_ = NULL;
-#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = branch;
-#line 728 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 727 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		sidebar_tree_disassociate_branch (self, _tmp2_);
-#line 4639 "Tree.c"
+#line 4648 "Tree.c"
 	}
-#line 730 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = branch;
-#line 730 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = shown;
-#line 730 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 729 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "branch-shown", _tmp3_, _tmp4_);
-#line 4647 "Tree.c"
+#line 4656 "Tree.c"
 }
 
 
@@ -4656,35 +4665,35 @@ static void sidebar_tree_on_sidebar_tooltip_changed (SidebarTree* self, SidebarE
 	const gchar* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 735 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 734 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->store;
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = tooltip;
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = guarded_markup_escape_text (_tmp4_);
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_TOOLTIP, _tmp6_, -1);
-#line 737 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 736 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp6_);
-#line 733 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 732 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4688 "Tree.c"
+#line 4697 "Tree.c"
 }
 
 
@@ -4695,29 +4704,29 @@ static void sidebar_tree_on_sidebar_icon_changed (SidebarTree* self, SidebarEntr
 	GtkTreeStore* _tmp2_ = NULL;
 	GtkTreeIter _tmp3_ = {0};
 	const gchar* _tmp4_ = NULL;
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 742 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 741 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->store;
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = icon;
-#line 744 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 743 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_ICON, _tmp4_, -1);
-#line 740 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 739 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4721 "Tree.c"
+#line 4730 "Tree.c"
 }
 
 
@@ -4730,103 +4739,103 @@ static void sidebar_tree_rename_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarEntry* _tmp4_ = NULL;
 	gchar* _tmp5_ = NULL;
 	gchar* _tmp6_ = NULL;
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 749 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 748 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (wrapper != NULL, "wrapper != null");
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = self->priv->store;
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_entry_wrapper_get_iter (wrapper, &_tmp3_);
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = entry;
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = sidebar_tree_get_name_for_entry (self, _tmp4_);
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp2_, &_tmp3_, SIDEBAR_TREE_COLUMNS_NAME, _tmp6_, -1);
-#line 751 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 750 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp6_);
-#line 747 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 746 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4762 "Tree.c"
+#line 4771 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_name_changed (SidebarTree* self, SidebarEntry* entry, const gchar* name) {
 	SidebarEntry* _tmp0_ = NULL;
-#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
-#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 753 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (name != NULL);
-#line 755 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 755 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 754 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_rename_entry (self, _tmp0_);
-#line 4778 "Tree.c"
+#line 4787 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_page_created (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
 	SidebarPageRepresentative* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 757 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = page;
-#line 759 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 758 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "page-created", _tmp0_, _tmp1_);
-#line 4797 "Tree.c"
+#line 4806 "Tree.c"
 }
 
 
 static void sidebar_tree_on_is_emphasized_changed (SidebarTree* self, SidebarEmphasizableEntry* entry, gboolean is_emphasized) {
 	SidebarEmphasizableEntry* _tmp0_ = NULL;
-#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 761 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_EMPHASIZABLE_ENTRY (entry));
-#line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 763 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 762 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_rename_entry (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, SIDEBAR_TYPE_ENTRY, SidebarEntry));
-#line 4811 "Tree.c"
+#line 4820 "Tree.c"
 }
 
 
 static void sidebar_tree_on_sidebar_destroying_page (SidebarTree* self, SidebarPageRepresentative* entry, Page* page) {
 	SidebarPageRepresentative* _tmp0_ = NULL;
 	Page* _tmp1_ = NULL;
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_PAGE_REPRESENTATIVE (entry));
-#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 765 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (IS_PAGE (page));
-#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = page;
-#line 767 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 766 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_emit_by_name (self, "destroying-page", _tmp0_, _tmp1_);
-#line 4830 "Tree.c"
+#line 4839 "Tree.c"
 }
 
 
@@ -4842,47 +4851,47 @@ static void sidebar_tree_load_entry_icons (SidebarTree* self, GtkTreeIter* iter)
 	GtkTreeStore* _tmp6_ = NULL;
 	GtkTreeIter _tmp7_ = {0};
 	const gchar* _tmp8_ = NULL;
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (iter != NULL);
-#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_);
-#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 771 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 772 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 4864 "Tree.c"
+#line 4873 "Tree.c"
 	}
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = sidebar_entry_get_sidebar_icon (_tmp4_);
-#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 773 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	icon = _tmp5_;
-#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = self->priv->store;
-#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = *iter;
-#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = icon;
-#line 775 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 774 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_store_set (_tmp6_, &_tmp7_, SIDEBAR_TREE_COLUMNS_ICON, _tmp8_, -1);
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (icon);
-#line 770 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 769 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 4886 "Tree.c"
+#line 4895 "Tree.c"
 }
 
 
@@ -4893,56 +4902,56 @@ static void sidebar_tree_load_branch_icons (SidebarTree* self, GtkTreeIter* iter
 	GtkTreeIter _tmp2_ = {0};
 	GtkTreeIter _tmp3_ = {0};
 	gboolean _tmp4_ = FALSE;
-#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 777 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (iter != NULL);
-#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 779 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 778 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_load_entry_icons (self, &_tmp0_);
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->store;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = *iter;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 781 "/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 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	child_iter = _tmp3_;
-#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 781 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 4915 "Tree.c"
+#line 4924 "Tree.c"
 		{
 			gboolean _tmp5_ = FALSE;
-#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp5_ = TRUE;
-#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			while (TRUE) {
-#line 4922 "Tree.c"
+#line 4931 "Tree.c"
 				GtkTreeIter _tmp8_ = {0};
-#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (!_tmp5_) {
-#line 4926 "Tree.c"
+#line 4935 "Tree.c"
 					GtkTreeStore* _tmp6_ = NULL;
 					gboolean _tmp7_ = FALSE;
-#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp6_ = self->priv->store;
-#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 784 "/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 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					if (!_tmp7_) {
-#line 785 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 						break;
-#line 4937 "Tree.c"
+#line 4946 "Tree.c"
 					}
 				}
-#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 782 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp5_ = FALSE;
-#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp8_ = child_iter;
-#line 784 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 783 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_load_branch_icons (self, &_tmp8_);
-#line 4946 "Tree.c"
+#line 4955 "Tree.c"
 			}
 		}
 	}
@@ -4956,46 +4965,46 @@ static gboolean sidebar_tree_on_selection (SidebarTree* self, GtkTreeSelection*
 	SidebarTreeEntryWrapper* _tmp1_ = NULL;
 	gboolean _tmp2_ = FALSE;
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_SELECTION (selection), FALSE);
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
-#line 789 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 788 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 792 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 791 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ != NULL) {
-#line 4978 "Tree.c"
+#line 4987 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp4_ = NULL;
 		SidebarEntry* _tmp5_ = NULL;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = wrapper;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp4_->entry;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp5_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 4987 "Tree.c"
+#line 4996 "Tree.c"
 	} else {
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 4991 "Tree.c"
+#line 5000 "Tree.c"
 	}
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp2_;
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 794 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 793 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 4999 "Tree.c"
+#line 5008 "Tree.c"
 }
 
 
@@ -5023,65 +5032,65 @@ static GtkTreePath* sidebar_tree_get_path_from_event (SidebarTree* self, GdkEven
 	gint _tmp13_ = 0;
 	gboolean _tmp14_ = FALSE;
 	GtkTreePath* _tmp16_ = NULL;
-#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 797 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 796 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, NULL);
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->window;
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_display_get_default ();
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = gdk_display_get_device_manager (_tmp2_);
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = gdk_device_manager_get_client_pointer (_tmp3_);
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gdk_window_get_device_position (_tmp1_, _tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	x = _tmp5_;
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	y = _tmp6_;
-#line 800 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 799 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	mask = _tmp7_;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = x;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = y;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/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 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp11_;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cell_x = _tmp12_;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cell_y = _tmp13_;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp14_) {
-#line 5065 "Tree.c"
+#line 5074 "Tree.c"
 		GtkTreePath* _tmp15_ = NULL;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = path;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = _tmp15_;
-#line 5071 "Tree.c"
+#line 5080 "Tree.c"
 	} else {
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = NULL;
-#line 5075 "Tree.c"
+#line 5084 "Tree.c"
 	}
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = _gtk_tree_path_copy0 (_tmp8_);
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp16_;
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 805 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 804 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5085 "Tree.c"
+#line 5094 "Tree.c"
 }
 
 
@@ -5100,74 +5109,74 @@ static GtkTreePath* sidebar_tree_get_current_path (SidebarTree* self) {
 	GList* _tmp10_ = NULL;
 	guint _tmp11_ = 0U;
 	GtkTreePath* _tmp14_ = NULL;
-#line 808 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 807 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), NULL);
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/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 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gtk_tree_selection_get_selected_rows (_tmp0_, &_tmp1_);
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _g_object_ref0 (_tmp1_);
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	model = _tmp3_;
-#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 809 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp2_;
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = rows;
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = g_list_length (_tmp5_);
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == ((guint) 0)) {
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = TRUE;
-#line 5126 "Tree.c"
+#line 5135 "Tree.c"
 	} else {
 		GList* _tmp7_ = NULL;
 		guint _tmp8_ = 0U;
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = rows;
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = g_list_length (_tmp7_);
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = _tmp8_ == ((guint) 1);
-#line 5136 "Tree.c"
+#line 5145 "Tree.c"
 	}
-#line 811 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 810 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_vala_assert (_tmp4_, "rows.length() == 0 || rows.length() == 1");
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = rows;
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = g_list_length (_tmp10_);
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp11_ != ((guint) 0)) {
-#line 5146 "Tree.c"
+#line 5155 "Tree.c"
 		GList* _tmp12_ = NULL;
 		gconstpointer _tmp13_ = NULL;
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = rows;
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = g_list_nth_data (_tmp12_, (guint) 0);
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = (GtkTreePath*) _tmp13_;
-#line 5155 "Tree.c"
+#line 5164 "Tree.c"
 	} else {
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = NULL;
-#line 5159 "Tree.c"
+#line 5168 "Tree.c"
 	}
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = _gtk_tree_path_copy0 (_tmp9_);
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp14_;
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (model);
-#line 813 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 812 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5171 "Tree.c"
+#line 5180 "Tree.c"
 }
 
 
@@ -5185,65 +5194,65 @@ static gboolean sidebar_tree_on_context_menu_keypress (SidebarTree* self) {
 	GtkTreePath* _tmp7_ = NULL;
 	GtkTreePath* _tmp8_ = NULL;
 	gboolean _tmp9_ = FALSE;
-#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 815 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = gtk_tree_view_get_selection (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView));
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = gtk_tree_selection_get_selected_rows (_tmp0_, NULL);
-#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 816 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	rows = _tmp1_;
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = rows;
-#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 817 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 819 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 818 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5207 "Tree.c"
+#line 5216 "Tree.c"
 	}
-#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = rows;
-#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->data;
-#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _gtk_tree_path_copy0 ((GtkTreePath*) _tmp4_);
-#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 820 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp5_;
-#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = path;
-#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 821 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 823 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 822 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5229 "Tree.c"
+#line 5238 "Tree.c"
 	}
-#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 824 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = path;
-#line 825 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 824 "/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 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = path;
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = sidebar_tree_popup_context_menu (self, _tmp8_, NULL);
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp9_;
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	__g_list_free__gtk_tree_path_free0_0 (rows);
-#line 827 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 826 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5247 "Tree.c"
+#line 5256 "Tree.c"
 }
 
 
@@ -5271,157 +5280,157 @@ static gboolean sidebar_tree_popup_context_menu (SidebarTree* self, GtkTreePath*
 	GtkMenu* _tmp16_ = NULL;
 	GtkWidget* _tmp17_ = NULL;
 	GdkEventButton* _tmp19_ = NULL;
-#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 829 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 830 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 831 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 833 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 832 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5295 "Tree.c"
+#line 5304 "Tree.c"
 	}
-#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 834 "/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 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 834 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	contextable = _tmp5_;
-#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = contextable;
-#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 835 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (contextable);
-#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 837 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 836 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5317 "Tree.c"
+#line 5326 "Tree.c"
 	}
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = wrapper;
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_->entry;
-#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 839 "/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 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 839 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	selectable = _tmp9_;
-#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = selectable;
-#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 840 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp10_ != NULL) {
-#line 5331 "Tree.c"
+#line 5340 "Tree.c"
 		SidebarSelectableEntry* _tmp11_ = NULL;
-#line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = selectable;
-#line 842 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 841 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_emit_by_name (self, "entry-selected", _tmp11_);
-#line 5337 "Tree.c"
+#line 5346 "Tree.c"
 	}
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp12_ = contextable;
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = event;
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = sidebar_contextable_get_sidebar_context_menu (_tmp12_, _tmp13_);
-#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 843 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	context_menu = _tmp14_;
-#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = context_menu;
-#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 844 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp15_ == NULL) {
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (context_menu);
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (contextable);
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 846 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 845 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5363 "Tree.c"
+#line 5372 "Tree.c"
 	}
-#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context_menu;
-#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gtk_menu_get_attach_widget (_tmp16_);
-#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 847 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp17_ == NULL) {
-#line 5371 "Tree.c"
+#line 5380 "Tree.c"
 		GtkMenu* _tmp18_ = NULL;
-#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp18_ = context_menu;
-#line 849 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 848 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_attach_to_widget (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
-#line 5377 "Tree.c"
+#line 5386 "Tree.c"
 	}
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp19_ = event;
-#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 851 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp19_ != NULL) {
-#line 5383 "Tree.c"
+#line 5392 "Tree.c"
 		GtkMenu* _tmp20_ = NULL;
 		GdkEventButton* _tmp21_ = NULL;
 		guint _tmp22_ = 0U;
 		GdkEventButton* _tmp23_ = NULL;
 		guint32 _tmp24_ = 0U;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp20_ = context_menu;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp21_ = event;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = _tmp21_->button;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp23_ = event;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp24_ = _tmp23_->time;
-#line 853 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 852 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_popup (_tmp20_, NULL, NULL, NULL, NULL, _tmp22_, _tmp24_);
-#line 5401 "Tree.c"
+#line 5410 "Tree.c"
 	} else {
 		GtkMenu* _tmp25_ = NULL;
 		guint32 _tmp26_ = 0U;
-#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = context_menu;
-#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = gtk_get_current_event_time ();
-#line 855 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 854 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_menu_popup (_tmp25_, NULL, NULL, NULL, NULL, (guint) 0, _tmp26_);
-#line 5411 "Tree.c"
+#line 5420 "Tree.c"
 	}
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (context_menu);
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (selectable);
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (contextable);
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 857 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 856 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5425 "Tree.c"
+#line 5434 "Tree.c"
 }
 
 
@@ -5432,27 +5441,27 @@ static gboolean sidebar_tree_popup_default_context_menu (SidebarTree* self, GdkE
 	guint _tmp2_ = 0U;
 	GdkEventButton* _tmp3_ = NULL;
 	guint32 _tmp4_ = 0U;
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 859 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->default_context_menu;
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = event;
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_->button;
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = event;
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->time;
-#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 860 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_menu_popup (_tmp0_, NULL, NULL, NULL, NULL, _tmp2_, _tmp4_);
-#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 862 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 861 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5456 "Tree.c"
+#line 5465 "Tree.c"
 }
 
 
@@ -5469,129 +5478,129 @@ gboolean sidebar_tree_on_toggle_row (SidebarTree* self, GtkTreeIter* iter, GtkTr
 	GtkTreePath* _tmp6_ = NULL;
 	gboolean _tmp7_ = FALSE;
 	gboolean _tmp16_ = FALSE;
-#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
-#line 865 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 864 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = *iter;
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_iter (self, &_tmp0_);
-#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 866 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 867 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 869 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 868 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5495 "Tree.c"
+#line 5504 "Tree.c"
 	}
-#line 873 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->expander_called_manually;
-#line 873 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 872 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	should_allow_toggle = _tmp3_;
-#line 876 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 875 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self->priv->expander_called_manually = FALSE;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = path;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/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 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_) {
-#line 5509 "Tree.c"
+#line 5518 "Tree.c"
 		GtkTreeStore* _tmp8_ = NULL;
 		GtkTreeIter _tmp9_ = {0};
 		gboolean _tmp10_ = FALSE;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = self->priv->store;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = *iter;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/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 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp10_;
-#line 5521 "Tree.c"
+#line 5530 "Tree.c"
 	} else {
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = FALSE;
-#line 5525 "Tree.c"
+#line 5534 "Tree.c"
 	}
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_) {
-#line 5529 "Tree.c"
+#line 5538 "Tree.c"
 		SidebarTreeEntryWrapper* _tmp11_ = NULL;
 		SidebarEntry* _tmp12_ = NULL;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = wrapper;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = _tmp11_->entry;
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, SIDEBAR_TYPE_SELECTABLE_ENTRY);
-#line 5538 "Tree.c"
+#line 5547 "Tree.c"
 	} else {
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = FALSE;
-#line 5542 "Tree.c"
+#line 5551 "Tree.c"
 	}
-#line 879 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 878 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 5546 "Tree.c"
+#line 5555 "Tree.c"
 		gint _tmp13_ = 0;
 		gint _tmp14_ = 0;
-#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = self->priv->expander_special_count;
-#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 880 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = _tmp13_ + 1;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp14_ = self->priv->expander_special_count;
-#line 882 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 881 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp14_ == 1) {
-#line 884 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			result = TRUE;
-#line 884 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 884 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 883 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return result;
-#line 5563 "Tree.c"
+#line 5572 "Tree.c"
 		} else {
 			gboolean _tmp15_ = FALSE;
-#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = should_allow_toggle;
-#line 887 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 886 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			should_allow_toggle = !_tmp15_;
-#line 5570 "Tree.c"
+#line 5579 "Tree.c"
 		}
 	} else {
-#line 891 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 890 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->expander_special_count = 0;
-#line 5575 "Tree.c"
+#line 5584 "Tree.c"
 	}
-#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = should_allow_toggle;
-#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 893 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp16_) {
-#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 895 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 894 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5587 "Tree.c"
+#line 5596 "Tree.c"
 	}
-#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 898 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 897 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5595 "Tree.c"
+#line 5604 "Tree.c"
 }
 
 
@@ -5608,120 +5617,120 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 	guint _tmp8_ = 0U;
 	GdkEventButton* _tmp58_ = NULL;
 	gboolean _tmp59_ = FALSE;
-#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 900 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 902 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 902 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_path_from_event (self, _tmp0_);
-#line 902 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 901 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp1_;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = path;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 5626 "Tree.c"
+#line 5635 "Tree.c"
 		GdkEventButton* _tmp4_ = NULL;
 		guint _tmp5_ = 0U;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = event;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = _tmp4_->button;
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _tmp5_ != ((guint) 3);
-#line 5635 "Tree.c"
+#line 5644 "Tree.c"
 	} else {
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = FALSE;
-#line 5639 "Tree.c"
+#line 5648 "Tree.c"
 	}
-#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 904 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_) {
-#line 906 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
-#line 906 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 906 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 905 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 5649 "Tree.c"
+#line 5658 "Tree.c"
 	}
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = event;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = _tmp7_->button;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp8_ == ((guint) 3)) {
-#line 5657 "Tree.c"
+#line 5666 "Tree.c"
 		GdkEventButton* _tmp9_ = NULL;
 		GdkEventType _tmp10_ = 0;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = event;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = _tmp9_->type;
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = _tmp10_ == GDK_BUTTON_PRESS;
-#line 5666 "Tree.c"
+#line 5675 "Tree.c"
 	} else {
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = FALSE;
-#line 5670 "Tree.c"
+#line 5679 "Tree.c"
 	}
-#line 909 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 908 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_) {
-#line 5674 "Tree.c"
+#line 5683 "Tree.c"
 		GtkTreePath* _tmp11_ = NULL;
-#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = path;
-#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 910 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ != NULL) {
-#line 5680 "Tree.c"
+#line 5689 "Tree.c"
 			GtkTreePath* _tmp12_ = NULL;
 			GdkEventButton* _tmp13_ = NULL;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = path;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = event;
-#line 912 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 911 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_context_menu (self, _tmp12_, _tmp13_);
-#line 5689 "Tree.c"
+#line 5698 "Tree.c"
 		} else {
 			GdkEventButton* _tmp14_ = NULL;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = event;
-#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 913 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_tree_popup_default_context_menu (self, _tmp14_);
-#line 5696 "Tree.c"
+#line 5705 "Tree.c"
 		}
 	} else {
 		gboolean _tmp15_ = FALSE;
 		GdkEventButton* _tmp16_ = NULL;
 		guint _tmp17_ = 0U;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp16_ = event;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp17_ = _tmp16_->button;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp17_ == ((guint) 1)) {
-#line 5708 "Tree.c"
+#line 5717 "Tree.c"
 			GdkEventButton* _tmp18_ = NULL;
 			GdkEventType _tmp19_ = 0;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = event;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp19_ = _tmp18_->type;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = _tmp19_ == GDK_BUTTON_PRESS;
-#line 5717 "Tree.c"
+#line 5726 "Tree.c"
 		} else {
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp15_ = FALSE;
-#line 5721 "Tree.c"
+#line 5730 "Tree.c"
 		}
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp15_) {
-#line 5725 "Tree.c"
+#line 5734 "Tree.c"
 			GtkTreePath* _tmp20_ = NULL;
 			SidebarTreeEntryWrapper* wrapper = NULL;
 			GtkTreePath* _tmp23_ = NULL;
@@ -5739,226 +5748,226 @@ static gboolean sidebar_tree_real_button_press_event (GtkWidget* base, GdkEventB
 			GtkTreeStore* _tmp55_ = NULL;
 			GtkTreePath* _tmp56_ = NULL;
 			GtkTreeRowReference* _tmp57_ = NULL;
-#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = path;
-#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp20_ == NULL) {
-#line 5747 "Tree.c"
+#line 5756 "Tree.c"
 				GdkEventButton* _tmp21_ = NULL;
 				gboolean _tmp22_ = FALSE;
-#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 916 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp21_ = event;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/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 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp22_;
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 918 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 917 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5764 "Tree.c"
+#line 5773 "Tree.c"
 			}
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp23_ = path;
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp24_ = sidebar_tree_get_wrapper_at_path (self, _tmp23_);
-#line 921 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 920 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			wrapper = _tmp24_;
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp25_ = wrapper;
-#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 922 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp25_ == NULL) {
-#line 5776 "Tree.c"
+#line 5785 "Tree.c"
 				GdkEventButton* _tmp26_ = NULL;
 				gboolean _tmp27_ = FALSE;
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 923 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				self->priv->old_path_ref = NULL;
-#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp26_ = event;
-#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/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 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp27_;
-#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
-#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 925 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 924 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5795 "Tree.c"
+#line 5804 "Tree.c"
 			}
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp29_ = wrapper;
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp30_ = _tmp29_->entry;
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp30_, SIDEBAR_TYPE_EXPANDABLE_ENTRY)) {
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = TRUE;
-#line 5805 "Tree.c"
+#line 5814 "Tree.c"
 			} else {
 				SidebarTreeEntryWrapper* _tmp31_ = NULL;
 				SidebarEntry* _tmp32_ = NULL;
-#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp31_ = wrapper;
-#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp32_ = _tmp31_->entry;
-#line 930 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp28_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp32_, SIDEBAR_TYPE_INTERNAL_DROP_TARGET_ENTRY);
-#line 5815 "Tree.c"
+#line 5824 "Tree.c"
 			}
-#line 929 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 928 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp28_) {
-#line 5819 "Tree.c"
+#line 5828 "Tree.c"
 				GtkTreePath* _tmp33_ = NULL;
-#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp33_ = path;
-#line 932 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 931 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				sidebar_tree_toggle_branch_expansion (self, _tmp33_, FALSE);
-#line 5825 "Tree.c"
+#line 5834 "Tree.c"
 			}
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp36_ = self->priv->old_path_ref;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp36_ != NULL) {
-#line 5831 "Tree.c"
+#line 5840 "Tree.c"
 				const GtkTreeRowReference* _tmp37_ = NULL;
 				GtkTreePath* _tmp38_ = NULL;
 				GtkTreePath* _tmp39_ = NULL;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp37_ = self->priv->old_path_ref;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp38_ = gtk_tree_row_reference_get_path (_tmp37_);
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp39_ = _tmp38_;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp35_ = _tmp39_ != NULL;
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp39_);
-#line 5845 "Tree.c"
+#line 5854 "Tree.c"
 			} else {
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp35_ = FALSE;
-#line 5849 "Tree.c"
+#line 5858 "Tree.c"
 			}
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp35_) {
-#line 5853 "Tree.c"
+#line 5862 "Tree.c"
 				const GtkTreeRowReference* _tmp40_ = NULL;
 				GtkTreePath* _tmp41_ = NULL;
 				GtkTreePath* _tmp42_ = NULL;
 				GtkTreePath* _tmp43_ = NULL;
 				gint _tmp44_ = 0;
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp40_ = self->priv->old_path_ref;
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp41_ = gtk_tree_row_reference_get_path (_tmp40_);
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp42_ = _tmp41_;
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp43_ = path;
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp44_ = gtk_tree_path_compare (_tmp42_, _tmp43_);
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp34_ = _tmp44_ == 0;
-#line 937 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (_tmp42_);
-#line 5873 "Tree.c"
+#line 5882 "Tree.c"
 			} else {
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp34_ = FALSE;
-#line 5877 "Tree.c"
+#line 5886 "Tree.c"
 			}
-#line 936 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 935 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp34_) {
-#line 5881 "Tree.c"
+#line 5890 "Tree.c"
 				GtkCellRendererText* _tmp45_ = NULL;
 				GdkEventButton* _tmp46_ = NULL;
 				gboolean _tmp47_ = FALSE;
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp45_ = self->priv->text_renderer;
-#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 939 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				g_object_set (_tmp45_, "editable", FALSE, NULL);
-#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp46_ = event;
-#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/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 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp47_;
-#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_g_object_unref0 (wrapper);
-#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 941 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 940 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 5901 "Tree.c"
+#line 5910 "Tree.c"
 			}
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = wrapper;
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp50_ = _tmp49_->entry;
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp50_, SIDEBAR_TYPE_RENAMEABLE_ENTRY)) {
-#line 5909 "Tree.c"
+#line 5918 "Tree.c"
 				SidebarTreeEntryWrapper* _tmp51_ = NULL;
 				SidebarEntry* _tmp52_ = NULL;
 				gboolean _tmp53_ = FALSE;
-#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp51_ = wrapper;
-#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp52_ = _tmp51_->entry;
-#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/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 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = _tmp53_;
-#line 5921 "Tree.c"
+#line 5930 "Tree.c"
 			} else {
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp48_ = FALSE;
-#line 5925 "Tree.c"
+#line 5934 "Tree.c"
 			}
-#line 946 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 945 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			if (_tmp48_) {
-#line 5929 "Tree.c"
+#line 5938 "Tree.c"
 				GtkCellRendererText* _tmp54_ = NULL;
-#line 948 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp54_ = self->priv->text_renderer;
-#line 948 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 947 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				g_object_set (_tmp54_, "editable", TRUE, NULL);
-#line 5935 "Tree.c"
+#line 5944 "Tree.c"
 			}
-#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp55_ = self->priv->store;
-#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp56_ = path;
-#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/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 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_row_reference_free0 (self->priv->old_path_ref);
-#line 952 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 951 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			self->priv->old_path_ref = _tmp57_;
-#line 915 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 914 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 5949 "Tree.c"
+#line 5958 "Tree.c"
 		}
 	}
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = event;
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/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 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp59_;
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 955 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 954 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 5962 "Tree.c"
+#line 5971 "Tree.c"
 }
 
 
@@ -5969,53 +5978,53 @@ gboolean sidebar_tree_is_keypress_interpreted (SidebarTree* self, GdkEventKey* e
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
-	static GQuark _tmp4_label3 = 0;
 #line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+	static GQuark _tmp4_label3 = 0;
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 957 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _tmp2_;
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/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 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 5999 "Tree.c"
+#line 6008 "Tree.c"
 			default:
 			{
-#line 964 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
-#line 964 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 963 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6006 "Tree.c"
+#line 6015 "Tree.c"
 			}
 		}
 	} else {
-#line 959 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 958 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6012 "Tree.c"
+#line 6021 "Tree.c"
 			default:
 			{
-#line 967 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = FALSE;
-#line 967 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 966 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6019 "Tree.c"
+#line 6028 "Tree.c"
 			}
 		}
 	}
@@ -6030,134 +6039,134 @@ static gboolean sidebar_tree_real_key_press_event (GtkWidget* base, GdkEventKey*
 	const gchar* _tmp2_ = NULL;
 	const gchar* _tmp3_ = NULL;
 	GQuark _tmp5_ = 0U;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label0 = 0;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label1 = 0;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label2 = 0;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	static GQuark _tmp4_label3 = 0;
-#line 6042 "Tree.c"
+#line 6051 "Tree.c"
 	GdkEventKey* _tmp15_ = NULL;
 	gboolean _tmp16_ = FALSE;
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 970 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = event;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_->keyval;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = gdk_keyval_name (_tmp1_);
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = _tmp2_;
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/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 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6063 "Tree.c"
+#line 6072 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
 				GtkTreePath* _tmp6_ = NULL;
 				GtkTreePath* _tmp7_ = NULL;
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp6_ = sidebar_tree_get_current_path (self);
-#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 974 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				path = _tmp6_;
-#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp7_ = path;
-#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 975 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp7_ != NULL) {
-#line 6077 "Tree.c"
+#line 6086 "Tree.c"
 					GtkTreePath* _tmp8_ = NULL;
-#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp8_ = path;
-#line 977 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 976 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					sidebar_tree_toggle_branch_expansion (self, _tmp8_, FALSE);
-#line 6083 "Tree.c"
+#line 6092 "Tree.c"
 				}
-#line 979 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = TRUE;
-#line 979 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 979 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 978 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6091 "Tree.c"
+#line 6100 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("F2")))) {
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6097 "Tree.c"
+#line 6106 "Tree.c"
 			default:
 			{
 				gboolean _tmp9_ = FALSE;
-#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp9_ = sidebar_tree_rename_in_place (self);
-#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp9_;
-#line 982 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 981 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6107 "Tree.c"
+#line 6116 "Tree.c"
 			}
 		}
 	} else if (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("Delete")))) {
-#line 972 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 971 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		switch (0) {
-#line 6113 "Tree.c"
+#line 6122 "Tree.c"
 			default:
 			{
 				GtkTreePath* path = NULL;
 				GtkTreePath* _tmp10_ = NULL;
 				gboolean _tmp11_ = FALSE;
 				GtkTreePath* _tmp12_ = NULL;
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 984 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp10_ = sidebar_tree_get_current_path (self);
-#line 985 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 984 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				path = _tmp10_;
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_tmp12_ = path;
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				if (_tmp12_ != NULL) {
-#line 6128 "Tree.c"
+#line 6137 "Tree.c"
 					GtkTreePath* _tmp13_ = NULL;
 					gboolean _tmp14_ = FALSE;
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp13_ = path;
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp14_ = sidebar_tree_destroy_path (self, _tmp13_);
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = _tmp14_;
-#line 6137 "Tree.c"
+#line 6146 "Tree.c"
 				} else {
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 					_tmp11_ = FALSE;
-#line 6141 "Tree.c"
+#line 6150 "Tree.c"
 				}
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				result = _tmp11_;
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				_gtk_tree_path_free0 (path);
-#line 987 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 986 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 				return result;
-#line 6149 "Tree.c"
+#line 6158 "Tree.c"
 			}
 		}
 	}
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = event;
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 989 "/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 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp16_;
-#line 990 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 989 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6161 "Tree.c"
+#line 6170 "Tree.c"
 }
 
 
@@ -6168,41 +6177,41 @@ gboolean sidebar_tree_rename_entry_in_place (SidebarTree* self, SidebarEntry* en
 	SidebarEntry* _tmp2_ = NULL;
 	gboolean _tmp3_ = FALSE;
 	gboolean _tmp4_ = FALSE;
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 992 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_expand_to_entry (self, _tmp0_);
-#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 993 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp1_) {
-#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 995 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 994 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6186 "Tree.c"
+#line 6195 "Tree.c"
 	}
-#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = entry;
-#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_place_cursor (self, _tmp2_, FALSE);
-#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 996 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp3_) {
-#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 998 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 997 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6198 "Tree.c"
+#line 6207 "Tree.c"
 	}
-#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_rename_in_place (self);
-#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = _tmp4_;
-#line 1000 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 999 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6206 "Tree.c"
+#line 6215 "Tree.c"
 }
 
 
@@ -6215,57 +6224,57 @@ static gboolean sidebar_tree_rename_in_place (SidebarTree* self) {
 	GtkTreeViewColumn* _tmp2_ = NULL;
 	GtkTreePath* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 1003 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1002 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/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 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (cursor_path);
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cursor_path = _tmp0_;
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (cursor_column);
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 1006 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1005 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	cursor_column = _tmp2_;
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = cursor_path;
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_can_rename_path (self, _tmp3_);
-#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1007 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp4_) {
-#line 6239 "Tree.c"
+#line 6248 "Tree.c"
 		GtkTreePath* _tmp5_ = NULL;
 		GtkTreeViewColumn* _tmp6_ = NULL;
 		GtkCellRendererText* _tmp7_ = NULL;
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = cursor_path;
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = cursor_column;
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = self->priv->text_renderer;
-#line 1009 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1008 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_tree_view_set_cursor_on_cell (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_tree_view_get_type (), GtkTreeView), _tmp5_, _tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = TRUE;
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (cursor_column);
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (cursor_path);
-#line 1011 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1010 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6259 "Tree.c"
+#line 6268 "Tree.c"
 	}
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (cursor_column);
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (cursor_path);
-#line 1014 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1013 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6269 "Tree.c"
+#line 6278 "Tree.c"
 }
 
 
@@ -6278,45 +6287,45 @@ gboolean sidebar_tree_scroll_to_entry (SidebarTree* self, SidebarEntry* entry) {
 	SidebarTreeEntryWrapper* _tmp3_ = NULL;
 	GtkTreePath* _tmp4_ = NULL;
 	GtkTreePath* _tmp5_ = NULL;
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1016 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), FALSE);
-#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = entry;
-#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper (self, _tmp0_);
-#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1017 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1018 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1020 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1019 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6302 "Tree.c"
+#line 6311 "Tree.c"
 	}
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = sidebar_tree_entry_wrapper_get_path (_tmp3_);
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_;
-#line 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1021 "/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 1022 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1021 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp5_);
-#line 1024 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1024 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1024 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1023 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6320 "Tree.c"
+#line 6329 "Tree.c"
 }
 
 
@@ -6327,55 +6336,55 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 	SidebarInternalDragSourceEntry* _tmp6_ = NULL;
 	SidebarInternalDragSourceEntry* _tmp16_ = NULL;
 	GtkSelectionData* _tmp17_ = NULL;
-#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 1029 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1028 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	drag_source = NULL;
-#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->internal_drag_source_entry;
-#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ != NULL) {
-#line 6343 "Tree.c"
+#line 6352 "Tree.c"
 		SidebarSelectableEntry* selectable = NULL;
 		SidebarEntry* _tmp1_ = NULL;
 		SidebarSelectableEntry* _tmp2_ = NULL;
 		SidebarSelectableEntry* _tmp3_ = NULL;
-#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = self->priv->internal_drag_source_entry;
-#line 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1031 "/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 1032 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selectable = _tmp2_;
-#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = selectable;
-#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1033 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp3_ == NULL) {
-#line 6358 "Tree.c"
+#line 6367 "Tree.c"
 			SidebarEntry* _tmp4_ = NULL;
 			SidebarInternalDragSourceEntry* _tmp5_ = NULL;
-#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp4_ = self->priv->internal_drag_source_entry;
-#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/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 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1035 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1034 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			drag_source = _tmp5_;
-#line 6369 "Tree.c"
+#line 6378 "Tree.c"
 		}
-#line 1031 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1030 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (selectable);
-#line 6373 "Tree.c"
+#line 6382 "Tree.c"
 	}
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = drag_source;
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 6379 "Tree.c"
+#line 6388 "Tree.c"
 		GtkTreePath* selected_path = NULL;
 		GtkTreePath* _tmp7_ = NULL;
 		GtkTreePath* _tmp8_ = NULL;
@@ -6387,81 +6396,81 @@ static void sidebar_tree_real_drag_data_get (GtkWidget* base, GdkDragContext* co
 		SidebarEntry* _tmp13_ = NULL;
 		SidebarInternalDragSourceEntry* _tmp14_ = NULL;
 		SidebarInternalDragSourceEntry* _tmp15_ = NULL;
-#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = sidebar_tree_get_selected_path (self);
-#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		selected_path = _tmp7_;
-#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp8_ = selected_path;
-#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1040 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp8_ == NULL) {
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1042 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1041 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6405 "Tree.c"
+#line 6414 "Tree.c"
 		}
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = selected_path;
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp10_ = sidebar_tree_get_wrapper_at_path (self, _tmp9_);
-#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1043 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		wrapper = _tmp10_;
-#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = wrapper;
-#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1044 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp11_ == NULL) {
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1046 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1045 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6425 "Tree.c"
+#line 6434 "Tree.c"
 		}
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = wrapper;
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = _tmp12_->entry;
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/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 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (drag_source);
-#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1047 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		drag_source = _tmp14_;
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp15_ = drag_source;
-#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1048 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp15_ == NULL) {
-#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (wrapper);
-#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_gtk_tree_path_free0 (selected_path);
-#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_g_object_unref0 (drag_source);
-#line 1050 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1049 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			return;
-#line 6449 "Tree.c"
+#line 6458 "Tree.c"
 		}
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1039 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1038 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (selected_path);
-#line 6455 "Tree.c"
+#line 6464 "Tree.c"
 	}
-#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = drag_source;
-#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = selection_data;
-#line 1053 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1052 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_internal_drag_source_entry_prepare_selection_data (_tmp16_, _tmp17_);
-#line 1027 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1026 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (drag_source);
-#line 6465 "Tree.c"
+#line 6474 "Tree.c"
 }
 
 
@@ -6494,87 +6503,87 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 	GdkDragContext* _tmp57_ = NULL;
 	gboolean _tmp58_ = FALSE;
 	guint _tmp59_ = 0U;
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GDK_IS_DRAG_CONTEXT (context));
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (selection_data != NULL);
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = x;
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = y;
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/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 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp2_;
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pos = _tmp3_;
-#line 1061 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1060 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp4_) {
-#line 6518 "Tree.c"
+#line 6527 "Tree.c"
 		GdkDragContext* _tmp5_ = NULL;
 		GtkWidget* _tmp6_ = NULL;
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = context;
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = gtk_drag_get_source_widget (_tmp5_);
-#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1062 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp6_ == NULL) {
-#line 6527 "Tree.c"
+#line 6536 "Tree.c"
 			SidebarTreeExternalDropHandler _tmp7_ = NULL;
 			void* _tmp7__target = NULL;
 			GdkDragContext* _tmp8_ = NULL;
 			GtkSelectionData* _tmp9_ = NULL;
 			guint _tmp10_ = 0U;
 			guint _tmp11_ = 0U;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ = self->priv->drop_handler;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7__target = self->priv->drop_handler_target;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp8_ = context;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp9_ = selection_data;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = info;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = time;
-#line 1064 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1063 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp7_ (_tmp8_, NULL, _tmp9_, _tmp10_, _tmp11_, _tmp7__target);
-#line 6548 "Tree.c"
+#line 6557 "Tree.c"
 		} else {
 			GdkDragContext* _tmp12_ = NULL;
 			guint _tmp13_ = 0U;
-#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = context;
-#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp13_ = time;
-#line 1066 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1065 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			gtk_drag_finish (_tmp12_, FALSE, FALSE, (guint32) _tmp13_);
-#line 6558 "Tree.c"
+#line 6567 "Tree.c"
 		}
-#line 1068 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1068 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1067 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6564 "Tree.c"
+#line 6573 "Tree.c"
 	}
-#line 1072 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp14_ = path;
-#line 1072 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = sidebar_tree_get_wrapper_at_path (self, _tmp14_);
-#line 1072 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1071 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp15_;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context;
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gtk_drag_get_source_widget (_tmp16_);
-#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1074 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp17_ == NULL) {
-#line 6578 "Tree.c"
+#line 6587 "Tree.c"
 		SidebarEntry* _tmp18_ = NULL;
 		SidebarTreeEntryWrapper* _tmp19_ = NULL;
 		SidebarTreeExternalDropHandler _tmp22_ = NULL;
@@ -6583,128 +6592,128 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		GtkSelectionData* _tmp24_ = NULL;
 		guint _tmp25_ = 0U;
 		guint _tmp26_ = 0U;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp19_ = wrapper;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp19_ != NULL) {
-#line 6591 "Tree.c"
+#line 6600 "Tree.c"
 			SidebarTreeEntryWrapper* _tmp20_ = NULL;
 			SidebarEntry* _tmp21_ = NULL;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp20_ = wrapper;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp21_ = _tmp20_->entry;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = _tmp21_;
-#line 6600 "Tree.c"
+#line 6609 "Tree.c"
 		} else {
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp18_ = NULL;
-#line 6604 "Tree.c"
+#line 6613 "Tree.c"
 		}
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ = self->priv->drop_handler;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22__target = self->priv->drop_handler_target;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp23_ = context;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp24_ = selection_data;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp25_ = info;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp26_ = time;
-#line 1076 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1075 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp22_ (_tmp23_, _tmp18_, _tmp24_, _tmp25_, _tmp26_, _tmp22__target);
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1079 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1078 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6626 "Tree.c"
+#line 6635 "Tree.c"
 	}
-#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp27_ = wrapper;
-#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1082 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp27_ == NULL) {
-#line 6632 "Tree.c"
+#line 6641 "Tree.c"
 		GdkDragContext* _tmp28_ = NULL;
 		guint _tmp29_ = 0U;
-#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp28_ = context;
-#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp29_ = time;
-#line 1084 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1083 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_drag_finish (_tmp28_, FALSE, FALSE, (guint32) _tmp29_);
-#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1086 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1085 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6647 "Tree.c"
+#line 6656 "Tree.c"
 	}
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp30_ = wrapper;
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp31_ = _tmp30_->entry;
-#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1088 "/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 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1088 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	targetable = _tmp32_;
-#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp33_ = targetable;
-#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1089 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp33_ == NULL) {
-#line 6661 "Tree.c"
+#line 6670 "Tree.c"
 		GdkDragContext* _tmp34_ = NULL;
 		guint _tmp35_ = 0U;
-#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp34_ = context;
-#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp35_ = time;
-#line 1091 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1090 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		gtk_drag_finish (_tmp34_, FALSE, FALSE, (guint32) _tmp35_);
-#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (targetable);
-#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_gtk_tree_path_free0 (path);
-#line 1093 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1092 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return;
-#line 6678 "Tree.c"
+#line 6687 "Tree.c"
 	}
-#line 1096 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1095 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	success = FALSE;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp36_ = selection_data;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp37_ = gtk_selection_data_get_data_type (_tmp36_);
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp38_ = gdk_atom_name (_tmp37_);
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp39_ = _tmp38_;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp40_ = g_strcmp0 (_tmp39_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_free0 (_tmp39_);
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp40_) {
-#line 6696 "Tree.c"
+#line 6705 "Tree.c"
 		SidebarInternalDropTargetEntry* _tmp41_ = NULL;
 		GtkSelectionData* _tmp42_ = NULL;
 		gboolean _tmp43_ = FALSE;
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp41_ = targetable;
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp42_ = selection_data;
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp43_ = sidebar_internal_drop_target_entry_internal_drop_received_arbitrary (_tmp41_, _tmp42_);
-#line 1099 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		success = _tmp43_;
-#line 6708 "Tree.c"
+#line 6717 "Tree.c"
 	} else {
 		GeeList* media = NULL;
 		GtkSelectionData* _tmp44_ = NULL;
@@ -6714,75 +6723,75 @@ static void sidebar_tree_real_drag_data_received (GtkWidget* base, GdkDragContex
 		GeeList* _tmp48_ = NULL;
 		gboolean _tmp49_ = FALSE;
 		GeeList* _tmp50_ = NULL;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp44_ = selection_data;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp45_ = gtk_selection_data_get_data (_tmp44_);
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp46_ = selection_data;
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp47_ = gtk_selection_data_get_length (_tmp46_);
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp48_ = unserialize_media_sources (_tmp45_, _tmp47_);
-#line 1101 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1100 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		media = _tmp48_;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp50_ = media;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp50_ != NULL) {
-#line 6734 "Tree.c"
+#line 6743 "Tree.c"
 			GeeList* _tmp51_ = NULL;
 			gint _tmp52_ = 0;
 			gint _tmp53_ = 0;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp51_ = media;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp52_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp53_ = _tmp52_;
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = _tmp53_ > 0;
-#line 6746 "Tree.c"
+#line 6755 "Tree.c"
 		} else {
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp49_ = FALSE;
-#line 6750 "Tree.c"
+#line 6759 "Tree.c"
 		}
-#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1102 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp49_) {
-#line 6754 "Tree.c"
+#line 6763 "Tree.c"
 			SidebarInternalDropTargetEntry* _tmp54_ = NULL;
 			GeeList* _tmp55_ = NULL;
 			gboolean _tmp56_ = FALSE;
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp54_ = targetable;
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp55_ = media;
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp56_ = sidebar_internal_drop_target_entry_internal_drop_received (_tmp54_, _tmp55_);
-#line 1104 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1103 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			success = _tmp56_;
-#line 6766 "Tree.c"
+#line 6775 "Tree.c"
 		}
-#line 1098 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1097 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (media);
-#line 6770 "Tree.c"
+#line 6779 "Tree.c"
 	}
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp57_ = context;
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp58_ = success;
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp59_ = time;
-#line 1107 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1106 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_drag_finish (_tmp57_, _tmp58_, FALSE, (guint32) _tmp59_);
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (targetable);
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1056 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1055 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 6786 "Tree.c"
+#line 6795 "Tree.c"
 }
 
 
@@ -6807,90 +6816,90 @@ static gboolean sidebar_tree_real_drag_motion (GtkWidget* base, GdkDragContext*
 	GdkDragContext* _tmp16_ = NULL;
 	GdkDragAction _tmp17_ = 0;
 	guint _tmp18_ = 0U;
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, SIDEBAR_TYPE_TREE, SidebarTree);
-#line 1110 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1109 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (GDK_IS_DRAG_CONTEXT (context), FALSE);
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = context;
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = x;
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = y;
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1111 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = time;
-#line 1112 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1111 "/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 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = x;
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = y;
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/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 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	path = _tmp6_;
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	pos = _tmp7_;
-#line 1116 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1115 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	has_dest = _tmp8_;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp10_ = has_dest;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (!_tmp10_) {
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = TRUE;
-#line 6845 "Tree.c"
+#line 6854 "Tree.c"
 	} else {
 		GtkTreeViewDropPosition _tmp11_ = 0;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp11_ = pos;
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = _tmp11_ == GTK_TREE_VIEW_DROP_BEFORE;
-#line 6852 "Tree.c"
+#line 6861 "Tree.c"
 	}
-#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1118 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp9_) {
-#line 6856 "Tree.c"
+#line 6865 "Tree.c"
 		GtkTreePath* _tmp12_ = NULL;
-#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp12_ = path;
-#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1119 "/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 6862 "Tree.c"
+#line 6871 "Tree.c"
 	} else {
 		GtkTreeViewDropPosition _tmp13_ = 0;
-#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp13_ = pos;
-#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1120 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp13_ == GTK_TREE_VIEW_DROP_AFTER) {
-#line 6869 "Tree.c"
+#line 6878 "Tree.c"
 			GtkTreePath* _tmp14_ = NULL;
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1121 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp14_ = path;
-#line 1122 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1121 "/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 6875 "Tree.c"
+#line 6884 "Tree.c"
 		}
 	}
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = context;
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp16_ = context;
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp17_ = gdk_drag_context_get_suggested_action (_tmp16_);
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp18_ = time;
-#line 1124 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1123 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gdk_drag_status (_tmp15_, _tmp17_, (guint32) _tmp18_);
-#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = has_dest;
-#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (path);
-#line 1126 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1125 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6894 "Tree.c"
+#line 6903 "Tree.c"
 }
 
 
@@ -6910,91 +6919,91 @@ static gboolean sidebar_tree_can_rename_path (SidebarTree* self, GtkTreePath* pa
 	SidebarEntry* _tmp9_ = NULL;
 	GtkTreeSelection* _tmp10_ = NULL;
 	GtkTreePath* _tmp11_ = NULL;
-#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1129 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->editing_disabled;
-#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1130 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp0_ > 0) {
-#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1132 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1131 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6926 "Tree.c"
+#line 6935 "Tree.c"
 	}
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = path;
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = sidebar_tree_get_wrapper_at_path (self, _tmp1_);
-#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1133 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp2_;
-#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1134 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp3_ == NULL) {
-#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1136 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1135 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6944 "Tree.c"
+#line 6953 "Tree.c"
 	}
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = wrapper;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = _tmp4_->entry;
-#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1137 "/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 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1137 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	renameable = _tmp6_;
-#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = renameable;
-#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1138 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp7_ == NULL) {
-#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1140 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1139 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6966 "Tree.c"
+#line 6975 "Tree.c"
 	}
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp8_ = wrapper;
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp9_ = _tmp8_->entry;
-#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1141 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, SIDEBAR_TYPE_HEADER)) {
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1143 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1142 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 6982 "Tree.c"
+#line 6991 "Tree.c"
 	}
-#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1144 "/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 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp11_ = path;
-#line 1145 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1144 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	gtk_tree_selection_select_path (_tmp10_, _tmp11_);
-#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (renameable);
-#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1147 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1146 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 6998 "Tree.c"
+#line 7007 "Tree.c"
 }
 
 
@@ -7010,121 +7019,121 @@ static gboolean sidebar_tree_destroy_path (SidebarTree* self, GtkTreePath* path)
 	SidebarDestroyableEntry* _tmp5_ = NULL;
 	SidebarDestroyableEntry* _tmp6_ = NULL;
 	SidebarDestroyableEntry* _tmp7_ = NULL;
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1149 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (path != NULL, FALSE);
-#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = path;
-#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_wrapper_at_path (self, _tmp0_);
-#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1150 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp1_;
-#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = wrapper;
-#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1151 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp2_ == NULL) {
-#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1153 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1152 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7034 "Tree.c"
+#line 7043 "Tree.c"
 	}
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = wrapper;
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_->entry;
-#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/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 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1154 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	destroyable = _tmp5_;
-#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = destroyable;
-#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1155 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp6_ == NULL) {
-#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		result = FALSE;
-#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (destroyable);
-#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (wrapper);
-#line 1157 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1156 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		return result;
-#line 7056 "Tree.c"
+#line 7065 "Tree.c"
 	}
-#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp7_ = destroyable;
-#line 1159 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1158 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_destroyable_entry_destroy_source (_tmp7_);
-#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = TRUE;
-#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (destroyable);
-#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 1161 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1160 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7070 "Tree.c"
+#line 7079 "Tree.c"
 }
 
 
 static void _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done (GtkCellEditable* _sender, gpointer self) {
-#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	sidebar_tree_on_editing_done ((SidebarTree*) self);
-#line 7077 "Tree.c"
+#line 7086 "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 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7086 "Tree.c"
+#line 7095 "Tree.c"
 }
 
 
 static void sidebar_tree_on_editing_started (SidebarTree* self, GtkCellEditable* editable, const gchar* path) {
 	GtkCellEditable* _tmp0_ = NULL;
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (GTK_IS_CELL_EDITABLE (editable));
-#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1163 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (path != NULL);
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = editable;
-#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1164 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, gtk_entry_get_type ())) {
-#line 7102 "Tree.c"
+#line 7111 "Tree.c"
 		GtkCellEditable* _tmp1_ = NULL;
 		GtkEntry* _tmp2_ = NULL;
 		GtkEntry* _tmp3_ = NULL;
 		GtkEntry* _tmp4_ = NULL;
 		GtkEntry* _tmp5_ = NULL;
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp1_ = editable;
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp2_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_entry_get_type (), GtkEntry));
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (self->priv->text_entry);
-#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1165 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		self->priv->text_entry = _tmp2_;
-#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp3_ = self->priv->text_entry;
-#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1166 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GTK_TYPE_CELL_EDITABLE, GtkCellEditable), "editing-done", (GCallback) _sidebar_tree_on_editing_done_gtk_cell_editable_editing_done, self, 0);
-#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp4_ = self->priv->text_entry;
-#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1167 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), "focus-out-event", (GCallback) _sidebar_tree_on_editing_focus_out_gtk_widget_focus_out_event, self, 0);
-#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp5_ = self->priv->text_entry;
-#line 1169 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1168 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		g_object_set (_tmp5_, "editable", TRUE, NULL);
-#line 7128 "Tree.c"
+#line 7137 "Tree.c"
 	}
 }
 
@@ -7135,25 +7144,25 @@ static void sidebar_tree_on_editing_canceled (SidebarTree* self) {
 	guint _tmp2_ = 0U;
 	GtkEntry* _tmp3_ = NULL;
 	guint _tmp4_ = 0U;
-#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1172 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_entry;
-#line 1174 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1173 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_set (_tmp0_, "editable", FALSE, NULL);
-#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = self->priv->text_entry;
-#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp2_, NULL, FALSE);
-#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1175 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_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 1177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = self->priv->text_entry;
-#line 1177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp4_, NULL, FALSE);
-#line 1177 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1176 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_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 7157 "Tree.c"
+#line 7166 "Tree.c"
 }
 
 
@@ -7169,110 +7178,110 @@ static void sidebar_tree_on_editing_done (SidebarTree* self) {
 	guint _tmp14_ = 0U;
 	GtkEntry* _tmp15_ = NULL;
 	guint _tmp16_ = 0U;
-#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = self->priv->text_entry;
-#line 1181 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_object_set (_tmp0_, "editable", FALSE, NULL);
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = sidebar_tree_get_current_path (self);
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = sidebar_tree_get_wrapper_at_path (self, _tmp2_);
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_gtk_tree_path_free0 (_tmp2_);
-#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1182 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	wrapper = _tmp4_;
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = wrapper;
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	if (_tmp5_ != NULL) {
-#line 7195 "Tree.c"
+#line 7204 "Tree.c"
 		SidebarRenameableEntry* renameable = NULL;
 		SidebarTreeEntryWrapper* _tmp6_ = NULL;
 		SidebarEntry* _tmp7_ = NULL;
 		SidebarRenameableEntry* _tmp8_ = NULL;
 		SidebarRenameableEntry* _tmp9_ = NULL;
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp6_ = wrapper;
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp7_ = _tmp6_->entry;
-#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/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 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		renameable = _tmp8_;
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_tmp9_ = renameable;
-#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1185 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		if (_tmp9_ != NULL) {
-#line 7213 "Tree.c"
+#line 7222 "Tree.c"
 			SidebarRenameableEntry* _tmp10_ = NULL;
 			GtkEntry* _tmp11_ = NULL;
 			const gchar* _tmp12_ = NULL;
-#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp10_ = renameable;
-#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp11_ = self->priv->text_entry;
-#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			_tmp12_ = gtk_entry_get_text (_tmp11_);
-#line 1187 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1186 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 			sidebar_renameable_entry_rename (_tmp10_, _tmp12_);
-#line 7225 "Tree.c"
+#line 7234 "Tree.c"
 		}
-#line 1184 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1183 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 		_g_object_unref0 (renameable);
-#line 7229 "Tree.c"
+#line 7238 "Tree.c"
 	}
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp13_ = self->priv->text_entry;
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("editing-done", GTK_TYPE_CELL_EDITABLE, &_tmp14_, NULL, FALSE);
-#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1189 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_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 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp15_ = self->priv->text_entry;
-#line 1191 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1190 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_parse_name ("focus-out-event", gtk_widget_get_type (), &_tmp16_, NULL, FALSE);
-#line 1191 "/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 (_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 1180 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1179 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (wrapper);
-#line 7245 "Tree.c"
+#line 7254 "Tree.c"
 }
 
 
 static gboolean sidebar_tree_on_editing_focus_out (SidebarTree* self, GdkEventFocus* event) {
 	gboolean result = FALSE;
-#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (SIDEBAR_IS_TREE (self), FALSE);
-#line 1194 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1193 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
-#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	result = FALSE;
-#line 1198 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1197 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	return result;
-#line 7259 "Tree.c"
+#line 7268 "Tree.c"
 }
 
 
 static void sidebar_tree_on_new_search (SidebarTree* self) {
 	SavedSearchDialog* _tmp0_ = NULL;
 	SavedSearchDialog* _tmp1_ = NULL;
-#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1200 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = saved_search_dialog_new ();
-#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = _tmp0_;
-#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	saved_search_dialog_show (_tmp1_);
-#line 1202 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1201 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_saved_search_dialog_unref0 (_tmp1_);
-#line 7276 "Tree.c"
+#line 7285 "Tree.c"
 }
 
 
@@ -7285,37 +7294,37 @@ static void sidebar_tree_on_new_tag (SidebarTree* self) {
 	LibraryWindow* _tmp4_ = NULL;
 	Tag* _tmp5_ = NULL;
 	Tag* _tmp6_ = NULL;
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_return_if_fail (SIDEBAR_IS_TREE (self));
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp0_ = new_root_tag_command_new ();
-#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	creation_command = _tmp0_;
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp1_ = app_window_get_command_manager ();
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp2_ = _tmp1_;
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	command_manager_execute (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (creation_command, TYPE_COMMAND, Command));
-#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1206 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_command_manager_unref0 (_tmp2_);
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp3_ = library_window_get_app ();
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp4_ = _tmp3_;
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp5_ = new_root_tag_command_get_created_tag (creation_command);
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_tmp6_ = _tmp5_;
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	library_window_rename_tag_in_sidebar (_tmp4_, _tmp6_);
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp6_);
-#line 1208 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1207 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (_tmp4_);
-#line 1205 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
+#line 1204 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	_g_object_unref0 (creation_command);
-#line 7319 "Tree.c"
+#line 7328 "Tree.c"
 }
 
 
@@ -7334,19 +7343,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 7338 "Tree.c"
+#line 7347 "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 7344 "Tree.c"
+#line 7353 "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 7350 "Tree.c"
+#line 7359 "Tree.c"
 }
 
 
@@ -7365,19 +7374,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 7369 "Tree.c"
+#line 7378 "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 7375 "Tree.c"
+#line 7384 "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 7381 "Tree.c"
+#line 7390 "Tree.c"
 }
 
 
@@ -7416,14 +7425,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 7420 "Tree.c"
+#line 7429 "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 7427 "Tree.c"
+#line 7436 "Tree.c"
 }
 
 
@@ -7441,7 +7450,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 7445 "Tree.c"
+#line 7454 "Tree.c"
 }
 
 
@@ -7481,7 +7490,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 7485 "Tree.c"
+#line 7494 "Tree.c"
 }
 
 
@@ -7490,7 +7499,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 7494 "Tree.c"
+#line 7503 "Tree.c"
 }
 
 
@@ -7508,7 +7517,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 7512 "Tree.c"
+#line 7521 "Tree.c"
 }
 
 
@@ -7550,14 +7559,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 7554 "Tree.c"
+#line 7563 "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 7561 "Tree.c"
+#line 7570 "Tree.c"
 }
 
 
@@ -7566,7 +7575,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 7570 "Tree.c"
+#line 7579 "Tree.c"
 }
 
 
@@ -7580,7 +7589,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 7584 "Tree.c"
+#line 7593 "Tree.c"
 }
 
 
@@ -7631,7 +7640,7 @@ static void sidebar_tree_class_init (SidebarTreeClass * klass) {
 	g_signal_new ("page_created", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
 #line 7 "/home/jens/Source/shotwell/src/sidebar/Tree.vala"
 	g_signal_new ("destroying_page", SIDEBAR_TYPE_TREE, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__OBJECT_OBJECT, G_TYPE_NONE, 2, SIDEBAR_TYPE_PAGE_REPRESENTATIVE, TYPE_PAGE);
-#line 7635 "Tree.c"
+#line 7644 "Tree.c"
 }
 
 
@@ -7678,7 +7687,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 7682 "Tree.c"
+#line 7691 "Tree.c"
 }
 
 
@@ -7722,7 +7731,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 7726 "Tree.c"
+#line 7735 "Tree.c"
 }
 
 
diff --git a/src/sidebar/Tree.vala b/src/sidebar/Tree.vala
index 9c80f00..a3fc8bf 100644
--- a/src/sidebar/Tree.vala
+++ b/src/sidebar/Tree.vala
@@ -197,8 +197,7 @@ public class Sidebar.Tree : Gtk.TreeView {
 
     private void setup_default_context_menu() {
         try {
-            this.builder.add_from_resource
-                            ("/org/gnome/Shotwell/sidebar_default_context.ui");
+            this.builder.add_from_resource(Resources.get_ui("sidebar_default_context.ui"));
             var model = builder.get_object ("popup-menu") as GLib.MenuModel;
             this.default_context_menu = new Gtk.Menu.from_model (model);
             var group = new GLib.SimpleActionGroup ();
diff --git a/src/tags/Branch.c b/src/tags/Branch.c
index 2ed3ac9..7c51fba 100644
--- a/src/tags/Branch.c
+++ b/src/tags/Branch.c
@@ -728,6 +728,7 @@ enum  {
 SidebarHeader* sidebar_header_new (const gchar* name, gboolean emphasized);
 SidebarHeader* sidebar_header_construct (GType object_type, const gchar* name, gboolean emphasized);
 static void tags_header_setup_context_menu (TagsHeader* self);
+gchar* resources_get_ui (const gchar* filename);
 void app_window_error_message (const gchar* message, GtkWindow* parent);
 gpointer application_ref (gpointer instance);
 void application_unref (gpointer instance);
@@ -826,14 +827,14 @@ static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify
 static void _tags_branch_on_tags_added_removed_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
 #line 26 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_branch_on_tags_added_removed ((TagsBranch*) self, added, removed);
-#line 830 "Branch.c"
+#line 831 "Branch.c"
 }
 
 
 static void _tags_branch_on_tags_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
 #line 27 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_branch_on_tags_altered ((TagsBranch*) self, items);
-#line 837 "Branch.c"
+#line 838 "Branch.c"
 }
 
 
@@ -842,7 +843,7 @@ static gint _tags_branch_comparator_gcompare_func (gconstpointer a, gconstpointe
 	result = tags_branch_comparator ((SidebarEntry*) a, (SidebarEntry*) b);
 #line 11 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 846 "Branch.c"
+#line 847 "Branch.c"
 }
 
 
@@ -883,14 +884,14 @@ TagsBranch* tags_branch_construct (GType object_type) {
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _tags_branch_on_tags_altered_data_collection_items_altered, self, 0);
 #line 10 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self;
-#line 887 "Branch.c"
+#line 888 "Branch.c"
 }
 
 
 TagsBranch* tags_branch_new (void) {
 #line 10 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return tags_branch_construct (TAGS_TYPE_BRANCH);
-#line 894 "Branch.c"
+#line 895 "Branch.c"
 }
 
 
@@ -913,7 +914,7 @@ TagsSidebarEntry* tags_branch_get_entry_for_tag (TagsBranch* self, Tag* tag) {
 	result = (TagsSidebarEntry*) _tmp2_;
 #line 31 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 917 "Branch.c"
+#line 918 "Branch.c"
 }
 
 
@@ -925,7 +926,7 @@ gboolean tags_branch_is_user_renameable (TagsBranch* self) {
 	result = TRUE;
 #line 35 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 929 "Branch.c"
+#line 930 "Branch.c"
 }
 
 
@@ -955,7 +956,7 @@ static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 		result = 0;
 #line 40 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 959 "Branch.c"
+#line 960 "Branch.c"
 	}
 #line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = a;
@@ -981,7 +982,7 @@ static gint tags_branch_comparator (SidebarEntry* a, SidebarEntry* b) {
 	result = _tmp9_;
 #line 42 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 985 "Branch.c"
+#line 986 "Branch.c"
 }
 
 
@@ -990,14 +991,14 @@ static gint _tag_compare_names_gcompare_data_func (gconstpointer a, gconstpointe
 	result = tag_compare_names ((Tag*) a, (Tag*) b);
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 994 "Branch.c"
+#line 995 "Branch.c"
 }
 
 
 static gpointer _g_object_ref0 (gpointer self) {
 #line 59 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1001 "Branch.c"
+#line 1002 "Branch.c"
 }
 
 
@@ -1017,14 +1018,14 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 	_tmp0_ = added_raw;
 #line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp0_ != NULL) {
-#line 1021 "Branch.c"
+#line 1022 "Branch.c"
 		GeeSortedSet* added = NULL;
 		GeeTreeSet* _tmp1_ = NULL;
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp1_ = gee_tree_set_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, _tag_compare_names_gcompare_data_func, NULL, NULL);
 #line 57 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		added = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 1028 "Branch.c"
+#line 1029 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp2_ = NULL;
@@ -1037,7 +1038,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 			_object_it = _tmp3_;
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 1041 "Branch.c"
+#line 1042 "Branch.c"
 				GeeIterator* _tmp4_ = NULL;
 				gboolean _tmp5_ = FALSE;
 				DataObject* object = NULL;
@@ -1056,7 +1057,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				if (!_tmp5_) {
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 1060 "Branch.c"
+#line 1061 "Branch.c"
 				}
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp6_ = _object_it;
@@ -1080,11 +1081,11 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_g_object_unref0 (tag);
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_object_unref0 (object);
-#line 1084 "Branch.c"
+#line 1085 "Branch.c"
 			}
 #line 58 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_object_it);
-#line 1088 "Branch.c"
+#line 1089 "Branch.c"
 		}
 		{
 			GeeIterator* _tag_it = NULL;
@@ -1098,7 +1099,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 			_tag_it = _tmp13_;
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 1102 "Branch.c"
+#line 1103 "Branch.c"
 				GeeIterator* _tmp14_ = NULL;
 				gboolean _tmp15_ = FALSE;
 				Tag* tag = NULL;
@@ -1126,7 +1127,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				if (!_tmp15_) {
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 1130 "Branch.c"
+#line 1131 "Branch.c"
 				}
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp16_ = _tag_it;
@@ -1142,7 +1143,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				parent_tag = _tmp19_;
 #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				while (TRUE) {
-#line 1146 "Branch.c"
+#line 1147 "Branch.c"
 					Tag* _tmp20_ = NULL;
 					GeeHashMap* _tmp21_ = NULL;
 					Tag* _tmp22_ = NULL;
@@ -1155,7 +1156,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					if (!(_tmp20_ != NULL)) {
 #line 67 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 						break;
-#line 1159 "Branch.c"
+#line 1160 "Branch.c"
 					}
 #line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_tmp21_ = self->priv->entry_map;
@@ -1165,7 +1166,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					_tmp23_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_);
 #line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					if (!_tmp23_) {
-#line 1169 "Branch.c"
+#line 1170 "Branch.c"
 						TagsSidebarEntry* parent_entry = NULL;
 						Tag* _tmp24_ = NULL;
 						TagsSidebarEntry* _tmp25_ = NULL;
@@ -1188,7 +1189,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 						gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_, _tmp28_);
 #line 68 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 						_g_object_unref0 (parent_entry);
-#line 1192 "Branch.c"
+#line 1193 "Branch.c"
 					}
 #line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_tmp29_ = parent_tag;
@@ -1198,7 +1199,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					_g_object_unref0 (parent_tag);
 #line 73 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					parent_tag = _tmp30_;
-#line 1202 "Branch.c"
+#line 1203 "Branch.c"
 				}
 #line 77 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp31_ = tag;
@@ -1226,7 +1227,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_tmp38_ = parent_tag;
 #line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				if (_tmp38_ != NULL) {
-#line 1230 "Branch.c"
+#line 1231 "Branch.c"
 					TagsSidebarEntry* parent_entry = NULL;
 					GeeHashMap* _tmp39_ = NULL;
 					Tag* _tmp40_ = NULL;
@@ -1249,7 +1250,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, SIDEBAR_TYPE_ENTRY, SidebarEntry), G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
 #line 81 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_object_unref0 (parent_entry);
-#line 1253 "Branch.c"
+#line 1254 "Branch.c"
 				} else {
 					SidebarEntry* _tmp44_ = NULL;
 					SidebarEntry* _tmp45_ = NULL;
@@ -1264,7 +1265,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 					sidebar_branch_graft (G_TYPE_CHECK_INSTANCE_CAST (self, SIDEBAR_TYPE_BRANCH, SidebarBranch), _tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, SIDEBAR_TYPE_ENTRY, SidebarEntry), NULL);
 #line 85 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_object_unref0 (_tmp45_);
-#line 1268 "Branch.c"
+#line 1269 "Branch.c"
 				}
 #line 90 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp47_ = tag;
@@ -1280,21 +1281,21 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_g_object_unref0 (parent_tag);
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_object_unref0 (tag);
-#line 1284 "Branch.c"
+#line 1285 "Branch.c"
 			}
 #line 63 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_tag_it);
-#line 1288 "Branch.c"
+#line 1289 "Branch.c"
 		}
 #line 53 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (added);
-#line 1292 "Branch.c"
+#line 1293 "Branch.c"
 	}
 #line 94 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp49_ = removed;
 #line 94 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp49_ != NULL) {
-#line 1298 "Branch.c"
+#line 1299 "Branch.c"
 		{
 			GeeIterator* _object_it = NULL;
 			GeeIterable* _tmp50_ = NULL;
@@ -1307,7 +1308,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 			_object_it = _tmp51_;
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 1311 "Branch.c"
+#line 1312 "Branch.c"
 				GeeIterator* _tmp52_ = NULL;
 				gboolean _tmp53_ = FALSE;
 				DataObject* object = NULL;
@@ -1335,7 +1336,7 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				if (!_tmp53_) {
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 1339 "Branch.c"
+#line 1340 "Branch.c"
 				}
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp54_ = _object_it;
@@ -1383,16 +1384,16 @@ static void tags_branch_on_tags_added_removed (TagsBranch* self, GeeIterable* ad
 				_g_object_unref0 (tag);
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_object_unref0 (object);
-#line 1387 "Branch.c"
+#line 1388 "Branch.c"
 			}
 #line 95 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_object_it);
-#line 1391 "Branch.c"
+#line 1392 "Branch.c"
 		}
 	}
 #line 46 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (restore_point);
-#line 1396 "Branch.c"
+#line 1397 "Branch.c"
 }
 
 
@@ -1401,7 +1402,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 	g_return_if_fail (TAGS_IS_BRANCH (self));
 #line 109 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (GEE_IS_MAP (altered));
-#line 1405 "Branch.c"
+#line 1406 "Branch.c"
 	{
 		GeeIterator* _object_it = NULL;
 		GeeMap* _tmp0_ = NULL;
@@ -1428,7 +1429,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 		_object_it = _tmp5_;
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		while (TRUE) {
-#line 1432 "Branch.c"
+#line 1433 "Branch.c"
 			GeeIterator* _tmp6_ = NULL;
 			gboolean _tmp7_ = FALSE;
 			DataObject* object = NULL;
@@ -1465,7 +1466,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 			if (!_tmp7_) {
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				break;
-#line 1469 "Branch.c"
+#line 1470 "Branch.c"
 			}
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp8_ = _object_it;
@@ -1493,7 +1494,7 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 				_g_object_unref0 (object);
 #line 112 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				continue;
-#line 1497 "Branch.c"
+#line 1498 "Branch.c"
 			}
 #line 114 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp16_ = object;
@@ -1547,11 +1548,11 @@ static void tags_branch_on_tags_altered (TagsBranch* self, GeeMap* altered) {
 			_g_object_unref0 (tag);
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (object);
-#line 1551 "Branch.c"
+#line 1552 "Branch.c"
 		}
 #line 110 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_object_it);
-#line 1555 "Branch.c"
+#line 1556 "Branch.c"
 	}
 }
 
@@ -1563,7 +1564,7 @@ static void tags_branch_class_init (TagsBranchClass * klass) {
 	g_type_class_add_private (klass, sizeof (TagsBranchPrivate));
 #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_branch_finalize;
-#line 1567 "Branch.c"
+#line 1568 "Branch.c"
 }
 
 
@@ -1575,7 +1576,7 @@ static void tags_branch_instance_init (TagsBranch * self) {
 	_tmp0_ = gee_hash_map_new (TYPE_TAG, (GBoxedCopyFunc) g_object_ref, g_object_unref, TAGS_TYPE_SIDEBAR_ENTRY, (GBoxedCopyFunc) g_object_ref, g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 8 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->entry_map = _tmp0_;
-#line 1579 "Branch.c"
+#line 1580 "Branch.c"
 }
 
 
@@ -1603,7 +1604,7 @@ static void tags_branch_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->entry_map);
 #line 7 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (tags_branch_parent_class)->finalize (obj);
-#line 1607 "Branch.c"
+#line 1608 "Branch.c"
 }
 
 
@@ -1630,14 +1631,14 @@ TagsHeader* tags_header_construct (GType object_type) {
 	tags_header_setup_context_menu (self);
 #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self;
-#line 1634 "Branch.c"
+#line 1635 "Branch.c"
 }
 
 
 TagsHeader* tags_header_new (void) {
 #line 130 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return tags_header_construct (TAGS_TYPE_HEADER);
-#line 1641 "Branch.c"
+#line 1642 "Branch.c"
 }
 
 
@@ -1652,85 +1653,93 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 	_g_object_unref0 (self->priv->builder);
 #line 136 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->builder = _tmp0_;
-#line 1656 "Branch.c"
+#line 1657 "Branch.c"
 	{
 		GtkBuilder* _tmp1_ = NULL;
+		gchar* _tmp2_ = NULL;
+		gchar* _tmp3_ = NULL;
 		GMenuModel* model = NULL;
-		GtkBuilder* _tmp2_ = NULL;
-		GObject* _tmp3_ = NULL;
-		GMenuModel* _tmp4_ = NULL;
-		GMenuModel* _tmp5_ = NULL;
-		GtkMenu* _tmp6_ = NULL;
+		GtkBuilder* _tmp4_ = NULL;
+		GObject* _tmp5_ = NULL;
+		GMenuModel* _tmp6_ = NULL;
+		GMenuModel* _tmp7_ = NULL;
+		GtkMenu* _tmp8_ = NULL;
 #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp1_ = self->priv->builder;
 #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		gtk_builder_add_from_resource (_tmp1_, "/org/gnome/Shotwell/tag_sidebar_context.ui", &_inner_error_);
+		_tmp2_ = resources_get_ui ("tag_sidebar_context.ui");
+#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp3_ = _tmp2_;
+#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		gtk_builder_add_from_resource (_tmp1_, _tmp3_, &_inner_error_);
+#line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_g_free0 (_tmp3_);
 #line 138 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1671 "Branch.c"
-			goto __catch53_g_error;
+#line 1680 "Branch.c"
+			goto __catch54_g_error;
 		}
+#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp4_ = self->priv->builder;
+#line 139 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp5_ = gtk_builder_get_object (_tmp4_, "popup-menu");
+#line 139 "/home/jens/Source/shotwell/src/tags/Branch.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"
+		model = _tmp6_;
 #line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp2_ = self->priv->builder;
+		_tmp7_ = model;
 #line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp3_ = gtk_builder_get_object (_tmp2_, "popup-menu");
+		_tmp8_ = (GtkMenu*) gtk_menu_new_from_model (_tmp7_);
 #line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp4_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, g_menu_model_get_type ()) ? ((GMenuModel*) _tmp3_) : NULL);
+		g_object_ref_sink (_tmp8_);
 #line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		model = _tmp4_;
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp5_ = model;
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp6_ = (GtkMenu*) gtk_menu_new_from_model (_tmp5_);
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		g_object_ref_sink (_tmp6_);
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (self->priv->context_menu);
-#line 141 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		self->priv->context_menu = _tmp6_;
+#line 140 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		self->priv->context_menu = _tmp8_;
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (model);
-#line 1694 "Branch.c"
+#line 1703 "Branch.c"
 	}
-	goto __finally53;
-	__catch53_g_error:
+	goto __finally54;
+	__catch54_g_error:
 	{
 		GError* _error_ = NULL;
-		GError* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		Application* _tmp11_ = NULL;
-		Application* _tmp12_ = NULL;
+		GError* _tmp9_ = NULL;
+		const gchar* _tmp10_ = NULL;
+		gchar* _tmp11_ = NULL;
+		gchar* _tmp12_ = NULL;
+		Application* _tmp13_ = NULL;
+		Application* _tmp14_ = NULL;
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_error_ = _inner_error_;
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_inner_error_ = NULL;
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp7_ = _error_;
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp8_ = _tmp7_->message;
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp9_ = g_strdup_printf ("Error loading UI resource: %s", _tmp8_);
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp10_ = _tmp9_;
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		app_window_error_message (_tmp10_, NULL);
-#line 143 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_g_free0 (_tmp10_);
-#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_tmp11_ = application_get_instance ();
-#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp9_ = _error_;
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp10_ = _tmp9_->message;
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp11_ = g_strdup_printf ("Error loading UI resource: %s", _tmp10_);
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp12_ = _tmp11_;
-#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		application_panic (_tmp12_);
-#line 145 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-		_application_unref0 (_tmp12_);
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		app_window_error_message (_tmp12_, NULL);
+#line 142 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_g_free0 (_tmp12_);
+#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp13_ = application_get_instance ();
+#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_tmp14_ = _tmp13_;
+#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		application_panic (_tmp14_);
+#line 144 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+		_application_unref0 (_tmp14_);
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_error_free0 (_error_);
-#line 1732 "Branch.c"
+#line 1741 "Branch.c"
 	}
-	__finally53:
+	__finally54:
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
@@ -1739,7 +1748,7 @@ static void tags_header_setup_context_menu (TagsHeader* self) {
 		g_clear_error (&_inner_error_);
 #line 137 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 1743 "Branch.c"
+#line 1752 "Branch.c"
 	}
 }
 
@@ -1765,85 +1774,85 @@ static gboolean tags_header_real_internal_drop_received (SidebarInternalDropTarg
 	GeeList* _tmp10_ = NULL;
 	AddTagsCommand* _tmp11_ = NULL;
 	AddTagsCommand* _tmp12_ = NULL;
-#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 148 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (GEE_IS_LIST (media), FALSE);
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = add_tags_dialog_new ();
-#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 149 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	dialog = _tmp0_;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = dialog;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = add_tags_dialog_execute (_tmp1_, &_tmp2_);
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	names = _tmp3_;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	names_length1 = _tmp2_;
-#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 150 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_names_size_ = names_length1;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = names;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5__length1 = names_length1;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp5_ == NULL) {
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = TRUE;
-#line 1795 "Branch.c"
+#line 1804 "Branch.c"
 	} else {
 		gchar** _tmp6_ = NULL;
 		gint _tmp6__length1 = 0;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = names;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6__length1 = names_length1;
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = _tmp6__length1 == 0;
-#line 1805 "Branch.c"
+#line 1814 "Branch.c"
 	}
-#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 151 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
-#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		result = FALSE;
-#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_text_entry_dialog_mediator_unref0 (dialog);
-#line 153 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 152 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 1817 "Branch.c"
+#line 1826 "Branch.c"
 	}
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp7_ = app_window_get_command_manager ();
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp8_ = _tmp7_;
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp9_ = names;
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp9__length1 = names_length1;
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp10_ = media;
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp11_ = add_tags_command_new (_tmp9_, _tmp9__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp12_ = _tmp11_;
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (_tmp12_);
-#line 155 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 154 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_command_manager_unref0 (_tmp8_);
-#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = TRUE;
-#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
-#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 157 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 156 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 1847 "Branch.c"
+#line 1856 "Branch.c"
 }
 
 
@@ -1855,25 +1864,25 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 159 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (data != NULL, FALSE);
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = data;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = gtk_selection_data_get_data_type (_tmp0_);
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = gdk_atom_name (_tmp1_);
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = _tmp2_;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp3_);
-#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 160 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
-#line 1877 "Branch.c"
+#line 1886 "Branch.c"
 		gchar* old_tag_path = NULL;
 		GtkSelectionData* _tmp5_ = NULL;
 		guchar* _tmp6_ = NULL;
@@ -1894,91 +1903,91 @@ static gboolean tags_header_real_internal_drop_received_arbitrary (SidebarIntern
 		Tag* _tmp21_ = NULL;
 		ReparentTagCommand* _tmp22_ = NULL;
 		ReparentTagCommand* _tmp23_ = NULL;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp5_ = data;
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = gtk_selection_data_get_data (_tmp5_);
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 161 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag_path = _tmp7_;
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp8_ = tag_global;
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp9_ = old_tag_path;
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp10_ = tag_source_collection_exists (_tmp8_, _tmp9_, FALSE);
-#line 163 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 162 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_vala_assert (_tmp10_, "Tag.global.exists(old_tag_path)");
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp11_ = old_tag_path;
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp13_ = _tmp12_;
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp15_ = _tmp14_;
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp16_ = _tmp15_ < 2;
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp13_);
-#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 165 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp16_) {
-#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			result = TRUE;
-#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (old_tag_path);
-#line 167 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 166 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 1936 "Branch.c"
+#line 1945 "Branch.c"
 		}
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp17_ = app_window_get_command_manager ();
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp18_ = _tmp17_;
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp19_ = old_tag_path;
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp20_ = tag_for_path (_tmp19_);
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp21_ = _tmp20_;
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp22_ = reparent_tag_command_new (_tmp21_, "/");
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp23_ = _tmp22_;
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		command_manager_execute (_tmp18_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp23_);
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp21_);
-#line 169 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 168 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_command_manager_unref0 (_tmp18_);
-#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		result = TRUE;
-#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (old_tag_path);
-#line 172 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 171 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 1966 "Branch.c"
+#line 1975 "Branch.c"
 	}
-#line 175 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = FALSE;
-#line 175 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 174 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 1972 "Branch.c"
+#line 1981 "Branch.c"
 }
 
 
 static void tags_header_real_prepare_selection_data (SidebarInternalDragSourceEntry* base, GtkSelectionData* data) {
 	TagsHeader * self;
-#line 178 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 178 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 177 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (data != NULL);
-#line 1982 "Branch.c"
+#line 1991 "Branch.c"
 }
 
 
@@ -1987,17 +1996,17 @@ static GtkMenu* tags_header_real_get_sidebar_context_menu (SidebarContextable* b
 	GtkMenu* result = NULL;
 	GtkMenu* _tmp0_ = NULL;
 	GtkMenu* _tmp1_ = NULL;
-#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 181 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_HEADER, TagsHeader);
-#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->context_menu;
-#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 183 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 182 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2001 "Branch.c"
+#line 2010 "Branch.c"
 }
 
 
@@ -2008,7 +2017,7 @@ static void tags_header_class_init (TagsHeaderClass * klass) {
 	g_type_class_add_private (klass, sizeof (TagsHeaderPrivate));
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_header_finalize;
-#line 2012 "Branch.c"
+#line 2021 "Branch.c"
 }
 
 
@@ -2019,7 +2028,7 @@ static void tags_header_sidebar_internal_drop_target_entry_interface_init (Sideb
 	iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_header_real_internal_drop_received;
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_header_real_internal_drop_received_arbitrary;
-#line 2023 "Branch.c"
+#line 2032 "Branch.c"
 }
 
 
@@ -2028,7 +2037,7 @@ static void tags_header_sidebar_internal_drag_source_entry_interface_init (Sideb
 	tags_header_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_header_real_prepare_selection_data;
-#line 2032 "Branch.c"
+#line 2041 "Branch.c"
 }
 
 
@@ -2037,7 +2046,7 @@ static void tags_header_sidebar_contextable_interface_init (SidebarContextableIf
 	tags_header_sidebar_contextable_parent_iface = g_type_interface_peek_parent (iface);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->get_sidebar_context_menu = (GtkMenu* (*)(SidebarContextable*, GdkEventButton*)) tags_header_real_get_sidebar_context_menu;
-#line 2041 "Branch.c"
+#line 2050 "Branch.c"
 }
 
 
@@ -2046,7 +2055,7 @@ static void tags_header_instance_init (TagsHeader * self) {
 	self->priv = TAGS_HEADER_GET_PRIVATE (self);
 #line 128 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->context_menu = NULL;
-#line 2050 "Branch.c"
+#line 2059 "Branch.c"
 }
 
 
@@ -2060,7 +2069,7 @@ static void tags_header_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 125 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (tags_header_parent_class)->finalize (obj);
-#line 2064 "Branch.c"
+#line 2073 "Branch.c"
 }
 
 
@@ -2086,28 +2095,28 @@ TagsSidebarEntry* tags_sidebar_entry_construct (GType object_type, Tag* tag) {
 	TagsSidebarEntry * self = NULL;
 	Tag* _tmp0_ = NULL;
 	Tag* _tmp1_ = NULL;
-#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (IS_TAG (tag), NULL);
-#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = (TagsSidebarEntry*) sidebar_simple_page_entry_construct (object_type);
-#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = tag;
-#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (self->priv->tag);
-#line 195 "/home/jens/Source/shotwell/src/tags/Branch.vala"
-	self->priv->tag = _tmp1_;
 #line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+	self->priv->tag = _tmp1_;
+#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return self;
-#line 2104 "Branch.c"
+#line 2113 "Branch.c"
 }
 
 
 TagsSidebarEntry* tags_sidebar_entry_new (Tag* tag) {
-#line 194 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 193 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return tags_sidebar_entry_construct (TAGS_TYPE_SIDEBAR_ENTRY, tag);
-#line 2111 "Branch.c"
+#line 2120 "Branch.c"
 }
 
 
@@ -2123,17 +2132,17 @@ Tag* tags_sidebar_entry_for_tag (TagsSidebarEntry* self) {
 	Tag* result = NULL;
 	Tag* _tmp0_ = NULL;
 	Tag* _tmp1_ = NULL;
-#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 203 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (TAGS_IS_SIDEBAR_ENTRY (self), NULL);
-#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _g_object_ref0 (_tmp0_);
-#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 205 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 204 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2137 "Branch.c"
+#line 2146 "Branch.c"
 }
 
 
@@ -2142,17 +2151,17 @@ static gchar* tags_sidebar_entry_real_get_sidebar_name (SidebarSimplePageEntry*
 	gchar* result = NULL;
 	Tag* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 207 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = tag_get_user_visible_name (_tmp0_);
-#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 209 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 208 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2156 "Branch.c"
+#line 2165 "Branch.c"
 }
 
 
@@ -2161,17 +2170,17 @@ static gchar* tags_sidebar_entry_real_get_sidebar_icon (SidebarSimplePageEntry*
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gchar* _tmp1_ = NULL;
-#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 211 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->single_tag_icon;
-#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = g_strdup (_tmp0_);
-#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = _tmp1_;
-#line 213 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 212 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2175 "Branch.c"
+#line 2184 "Branch.c"
 }
 
 
@@ -2180,32 +2189,32 @@ static Page* tags_sidebar_entry_real_create_page (SidebarSimplePageEntry* base)
 	Page* result = NULL;
 	Tag* _tmp0_ = NULL;
 	TagPage* _tmp1_ = NULL;
-#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 215 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = tag_page_new (_tmp0_);
-#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_object_ref_sink (_tmp1_);
-#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE, Page);
-#line 217 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 216 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2196 "Branch.c"
+#line 2205 "Branch.c"
 }
 
 
 static gboolean tags_sidebar_entry_real_is_user_renameable (SidebarRenameableEntry* base) {
 	TagsSidebarEntry * self;
 	gboolean result = FALSE;
-#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 219 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 221 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = TRUE;
-#line 221 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 220 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2209 "Branch.c"
+#line 2218 "Branch.c"
 }
 
 
@@ -2218,7 +2227,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 	g_return_val_if_fail (old != NULL, NULL);
 #line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 2222 "Branch.c"
+#line 2231 "Branch.c"
 	{
 		GRegex* regex = NULL;
 		const gchar* _tmp0_ = NULL;
@@ -2249,8 +2258,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2253 "Branch.c"
-				goto __catch54_g_regex_error;
+#line 2262 "Branch.c"
+				goto __catch55_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2258,7 +2267,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2262 "Branch.c"
+#line 2271 "Branch.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp6_ = regex;
@@ -2274,8 +2283,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 2278 "Branch.c"
-				goto __catch54_g_regex_error;
+#line 2287 "Branch.c"
+				goto __catch55_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -2285,7 +2294,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 			g_clear_error (&_inner_error_);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			return NULL;
-#line 2289 "Branch.c"
+#line 2298 "Branch.c"
 		}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_tmp9_ = _tmp5_;
@@ -2299,10 +2308,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_regex_unref0 (regex);
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return result;
-#line 2303 "Branch.c"
+#line 2312 "Branch.c"
 	}
-	goto __finally54;
-	__catch54_g_regex_error:
+	goto __finally55;
+	__catch55_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2313,9 +2322,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_assert_not_reached ();
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 2317 "Branch.c"
+#line 2326 "Branch.c"
 	}
-	__finally54:
+	__finally55:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -2324,7 +2333,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		g_clear_error (&_inner_error_);
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		return NULL;
-#line 2328 "Branch.c"
+#line 2337 "Branch.c"
 	}
 }
 
@@ -2349,85 +2358,85 @@ static void tags_sidebar_entry_real_rename (SidebarRenameableEntry* base, const
 	const gchar* _tmp14_ = NULL;
 	RenameTagCommand* _tmp15_ = NULL;
 	RenameTagCommand* _tmp16_ = NULL;
-#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (new_name != NULL);
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = new_name;
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = tag_prep_tag_name (_tmp0_);
-#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	prepped = _tmp1_;
-#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = prepped;
-#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 225 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp2_ == NULL) {
-#line 227 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (prepped);
-#line 227 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 226 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2371 "Branch.c"
+#line 2380 "Branch.c"
 	}
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = prepped;
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = string_replace (_tmp3_, "/", "");
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (prepped);
-#line 229 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 228 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	prepped = _tmp4_;
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = prepped;
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6_ = self->priv->tag;
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp7_ = tag_get_user_visible_name (_tmp6_);
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp8_ = _tmp7_;
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp9_ = g_strcmp0 (_tmp5_, _tmp8_) == 0;
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp8_);
-#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 230 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp9_) {
-#line 232 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (prepped);
-#line 232 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 231 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2399 "Branch.c"
+#line 2408 "Branch.c"
 	}
-#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp10_ = prepped;
-#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 233 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (g_strcmp0 (_tmp10_, "") == 0) {
-#line 235 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (prepped);
-#line 235 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 234 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return;
-#line 2409 "Branch.c"
+#line 2418 "Branch.c"
 	}
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp11_ = app_window_get_command_manager ();
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp12_ = _tmp11_;
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp13_ = self->priv->tag;
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp14_ = prepped;
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp15_ = rename_tag_command_new (_tmp13_, _tmp14_);
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp16_ = _tmp15_;
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_COMMAND, Command));
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (_tmp16_);
-#line 237 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 236 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_command_manager_unref0 (_tmp12_);
-#line 224 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 223 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (prepped);
-#line 2431 "Branch.c"
+#line 2440 "Branch.c"
 }
 
 
@@ -2435,37 +2444,37 @@ static void tags_sidebar_entry_real_destroy_source (SidebarDestroyableEntry* bas
 	TagsSidebarEntry * self;
 	Tag* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 239 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = self->priv->tag;
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = dialogs_confirm_delete_tag (_tmp0_);
-#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 240 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp1_) {
-#line 2447 "Branch.c"
+#line 2456 "Branch.c"
 		CommandManager* _tmp2_ = NULL;
 		CommandManager* _tmp3_ = NULL;
 		Tag* _tmp4_ = NULL;
 		DeleteTagCommand* _tmp5_ = NULL;
 		DeleteTagCommand* _tmp6_ = NULL;
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp2_ = app_window_get_command_manager ();
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp3_ = _tmp2_;
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp4_ = self->priv->tag;
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp5_ = delete_tag_command_new (_tmp4_);
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = _tmp5_;
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		command_manager_execute (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_COMMAND, Command));
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp6_);
-#line 242 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 241 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_command_manager_unref0 (_tmp3_);
-#line 2469 "Branch.c"
+#line 2478 "Branch.c"
 	}
 }
 
@@ -2482,39 +2491,39 @@ static gboolean tags_sidebar_entry_real_internal_drop_received (SidebarInternalD
 	gint _tmp6_ = 0;
 	TagUntagPhotosCommand* _tmp7_ = NULL;
 	TagUntagPhotosCommand* _tmp8_ = NULL;
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 244 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (GEE_IS_LIST (media), FALSE);
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = app_window_get_command_manager ();
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = _tmp0_;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = self->priv->tag;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = media;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = media;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6_ = _tmp5_;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp7_ = tag_untag_photos_command_new (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp6_, TRUE);
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp8_ = _tmp7_;
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	command_manager_execute (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command));
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (_tmp8_);
-#line 246 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 245 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 249 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = TRUE;
-#line 249 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 248 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2518 "Branch.c"
+#line 2527 "Branch.c"
 }
 
 
@@ -2526,25 +2535,25 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 	gchar* _tmp2_ = NULL;
 	gchar* _tmp3_ = NULL;
 	gboolean _tmp4_ = FALSE;
-#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 251 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_val_if_fail (data != NULL, FALSE);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = data;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = gtk_selection_data_get_data_type (_tmp0_);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = gdk_atom_name (_tmp1_);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = _tmp2_;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = g_strcmp0 (_tmp3_, LIBRARY_WINDOW_TAG_PATH_MIME_TYPE) == 0;
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp3_);
-#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 252 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	if (_tmp4_) {
-#line 2548 "Branch.c"
+#line 2557 "Branch.c"
 		gchar* old_tag_path = NULL;
 		GtkSelectionData* _tmp5_ = NULL;
 		guchar* _tmp6_ = NULL;
@@ -2573,35 +2582,35 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 		gchar* _tmp49_ = NULL;
 		ReparentTagCommand* _tmp50_ = NULL;
 		ReparentTagCommand* _tmp51_ = NULL;
-#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp5_ = data;
-#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp6_ = gtk_selection_data_get_data (_tmp5_);
-#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp7_ = g_strdup ((const gchar*) _tmp6_);
-#line 254 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 253 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag_path = _tmp7_;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp8_ = old_tag_path;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp9_ = self->priv->tag;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp10_ = tag_get_path (_tmp9_);
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp11_ = _tmp10_;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp12_ = g_strcmp0 (_tmp8_, _tmp11_) == 0;
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (_tmp11_);
-#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 256 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp12_) {
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			result = TRUE;
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (old_tag_path);
-#line 258 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 257 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 2605 "Branch.c"
+#line 2614 "Branch.c"
 		}
 		{
 			GeeList* _parent_path_list = NULL;
@@ -2615,33 +2624,33 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 			gint _tmp19_ = 0;
 			gint _tmp20_ = 0;
 			gint _parent_path_index = 0;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp13_ = self->priv->tag;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp14_ = tag_get_path (_tmp13_);
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp15_ = _tmp14_;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp16_ = hierarchical_tag_utilities_enumerate_parent_paths (_tmp15_);
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp17_ = _tmp16_;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (_tmp15_);
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_parent_path_list = _tmp17_;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp18_ = _parent_path_list;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp19_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp20_ = _tmp19_;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_parent_path_size = _tmp20_;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_parent_path_index = -1;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			while (TRUE) {
-#line 2645 "Branch.c"
+#line 2654 "Branch.c"
 				gint _tmp21_ = 0;
 				gint _tmp22_ = 0;
 				gint _tmp23_ = 0;
@@ -2651,177 +2660,177 @@ static gboolean tags_sidebar_entry_real_internal_drop_received_arbitrary (Sideba
 				gpointer _tmp26_ = NULL;
 				const gchar* _tmp27_ = NULL;
 				const gchar* _tmp28_ = NULL;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp21_ = _parent_path_index;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_parent_path_index = _tmp21_ + 1;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp22_ = _parent_path_index;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp23_ = _parent_path_size;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				if (!(_tmp22_ < _tmp23_)) {
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					break;
-#line 2667 "Branch.c"
+#line 2676 "Branch.c"
 				}
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp24_ = _parent_path_list;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp25_ = _parent_path_index;
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp26_ = gee_list_get (_tmp24_, _tmp25_);
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				parent_path = (gchar*) _tmp26_;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp27_ = parent_path;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_tmp28_ = old_tag_path;
-#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				if (g_strcmp0 (_tmp27_, _tmp28_) == 0) {
-#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					result = TRUE;
-#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_free0 (parent_path);
-#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_object_unref0 (_parent_path_list);
-#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					_g_free0 (old_tag_path);
-#line 263 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 262 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 					return result;
-#line 2693 "Branch.c"
+#line 2702 "Branch.c"
 				}
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 				_g_free0 (parent_path);
-#line 2697 "Branch.c"
+#line 2706 "Branch.c"
 			}
-#line 261 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 260 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (_parent_path_list);
-#line 2701 "Branch.c"
+#line 2710 "Branch.c"
 		}
-#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp29_ = tag_global;
-#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp30_ = old_tag_path;
-#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp31_ = tag_source_collection_exists (_tmp29_, _tmp30_, FALSE);
-#line 266 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 265 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_vala_assert (_tmp31_, "Tag.global.exists(old_tag_path)");
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp32_ = old_tag_path;
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp33_ = tag_for_path (_tmp32_);
-#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 268 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag = _tmp33_;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp34_ = old_tag;
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp35_ = tag_get_hierarchical_parent (_tmp34_);
-#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 269 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		old_tag_parent = _tmp35_;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp37_ = old_tag_parent;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp37_ != NULL) {
-#line 2727 "Branch.c"
+#line 2736 "Branch.c"
 			Tag* _tmp38_ = NULL;
 			gchar* _tmp39_ = NULL;
 			gchar* _tmp40_ = NULL;
 			Tag* _tmp41_ = NULL;
 			gchar* _tmp42_ = NULL;
 			gchar* _tmp43_ = NULL;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp38_ = old_tag_parent;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp39_ = tag_get_path (_tmp38_);
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp40_ = _tmp39_;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp41_ = self->priv->tag;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp42_ = tag_get_path (_tmp41_);
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp43_ = _tmp42_;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp36_ = g_strcmp0 (_tmp40_, _tmp43_) == 0;
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (_tmp43_);
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (_tmp40_);
-#line 2752 "Branch.c"
+#line 2761 "Branch.c"
 		} else {
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_tmp36_ = FALSE;
-#line 2756 "Branch.c"
+#line 2765 "Branch.c"
 		}
-#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 270 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		if (_tmp36_) {
-#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			result = TRUE;
-#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (old_tag_parent);
-#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_object_unref0 (old_tag);
-#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			_g_free0 (old_tag_path);
-#line 272 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 271 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 			return result;
-#line 2770 "Branch.c"
+#line 2779 "Branch.c"
 		}
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp44_ = app_window_get_command_manager ();
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp45_ = _tmp44_;
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp46_ = old_tag;
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp47_ = self->priv->tag;
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp48_ = tag_get_path (_tmp47_);
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp49_ = _tmp48_;
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp50_ = reparent_tag_command_new (_tmp46_, _tmp49_);
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_tmp51_ = _tmp50_;
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		command_manager_execute (_tmp45_, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_COMMAND, Command));
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (_tmp51_);
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (_tmp49_);
-#line 274 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 273 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_command_manager_unref0 (_tmp45_);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		result = TRUE;
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (old_tag_parent);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_object_unref0 (old_tag);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		_g_free0 (old_tag_path);
-#line 277 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 276 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 		return result;
-#line 2806 "Branch.c"
+#line 2815 "Branch.c"
 	}
-#line 280 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = FALSE;
-#line 280 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 279 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2812 "Branch.c"
+#line 2821 "Branch.c"
 }
 
 
 static gboolean tags_sidebar_entry_real_expand_on_select (SidebarExpandableEntry* base) {
 	TagsSidebarEntry * self;
 	gboolean result = FALSE;
-#line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 282 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 284 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	result = FALSE;
-#line 284 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 283 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	return result;
-#line 2825 "Branch.c"
+#line 2834 "Branch.c"
 }
 
 
@@ -2865,13 +2874,13 @@ static guint8* string_get_data (const gchar* self, int* result_length1) {
 	if (result_length1) {
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 		*result_length1 = _tmp4__length1;
-#line 2869 "Branch.c"
+#line 2878 "Branch.c"
 	}
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	result = _tmp4_;
 #line 1401 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	return result;
-#line 2875 "Branch.c"
+#line 2884 "Branch.c"
 }
 
 
@@ -2886,123 +2895,123 @@ static void tags_sidebar_entry_real_prepare_selection_data (SidebarInternalDragS
 	gint _tmp5__length1 = 0;
 	guint8* _tmp6_ = NULL;
 	gint _tmp6__length1 = 0;
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 286 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_return_if_fail (data != NULL);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = data;
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp1_ = gdk_atom_intern_static_string (LIBRARY_WINDOW_TAG_PATH_MIME_TYPE);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp2_ = self->priv->tag;
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp3_ = tag_get_path (_tmp2_);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp4_ = _tmp3_;
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp5_ = string_get_data (_tmp4_, &_tmp5__length1);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6_ = _tmp5_;
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp6__length1 = _tmp5__length1;
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	gtk_selection_data_set (_tmp0_, _tmp1_, 0, _tmp6_, _tmp6__length1);
-#line 288 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 287 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (_tmp4_);
-#line 2914 "Branch.c"
+#line 2923 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_class_init (TagsSidebarEntryClass * klass) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_parent_class = g_type_class_peek_parent (klass);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	g_type_class_add_private (klass, sizeof (TagsSidebarEntryPrivate));
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_name = tags_sidebar_entry_real_get_sidebar_name;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->get_sidebar_icon = tags_sidebar_entry_real_get_sidebar_icon;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	((SidebarSimplePageEntryClass *) klass)->create_page = tags_sidebar_entry_real_create_page;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (klass)->finalize = tags_sidebar_entry_finalize;
-#line 2931 "Branch.c"
+#line 2940 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_renameable_entry_interface_init (SidebarRenameableEntryIface * iface) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_renameable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->is_user_renameable = (gboolean (*)(SidebarRenameableEntry*)) tags_sidebar_entry_real_is_user_renameable;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->rename = (void (*)(SidebarRenameableEntry*, const gchar*)) tags_sidebar_entry_real_rename;
-#line 2942 "Branch.c"
+#line 2951 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_destroyable_entry_interface_init (SidebarDestroyableEntryIface * iface) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_destroyable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->destroy_source = (void (*)(SidebarDestroyableEntry*)) tags_sidebar_entry_real_destroy_source;
-#line 2951 "Branch.c"
+#line 2960 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_internal_drop_target_entry_interface_init (SidebarInternalDropTargetEntryIface * iface) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_internal_drop_target_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->internal_drop_received = (gboolean (*)(SidebarInternalDropTargetEntry*, GeeList*)) tags_sidebar_entry_real_internal_drop_received;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->internal_drop_received_arbitrary = (gboolean (*)(SidebarInternalDropTargetEntry*, GtkSelectionData*)) tags_sidebar_entry_real_internal_drop_received_arbitrary;
-#line 2962 "Branch.c"
+#line 2971 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_expandable_entry_interface_init (SidebarExpandableEntryIface * iface) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_expandable_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->expand_on_select = (gboolean (*)(SidebarExpandableEntry*)) tags_sidebar_entry_real_expand_on_select;
-#line 2971 "Branch.c"
+#line 2980 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_sidebar_internal_drag_source_entry_interface_init (SidebarInternalDragSourceEntryIface * iface) {
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	tags_sidebar_entry_sidebar_internal_drag_source_entry_parent_iface = g_type_interface_peek_parent (iface);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	iface->prepare_selection_data = (void (*)(SidebarInternalDragSourceEntry*, GtkSelectionData*)) tags_sidebar_entry_real_prepare_selection_data;
-#line 2980 "Branch.c"
+#line 2989 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_instance_init (TagsSidebarEntry * self) {
 	gchar* _tmp0_ = NULL;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv = TAGS_SIDEBAR_ENTRY_GET_PRIVATE (self);
-#line 190 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_tmp0_ = g_strdup (RESOURCES_ICON_ONE_TAG);
-#line 190 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self->priv->single_tag_icon = _tmp0_;
-#line 2992 "Branch.c"
+#line 3001 "Branch.c"
 }
 
 
 static void tags_sidebar_entry_finalize (GObject* obj) {
 	TagsSidebarEntry * self;
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TAGS_TYPE_SIDEBAR_ENTRY, TagsSidebarEntry);
-#line 190 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 189 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_free0 (self->priv->single_tag_icon);
-#line 192 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 191 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	_g_object_unref0 (self->priv->tag);
-#line 187 "/home/jens/Source/shotwell/src/tags/Branch.vala"
+#line 186 "/home/jens/Source/shotwell/src/tags/Branch.vala"
 	G_OBJECT_CLASS (tags_sidebar_entry_parent_class)->finalize (obj);
-#line 3006 "Branch.c"
+#line 3015 "Branch.c"
 }
 
 
diff --git a/src/tags/Branch.vala b/src/tags/Branch.vala
index 41c6feb..52dabdb 100644
--- a/src/tags/Branch.vala
+++ b/src/tags/Branch.vala
@@ -135,8 +135,7 @@ public class Tags.Header : Sidebar.Header, Sidebar.InternalDropTargetEntry,
     private void setup_context_menu() {
         this.builder = new Gtk.Builder ();
         try {
-            this.builder.add_from_resource
-                            ("/org/gnome/Shotwell/tag_sidebar_context.ui");
+            this.builder.add_from_resource(Resources.get_ui("tag_sidebar_context.ui"));
             var model = builder.get_object ("popup-menu") as GLib.MenuModel;
             this.context_menu = new Gtk.Menu.from_model (model);
         } catch (Error error) {
diff --git a/src/tags/HierarchicalTagUtilities.c b/src/tags/HierarchicalTagUtilities.c
index 0977264..1945def 100644
--- a/src/tags/HierarchicalTagUtilities.c
+++ b/src/tags/HierarchicalTagUtilities.c
@@ -1311,7 +1311,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1314 "HierarchicalTagUtilities.c"
-				goto __catch55_g_regex_error;
+				goto __catch56_g_regex_error;
 			}
 #line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1336,7 +1336,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
 #line 1339 "HierarchicalTagUtilities.c"
-				goto __catch55_g_regex_error;
+				goto __catch56_g_regex_error;
 			}
 #line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
@@ -1362,8 +1362,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		return result;
 #line 1364 "HierarchicalTagUtilities.c"
 	}
-	goto __finally55;
-	__catch55_g_regex_error:
+	goto __finally56;
+	__catch56_g_regex_error:
 	{
 		GError* e = NULL;
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -1376,7 +1376,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
 		_g_error_free0 (e);
 #line 1378 "HierarchicalTagUtilities.c"
 	}
-	__finally55:
+	__finally56:
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
diff --git a/ui/Makefile.am b/ui/Makefile.am
index c13a172..73bb976 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -1,5 +1,4 @@
-uidir = $(datadir)/shotwell/ui
-dist_ui_DATA = \
+dist_noinst_DATA = \
 	collection.ui \
 	direct_context.ui \
 	direct.ui \
@@ -12,19 +11,16 @@ dist_ui_DATA = \
 	offline.ui \
 	photo_context.ui \
 	photo.ui \
+	printing_widget.ui \
 	savedsearch.ui \
 	search_bar.ui \
 	search_sidebar_context.ui \
+	set_background_dialog.ui \
+	set_background_slideshow_dialog.ui \
 	shotwell.ui \
 	sidebar_default_context.ui \
 	tag_sidebar_context.ui \
 	tags.ui \
-	top.ui \
 	trash.ui
 
-dist_noinst_DATA = \
-	set_background_dialog.ui \
-	set_background_slideshow_dialog.ui
-
-
 -include $(top_srcdir)/git.mk
diff --git a/ui/Makefile.in b/ui/Makefile.in
index dc60376..fca2df5 100644
--- a/ui/Makefile.in
+++ b/ui/Makefile.in
@@ -90,9 +90,7 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = ui
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \
-	$(top_srcdir)/m4/ax_check_enable_debug.m4 \
-	$(top_srcdir)/m4/ax_generate_changelog.m4 \
+am__aclocal_m4_deps = $(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 \
@@ -107,7 +105,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/appdata-xml.m4 \
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(dist_noinst_DATA) \
-	$(dist_ui_DATA) $(am__DIST_COMMON)
+	$(am__DIST_COMMON)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
@@ -131,35 +129,7 @@ am__can_run_installinfo = \
     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)$(uidir)"
-DATA = $(dist_noinst_DATA) $(dist_ui_DATA)
+DATA = $(dist_noinst_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 am__DIST_COMMON = $(srcdir)/Makefile.in
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -170,6 +140,9 @@ 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@
@@ -257,6 +230,7 @@ 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@
@@ -338,8 +312,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-uidir = $(datadir)/shotwell/ui
-dist_ui_DATA = \
+dist_noinst_DATA = \
 	collection.ui \
 	direct_context.ui \
 	direct.ui \
@@ -352,20 +325,18 @@ dist_ui_DATA = \
 	offline.ui \
 	photo_context.ui \
 	photo.ui \
+	printing_widget.ui \
 	savedsearch.ui \
 	search_bar.ui \
 	search_sidebar_context.ui \
+	set_background_dialog.ui \
+	set_background_slideshow_dialog.ui \
 	shotwell.ui \
 	sidebar_default_context.ui \
 	tag_sidebar_context.ui \
 	tags.ui \
-	top.ui \
 	trash.ui
 
-dist_noinst_DATA = \
-	set_background_dialog.ui \
-	set_background_slideshow_dialog.ui
-
 all: all-am
 
 .SUFFIXES:
@@ -404,27 +375,6 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-dist_uiDATA: $(dist_ui_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_ui_DATA)'; test -n "$(uidir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(uidir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(uidir)" || 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)$(uidir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \
-	done
-
-uninstall-dist_uiDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_ui_DATA)'; test -n "$(uidir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(uidir)'; $(am__uninstall_files_from_dir)
 tags TAGS:
 
 ctags CTAGS:
@@ -466,9 +416,6 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(uidir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -519,7 +466,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_uiDATA
+install-data-am:
 
 install-dvi: install-dvi-am
 
@@ -563,22 +510,21 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-dist_uiDATA
+uninstall-am:
 
 .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-data install-data-am \
-	install-dist_uiDATA 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-dist_uiDATA
+	install install-am 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
 
 .PRECIOUS: Makefile
 
diff --git a/ui/event.ui b/ui/event.ui
index 11d9b74..2189660 100644
--- a/ui/event.ui
+++ b/ui/event.ui
@@ -14,7 +14,7 @@
           <attribute name="action">win.ExternalLibraryImport</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Save _As…</attribute>
+          <attribute name="label" translatable="yes">_Export…</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;e</attribute>
           <attribute name="action">win.Export</attribute>
         </item>
diff --git a/ui/media.ui b/ui/media.ui
index e3d8ba1..c4622ae 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -14,7 +14,7 @@
           <attribute name="action">win.ExternalLibraryImport</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Save _As…</attribute>
+          <attribute name="label" translatable="yes">_Export…</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;e</attribute>
           <attribute name="action">win.Export</attribute>
         </item>
diff --git a/ui/photo.ui b/ui/photo.ui
index 6b662a5..33d2705 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -14,7 +14,7 @@
           <attribute name="action">win.ExternalLibraryImport</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Save _As…</attribute>
+          <attribute name="label" translatable="yes">_Export…</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;e</attribute>
           <attribute name="action">win.Export</attribute>
         </item>
diff --git a/ui/printing_widget.ui b/ui/printing_widget.ui
new file mode 100644
index 0000000..02b452e
--- /dev/null
+++ b/ui/printing_widget.ui
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.20.0 -->
+<interface domain="shotwell">
+  <requires lib="gtk+" version="3.14"/>
+  <template class="CustomPrintTab" parent="GtkBox">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="margin_left">12</property>
+    <property name="margin_right">12</property>
+    <property name="margin_top">12</property>
+    <property name="margin_bottom">12</property>
+    <property name="orientation">vertical</property>
+    <child>
+      <object class="GtkLabel" id="lbl_PrintedImageSize">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="halign">start</property>
+        <property name="margin_top">4</property>
+        <property name="label" translatable="yes">&lt;b&gt;Printed Image Size&lt;/b&gt;</property>
+        <property name="use_markup">True</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="margin_left">24</property>
+        <property name="margin_top">2</property>
+        <child>
+          <object class="GtkRadioButton" id="standard_size_radio">
+            <property name="label" translatable="yes">Use a _standard size:</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="active">True</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">custom_size_radio</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="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>
+          </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>
+            <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="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="GtkBox" id="box4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">19</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>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="lbl_MultSymbol">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label">×</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <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>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBoxText" id="units_combo">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="active">0</property>
+                <items>
+                  <item translatable="yes" comments="Abbrevation for &quot;inch&quot;">in.</item>
+                  <item translatable="yes" comments="Abbrevation for &quot;centimeters&quot;">cm</item>
+                </items>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">3</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="padding">14</property>
+            <property name="position">1</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>
+            <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="active">True</property>
+            <property name="draw_indicator">True</property>
+            <property name="group">custom_size_radio</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="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>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">4</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="lbl_Titles">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="halign">start</property>
+        <property name="label" translatable="yes">&lt;b&gt;Titles&lt;/b&gt;</property>
+        <property name="use_markup">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">5</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_top">2</property>
+        <child>
+          <object class="GtkCheckButton" id="title_print_check">
+            <property name="label" translatable="yes">Print image _title</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="halign">start</property>
+            <property name="use_underline">True</property>
+            <property name="draw_indicator">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFontButton" id="title_print_font">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="margin_left">49</property>
+            <property name="font">Sans 12</property>
+            <property name="preview_text"/>
+            <property name="show_preview_entry">False</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">True</property>
+        <property name="position">6</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkLabel" id="lbl_PixelResolution">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="halign">start</property>
+        <property name="margin_top">12</property>
+        <property name="label" translatable="yes">&lt;b&gt;Pixel Resolution&lt;/b&gt;</property>
+        <property name="use_markup">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">7</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_top">2</property>
+        <child>
+          <object class="GtkLabel" id="lbl_OutputPhotoAt">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">_Output photo at:</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">ppi_entry</property>
+            <property name="ellipsize">start</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="box8">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">65</property>
+            <child>
+              <object class="GtkEntry" id="ppi_entry">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="margin_right">8</property>
+                <property name="invisible_char">●</property>
+                <property name="width_chars">13</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="lbl_PixelsPerInch">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">pixels per inch</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">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">8</property>
+      </packing>
+    </child>
+  </template>
+</interface>
diff --git a/ui/shotwell.ui b/ui/shotwell.ui
index 573c736..59b034a 100644
--- a/ui/shotwell.ui
+++ b/ui/shotwell.ui
@@ -570,365 +570,6 @@
       </object>
     </child>
   </object>
-  <object class="GtkBox" id="box_ImgSettingsPane">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkLabel" id="lbl_PrintedImageSize">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="margin_top">4</property>
-        <property name="label" translatable="yes">&lt;b&gt;Printed Image Size&lt;/b&gt;</property>
-        <property name="use_markup">True</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="margin_left">24</property>
-        <property name="margin_top">2</property>
-        <child>
-          <object class="GtkRadioButton" id="radio_UseStandardSize">
-            <property name="label" translatable="yes">Use a _standard size:</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="active">True</property>
-            <property name="draw_indicator">True</property>
-            <property name="group">radio_UseCustomSize</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkComboBox" id="combo_StdSizes">
-            <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>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</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="radio_UseCustomSize">
-            <property name="label" translatable="yes">Use a c_ustom size:</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="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="GtkBox" id="box4">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">19</property>
-            <child>
-              <object class="GtkEntry" id="entry_CustomWidth">
-                <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>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="lbl_MultSymbol">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label">×</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="entry_CustomHeight">
-                <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>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBoxText" id="combo_Units">
-                <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">3</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="padding">14</property>
-            <property name="position">1</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="check_MatchAspectRatio">
-        <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="radio_Autosize">
-            <property name="label" translatable="yes">_Autosize:</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="active">True</property>
-            <property name="draw_indicator">True</property>
-            <property name="group">radio_UseCustomSize</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkComboBox" id="combo_Autosize">
-            <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>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">4</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="lbl_Titles">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">&lt;b&gt;Titles&lt;/b&gt;</property>
-        <property name="use_markup">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">5</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_top">2</property>
-        <child>
-          <object class="GtkCheckButton" id="check_PrintImageTitle">
-            <property name="label" translatable="yes">Print image _title</property>
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="halign">start</property>
-            <property name="use_underline">True</property>
-            <property name="draw_indicator">True</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFontButton" id="fntbn_TitleFont">
-            <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="margin_left">49</property>
-            <property name="font">Sans 12</property>
-            <property name="preview_text"/>
-            <property name="show_preview_entry">False</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">True</property>
-        <property name="position">6</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="lbl_PixelResolution">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="halign">start</property>
-        <property name="margin_top">12</property>
-        <property name="label" translatable="yes">&lt;b&gt;Pixel Resolution&lt;/b&gt;</property>
-        <property name="use_markup">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">7</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_top">2</property>
-        <child>
-          <object class="GtkLabel" id="lbl_OutputPhotoAt">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="label" translatable="yes">_Output photo at:</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">entry_PixelsPerInch</property>
-            <property name="ellipsize">start</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="box8">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">65</property>
-            <child>
-              <object class="GtkEntry" id="entry_PixelsPerInch">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="margin_right">8</property>
-                <property name="invisible_char">●</property>
-                <property name="width_chars">13</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="lbl_PixelsPerInch">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">pixels per inch</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">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">8</property>
-      </packing>
-    </child>
-  </object>
   <object class="GtkBox" id="criteria">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
diff --git a/ui/tags.ui b/ui/tags.ui
index 334b24d..910571b 100644
--- a/ui/tags.ui
+++ b/ui/tags.ui
@@ -14,7 +14,7 @@
           <attribute name="action">win.ExternalLibraryImport</attribute>
         </item>
         <item>
-          <attribute name="label" translatable="yes">Save _As…</attribute>
+          <attribute name="label" translatable="yes">_Export…</attribute>
           <attribute name="accel">&lt;Primary&gt;&lt;Shift&gt;e</attribute>
           <attribute name="action">win.Export</attribute>
         </item>
diff --git a/ui/top.ui b/ui/top.ui
deleted file mode 100644
index 683a2fa..0000000
--- a/ui/top.ui
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0"?>
-<interface domain="shotwell">
-  <menu id="MenuBar">
-    <submenu>
-      <attribute name="label" translatable="yes">_File</attribute>
-      <section>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_Edit</attribute>
-      <section>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_View</attribute>
-      <section>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_Photo</attribute>
-      <section>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_Photos</attribute>
-      <section>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">Even_ts</attribute>
-      <section>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">Ta_gs</attribute>
-      <section>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_Help</attribute>
-      <section>
-      </section>
-    </submenu>
-  </menu>
-</interface>
diff --git a/vapi/libgdata.vapi b/vapi/libgdata.vapi
new file mode 100644
index 0000000..4141f6b
--- /dev/null
+++ b/vapi/libgdata.vapi
@@ -0,0 +1,2404 @@
+/* libgdata.vapi generated by vapigen, do not modify. */
+
+[CCode (cprefix = "GData", gir_namespace = "GData", gir_version = "0.0", lower_case_cprefix = "gdata_")]
+namespace GData {
+	namespace ContactsGender {
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_GENDER_FEMALE")]
+		public const string FEMALE;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_GENDER_MALE")]
+		public const string MALE;
+	}
+	namespace ContactsGroupType {
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_GROUP_CONTACTS")]
+		public const string CONTACTS;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_GROUP_COWORKERS")]
+		public const string COWORKERS;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_GROUP_FAMILY")]
+		public const string FAMILY;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_GROUP_FRIENDS")]
+		public const string FRIENDS;
+	}
+	namespace ContactsPriority {
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_PRIORITY_HIGH")]
+		public const string HIGH;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_PRIORITY_LOW")]
+		public const string LOW;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_PRIORITY_NORMAL")]
+		public const string NORMAL;
+	}
+	namespace ContactsSensitivity {
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_SENSITIVITY_CONFIDENTIAL")]
+		public const string CONFIDENTIAL;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_SENSITIVITY_NORMAL")]
+		public const string NORMAL;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_SENSITIVITY_PERSONAL")]
+		public const string PERSONAL;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CONTACTS_SENSITIVITY_PRIVATE")]
+		public const string PRIVATE;
+	}
+	namespace DocumentsPresentationFormat {
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_PRESENTATION_PDF")]
+		public const string PDF;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_PRESENTATION_PNG")]
+		public const string PNG;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_PRESENTATION_PPT")]
+		public const string PPT;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_PRESENTATION_SWF")]
+		public const string SWF;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_PRESENTATION_TXT")]
+		public const string TXT;
+	}
+	namespace DocumentsSpreadsheetFormat {
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_SPREADSHEET_CSV")]
+		public const string CSV;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_SPREADSHEET_HTML")]
+		public const string HTML;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_SPREADSHEET_ODS")]
+		public const string ODS;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_SPREADSHEET_PDF")]
+		public const string PDF;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_SPREADSHEET_TSV")]
+		public const string TSV;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_SPREADSHEET_XLS")]
+		public const string XLS;
+	}
+	namespace DocumentsTextFormat {
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_TEXT_DOC")]
+		public const string DOC;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_TEXT_HTML")]
+		public const string HTML;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_TEXT_JPEG")]
+		public const string JPEG;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_TEXT_ODT")]
+		public const string ODT;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_TEXT_PDF")]
+		public const string PDF;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_TEXT_PNG")]
+		public const string PNG;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_TEXT_RTF")]
+		public const string RTF;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_TEXT_TXT")]
+		public const string TXT;
+		[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_TEXT_ZIP")]
+		public const string ZIP;
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_app_categories_get_type ()")]
+	public class APPCategories : GData.Parsable {
+		[CCode (has_construct_function = false)]
+		protected APPCategories ();
+		public unowned GLib.List<GData.Category> get_categories ();
+		[NoAccessorMethod]
+		public bool is_fixed { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_access_rule_get_type ()")]
+	public class AccessRule : GData.Entry {
+		[CCode (has_construct_function = false)]
+		public AccessRule (string id);
+		public int64 get_edited ();
+		public unowned string get_key ();
+		public unowned string get_role ();
+		public void get_scope (out unowned string type, out unowned string value);
+		public void set_role (string role);
+		public void set_scope (string type, string? value);
+		public int64 edited { get; }
+		public string key { get; }
+		public string role { get; set; }
+		[NoAccessorMethod]
+		public string scope_type { owned get; set; }
+		[NoAccessorMethod]
+		public string scope_value { owned get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_author_get_type ()")]
+	public class Author : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public Author (string name, string? uri, string? email_address);
+		public unowned string get_email_address ();
+		public unowned string get_name ();
+		public unowned string get_uri ();
+		public void set_email_address (string? email_address);
+		public void set_name (string name);
+		public void set_uri (string? uri);
+		public string email_address { get; set; }
+		public string name { get; set; }
+		public string uri { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_authorization_domain_get_type ()")]
+	public class AuthorizationDomain : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected AuthorizationDomain ();
+		public unowned string get_scope ();
+		public unowned string get_service_name ();
+		public string scope { get; construct; }
+		public string service_name { get; construct; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_batch_operation_get_type ()")]
+	public class BatchOperation : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected BatchOperation ();
+		public uint add_deletion (GData.Entry entry, [CCode (scope = "async")] GData.BatchOperationCallback callback);
+		public uint add_insertion (GData.Entry entry, [CCode (scope = "async")] GData.BatchOperationCallback callback);
+		public uint add_query (string id, GLib.Type entry_type, [CCode (scope = "async")] GData.BatchOperationCallback callback);
+		public uint add_update (GData.Entry entry, [CCode (scope = "async")] GData.BatchOperationCallback callback);
+		public unowned GData.AuthorizationDomain? get_authorization_domain ();
+		public unowned string get_feed_uri ();
+		public unowned GData.Service get_service ();
+		public bool run (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool run_async (GLib.Cancellable? cancellable) throws GLib.Error;
+		public GData.AuthorizationDomain authorization_domain { get; construct; }
+		public string feed_uri { get; construct; }
+		public GData.Service service { get; construct; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_calendar_access_rule_get_type ()")]
+	public class CalendarAccessRule : GData.AccessRule {
+		[CCode (has_construct_function = false)]
+		public CalendarAccessRule (string id);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_calendar_calendar_get_type ()")]
+	public class CalendarCalendar : GData.Entry, GData.AccessHandler {
+		[CCode (has_construct_function = false)]
+		public CalendarCalendar (string? id);
+		public unowned string get_access_level ();
+		public GData.Color get_color ();
+		public int64 get_edited ();
+		public uint get_times_cleaned ();
+		public unowned string get_timezone ();
+		public void set_color (GData.Color color);
+		public void set_is_hidden (bool is_hidden);
+		public void set_is_selected (bool is_selected);
+		public void set_timezone (string? _timezone);
+		public string access_level { get; }
+		public GData.Color color { get; set; }
+		public int64 edited { get; }
+		[NoAccessorMethod]
+		public bool is_hidden { get; set; }
+		[NoAccessorMethod]
+		public bool is_selected { get; set; }
+		public uint times_cleaned { get; }
+		public string timezone { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_calendar_event_get_type ()")]
+	public class CalendarEvent : GData.Entry {
+		[CCode (has_construct_function = false)]
+		public CalendarEvent (string? id);
+		public void add_person (GData.GDWho who);
+		public void add_place (GData.GDWhere where);
+		public void add_time (GData.GDWhen when);
+		public bool get_anyone_can_add_self ();
+		public int64 get_edited ();
+		public bool get_guests_can_invite_others ();
+		public bool get_guests_can_modify ();
+		public bool get_guests_can_see_guests ();
+		public void get_original_event_details (out string event_id, out string event_uri);
+		public unowned GLib.List<GData.GDWho> get_people ();
+		public unowned GLib.List<GData.GDWhere> get_places ();
+		public bool get_primary_time (out int64 start_time, out int64 end_time, out unowned GData.GDWhen when);
+		public unowned string get_recurrence ();
+		public uint get_sequence ();
+		public unowned string get_status ();
+		public unowned GLib.List<GData.GDWhen> get_times ();
+		public unowned string get_transparency ();
+		public unowned string get_uid ();
+		public unowned string get_visibility ();
+		public bool is_exception ();
+		public void set_anyone_can_add_self (bool anyone_can_add_self);
+		public void set_guests_can_invite_others (bool guests_can_invite_others);
+		public void set_guests_can_modify (bool guests_can_modify);
+		public void set_guests_can_see_guests (bool guests_can_see_guests);
+		public void set_recurrence (string? recurrence);
+		public void set_sequence (uint sequence);
+		public void set_status (string? status);
+		public void set_transparency (string? transparency);
+		public void set_uid (string? uid);
+		public void set_visibility (string? visibility);
+		public bool anyone_can_add_self { get; set; }
+		public int64 edited { get; }
+		public bool guests_can_invite_others { get; set; }
+		public bool guests_can_modify { get; set; }
+		public bool guests_can_see_guests { get; set; }
+		[NoAccessorMethod]
+		public string original_event_id { owned get; }
+		[NoAccessorMethod]
+		public string original_event_uri { owned get; }
+		public string recurrence { get; set; }
+		public uint sequence { get; set; }
+		public string status { get; set; }
+		public string transparency { get; set; }
+		public string uid { get; set; }
+		public string visibility { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_calendar_feed_get_type ()")]
+	public class CalendarFeed : GData.Feed {
+		[CCode (has_construct_function = false)]
+		protected CalendarFeed ();
+		public uint get_times_cleaned ();
+		public unowned string get_timezone ();
+		public uint times_cleaned { get; }
+		public string timezone { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_calendar_query_get_type ()")]
+	public class CalendarQuery : GData.Query {
+		[CCode (has_construct_function = false)]
+		public CalendarQuery (string? q);
+		public bool get_future_events ();
+		public uint get_max_attendees ();
+		public unowned string get_order_by ();
+		public int64 get_recurrence_expansion_end ();
+		public int64 get_recurrence_expansion_start ();
+		public bool get_single_events ();
+		public unowned string get_sort_order ();
+		public int64 get_start_max ();
+		public int64 get_start_min ();
+		public unowned string get_timezone ();
+		public void set_future_events (bool future_events);
+		public void set_max_attendees (uint max_attendees);
+		public void set_order_by (string? order_by);
+		public void set_recurrence_expansion_end (int64 end);
+		public void set_recurrence_expansion_start (int64 start);
+		public void set_show_deleted (bool show_deleted);
+		public void set_single_events (bool single_events);
+		public void set_sort_order (string? sort_order);
+		public void set_start_max (int64 start_max);
+		public void set_start_min (int64 start_min);
+		public void set_timezone (string? _timezone);
+		[CCode (has_construct_function = false)]
+		public CalendarQuery.with_limits (string? q, int64 start_min, int64 start_max);
+		public bool future_events { get; set; }
+		public uint max_attendees { get; set; }
+		public string order_by { get; set; }
+		public int64 recurrence_expansion_end { get; set; }
+		public int64 recurrence_expansion_start { get; set; }
+		[NoAccessorMethod]
+		public bool show_deleted { get; set; }
+		public bool single_events { get; set; }
+		public string sort_order { get; set; }
+		public int64 start_max { get; set; }
+		public int64 start_min { get; set; }
+		public string timezone { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_calendar_service_get_type ()")]
+	public class CalendarService : GData.Service, GData.Batchable {
+		[CCode (has_construct_function = false)]
+		public CalendarService (GData.Authorizer? authorizer);
+		public static unowned GData.AuthorizationDomain get_primary_authorization_domain ();
+		public GData.CalendarEvent insert_calendar_event (GData.CalendarCalendar calendar, GData.CalendarEvent event, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void insert_calendar_event_async (GData.CalendarCalendar calendar, GData.CalendarEvent event, GLib.Cancellable? cancellable);
+		public GData.CalendarEvent insert_event (GData.CalendarEvent event, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void insert_event_async (GData.CalendarEvent event, GLib.Cancellable? cancellable);
+		public GData.Feed query_all_calendars (GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_all_calendars_async (GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+		public GData.Feed query_events (GData.CalendarCalendar calendar, GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_events_async (GData.CalendarCalendar calendar, GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+		public GData.Feed query_own_calendars (GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_own_calendars_async (GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_category_get_type ()")]
+	public class Category : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public Category (string term, string? scheme, string? label);
+		public unowned string get_label ();
+		public unowned string get_scheme ();
+		public unowned string get_term ();
+		public void set_label (string? label);
+		public void set_scheme (string? scheme);
+		public void set_term (string term);
+		public string label { get; set; }
+		public string scheme { get; set; }
+		public string term { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_client_login_authorizer_get_type ()")]
+	public class ClientLoginAuthorizer : GLib.Object, GData.Authorizer {
+		[CCode (has_construct_function = false)]
+		public ClientLoginAuthorizer (string client_id, GLib.Type service_type);
+		public bool authenticate (string username, string password, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool authenticate_async (string username, string password, GLib.Cancellable? cancellable) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public ClientLoginAuthorizer.for_authorization_domains (string client_id, GLib.List<GData.AuthorizationDomain> authorization_domains);
+		public unowned string get_client_id ();
+		public unowned string get_password ();
+		public unowned GLib.ProxyResolver? get_proxy_resolver ();
+		public Soup.URI get_proxy_uri ();
+		public uint get_timeout ();
+		public unowned string get_username ();
+		public void set_proxy_resolver (GLib.ProxyResolver? proxy_resolver);
+		public void set_proxy_uri (Soup.URI? proxy_uri);
+		public void set_timeout (uint timeout);
+		public string client_id { get; construct; }
+		public string password { get; }
+		public GLib.ProxyResolver proxy_resolver { get; set; }
+		public Soup.URI proxy_uri { owned get; set; }
+		public uint timeout { get; set; }
+		public string username { get; }
+		public signal string captcha_challenge (string uri);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_comment_get_type ()")]
+	public abstract class Comment : GData.Entry {
+		[CCode (has_construct_function = false)]
+		protected Comment ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_contacts_contact_get_type ()")]
+	public class ContactsContact : GData.Entry {
+		[CCode (has_construct_function = false)]
+		public ContactsContact (string? id);
+		public void add_calendar (GData.GContactCalendar calendar);
+		public void add_email_address (GData.GDEmailAddress email_address);
+		public void add_event (GData.GContactEvent event);
+		public void add_external_id (GData.GContactExternalID external_id);
+		public void add_group (string href);
+		public void add_hobby (string hobby);
+		public void add_im_address (GData.GDIMAddress im_address);
+		public void add_jot (GData.GContactJot jot);
+		public void add_language (GData.GContactLanguage language);
+		public void add_organization (GData.GDOrganization organization);
+		public void add_phone_number (GData.GDPhoneNumber phone_number);
+		public void add_postal_address (GData.GDPostalAddress postal_address);
+		public void add_relation (GData.GContactRelation relation);
+		public void add_website (GData.GContactWebsite website);
+		public unowned string get_billing_information ();
+		public bool get_birthday (out GLib.Date birthday);
+		public unowned GLib.List<GData.GContactCalendar> get_calendars ();
+		public unowned string get_directory_server ();
+		public int64 get_edited ();
+		public unowned GLib.List<GData.GDEmailAddress> get_email_addresses ();
+		public unowned GLib.List<GData.GContactEvent> get_events ();
+		public unowned GLib.HashTable<void*,void*> get_extended_properties ();
+		public unowned string get_extended_property (string name);
+		public unowned GLib.List<GData.GContactExternalID> get_external_ids ();
+		public unowned string get_file_as ();
+		public unowned string get_gender ();
+		public GLib.List<weak string> get_groups ();
+		public unowned GLib.List<string> get_hobbies ();
+		public unowned GLib.List<GData.GDIMAddress> get_im_addresses ();
+		public unowned string get_initials ();
+		public unowned GLib.List<GData.GContactJot> get_jots ();
+		public unowned GLib.List<GData.GContactLanguage> get_languages ();
+		public unowned string get_maiden_name ();
+		public unowned string get_mileage ();
+		public unowned GData.GDName get_name ();
+		public unowned string get_nickname ();
+		public unowned string get_occupation ();
+		public unowned GLib.List<GData.GDOrganization> get_organizations ();
+		public unowned GLib.List<GData.GDPhoneNumber> get_phone_numbers ();
+		[CCode (array_length_pos = 1.5, array_length_type = "gsize")]
+		public uint8[] get_photo (GData.ContactsService service, out string content_type, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		[CCode (array_length_pos = 1.1)]
+		public async uint8[] get_photo_async (GData.ContactsService service, out string content_type) throws GLib.Error;
+		public unowned string get_photo_etag ();
+		public unowned GLib.List<GData.GDPostalAddress> get_postal_addresses ();
+		public unowned GData.GContactCalendar get_primary_calendar ();
+		public unowned GData.GDEmailAddress get_primary_email_address ();
+		public unowned GData.GDIMAddress get_primary_im_address ();
+		public unowned GData.GDOrganization get_primary_organization ();
+		public unowned GData.GDPhoneNumber get_primary_phone_number ();
+		public unowned GData.GDPostalAddress get_primary_postal_address ();
+		public unowned GData.GContactWebsite get_primary_website ();
+		public unowned string get_priority ();
+		public unowned GLib.List<GData.GContactRelation> get_relations ();
+		public unowned string get_sensitivity ();
+		public unowned string get_short_name ();
+		public unowned string get_subject ();
+		public unowned string get_user_defined_field (string name);
+		public unowned GLib.HashTable<void*,void*> get_user_defined_fields ();
+		public unowned GLib.List<GData.GContactWebsite> get_websites ();
+		public bool is_deleted ();
+		public bool is_group_deleted (string href);
+		public void remove_all_calendars ();
+		public void remove_all_email_addresses ();
+		public void remove_all_events ();
+		public void remove_all_external_ids ();
+		public void remove_all_hobbies ();
+		public void remove_all_im_addresses ();
+		public void remove_all_jots ();
+		public void remove_all_languages ();
+		public void remove_all_organizations ();
+		public void remove_all_phone_numbers ();
+		public void remove_all_postal_addresses ();
+		public void remove_all_relations ();
+		public void remove_all_websites ();
+		public void remove_group (string href);
+		public void set_billing_information (string? billing_information);
+		public void set_birthday (GLib.Date? birthday, bool birthday_has_year);
+		public void set_directory_server (string? directory_server);
+		public bool set_extended_property (string name, string? value);
+		public void set_file_as (string? file_as);
+		public void set_gender (string? gender);
+		public void set_initials (string? initials);
+		public void set_maiden_name (string? maiden_name);
+		public void set_mileage (string? mileage);
+		public void set_name (GData.GDName name);
+		public void set_nickname (string? nickname);
+		public void set_occupation (string? occupation);
+		public bool set_photo (GData.ContactsService service, uint8? data, size_t length, string? content_type, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool set_photo_async (GData.ContactsService service, uint8? data, size_t length, string? content_type, GLib.Cancellable? cancellable) throws GLib.Error;
+		public void set_priority (string? priority);
+		public void set_sensitivity (string? sensitivity);
+		public void set_short_name (string? short_name);
+		public void set_subject (string? subject);
+		public void set_user_defined_field (string name, string? value);
+		public string billing_information { get; set; }
+		[NoAccessorMethod]
+		public GLib.Date birthday { get; set; }
+		[NoAccessorMethod]
+		public bool birthday_has_year { get; set; }
+		[NoAccessorMethod]
+		public bool deleted { get; }
+		public string directory_server { get; set; }
+		public int64 edited { get; }
+		public string file_as { get; set; }
+		public string gender { get; set; }
+		public string initials { get; set; }
+		public string maiden_name { get; set; }
+		public string mileage { get; set; }
+		public GData.GDName name { get; set; }
+		public string nickname { get; set; }
+		public string occupation { get; set; }
+		public string photo_etag { get; }
+		public string priority { get; set; }
+		public string sensitivity { get; set; }
+		public string short_name { get; set; }
+		public string subject { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_contacts_group_get_type ()")]
+	public class ContactsGroup : GData.Entry {
+		[CCode (has_construct_function = false)]
+		public ContactsGroup (string? id);
+		public int64 get_edited ();
+		public unowned GLib.HashTable<void*,void*> get_extended_properties ();
+		public unowned string get_extended_property (string name);
+		public unowned string get_system_group_id ();
+		public bool is_deleted ();
+		public bool set_extended_property (string name, string? value);
+		[NoAccessorMethod]
+		public bool deleted { get; }
+		public int64 edited { get; }
+		public string system_group_id { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_contacts_query_get_type ()")]
+	public class ContactsQuery : GData.Query {
+		[CCode (has_construct_function = false)]
+		public ContactsQuery (string? q);
+		public unowned string get_group ();
+		public unowned string get_order_by ();
+		public unowned string get_sort_order ();
+		public void set_group (string? group);
+		public void set_order_by (string? order_by);
+		public void set_show_deleted (bool show_deleted);
+		public void set_sort_order (string? sort_order);
+		[CCode (has_construct_function = false)]
+		public ContactsQuery.with_limits (string? q, uint start_index, uint max_results);
+		public string group { get; set; }
+		public string order_by { get; set; }
+		[NoAccessorMethod]
+		public bool show_deleted { get; set; }
+		public string sort_order { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_contacts_service_get_type ()")]
+	public class ContactsService : GData.Service, GData.Batchable {
+		[CCode (has_construct_function = false)]
+		public ContactsService (GData.Authorizer? authorizer);
+		public static unowned GData.AuthorizationDomain get_primary_authorization_domain ();
+		public GData.ContactsContact insert_contact (GData.ContactsContact contact, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void insert_contact_async (GData.ContactsContact contact, GLib.Cancellable? cancellable);
+		public GData.ContactsGroup insert_group (GData.ContactsGroup group, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void insert_group_async (GData.ContactsGroup group, GLib.Cancellable? cancellable);
+		public GData.Feed query_contacts (GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_contacts_async (GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+		public GData.Feed query_groups (GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_groups_async (GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_access_rule_get_type ()")]
+	public class DocumentsAccessRule : GData.AccessRule {
+		[CCode (has_construct_function = false)]
+		public DocumentsAccessRule (string id);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_document_get_type ()")]
+	public class DocumentsDocument : GData.DocumentsEntry, GData.AccessHandler {
+		[CCode (has_construct_function = false)]
+		public DocumentsDocument (string? id);
+		public GData.DownloadStream download (GData.DocumentsService service, string export_format, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public string? get_download_uri (string export_format);
+		public unowned string? get_thumbnail_uri ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_drawing_get_type ()")]
+	public class DocumentsDrawing : GData.DocumentsDocument, GData.AccessHandler {
+		[CCode (has_construct_function = false)]
+		public DocumentsDrawing (string? id);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_entry_get_type ()")]
+	public abstract class DocumentsEntry : GData.Entry, GData.AccessHandler {
+		[CCode (has_construct_function = false)]
+		protected DocumentsEntry ();
+		public unowned string get_document_id ();
+		public int64 get_edited ();
+		public unowned GData.Author get_last_modified_by ();
+		public int64 get_last_viewed ();
+		public string get_path ();
+		public int64 get_quota_used ();
+		public unowned string get_resource_id ();
+		public void set_writers_can_invite (bool writers_can_invite);
+		public string document_id { get; }
+		public int64 edited { get; }
+		[NoAccessorMethod]
+		public bool is_deleted { get; set; }
+		public GData.Author last_modified_by { get; }
+		public int64 last_viewed { get; }
+		public int64 quota_used { get; }
+		public string resource_id { get; }
+		[NoAccessorMethod]
+		public bool writers_can_invite { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_feed_get_type ()")]
+	public class DocumentsFeed : GData.Feed {
+		[CCode (has_construct_function = false)]
+		protected DocumentsFeed ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_folder_get_type ()")]
+	public class DocumentsFolder : GData.DocumentsEntry, GData.AccessHandler {
+		[CCode (has_construct_function = false)]
+		public DocumentsFolder (string? id);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_pdf_get_type ()")]
+	public class DocumentsPdf : GData.DocumentsDocument, GData.AccessHandler {
+		[CCode (has_construct_function = false)]
+		public DocumentsPdf (string? id);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_presentation_get_type ()")]
+	public class DocumentsPresentation : GData.DocumentsDocument, GData.AccessHandler {
+		[CCode (has_construct_function = false)]
+		public DocumentsPresentation (string? id);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_query_get_type ()")]
+	public class DocumentsQuery : GData.Query {
+		[CCode (has_construct_function = false)]
+		public DocumentsQuery (string? q);
+		public void add_collaborator (string email_address);
+		public void add_reader (string email_address);
+		public unowned GLib.List<GData.GDEmailAddress> get_collaborator_addresses ();
+		public bool get_exact_title ();
+		public unowned string get_folder_id ();
+		public unowned GLib.List<GData.GDEmailAddress> get_reader_addresses ();
+		public unowned string get_title ();
+		public void set_folder_id (string? folder_id);
+		public void set_show_deleted (bool show_deleted);
+		public void set_show_folders (bool show_folders);
+		public void set_title (string? title, bool exact_title);
+		[CCode (has_construct_function = false)]
+		public DocumentsQuery.with_limits (string? q, uint start_index, uint max_results);
+		[NoAccessorMethod]
+		public bool exact_title { get; set; }
+		public string folder_id { get; set; }
+		[NoAccessorMethod]
+		public bool show_deleted { get; set; }
+		[NoAccessorMethod]
+		public bool show_folders { get; set; }
+		[NoAccessorMethod]
+		public string title { owned get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_service_get_type ()")]
+	public class DocumentsService : GData.Service, GData.Batchable {
+		[CCode (has_construct_function = false)]
+		public DocumentsService (GData.Authorizer? authorizer);
+		public GData.DocumentsEntry add_entry_to_folder (GData.DocumentsEntry entry, GData.DocumentsFolder folder, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async GData.DocumentsEntry add_entry_to_folder_async (GData.DocumentsEntry entry, GData.DocumentsFolder folder, GLib.Cancellable? cancellable) throws GLib.Error;
+		public GData.DocumentsDocument copy_document (GData.DocumentsDocument document, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async GData.DocumentsDocument copy_document_async (GData.DocumentsDocument document, GLib.Cancellable? cancellable) throws GLib.Error;
+		public GData.DocumentsDocument finish_upload (GData.UploadStream upload_stream) throws GLib.Error;
+		public static unowned GData.AuthorizationDomain get_primary_authorization_domain ();
+		public static unowned GData.AuthorizationDomain get_spreadsheet_authorization_domain ();
+		public static string get_upload_uri (GData.DocumentsFolder? folder);
+		public GData.DocumentsFeed query_documents (GData.DocumentsQuery? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_documents_async (GData.DocumentsQuery? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+		public GData.DocumentsEntry remove_entry_from_folder (GData.DocumentsEntry entry, GData.DocumentsFolder folder, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async GData.DocumentsEntry remove_entry_from_folder_async (GData.DocumentsEntry entry, GData.DocumentsFolder folder, GLib.Cancellable? cancellable) throws GLib.Error;
+		public GData.UploadStream update_document (GData.DocumentsDocument document, string slug, string content_type, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public GData.UploadStream update_document_resumable (GData.DocumentsDocument document, string slug, string content_type, int64 content_length, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public GData.UploadStream upload_document (GData.DocumentsDocument? document, string slug, string content_type, GData.DocumentsFolder? folder, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public GData.UploadStream upload_document_resumable (GData.DocumentsDocument? document, string slug, string content_type, int64 content_length, GData.DocumentsUploadQuery? query, GLib.Cancellable? cancellable = null) throws GLib.Error;
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_spreadsheet_get_type ()")]
+	public class DocumentsSpreadsheet : GData.DocumentsDocument, GData.AccessHandler {
+		[CCode (has_construct_function = false)]
+		public DocumentsSpreadsheet (string? id);
+		public string get_download_uri (string export_format, int gid);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_text_get_type ()")]
+	public class DocumentsText : GData.DocumentsDocument, GData.AccessHandler {
+		[CCode (has_construct_function = false)]
+		public DocumentsText (string? id);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_documents_upload_query_get_type ()")]
+	public class DocumentsUploadQuery : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public DocumentsUploadQuery ();
+		public string build_uri ();
+		public bool get_convert ();
+		public unowned GData.DocumentsFolder? get_folder ();
+		public void set_convert (bool convert);
+		public void set_folder (GData.DocumentsFolder? folder);
+		public bool convert { get; set; }
+		public GData.DocumentsFolder folder { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_download_stream_get_type ()")]
+	public class DownloadStream : GLib.InputStream, GLib.Seekable {
+		[CCode (has_construct_function = false, type = "GInputStream*")]
+		public DownloadStream (GData.Service service, GData.AuthorizationDomain? domain, string download_uri, GLib.Cancellable? cancellable = null);
+		public unowned GData.AuthorizationDomain? get_authorization_domain ();
+		public unowned GLib.Cancellable get_cancellable ();
+		public ssize_t get_content_length ();
+		public unowned string get_content_type ();
+		public unowned string get_download_uri ();
+		public unowned GData.Service get_service ();
+		public GData.AuthorizationDomain authorization_domain { get; construct; }
+		public GLib.Cancellable cancellable { get; construct; }
+		public long content_length { get; }
+		public string content_type { get; }
+		public string download_uri { get; construct; }
+		public GData.Service service { get; construct; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_entry_get_type ()")]
+	public class Entry : GData.Parsable {
+		[CCode (has_construct_function = false)]
+		public Entry (string? id);
+		public void add_author (GData.Author author);
+		public void add_category (GData.Category category);
+		public void add_link (GData.Link _link);
+		public unowned GLib.List<GData.Author> get_authors ();
+		public unowned GLib.List<GData.Category> get_categories ();
+		public unowned string get_content ();
+		public unowned string get_content_uri ();
+		public unowned string get_etag ();
+		public unowned string get_id ();
+		public int64 get_published ();
+		public unowned string get_rights ();
+		public unowned string get_summary ();
+		public unowned string get_title ();
+		public int64 get_updated ();
+		public unowned GData.Link look_up_link (string rel);
+		public GLib.List<weak GData.Link> look_up_links (string rel);
+		public bool remove_link (GData.Link _link);
+		public void set_content (string? content);
+		public void set_content_uri (string? content_uri);
+		public void set_rights (string? rights);
+		public void set_summary (string? summary);
+		public void set_title (string? title);
+		public string content { get; set; }
+		public string content_uri { get; set; }
+		public string etag { get; construct; }
+		public string id { get; construct; }
+		[NoAccessorMethod]
+		public bool is_inserted { get; }
+		public int64 published { get; }
+		public string rights { get; set; }
+		public string summary { get; set; }
+		public string title { get; set; }
+		public int64 updated { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_feed_get_type ()")]
+	public class Feed : GData.Parsable {
+		[CCode (has_construct_function = false)]
+		protected Feed ();
+		public unowned GLib.List<GData.Author> get_authors ();
+		public unowned GLib.List<GData.Category> get_categories ();
+		public unowned GLib.List<GData.Entry> get_entries ();
+		public unowned string get_etag ();
+		public unowned GData.Generator get_generator ();
+		public unowned string get_icon ();
+		public unowned string get_id ();
+		public uint get_items_per_page ();
+		public unowned GLib.List<GData.Link> get_links ();
+		public unowned string get_logo ();
+		public unowned string get_rights ();
+		public uint get_start_index ();
+		public unowned string get_subtitle ();
+		public unowned string get_title ();
+		public uint get_total_results ();
+		public int64 get_updated ();
+		public unowned GData.Entry look_up_entry (string id);
+		public unowned GData.Link look_up_link (string rel);
+		public string etag { get; }
+		public GData.Generator generator { get; }
+		public string icon { get; }
+		public string id { get; }
+		public uint items_per_page { get; }
+		public string logo { get; }
+		public string rights { get; }
+		public uint start_index { get; }
+		public string subtitle { get; }
+		public string title { get; }
+		public uint total_results { get; }
+		public int64 updated { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_freebase_query_get_type ()")]
+	public class FreebaseQuery : GData.Query {
+		[CCode (has_construct_function = false)]
+		public FreebaseQuery (string mql);
+		[CCode (has_construct_function = false)]
+		public FreebaseQuery.from_variant (GLib.Variant variant);
+		[NoAccessorMethod]
+		public GLib.Variant variant { owned get; construct; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_freebase_result_get_type ()")]
+	public class FreebaseResult : GData.Entry {
+		[CCode (has_construct_function = false)]
+		public FreebaseResult ();
+		public GLib.Variant? dup_variant ();
+		[NoAccessorMethod]
+		public GLib.Variant variant { owned get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_freebase_search_query_get_type ()")]
+	public class FreebaseSearchQuery : GData.Query {
+		[CCode (has_construct_function = false)]
+		public FreebaseSearchQuery (string search_terms);
+		public void add_filter (string property, string value);
+		public void add_location (uint64 radius, double lat, double lon);
+		public void close_filter ();
+		public unowned string? get_language ();
+		public bool get_stemmed ();
+		public void open_filter (GData.FreebaseSearchFilterType filter_type);
+		public void set_language (string? lang);
+		public void set_stemmed (bool stemmed);
+		public string language { get; set; }
+		public bool stemmed { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_freebase_search_result_get_type ()")]
+	public class FreebaseSearchResult : GData.FreebaseResult {
+		[CCode (has_construct_function = false)]
+		public FreebaseSearchResult ();
+		public unowned GData.FreebaseSearchResultItem? get_item (uint i);
+		public uint get_num_items ();
+		public uint get_total_hits ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gdata_freebase_search_result_item_get_type ()")]
+	[Compact]
+	public class FreebaseSearchResultItem {
+		public unowned string get_id ();
+		public unowned string get_language ();
+		public unowned string get_mid ();
+		public unowned string get_name ();
+		public unowned string? get_notable_id ();
+		public unowned string? get_notable_name ();
+		public double get_score ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_freebase_service_get_type ()")]
+	public class FreebaseService : GData.Service {
+		[CCode (has_construct_function = false)]
+		public FreebaseService (string? developer_key, GData.Authorizer? authorizer);
+		public GLib.InputStream get_image (GData.FreebaseTopicValue value, GLib.Cancellable? cancellable, uint max_width, uint max_height) throws GLib.Error;
+		public static unowned GData.AuthorizationDomain get_primary_authorization_domain ();
+		public GData.FreebaseTopicResult get_topic (GData.FreebaseTopicQuery query, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void get_topic_async (GData.FreebaseTopicQuery query, GLib.Cancellable? cancellable);
+		public GData.FreebaseResult query (GData.FreebaseQuery query, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void query_async (GData.FreebaseQuery query, GLib.Cancellable? cancellable);
+		public GData.FreebaseSearchResult search (GData.FreebaseSearchQuery query, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void search_async (GData.FreebaseSearchQuery query, GLib.Cancellable? cancellable);
+		[NoAccessorMethod]
+		public string developer_key { owned get; construct; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", ref_function = "gdata_freebase_topic_object_ref", type_id = "gdata_freebase_topic_object_get_type ()", unref_function = "gdata_freebase_topic_object_unref")]
+	[Compact]
+	public class FreebaseTopicObject {
+		public unowned string get_id ();
+		public uint64 get_property_count (string property);
+		public uint64 get_property_hits (string property);
+		public unowned GData.FreebaseTopicValue? get_property_value (string property, int64 item);
+		public GLib.GenericArray<weak string> list_properties ();
+		public GData.FreebaseTopicObject @ref ();
+		public void unref ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_freebase_topic_query_get_type ()")]
+	public class FreebaseTopicQuery : GData.Query {
+		[CCode (has_construct_function = false)]
+		public FreebaseTopicQuery (string id);
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[]? get_filter ();
+		public unowned string? get_language ();
+		public void set_filter ([CCode (array_length = false, array_null_terminated = true)] string[]? filter);
+		public void set_language (string? lang);
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] filter { get; set; }
+		public string language { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_freebase_topic_result_get_type ()")]
+	public class FreebaseTopicResult : GData.FreebaseResult {
+		[CCode (has_construct_function = false)]
+		public FreebaseTopicResult ();
+		public GData.FreebaseTopicObject dup_object ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", ref_function = "gdata_freebase_topic_value_ref", type_id = "gdata_freebase_topic_value_get_type ()", unref_function = "gdata_freebase_topic_value_unref")]
+	[Compact]
+	public class FreebaseTopicValue {
+		public GLib.Value copy_value ();
+		public unowned string get_creator ();
+		public double get_double ();
+		public int64 get_int ();
+		public unowned string get_language ();
+		public unowned GData.FreebaseTopicObject get_object ();
+		public unowned string get_property ();
+		public unowned string get_string ();
+		public unowned string get_text ();
+		public int64 get_timestamp ();
+		public GLib.Type get_value_type ();
+		public bool is_image ();
+		public GData.FreebaseTopicValue @ref ();
+		public void unref ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gcontact_calendar_get_type ()")]
+	public class GContactCalendar : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GContactCalendar (string uri, string? relation_type, string? label, bool is_primary);
+		public unowned string get_label ();
+		public unowned string get_relation_type ();
+		public unowned string get_uri ();
+		public void set_is_primary (bool is_primary);
+		public void set_label (string? label);
+		public void set_relation_type (string? relation_type);
+		public void set_uri (string uri);
+		[NoAccessorMethod]
+		public bool is_primary { get; set; }
+		public string label { get; set; }
+		public string relation_type { get; set; }
+		public string uri { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gcontact_event_get_type ()")]
+	public class GContactEvent : GData.Parsable {
+		[CCode (has_construct_function = false)]
+		public GContactEvent (GLib.Date date, string? relation_type, string? label);
+		public GLib.Date get_date ();
+		public unowned string get_label ();
+		public unowned string get_relation_type ();
+		public void set_date (GLib.Date date);
+		public void set_label (string? label);
+		public void set_relation_type (string? relation_type);
+		public GLib.Date date { get; set; }
+		public string label { get; set; }
+		public string relation_type { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gcontact_external_id_get_type ()")]
+	public class GContactExternalID : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GContactExternalID (string value, string? relation_type, string? label);
+		public unowned string get_label ();
+		public unowned string get_relation_type ();
+		public unowned string get_value ();
+		public void set_label (string? label);
+		public void set_relation_type (string? relation_type);
+		public void set_value (string value);
+		public string label { get; set; }
+		public string relation_type { get; set; }
+		public string value { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gcontact_jot_get_type ()")]
+	public class GContactJot : GData.Parsable {
+		[CCode (has_construct_function = false)]
+		public GContactJot (string content, string relation_type);
+		public unowned string get_content ();
+		public unowned string get_relation_type ();
+		public void set_content (string content);
+		public void set_relation_type (string relation_type);
+		public string content { get; set; }
+		public string relation_type { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gcontact_language_get_type ()")]
+	public class GContactLanguage : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GContactLanguage (string? code, string? label);
+		public unowned string get_code ();
+		public unowned string get_label ();
+		public void set_code (string? code);
+		public void set_label (string? label);
+		public string code { get; set; }
+		public string label { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gcontact_relation_get_type ()")]
+	public class GContactRelation : GData.Parsable {
+		[CCode (has_construct_function = false)]
+		public GContactRelation (string name, string? relation_type, string? label);
+		public unowned string get_label ();
+		public unowned string get_name ();
+		public unowned string get_relation_type ();
+		public void set_label (string? label);
+		public void set_name (string? name);
+		public void set_relation_type (string? relation_type);
+		public string label { get; set; }
+		public string name { get; set; }
+		public string relation_type { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gcontact_website_get_type ()")]
+	public class GContactWebsite : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GContactWebsite (string uri, string relation_type, string? label, bool is_primary);
+		public unowned string get_label ();
+		public unowned string get_relation_type ();
+		public unowned string get_uri ();
+		public void set_is_primary (bool is_primary);
+		public void set_label (string? label);
+		public void set_relation_type (string relation_type);
+		public void set_uri (string uri);
+		[NoAccessorMethod]
+		public bool is_primary { get; set; }
+		public string label { get; set; }
+		public string relation_type { get; set; }
+		public string uri { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gd_email_address_get_type ()")]
+	public class GDEmailAddress : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GDEmailAddress (string address, string? relation_type, string? label, bool is_primary);
+		public unowned string get_address ();
+		public unowned string get_display_name ();
+		public unowned string get_label ();
+		public unowned string get_relation_type ();
+		public void set_address (string address);
+		public void set_display_name (string? display_name);
+		public void set_is_primary (bool is_primary);
+		public void set_label (string? label);
+		public void set_relation_type (string? relation_type);
+		public string address { get; set; }
+		public string display_name { get; set; }
+		[NoAccessorMethod]
+		public bool is_primary { get; set; }
+		public string label { get; set; }
+		public string relation_type { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "gd_im_address", type_id = "gdata_gd_im_address_get_type ()")]
+	public class GDIMAddress : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GDIMAddress (string address, string? protocol, string? relation_type, string? label, bool is_primary);
+		public unowned string get_address ();
+		public unowned string get_label ();
+		public unowned string get_protocol ();
+		public unowned string get_relation_type ();
+		public void set_address (string address);
+		public void set_is_primary (bool is_primary);
+		public void set_label (string? label);
+		public void set_protocol (string? protocol);
+		public void set_relation_type (string? relation_type);
+		public string address { get; set; }
+		[NoAccessorMethod]
+		public bool is_primary { get; set; }
+		public string label { get; set; }
+		public string protocol { get; set; }
+		public string relation_type { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gd_name_get_type ()")]
+	public class GDName : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GDName (string? given_name, string? family_name);
+		public unowned string get_additional_name ();
+		public unowned string get_family_name ();
+		public unowned string get_full_name ();
+		public unowned string get_given_name ();
+		public unowned string get_prefix ();
+		public unowned string get_suffix ();
+		public void set_additional_name (string? additional_name);
+		public void set_family_name (string? family_name);
+		public void set_full_name (string? full_name);
+		public void set_given_name (string? given_name);
+		public void set_prefix (string? prefix);
+		public void set_suffix (string? suffix);
+		public string additional_name { get; set; }
+		public string family_name { get; set; }
+		public string full_name { get; set; }
+		public string given_name { get; set; }
+		public string prefix { get; set; }
+		public string suffix { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gd_organization_get_type ()")]
+	public class GDOrganization : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GDOrganization (string? name, string? title, string? relation_type, string? label, bool is_primary);
+		public unowned string get_department ();
+		public unowned string get_job_description ();
+		public unowned string get_label ();
+		public unowned GData.GDWhere get_location ();
+		public unowned string get_name ();
+		public unowned string get_relation_type ();
+		public unowned string get_symbol ();
+		public unowned string get_title ();
+		public void set_department (string? department);
+		public void set_is_primary (bool is_primary);
+		public void set_job_description (string? job_description);
+		public void set_label (string? label);
+		public void set_location (GData.GDWhere? location);
+		public void set_name (string? name);
+		public void set_relation_type (string? relation_type);
+		public void set_symbol (string? symbol);
+		public void set_title (string? title);
+		public string department { get; set; }
+		[NoAccessorMethod]
+		public bool is_primary { get; set; }
+		public string job_description { get; set; }
+		public string label { get; set; }
+		public GData.GDWhere location { get; set; }
+		public string name { get; set; }
+		public string relation_type { get; set; }
+		public string symbol { get; set; }
+		public string title { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gd_phone_number_get_type ()")]
+	public class GDPhoneNumber : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GDPhoneNumber (string number, string? relation_type, string? label, string? uri, bool is_primary);
+		public unowned string get_label ();
+		public unowned string get_number ();
+		public unowned string get_relation_type ();
+		public unowned string get_uri ();
+		public void set_is_primary (bool is_primary);
+		public void set_label (string? label);
+		public void set_number (string number);
+		public void set_relation_type (string? relation_type);
+		public void set_uri (string? uri);
+		[NoAccessorMethod]
+		public bool is_primary { get; set; }
+		public string label { get; set; }
+		public string number { get; set; }
+		public string relation_type { get; set; }
+		public string uri { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gd_postal_address_get_type ()")]
+	public class GDPostalAddress : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GDPostalAddress (string? relation_type, string? label, bool is_primary);
+		public unowned string get_address ();
+		public unowned string get_agent ();
+		public unowned string get_city ();
+		public unowned string get_country ();
+		public unowned string get_country_code ();
+		public unowned string get_house_name ();
+		public unowned string get_label ();
+		public unowned string get_mail_class ();
+		public unowned string get_neighborhood ();
+		public unowned string get_po_box ();
+		public unowned string get_postcode ();
+		public unowned string get_region ();
+		public unowned string get_relation_type ();
+		public unowned string get_street ();
+		public unowned string get_subregion ();
+		public unowned string get_usage ();
+		public void set_address (string? address);
+		public void set_agent (string? agent);
+		public void set_city (string? city);
+		public void set_country (string? country, string? country_code);
+		public void set_house_name (string? house_name);
+		public void set_is_primary (bool is_primary);
+		public void set_label (string? label);
+		public void set_mail_class (string? mail_class);
+		public void set_neighborhood (string? neighborhood);
+		public void set_po_box (string? po_box);
+		public void set_postcode (string? postcode);
+		public void set_region (string? region);
+		public void set_relation_type (string? relation_type);
+		public void set_street (string? street);
+		public void set_subregion (string? subregion);
+		public void set_usage (string? usage);
+		public string address { get; set; }
+		public string agent { get; set; }
+		public string city { get; set; }
+		public string country { get; }
+		public string country_code { get; }
+		public string house_name { get; set; }
+		[NoAccessorMethod]
+		public bool is_primary { get; set; }
+		public string label { get; set; }
+		public string mail_class { get; set; }
+		public string neighborhood { get; set; }
+		public string po_box { get; set; }
+		public string postcode { get; set; }
+		public string region { get; set; }
+		public string relation_type { get; set; }
+		public string street { get; set; }
+		public string subregion { get; set; }
+		public string usage { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gd_reminder_get_type ()")]
+	public class GDReminder : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GDReminder (string? method, int64 absolute_time, int relative_time);
+		public int64 get_absolute_time ();
+		public unowned string get_method ();
+		public int get_relative_time ();
+		public void set_absolute_time (int64 absolute_time);
+		public void set_method (string? method);
+		public void set_relative_time (int relative_time);
+		public int64 absolute_time { get; set; }
+		[NoAccessorMethod]
+		public bool is_absolute_time { get; }
+		public string method { get; set; }
+		public int relative_time { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gd_when_get_type ()")]
+	public class GDWhen : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GDWhen (int64 start_time, int64 end_time, bool is_date);
+		public void add_reminder (GData.GDReminder reminder);
+		public int64 get_end_time ();
+		public unowned GLib.List<GData.GDReminder> get_reminders ();
+		public int64 get_start_time ();
+		public unowned string get_value_string ();
+		public void set_end_time (int64 end_time);
+		public void set_is_date (bool is_date);
+		public void set_start_time (int64 start_time);
+		public void set_value_string (string? value_string);
+		public int64 end_time { get; set; }
+		[NoAccessorMethod]
+		public bool is_date { get; set; }
+		public int64 start_time { get; set; }
+		public string value_string { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gd_where_get_type ()")]
+	public class GDWhere : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GDWhere (string? relation_type, string? value_string, string? label);
+		public unowned string get_label ();
+		public unowned string get_relation_type ();
+		public unowned string get_value_string ();
+		public void set_label (string? label);
+		public void set_relation_type (string? relation_type);
+		public void set_value_string (string? value_string);
+		public string label { get; set; }
+		public string relation_type { get; set; }
+		public string value_string { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_gd_who_get_type ()")]
+	public class GDWho : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public GDWho (string? relation_type, string? value_string, string? email_address);
+		public unowned string get_email_address ();
+		public unowned string get_relation_type ();
+		public unowned string get_value_string ();
+		public void set_email_address (string? email_address);
+		public void set_relation_type (string? relation_type);
+		public void set_value_string (string? value_string);
+		public string email_address { get; set; }
+		public string relation_type { get; set; }
+		public string value_string { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_generator_get_type ()")]
+	public class Generator : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		protected Generator ();
+		public unowned string get_name ();
+		public unowned string get_uri ();
+		public unowned string get_version ();
+		public string name { get; }
+		public string uri { get; }
+		public string version { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_link_get_type ()")]
+	public class Link : GData.Parsable, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		public Link (string uri, string? relation_type);
+		public unowned string get_content_type ();
+		public unowned string get_language ();
+		public int get_length ();
+		public unowned string get_relation_type ();
+		public unowned string get_title ();
+		public unowned string get_uri ();
+		public void set_content_type (string? content_type);
+		public void set_language (string? language);
+		public void set_length (int length);
+		public void set_relation_type (string? relation_type);
+		public void set_title (string? title);
+		public void set_uri (string uri);
+		public string content_type { get; set; }
+		public string language { get; set; }
+		public int length { get; set; }
+		public string relation_type { get; set; }
+		public string title { get; set; }
+		public string uri { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_media_category_get_type ()")]
+	public class MediaCategory : GData.Parsable {
+		[CCode (has_construct_function = false)]
+		public MediaCategory (string category, string? scheme, string? label);
+		public unowned string get_category ();
+		public unowned string get_label ();
+		public unowned string get_scheme ();
+		public void set_category (string category);
+		public void set_label (string? label);
+		public void set_scheme (string? scheme);
+		public string category { get; set; }
+		public string label { get; set; }
+		public string scheme { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_media_content_get_type ()")]
+	public class MediaContent : GData.Parsable {
+		[CCode (has_construct_function = false)]
+		protected MediaContent ();
+		public GData.DownloadStream download (GData.Service service, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public unowned string get_content_type ();
+		public int64 get_duration ();
+		public GData.MediaExpression get_expression ();
+		public size_t get_filesize ();
+		public uint get_height ();
+		public GData.MediaMedium get_medium ();
+		public unowned string get_uri ();
+		public uint get_width ();
+		public string content_type { get; }
+		public int64 duration { get; }
+		public GData.MediaExpression expression { get; }
+		public ulong filesize { get; }
+		public uint height { get; }
+		[NoAccessorMethod]
+		public bool is_default { get; }
+		public GData.MediaMedium medium { get; }
+		public string uri { get; }
+		public uint width { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_media_credit_get_type ()")]
+	public class MediaCredit : GData.Parsable {
+		[CCode (has_construct_function = false)]
+		protected MediaCredit ();
+		public unowned string get_credit ();
+		public unowned string get_role ();
+		public unowned string get_scheme ();
+		public string credit { get; }
+		public string role { get; }
+		public string scheme { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_media_thumbnail_get_type ()")]
+	public class MediaThumbnail : GData.Parsable {
+		[CCode (has_construct_function = false)]
+		protected MediaThumbnail ();
+		public GData.DownloadStream download (GData.Service service, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public uint get_height ();
+		public int64 get_time ();
+		public unowned string get_uri ();
+		public uint get_width ();
+		public uint height { get; }
+		public int64 time { get; }
+		public string uri { get; }
+		public uint width { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_oauth1_authorizer_get_type ()")]
+	public class OAuth1Authorizer : GLib.Object, GData.Authorizer {
+		[CCode (has_construct_function = false)]
+		public OAuth1Authorizer (string? application_name, GLib.Type service_type);
+		[CCode (has_construct_function = false)]
+		public OAuth1Authorizer.for_authorization_domains (string? application_name, GLib.List<GData.AuthorizationDomain> authorization_domains);
+		public unowned string? get_application_name ();
+		public unowned string? get_locale ();
+		public unowned GLib.ProxyResolver? get_proxy_resolver ();
+		public Soup.URI? get_proxy_uri ();
+		public uint get_timeout ();
+		public string request_authentication_uri (out string token, out string token_secret, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async string request_authentication_uri_async (GLib.Cancellable? cancellable, out string token, out string token_secret) throws GLib.Error;
+		public bool request_authorization (string token, string token_secret, string verifier, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool request_authorization_async (string token, string token_secret, string verifier, GLib.Cancellable? cancellable) throws GLib.Error;
+		public void set_locale (string? locale);
+		public void set_proxy_resolver (GLib.ProxyResolver? proxy_resolver);
+		public void set_proxy_uri (Soup.URI? proxy_uri);
+		public void set_timeout (uint timeout);
+		public string application_name { get; construct; }
+		public string locale { get; set; }
+		public GLib.ProxyResolver proxy_resolver { get; set; }
+		public Soup.URI proxy_uri { owned get; set; }
+		public uint timeout { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_oauth2_authorizer_get_type ()")]
+	public class OAuth2Authorizer : GLib.Object, GData.Authorizer {
+		[CCode (has_construct_function = false)]
+		public OAuth2Authorizer (string client_id, string client_secret, string redirect_uri, GLib.Type service_type);
+		public string build_authentication_uri (string? login_hint, bool include_granted_scopes);
+		public string dup_refresh_token ();
+		[CCode (has_construct_function = false)]
+		public OAuth2Authorizer.for_authorization_domains (string client_id, string client_secret, string redirect_uri, GLib.List<GData.AuthorizationDomain> authorization_domains);
+		public unowned string get_client_id ();
+		public unowned string get_client_secret ();
+		public unowned string? get_locale ();
+		public unowned GLib.ProxyResolver? get_proxy_resolver ();
+		public unowned string get_redirect_uri ();
+		public uint get_timeout ();
+		public bool request_authorization (string authorization_code, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool request_authorization_async (string authorization_code, GLib.Cancellable? cancellable) throws GLib.Error;
+		public void set_locale (string? locale);
+		public void set_proxy_resolver (GLib.ProxyResolver? proxy_resolver);
+		public void set_refresh_token (string? refresh_token);
+		public void set_timeout (uint timeout);
+		public string client_id { get; construct; }
+		public string client_secret { get; construct; }
+		public string locale { get; set; }
+		public GLib.ProxyResolver proxy_resolver { get; set; }
+		public string redirect_uri { get; construct; }
+		[NoAccessorMethod]
+		public string refresh_token { owned get; set; }
+		public uint timeout { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_parsable_get_type ()")]
+	public abstract class Parsable : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected Parsable ();
+		[CCode (has_construct_function = false)]
+		public Parsable.from_json (GLib.Type parsable_type, string json, int length) throws GLib.Error;
+		[CCode (has_construct_function = false)]
+		public Parsable.from_xml (GLib.Type parsable_type, string xml, int length) throws GLib.Error;
+		[NoWrapper]
+		public virtual void get_json (Json.Builder builder);
+		[CCode (cname = "gdata_parsable_get_json")]
+		public string get_json_string ();
+		[NoWrapper]
+		public virtual void get_namespaces (GLib.HashTable<void*,void*> namespaces);
+		[NoWrapper]
+		public virtual void get_xml (GLib.StringBuilder xml_string);
+		[NoWrapper]
+		public virtual bool parse_json (Json.Reader reader) throws GLib.Error;
+		[NoWrapper]
+		public virtual bool parse_xml (Xml.Doc doc, Xml.Node node) throws GLib.Error;
+		[NoWrapper]
+		public virtual bool post_parse_json () throws GLib.Error;
+		[NoWrapper]
+		public virtual bool post_parse_xml () throws GLib.Error;
+		[NoWrapper]
+		public virtual void pre_get_xml (GLib.StringBuilder xml_string);
+		[NoWrapper]
+		public virtual bool pre_parse_xml (Xml.Doc doc, Xml.Node root_node) throws GLib.Error;
+		[NoAccessorMethod]
+		public bool constructed_from_xml { get; construct; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "picasaweb_album", type_id = "gdata_picasaweb_album_get_type ()")]
+	public class PicasaWebAlbum : GData.Entry {
+		[CCode (has_construct_function = false)]
+		public PicasaWebAlbum (string? id);
+		public long get_bytes_used ();
+		public uint get_comment_count ();
+		public unowned GLib.List<GData.MediaContent> get_contents ();
+		public void get_coordinates (out double latitude, out double longitude);
+		public int64 get_edited ();
+		public unowned string get_id ();
+		public unowned string get_location ();
+		public unowned string get_nickname ();
+		public uint get_num_photos ();
+		public uint get_num_photos_remaining ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_tags ();
+		public unowned GLib.List<GData.MediaThumbnail> get_thumbnails ();
+		public int64 get_timestamp ();
+		public unowned string get_user ();
+		public GData.PicasaWebVisibility get_visibility ();
+		public void set_coordinates (double latitude, double longitude);
+		public void set_is_commenting_enabled (bool is_commenting_enabled);
+		public void set_location (string? location);
+		public void set_tags ([CCode (array_length = false, array_null_terminated = true)] string[]? tags);
+		public void set_timestamp (int64 timestamp);
+		public void set_visibility (GData.PicasaWebVisibility visibility);
+		[NoAccessorMethod]
+		public string album_id { owned get; construct; }
+		public long bytes_used { get; }
+		public uint comment_count { get; }
+		public int64 edited { get; }
+		[NoAccessorMethod]
+		public bool is_commenting_enabled { get; set; }
+		[NoAccessorMethod]
+		public double latitude { get; set; }
+		public string location { get; set; }
+		[NoAccessorMethod]
+		public double longitude { get; set; }
+		public string nickname { get; }
+		public uint num_photos { get; }
+		public uint num_photos_remaining { get; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] tags { get; set; }
+		public int64 timestamp { get; set; }
+		public string user { get; }
+		public GData.PicasaWebVisibility visibility { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "picasaweb_comment", type_id = "gdata_picasaweb_comment_get_type ()")]
+	public class PicasaWebComment : GData.Comment {
+		[CCode (has_construct_function = false)]
+		public PicasaWebComment (string id);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "picasaweb_feed", type_id = "gdata_picasaweb_feed_get_type ()")]
+	public class PicasaWebFeed : GData.Feed {
+		[CCode (has_construct_function = false)]
+		protected PicasaWebFeed ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "picasaweb_file", type_id = "gdata_picasaweb_file_get_type ()")]
+	public class PicasaWebFile : GData.Entry, GData.Commentable {
+		[CCode (has_construct_function = false)]
+		public PicasaWebFile (string? id);
+		public unowned string get_album_id ();
+		public unowned string get_caption ();
+		public unowned string get_checksum ();
+		public uint get_comment_count ();
+		public unowned GLib.List<GData.MediaContent> get_contents ();
+		public void get_coordinates (out double latitude, out double longitude);
+		public unowned string get_credit ();
+		public double get_distance ();
+		public int64 get_edited ();
+		public double get_exposure ();
+		public bool get_flash ();
+		public double get_focal_length ();
+		public double get_fstop ();
+		public uint get_height ();
+		public unowned string get_id ();
+		public unowned string get_image_unique_id ();
+		public int get_iso ();
+		public unowned string get_make ();
+		public unowned string get_model ();
+		public uint get_rotation ();
+		public size_t get_size ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_tags ();
+		public unowned GLib.List<GData.MediaThumbnail> get_thumbnails ();
+		public int64 get_timestamp ();
+		public unowned string get_version ();
+		public unowned string get_video_status ();
+		public uint get_width ();
+		public void set_album_id (string album_id);
+		public void set_caption (string? caption);
+		public void set_checksum (string? checksum);
+		public void set_coordinates (double latitude, double longitude);
+		public void set_is_commenting_enabled (bool is_commenting_enabled);
+		public void set_rotation (uint rotation);
+		public void set_tags ([CCode (array_length = false, array_null_terminated = true)] string[]? tags);
+		public void set_timestamp (int64 timestamp);
+		public string album_id { get; set; }
+		public string caption { get; set; }
+		public string checksum { get; set; }
+		public uint comment_count { get; }
+		public string credit { get; }
+		public double distance { get; }
+		public int64 edited { get; }
+		public double exposure { get; }
+		[NoAccessorMethod]
+		public string file_id { owned get; construct; }
+		public bool flash { get; }
+		public double focal_length { get; }
+		public double fstop { get; }
+		public uint height { get; }
+		public string image_unique_id { get; }
+		[NoAccessorMethod]
+		public bool is_commenting_enabled { get; set; }
+		public long iso { get; }
+		[NoAccessorMethod]
+		public double latitude { get; set; }
+		[NoAccessorMethod]
+		public double longitude { get; set; }
+		public string make { get; }
+		public string model { get; }
+		public uint rotation { get; set; }
+		public ulong size { get; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] tags { get; set; }
+		public int64 timestamp { get; set; }
+		public string version { get; construct; }
+		public string video_status { get; }
+		public uint width { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "picasaweb_query", type_id = "gdata_picasaweb_query_get_type ()")]
+	public class PicasaWebQuery : GData.Query {
+		[CCode (has_construct_function = false)]
+		public PicasaWebQuery (string? q);
+		public void get_bounding_box (out double north, out double east, out double south, out double west);
+		public unowned string get_image_size ();
+		public unowned string get_location ();
+		public unowned string get_tag ();
+		public unowned string get_thumbnail_size ();
+		public GData.PicasaWebVisibility get_visibility ();
+		public void set_bounding_box (double north, double east, double south, double west);
+		public void set_image_size (string? image_size);
+		public void set_location (string? location);
+		public void set_tag (string? tag);
+		public void set_thumbnail_size (string? thumbnail_size);
+		public void set_visibility (GData.PicasaWebVisibility visibility);
+		[CCode (has_construct_function = false)]
+		public PicasaWebQuery.with_limits (string? q, uint start_index, uint max_results);
+		public string image_size { get; set; }
+		public string location { get; set; }
+		public string tag { get; set; }
+		public string thumbnail_size { get; set; }
+		public int visibility { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "picasaweb_service", type_id = "gdata_picasaweb_service_get_type ()")]
+	public class PicasaWebService : GData.Service {
+		[CCode (has_construct_function = false)]
+		public PicasaWebService (GData.Authorizer? authorizer);
+		public GData.PicasaWebFile finish_file_upload (GData.UploadStream upload_stream) throws GLib.Error;
+		public static unowned GData.AuthorizationDomain get_primary_authorization_domain ();
+		public GData.PicasaWebUser get_user (string? username, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async GData.PicasaWebUser get_user_async (string? username, GLib.Cancellable? cancellable) throws GLib.Error;
+		public GData.PicasaWebAlbum insert_album (GData.PicasaWebAlbum album, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void insert_album_async (GData.PicasaWebAlbum album, GLib.Cancellable? cancellable);
+		public GData.Feed query_all_albums (GData.Query? query, string? username, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_all_albums_async (GData.Query? query, string? username, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+		public GData.Feed query_files (GData.PicasaWebAlbum? album, GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_files_async (GData.PicasaWebAlbum? album, GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+		public GData.UploadStream upload_file (GData.PicasaWebAlbum? album, GData.PicasaWebFile file_entry, string slug, string content_type, GLib.Cancellable? cancellable = null) throws GLib.Error;
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "picasaweb_user", type_id = "gdata_picasaweb_user_get_type ()")]
+	public class PicasaWebUser : GData.Entry {
+		[CCode (has_construct_function = false)]
+		protected PicasaWebUser ();
+		public int get_max_photos_per_album ();
+		public unowned string get_nickname ();
+		public int64 get_quota_current ();
+		public int64 get_quota_limit ();
+		public unowned string get_thumbnail_uri ();
+		public unowned string get_user ();
+		public int max_photos_per_album { get; }
+		public string nickname { get; }
+		public int64 quota_current { get; }
+		public int64 quota_limit { get; }
+		public string thumbnail_uri { get; }
+		public string user { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_query_get_type ()")]
+	public class Query : GLib.Object {
+		[CCode (has_construct_function = false)]
+		public Query (string? q);
+		public unowned string get_author ();
+		public unowned string get_categories ();
+		public unowned string get_etag ();
+		public uint get_max_results ();
+		public int64 get_published_max ();
+		public int64 get_published_min ();
+		public unowned string get_q ();
+		[NoWrapper]
+		public virtual void get_query_uri (string feed_uri, GLib.StringBuilder query_uri, bool params_started);
+		public uint get_start_index ();
+		public int64 get_updated_max ();
+		public int64 get_updated_min ();
+		public void next_page ();
+		public bool previous_page ();
+		public void set_author (string? author);
+		public void set_categories (string? categories);
+		public void set_etag (string? etag);
+		public void set_is_strict (bool is_strict);
+		public void set_max_results (uint max_results);
+		public void set_published_max (int64 published_max);
+		public void set_published_min (int64 published_min);
+		public void set_q (string? q);
+		public void set_start_index (uint start_index);
+		public void set_updated_max (int64 updated_max);
+		public void set_updated_min (int64 updated_min);
+		[CCode (has_construct_function = false)]
+		public Query.with_limits (string? q, uint start_index, uint max_results);
+		public string author { get; set; }
+		public string categories { get; set; }
+		public string etag { get; set; }
+		[NoAccessorMethod]
+		public bool is_strict { get; set; }
+		public uint max_results { get; set; }
+		public int64 published_max { get; set; }
+		public int64 published_min { get; set; }
+		public string q { get; set; }
+		public uint start_index { get; set; }
+		public int64 updated_max { get; set; }
+		public int64 updated_min { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_service_get_type ()")]
+	public class Service : GLib.Object {
+		[CCode (has_construct_function = false)]
+		protected Service ();
+		[NoWrapper]
+		public virtual void append_query_headers (GData.AuthorizationDomain domain, Soup.Message message);
+		public bool delete_entry (GData.AuthorizationDomain? domain, GData.Entry entry, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool delete_entry_async (GData.AuthorizationDomain? domain, GData.Entry entry, GLib.Cancellable? cancellable) throws GLib.Error;
+		public static GLib.List<weak GData.AuthorizationDomain> get_authorization_domains (GLib.Type service_type);
+		public unowned GData.Authorizer get_authorizer ();
+		public unowned string get_locale ();
+		public unowned GLib.ProxyResolver? get_proxy_resolver ();
+		public unowned Soup.URI get_proxy_uri ();
+		public uint get_timeout ();
+		public GData.Entry insert_entry (GData.AuthorizationDomain? domain, string upload_uri, GData.Entry entry, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async GData.Entry insert_entry_async (GData.AuthorizationDomain? domain, string upload_uri, GData.Entry entry, GLib.Cancellable? cancellable) throws GLib.Error;
+		public bool is_authorized ();
+		[NoWrapper]
+		public virtual void parse_error_response (GData.OperationType operation_type, uint status, string reason_phrase, string response_body, int length) throws GLib.Error;
+		public GData.Feed query (GData.AuthorizationDomain? domain, string feed_uri, GData.Query? query, GLib.Type entry_type, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async GData.Feed query_async (GData.AuthorizationDomain? domain, string feed_uri, GData.Query? query, GLib.Type entry_type, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public GData.Entry query_single_entry (GData.AuthorizationDomain? domain, string entry_id, GData.Query? query, GLib.Type entry_type, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async GData.Entry query_single_entry_async (GData.AuthorizationDomain? domain, string entry_id, GData.Query? query, GLib.Type entry_type, GLib.Cancellable? cancellable) throws GLib.Error;
+		public void set_authorizer (GData.Authorizer authorizer);
+		public void set_locale (string? locale);
+		public void set_proxy_resolver (GLib.ProxyResolver? proxy_resolver);
+		public void set_proxy_uri (Soup.URI? proxy_uri);
+		public void set_timeout (uint timeout);
+		public GData.Entry update_entry (GData.AuthorizationDomain? domain, GData.Entry entry, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async GData.Entry update_entry_async (GData.AuthorizationDomain? domain, GData.Entry entry, GLib.Cancellable? cancellable) throws GLib.Error;
+		public GData.Authorizer authorizer { get; set; }
+		public string locale { get; set; }
+		public GLib.ProxyResolver proxy_resolver { get; set; }
+		public Soup.URI proxy_uri { get; set; }
+		public uint timeout { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_tasks_query_get_type ()")]
+	public class TasksQuery : GData.Query {
+		[CCode (has_construct_function = false)]
+		public TasksQuery (string? q);
+		public int64 get_completed_max ();
+		public int64 get_completed_min ();
+		public int64 get_due_max ();
+		public int64 get_due_min ();
+		public bool get_show_completed ();
+		public bool get_show_deleted ();
+		public bool get_show_hidden ();
+		public void set_completed_max (int64 completed_max);
+		public void set_completed_min (int64 completed_min);
+		public void set_due_max (int64 due_max);
+		public void set_due_min (int64 due_min);
+		public void set_show_completed (bool show_completed);
+		public void set_show_deleted (bool show_deleted);
+		public void set_show_hidden (bool show_hidden);
+		public int64 completed_max { get; set; }
+		public int64 completed_min { get; set; }
+		public int64 due_max { get; set; }
+		public int64 due_min { get; set; }
+		public bool show_completed { get; set; }
+		public bool show_deleted { get; set; }
+		public bool show_hidden { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_tasks_service_get_type ()")]
+	public class TasksService : GData.Service {
+		[CCode (has_construct_function = false)]
+		public TasksService (GData.Authorizer? authorizer);
+		public bool delete_task (GData.TasksTask task, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void delete_task_async (GData.TasksTask task, GLib.Cancellable? cancellable);
+		public bool delete_tasklist (GData.TasksTasklist tasklist, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void delete_tasklist_async (GData.TasksTasklist tasklist, GLib.Cancellable? cancellable);
+		public static unowned GData.AuthorizationDomain get_primary_authorization_domain ();
+		public GData.TasksTask insert_task (GData.TasksTask task, GData.TasksTasklist tasklist, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void insert_task_async (GData.TasksTask task, GData.TasksTasklist tasklist, GLib.Cancellable? cancellable);
+		public GData.TasksTasklist insert_tasklist (GData.TasksTasklist tasklist, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void insert_tasklist_async (GData.TasksTasklist tasklist, GLib.Cancellable? cancellable);
+		public GData.Feed query_all_tasklists (GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_all_tasklists_async (GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+		public GData.Feed query_tasks (GData.TasksTasklist tasklist, GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_tasks_async (GData.TasksTasklist tasklist, GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+		public GData.TasksTask update_task (GData.TasksTask task, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void update_task_async (GData.TasksTask task, GLib.Cancellable? cancellable);
+		public GData.TasksTasklist update_tasklist (GData.TasksTasklist tasklist, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async void update_tasklist_async (GData.TasksTasklist tasklist, GLib.Cancellable? cancellable);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_tasks_task_get_type ()")]
+	public class TasksTask : GData.Entry {
+		[CCode (has_construct_function = false)]
+		public TasksTask (string? id);
+		public int64 get_completed ();
+		public int64 get_due ();
+		public unowned string? get_notes ();
+		public unowned string? get_parent ();
+		public unowned string? get_position ();
+		public unowned string? get_status ();
+		public void set_completed (int64 completed);
+		public void set_due (int64 due);
+		public void set_is_deleted (bool deleted);
+		public void set_notes (string? notes);
+		public void set_status (string? status);
+		public int64 completed { get; set; }
+		public int64 due { get; set; }
+		[NoAccessorMethod]
+		public bool is_deleted { get; set; }
+		[NoAccessorMethod]
+		public bool is_hidden { get; }
+		public string notes { get; set; }
+		public string parent { get; }
+		public string position { get; }
+		public string status { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_tasks_tasklist_get_type ()")]
+	public class TasksTasklist : GData.Entry {
+		[CCode (has_construct_function = false)]
+		public TasksTasklist (string? id);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_upload_stream_get_type ()")]
+	public class UploadStream : GLib.OutputStream {
+		[CCode (has_construct_function = false, type = "GOutputStream*")]
+		public UploadStream (GData.Service service, GData.AuthorizationDomain? domain, string method, string upload_uri, GData.Entry? entry, string slug, string content_type, GLib.Cancellable? cancellable = null);
+		public unowned GData.AuthorizationDomain? get_authorization_domain ();
+		public unowned GLib.Cancellable get_cancellable ();
+		public int64 get_content_length ();
+		public unowned string get_content_type ();
+		public unowned GData.Entry get_entry ();
+		public unowned string get_method ();
+		public unowned string get_response (out ssize_t length);
+		public unowned GData.Service get_service ();
+		public unowned string get_slug ();
+		public unowned string get_upload_uri ();
+		[CCode (has_construct_function = false, type = "GOutputStream*")]
+		public UploadStream.resumable (GData.Service service, GData.AuthorizationDomain? domain, string method, string upload_uri, GData.Entry? entry, string slug, string content_type, int64 content_length, GLib.Cancellable? cancellable = null);
+		public GData.AuthorizationDomain authorization_domain { get; construct; }
+		public GLib.Cancellable cancellable { get; construct; }
+		public int64 content_length { get; construct; }
+		public string content_type { get; construct; }
+		public GData.Entry entry { get; construct; }
+		public string method { get; construct; }
+		public GData.Service service { get; construct; }
+		public string slug { get; construct; }
+		public string upload_uri { get; construct; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_category", type_id = "gdata_youtube_category_get_type ()")]
+	public class YouTubeCategory : GData.Category, GData.Comparable {
+		[CCode (has_construct_function = false)]
+		protected YouTubeCategory ();
+		public bool is_browsable (string region);
+		[NoAccessorMethod]
+		public bool is_assignable { get; }
+		[NoAccessorMethod]
+		public bool is_deprecated { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_comment", type_id = "gdata_youtube_comment_get_type ()")]
+	public class YouTubeComment : GData.Comment {
+		[CCode (has_construct_function = false)]
+		public YouTubeComment (string id);
+		public unowned string get_parent_comment_uri ();
+		public void set_parent_comment_uri (string parent_comment_uri);
+		public string parent_comment_uri { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_content", type_id = "gdata_youtube_content_get_type ()")]
+	public class YouTubeContent : GData.MediaContent {
+		[CCode (has_construct_function = false)]
+		protected YouTubeContent ();
+		public GData.YouTubeFormat get_format ();
+		public GData.YouTubeFormat format { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_credit", type_id = "gdata_youtube_credit_get_type ()")]
+	public class YouTubeCredit : GData.MediaCredit {
+		[CCode (has_construct_function = false)]
+		protected YouTubeCredit ();
+		public unowned string get_entity_type ();
+		public string entity_type { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_feed", type_id = "gdata_youtube_feed_get_type ()")]
+	public class YouTubeFeed : GData.Feed {
+		[CCode (has_construct_function = false)]
+		protected YouTubeFeed ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_query", type_id = "gdata_youtube_query_get_type ()")]
+	public class YouTubeQuery : GData.Query {
+		[CCode (has_construct_function = false)]
+		public YouTubeQuery (string? q);
+		public GData.YouTubeAge get_age ();
+		public GData.YouTubeFormat get_format ();
+		public unowned string get_language ();
+		public unowned string get_license ();
+		public void get_location (out double latitude, out double longitude, out double radius, out bool has_location);
+		public unowned string get_order_by ();
+		public unowned string get_restriction ();
+		public GData.YouTubeSafeSearch get_safe_search ();
+		public GData.YouTubeSortOrder get_sort_order ();
+		public GData.YouTubeUploader get_uploader ();
+		public void set_age (GData.YouTubeAge age);
+		public void set_format (GData.YouTubeFormat format);
+		public void set_language (string? language);
+		public void set_license (string? license);
+		public void set_location (double latitude, double longitude, double radius, bool has_location);
+		public void set_order_by (string? order_by);
+		public void set_restriction (string? restriction);
+		public void set_safe_search (GData.YouTubeSafeSearch safe_search);
+		public void set_sort_order (GData.YouTubeSortOrder sort_order);
+		public void set_uploader (GData.YouTubeUploader uploader);
+		public GData.YouTubeAge age { get; set; }
+		public GData.YouTubeFormat format { get; set; }
+		[NoAccessorMethod]
+		public bool has_location { get; set; }
+		public string language { get; set; }
+		[NoAccessorMethod]
+		public double latitude { get; set; }
+		public string license { get; set; }
+		[NoAccessorMethod]
+		public double location_radius { get; set; }
+		[NoAccessorMethod]
+		public double longitude { get; set; }
+		public string order_by { get; set; }
+		public string restriction { get; set; }
+		public GData.YouTubeSafeSearch safe_search { get; set; }
+		public GData.YouTubeSortOrder sort_order { get; set; }
+		public GData.YouTubeUploader uploader { get; set; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_service", type_id = "gdata_youtube_service_get_type ()")]
+	public class YouTubeService : GData.Service, GData.Batchable {
+		[CCode (has_construct_function = false)]
+		public YouTubeService (string developer_key, GData.Authorizer? authorizer);
+		public static GLib.Quark error_quark ();
+		public GData.YouTubeVideo finish_video_upload (GData.UploadStream upload_stream) throws GLib.Error;
+		public GData.APPCategories get_categories (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async GData.APPCategories get_categories_async (GLib.Cancellable? cancellable) throws GLib.Error;
+		public unowned string get_developer_key ();
+		public static unowned GData.AuthorizationDomain get_primary_authorization_domain ();
+		public GData.Feed query_related (GData.YouTubeVideo video, GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_related_async (GData.YouTubeVideo video, GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+		public GData.Feed query_standard_feed (GData.YouTubeStandardFeedType feed_type, GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_standard_feed_async (GData.YouTubeStandardFeedType feed_type, GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+		public GData.Feed query_videos (GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void query_videos_async (GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+		public GData.UploadStream upload_video (GData.YouTubeVideo video, string slug, string content_type, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public string developer_key { get; construct; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_state", type_id = "gdata_youtube_state_get_type ()")]
+	public class YouTubeState : GData.Parsable {
+		[CCode (has_construct_function = false)]
+		protected YouTubeState ();
+		public unowned string get_help_uri ();
+		public unowned string get_message ();
+		public unowned string get_name ();
+		public unowned string get_reason_code ();
+		public string help_uri { get; construct; }
+		public string message { get; construct; }
+		public string name { get; construct; }
+		public string reason_code { get; construct; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", lower_case_csuffix = "youtube_video", type_id = "gdata_youtube_video_get_type ()")]
+	public class YouTubeVideo : GData.Entry, GData.Commentable {
+		[CCode (has_construct_function = false)]
+		public YouTubeVideo (string? id);
+		public GData.YouTubePermission get_access_control (string action);
+		public unowned string get_aspect_ratio ();
+		public unowned GData.MediaCategory get_category ();
+		public void get_coordinates (out double latitude, out double longitude);
+		public unowned GData.YouTubeCredit get_credit ();
+		public unowned string get_description ();
+		public uint get_duration ();
+		public uint get_favorite_count ();
+		[CCode (array_length = false, array_null_terminated = true)]
+		public unowned string[] get_keywords ();
+		public unowned string get_location ();
+		public unowned string get_media_rating (string rating_type);
+		public unowned string get_player_uri ();
+		public void get_rating (out uint min, out uint max, out uint count, out double average);
+		public int64 get_recorded ();
+		public unowned GData.YouTubeState get_state ();
+		public unowned GLib.List<GData.MediaThumbnail> get_thumbnails ();
+		public int64 get_uploaded ();
+		public unowned string get_video_id ();
+		public static string get_video_id_from_uri (string video_uri);
+		public uint get_view_count ();
+		public bool is_restricted_in_country (string country);
+		public unowned GData.YouTubeContent look_up_content (string type);
+		public void set_access_control (string action, GData.YouTubePermission permission);
+		public void set_aspect_ratio (string? aspect_ratio);
+		public void set_category (GData.MediaCategory category);
+		public void set_coordinates (double latitude, double longitude);
+		public void set_description (string? description);
+		public void set_is_draft (bool is_draft);
+		public void set_is_private (bool is_private);
+		public void set_keywords ([CCode (array_length = false, array_null_terminated = true)] string[] keywords);
+		public void set_location (string? location);
+		public void set_recorded (int64 recorded);
+		public string aspect_ratio { get; set; }
+		[NoAccessorMethod]
+		public double average_rating { get; }
+		public GData.MediaCategory category { get; set; }
+		public GData.YouTubeCredit credit { get; }
+		public string description { get; set; }
+		public uint duration { get; }
+		public uint favorite_count { get; }
+		[NoAccessorMethod]
+		public bool is_draft { get; set; }
+		[NoAccessorMethod]
+		public bool is_private { get; set; }
+		[CCode (array_length = false, array_null_terminated = true)]
+		public string[] keywords { get; set; }
+		[NoAccessorMethod]
+		public double latitude { get; set; }
+		public string location { get; set; }
+		[NoAccessorMethod]
+		public double longitude { get; set; }
+		[NoAccessorMethod]
+		public uint max_rating { get; }
+		[NoAccessorMethod]
+		public uint min_rating { get; }
+		public string player_uri { get; }
+		[NoAccessorMethod]
+		public uint rating_count { get; }
+		public int64 recorded { get; set; }
+		public GData.YouTubeState state { get; }
+		public int64 uploaded { get; }
+		public string video_id { get; }
+		public uint view_count { get; }
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_access_handler_get_type ()")]
+	public interface AccessHandler : GData.Entry {
+		public abstract GData.Feed get_rules (GData.Service service, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async void get_rules_async (GData.Service service, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_cname = "GDataAuthorizerInterface", type_id = "gdata_authorizer_get_type ()")]
+	public interface Authorizer : GLib.Object {
+		public abstract bool is_authorized_for_domain (GData.AuthorizationDomain domain);
+		public abstract void process_request (GData.AuthorizationDomain? domain, Soup.Message message);
+		public virtual bool refresh_authorization (GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public virtual async bool refresh_authorization_async (GLib.Cancellable? cancellable) throws GLib.Error;
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_batchable_get_type ()")]
+	public interface Batchable : GData.Service {
+		public GData.BatchOperation create_operation (GData.AuthorizationDomain? domain, string feed_uri);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_cname = "GDataCommentableInterface", type_id = "gdata_commentable_get_type ()")]
+	public interface Commentable : GData.Entry {
+		public bool delete_comment (GData.Service service, GData.Comment comment_, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async bool delete_comment_async (GData.Service service, GData.Comment comment_, GLib.Cancellable? cancellable) throws GLib.Error;
+		[NoWrapper]
+		public abstract string get_insert_comment_uri (GData.Comment comment);
+		[NoWrapper]
+		public abstract string get_query_comments_uri ();
+		public GData.Comment? insert_comment (GData.Service service, GData.Comment comment_, GLib.Cancellable? cancellable = null) throws GLib.Error;
+		public async GData.Comment? insert_comment_async (GData.Service service, GData.Comment comment_, GLib.Cancellable? cancellable) throws GLib.Error;
+		[NoWrapper]
+		public abstract bool is_comment_deletable (GData.Comment comment);
+		public GData.Feed? query_comments (GData.Service service, GData.Query? query, GLib.Cancellable? cancellable, GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+		public async GData.Feed? query_comments_async (GData.Service service, GData.Query? query, GLib.Cancellable? cancellable, owned GData.QueryProgressCallback? progress_callback) throws GLib.Error;
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_comparable_get_type ()")]
+	public interface Comparable : GLib.Object {
+		public int compare (GData.Comparable? other);
+		[NoWrapper]
+		public abstract int compare_with (GData.Comparable other);
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", type_id = "gdata_color_get_type ()")]
+	public struct Color {
+		public uint16 red;
+		public uint16 green;
+		public uint16 blue;
+		public static bool from_hexadecimal (string hexadecimal, out GData.Color color);
+		public string to_hexadecimal ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_BATCH_OPERATION_", type_id = "gdata_batch_operation_type_get_type ()")]
+	public enum BatchOperationType {
+		QUERY,
+		INSERTION,
+		UPDATE,
+		DELETION
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_FREEBASE_SEARCH_FILTER_", type_id = "gdata_freebase_search_filter_type_get_type ()")]
+	public enum FreebaseSearchFilterType {
+		ALL,
+		ANY,
+		NOT
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_MEDIA_EXPRESSION_", type_id = "gdata_media_expression_get_type ()")]
+	public enum MediaExpression {
+		SAMPLE,
+		FULL,
+		NONSTOP
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_MEDIA_", type_id = "gdata_media_medium_get_type ()")]
+	public enum MediaMedium {
+		UNKNOWN,
+		IMAGE,
+		AUDIO,
+		VIDEO,
+		DOCUMENT,
+		EXECUTABLE
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_OPERATION_", type_id = "gdata_operation_type_get_type ()")]
+	public enum OperationType {
+		QUERY,
+		INSERTION,
+		UPDATE,
+		DELETION,
+		DOWNLOAD,
+		UPLOAD,
+		AUTHENTICATION,
+		BATCH
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_PICASAWEB_", type_id = "gdata_picasaweb_visibility_get_type ()")]
+	public enum PicasaWebVisibility {
+		PUBLIC,
+		PRIVATE
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_AGE_", type_id = "gdata_youtube_age_get_type ()")]
+	public enum YouTubeAge {
+		ALL_TIME,
+		TODAY,
+		THIS_WEEK,
+		THIS_MONTH
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_FORMAT_", type_id = "gdata_youtube_format_get_type ()")]
+	public enum YouTubeFormat {
+		UNKNOWN,
+		RTSP_H263_AMR,
+		HTTP_SWF,
+		RTSP_MPEG4_AAC
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_PERMISSION_", type_id = "gdata_youtube_permission_get_type ()")]
+	public enum YouTubePermission {
+		ALLOWED,
+		DENIED,
+		MODERATED
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SAFE_SEARCH_", type_id = "gdata_youtube_safe_search_get_type ()")]
+	public enum YouTubeSafeSearch {
+		NONE,
+		MODERATE,
+		STRICT
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SORT_", type_id = "gdata_youtube_sort_order_get_type ()")]
+	public enum YouTubeSortOrder {
+		NONE,
+		ASCENDING,
+		DESCENDING
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_", type_id = "gdata_youtube_standard_feed_type_get_type ()")]
+	public enum YouTubeStandardFeedType {
+		TOP_RATED_FEED,
+		TOP_FAVORITES_FEED,
+		MOST_VIEWED_FEED,
+		MOST_POPULAR_FEED,
+		MOST_RECENT_FEED,
+		MOST_DISCUSSED_FEED,
+		MOST_LINKED_FEED,
+		MOST_RESPONDED_FEED,
+		RECENTLY_FEATURED_FEED,
+		WATCH_ON_MOBILE_FEED
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_UPLOADER_", type_id = "gdata_youtube_uploader_get_type ()")]
+	public enum YouTubeUploader {
+		ALL,
+		PARTNER
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_CLIENT_LOGIN_AUTHORIZER_ERROR_")]
+	public errordomain ClientLoginAuthorizerError {
+		BAD_AUTHENTICATION,
+		NOT_VERIFIED,
+		TERMS_NOT_AGREED,
+		CAPTCHA_REQUIRED,
+		ACCOUNT_DELETED,
+		ACCOUNT_DISABLED,
+		SERVICE_DISABLED,
+		ACCOUNT_MIGRATED,
+		INVALID_SECOND_FACTOR;
+		public static GLib.Quark quark ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_DOCUMENTS_SERVICE_ERROR_INVALID_CONTENT_")]
+	public errordomain DocumentsServiceError {
+		TYPE;
+		public static GLib.Quark quark ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_PARSER_ERROR_")]
+	public errordomain ParserError {
+		PARSING_STRING,
+		EMPTY_DOCUMENT;
+		public static GLib.Quark quark ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_SERVICE_ERROR_")]
+	public errordomain ServiceError {
+		UNAVAILABLE,
+		PROTOCOL_ERROR,
+		ENTRY_ALREADY_INSERTED,
+		AUTHENTICATION_REQUIRED,
+		NOT_FOUND,
+		CONFLICT,
+		FORBIDDEN,
+		BAD_QUERY_PARAMETER,
+		NETWORK_ERROR,
+		PROXY_ERROR,
+		WITH_BATCH_OPERATION,
+		API_QUOTA_EXCEEDED;
+		public static GLib.Quark quark ();
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", cprefix = "GDATA_YOUTUBE_SERVICE_ERROR_")]
+	public errordomain YouTubeServiceError {
+		API_QUOTA_EXCEEDED,
+		ENTRY_QUOTA_EXCEEDED,
+		CHANNEL_REQUIRED
+	}
+	[CCode (cheader_filename = "gdata/gdata.h", instance_pos = 4.9)]
+	public delegate void BatchOperationCallback (uint operation_id, GData.BatchOperationType operation_type, GData.Entry entry, GLib.Error error);
+	[CCode (cheader_filename = "gdata/gdata.h", instance_pos = 3.9)]
+	public delegate void QueryProgressCallback (GData.Entry entry, uint entry_key, uint entry_count);
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_ACCESS_ROLE_NONE")]
+	public const string ACCESS_ROLE_NONE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_ACCESS_SCOPE_DEFAULT")]
+	public const string ACCESS_SCOPE_DEFAULT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_ACCESS_SCOPE_DOMAIN")]
+	public const string ACCESS_SCOPE_DOMAIN;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_ACCESS_SCOPE_USER")]
+	public const string ACCESS_SCOPE_USER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CALENDAR_ACCESS_ROLE_EDITOR")]
+	public const string CALENDAR_ACCESS_ROLE_EDITOR;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CALENDAR_ACCESS_ROLE_FREE_BUSY")]
+	public const string CALENDAR_ACCESS_ROLE_FREE_BUSY;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CALENDAR_ACCESS_ROLE_OWNER")]
+	public const string CALENDAR_ACCESS_ROLE_OWNER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CALENDAR_ACCESS_ROLE_READ")]
+	public const string CALENDAR_ACCESS_ROLE_READ;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CALENDAR_ACCESS_ROLE_ROOT")]
+	public const string CALENDAR_ACCESS_ROLE_ROOT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_CATEGORY_SCHEMA_LABELS")]
+	public const string CATEGORY_SCHEMA_LABELS;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_ACCESS_ROLE_OWNER")]
+	public const string DOCUMENTS_ACCESS_ROLE_OWNER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_ACCESS_ROLE_READER")]
+	public const string DOCUMENTS_ACCESS_ROLE_READER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_ACCESS_ROLE_WRITER")]
+	public const string DOCUMENTS_ACCESS_ROLE_WRITER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_DRAWING_JPEG")]
+	public const string DOCUMENTS_DRAWING_JPEG;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_DRAWING_PDF")]
+	public const string DOCUMENTS_DRAWING_PDF;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_DRAWING_PNG")]
+	public const string DOCUMENTS_DRAWING_PNG;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_DOCUMENTS_DRAWING_SVG")]
+	public const string DOCUMENTS_DRAWING_SVG;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_CALENDAR_FREE_BUSY")]
+	public const string GCONTACT_CALENDAR_FREE_BUSY;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_CALENDAR_HOME")]
+	public const string GCONTACT_CALENDAR_HOME;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_CALENDAR_WORK")]
+	public const string GCONTACT_CALENDAR_WORK;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_EVENT_ANNIVERSARY")]
+	public const string GCONTACT_EVENT_ANNIVERSARY;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_EVENT_OTHER")]
+	public const string GCONTACT_EVENT_OTHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_EXTERNAL_ID_ACCOUNT")]
+	public const string GCONTACT_EXTERNAL_ID_ACCOUNT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_EXTERNAL_ID_CUSTOMER")]
+	public const string GCONTACT_EXTERNAL_ID_CUSTOMER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_EXTERNAL_ID_NETWORK")]
+	public const string GCONTACT_EXTERNAL_ID_NETWORK;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_EXTERNAL_ID_ORGANIZATION")]
+	public const string GCONTACT_EXTERNAL_ID_ORGANIZATION;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_JOT_HOME")]
+	public const string GCONTACT_JOT_HOME;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_JOT_KEYWORDS")]
+	public const string GCONTACT_JOT_KEYWORDS;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_JOT_OTHER")]
+	public const string GCONTACT_JOT_OTHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_JOT_USER")]
+	public const string GCONTACT_JOT_USER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_JOT_WORK")]
+	public const string GCONTACT_JOT_WORK;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_ASSISTANT")]
+	public const string GCONTACT_RELATION_ASSISTANT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_BROTHER")]
+	public const string GCONTACT_RELATION_BROTHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_CHILD")]
+	public const string GCONTACT_RELATION_CHILD;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_DOMESTIC_PARTNER")]
+	public const string GCONTACT_RELATION_DOMESTIC_PARTNER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_FATHER")]
+	public const string GCONTACT_RELATION_FATHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_FRIEND")]
+	public const string GCONTACT_RELATION_FRIEND;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_MANAGER")]
+	public const string GCONTACT_RELATION_MANAGER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_MOTHER")]
+	public const string GCONTACT_RELATION_MOTHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_PARENT")]
+	public const string GCONTACT_RELATION_PARENT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_PARTNER")]
+	public const string GCONTACT_RELATION_PARTNER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_REFERRER")]
+	public const string GCONTACT_RELATION_REFERRER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_RELATIVE")]
+	public const string GCONTACT_RELATION_RELATIVE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_SISTER")]
+	public const string GCONTACT_RELATION_SISTER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_RELATION_SPOUSE")]
+	public const string GCONTACT_RELATION_SPOUSE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_WEBSITE_BLOG")]
+	public const string GCONTACT_WEBSITE_BLOG;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_WEBSITE_FTP")]
+	public const string GCONTACT_WEBSITE_FTP;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_WEBSITE_HOME")]
+	public const string GCONTACT_WEBSITE_HOME;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_WEBSITE_HOME_PAGE")]
+	public const string GCONTACT_WEBSITE_HOME_PAGE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_WEBSITE_OTHER")]
+	public const string GCONTACT_WEBSITE_OTHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_WEBSITE_PROFILE")]
+	public const string GCONTACT_WEBSITE_PROFILE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GCONTACT_WEBSITE_WORK")]
+	public const string GCONTACT_WEBSITE_WORK;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_ADDRESS_USAGE_GENERAL")]
+	public const string GD_ADDRESS_USAGE_GENERAL;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_ADDRESS_USAGE_LOCAL")]
+	public const string GD_ADDRESS_USAGE_LOCAL;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EMAIL_ADDRESS_HOME")]
+	public const string GD_EMAIL_ADDRESS_HOME;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EMAIL_ADDRESS_OTHER")]
+	public const string GD_EMAIL_ADDRESS_OTHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EMAIL_ADDRESS_WORK")]
+	public const string GD_EMAIL_ADDRESS_WORK;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EVENT_STATUS_CANCELED")]
+	public const string GD_EVENT_STATUS_CANCELED;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EVENT_STATUS_CONFIRMED")]
+	public const string GD_EVENT_STATUS_CONFIRMED;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EVENT_STATUS_TENTATIVE")]
+	public const string GD_EVENT_STATUS_TENTATIVE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EVENT_TRANSPARENCY_OPAQUE")]
+	public const string GD_EVENT_TRANSPARENCY_OPAQUE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EVENT_TRANSPARENCY_TRANSPARENT")]
+	public const string GD_EVENT_TRANSPARENCY_TRANSPARENT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EVENT_VISIBILITY_CONFIDENTIAL")]
+	public const string GD_EVENT_VISIBILITY_CONFIDENTIAL;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EVENT_VISIBILITY_DEFAULT")]
+	public const string GD_EVENT_VISIBILITY_DEFAULT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EVENT_VISIBILITY_PRIVATE")]
+	public const string GD_EVENT_VISIBILITY_PRIVATE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_EVENT_VISIBILITY_PUBLIC")]
+	public const string GD_EVENT_VISIBILITY_PUBLIC;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_ADDRESS_HOME")]
+	public const string GD_IM_ADDRESS_HOME;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_ADDRESS_NETMEETING")]
+	public const string GD_IM_ADDRESS_NETMEETING;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_ADDRESS_OTHER")]
+	public const string GD_IM_ADDRESS_OTHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_ADDRESS_WORK")]
+	public const string GD_IM_ADDRESS_WORK;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_PROTOCOL_AIM")]
+	public const string GD_IM_PROTOCOL_AIM;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_PROTOCOL_GOOGLE_TALK")]
+	public const string GD_IM_PROTOCOL_GOOGLE_TALK;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_PROTOCOL_ICQ")]
+	public const string GD_IM_PROTOCOL_ICQ;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_PROTOCOL_JABBER")]
+	public const string GD_IM_PROTOCOL_JABBER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_PROTOCOL_LIVE_MESSENGER")]
+	public const string GD_IM_PROTOCOL_LIVE_MESSENGER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_PROTOCOL_QQ")]
+	public const string GD_IM_PROTOCOL_QQ;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_PROTOCOL_SKYPE")]
+	public const string GD_IM_PROTOCOL_SKYPE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_IM_PROTOCOL_YAHOO_MESSENGER")]
+	public const string GD_IM_PROTOCOL_YAHOO_MESSENGER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_MAIL_CLASS_BOTH")]
+	public const string GD_MAIL_CLASS_BOTH;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_MAIL_CLASS_LETTERS")]
+	public const string GD_MAIL_CLASS_LETTERS;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_MAIL_CLASS_NEITHER")]
+	public const string GD_MAIL_CLASS_NEITHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_MAIL_CLASS_PARCELS")]
+	public const string GD_MAIL_CLASS_PARCELS;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_ORGANIZATION_OTHER")]
+	public const string GD_ORGANIZATION_OTHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_ORGANIZATION_WORK")]
+	public const string GD_ORGANIZATION_WORK;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_ASSISTANT")]
+	public const string GD_PHONE_NUMBER_ASSISTANT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_CALLBACK")]
+	public const string GD_PHONE_NUMBER_CALLBACK;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_CAR")]
+	public const string GD_PHONE_NUMBER_CAR;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_COMPANY_MAIN")]
+	public const string GD_PHONE_NUMBER_COMPANY_MAIN;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_FAX")]
+	public const string GD_PHONE_NUMBER_FAX;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_HOME")]
+	public const string GD_PHONE_NUMBER_HOME;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_HOME_FAX")]
+	public const string GD_PHONE_NUMBER_HOME_FAX;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_ISDN")]
+	public const string GD_PHONE_NUMBER_ISDN;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_MAIN")]
+	public const string GD_PHONE_NUMBER_MAIN;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_MOBILE")]
+	public const string GD_PHONE_NUMBER_MOBILE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_OTHER")]
+	public const string GD_PHONE_NUMBER_OTHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_OTHER_FAX")]
+	public const string GD_PHONE_NUMBER_OTHER_FAX;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_PAGER")]
+	public const string GD_PHONE_NUMBER_PAGER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_RADIO")]
+	public const string GD_PHONE_NUMBER_RADIO;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_TELEX")]
+	public const string GD_PHONE_NUMBER_TELEX;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_TTY_TDD")]
+	public const string GD_PHONE_NUMBER_TTY_TDD;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_WORK")]
+	public const string GD_PHONE_NUMBER_WORK;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_WORK_FAX")]
+	public const string GD_PHONE_NUMBER_WORK_FAX;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_WORK_MOBILE")]
+	public const string GD_PHONE_NUMBER_WORK_MOBILE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_PHONE_NUMBER_WORK_PAGER")]
+	public const string GD_PHONE_NUMBER_WORK_PAGER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_POSTAL_ADDRESS_HOME")]
+	public const string GD_POSTAL_ADDRESS_HOME;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_POSTAL_ADDRESS_OTHER")]
+	public const string GD_POSTAL_ADDRESS_OTHER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_POSTAL_ADDRESS_WORK")]
+	public const string GD_POSTAL_ADDRESS_WORK;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_REMINDER_ALERT")]
+	public const string GD_REMINDER_ALERT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_REMINDER_EMAIL")]
+	public const string GD_REMINDER_EMAIL;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_REMINDER_SMS")]
+	public const string GD_REMINDER_SMS;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_WHERE_EVENT")]
+	public const string GD_WHERE_EVENT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_WHERE_EVENT_ALTERNATE")]
+	public const string GD_WHERE_EVENT_ALTERNATE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_WHERE_EVENT_PARKING")]
+	public const string GD_WHERE_EVENT_PARKING;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_WHO_EVENT_ATTENDEE")]
+	public const string GD_WHO_EVENT_ATTENDEE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_WHO_EVENT_ORGANIZER")]
+	public const string GD_WHO_EVENT_ORGANIZER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_WHO_EVENT_PERFORMER")]
+	public const string GD_WHO_EVENT_PERFORMER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_GD_WHO_EVENT_SPEAKER")]
+	public const string GD_WHO_EVENT_SPEAKER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_ACCESS_CONTROL_LIST")]
+	public const string LINK_ACCESS_CONTROL_LIST;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_ALTERNATE")]
+	public const string LINK_ALTERNATE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_BATCH")]
+	public const string LINK_BATCH;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_EDIT")]
+	public const string LINK_EDIT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_EDIT_MEDIA")]
+	public const string LINK_EDIT_MEDIA;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_ENCLOSURE")]
+	public const string LINK_ENCLOSURE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_PARENT")]
+	public const string LINK_PARENT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_RELATED")]
+	public const string LINK_RELATED;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_RESUMABLE_CREATE_MEDIA")]
+	public const string LINK_RESUMABLE_CREATE_MEDIA;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_RESUMABLE_EDIT_MEDIA")]
+	public const string LINK_RESUMABLE_EDIT_MEDIA;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_SELF")]
+	public const string LINK_SELF;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_LINK_VIA")]
+	public const string LINK_VIA;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_MAJOR_VERSION")]
+	public const int MAJOR_VERSION;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_MICRO_VERSION")]
+	public const int MICRO_VERSION;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_MINOR_VERSION")]
+	public const int MINOR_VERSION;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_OAUTH2_REDIRECT_URI_OOB")]
+	public const string OAUTH2_REDIRECT_URI_OOB;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_OAUTH2_REDIRECT_URI_OOB_AUTO")]
+	public const string OAUTH2_REDIRECT_URI_OOB_AUTO;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_PICASAWEB_VIDEO_STATUS_FAILED")]
+	public const string PICASAWEB_VIDEO_STATUS_FAILED;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_PICASAWEB_VIDEO_STATUS_FINAL")]
+	public const string PICASAWEB_VIDEO_STATUS_FINAL;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_PICASAWEB_VIDEO_STATUS_PENDING")]
+	public const string PICASAWEB_VIDEO_STATUS_PENDING;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_PICASAWEB_VIDEO_STATUS_READY")]
+	public const string PICASAWEB_VIDEO_STATUS_READY;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_TASKS_STATUS_COMPLETED")]
+	public const string TASKS_STATUS_COMPLETED;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_TASKS_STATUS_NEEDS_ACTION")]
+	public const string TASKS_STATUS_NEEDS_ACTION;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_ACTION_COMMENT")]
+	public const string YOUTUBE_ACTION_COMMENT;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_ACTION_COMMENT_VOTE")]
+	public const string YOUTUBE_ACTION_COMMENT_VOTE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_ACTION_EMBED")]
+	public const string YOUTUBE_ACTION_EMBED;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_ACTION_RATE")]
+	public const string YOUTUBE_ACTION_RATE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_ACTION_SYNDICATE")]
+	public const string YOUTUBE_ACTION_SYNDICATE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_ACTION_VIDEO_RESPOND")]
+	public const string YOUTUBE_ACTION_VIDEO_RESPOND;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_ASPECT_RATIO_WIDESCREEN")]
+	public const string YOUTUBE_ASPECT_RATIO_WIDESCREEN;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_CREDIT_ENTITY_PARTNER")]
+	public const string YOUTUBE_CREDIT_ENTITY_PARTNER;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_LICENSE_CC")]
+	public const string YOUTUBE_LICENSE_CC;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_LICENSE_STANDARD")]
+	public const string YOUTUBE_LICENSE_STANDARD;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_RATING_TYPE_MPAA")]
+	public const string YOUTUBE_RATING_TYPE_MPAA;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_RATING_TYPE_SIMPLE")]
+	public const string YOUTUBE_RATING_TYPE_SIMPLE;
+	[CCode (cheader_filename = "gdata/gdata.h", cname = "GDATA_YOUTUBE_RATING_TYPE_V_CHIP")]
+	public const string YOUTUBE_RATING_TYPE_V_CHIP;
+}
diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi
index b6deb1f..22f70ee 100644
--- a/vapi/libgphoto2.vapi
+++ b/vapi/libgphoto2.vapi
@@ -104,6 +104,8 @@ namespace GPhoto {
     public class CameraFile {
         [CCode (cname="gp_file_new")]
         public static Result create(out CameraFile file);
+        [CCode (cname="gp_file_new_from_fd")]
+        public static Result create_from_fd(out CameraFile file, int fd);
         public Result get_data_and_size(out uint8 *data, out ulong data_len);
         public Result save(string filename);
         public Result slurp(uint8[] data, out size_t readlen);
diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi
index da6a57e..b1b5875 100644
--- a/vapi/libraw.vapi
+++ b/vapi/libraw.vapi
@@ -107,7 +107,7 @@ public struct OutputParams {
     public int highlight;
     public bool use_auto_wb;
     public bool use_camera_wb;
-    public bool use_camera_matrix;
+    public int use_camera_matrix;
     public int output_color;
     public int output_bps;
     public bool output_tiff;
@@ -144,14 +144,14 @@ public struct OutputParams {
     public float exp_shift;
     public float exp_preser;
     
-    public void set_chromatic_aberrations(double red_multiplier, double green_multiplier) {
-        aber[0] = red_multiplier;
-        aber[2] = green_multiplier;
+    public static void set_chromatic_aberrations(OutputParams* params, double red_multiplier, double green_multiplier) {
+        params->aber[0] = red_multiplier;
+        params->aber[2] = green_multiplier;
     }
     
-    public void set_gamma_curve(double power, double slope) {
-        gamm[0] = power;
-        gamm[1] = slope;
+    public static void set_gamma_curve(OutputParams* params, double power, double slope) {
+        params->gamm[0] = 1.0 / power;
+        params->gamm[1] = slope;
     }
 }